=8.4\"\n+ \"php\": \">=8.4.1\"\n },\n \"type\": \"library\",\n \"autoload\": {\n@@ -4465,7 +4477,7 @@\n \"description\": \"Executes commands in sub-processes\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/process/tree/v8.0.11\"\n+ \"source\": \"https://github.com/symfony/process/tree/v8.1.0\"\n },\n \"funding\": [\n {\n@@ -4485,7 +4497,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-05-11T16:56:32+00:00\"\n+ \"time\": \"2026-05-29T05:06:50+00:00\"\n },\n {\n \"name\": \"symfony/service-contracts\",\n@@ -4576,20 +4588,20 @@\n },\n {\n \"name\": \"symfony/string\",\n- \"version\": \"v8.0.11\",\n+ \"version\": \"v8.1.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/string.git\",\n- \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\"\n+ \"reference\": \"afd5944f4005862d961efb85c8bbd5c523c4e3c9\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/string/zipball/39be2ad058a3c0bd558edca23e65f009865d75ff\",\n- \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\",\n+ \"url\": \"https://api.github.com/repos/symfony/string/zipball/afd5944f4005862d961efb85c8bbd5c523c4e3c9\",\n+ \"reference\": \"afd5944f4005862d961efb85c8bbd5c523c4e3c9\",\n \"shasum\": \"\"\n },\n \"require\": {\n- \"php\": \">=8.4\",\n+ \"php\": \">=8.4.1\",\n \"symfony/polyfill-ctype\": \"^1.8\",\n \"symfony/polyfill-intl-grapheme\": \"^1.33\",\n \"symfony/polyfill-intl-normalizer\": \"^1.0\",\n@@ -4642,7 +4654,7 @@\n \"utf8\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/string/tree/v8.0.11\"\n+ \"source\": \"https://github.com/symfony/string/tree/v8.1.0\"\n },\n \"funding\": [\n {\n@@ -4662,7 +4674,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-05-13T12:07:53+00:00\"\n+ \"time\": \"2026-05-29T05:06:50+00:00\"\n },\n {\n \"name\": \"theseer/tokenizer\",\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 5c5e983ed6e..7dda5e33deb 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -73,6 +73,7 @@ Yii Framework 2 Change Log\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\n - Bug: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$actionNamespace` (terabytesoftw)\n - Bug: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions (terabytesoftw)\n+- Enh: Consolidate MSSQL data-type conversion into `ColumnSchema`: harden `defaultPhpTypecast()` for unicode (`N'...'`), escaped quotes, and expression defaults; add `getOutputColumnDeclaration()` used by `QueryBuilder::insert()` (terabytesoftw)\n \n 2.0.56 under development\n ------------------------\ndiff --git a/framework/db/mssql/ColumnSchema.php b/framework/db/mssql/ColumnSchema.php\nindex a7ec2732402..3f1c57dae3e 100644\n--- a/framework/db/mssql/ColumnSchema.php\n+++ b/framework/db/mssql/ColumnSchema.php\n@@ -13,10 +13,17 @@\n use yii\\db\\Expression;\n \n use function bin2hex;\n+use function in_array;\n use function is_string;\n+use function preg_match;\n+use function str_replace;\n \n /**\n- * Class ColumnSchema for MSSQL database\n+ * Represents the metadata of a column in a Microsoft SQL Server database table.\n+ *\n+ * Extends {@see \\yii\\db\\ColumnSchema} with MSSQL-specific type handling: converts `varbinary` values to explicit\n+ * `CONVERT()` expressions, normalizes column default values, and builds OUTPUT-clause type declarations for\n+ * `INSERT ... OUTPUT INTO` temp tables.\n *\n * @since 2.0.23\n */\n@@ -53,18 +60,69 @@ public function dbTypecast($value)\n }\n \n /**\n- * Prepares default value and converts it according to [[phpType]]\n- * @param mixed $value default value\n- * @return mixed converted value\n+ * Converts a MSSQL column default value to its PHP representation.\n+ *\n+ * Handles MSSQL-specific default formats:\n+ * - `null` or `(NULL)` to `null`.\n+ * - `CURRENT_TIMESTAMP` on `timestamp` columns to `null` (server-managed value).\n+ * - `('value')` / `(N'value')` string wrappers to the unwrapped literal with escaped quotes resolved.\n+ * - `((number))` numeric wrapper to the unwrapped numeric string.\n+ * - expression defaults such as `(getdate())` or `(newid())` to `null` (server-computed, not a literal).\n+ *\n+ * @param mixed $value Default value in MSSQL `column_default` format.\n+ *\n+ * @return mixed Converted value.\n+ *\n * @since 2.0.24\n */\n public function defaultPhpTypecast($value)\n {\n- if ($value !== null) {\n- // convert from MSSQL column_default format, e.g. ('1') -> 1, ('string') -> string\n- $value = substr(substr($value, 2), 0, -2);\n+ if ($value === null || $value === '(NULL)') {\n+ return null;\n+ }\n+\n+ if ($this->type === Schema::TYPE_TIMESTAMP && $value === 'CURRENT_TIMESTAMP') {\n+ return null;\n+ }\n+\n+ if (is_string($value)) {\n+ // string defaults: ('value') or unicode (N'value') โ unwrap and resolve escaped single quotes.\n+ if (preg_match(\"/^\\(N?'(.*)'\\)$/s\", $value, $matches) === 1) {\n+ $value = str_replace(\"''\", \"'\", $matches[1]);\n+ } elseif (preg_match('/^\\(\\((.+)\\)\\)$/s', $value, $matches) === 1) {\n+ // numeric defaults: ((0)), ((42)), ((3.14)).\n+ $value = $matches[1];\n+ } else {\n+ // expression defaults: (getdate()), (newid()) โ not representable as a PHP literal.\n+ return null;\n+ }\n }\n \n return parent::phpTypecast($value);\n }\n+\n+ /**\n+ * Returns the SQL type declaration for this column inside an OUTPUT clause temp table.\n+ *\n+ * Appends `(MAX)` to variable-length types (`varchar`, `nvarchar`, `varbinary`), preserves the declared size for\n+ * fixed-length types (`char`, `nchar`, `binary`), and maps `timestamp` to `varbinary(8)` or `binary(8)`.\n+ *\n+ * @return string SQL type declaration.\n+ */\n+ public function getOutputColumnDeclaration(): string\n+ {\n+ if ($this->dbType === Schema::TYPE_TIMESTAMP) {\n+ return $this->allowNull ? 'varbinary(8)' : 'binary(8)';\n+ }\n+\n+ $dbType = $this->dbType;\n+\n+ if (in_array($dbType, ['varchar', 'nvarchar', 'varbinary'], true)) {\n+ $dbType .= '(MAX)';\n+ } elseif (in_array($dbType, ['char', 'nchar', 'binary'], true)) {\n+ $dbType .= \"($this->size)\";\n+ }\n+\n+ return $dbType;\n+ }\n }\ndiff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php\nindex 110bca448a0..5314bcebac5 100644\n--- a/framework/db/mssql/QueryBuilder.php\n+++ b/framework/db/mssql/QueryBuilder.php\n@@ -16,7 +16,6 @@\n use yii\\db\\Query;\n \n use function count;\n-use function in_array;\n \n /**\n * QueryBuilder is the query builder for MS SQL Server databases (version 2019 and above).\n@@ -431,23 +430,13 @@ public function insert($table, $columns, &$params)\n $outputColumns = [];\n \n foreach ($schema->columns as $column) {\n- if ($column->isComputed) {\n+ if (!$column instanceof ColumnSchema || $column->isComputed) {\n continue;\n }\n \n- $dbType = $column->dbType;\n-\n- if (in_array($dbType, ['varchar', 'nvarchar', 'binary', 'varbinary'], true)) {\n- $dbType .= '(MAX)';\n- }\n-\n- if ($column->dbType === Schema::TYPE_TIMESTAMP) {\n- $dbType = $column->allowNull ? 'varbinary(8)' : 'binary(8)';\n- }\n-\n $quoteColumnName = $this->db->quoteColumnName($column->name);\n \n- $cols[] = \"{$quoteColumnName} {$dbType} \" . ($column->allowNull ? 'NULL' : '');\n+ $cols[] = \"{$quoteColumnName} {$column->getOutputColumnDeclaration()} \" . ($column->allowNull ? 'NULL' : '');\n $outputColumns[] = \"INSERTED.{$quoteColumnName}\";\n }\n \ndiff --git a/framework/db/mssql/Schema.php b/framework/db/mssql/Schema.php\nindex 5d3b09f5bb3..f384762049a 100644\n--- a/framework/db/mssql/Schema.php\n+++ b/framework/db/mssql/Schema.php\n@@ -416,12 +416,8 @@ protected function loadColumnSchema($info)\n \n $column->phpType = $this->getColumnPhpType($column);\n \n- if ($info['column_default'] === '(NULL)') {\n- $info['column_default'] = null;\n- }\n- if (!$column->isPrimaryKey && ($column->type !== 'timestamp' || $info['column_default'] !== 'CURRENT_TIMESTAMP')) {\n- $column->defaultValue = $column->defaultPhpTypecast($info['column_default']);\n- }\n+ // store raw default for deferred resolution in `findColumns()`, where isPrimaryKey is known.\n+ $column->defaultValue = $info['column_default'];\n \n return $column;\n }\n@@ -493,6 +489,9 @@ protected function findColumns($table)\n if ($column->isPrimaryKey && $column->autoIncrement) {\n $table->sequenceName = '';\n }\n+ $column->defaultValue = $column->isPrimaryKey\n+ ? null\n+ : $column->defaultPhpTypecast($column->defaultValue);\n $table->columns[$column->name] = $column;\n }\n \ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex a7a2f9b5440..1bc1428ad13 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -372,12 +372,6 @@ parameters:\n \t\t\tcount: 1\n \t\t\tpath: framework/db/conditions/SimpleConditionBuilder.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$isComputed\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: framework/db/mssql/QueryBuilder.php\n-\n \t\t-\n \t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#'\n \t\t\tidentifier: method.notFound\n\ndiff --git a/tests/framework/db/mssql/ColumnSchemaTest.php b/tests/framework/db/mssql/ColumnSchemaTest.php\nnew file mode 100644\nindex 00000000000..34144da741b\n--- /dev/null\n+++ b/tests/framework/db/mssql/ColumnSchemaTest.php\n@@ -0,0 +1,110 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\db\\mssql;\n+\n+use PHPUnit\\Framework\\Attributes\\DataProviderExternal;\n+use PHPUnit\\Framework\\Attributes\\Group;\n+use yii\\db\\Expression;\n+use yii\\db\\mssql\\ColumnSchema;\n+use yiiunit\\framework\\db\\DatabaseTestCase;\n+use yiiunit\\framework\\db\\mssql\\providers\\ColumnSchemaProvider;\n+\n+/**\n+ * Unit tests for {@see \\yii\\db\\mssql\\ColumnSchema} type-casting and OUTPUT column declarations for the MSSQL driver.\n+ *\n+ * {@see ColumnSchemaProvider} for test case data providers.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+#[Group('db')]\n+#[Group('mssql')]\n+#[Group('column')]\n+final class ColumnSchemaTest extends DatabaseTestCase\n+{\n+ protected $driverName = 'sqlsrv';\n+\n+ #[DataProviderExternal(ColumnSchemaProvider::class, 'dbTypecast')]\n+ public function testDbTypecast(\n+ string $type,\n+ string $dbType,\n+ bool $allowNull,\n+ mixed $value,\n+ mixed $expected,\n+ ): void {\n+ $column = new ColumnSchema();\n+\n+ $column->type = $type;\n+ $column->dbType = $dbType;\n+ $column->allowNull = $allowNull;\n+\n+ $result = $column->dbTypecast($value);\n+\n+ if (!$expected instanceof Expression) {\n+ self::assertSame(\n+ $expected,\n+ $result,\n+ 'Converted value must match.',\n+ );\n+\n+ return;\n+ }\n+\n+ self::assertInstanceOf(\n+ Expression::class,\n+ $result,\n+ 'Value must yield an Expression.',\n+ );\n+ self::assertSame(\n+ $expected->expression,\n+ $result->expression,\n+ 'Expression SQL must match.',\n+ );\n+ }\n+\n+ #[DataProviderExternal(ColumnSchemaProvider::class, 'defaultPhpTypecast')]\n+ public function testDefaultPhpTypecast(string $type, mixed $value, mixed $expected): void\n+ {\n+ $column = new ColumnSchema();\n+\n+ $column->type = $type;\n+ $column->phpType = match ($type) {\n+ 'integer' => 'integer',\n+ default => 'string',\n+ };\n+\n+ self::assertSame(\n+ $expected,\n+ $column->defaultPhpTypecast($value),\n+ 'Converted default must match.',\n+ );\n+ }\n+\n+ #[DataProviderExternal(ColumnSchemaProvider::class, 'getOutputColumnDeclaration')]\n+ public function testGetOutputColumnDeclaration(\n+ string $dbType,\n+ bool $allowNull,\n+ int|null $size,\n+ string $expected,\n+ ): void {\n+ $column = new ColumnSchema();\n+\n+ $column->dbType = $dbType;\n+ $column->allowNull = $allowNull;\n+ $column->size = $size;\n+\n+ self::assertSame(\n+ $expected,\n+ $column->getOutputColumnDeclaration(),\n+ 'Type declaration must match.',\n+ );\n+ }\n+}\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 5ea92c3a6b9..2711cc07193 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -342,6 +342,60 @@ public function testNullDefaultValueColumn(): void\n $this->assertNull($table->getColumn('stringcol')->defaultValue);\n }\n \n+ public function testExpressionAndLiteralColumnDefaultValues(): void\n+ {\n+ $db = $this->getConnection();\n+\n+ if ($db->getSchema()->getTableSchema('column_default') !== null) {\n+ $db->createCommand()->dropTable('column_default')->execute();\n+ }\n+\n+ $db->createCommand()->createTable(\n+ 'column_default',\n+ [\n+ 'id' => 'int',\n+ 'created_getdate' => 'datetime DEFAULT GETDATE()',\n+ 'created_cts' => 'datetime DEFAULT CURRENT_TIMESTAMP',\n+ 'uuid' => 'uniqueidentifier DEFAULT NEWID()',\n+ 'status' => 'int DEFAULT 5',\n+ 'label' => \"varchar(32) DEFAULT 'pending'\",\n+ 'note' => \"nvarchar(32) DEFAULT N'it''s'\",\n+ ],\n+ )->execute();\n+\n+ $table = $db->getSchema()->getTableSchema('column_default', true);\n+\n+ self::assertNull(\n+ $table->getColumn('created_getdate')->defaultValue,\n+ \"Default must resolve to 'null'.\",\n+ );\n+ self::assertNull(\n+ $table->getColumn('created_cts')->defaultValue,\n+ \"Default must resolve to 'null'.\",\n+ );\n+ self::assertNull(\n+ $table->getColumn('uuid')->defaultValue,\n+ \"Default must resolve to 'null'.\",\n+ );\n+ self::assertSame(\n+ 5,\n+ $table->getColumn('status')->defaultValue,\n+ \"Numeric default must unwrap to 'int'.\",\n+ );\n+ self::assertSame(\n+ 'pending',\n+ $table->getColumn('label')->defaultValue,\n+ 'String default must unwrap.',\n+ );\n+ self::assertSame(\n+ \"it's\",\n+ $table->getColumn('note')->defaultValue,\n+ 'Escaped unicode default must unwrap.',\n+ );\n+\n+ $db->createCommand()->dropTable('column_default')->execute();\n+ }\n+\n public function testInsertWithCompositePrimaryKey(): void\n {\n $db = $this->getConnection(true, true);\ndiff --git a/tests/framework/db/mssql/providers/ColumnSchemaProvider.php b/tests/framework/db/mssql/providers/ColumnSchemaProvider.php\nnew file mode 100644\nindex 00000000000..b083f9538ea\n--- /dev/null\n+++ b/tests/framework/db/mssql/providers/ColumnSchemaProvider.php\n@@ -0,0 +1,243 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\db\\mssql\\providers;\n+\n+use yii\\db\\Expression;\n+use yii\\db\\mssql\\Schema;\n+\n+use function bin2hex;\n+\n+/**\n+ * Data provider for {@see \\yiiunit\\framework\\db\\mssql\\ColumnSchemaTest} test cases.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class ColumnSchemaProvider\n+{\n+ /**\n+ * @return array<string, array{string, string, bool, mixed, mixed}>\n+ */\n+ public static function dbTypecast(): array\n+ {\n+ return [\n+ 'non-varbinary string falls through to parent' => [\n+ Schema::TYPE_STRING,\n+ 'varchar',\n+ true,\n+ 'test',\n+ 'test',\n+ ],\n+ 'varbinary integer value falls through to parent' => [\n+ Schema::TYPE_BINARY,\n+ 'varbinary',\n+ true,\n+ 123,\n+ 123,\n+ ],\n+ 'varbinary null when not nullable' => [\n+ Schema::TYPE_BINARY,\n+ 'varbinary',\n+ false,\n+ null,\n+ null,\n+ ],\n+ 'varbinary null when nullable' => [\n+ Schema::TYPE_BINARY,\n+ 'varbinary',\n+ true,\n+ null,\n+ new Expression('CAST(NULL AS VARBINARY(MAX))'),\n+ ],\n+ 'varbinary string value' => [\n+ Schema::TYPE_BINARY,\n+ 'varbinary',\n+ true,\n+ 'binary data',\n+ new Expression('CONVERT(VARBINARY(MAX), 0x' . bin2hex('binary data') . ')'),\n+ ],\n+ ];\n+ }\n+\n+ /**\n+ * @return array<string, array{string, mixed, mixed}>\n+ */\n+ public static function defaultPhpTypecast(): array\n+ {\n+ return [\n+ 'CURRENT_TIMESTAMP on timestamp column returns null' => [\n+ Schema::TYPE_TIMESTAMP,\n+ 'CURRENT_TIMESTAMP',\n+ null,\n+ ],\n+ 'decimal default value unwrapped' => [\n+ Schema::TYPE_DECIMAL,\n+ '((3.14))',\n+ '3.14',\n+ ],\n+ 'expression default getdate returns null' => [\n+ Schema::TYPE_STRING,\n+ '(getdate())',\n+ null,\n+ ],\n+ 'expression default newid returns null' => [\n+ Schema::TYPE_STRING,\n+ '(newid())',\n+ null,\n+ ],\n+ 'expression default sysdatetime returns null' => [\n+ Schema::TYPE_STRING,\n+ '(sysdatetime())',\n+ null,\n+ ],\n+ 'integer default value unwrapped' => [\n+ Schema::TYPE_INTEGER,\n+ '((0))',\n+ 0,\n+ ],\n+ 'null string returns null' => [\n+ Schema::TYPE_STRING,\n+ '(NULL)',\n+ null,\n+ ],\n+ 'null value returns null' => [\n+ Schema::TYPE_STRING,\n+ null,\n+ null,\n+ ],\n+ 'string default value unwrapped' => [\n+ Schema::TYPE_STRING,\n+ \"('hello')\",\n+ 'hello',\n+ ],\n+ 'string with escaped single quotes' => [\n+ Schema::TYPE_STRING,\n+ \"('it''s')\",\n+ \"it's\",\n+ ],\n+ 'unicode string default value unwrapped' => [\n+ Schema::TYPE_STRING,\n+ \"(N'unicode')\",\n+ 'unicode',\n+ ],\n+ 'unicode string with escaped single quotes' => [\n+ Schema::TYPE_STRING,\n+ \"(N'it''s')\",\n+ \"it's\",\n+ ],\n+ ];\n+ }\n+\n+ /**\n+ * @return array<string, array{string, bool, int|null, string}>\n+ */\n+ public static function getOutputColumnDeclaration(): array\n+ {\n+ return [\n+ 'bigint returns as-is' => [\n+ 'bigint',\n+ false,\n+ null,\n+ 'bigint',\n+ ],\n+ 'binary appends size' => [\n+ 'binary',\n+ false,\n+ 16,\n+ 'binary(16)',\n+ ],\n+ 'binary with embedded size stays as-is' => [\n+ 'binary(16)',\n+ false,\n+ 16,\n+ 'binary(16)',\n+ ],\n+ 'char appends size' => [\n+ 'char',\n+ false,\n+ 10,\n+ 'char(10)',\n+ ],\n+ 'char with embedded size stays as-is' => [\n+ 'char(10)',\n+ false,\n+ 10,\n+ 'char(10)',\n+ ],\n+ 'int returns as-is' => [\n+ 'int',\n+ false,\n+ null,\n+ 'int',\n+ ],\n+ 'nchar appends size' => [\n+ 'nchar',\n+ false,\n+ 20,\n+ 'nchar(20)',\n+ ],\n+ 'nchar with embedded size stays as-is' => [\n+ 'nchar(20)',\n+ false,\n+ 20,\n+ 'nchar(20)',\n+ ],\n+ 'nvarchar appends MAX' => [\n+ 'nvarchar',\n+ false,\n+ null,\n+ 'nvarchar(MAX)',\n+ ],\n+ 'nvarchar with embedded size stays as-is' => [\n+ 'nvarchar(100)',\n+ false,\n+ 100,\n+ 'nvarchar(100)',\n+ ],\n+ 'timestamp not nullable' => [\n+ Schema::TYPE_TIMESTAMP,\n+ false,\n+ null,\n+ 'binary(8)',\n+ ],\n+ 'timestamp nullable' => [\n+ Schema::TYPE_TIMESTAMP,\n+ true,\n+ null,\n+ 'varbinary(8)',\n+ ],\n+ 'varbinary appends MAX' => [\n+ 'varbinary',\n+ false,\n+ null,\n+ 'varbinary(MAX)',\n+ ],\n+ 'varbinary with embedded size stays as-is' => [\n+ 'varbinary(50)',\n+ false,\n+ 50,\n+ 'varbinary(50)',\n+ ],\n+ 'varchar appends MAX' => [\n+ 'varchar',\n+ false,\n+ null,\n+ 'varchar(MAX)',\n+ ],\n+ 'varchar with embedded size stays as-is' => [\n+ 'varchar(128)',\n+ false,\n+ 128,\n+ 'varchar(128)',\n+ ],\n+ ];\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":9,"string":"9"}}},{"rowIdx":34253,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20917"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20917,"string":"20,917"},"base_sha":{"kind":"string","value":"066e168d674268637bb568cd40c31a106a4e1412"},"head_sha":{"kind":"string","value":"32151face43e1e9fb2dcfd65def3161cc1cf458c"},"task":{"kind":"string","value":"Sync to master brach.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `build/controllers/` needed for: Sync to master brach.","scope_files":["build/controllers/ReleaseController.php"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/` needed for: Sync to master brach.","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/i18n/` needed for: Sync to master brach.","scope_files":["framework/i18n/PhpMessageSource.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/` needed for: Sync to master brach.","scope_files":["tests/framework/ReleaseControllerTest.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/i18n/` needed for: Sync to master brach.","scope_files":["tests/framework/i18n/PhpMessageSourceTest.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/framework/i18n/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/i18n/stubs/ExposedPhpMessageSource.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/i18n/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/i18n/PhpMessageSource.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/i18n/PhpMessageSourceTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/i18n/stubs/ExposedPhpMessageSource.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["build/controllers/ReleaseController.php"],"solution_diff":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n@@ -913,6 +942,7 @@ protected function resortChangelog($changelog)\n // cleanup whitespace\n foreach ($changelog as $i => $line) {\n $changelog[$i] = rtrim($line);\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\d+(, #\\d+)*: )/', '- Bug', $changelog[$i]);\n }\n $changelog = array_filter($changelog);\n \n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s2","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b500b9a0520..5c5e983ed6e 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -89,6 +89,7 @@ Yii Framework 2 Change Log\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n+- Enh #20890: Harden `yii\\i18n\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s3","scope_files":["framework/i18n/PhpMessageSource.php"],"solution_diff":"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n\n","summary":"Edited 1 file(s) in framework/i18n/"},{"subtask_id":"s4","scope_files":["tests/framework/ReleaseControllerTest.php"],"solution_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nnew file mode 100644\nindex 00000000000..a11769c4182\n--- /dev/null\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -0,0 +1,160 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework;\n+\n+use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n+use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * ReleaseControllerTest.\n+ * @group base\n+ */\n+class ReleaseControllerTest extends TestCase\n+{\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n+ {\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->assertSame(\n+ [\n+ '',\n+ '- Bug #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- Bug #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '',\n+ '',\n+ ],\n+ $method->invoke($controller, [\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Fix #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '- Fix #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ ])\n+ );\n+ }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/"},{"subtask_id":"s5","scope_files":["tests/framework/i18n/PhpMessageSourceTest.php"],"solution_diff":"diff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\nnew file mode 100644\nindex 00000000000..52f8ed949e9\n--- /dev/null\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\n@@ -0,0 +1,197 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\i18n;\n+\n+use Yii;\n+use yii\\base\\InvalidArgumentException;\n+use yiiunit\\framework\\i18n\\stubs\\ExposedPhpMessageSource;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * Unit tests for {@see \\yii\\i18n\\PhpMessageSource} category path-traversal hardening.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ * @group i18n\n+ */\n+final class PhpMessageSourceTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication();\n+ }\n+\n+ /**\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\n+ *\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\n+ */\n+ public static function unsafeCategoryProvider(): array\n+ {\n+ return [\n+ 'absolute unix path' => ['/etc/passwd'],\n+ 'bare parent segment' => ['..'],\n+ 'embedded traversal segment' => ['app/../../config/db'],\n+ 'leading traversal segment' => ['../secret'],\n+ 'parent traversal' => ['../../etc/passwd'],\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\n+ 'trailing traversal segment' => ['app/..'],\n+ 'windows absolute path' => ['C:\\\\Windows\\\\system32'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function safeCategoryProvider(): array\n+ {\n+ return [\n+ 'backslash namespace' => ['modules\\\\users\\\\validation', 'modules/users/validation'],\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\n+ 'simple' => ['app', 'app'],\n+ 'slash namespace' => ['app/error', 'app/error'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides categories outside the traversal threat model that must remain accepted.\n+ *\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function benignCategoryProvider(): array\n+ {\n+ return [\n+ 'leading dot' => ['.messages', '.messages'],\n+ 'leading hyphen' => ['-foo', '-foo'],\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\n+ 'whitespace in name' => ['My Category', 'My Category'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\n+ *\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function inBoundsNonCanonicalCategoryProvider(): array\n+ {\n+ return [\n+ 'double slash' => ['app//error', 'app//error'],\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\n+ 'leading current-dir segment' => ['./config', './config'],\n+ ];\n+ }\n+\n+ /**\n+ * @dataProvider unsafeCategoryProvider\n+ */\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\n+ {\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\n+\n+ $this->expectException(InvalidArgumentException::class);\n+ $this->expectExceptionMessage('Invalid message category:');\n+\n+ $source->exposeMessageFilePath($category, 'en');\n+ }\n+\n+ /**\n+ * @dataProvider safeCategoryProvider\n+ */\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Namespace separators must be preserved under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider benignCategoryProvider\n+ */\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-traversal category must resolve under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\n+ */\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(\n+ string $category,\n+ string $expectedRelative\n+ ): void {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-canonical in-bounds category must be accepted.',\n+ );\n+ }\n+\n+ public function testReturnFileMapPathForMappedCategory(): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\n+ 'fileMap entry must bypass category validation.',\n+ );\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/i18n/"},{"subtask_id":"s6","scope_files":["tests/framework/i18n/stubs/ExposedPhpMessageSource.php"],"solution_diff":"diff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\nnew file mode 100644\nindex 00000000000..f97f4b495c8\n--- /dev/null\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\n@@ -0,0 +1,22 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\i18n\\stubs;\n+\n+use yii\\i18n\\PhpMessageSource;\n+\n+/**\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\n+ */\n+class ExposedPhpMessageSource extends PhpMessageSource\n+{\n+ public function exposeMessageFilePath($category, $language): string\n+ {\n+ return $this->getMessageFilePath($category, $language);\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/i18n/stubs/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\\nindex 4ffa7142f05..e7c36cf436a 100644\\n--- a/build/controllers/ReleaseController.php\\n+++ b/build/controllers/ReleaseController.php\\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\\n protected function resortChangelogs($what, $version)\\n {\\n foreach ($this->getChangelogs($what) as $file) {\\n+ $this->updateChangelogDevelopmentVersion($file, $version);\\n // split the file into relevant parts\\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\\n $changelog = $this->resortChangelog($changelog);\\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\\n }\\n }\\n \\n+ protected function updateChangelogDevelopmentVersion($file, $version)\\n+ {\\n+ $contents = file_get_contents($file);\\n+ $headline = $version . ' under development';\\n+ $updatedContents = preg_replace(\\n+ '/^([^\\\\s]+) under development\\\\R-+\\\\R/m',\\n+ $headline . \\\"\\\\n\\\" . str_repeat('-', \\\\strlen($headline)) . \\\"\\\\n\\\",\\n+ $contents,\\n+ 1\\n+ );\\n+\\n+ if ($updatedContents !== $contents) {\\n+ file_put_contents($file, $updatedContents);\\n+ }\\n+ }\\n+\\n /**\\n * Extract changelog content for a specific version.\\n * @param string $file\\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\\n $end = [];\\n \\n $state = 'start';\\n+ $found = false;\\n foreach ($lines as $l => $line) {\\n // starting from the changelogs headline\\n if (\\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\\n ) {\\n $state = 'changelog';\\n+ $found = true;\\n }\\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\\n $state = 'end';\\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\\n }\\n }\\n \\n+ if (!$found) {\\n+ throw new Exception(\\\"Changelog section for version $version was not found in $file.\\\");\\n+ }\\n+\\n return [$start, $changelog, $end];\\n }\\n \\n+ protected function matchesChangelogVersion($line, $version)\\n+ {\\n+ $v = str_replace('\\\\\\\\-', '[\\\\\\\\- ]', preg_quote($version, '/'));\\n+ return preg_match('/^' . $v . '(?:\\\\s|$)/', $line) === 1;\\n+ }\\n+\\n /**\\n * Ensure sorting of the changelog lines.\\n * @param string[] $changelog\\n@@ -913,6 +942,7 @@ protected function resortChangelog($changelog)\\n // cleanup whitespace\\n foreach ($changelog as $i => $line) {\\n $changelog[$i] = rtrim($line);\\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\\\d+(, #\\\\d+)*: )/', '- Bug', $changelog[$i]);\\n }\\n $changelog = array_filter($changelog);\\n \\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex b500b9a0520..5c5e983ed6e 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -89,6 +89,7 @@ Yii Framework 2 Change Log\\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\\n+- Enh #20890: Harden `yii\\\\i18n\\\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/i18n/PhpMessageSource.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\\nindex 8ef075e4744..fc1033c666e 100644\\n--- a/framework/i18n/PhpMessageSource.php\\n+++ b/framework/i18n/PhpMessageSource.php\\n@@ -11,6 +11,9 @@\\n use Yii;\\n use yii\\\\base\\\\InvalidArgumentException;\\n \\n+use function sprintf;\\n+use function str_replace;\\n+\\n /**\\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\\n *\\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\\n /**\\n * Returns message file path for the specified language and category.\\n *\\n+ * The category may use `/` or `\\\\` as namespace separators (for example, `app/error`). Categories that contain `..`\\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\\n+ * cannot escape [[basePath]].\\n+ *\\n * @param string $category the message category\\n * @param string $language the target language\\n * @return string path to message file\\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\\n */\\n protected function getMessageFilePath($category, $language)\\n {\\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\\n if (isset($this->fileMap[$category])) {\\n $messageFile .= $this->fileMap[$category];\\n } else {\\n- $messageFile .= str_replace('\\\\\\\\', '/', $category) . '.php';\\n+ $normalizedCategory = str_replace('\\\\\\\\', '/', (string) $category);\\n+\\n+ if (preg_match('~(?:^|/)\\\\.\\\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\\\-]*://~', $normalizedCategory)) {\\n+ throw new InvalidArgumentException(\\n+ sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n+ );\\n+ }\\n+\\n+ $messageFile .= \\\"{$normalizedCategory}.php\\\";\\n }\\n \\n return $messageFile;\\n\\n\",\n \"summary\": \"Edited 1 file(s) in framework/i18n/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nnew file mode 100644\\nindex 00000000000..a11769c4182\\n--- /dev/null\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -0,0 +1,160 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework;\\n+\\n+use ReflectionClass;\\n+use ReflectionMethod;\\n+use yii\\\\base\\\\Exception;\\n+use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yii\\\\helpers\\\\FileHelper;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * ReleaseControllerTest.\\n+ * @group base\\n+ */\\n+class ReleaseControllerTest extends TestCase\\n+{\\n+ private array $tempPaths = [];\\n+\\n+ protected function tearDown(): void\\n+ {\\n+ foreach ($this->tempPaths as $path) {\\n+ FileHelper::removeDirectory($path);\\n+ }\\n+ $this->tempPaths = [];\\n+ parent::tearDown();\\n+ }\\n+\\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n+ {\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->assertSame(\\n+ [\\n+ '',\\n+ '- Bug #275: Fix logging (samdark)',\\n+ '- Bug #283: Fix first sentence extraction (samdark)',\\n+ '- Bug #294: Make dependency optional (samdark)',\\n+ '- Bug #339: Fix static replacement (samdark)',\\n+ '- Bug #360: Fix URL processing (samdark)',\\n+ '- Enh #244: Uniform descriptions (samdark)',\\n+ '- Chg #352: Remove deprecated code (samdark)',\\n+ '- New #131: Add template (samdark)',\\n+ '',\\n+ '',\\n+ ],\\n+ $method->invoke($controller, [\\n+ '- Chg #352: Remove deprecated code (samdark)',\\n+ '- Bug #294: Make dependency optional (samdark)',\\n+ '- Fix #360: Fix URL processing (samdark)',\\n+ '- Enh #244: Uniform descriptions (samdark)',\\n+ '- Bug #339: Fix static replacement (samdark)',\\n+ '- New #131: Add template (samdark)',\\n+ '- Fix #275: Fix logging (samdark)',\\n+ '- Bug #283: Fix first sentence extraction (samdark)',\\n+ ])\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"4.0.0 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\"\\n+ . \\\"- Fix #1: Test fix (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+\\n+ $this->assertSame(\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.9 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test fix (samdark)\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\\n\\\",\\n+ file_get_contents($file)\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ $contents = \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.8 November 24, 2025\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\";\\n+ file_put_contents($file, $contents);\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+\\n+ try {\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+ $this->fail('Expected missing changelog version exception.');\\n+ } catch (Exception $e) {\\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\\n+ }\\n+\\n+ $this->assertSame($contents, file_get_contents($file));\\n+ }\\n+\\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath, 0777, true);\\n+ $file = $basePath . '/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 Change Log\\\\n\\\"\\n+ . \\\"==========================\\\\n\\\\n\\\"\\n+ . \\\"2.0.50 May 09, 2026\\\\n\\\"\\n+ . \\\"-------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->expectException(Exception::class);\\n+ $this->expectExceptionMessage('2.0.5');\\n+\\n+ $method->invoke($controller, $file, '2.0.5');\\n+ }\\n+\\n+ private function createController(): ReleaseController\\n+ {\\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/i18n/PhpMessageSourceTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\\nnew file mode 100644\\nindex 00000000000..52f8ed949e9\\n--- /dev/null\\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\\n@@ -0,0 +1,197 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\i18n;\\n+\\n+use Yii;\\n+use yii\\\\base\\\\InvalidArgumentException;\\n+use yiiunit\\\\framework\\\\i18n\\\\stubs\\\\ExposedPhpMessageSource;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * Unit tests for {@see \\\\yii\\\\i18n\\\\PhpMessageSource} category path-traversal hardening.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 2.0.56\\n+ * @group i18n\\n+ */\\n+final class PhpMessageSourceTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ $this->mockApplication();\\n+ }\\n+\\n+ /**\\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\\n+ *\\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\\n+ */\\n+ public static function unsafeCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'absolute unix path' => ['/etc/passwd'],\\n+ 'bare parent segment' => ['..'],\\n+ 'embedded traversal segment' => ['app/../../config/db'],\\n+ 'leading traversal segment' => ['../secret'],\\n+ 'parent traversal' => ['../../etc/passwd'],\\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\\n+ 'trailing traversal segment' => ['app/..'],\\n+ 'windows absolute path' => ['C:\\\\\\\\Windows\\\\\\\\system32'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public static function safeCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'backslash namespace' => ['modules\\\\\\\\users\\\\\\\\validation', 'modules/users/validation'],\\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\\n+ 'simple' => ['app', 'app'],\\n+ 'slash namespace' => ['app/error', 'app/error'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides categories outside the traversal threat model that must remain accepted.\\n+ *\\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public static function benignCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'leading dot' => ['.messages', '.messages'],\\n+ 'leading hyphen' => ['-foo', '-foo'],\\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\\n+ 'whitespace in name' => ['My Category', 'My Category'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\\n+ *\\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public static function inBoundsNonCanonicalCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'double slash' => ['app//error', 'app//error'],\\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\\n+ 'leading current-dir segment' => ['./config', './config'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * @dataProvider unsafeCategoryProvider\\n+ */\\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\\n+\\n+ $this->expectException(InvalidArgumentException::class);\\n+ $this->expectExceptionMessage('Invalid message category:');\\n+\\n+ $source->exposeMessageFilePath($category, 'en');\\n+ }\\n+\\n+ /**\\n+ * @dataProvider safeCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Namespace separators must be preserved under basePath.',\\n+ );\\n+ }\\n+\\n+ /**\\n+ * @dataProvider benignCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Non-traversal category must resolve under basePath.',\\n+ );\\n+ }\\n+\\n+ /**\\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(\\n+ string $category,\\n+ string $expectedRelative\\n+ ): void {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Non-canonical in-bounds category must be accepted.',\\n+ );\\n+ }\\n+\\n+ public function testReturnFileMapPathForMappedCategory(): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\\n+ 'fileMap entry must bypass category validation.',\\n+ );\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/i18n/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/framework/i18n/stubs/ExposedPhpMessageSource.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\\nnew file mode 100644\\nindex 00000000000..f97f4b495c8\\n--- /dev/null\\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\\n@@ -0,0 +1,22 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\i18n\\\\stubs;\\n+\\n+use yii\\\\i18n\\\\PhpMessageSource;\\n+\\n+/**\\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\\n+ */\\n+class ExposedPhpMessageSource extends PhpMessageSource\\n+{\\n+ public function exposeMessageFilePath($category, $language): string\\n+ {\\n+ return $this->getMessageFilePath($category, $language);\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/i18n/stubs/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n@@ -913,6 +942,7 @@ protected function resortChangelog($changelog)\n // cleanup whitespace\n foreach ($changelog as $i => $line) {\n $changelog[$i] = rtrim($line);\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\d+(, #\\d+)*: )/', '- Bug', $changelog[$i]);\n }\n $changelog = array_filter($changelog);\n \ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b500b9a0520..5c5e983ed6e 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -89,6 +89,7 @@ Yii Framework 2 Change Log\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n+- Enh #20890: Harden `yii\\i18n\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n\ndiff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nnew file mode 100644\nindex 00000000000..a11769c4182\n--- /dev/null\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -0,0 +1,160 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework;\n+\n+use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n+use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * ReleaseControllerTest.\n+ * @group base\n+ */\n+class ReleaseControllerTest extends TestCase\n+{\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n+ {\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->assertSame(\n+ [\n+ '',\n+ '- Bug #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- Bug #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '',\n+ '',\n+ ],\n+ $method->invoke($controller, [\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Fix #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '- Fix #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ ])\n+ );\n+ }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n+}\ndiff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\nnew file mode 100644\nindex 00000000000..52f8ed949e9\n--- /dev/null\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\n@@ -0,0 +1,197 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\i18n;\n+\n+use Yii;\n+use yii\\base\\InvalidArgumentException;\n+use yiiunit\\framework\\i18n\\stubs\\ExposedPhpMessageSource;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * Unit tests for {@see \\yii\\i18n\\PhpMessageSource} category path-traversal hardening.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ * @group i18n\n+ */\n+final class PhpMessageSourceTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication();\n+ }\n+\n+ /**\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\n+ *\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\n+ */\n+ public static function unsafeCategoryProvider(): array\n+ {\n+ return [\n+ 'absolute unix path' => ['/etc/passwd'],\n+ 'bare parent segment' => ['..'],\n+ 'embedded traversal segment' => ['app/../../config/db'],\n+ 'leading traversal segment' => ['../secret'],\n+ 'parent traversal' => ['../../etc/passwd'],\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\n+ 'trailing traversal segment' => ['app/..'],\n+ 'windows absolute path' => ['C:\\\\Windows\\\\system32'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function safeCategoryProvider(): array\n+ {\n+ return [\n+ 'backslash namespace' => ['modules\\\\users\\\\validation', 'modules/users/validation'],\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\n+ 'simple' => ['app', 'app'],\n+ 'slash namespace' => ['app/error', 'app/error'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides categories outside the traversal threat model that must remain accepted.\n+ *\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function benignCategoryProvider(): array\n+ {\n+ return [\n+ 'leading dot' => ['.messages', '.messages'],\n+ 'leading hyphen' => ['-foo', '-foo'],\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\n+ 'whitespace in name' => ['My Category', 'My Category'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\n+ *\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public static function inBoundsNonCanonicalCategoryProvider(): array\n+ {\n+ return [\n+ 'double slash' => ['app//error', 'app//error'],\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\n+ 'leading current-dir segment' => ['./config', './config'],\n+ ];\n+ }\n+\n+ /**\n+ * @dataProvider unsafeCategoryProvider\n+ */\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\n+ {\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\n+\n+ $this->expectException(InvalidArgumentException::class);\n+ $this->expectExceptionMessage('Invalid message category:');\n+\n+ $source->exposeMessageFilePath($category, 'en');\n+ }\n+\n+ /**\n+ * @dataProvider safeCategoryProvider\n+ */\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Namespace separators must be preserved under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider benignCategoryProvider\n+ */\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-traversal category must resolve under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\n+ */\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(\n+ string $category,\n+ string $expectedRelative\n+ ): void {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-canonical in-bounds category must be accepted.',\n+ );\n+ }\n+\n+ public function testReturnFileMapPathForMappedCategory(): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\n+ 'fileMap entry must bypass category validation.',\n+ );\n+ }\n+}\ndiff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\nnew file mode 100644\nindex 00000000000..f97f4b495c8\n--- /dev/null\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\n@@ -0,0 +1,22 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\i18n\\stubs;\n+\n+use yii\\i18n\\PhpMessageSource;\n+\n+/**\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\n+ */\n+class ExposedPhpMessageSource extends PhpMessageSource\n+{\n+ public function exposeMessageFilePath($category, $language): string\n+ {\n+ return $this->getMessageFilePath($category, $language);\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":6,"string":"6"},"num_changed_files":{"kind":"number","value":6,"string":"6"}}},{"rowIdx":34254,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20895"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20895,"string":"20,895"},"base_sha":{"kind":"string","value":"3dea6d59b9a54e1eaa599081ae30bfd4a976d69a"},"head_sha":{"kind":"string","value":"1f4fb57bd147ea7b4870ed260d14197da4da3770"},"task":{"kind":"string","value":"Harden PhpMessageSource category path handling\n\n`yii\\i18n\\PhpMessageSource` builds message file paths from the translation category. Category names intentionally support slash-separated namespaces such as `app/error`, `modules/users/validation`, and `widgets/menu/messages`, but unsafe path segments are currently not rejected before the file path is built.\n\nThis is not a default remote vulnerability because translation categories are normally developer-controlled values passed to `Yii::t()`. However, if application code passes untrusted input as the category, values containing traversal segments may resolve outside the configured message `basePath`.\n\nSuggested hardening:\n\n- Reject `..` path segments in categories.\n- Reject absolute path categories.\n- Reject stream-wrapper style categories.\n- Preserve documented category names that use `/` or `\\\\` as namespace/path separators.\n- Add regression tests for traversal attempts and for valid slash-separated categories.\n\nThis should be handled as public hardening rather than a private high-severity advisory.\n\nHarden `yii\\i18n\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | #20890 \r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `framework/` needed for: Harden PhpMessageSource category path handling","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/i18n/` needed for: Harden PhpMessageSource category path handling","scope_files":["framework/i18n/PhpMessageSource.php"]},{"subtask_id":"s3","goal":"Implement the changes under `tests/framework/i18n/` needed for: Harden PhpMessageSource category path handling","scope_files":["tests/framework/i18n/PhpMessageSourceTest.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/i18n/stubs/` needed for: Harden PhpMessageSource category path handling","scope_files":["tests/framework/i18n/stubs/ExposedPhpMessageSource.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `framework/` needed for: Harden PhpMessageSource category path handling\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/i18n/` needed for: Harden PhpMessageSource category path handling\",\n \"scope_files\": [\n \"framework/i18n/PhpMessageSource.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/` needed for: Harden PhpMessageSource category path handling\",\n \"scope_files\": [\n \"tests/framework/i18n/PhpMessageSourceTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/stubs/` needed for: Harden PhpMessageSource category path handling\",\n \"scope_files\": [\n \"tests/framework/i18n/stubs/ExposedPhpMessageSource.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 4bba8cbfa39..3a9a40dca30 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -16,6 +16,7 @@ Yii Framework 2 Change Log\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n+- Enh #20890: Harden `yii\\i18n\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s2","scope_files":["framework/i18n/PhpMessageSource.php"],"solution_diff":"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n\n","summary":"Edited 1 file(s) in framework/i18n/"},{"subtask_id":"s3","scope_files":["tests/framework/i18n/PhpMessageSourceTest.php"],"solution_diff":"diff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\nnew file mode 100644\nindex 00000000000..48895781039\n--- /dev/null\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\n@@ -0,0 +1,195 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\i18n;\n+\n+use Yii;\n+use yii\\base\\InvalidArgumentException;\n+use yiiunit\\framework\\i18n\\stubs\\ExposedPhpMessageSource;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * Unit tests for {@see \\yii\\i18n\\PhpMessageSource} category path-traversal hardening.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ * @group i18n\n+ */\n+final class PhpMessageSourceTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication();\n+ }\n+\n+ /**\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\n+ *\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\n+ */\n+ public function unsafeCategoryProvider(): array\n+ {\n+ return [\n+ 'absolute unix path' => ['/etc/passwd'],\n+ 'bare parent segment' => ['..'],\n+ 'embedded traversal segment' => ['app/../../config/db'],\n+ 'leading traversal segment' => ['../secret'],\n+ 'parent traversal' => ['../../etc/passwd'],\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\n+ 'trailing traversal segment' => ['app/..'],\n+ 'windows absolute path' => ['C:\\\\Windows\\\\system32'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function safeCategoryProvider(): array\n+ {\n+ return [\n+ 'backslash namespace' => ['modules\\\\users\\\\validation', 'modules/users/validation'],\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\n+ 'simple' => ['app', 'app'],\n+ 'slash namespace' => ['app/error', 'app/error'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides categories outside the traversal threat model that must remain accepted.\n+ *\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function benignCategoryProvider(): array\n+ {\n+ return [\n+ 'leading dot' => ['.messages', '.messages'],\n+ 'leading hyphen' => ['-foo', '-foo'],\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\n+ 'whitespace in name' => ['My Category', 'My Category'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\n+ *\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function inBoundsNonCanonicalCategoryProvider(): array\n+ {\n+ return [\n+ 'double slash' => ['app//error', 'app//error'],\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\n+ 'leading current-dir segment' => ['./config', './config'],\n+ ];\n+ }\n+\n+ /**\n+ * @dataProvider unsafeCategoryProvider\n+ */\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\n+ {\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\n+\n+ $this->expectException(InvalidArgumentException::class);\n+ $this->expectExceptionMessage('Invalid message category:');\n+\n+ $source->exposeMessageFilePath($category, 'en');\n+ }\n+\n+ /**\n+ * @dataProvider safeCategoryProvider\n+ */\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Namespace separators must be preserved under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider benignCategoryProvider\n+ */\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-traversal category must resolve under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\n+ */\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-canonical in-bounds category must be accepted.',\n+ );\n+ }\n+\n+ public function testReturnFileMapPathForMappedCategory(): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\n+ 'fileMap entry must bypass category validation.',\n+ );\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/i18n/"},{"subtask_id":"s4","scope_files":["tests/framework/i18n/stubs/ExposedPhpMessageSource.php"],"solution_diff":"diff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\nnew file mode 100644\nindex 00000000000..f97f4b495c8\n--- /dev/null\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\n@@ -0,0 +1,22 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\i18n\\stubs;\n+\n+use yii\\i18n\\PhpMessageSource;\n+\n+/**\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\n+ */\n+class ExposedPhpMessageSource extends PhpMessageSource\n+{\n+ public function exposeMessageFilePath($category, $language): string\n+ {\n+ return $this->getMessageFilePath($category, $language);\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/i18n/stubs/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 4bba8cbfa39..3a9a40dca30 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -16,6 +16,7 @@ Yii Framework 2 Change Log\\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\\n+- Enh #20890: Harden `yii\\\\i18n\\\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/i18n/PhpMessageSource.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\\nindex 8ef075e4744..fc1033c666e 100644\\n--- a/framework/i18n/PhpMessageSource.php\\n+++ b/framework/i18n/PhpMessageSource.php\\n@@ -11,6 +11,9 @@\\n use Yii;\\n use yii\\\\base\\\\InvalidArgumentException;\\n \\n+use function sprintf;\\n+use function str_replace;\\n+\\n /**\\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\\n *\\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\\n /**\\n * Returns message file path for the specified language and category.\\n *\\n+ * The category may use `/` or `\\\\` as namespace separators (for example, `app/error`). Categories that contain `..`\\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\\n+ * cannot escape [[basePath]].\\n+ *\\n * @param string $category the message category\\n * @param string $language the target language\\n * @return string path to message file\\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\\n */\\n protected function getMessageFilePath($category, $language)\\n {\\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\\n if (isset($this->fileMap[$category])) {\\n $messageFile .= $this->fileMap[$category];\\n } else {\\n- $messageFile .= str_replace('\\\\\\\\', '/', $category) . '.php';\\n+ $normalizedCategory = str_replace('\\\\\\\\', '/', (string) $category);\\n+\\n+ if (preg_match('~(?:^|/)\\\\.\\\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\\\-]*://~', $normalizedCategory)) {\\n+ throw new InvalidArgumentException(\\n+ sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n+ );\\n+ }\\n+\\n+ $messageFile .= \\\"{$normalizedCategory}.php\\\";\\n }\\n \\n return $messageFile;\\n\\n\",\n \"summary\": \"Edited 1 file(s) in framework/i18n/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"tests/framework/i18n/PhpMessageSourceTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\\nnew file mode 100644\\nindex 00000000000..48895781039\\n--- /dev/null\\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\\n@@ -0,0 +1,195 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\i18n;\\n+\\n+use Yii;\\n+use yii\\\\base\\\\InvalidArgumentException;\\n+use yiiunit\\\\framework\\\\i18n\\\\stubs\\\\ExposedPhpMessageSource;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * Unit tests for {@see \\\\yii\\\\i18n\\\\PhpMessageSource} category path-traversal hardening.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 2.0.56\\n+ * @group i18n\\n+ */\\n+final class PhpMessageSourceTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ $this->mockApplication();\\n+ }\\n+\\n+ /**\\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\\n+ *\\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\\n+ */\\n+ public function unsafeCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'absolute unix path' => ['/etc/passwd'],\\n+ 'bare parent segment' => ['..'],\\n+ 'embedded traversal segment' => ['app/../../config/db'],\\n+ 'leading traversal segment' => ['../secret'],\\n+ 'parent traversal' => ['../../etc/passwd'],\\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\\n+ 'trailing traversal segment' => ['app/..'],\\n+ 'windows absolute path' => ['C:\\\\\\\\Windows\\\\\\\\system32'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public function safeCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'backslash namespace' => ['modules\\\\\\\\users\\\\\\\\validation', 'modules/users/validation'],\\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\\n+ 'simple' => ['app', 'app'],\\n+ 'slash namespace' => ['app/error', 'app/error'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides categories outside the traversal threat model that must remain accepted.\\n+ *\\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public function benignCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'leading dot' => ['.messages', '.messages'],\\n+ 'leading hyphen' => ['-foo', '-foo'],\\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\\n+ 'whitespace in name' => ['My Category', 'My Category'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\\n+ *\\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\\n+ *\\n+ * @return array<string, array{string, string}> input category and resolved relative path.\\n+ */\\n+ public function inBoundsNonCanonicalCategoryProvider(): array\\n+ {\\n+ return [\\n+ 'double slash' => ['app//error', 'app//error'],\\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\\n+ 'leading current-dir segment' => ['./config', './config'],\\n+ ];\\n+ }\\n+\\n+ /**\\n+ * @dataProvider unsafeCategoryProvider\\n+ */\\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\\n+\\n+ $this->expectException(InvalidArgumentException::class);\\n+ $this->expectExceptionMessage('Invalid message category:');\\n+\\n+ $source->exposeMessageFilePath($category, 'en');\\n+ }\\n+\\n+ /**\\n+ * @dataProvider safeCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Namespace separators must be preserved under basePath.',\\n+ );\\n+ }\\n+\\n+ /**\\n+ * @dataProvider benignCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Non-traversal category must resolve under basePath.',\\n+ );\\n+ }\\n+\\n+ /**\\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\\n+ */\\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(string $category, string $expectedRelative): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath($category, 'en'),\\n+ 'Non-canonical in-bounds category must be accepted.',\\n+ );\\n+ }\\n+\\n+ public function testReturnFileMapPathForMappedCategory(): void\\n+ {\\n+ $source = new ExposedPhpMessageSource(\\n+ [\\n+ 'basePath' => '@yiiunit/data/i18n/messages',\\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\\n+ ],\\n+ );\\n+\\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\\n+\\n+ $this->assertSame(\\n+ $expected,\\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\\n+ 'fileMap entry must bypass category validation.',\\n+ );\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/i18n/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/i18n/stubs/ExposedPhpMessageSource.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\\nnew file mode 100644\\nindex 00000000000..f97f4b495c8\\n--- /dev/null\\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\\n@@ -0,0 +1,22 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\i18n\\\\stubs;\\n+\\n+use yii\\\\i18n\\\\PhpMessageSource;\\n+\\n+/**\\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\\n+ */\\n+class ExposedPhpMessageSource extends PhpMessageSource\\n+{\\n+ public function exposeMessageFilePath($category, $language): string\\n+ {\\n+ return $this->getMessageFilePath($category, $language);\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/i18n/stubs/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s2","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Don't overconstrain the first category segment.**\n\nThis regex now rejects safe relative categories whose first segment starts with `.` or `-` (for example, `.messages`), even though they still resolve under `basePath` and are outside the threat model described in this PR. That makes the hardening broader than advertised and introduces a BC break for existing category names. \n \n\n<details>\n<summary>๐ก Narrow the guard to actual unsafe path forms</summary>\n\n```diff\n- if (!preg_match('~^\\w(?:(?!\\/\\.{0,2}\\/)[\\w\\/\\-\\.])*$~', $normalizedCategory)) {\n+ if (\n+ $normalizedCategory === ''\n+ || $normalizedCategory[0] === '/'\n+ || preg_match('~^[A-Za-z]:/~', $normalizedCategory)\n+ || preg_match('~^[A-Za-z][A-Za-z0-9+.-]*://~', $normalizedCategory)\n+ || preg_match('~(?:^|/)(?:\\.{1,2})(?:/|$)~', $normalizedCategory)\n+ || strpos($normalizedCategory, '//') !== false\n+ ) {\n throw new InvalidArgumentException(\n sprintf('Invalid message category: \"%s\".', (string) $category),\n );\n }\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n if (\n $normalizedCategory === ''\n || $normalizedCategory[0] === '/'\n || preg_match('~^[A-Za-z]:/~', $normalizedCategory)\n || preg_match('~^[A-Za-z][A-Za-z0-9+.-]*://~', $normalizedCategory)\n || preg_match('~(?:^|/)(?:\\.{1,2})(?:/|$)~', $normalizedCategory)\n || strpos($normalizedCategory, '//') !== false\n ) {\n throw new InvalidArgumentException(\n sprintf('Invalid message category: \"%s\".', (string) $category),\n );\n }\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@framework/i18n/PhpMessageSource.php` around lines 155 - 158, The current\npreg_match in PhpMessageSource.php overrestricts normalizedCategory by\nforbidding first-segment leading dots or hyphens; change the validation so it\nonly rejects unsafe path forms (absolute paths starting with '/', any use of '.'\nor '..' as a segment, or path-traversal sequences like '../' or '/..') while\nallowing safe relative categories whose first segment begins with '.' or '-'.\nUpdate the preg_match on $normalizedCategory (the condition that throws\nInvalidArgumentException) to a pattern that disallows leading slashes and any\nsegment equal to '.' or '..' or containing traversal sequences, but permits\nsegments that start with '.' or '-' and otherwise consist of word, dot, hyphen\ncharacters.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:grasshopper -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 2c977e3","revised_diff":"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n"},{"subtask_id":"s2","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Narrow the drive-letter check to actual absolute Windows paths.**\n\n`^[A-Za-z]:` also rejects safe relative categories like `app:errors`, which still resolve under `basePath` and are not stream-wrapper inputs. That broadens the hardening beyond the PR contract and introduces a BC break.\n\n \n\n<details>\n<summary>๐ก Minimal fix</summary>\n\n```diff\n- if (preg_match('~^[A-Za-z]:|(?:^|/)\\.{0,2}(?:/|$)~', $normalizedCategory)) {\n+ if (preg_match('~^[A-Za-z]:/|(?:^|/)\\.{0,2}(?:/|$)~', $normalizedCategory)) {\n throw new InvalidArgumentException(\n sprintf('Invalid message category: \"%s\".', (string) $category),\n );\n }\n```\n\nAlso add a regression case for a leading-letter-colon category so this BC edge stays covered.\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n if (preg_match('~^[A-Za-z]:/|(?:^|/)\\.{0,2}(?:/|$)~', $normalizedCategory)) {\n throw new InvalidArgumentException(\n sprintf('Invalid message category: \"%s\".', (string) $category),\n );\n }\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@framework/i18n/PhpMessageSource.php` around lines 155 - 158, The current\nvalidation in PhpMessageSource (checking preg_match on $normalizedCategory)\nwrongly treats any leading-letter-colon like \"app:errors\" as an absolute Windows\npath; change the drive-letter check to match only true Windows absolute paths\n(e.g. require a slash or backslash after the colon, such as ^[A-Za-z]:[\\\\/]) so\ncategories like \"app:errors\" remain valid, and keep the rest of the path\ntraversal check intact; also add a regression test that asserts a\nleading-letter-colon category (e.g. \"a:foo\") is accepted to prevent this BC\nbreak.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:grasshopper -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 951d1be","revised_diff":"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n"}],"string":"[\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Don't overconstrain the first category segment.**\\n\\nThis regex now rejects safe relative categories whose first segment starts with `.` or `-` (for example, `.messages`), even though they still resolve under `basePath` and are outside the threat model described in this PR. That makes the hardening broader than advertised and introduces a BC break for existing category names. \\n \\n\\n<details>\\n<summary>๐ก Narrow the guard to actual unsafe path forms</summary>\\n\\n```diff\\n- if (!preg_match('~^\\\\w(?:(?!\\\\/\\\\.{0,2}\\\\/)[\\\\w\\\\/\\\\-\\\\.])*$~', $normalizedCategory)) {\\n+ if (\\n+ $normalizedCategory === ''\\n+ || $normalizedCategory[0] === '/'\\n+ || preg_match('~^[A-Za-z]:/~', $normalizedCategory)\\n+ || preg_match('~^[A-Za-z][A-Za-z0-9+.-]*://~', $normalizedCategory)\\n+ || preg_match('~(?:^|/)(?:\\\\.{1,2})(?:/|$)~', $normalizedCategory)\\n+ || strpos($normalizedCategory, '//') !== false\\n+ ) {\\n throw new InvalidArgumentException(\\n sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n );\\n }\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n if (\\n $normalizedCategory === ''\\n || $normalizedCategory[0] === '/'\\n || preg_match('~^[A-Za-z]:/~', $normalizedCategory)\\n || preg_match('~^[A-Za-z][A-Za-z0-9+.-]*://~', $normalizedCategory)\\n || preg_match('~(?:^|/)(?:\\\\.{1,2})(?:/|$)~', $normalizedCategory)\\n || strpos($normalizedCategory, '//') !== false\\n ) {\\n throw new InvalidArgumentException(\\n sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n );\\n }\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@framework/i18n/PhpMessageSource.php` around lines 155 - 158, The current\\npreg_match in PhpMessageSource.php overrestricts normalizedCategory by\\nforbidding first-segment leading dots or hyphens; change the validation so it\\nonly rejects unsafe path forms (absolute paths starting with '/', any use of '.'\\nor '..' as a segment, or path-traversal sequences like '../' or '/..') while\\nallowing safe relative categories whose first segment begins with '.' or '-'.\\nUpdate the preg_match on $normalizedCategory (the condition that throws\\nInvalidArgumentException) to a pattern that disallows leading slashes and any\\nsegment equal to '.' or '..' or containing traversal sequences, but permits\\nsegments that start with '.' or '-' and otherwise consist of word, dot, hyphen\\ncharacters.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:grasshopper -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 2c977e3\",\n \"revised_diff\": \"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\\nindex 8ef075e4744..fc1033c666e 100644\\n--- a/framework/i18n/PhpMessageSource.php\\n+++ b/framework/i18n/PhpMessageSource.php\\n@@ -11,6 +11,9 @@\\n use Yii;\\n use yii\\\\base\\\\InvalidArgumentException;\\n \\n+use function sprintf;\\n+use function str_replace;\\n+\\n /**\\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\\n *\\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\\n /**\\n * Returns message file path for the specified language and category.\\n *\\n+ * The category may use `/` or `\\\\` as namespace separators (for example, `app/error`). Categories that contain `..`\\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\\n+ * cannot escape [[basePath]].\\n+ *\\n * @param string $category the message category\\n * @param string $language the target language\\n * @return string path to message file\\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\\n */\\n protected function getMessageFilePath($category, $language)\\n {\\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\\n if (isset($this->fileMap[$category])) {\\n $messageFile .= $this->fileMap[$category];\\n } else {\\n- $messageFile .= str_replace('\\\\\\\\', '/', $category) . '.php';\\n+ $normalizedCategory = str_replace('\\\\\\\\', '/', (string) $category);\\n+\\n+ if (preg_match('~(?:^|/)\\\\.\\\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\\\-]*://~', $normalizedCategory)) {\\n+ throw new InvalidArgumentException(\\n+ sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n+ );\\n+ }\\n+\\n+ $messageFile .= \\\"{$normalizedCategory}.php\\\";\\n }\\n \\n return $messageFile;\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Narrow the drive-letter check to actual absolute Windows paths.**\\n\\n`^[A-Za-z]:` also rejects safe relative categories like `app:errors`, which still resolve under `basePath` and are not stream-wrapper inputs. That broadens the hardening beyond the PR contract and introduces a BC break.\\n\\n \\n\\n<details>\\n<summary>๐ก Minimal fix</summary>\\n\\n```diff\\n- if (preg_match('~^[A-Za-z]:|(?:^|/)\\\\.{0,2}(?:/|$)~', $normalizedCategory)) {\\n+ if (preg_match('~^[A-Za-z]:/|(?:^|/)\\\\.{0,2}(?:/|$)~', $normalizedCategory)) {\\n throw new InvalidArgumentException(\\n sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n );\\n }\\n```\\n\\nAlso add a regression case for a leading-letter-colon category so this BC edge stays covered.\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n if (preg_match('~^[A-Za-z]:/|(?:^|/)\\\\.{0,2}(?:/|$)~', $normalizedCategory)) {\\n throw new InvalidArgumentException(\\n sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n );\\n }\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@framework/i18n/PhpMessageSource.php` around lines 155 - 158, The current\\nvalidation in PhpMessageSource (checking preg_match on $normalizedCategory)\\nwrongly treats any leading-letter-colon like \\\"app:errors\\\" as an absolute Windows\\npath; change the drive-letter check to match only true Windows absolute paths\\n(e.g. require a slash or backslash after the colon, such as ^[A-Za-z]:[\\\\\\\\/]) so\\ncategories like \\\"app:errors\\\" remain valid, and keep the rest of the path\\ntraversal check intact; also add a regression test that asserts a\\nleading-letter-colon category (e.g. \\\"a:foo\\\") is accepted to prevent this BC\\nbreak.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:grasshopper -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 951d1be\",\n \"revised_diff\": \"diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\\nindex 8ef075e4744..fc1033c666e 100644\\n--- a/framework/i18n/PhpMessageSource.php\\n+++ b/framework/i18n/PhpMessageSource.php\\n@@ -11,6 +11,9 @@\\n use Yii;\\n use yii\\\\base\\\\InvalidArgumentException;\\n \\n+use function sprintf;\\n+use function str_replace;\\n+\\n /**\\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\\n *\\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\\n /**\\n * Returns message file path for the specified language and category.\\n *\\n+ * The category may use `/` or `\\\\` as namespace separators (for example, `app/error`). Categories that contain `..`\\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\\n+ * cannot escape [[basePath]].\\n+ *\\n * @param string $category the message category\\n * @param string $language the target language\\n * @return string path to message file\\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\\n */\\n protected function getMessageFilePath($category, $language)\\n {\\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\\n if (isset($this->fileMap[$category])) {\\n $messageFile .= $this->fileMap[$category];\\n } else {\\n- $messageFile .= str_replace('\\\\\\\\', '/', $category) . '.php';\\n+ $normalizedCategory = str_replace('\\\\\\\\', '/', (string) $category);\\n+\\n+ if (preg_match('~(?:^|/)\\\\.\\\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\\\-]*://~', $normalizedCategory)) {\\n+ throw new InvalidArgumentException(\\n+ sprintf('Invalid message category: \\\"%s\\\".', (string) $category),\\n+ );\\n+ }\\n+\\n+ $messageFile .= \\\"{$normalizedCategory}.php\\\";\\n }\\n \\n return $messageFile;\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 4bba8cbfa39..3a9a40dca30 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -16,6 +16,7 @@ Yii Framework 2 Change Log\n - Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n - Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n - Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n+- Enh #20890: Harden `yii\\i18n\\PhpMessageSource` category path handling to reject `..` segments, absolute paths, and stream-wrapper categories (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php\nindex 8ef075e4744..fc1033c666e 100644\n--- a/framework/i18n/PhpMessageSource.php\n+++ b/framework/i18n/PhpMessageSource.php\n@@ -11,6 +11,9 @@\n use Yii;\n use yii\\base\\InvalidArgumentException;\n \n+use function sprintf;\n+use function str_replace;\n+\n /**\n * PhpMessageSource represents a message source that stores translated messages in PHP scripts.\n *\n@@ -128,9 +131,14 @@ protected function loadFallbackMessages($category, $fallbackLanguage, $messages,\n /**\n * Returns message file path for the specified language and category.\n *\n+ * The category may use `/` or `\\` as namespace separators (for example, `app/error`). Categories that contain `..`\n+ * segments, an absolute path, or a stream-wrapper scheme (such as `php://`) are rejected so the resolved path\n+ * cannot escape [[basePath]].\n+ *\n * @param string $category the message category\n * @param string $language the target language\n * @return string path to message file\n+ * @throws InvalidArgumentException if the language code is invalid, or the category resolves to an unsafe path.\n */\n protected function getMessageFilePath($category, $language)\n {\n@@ -142,7 +150,15 @@ protected function getMessageFilePath($category, $language)\n if (isset($this->fileMap[$category])) {\n $messageFile .= $this->fileMap[$category];\n } else {\n- $messageFile .= str_replace('\\\\', '/', $category) . '.php';\n+ $normalizedCategory = str_replace('\\\\', '/', (string) $category);\n+\n+ if (preg_match('~(?:^|/)\\.\\.(?:/|$)|^/|^[A-Za-z]:/|^[A-Za-z][A-Za-z0-9+.\\-]*://~', $normalizedCategory)) {\n+ throw new InvalidArgumentException(\n+ sprintf('Invalid message category: \"%s\".', (string) $category),\n+ );\n+ }\n+\n+ $messageFile .= \"{$normalizedCategory}.php\";\n }\n \n return $messageFile;\n\ndiff --git a/tests/framework/i18n/PhpMessageSourceTest.php b/tests/framework/i18n/PhpMessageSourceTest.php\nnew file mode 100644\nindex 00000000000..48895781039\n--- /dev/null\n+++ b/tests/framework/i18n/PhpMessageSourceTest.php\n@@ -0,0 +1,195 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\i18n;\n+\n+use Yii;\n+use yii\\base\\InvalidArgumentException;\n+use yiiunit\\framework\\i18n\\stubs\\ExposedPhpMessageSource;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * Unit tests for {@see \\yii\\i18n\\PhpMessageSource} category path-traversal hardening.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ * @group i18n\n+ */\n+final class PhpMessageSourceTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication();\n+ }\n+\n+ /**\n+ * Provides categories that resolve outside [[PhpMessageSource::basePath]] and must be rejected.\n+ *\n+ * @return array<string, array{string}> traversal, absolute, and stream-wrapper category inputs.\n+ */\n+ public function unsafeCategoryProvider(): array\n+ {\n+ return [\n+ 'absolute unix path' => ['/etc/passwd'],\n+ 'bare parent segment' => ['..'],\n+ 'embedded traversal segment' => ['app/../../config/db'],\n+ 'leading traversal segment' => ['../secret'],\n+ 'parent traversal' => ['../../etc/passwd'],\n+ 'phar stream wrapper' => ['phar://archive.phar/config'],\n+ 'php stream wrapper' => ['php://filter/resource=config/db'],\n+ 'trailing traversal segment' => ['app/..'],\n+ 'windows absolute path' => ['C:\\\\Windows\\\\system32'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides valid categories paired with their expected `basePath`-relative file name.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function safeCategoryProvider(): array\n+ {\n+ return [\n+ 'backslash namespace' => ['modules\\\\users\\\\validation', 'modules/users/validation'],\n+ 'dashes and dots' => ['app-name/sub.module', 'app-name/sub.module'],\n+ 'simple' => ['app', 'app'],\n+ 'slash namespace' => ['app/error', 'app/error'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides categories outside the traversal threat model that must remain accepted.\n+ *\n+ * Leading `.`/`-`, a `letter:` prefix, non-ASCII names, and spaces resolve under `basePath` and predate the\n+ * hardening; rejecting them would be a backward-compatibility break wider than the documented threat model.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function benignCategoryProvider(): array\n+ {\n+ return [\n+ 'leading dot' => ['.messages', '.messages'],\n+ 'leading hyphen' => ['-foo', '-foo'],\n+ 'letter colon prefix' => ['a:foo', 'a:foo'],\n+ 'non-ascii accented' => ['cafรฉ', 'cafรฉ'],\n+ 'non-ascii cyrillic' => ['ะผะพะดัะปั', 'ะผะพะดัะปั'],\n+ 'whitespace in name' => ['My Category', 'My Category'],\n+ ];\n+ }\n+\n+ /**\n+ * Provides non-canonical but in-bounds categories that must remain accepted.\n+ *\n+ * Current-directory (`.`) segments and duplicate separators (`//`) still resolve under `basePath`; the documented\n+ * threat model only covers `..`, absolute paths, and stream wrappers, so rejecting them would break compatibility.\n+ *\n+ * @return array<string, array{string, string}> input category and resolved relative path.\n+ */\n+ public function inBoundsNonCanonicalCategoryProvider(): array\n+ {\n+ return [\n+ 'double slash' => ['app//error', 'app//error'],\n+ 'embedded current-dir segment' => ['app/./db', 'app/./db'],\n+ 'leading current-dir segment' => ['./config', './config'],\n+ ];\n+ }\n+\n+ /**\n+ * @dataProvider unsafeCategoryProvider\n+ */\n+ public function testThrowInvalidArgumentExceptionForUnsafeCategory(string $category): void\n+ {\n+ $source = new ExposedPhpMessageSource(['basePath' => '@yiiunit/data/i18n/messages']);\n+\n+ $this->expectException(InvalidArgumentException::class);\n+ $this->expectExceptionMessage('Invalid message category:');\n+\n+ $source->exposeMessageFilePath($category, 'en');\n+ }\n+\n+ /**\n+ * @dataProvider safeCategoryProvider\n+ */\n+ public function testReturnExpectedPathForSafeCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Namespace separators must be preserved under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider benignCategoryProvider\n+ */\n+ public function testReturnExpectedPathForBenignCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-traversal category must resolve under basePath.',\n+ );\n+ }\n+\n+ /**\n+ * @dataProvider inBoundsNonCanonicalCategoryProvider\n+ */\n+ public function testReturnExpectedPathForInBoundsNonCanonicalCategory(string $category, string $expectedRelative): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/' . $expectedRelative . '.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath($category, 'en'),\n+ 'Non-canonical in-bounds category must be accepted.',\n+ );\n+ }\n+\n+ public function testReturnFileMapPathForMappedCategory(): void\n+ {\n+ $source = new ExposedPhpMessageSource(\n+ [\n+ 'basePath' => '@yiiunit/data/i18n/messages',\n+ 'fileMap' => ['weird/../category' => 'safe.php'],\n+ ],\n+ );\n+\n+ $expected = Yii::getAlias('@yiiunit/data/i18n/messages') . '/en/safe.php';\n+\n+ $this->assertSame(\n+ $expected,\n+ $source->exposeMessageFilePath('weird/../category', 'en'),\n+ 'fileMap entry must bypass category validation.',\n+ );\n+ }\n+}\ndiff --git a/tests/framework/i18n/stubs/ExposedPhpMessageSource.php b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\nnew file mode 100644\nindex 00000000000..f97f4b495c8\n--- /dev/null\n+++ b/tests/framework/i18n/stubs/ExposedPhpMessageSource.php\n@@ -0,0 +1,22 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\i18n\\stubs;\n+\n+use yii\\i18n\\PhpMessageSource;\n+\n+/**\n+ * Test double exposing the protected {@see PhpMessageSource::getMessageFilePath()} for direct assertions.\n+ */\n+class ExposedPhpMessageSource extends PhpMessageSource\n+{\n+ public function exposeMessageFilePath($category, $language): string\n+ {\n+ return $this->getMessageFilePath($category, $language);\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":4,"string":"4"}}},{"rowIdx":34255,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20911"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20911,"string":"20,911"},"base_sha":{"kind":"string","value":"540c7de68aad91907481f8cb34ba97ae91aec973"},"head_sha":{"kind":"string","value":"2ebf83509323de04076ddf5d9ca9552741595a93"},"task":{"kind":"string","value":"Fix release changelog version detection\n\n## Summary\n- keep the release command's selected version authoritative\n- update the active CHANGELOG `under development` section to the selected version before sorting\n- normalize invalid `Fix #...` changelog entries to canonical `Bug #...` before sorting\n- fail loudly when no matching changelog section exists after the header adjustment attempt\n\n## Tests\n- `vendor/bin/phpunit --filter ReleaseControllerTest tests/framework/ReleaseControllerTest.php`"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `build/controllers/` needed for: Fix release changelog version detection","scope_files":["build/controllers/ReleaseController.php"]},{"subtask_id":"s2","goal":"Implement the changes under `tests/framework/` needed for: Fix release changelog version detection","scope_files":["tests/framework/ReleaseControllerTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Fix release changelog version detection\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `tests/framework/` needed for: Fix release changelog version detection\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["build/controllers/ReleaseController.php"],"solution_diff":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex b5f53881186..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n\n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s2","scope_files":["tests/framework/ReleaseControllerTest.php"],"solution_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nindex 4197ecd16d5..a11769c4182 100644\n--- a/tests/framework/ReleaseControllerTest.php\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -11,21 +11,33 @@\n namespace yiiunit\\framework;\n \n use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n use yiiunit\\TestCase;\n \n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n-\n /**\n * ReleaseControllerTest.\n * @group base\n */\n class ReleaseControllerTest extends TestCase\n {\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n {\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n- $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n $method->setAccessible(true);\n \n $this->assertSame(\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n ])\n );\n }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n }\n","summary":"Edited 1 file(s) in tests/framework/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\\nindex b5f53881186..e7c36cf436a 100644\\n--- a/build/controllers/ReleaseController.php\\n+++ b/build/controllers/ReleaseController.php\\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\\n protected function resortChangelogs($what, $version)\\n {\\n foreach ($this->getChangelogs($what) as $file) {\\n+ $this->updateChangelogDevelopmentVersion($file, $version);\\n // split the file into relevant parts\\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\\n $changelog = $this->resortChangelog($changelog);\\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\\n }\\n }\\n \\n+ protected function updateChangelogDevelopmentVersion($file, $version)\\n+ {\\n+ $contents = file_get_contents($file);\\n+ $headline = $version . ' under development';\\n+ $updatedContents = preg_replace(\\n+ '/^([^\\\\s]+) under development\\\\R-+\\\\R/m',\\n+ $headline . \\\"\\\\n\\\" . str_repeat('-', \\\\strlen($headline)) . \\\"\\\\n\\\",\\n+ $contents,\\n+ 1\\n+ );\\n+\\n+ if ($updatedContents !== $contents) {\\n+ file_put_contents($file, $updatedContents);\\n+ }\\n+ }\\n+\\n /**\\n * Extract changelog content for a specific version.\\n * @param string $file\\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\\n $end = [];\\n \\n $state = 'start';\\n+ $found = false;\\n foreach ($lines as $l => $line) {\\n // starting from the changelogs headline\\n if (\\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\\n ) {\\n $state = 'changelog';\\n+ $found = true;\\n }\\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\\n $state = 'end';\\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\\n }\\n }\\n \\n+ if (!$found) {\\n+ throw new Exception(\\\"Changelog section for version $version was not found in $file.\\\");\\n+ }\\n+\\n return [$start, $changelog, $end];\\n }\\n \\n+ protected function matchesChangelogVersion($line, $version)\\n+ {\\n+ $v = str_replace('\\\\\\\\-', '[\\\\\\\\- ]', preg_quote($version, '/'));\\n+ return preg_match('/^' . $v . '(?:\\\\s|$)/', $line) === 1;\\n+ }\\n+\\n /**\\n * Ensure sorting of the changelog lines.\\n * @param string[] $changelog\\n\\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nindex 4197ecd16d5..a11769c4182 100644\\n--- a/tests/framework/ReleaseControllerTest.php\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -11,21 +11,33 @@\\n namespace yiiunit\\\\framework;\\n \\n use ReflectionClass;\\n+use ReflectionMethod;\\n+use yii\\\\base\\\\Exception;\\n use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yii\\\\helpers\\\\FileHelper;\\n use yiiunit\\\\TestCase;\\n \\n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\\n-\\n /**\\n * ReleaseControllerTest.\\n * @group base\\n */\\n class ReleaseControllerTest extends TestCase\\n {\\n+ private array $tempPaths = [];\\n+\\n+ protected function tearDown(): void\\n+ {\\n+ foreach ($this->tempPaths as $path) {\\n+ FileHelper::removeDirectory($path);\\n+ }\\n+ $this->tempPaths = [];\\n+ parent::tearDown();\\n+ }\\n+\\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n {\\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n- $method = new \\\\ReflectionMethod($controller, 'resortChangelog');\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\\n $method->setAccessible(true);\\n \\n $this->assertSame(\\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n ])\\n );\\n }\\n+\\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"4.0.0 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\"\\n+ . \\\"- Fix #1: Test fix (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+\\n+ $this->assertSame(\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.9 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test fix (samdark)\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\\n\\\",\\n+ file_get_contents($file)\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ $contents = \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.8 November 24, 2025\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\";\\n+ file_put_contents($file, $contents);\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+\\n+ try {\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+ $this->fail('Expected missing changelog version exception.');\\n+ } catch (Exception $e) {\\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\\n+ }\\n+\\n+ $this->assertSame($contents, file_get_contents($file));\\n+ }\\n+\\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath, 0777, true);\\n+ $file = $basePath . '/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 Change Log\\\\n\\\"\\n+ . \\\"==========================\\\\n\\\\n\\\"\\n+ . \\\"2.0.50 May 09, 2026\\\\n\\\"\\n+ . \\\"-------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->expectException(Exception::class);\\n+ $this->expectExceptionMessage('2.0.5');\\n+\\n+ $method->invoke($controller, $file, '2.0.5');\\n+ }\\n+\\n+ private function createController(): ReleaseController\\n+ {\\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ }\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Use exact version-boundary matching when locating the changelog section.**\n\n`splitChangelog()` still uses substring matching for headings. A requested version like `2.0.5` can incorrectly match `2.0.50 ...`, mark the section as found, and sort the wrong block instead of failing.\n\n\n\n\n<details>\n<summary>Proposed fix</summary>\n\n```diff\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && preg_match('/^' . preg_quote($version, '/') . '(?:\\s|$)/', $lines[$l - 2]) === 1 &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n $found = true;\n }\n```\n</details>\n\n\nAlso applies to: 905-907\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@build/controllers/ReleaseController.php` around lines 880 - 889,\nsplitChangelog() currently uses substring matching (strpos) against $version\nwhen scanning $lines (loop variables $l, $line), which can misidentify e.g.\n\"2.0.50\" as \"2.0.5\"; change the check to an exact/version-boundary matchโuse\npreg_match with preg_quote($version) and word or boundary anchors (e.g.\n/\\bVERSION\\b/ or start/end anchors appropriate to the changelog heading) instead\nof strpos, and update the same matching logic used around the later block\nreferenced (the checks at the other occurrence near lines 905-907) so both\nplaces perform strict version-boundary matching.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:medusa:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit fa74f92","revised_diff":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex b5f53881186..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n"},{"subtask_id":"s2","comment":"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Clean up the temporary directories created by these tests.**\n\nBoth `testGetReleaseVersionsUsesChangelogDevelopmentVersion` (Lines 60-69) and `testResortChangelogsFailsWhenVersionSectionIsMissing` (Lines 84-92) create directories and files under `sys_get_temp_dir()` that are never removed, leaving artifacts behind on every run. Track the base paths and remove them in `tearDown()`.\n\n\n<details>\n<summary>๐งน Proposed cleanup approach</summary>\n\n```php\nuse yii\\helpers\\FileHelper;\n\nprivate array $tempPaths = [];\n\nprotected function tearDown(): void\n{\n foreach ($this->tempPaths as $path) {\n FileHelper::removeDirectory($path);\n }\n $this->tempPaths = [];\n parent::tearDown();\n}\n```\n\nThen register each created `$basePath`:\n\n```diff\n $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n mkdir($basePath . '/extensions/apidoc', 0777, true);\n```\n</details>\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[error] 73-73: Missing class import via use statement (line '73', column '23'). (undefined)\n\n(MissingImport)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/ReleaseControllerTest.php` around lines 58 - 80, The tests\ncreate temp dirs that are never removed; add a private array property (e.g.,\nprivate array $tempPaths = [];), push each created $basePath from\ntestGetReleaseVersionsUsesChangelogDevelopmentVersion and\ntestResortChangelogsFailsWhenVersionSectionIsMissing into that array, and\nimplement tearDown(): void that iterates $tempPaths and calls\nyii\\helpers\\FileHelper::removeDirectory($path) for each, clears the array, then\ncalls parent::tearDown(); to ensure temporary directories are cleaned up after\ntests.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:capybara -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 88118a3","revised_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nindex 4197ecd16d5..a11769c4182 100644\n--- a/tests/framework/ReleaseControllerTest.php\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -11,21 +11,33 @@\n namespace yiiunit\\framework;\n \n use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n use yiiunit\\TestCase;\n \n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n-\n /**\n * ReleaseControllerTest.\n * @group base\n */\n class ReleaseControllerTest extends TestCase\n {\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n {\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n- $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n $method->setAccessible(true);\n \n $this->assertSame(\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n ])\n );\n }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n }\n"},{"subtask_id":"s1","comment":"`splitChangelog()` detects the version section via `strpos(..., $version)`, which can match the wrong section when one version is a prefix of another (e.g. `2.0.1` also matches `2.0.10`). This can cause the controller to sort/modify the wrong changelog section.","revised_diff":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex b5f53881186..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n"},{"subtask_id":"s2","comment":"This test creates a unique temp directory under `sys_get_temp_dir()` but never removes it, which can leave clutter behind across repeated local/CI runs. Other tests in the suite typically clean up temporary directories via `FileHelper::removeDirectory()`.","revised_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nindex 4197ecd16d5..a11769c4182 100644\n--- a/tests/framework/ReleaseControllerTest.php\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -11,21 +11,33 @@\n namespace yiiunit\\framework;\n \n use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n use yiiunit\\TestCase;\n \n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n-\n /**\n * ReleaseControllerTest.\n * @group base\n */\n class ReleaseControllerTest extends TestCase\n {\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n {\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n- $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n $method->setAccessible(true);\n \n $this->assertSame(\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n ])\n );\n }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n }\n"},{"subtask_id":"s2","comment":"This test creates a unique temp directory under `sys_get_temp_dir()` but never removes it. Cleaning up the directory helps avoid leaving stray `yii-release-controller-test-*` folders on developer machines and CI runners.","revised_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nindex 4197ecd16d5..a11769c4182 100644\n--- a/tests/framework/ReleaseControllerTest.php\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -11,21 +11,33 @@\n namespace yiiunit\\framework;\n \n use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n use yiiunit\\TestCase;\n \n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n-\n /**\n * ReleaseControllerTest.\n * @group base\n */\n class ReleaseControllerTest extends TestCase\n {\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n {\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n- $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n $method->setAccessible(true);\n \n $this->assertSame(\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n ])\n );\n }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n }\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Use exact version-boundary matching when locating the changelog section.**\\n\\n`splitChangelog()` still uses substring matching for headings. A requested version like `2.0.5` can incorrectly match `2.0.50 ...`, mark the section as found, and sort the wrong block instead of failing.\\n\\n\\n\\n\\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n if (\\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\\n+ isset($lines[$l - 2]) && preg_match('/^' . preg_quote($version, '/') . '(?:\\\\s|$)/', $lines[$l - 2]) === 1 &&\\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\\n ) {\\n $state = 'changelog';\\n $found = true;\\n }\\n```\\n</details>\\n\\n\\nAlso applies to: 905-907\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@build/controllers/ReleaseController.php` around lines 880 - 889,\\nsplitChangelog() currently uses substring matching (strpos) against $version\\nwhen scanning $lines (loop variables $l, $line), which can misidentify e.g.\\n\\\"2.0.50\\\" as \\\"2.0.5\\\"; change the check to an exact/version-boundary matchโuse\\npreg_match with preg_quote($version) and word or boundary anchors (e.g.\\n/\\\\bVERSION\\\\b/ or start/end anchors appropriate to the changelog heading) instead\\nof strpos, and update the same matching logic used around the later block\\nreferenced (the checks at the other occurrence near lines 905-907) so both\\nplaces perform strict version-boundary matching.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:medusa:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit fa74f92\",\n \"revised_diff\": \"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\\nindex b5f53881186..e7c36cf436a 100644\\n--- a/build/controllers/ReleaseController.php\\n+++ b/build/controllers/ReleaseController.php\\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\\n protected function resortChangelogs($what, $version)\\n {\\n foreach ($this->getChangelogs($what) as $file) {\\n+ $this->updateChangelogDevelopmentVersion($file, $version);\\n // split the file into relevant parts\\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\\n $changelog = $this->resortChangelog($changelog);\\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\\n }\\n }\\n \\n+ protected function updateChangelogDevelopmentVersion($file, $version)\\n+ {\\n+ $contents = file_get_contents($file);\\n+ $headline = $version . ' under development';\\n+ $updatedContents = preg_replace(\\n+ '/^([^\\\\s]+) under development\\\\R-+\\\\R/m',\\n+ $headline . \\\"\\\\n\\\" . str_repeat('-', \\\\strlen($headline)) . \\\"\\\\n\\\",\\n+ $contents,\\n+ 1\\n+ );\\n+\\n+ if ($updatedContents !== $contents) {\\n+ file_put_contents($file, $updatedContents);\\n+ }\\n+ }\\n+\\n /**\\n * Extract changelog content for a specific version.\\n * @param string $file\\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\\n $end = [];\\n \\n $state = 'start';\\n+ $found = false;\\n foreach ($lines as $l => $line) {\\n // starting from the changelogs headline\\n if (\\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\\n ) {\\n $state = 'changelog';\\n+ $found = true;\\n }\\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\\n $state = 'end';\\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\\n }\\n }\\n \\n+ if (!$found) {\\n+ throw new Exception(\\\"Changelog section for version $version was not found in $file.\\\");\\n+ }\\n+\\n return [$start, $changelog, $end];\\n }\\n \\n+ protected function matchesChangelogVersion($line, $version)\\n+ {\\n+ $v = str_replace('\\\\\\\\-', '[\\\\\\\\- ]', preg_quote($version, '/'));\\n+ return preg_match('/^' . $v . '(?:\\\\s|$)/', $line) === 1;\\n+ }\\n+\\n /**\\n * Ensure sorting of the changelog lines.\\n * @param string[] $changelog\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\\n\\n**Clean up the temporary directories created by these tests.**\\n\\nBoth `testGetReleaseVersionsUsesChangelogDevelopmentVersion` (Lines 60-69) and `testResortChangelogsFailsWhenVersionSectionIsMissing` (Lines 84-92) create directories and files under `sys_get_temp_dir()` that are never removed, leaving artifacts behind on every run. Track the base paths and remove them in `tearDown()`.\\n\\n\\n<details>\\n<summary>๐งน Proposed cleanup approach</summary>\\n\\n```php\\nuse yii\\\\helpers\\\\FileHelper;\\n\\nprivate array $tempPaths = [];\\n\\nprotected function tearDown(): void\\n{\\n foreach ($this->tempPaths as $path) {\\n FileHelper::removeDirectory($path);\\n }\\n $this->tempPaths = [];\\n parent::tearDown();\\n}\\n```\\n\\nThen register each created `$basePath`:\\n\\n```diff\\n $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n mkdir($basePath . '/extensions/apidoc', 0777, true);\\n```\\n</details>\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[error] 73-73: Missing class import via use statement (line '73', column '23'). (undefined)\\n\\n(MissingImport)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/ReleaseControllerTest.php` around lines 58 - 80, The tests\\ncreate temp dirs that are never removed; add a private array property (e.g.,\\nprivate array $tempPaths = [];), push each created $basePath from\\ntestGetReleaseVersionsUsesChangelogDevelopmentVersion and\\ntestResortChangelogsFailsWhenVersionSectionIsMissing into that array, and\\nimplement tearDown(): void that iterates $tempPaths and calls\\nyii\\\\helpers\\\\FileHelper::removeDirectory($path) for each, clears the array, then\\ncalls parent::tearDown(); to ensure temporary directories are cleaned up after\\ntests.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:capybara -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 88118a3\",\n \"revised_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nindex 4197ecd16d5..a11769c4182 100644\\n--- a/tests/framework/ReleaseControllerTest.php\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -11,21 +11,33 @@\\n namespace yiiunit\\\\framework;\\n \\n use ReflectionClass;\\n+use ReflectionMethod;\\n+use yii\\\\base\\\\Exception;\\n use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yii\\\\helpers\\\\FileHelper;\\n use yiiunit\\\\TestCase;\\n \\n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\\n-\\n /**\\n * ReleaseControllerTest.\\n * @group base\\n */\\n class ReleaseControllerTest extends TestCase\\n {\\n+ private array $tempPaths = [];\\n+\\n+ protected function tearDown(): void\\n+ {\\n+ foreach ($this->tempPaths as $path) {\\n+ FileHelper::removeDirectory($path);\\n+ }\\n+ $this->tempPaths = [];\\n+ parent::tearDown();\\n+ }\\n+\\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n {\\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n- $method = new \\\\ReflectionMethod($controller, 'resortChangelog');\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\\n $method->setAccessible(true);\\n \\n $this->assertSame(\\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n ])\\n );\\n }\\n+\\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"4.0.0 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\"\\n+ . \\\"- Fix #1: Test fix (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+\\n+ $this->assertSame(\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.9 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test fix (samdark)\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\\n\\\",\\n+ file_get_contents($file)\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ $contents = \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.8 November 24, 2025\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\";\\n+ file_put_contents($file, $contents);\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+\\n+ try {\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+ $this->fail('Expected missing changelog version exception.');\\n+ } catch (Exception $e) {\\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\\n+ }\\n+\\n+ $this->assertSame($contents, file_get_contents($file));\\n+ }\\n+\\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath, 0777, true);\\n+ $file = $basePath . '/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 Change Log\\\\n\\\"\\n+ . \\\"==========================\\\\n\\\\n\\\"\\n+ . \\\"2.0.50 May 09, 2026\\\\n\\\"\\n+ . \\\"-------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->expectException(Exception::class);\\n+ $this->expectExceptionMessage('2.0.5');\\n+\\n+ $method->invoke($controller, $file, '2.0.5');\\n+ }\\n+\\n+ private function createController(): ReleaseController\\n+ {\\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"`splitChangelog()` detects the version section via `strpos(..., $version)`, which can match the wrong section when one version is a prefix of another (e.g. `2.0.1` also matches `2.0.10`). This can cause the controller to sort/modify the wrong changelog section.\",\n \"revised_diff\": \"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\\nindex b5f53881186..e7c36cf436a 100644\\n--- a/build/controllers/ReleaseController.php\\n+++ b/build/controllers/ReleaseController.php\\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\\n protected function resortChangelogs($what, $version)\\n {\\n foreach ($this->getChangelogs($what) as $file) {\\n+ $this->updateChangelogDevelopmentVersion($file, $version);\\n // split the file into relevant parts\\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\\n $changelog = $this->resortChangelog($changelog);\\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\\n }\\n }\\n \\n+ protected function updateChangelogDevelopmentVersion($file, $version)\\n+ {\\n+ $contents = file_get_contents($file);\\n+ $headline = $version . ' under development';\\n+ $updatedContents = preg_replace(\\n+ '/^([^\\\\s]+) under development\\\\R-+\\\\R/m',\\n+ $headline . \\\"\\\\n\\\" . str_repeat('-', \\\\strlen($headline)) . \\\"\\\\n\\\",\\n+ $contents,\\n+ 1\\n+ );\\n+\\n+ if ($updatedContents !== $contents) {\\n+ file_put_contents($file, $updatedContents);\\n+ }\\n+ }\\n+\\n /**\\n * Extract changelog content for a specific version.\\n * @param string $file\\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\\n $end = [];\\n \\n $state = 'start';\\n+ $found = false;\\n foreach ($lines as $l => $line) {\\n // starting from the changelogs headline\\n if (\\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\\n ) {\\n $state = 'changelog';\\n+ $found = true;\\n }\\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\\n $state = 'end';\\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\\n }\\n }\\n \\n+ if (!$found) {\\n+ throw new Exception(\\\"Changelog section for version $version was not found in $file.\\\");\\n+ }\\n+\\n return [$start, $changelog, $end];\\n }\\n \\n+ protected function matchesChangelogVersion($line, $version)\\n+ {\\n+ $v = str_replace('\\\\\\\\-', '[\\\\\\\\- ]', preg_quote($version, '/'));\\n+ return preg_match('/^' . $v . '(?:\\\\s|$)/', $line) === 1;\\n+ }\\n+\\n /**\\n * Ensure sorting of the changelog lines.\\n * @param string[] $changelog\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"This test creates a unique temp directory under `sys_get_temp_dir()` but never removes it, which can leave clutter behind across repeated local/CI runs. Other tests in the suite typically clean up temporary directories via `FileHelper::removeDirectory()`.\",\n \"revised_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nindex 4197ecd16d5..a11769c4182 100644\\n--- a/tests/framework/ReleaseControllerTest.php\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -11,21 +11,33 @@\\n namespace yiiunit\\\\framework;\\n \\n use ReflectionClass;\\n+use ReflectionMethod;\\n+use yii\\\\base\\\\Exception;\\n use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yii\\\\helpers\\\\FileHelper;\\n use yiiunit\\\\TestCase;\\n \\n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\\n-\\n /**\\n * ReleaseControllerTest.\\n * @group base\\n */\\n class ReleaseControllerTest extends TestCase\\n {\\n+ private array $tempPaths = [];\\n+\\n+ protected function tearDown(): void\\n+ {\\n+ foreach ($this->tempPaths as $path) {\\n+ FileHelper::removeDirectory($path);\\n+ }\\n+ $this->tempPaths = [];\\n+ parent::tearDown();\\n+ }\\n+\\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n {\\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n- $method = new \\\\ReflectionMethod($controller, 'resortChangelog');\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\\n $method->setAccessible(true);\\n \\n $this->assertSame(\\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n ])\\n );\\n }\\n+\\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"4.0.0 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\"\\n+ . \\\"- Fix #1: Test fix (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+\\n+ $this->assertSame(\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.9 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test fix (samdark)\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\\n\\\",\\n+ file_get_contents($file)\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ $contents = \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.8 November 24, 2025\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\";\\n+ file_put_contents($file, $contents);\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+\\n+ try {\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+ $this->fail('Expected missing changelog version exception.');\\n+ } catch (Exception $e) {\\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\\n+ }\\n+\\n+ $this->assertSame($contents, file_get_contents($file));\\n+ }\\n+\\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath, 0777, true);\\n+ $file = $basePath . '/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 Change Log\\\\n\\\"\\n+ . \\\"==========================\\\\n\\\\n\\\"\\n+ . \\\"2.0.50 May 09, 2026\\\\n\\\"\\n+ . \\\"-------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->expectException(Exception::class);\\n+ $this->expectExceptionMessage('2.0.5');\\n+\\n+ $method->invoke($controller, $file, '2.0.5');\\n+ }\\n+\\n+ private function createController(): ReleaseController\\n+ {\\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"This test creates a unique temp directory under `sys_get_temp_dir()` but never removes it. Cleaning up the directory helps avoid leaving stray `yii-release-controller-test-*` folders on developer machines and CI runners.\",\n \"revised_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nindex 4197ecd16d5..a11769c4182 100644\\n--- a/tests/framework/ReleaseControllerTest.php\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -11,21 +11,33 @@\\n namespace yiiunit\\\\framework;\\n \\n use ReflectionClass;\\n+use ReflectionMethod;\\n+use yii\\\\base\\\\Exception;\\n use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yii\\\\helpers\\\\FileHelper;\\n use yiiunit\\\\TestCase;\\n \\n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\\n-\\n /**\\n * ReleaseControllerTest.\\n * @group base\\n */\\n class ReleaseControllerTest extends TestCase\\n {\\n+ private array $tempPaths = [];\\n+\\n+ protected function tearDown(): void\\n+ {\\n+ foreach ($this->tempPaths as $path) {\\n+ FileHelper::removeDirectory($path);\\n+ }\\n+ $this->tempPaths = [];\\n+ parent::tearDown();\\n+ }\\n+\\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n {\\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n- $method = new \\\\ReflectionMethod($controller, 'resortChangelog');\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\\n $method->setAccessible(true);\\n \\n $this->assertSame(\\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n ])\\n );\\n }\\n+\\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"4.0.0 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\"\\n+ . \\\"- Fix #1: Test fix (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+\\n+ $this->assertSame(\\n+ \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.9 under development\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test fix (samdark)\\\\n\\\"\\n+ . \\\"- Enh #2: Test enhancement (samdark)\\\\n\\\\n\\\",\\n+ file_get_contents($file)\\n+ );\\n+ }\\n+\\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\\n+ $contents = \\\"Yii Framework 2 apidoc extension Change Log\\\\n\\\"\\n+ . \\\"===========================================\\\\n\\\\n\\\"\\n+ . \\\"3.0.8 November 24, 2025\\\\n\\\"\\n+ . \\\"-----------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\";\\n+ file_put_contents($file, $contents);\\n+\\n+ $controller = $this->createController();\\n+ $controller->basePath = $basePath;\\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\\n+ $method->setAccessible(true);\\n+\\n+ try {\\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\\n+ $this->fail('Expected missing changelog version exception.');\\n+ } catch (Exception $e) {\\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\\n+ }\\n+\\n+ $this->assertSame($contents, file_get_contents($file));\\n+ }\\n+\\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\\n+ {\\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\\n+ $this->tempPaths[] = $basePath;\\n+ mkdir($basePath, 0777, true);\\n+ $file = $basePath . '/CHANGELOG.md';\\n+ file_put_contents(\\n+ $file,\\n+ \\\"Yii Framework 2 Change Log\\\\n\\\"\\n+ . \\\"==========================\\\\n\\\\n\\\"\\n+ . \\\"2.0.50 May 09, 2026\\\\n\\\"\\n+ . \\\"-------------------\\\\n\\\\n\\\"\\n+ . \\\"- Bug #1: Test change (samdark)\\\\n\\\"\\n+ );\\n+\\n+ $controller = $this->createController();\\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->expectException(Exception::class);\\n+ $this->expectExceptionMessage('2.0.5');\\n+\\n+ $method->invoke($controller, $file, '2.0.5');\\n+ }\\n+\\n+ private function createController(): ReleaseController\\n+ {\\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ }\\n }\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex b5f53881186..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)\n protected function resortChangelogs($what, $version)\n {\n foreach ($this->getChangelogs($what) as $file) {\n+ $this->updateChangelogDevelopmentVersion($file, $version);\n // split the file into relevant parts\n list($start, $changelog, $end) = $this->splitChangelog($file, $version);\n $changelog = $this->resortChangelog($changelog);\n@@ -861,6 +862,22 @@ protected function resortChangelogs($what, $version)\n }\n }\n \n+ protected function updateChangelogDevelopmentVersion($file, $version)\n+ {\n+ $contents = file_get_contents($file);\n+ $headline = $version . ' under development';\n+ $updatedContents = preg_replace(\n+ '/^([^\\s]+) under development\\R-+\\R/m',\n+ $headline . \"\\n\" . str_repeat('-', \\strlen($headline)) . \"\\n\",\n+ $contents,\n+ 1\n+ );\n+\n+ if ($updatedContents !== $contents) {\n+ file_put_contents($file, $updatedContents);\n+ }\n+ }\n+\n /**\n * Extract changelog content for a specific version.\n * @param string $file\n@@ -877,13 +894,15 @@ protected function splitChangelog($file, $version)\n $end = [];\n \n $state = 'start';\n+ $found = false;\n foreach ($lines as $l => $line) {\n // starting from the changelogs headline\n if (\n- isset($lines[$l - 2]) && strpos($lines[$l - 2], $version) !== false &&\n+ isset($lines[$l - 2]) && $this->matchesChangelogVersion($lines[$l - 2], $version) &&\n isset($lines[$l - 1]) && strncmp($lines[$l - 1], '---', 3) === 0\n ) {\n $state = 'changelog';\n+ $found = true;\n }\n if ($state === 'changelog' && isset($lines[$l + 1]) && strncmp($lines[$l + 1], '---', 3) === 0) {\n $state = 'end';\n@@ -900,9 +919,19 @@ protected function splitChangelog($file, $version)\n }\n }\n \n+ if (!$found) {\n+ throw new Exception(\"Changelog section for version $version was not found in $file.\");\n+ }\n+\n return [$start, $changelog, $end];\n }\n \n+ protected function matchesChangelogVersion($line, $version)\n+ {\n+ $v = str_replace('\\\\-', '[\\\\- ]', preg_quote($version, '/'));\n+ return preg_match('/^' . $v . '(?:\\s|$)/', $line) === 1;\n+ }\n+\n /**\n * Ensure sorting of the changelog lines.\n * @param string[] $changelog\n\ndiff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nindex 4197ecd16d5..a11769c4182 100644\n--- a/tests/framework/ReleaseControllerTest.php\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -11,21 +11,33 @@\n namespace yiiunit\\framework;\n \n use ReflectionClass;\n+use ReflectionMethod;\n+use yii\\base\\Exception;\n use yii\\build\\controllers\\ReleaseController;\n+use yii\\helpers\\FileHelper;\n use yiiunit\\TestCase;\n \n-require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n-\n /**\n * ReleaseControllerTest.\n * @group base\n */\n class ReleaseControllerTest extends TestCase\n {\n+ private array $tempPaths = [];\n+\n+ protected function tearDown(): void\n+ {\n+ foreach ($this->tempPaths as $path) {\n+ FileHelper::removeDirectory($path);\n+ }\n+ $this->tempPaths = [];\n+ parent::tearDown();\n+ }\n+\n public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n {\n- $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n- $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'resortChangelog');\n $method->setAccessible(true);\n \n $this->assertSame(\n@@ -54,4 +66,95 @@ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n ])\n );\n }\n+\n+ public function testResortChangelogsUpdatesDevelopmentHeaderToRequestedVersion(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"4.0.0 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\"\n+ . \"- Fix #1: Test fix (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+\n+ $this->assertSame(\n+ \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.9 under development\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test fix (samdark)\\n\"\n+ . \"- Enh #2: Test enhancement (samdark)\\n\\n\",\n+ file_get_contents($file)\n+ );\n+ }\n+\n+ public function testResortChangelogsFailsWhenVersionSectionIsMissing(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath . '/extensions/apidoc', 0777, true);\n+ $file = $basePath . '/extensions/apidoc/CHANGELOG.md';\n+ $contents = \"Yii Framework 2 apidoc extension Change Log\\n\"\n+ . \"===========================================\\n\\n\"\n+ . \"3.0.8 November 24, 2025\\n\"\n+ . \"-----------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\";\n+ file_put_contents($file, $contents);\n+\n+ $controller = $this->createController();\n+ $controller->basePath = $basePath;\n+ $method = new ReflectionMethod($controller, 'resortChangelogs');\n+ $method->setAccessible(true);\n+\n+ try {\n+ $method->invoke($controller, ['apidoc'], '3.0.9');\n+ $this->fail('Expected missing changelog version exception.');\n+ } catch (Exception $e) {\n+ $this->assertStringContainsString('3.0.9', $e->getMessage());\n+ }\n+\n+ $this->assertSame($contents, file_get_contents($file));\n+ }\n+\n+ public function testSplitChangelogUsesExactVersionBoundary(): void\n+ {\n+ $basePath = sys_get_temp_dir() . '/yii-release-controller-test-' . str_replace('.', '', uniqid('', true));\n+ $this->tempPaths[] = $basePath;\n+ mkdir($basePath, 0777, true);\n+ $file = $basePath . '/CHANGELOG.md';\n+ file_put_contents(\n+ $file,\n+ \"Yii Framework 2 Change Log\\n\"\n+ . \"==========================\\n\\n\"\n+ . \"2.0.50 May 09, 2026\\n\"\n+ . \"-------------------\\n\\n\"\n+ . \"- Bug #1: Test change (samdark)\\n\"\n+ );\n+\n+ $controller = $this->createController();\n+ $method = new ReflectionMethod($controller, 'splitChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->expectException(Exception::class);\n+ $this->expectExceptionMessage('2.0.5');\n+\n+ $method->invoke($controller, $file, '2.0.5');\n+ }\n+\n+ private function createController(): ReleaseController\n+ {\n+ return (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ }\n }\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34256,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20910"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20910,"string":"20,910"},"base_sha":{"kind":"string","value":"dc66de6f7af49927aace4bd778cb1761eba19087"},"head_sha":{"kind":"string","value":"640f803e40ae12a75adbe18ee12c140bb68af05e"},"task":{"kind":"string","value":"Fix changelog sorting when there are fix intries instead of bug\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | -\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `build/controllers/` needed for: Fix changelog sorting when there are fix intries instead of bug","scope_files":["build/controllers/ReleaseController.php"]},{"subtask_id":"s2","goal":"Implement the changes under `tests/framework/` needed for: Fix changelog sorting when there are fix intries instead of bug","scope_files":["tests/framework/ReleaseControllerTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Fix changelog sorting when there are fix intries instead of bug\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `tests/framework/` needed for: Fix changelog sorting when there are fix intries instead of bug\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["build/controllers/ReleaseController.php"],"solution_diff":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..b5f53881186 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -913,6 +913,7 @@ protected function resortChangelog($changelog)\n // cleanup whitespace\n foreach ($changelog as $i => $line) {\n $changelog[$i] = rtrim($line);\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\d+(, #\\d+)*: )/', '- Bug', $changelog[$i]);\n }\n $changelog = array_filter($changelog);\n \n\n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s2","scope_files":["tests/framework/ReleaseControllerTest.php"],"solution_diff":"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nnew file mode 100644\nindex 00000000000..4197ecd16d5\n--- /dev/null\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -0,0 +1,57 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework;\n+\n+use ReflectionClass;\n+use yii\\build\\controllers\\ReleaseController;\n+use yiiunit\\TestCase;\n+\n+require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n+\n+/**\n+ * ReleaseControllerTest.\n+ * @group base\n+ */\n+class ReleaseControllerTest extends TestCase\n+{\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n+ {\n+ $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->assertSame(\n+ [\n+ '',\n+ '- Bug #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- Bug #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '',\n+ '',\n+ ],\n+ $method->invoke($controller, [\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Fix #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '- Fix #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ ])\n+ );\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"build/controllers/ReleaseController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\\nindex 4ffa7142f05..b5f53881186 100644\\n--- a/build/controllers/ReleaseController.php\\n+++ b/build/controllers/ReleaseController.php\\n@@ -913,6 +913,7 @@ protected function resortChangelog($changelog)\\n // cleanup whitespace\\n foreach ($changelog as $i => $line) {\\n $changelog[$i] = rtrim($line);\\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\\\d+(, #\\\\d+)*: )/', '- Bug', $changelog[$i]);\\n }\\n $changelog = array_filter($changelog);\\n \\n\\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"tests/framework/ReleaseControllerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\\nnew file mode 100644\\nindex 00000000000..4197ecd16d5\\n--- /dev/null\\n+++ b/tests/framework/ReleaseControllerTest.php\\n@@ -0,0 +1,57 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework;\\n+\\n+use ReflectionClass;\\n+use yii\\\\build\\\\controllers\\\\ReleaseController;\\n+use yiiunit\\\\TestCase;\\n+\\n+require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\\n+\\n+/**\\n+ * ReleaseControllerTest.\\n+ * @group base\\n+ */\\n+class ReleaseControllerTest extends TestCase\\n+{\\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\\n+ {\\n+ $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\\n+ $method = new \\\\ReflectionMethod($controller, 'resortChangelog');\\n+ $method->setAccessible(true);\\n+\\n+ $this->assertSame(\\n+ [\\n+ '',\\n+ '- Bug #275: Fix logging (samdark)',\\n+ '- Bug #283: Fix first sentence extraction (samdark)',\\n+ '- Bug #294: Make dependency optional (samdark)',\\n+ '- Bug #339: Fix static replacement (samdark)',\\n+ '- Bug #360: Fix URL processing (samdark)',\\n+ '- Enh #244: Uniform descriptions (samdark)',\\n+ '- Chg #352: Remove deprecated code (samdark)',\\n+ '- New #131: Add template (samdark)',\\n+ '',\\n+ '',\\n+ ],\\n+ $method->invoke($controller, [\\n+ '- Chg #352: Remove deprecated code (samdark)',\\n+ '- Bug #294: Make dependency optional (samdark)',\\n+ '- Fix #360: Fix URL processing (samdark)',\\n+ '- Enh #244: Uniform descriptions (samdark)',\\n+ '- Bug #339: Fix static replacement (samdark)',\\n+ '- New #131: Add template (samdark)',\\n+ '- Fix #275: Fix logging (samdark)',\\n+ '- Bug #283: Fix first sentence extraction (samdark)',\\n+ ])\\n+ );\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..b5f53881186 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/build/controllers/ReleaseController.php\n@@ -913,6 +913,7 @@ protected function resortChangelog($changelog)\n // cleanup whitespace\n foreach ($changelog as $i => $line) {\n $changelog[$i] = rtrim($line);\n+ $changelog[$i] = preg_replace('/^- Fix(?= #\\d+(, #\\d+)*: )/', '- Bug', $changelog[$i]);\n }\n $changelog = array_filter($changelog);\n \n\ndiff --git a/tests/framework/ReleaseControllerTest.php b/tests/framework/ReleaseControllerTest.php\nnew file mode 100644\nindex 00000000000..4197ecd16d5\n--- /dev/null\n+++ b/tests/framework/ReleaseControllerTest.php\n@@ -0,0 +1,57 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework;\n+\n+use ReflectionClass;\n+use yii\\build\\controllers\\ReleaseController;\n+use yiiunit\\TestCase;\n+\n+require_once __DIR__ . '/../../build/controllers/ReleaseController.php';\n+\n+/**\n+ * ReleaseControllerTest.\n+ * @group base\n+ */\n+class ReleaseControllerTest extends TestCase\n+{\n+ public function testResortChangelogConvertsFixEntriesToBugsAndSortsThem(): void\n+ {\n+ $controller = (new ReflectionClass(ReleaseController::class))->newInstanceWithoutConstructor();\n+ $method = new \\ReflectionMethod($controller, 'resortChangelog');\n+ $method->setAccessible(true);\n+\n+ $this->assertSame(\n+ [\n+ '',\n+ '- Bug #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- Bug #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '',\n+ '',\n+ ],\n+ $method->invoke($controller, [\n+ '- Chg #352: Remove deprecated code (samdark)',\n+ '- Bug #294: Make dependency optional (samdark)',\n+ '- Fix #360: Fix URL processing (samdark)',\n+ '- Enh #244: Uniform descriptions (samdark)',\n+ '- Bug #339: Fix static replacement (samdark)',\n+ '- New #131: Add template (samdark)',\n+ '- Fix #275: Fix logging (samdark)',\n+ '- Bug #283: Fix first sentence extraction (samdark)',\n+ ])\n+ );\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34257,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20903"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20903,"string":"20,903"},"base_sha":{"kind":"string","value":"04bb96d928c06b3e12e87ab8100cdefeb0905212"},"head_sha":{"kind":"string","value":"15ddf5a4235ef05fc20e8d4396ec4674556b9db7"},"task":{"kind":"string","value":"Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `framework/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["framework/CHANGELOG.md","framework/UPGRADE-22.md"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/base/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["framework/base/Module.php"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/helpers/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["framework/helpers/BaseUrl.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/base/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["tests/framework/base/StandaloneActionTest.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/base/stub/standalone/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["tests/framework/base/stub/standalone/LifecycleRecordingAction.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/framework/helpers/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["tests/framework/helpers/UrlTest.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/web/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["tests/framework/web/WebActionTest.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/web/stub/standalone/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan","scope_files":["tests/framework/web/stub/standalone/GuardedAction.php","tests/framework/web/stub/standalone/ModuleServiceAction.php","tests/framework/web/stub/standalone/NullableServiceAction.php","tests/framework/web/stub/standalone/RequiredServiceAction.php","tests/framework/web/stub/standalone/UnregisteredDependency.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `framework/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\",\n \"framework/UPGRADE-22.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/base/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"framework/base/Module.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/helpers/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"framework/helpers/BaseUrl.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/base/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"tests/framework/base/StandaloneActionTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/base/stub/standalone/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"tests/framework/base/stub/standalone/LifecycleRecordingAction.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"tests/framework/helpers/UrlTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/web/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"tests/framework/web/WebActionTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/web/stub/standalone/` needed for: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan\",\n \"scope_files\": [\n \"tests/framework/web/stub/standalone/GuardedAction.php\",\n \"tests/framework/web/stub/standalone/ModuleServiceAction.php\",\n \"tests/framework/web/stub/standalone/NullableServiceAction.php\",\n \"tests/framework/web/stub/standalone/RequiredServiceAction.php\",\n \"tests/framework/web/stub/standalone/UnregisteredDependency.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["framework/CHANGELOG.md","framework/UPGRADE-22.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 31153757114..b500b9a0520 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -72,6 +72,7 @@ Yii Framework 2 Change Log\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\n - Bug: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$actionNamespace` (terabytesoftw)\n+- Bug: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions (terabytesoftw)\n \n 2.0.56 under development\n ------------------------\ndiff --git a/framework/UPGRADE-22.md b/framework/UPGRADE-22.md\nindex ce3eebf3396..05f26a4e368 100644\n--- a/framework/UPGRADE-22.md\n+++ b/framework/UPGRADE-22.md\n@@ -471,10 +471,14 @@ extension points (`removeItemSoftCascade()`, `removeItemManualCascade()`, `updat\n `updateRuleManualCascade()`, `removeRuleManualCascade()`, `removeAllRulesManualCascade()`) are available for finer\n overrides.\n \n-### Standalone action dispatch incidental BC\n+### Standalone actions\n \n-Alongside the new standalone-action dispatch (additive feature), two incidental changes can break code that relied on\n-prior behavior:\n+Standalone-action dispatch (`Module::$actionMap`, `Module::$actionNamespace`, and `yii\\web\\Action`) is an additive\n+feature. The notes below cover the incidental BC it introduces and a resolution-scope caveat to be aware of.\n+\n+#### Incidental BC\n+\n+Two incidental changes can break code that relied on prior behavior:\n \n - `yii\\base\\Action::$controller` is now nullable. Subclass overrides and any code that read `$action->controller`\n unchecked must add a `null` check.\n@@ -482,6 +486,14 @@ prior behavior:\n no longer matches when the action runs standalone. To preserve the previous behavior of always matching, leave\n `controllers` empty on the rule.\n \n+#### `actionMap` resolution scope\n+\n+`yii\\base\\Module::$actionMap` is consulted only by the module whose `runAction()` handles the route (typically the\n+application). Unlike `Module::$controllerMap`, it is not resolved recursively across sub-modules during nested-route\n+dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`. To expose a standalone action\n+under a sub-module, use convention-based discovery through `yii\\base\\Module::$actionNamespace` (which is resolved\n+recursively), or register the action in the dispatching module's `actionMap`.\n+\n ### View no longer assumes jQuery (`View::registerJs()`)\n \n `yii\\web\\View::registerJs()` no longer calls `JqueryAsset::register($this)` automatically when the script position is\n","summary":"Edited 2 file(s) in framework/"},{"subtask_id":"s2","scope_files":["framework/base/Module.php"],"solution_diff":"diff --git a/framework/base/Module.php b/framework/base/Module.php\nindex 33e765d7eeb..53e2b6c126d 100644\n--- a/framework/base/Module.php\n+++ b/framework/base/Module.php\n@@ -110,6 +110,11 @@ class Module extends ServiceLocator\n *\n * Routes whose first segment is not present here fall through to the legacy controller pipeline unchanged.\n *\n+ * Resolution scope: this map is consulted only by the module whose {@see runAction()} handles the route (typically\n+ * the application). Unlike {@see $controllerMap}, it is NOT resolved recursively across sub-modules during\n+ * nested-route dispatch. To expose a standalone action under a sub-module, rely on {@see $actionNamespace} (which\n+ * IS resolved recursively), or register the action in the dispatching module's {@see $actionMap}.\n+ *\n * @since 22.0\n */\n public array $actionMap = [];\n","summary":"Edited 1 file(s) in framework/base/"},{"subtask_id":"s3","scope_files":["framework/helpers/BaseUrl.php"],"solution_diff":"diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php\nindex 94775c14ac5..62edf165dc3 100644\n--- a/framework/helpers/BaseUrl.php\n+++ b/framework/helpers/BaseUrl.php\n@@ -10,6 +10,7 @@\n \n use Yii;\n use yii\\base\\InvalidArgumentException;\n+use yii\\base\\InvalidConfigException;\n \n /**\n * BaseUrl provides concrete implementation for [[Url]].\n@@ -337,12 +338,19 @@ public static function previous($name = null)\n * $this->registerLinkTag(['rel' => 'canonical', 'href' => Url::canonical()]);\n * ```\n *\n+ * When no controller is active (for example, a standalone action dispatched through\n+ * [[\\yii\\base\\Module::$actionMap]] or [[\\yii\\base\\Module::$actionNamespace]]), the route falls back to\n+ * [[\\yii\\base\\Application::$requestedRoute]] and no action parameters are appended.\n+ *\n * @return string the canonical URL of the currently requested page\n */\n public static function canonical()\n {\n- $params = Yii::$app->controller->actionParams;\n- $params[0] = Yii::$app->controller->getRoute();\n+ $controller = Yii::$app->controller;\n+\n+ $params = $controller !== null ? $controller->actionParams : [];\n+\n+ $params[0] = static::resolveCurrentRoute();\n \n return static::getUrlManager()->createAbsoluteUrl($params);\n }\n@@ -429,11 +437,42 @@ public static function isRelative($url)\n public static function current(array $params = [], $scheme = false)\n {\n $currentParams = Yii::$app->getRequest()->getQueryParams();\n- $currentParams[0] = '/' . Yii::$app->controller->getRoute();\n+ $currentParams[0] = '/' . static::resolveCurrentRoute();\n $route = array_replace_recursive($currentParams, $params);\n return static::toRoute($route, $scheme);\n }\n \n+ /**\n+ * Resolves the route of the currently requested page.\n+ *\n+ * Returns the active controller's [[\\yii\\web\\Controller::getRoute()|route]] when a controller is handling the\n+ * request. For standalone actions dispatched without a hosting controller (through [[\\yii\\base\\Module::$actionMap]]\n+ * or [[\\yii\\base\\Module::$actionNamespace]]), falls back to [[\\yii\\base\\Application::$requestedRoute]].\n+ *\n+ * @throws InvalidConfigException if no controller is active and [[\\yii\\base\\Application::$requestedRoute]] is\n+ * empty.\n+ *\n+ * @return string Route of the currently requested page, without a leading slash.\n+ *\n+ * @since 22.0\n+ */\n+ protected static function resolveCurrentRoute(): string\n+ {\n+ if (Yii::$app->controller !== null) {\n+ return Yii::$app->controller->getRoute();\n+ }\n+\n+ $requestedRoute = Yii::$app->requestedRoute;\n+\n+ if ($requestedRoute !== null && $requestedRoute !== '') {\n+ return $requestedRoute;\n+ }\n+\n+ throw new InvalidConfigException(\n+ 'Unable to determine the current route: no active controller and \"Application::$requestedRoute\" is empty.',\n+ );\n+ }\n+\n /**\n * @return \\yii\\web\\UrlManager URL manager used to create URLs\n * @since 2.0.8\n\n","summary":"Edited 1 file(s) in framework/helpers/"},{"subtask_id":"s4","scope_files":["tests/framework/base/StandaloneActionTest.php"],"solution_diff":"diff --git a/tests/framework/base/StandaloneActionTest.php b/tests/framework/base/StandaloneActionTest.php\nindex b88eef03e71..4a32492b922 100644\n--- a/tests/framework/base/StandaloneActionTest.php\n+++ b/tests/framework/base/StandaloneActionTest.php\n@@ -10,6 +10,7 @@\n \n namespace yiiunit\\framework\\base;\n \n+use PHPUnit\\Framework\\Attributes\\Group;\n use Yii;\n use yii\\base\\ActionEvent;\n use yii\\base\\Controller;\n@@ -20,6 +21,7 @@\n use yiiunit\\framework\\base\\stub\\standalone\\CancelingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\GreetAction;\n use yiiunit\\framework\\base\\stub\\standalone\\InjectingAction;\n+use yiiunit\\framework\\base\\stub\\standalone\\LifecycleRecordingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\MethodInjectingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\NoRunAction;\n use yiiunit\\framework\\base\\stub\\standalone\\StubController;\n@@ -29,15 +31,14 @@\n /**\n * Unit tests for {@see \\yii\\base\\Action} when invoked standalone (without a hosting controller).\n *\n- * Covers the nullable `$controller` contract, module-aware {@see \\yii\\base\\Action::getUniqueId()} fallback,\n- * DI-based parameter resolution on `run()` via {@see \\yii\\di\\Container::resolveCallableDependencies()}, the\n- * `beforeRun()` cancellation hook, and behavior attachment via the action's own event triggers.\n+ * Covers the nullable `$controller` contract, module-aware {@see \\yii\\base\\Action::getUniqueId()} fallback, DI-based\n+ * parameter resolution on `run()` via {@see \\yii\\di\\Container::resolveCallableDependencies()}, the `beforeRun()`\n+ * cancellation hook, and behavior attachment via the action's own event triggers.\n *\n * @author Wilmer Arambula <terabytesoftw@gmail.com>\n * @since 22.0\n- *\n- * @group base\n */\n+#[Group('base')]\n final class StandaloneActionTest extends TestCase\n {\n protected function setUp(): void\n@@ -187,6 +188,24 @@ public function testStandaloneRunResolvesParamsViaContainer(): void\n );\n }\n \n+ public function testAfterRunFiresAfterStandaloneRun(): void\n+ {\n+ $action = new LifecycleRecordingAction('lifecycle', null);\n+\n+ $result = $action->runWithParams([]);\n+\n+ self::assertSame(\n+ 'done',\n+ $result,\n+ 'Result must propagate from run.',\n+ );\n+ self::assertSame(\n+ ['before', 'run', 'after'],\n+ $action->calls,\n+ 'Order: beforeRun, run, afterRun.',\n+ );\n+ }\n+\n public function testThrowInvalidConfigExceptionWhenActionHasNoRunMethod(): void\n {\n $action = new NoRunAction('broken', null);\n","summary":"Edited 1 file(s) in tests/framework/base/"},{"subtask_id":"s5","scope_files":["tests/framework/base/stub/standalone/LifecycleRecordingAction.php"],"solution_diff":"diff --git a/tests/framework/base/stub/standalone/LifecycleRecordingAction.php b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\nnew file mode 100644\nindex 00000000000..541bada0626\n--- /dev/null\n+++ b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\n@@ -0,0 +1,44 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\base\\stub\\standalone;\n+\n+use yii\\base\\Action;\n+\n+/**\n+ * Action recording the `beforeRun()`, `run()`, and `afterRun()` call order for standalone lifecycle tests.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class LifecycleRecordingAction extends Action\n+{\n+ /** @var list<string> */\n+ public array $calls = [];\n+\n+ public function run(): string\n+ {\n+ $this->calls[] = 'run';\n+\n+ return 'done';\n+ }\n+\n+ protected function beforeRun(): bool\n+ {\n+ $this->calls[] = 'before';\n+\n+ return true;\n+ }\n+\n+ protected function afterRun(): void\n+ {\n+ $this->calls[] = 'after';\n+ }\n+}\n","summary":"Edited 1 file(s) in tests/framework/base/stub/standalone/"},{"subtask_id":"s6","scope_files":["tests/framework/helpers/UrlTest.php"],"solution_diff":"diff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex e67bc13078c..81468d56c04 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -1,5 +1,7 @@\n <?php\n \n+declare(strict_types=1);\n+\n /**\n * @link https://www.yiiframework.com/\n * @copyright Copyright (c) 2008 Yii Software LLC\n@@ -8,8 +10,10 @@\n \n namespace yiiunit\\framework\\helpers;\n \n+use PHPUnit\\Framework\\Attributes\\Group;\n use Yii;\n use yii\\base\\Action;\n+use yii\\base\\InvalidConfigException;\n use yii\\base\\Module;\n use yii\\helpers\\Url;\n use yii\\web\\Controller;\n@@ -18,9 +22,9 @@\n use yiiunit\\TestCase;\n \n /**\n- * UrlTest.\n- * @group helpers\n+ * Unit tests for {@see \\yii\\helpers\\Url}.\n */\n+#[Group('helpers')]\n class UrlTest extends TestCase\n {\n protected function setUp(): void\n@@ -296,6 +300,48 @@ public function testCanonical(): void\n $this->removeMockedAction();\n }\n \n+ public function testCurrentFallsBackToRequestedRouteWhenControllerIsNull(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = 'page/view';\n+\n+ Yii::$app->request->setQueryParams(['id' => 10]);\n+\n+ self::assertSame(\n+ '/base/index.php?r=page%2Fview&id=10',\n+ Url::current(),\n+ '`requestedRoute` must supply the route when no controller is active.',\n+ );\n+ }\n+\n+ public function testCanonicalFallsBackToRequestedRouteWhenControllerIsNull(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = 'page/view';\n+\n+ self::assertSame(\n+ 'http://example.com/base/index.php?r=page%2Fview',\n+ Url::canonical(),\n+ '`requestedRoute` must supply the canonical route when no controller is active.',\n+ );\n+ }\n+\n+ public function testThrowInvalidConfigExceptionWhenCurrentRouteCannotBeResolved(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = null;\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage(\n+ 'Unable to determine the current route: no active controller and \"Application::$requestedRoute\" is empty.',\n+ );\n+\n+ Url::current();\n+ }\n+\n public function testIsRelative(): void\n {\n $this->assertTrue(Url::isRelative('/test/index.php'));\n","summary":"Edited 1 file(s) in tests/framework/helpers/"},{"subtask_id":"s7","scope_files":["tests/framework/web/WebActionTest.php"],"solution_diff":"diff --git a/tests/framework/web/WebActionTest.php b/tests/framework/web/WebActionTest.php\nindex 4bbcbe6e58c..12969303bc7 100644\n--- a/tests/framework/web/WebActionTest.php\n+++ b/tests/framework/web/WebActionTest.php\n@@ -14,8 +14,15 @@\n use Yii;\n use yii\\base\\Module;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\MethodNotAllowedHttpException;\n+use yii\\web\\ServerErrorHttpException;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n use yiiunit\\framework\\web\\stub\\standalone\\CoerceIntAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\GuardedAction;\n use yiiunit\\framework\\web\\stub\\standalone\\LegacyConstructorWebAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\ModuleServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\NullableServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\RequiredServiceAction;\n use yiiunit\\TestCase;\n \n /**\n@@ -136,4 +143,122 @@ public function testLegacyConstructorWebActionObservesNullIdInInit(): void\n 'Unique ID must combine the module ID and the route segment.',\n );\n }\n+\n+ public function testWebActionInjectsNullForUnresolvableNullableService(): void\n+ {\n+ $action = new NullableServiceAction('optional', null);\n+\n+ $result = $action->runWithParams([]);\n+\n+ self::assertSame(\n+ 'null',\n+ $result,\n+ \"Unresolvable nullable service must inject 'null'.\",\n+ );\n+ }\n+\n+ public function testThrowServerErrorHttpExceptionWhenStandaloneDependencyIsUnresolvable(): void\n+ {\n+ $action = new RequiredServiceAction('required', null);\n+\n+ $this->expectException(ServerErrorHttpException::class);\n+ $this->expectExceptionMessage(\n+ 'Could not load required service: dependency',\n+ );\n+\n+ $action->runWithParams([]);\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleComponent(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set('service', ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module component must satisfy the typed parameter.',\n+ );\n+ self::assertStringStartsWith(\n+ 'Component:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged Component.',\n+ );\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleDiDefinition(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set(ActionTestService::class, ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module DI definition must satisfy the typed parameter.',\n+ );\n+ self::assertStringContainsString(\n+ 'DI:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged as module DI.',\n+ );\n+ }\n+\n+ public function testStandaloneActionRunsWhenVerbFilterAllowsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'POST';\n+\n+ try {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ self::assertSame(\n+ 'ok',\n+ $module->runAction('guarded'),\n+ 'Allowed verb must let the standalone action run.',\n+ );\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'GET';\n+\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ try {\n+ $this->expectException(MethodNotAllowedHttpException::class);\n+\n+ $module->runAction('guarded');\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ private function restoreRequestMethod(string|null $method): void\n+ {\n+ if ($method === null) {\n+ unset($_SERVER['REQUEST_METHOD']);\n+\n+ return;\n+ }\n+\n+ $_SERVER['REQUEST_METHOD'] = $method;\n+ }\n }\n","summary":"Edited 1 file(s) in tests/framework/web/"},{"subtask_id":"s8","scope_files":["tests/framework/web/stub/standalone/GuardedAction.php","tests/framework/web/stub/standalone/ModuleServiceAction.php","tests/framework/web/stub/standalone/NullableServiceAction.php","tests/framework/web/stub/standalone/RequiredServiceAction.php","tests/framework/web/stub/standalone/UnregisteredDependency.php"],"solution_diff":"diff --git a/tests/framework/web/stub/standalone/GuardedAction.php b/tests/framework/web/stub/standalone/GuardedAction.php\nnew file mode 100644\nindex 00000000000..ca75bc9687f\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/GuardedAction.php\n@@ -0,0 +1,38 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\filters\\VerbFilter;\n+use yii\\web\\Action;\n+\n+/**\n+ * Standalone action guarded by a {@see VerbFilter} behavior, used to test real filters through module dispatch.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class GuardedAction extends Action\n+{\n+ public function behaviors(): array\n+ {\n+ return [\n+ 'verbs' => [\n+ 'class' => VerbFilter::class,\n+ 'actions' => ['guarded' => ['POST']],\n+ ],\n+ ];\n+ }\n+\n+ public function run(): string\n+ {\n+ return 'ok';\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/ModuleServiceAction.php b/tests/framework/web/stub/standalone/ModuleServiceAction.php\nnew file mode 100644\nindex 00000000000..5b02ac8dba2\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/ModuleServiceAction.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n+\n+/**\n+ * Action whose `run()` depends on a typed service, used to test module component and module DI resolution paths.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class ModuleServiceAction extends Action\n+{\n+ public function run(ActionTestService $service): string\n+ {\n+ return $service->name();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/NullableServiceAction.php b/tests/framework/web/stub/standalone/NullableServiceAction.php\nnew file mode 100644\nindex 00000000000..783a71f3833\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/NullableServiceAction.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n+\n+/**\n+ * Action used for testing nullable service injection in {@see \\yii\\web\\Action::resolveStandaloneParams()}.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class NullableServiceAction extends Action\n+{\n+ public function run(?ActionTestService $service): string\n+ {\n+ return $service === null ? 'null' : $service->name();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/RequiredServiceAction.php b/tests/framework/web/stub/standalone/RequiredServiceAction.php\nnew file mode 100644\nindex 00000000000..6b71de8a1e4\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/RequiredServiceAction.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+\n+/**\n+ * Action whose `run()` requires an unresolvable non-nullable dependency, used to assert HTTP-aware DI failure mapping.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class RequiredServiceAction extends Action\n+{\n+ public function run(UnregisteredDependency $dependency): string\n+ {\n+ return $dependency->value();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/UnregisteredDependency.php b/tests/framework/web/stub/standalone/UnregisteredDependency.php\nnew file mode 100644\nindex 00000000000..de15c2e2052\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/UnregisteredDependency.php\n@@ -0,0 +1,25 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+/**\n+ * Service never registered in any container, used to force an unresolvable non-nullable dependency.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class UnregisteredDependency\n+{\n+ public function value(): string\n+ {\n+ return 'never';\n+ }\n+}\n","summary":"Edited 5 file(s) in tests/framework/web/stub/standalone/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\",\n \"framework/UPGRADE-22.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 31153757114..b500b9a0520 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -72,6 +72,7 @@ Yii Framework 2 Change Log\\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\\n - Bug: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$actionNamespace` (terabytesoftw)\\n+- Bug: Fix `yii\\\\helpers\\\\Url::current()` and `yii\\\\helpers\\\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions (terabytesoftw)\\n \\n 2.0.56 under development\\n ------------------------\\ndiff --git a/framework/UPGRADE-22.md b/framework/UPGRADE-22.md\\nindex ce3eebf3396..05f26a4e368 100644\\n--- a/framework/UPGRADE-22.md\\n+++ b/framework/UPGRADE-22.md\\n@@ -471,10 +471,14 @@ extension points (`removeItemSoftCascade()`, `removeItemManualCascade()`, `updat\\n `updateRuleManualCascade()`, `removeRuleManualCascade()`, `removeAllRulesManualCascade()`) are available for finer\\n overrides.\\n \\n-### Standalone action dispatch incidental BC\\n+### Standalone actions\\n \\n-Alongside the new standalone-action dispatch (additive feature), two incidental changes can break code that relied on\\n-prior behavior:\\n+Standalone-action dispatch (`Module::$actionMap`, `Module::$actionNamespace`, and `yii\\\\web\\\\Action`) is an additive\\n+feature. The notes below cover the incidental BC it introduces and a resolution-scope caveat to be aware of.\\n+\\n+#### Incidental BC\\n+\\n+Two incidental changes can break code that relied on prior behavior:\\n \\n - `yii\\\\base\\\\Action::$controller` is now nullable. Subclass overrides and any code that read `$action->controller`\\n unchecked must add a `null` check.\\n@@ -482,6 +486,14 @@ prior behavior:\\n no longer matches when the action runs standalone. To preserve the previous behavior of always matching, leave\\n `controllers` empty on the rule.\\n \\n+#### `actionMap` resolution scope\\n+\\n+`yii\\\\base\\\\Module::$actionMap` is consulted only by the module whose `runAction()` handles the route (typically the\\n+application). Unlike `Module::$controllerMap`, it is not resolved recursively across sub-modules during nested-route\\n+dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`. To expose a standalone action\\n+under a sub-module, use convention-based discovery through `yii\\\\base\\\\Module::$actionNamespace` (which is resolved\\n+recursively), or register the action in the dispatching module's `actionMap`.\\n+\\n ### View no longer assumes jQuery (`View::registerJs()`)\\n \\n `yii\\\\web\\\\View::registerJs()` no longer calls `JqueryAsset::register($this)` automatically when the script position is\\n\",\n \"summary\": \"Edited 2 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/base/Module.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/base/Module.php b/framework/base/Module.php\\nindex 33e765d7eeb..53e2b6c126d 100644\\n--- a/framework/base/Module.php\\n+++ b/framework/base/Module.php\\n@@ -110,6 +110,11 @@ class Module extends ServiceLocator\\n *\\n * Routes whose first segment is not present here fall through to the legacy controller pipeline unchanged.\\n *\\n+ * Resolution scope: this map is consulted only by the module whose {@see runAction()} handles the route (typically\\n+ * the application). Unlike {@see $controllerMap}, it is NOT resolved recursively across sub-modules during\\n+ * nested-route dispatch. To expose a standalone action under a sub-module, rely on {@see $actionNamespace} (which\\n+ * IS resolved recursively), or register the action in the dispatching module's {@see $actionMap}.\\n+ *\\n * @since 22.0\\n */\\n public array $actionMap = [];\\n\",\n \"summary\": \"Edited 1 file(s) in framework/base/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/helpers/BaseUrl.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php\\nindex 94775c14ac5..62edf165dc3 100644\\n--- a/framework/helpers/BaseUrl.php\\n+++ b/framework/helpers/BaseUrl.php\\n@@ -10,6 +10,7 @@\\n \\n use Yii;\\n use yii\\\\base\\\\InvalidArgumentException;\\n+use yii\\\\base\\\\InvalidConfigException;\\n \\n /**\\n * BaseUrl provides concrete implementation for [[Url]].\\n@@ -337,12 +338,19 @@ public static function previous($name = null)\\n * $this->registerLinkTag(['rel' => 'canonical', 'href' => Url::canonical()]);\\n * ```\\n *\\n+ * When no controller is active (for example, a standalone action dispatched through\\n+ * [[\\\\yii\\\\base\\\\Module::$actionMap]] or [[\\\\yii\\\\base\\\\Module::$actionNamespace]]), the route falls back to\\n+ * [[\\\\yii\\\\base\\\\Application::$requestedRoute]] and no action parameters are appended.\\n+ *\\n * @return string the canonical URL of the currently requested page\\n */\\n public static function canonical()\\n {\\n- $params = Yii::$app->controller->actionParams;\\n- $params[0] = Yii::$app->controller->getRoute();\\n+ $controller = Yii::$app->controller;\\n+\\n+ $params = $controller !== null ? $controller->actionParams : [];\\n+\\n+ $params[0] = static::resolveCurrentRoute();\\n \\n return static::getUrlManager()->createAbsoluteUrl($params);\\n }\\n@@ -429,11 +437,42 @@ public static function isRelative($url)\\n public static function current(array $params = [], $scheme = false)\\n {\\n $currentParams = Yii::$app->getRequest()->getQueryParams();\\n- $currentParams[0] = '/' . Yii::$app->controller->getRoute();\\n+ $currentParams[0] = '/' . static::resolveCurrentRoute();\\n $route = array_replace_recursive($currentParams, $params);\\n return static::toRoute($route, $scheme);\\n }\\n \\n+ /**\\n+ * Resolves the route of the currently requested page.\\n+ *\\n+ * Returns the active controller's [[\\\\yii\\\\web\\\\Controller::getRoute()|route]] when a controller is handling the\\n+ * request. For standalone actions dispatched without a hosting controller (through [[\\\\yii\\\\base\\\\Module::$actionMap]]\\n+ * or [[\\\\yii\\\\base\\\\Module::$actionNamespace]]), falls back to [[\\\\yii\\\\base\\\\Application::$requestedRoute]].\\n+ *\\n+ * @throws InvalidConfigException if no controller is active and [[\\\\yii\\\\base\\\\Application::$requestedRoute]] is\\n+ * empty.\\n+ *\\n+ * @return string Route of the currently requested page, without a leading slash.\\n+ *\\n+ * @since 22.0\\n+ */\\n+ protected static function resolveCurrentRoute(): string\\n+ {\\n+ if (Yii::$app->controller !== null) {\\n+ return Yii::$app->controller->getRoute();\\n+ }\\n+\\n+ $requestedRoute = Yii::$app->requestedRoute;\\n+\\n+ if ($requestedRoute !== null && $requestedRoute !== '') {\\n+ return $requestedRoute;\\n+ }\\n+\\n+ throw new InvalidConfigException(\\n+ 'Unable to determine the current route: no active controller and \\\"Application::$requestedRoute\\\" is empty.',\\n+ );\\n+ }\\n+\\n /**\\n * @return \\\\yii\\\\web\\\\UrlManager URL manager used to create URLs\\n * @since 2.0.8\\n\\n\",\n \"summary\": \"Edited 1 file(s) in framework/helpers/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/base/StandaloneActionTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/StandaloneActionTest.php b/tests/framework/base/StandaloneActionTest.php\\nindex b88eef03e71..4a32492b922 100644\\n--- a/tests/framework/base/StandaloneActionTest.php\\n+++ b/tests/framework/base/StandaloneActionTest.php\\n@@ -10,6 +10,7 @@\\n \\n namespace yiiunit\\\\framework\\\\base;\\n \\n+use PHPUnit\\\\Framework\\\\Attributes\\\\Group;\\n use Yii;\\n use yii\\\\base\\\\ActionEvent;\\n use yii\\\\base\\\\Controller;\\n@@ -20,6 +21,7 @@\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\CancelingAction;\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\GreetAction;\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\InjectingAction;\\n+use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\LifecycleRecordingAction;\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\MethodInjectingAction;\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\NoRunAction;\\n use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\StubController;\\n@@ -29,15 +31,14 @@\\n /**\\n * Unit tests for {@see \\\\yii\\\\base\\\\Action} when invoked standalone (without a hosting controller).\\n *\\n- * Covers the nullable `$controller` contract, module-aware {@see \\\\yii\\\\base\\\\Action::getUniqueId()} fallback,\\n- * DI-based parameter resolution on `run()` via {@see \\\\yii\\\\di\\\\Container::resolveCallableDependencies()}, the\\n- * `beforeRun()` cancellation hook, and behavior attachment via the action's own event triggers.\\n+ * Covers the nullable `$controller` contract, module-aware {@see \\\\yii\\\\base\\\\Action::getUniqueId()} fallback, DI-based\\n+ * parameter resolution on `run()` via {@see \\\\yii\\\\di\\\\Container::resolveCallableDependencies()}, the `beforeRun()`\\n+ * cancellation hook, and behavior attachment via the action's own event triggers.\\n *\\n * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n * @since 22.0\\n- *\\n- * @group base\\n */\\n+#[Group('base')]\\n final class StandaloneActionTest extends TestCase\\n {\\n protected function setUp(): void\\n@@ -187,6 +188,24 @@ public function testStandaloneRunResolvesParamsViaContainer(): void\\n );\\n }\\n \\n+ public function testAfterRunFiresAfterStandaloneRun(): void\\n+ {\\n+ $action = new LifecycleRecordingAction('lifecycle', null);\\n+\\n+ $result = $action->runWithParams([]);\\n+\\n+ self::assertSame(\\n+ 'done',\\n+ $result,\\n+ 'Result must propagate from run.',\\n+ );\\n+ self::assertSame(\\n+ ['before', 'run', 'after'],\\n+ $action->calls,\\n+ 'Order: beforeRun, run, afterRun.',\\n+ );\\n+ }\\n+\\n public function testThrowInvalidConfigExceptionWhenActionHasNoRunMethod(): void\\n {\\n $action = new NoRunAction('broken', null);\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/base/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/base/stub/standalone/LifecycleRecordingAction.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/stub/standalone/LifecycleRecordingAction.php b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\\nnew file mode 100644\\nindex 00000000000..541bada0626\\n--- /dev/null\\n+++ b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\\n@@ -0,0 +1,44 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\base\\\\stub\\\\standalone;\\n+\\n+use yii\\\\base\\\\Action;\\n+\\n+/**\\n+ * Action recording the `beforeRun()`, `run()`, and `afterRun()` call order for standalone lifecycle tests.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class LifecycleRecordingAction extends Action\\n+{\\n+ /** @var list<string> */\\n+ public array $calls = [];\\n+\\n+ public function run(): string\\n+ {\\n+ $this->calls[] = 'run';\\n+\\n+ return 'done';\\n+ }\\n+\\n+ protected function beforeRun(): bool\\n+ {\\n+ $this->calls[] = 'before';\\n+\\n+ return true;\\n+ }\\n+\\n+ protected function afterRun(): void\\n+ {\\n+ $this->calls[] = 'after';\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/base/stub/standalone/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/framework/helpers/UrlTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\\nindex e67bc13078c..81468d56c04 100644\\n--- a/tests/framework/helpers/UrlTest.php\\n+++ b/tests/framework/helpers/UrlTest.php\\n@@ -1,5 +1,7 @@\\n <?php\\n \\n+declare(strict_types=1);\\n+\\n /**\\n * @link https://www.yiiframework.com/\\n * @copyright Copyright (c) 2008 Yii Software LLC\\n@@ -8,8 +10,10 @@\\n \\n namespace yiiunit\\\\framework\\\\helpers;\\n \\n+use PHPUnit\\\\Framework\\\\Attributes\\\\Group;\\n use Yii;\\n use yii\\\\base\\\\Action;\\n+use yii\\\\base\\\\InvalidConfigException;\\n use yii\\\\base\\\\Module;\\n use yii\\\\helpers\\\\Url;\\n use yii\\\\web\\\\Controller;\\n@@ -18,9 +22,9 @@\\n use yiiunit\\\\TestCase;\\n \\n /**\\n- * UrlTest.\\n- * @group helpers\\n+ * Unit tests for {@see \\\\yii\\\\helpers\\\\Url}.\\n */\\n+#[Group('helpers')]\\n class UrlTest extends TestCase\\n {\\n protected function setUp(): void\\n@@ -296,6 +300,48 @@ public function testCanonical(): void\\n $this->removeMockedAction();\\n }\\n \\n+ public function testCurrentFallsBackToRequestedRouteWhenControllerIsNull(): void\\n+ {\\n+ $this->removeMockedAction();\\n+\\n+ Yii::$app->requestedRoute = 'page/view';\\n+\\n+ Yii::$app->request->setQueryParams(['id' => 10]);\\n+\\n+ self::assertSame(\\n+ '/base/index.php?r=page%2Fview&id=10',\\n+ Url::current(),\\n+ '`requestedRoute` must supply the route when no controller is active.',\\n+ );\\n+ }\\n+\\n+ public function testCanonicalFallsBackToRequestedRouteWhenControllerIsNull(): void\\n+ {\\n+ $this->removeMockedAction();\\n+\\n+ Yii::$app->requestedRoute = 'page/view';\\n+\\n+ self::assertSame(\\n+ 'http://example.com/base/index.php?r=page%2Fview',\\n+ Url::canonical(),\\n+ '`requestedRoute` must supply the canonical route when no controller is active.',\\n+ );\\n+ }\\n+\\n+ public function testThrowInvalidConfigExceptionWhenCurrentRouteCannotBeResolved(): void\\n+ {\\n+ $this->removeMockedAction();\\n+\\n+ Yii::$app->requestedRoute = null;\\n+\\n+ $this->expectException(InvalidConfigException::class);\\n+ $this->expectExceptionMessage(\\n+ 'Unable to determine the current route: no active controller and \\\"Application::$requestedRoute\\\" is empty.',\\n+ );\\n+\\n+ Url::current();\\n+ }\\n+\\n public function testIsRelative(): void\\n {\\n $this->assertTrue(Url::isRelative('/test/index.php'));\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/helpers/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/web/WebActionTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/WebActionTest.php b/tests/framework/web/WebActionTest.php\\nindex 4bbcbe6e58c..12969303bc7 100644\\n--- a/tests/framework/web/WebActionTest.php\\n+++ b/tests/framework/web/WebActionTest.php\\n@@ -14,8 +14,15 @@\\n use Yii;\\n use yii\\\\base\\\\Module;\\n use yii\\\\web\\\\BadRequestHttpException;\\n+use yii\\\\web\\\\MethodNotAllowedHttpException;\\n+use yii\\\\web\\\\ServerErrorHttpException;\\n+use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\ActionTestService;\\n use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\CoerceIntAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\GuardedAction;\\n use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\LegacyConstructorWebAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\ModuleServiceAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\NullableServiceAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\RequiredServiceAction;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -136,4 +143,122 @@ public function testLegacyConstructorWebActionObservesNullIdInInit(): void\\n 'Unique ID must combine the module ID and the route segment.',\\n );\\n }\\n+\\n+ public function testWebActionInjectsNullForUnresolvableNullableService(): void\\n+ {\\n+ $action = new NullableServiceAction('optional', null);\\n+\\n+ $result = $action->runWithParams([]);\\n+\\n+ self::assertSame(\\n+ 'null',\\n+ $result,\\n+ \\\"Unresolvable nullable service must inject 'null'.\\\",\\n+ );\\n+ }\\n+\\n+ public function testThrowServerErrorHttpExceptionWhenStandaloneDependencyIsUnresolvable(): void\\n+ {\\n+ $action = new RequiredServiceAction('required', null);\\n+\\n+ $this->expectException(ServerErrorHttpException::class);\\n+ $this->expectExceptionMessage(\\n+ 'Could not load required service: dependency',\\n+ );\\n+\\n+ $action->runWithParams([]);\\n+ }\\n+\\n+ public function testWebActionResolvesServiceViaModuleComponent(): void\\n+ {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\\n+\\n+ $module->set('service', ActionTestService::class);\\n+\\n+ $result = $module->runAction('svc');\\n+\\n+ self::assertSame(\\n+ 'svc',\\n+ $result,\\n+ 'Module component must satisfy the typed parameter.',\\n+ );\\n+ self::assertStringStartsWith(\\n+ 'Component:',\\n+ Yii::$app->requestedParams['service'],\\n+ 'Resolution path must be tagged Component.',\\n+ );\\n+ }\\n+\\n+ public function testWebActionResolvesServiceViaModuleDiDefinition(): void\\n+ {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\\n+\\n+ $module->set(ActionTestService::class, ActionTestService::class);\\n+\\n+ $result = $module->runAction('svc');\\n+\\n+ self::assertSame(\\n+ 'svc',\\n+ $result,\\n+ 'Module DI definition must satisfy the typed parameter.',\\n+ );\\n+ self::assertStringContainsString(\\n+ 'DI:',\\n+ Yii::$app->requestedParams['service'],\\n+ 'Resolution path must be tagged as module DI.',\\n+ );\\n+ }\\n+\\n+ public function testStandaloneActionRunsWhenVerbFilterAllowsMethod(): void\\n+ {\\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n+ $_SERVER['REQUEST_METHOD'] = 'POST';\\n+\\n+ try {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['guarded' => GuardedAction::class];\\n+\\n+ self::assertSame(\\n+ 'ok',\\n+ $module->runAction('guarded'),\\n+ 'Allowed verb must let the standalone action run.',\\n+ );\\n+ } finally {\\n+ $this->restoreRequestMethod($originalMethod);\\n+ }\\n+ }\\n+\\n+ public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\\n+ {\\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n+ $_SERVER['REQUEST_METHOD'] = 'GET';\\n+\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['guarded' => GuardedAction::class];\\n+\\n+ try {\\n+ $this->expectException(MethodNotAllowedHttpException::class);\\n+\\n+ $module->runAction('guarded');\\n+ } finally {\\n+ $this->restoreRequestMethod($originalMethod);\\n+ }\\n+ }\\n+\\n+ private function restoreRequestMethod(string|null $method): void\\n+ {\\n+ if ($method === null) {\\n+ unset($_SERVER['REQUEST_METHOD']);\\n+\\n+ return;\\n+ }\\n+\\n+ $_SERVER['REQUEST_METHOD'] = $method;\\n+ }\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/web/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/web/stub/standalone/GuardedAction.php\",\n \"tests/framework/web/stub/standalone/ModuleServiceAction.php\",\n \"tests/framework/web/stub/standalone/NullableServiceAction.php\",\n \"tests/framework/web/stub/standalone/RequiredServiceAction.php\",\n \"tests/framework/web/stub/standalone/UnregisteredDependency.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/stub/standalone/GuardedAction.php b/tests/framework/web/stub/standalone/GuardedAction.php\\nnew file mode 100644\\nindex 00000000000..ca75bc9687f\\n--- /dev/null\\n+++ b/tests/framework/web/stub/standalone/GuardedAction.php\\n@@ -0,0 +1,38 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\web\\\\stub\\\\standalone;\\n+\\n+use yii\\\\filters\\\\VerbFilter;\\n+use yii\\\\web\\\\Action;\\n+\\n+/**\\n+ * Standalone action guarded by a {@see VerbFilter} behavior, used to test real filters through module dispatch.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class GuardedAction extends Action\\n+{\\n+ public function behaviors(): array\\n+ {\\n+ return [\\n+ 'verbs' => [\\n+ 'class' => VerbFilter::class,\\n+ 'actions' => ['guarded' => ['POST']],\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function run(): string\\n+ {\\n+ return 'ok';\\n+ }\\n+}\\ndiff --git a/tests/framework/web/stub/standalone/ModuleServiceAction.php b/tests/framework/web/stub/standalone/ModuleServiceAction.php\\nnew file mode 100644\\nindex 00000000000..5b02ac8dba2\\n--- /dev/null\\n+++ b/tests/framework/web/stub/standalone/ModuleServiceAction.php\\n@@ -0,0 +1,28 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\web\\\\stub\\\\standalone;\\n+\\n+use yii\\\\web\\\\Action;\\n+use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\ActionTestService;\\n+\\n+/**\\n+ * Action whose `run()` depends on a typed service, used to test module component and module DI resolution paths.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class ModuleServiceAction extends Action\\n+{\\n+ public function run(ActionTestService $service): string\\n+ {\\n+ return $service->name();\\n+ }\\n+}\\ndiff --git a/tests/framework/web/stub/standalone/NullableServiceAction.php b/tests/framework/web/stub/standalone/NullableServiceAction.php\\nnew file mode 100644\\nindex 00000000000..783a71f3833\\n--- /dev/null\\n+++ b/tests/framework/web/stub/standalone/NullableServiceAction.php\\n@@ -0,0 +1,28 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\web\\\\stub\\\\standalone;\\n+\\n+use yii\\\\web\\\\Action;\\n+use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\ActionTestService;\\n+\\n+/**\\n+ * Action used for testing nullable service injection in {@see \\\\yii\\\\web\\\\Action::resolveStandaloneParams()}.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class NullableServiceAction extends Action\\n+{\\n+ public function run(?ActionTestService $service): string\\n+ {\\n+ return $service === null ? 'null' : $service->name();\\n+ }\\n+}\\ndiff --git a/tests/framework/web/stub/standalone/RequiredServiceAction.php b/tests/framework/web/stub/standalone/RequiredServiceAction.php\\nnew file mode 100644\\nindex 00000000000..6b71de8a1e4\\n--- /dev/null\\n+++ b/tests/framework/web/stub/standalone/RequiredServiceAction.php\\n@@ -0,0 +1,27 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\web\\\\stub\\\\standalone;\\n+\\n+use yii\\\\web\\\\Action;\\n+\\n+/**\\n+ * Action whose `run()` requires an unresolvable non-nullable dependency, used to assert HTTP-aware DI failure mapping.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class RequiredServiceAction extends Action\\n+{\\n+ public function run(UnregisteredDependency $dependency): string\\n+ {\\n+ return $dependency->value();\\n+ }\\n+}\\ndiff --git a/tests/framework/web/stub/standalone/UnregisteredDependency.php b/tests/framework/web/stub/standalone/UnregisteredDependency.php\\nnew file mode 100644\\nindex 00000000000..de15c2e2052\\n--- /dev/null\\n+++ b/tests/framework/web/stub/standalone/UnregisteredDependency.php\\n@@ -0,0 +1,25 @@\\n+<?php\\n+\\n+declare(strict_types=1);\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\web\\\\stub\\\\standalone;\\n+\\n+/**\\n+ * Service never registered in any container, used to force an unresolvable non-nullable dependency.\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 22.0\\n+ */\\n+final class UnregisteredDependency\\n+{\\n+ public function value(): string\\n+ {\\n+ return 'never';\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 5 file(s) in tests/framework/web/stub/standalone/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Use PHP method-call syntax in the route example.**\n\n`parent.runAction('child/ping')` is not valid PHP notation and may mislead readers during migration. Prefer a PHP-style call or explicitly mark it as pseudocode.\n\n<details>\n<summary>Suggested doc tweak</summary>\n\n```diff\n- dispatch: `parent.runAction('child/ping')` does not match `child.actionMap['ping']`.\n+ dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`.\n```\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@framework/UPGRADE-22.md` at line 493, The example uses JavaScript-style\nnotation parent.runAction('child/ping') which is invalid in PHP; update the\nroute example to use PHP method-call syntax (e.g., call the parent object's\nmethod in PHP form) or explicitly mark it as pseudocode so readers aren't\nmisledโmodify the occurrence of parent.runAction('child/ping') to a proper PHP\ncall and ensure consistency with the referenced child.actionMap['ping']\nterminology in the surrounding text.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 15ddf5a","revised_diff":"diff --git a/framework/UPGRADE-22.md b/framework/UPGRADE-22.md\nindex ce3eebf3396..05f26a4e368 100644\n--- a/framework/UPGRADE-22.md\n+++ b/framework/UPGRADE-22.md\n@@ -471,10 +471,14 @@ extension points (`removeItemSoftCascade()`, `removeItemManualCascade()`, `updat\n `updateRuleManualCascade()`, `removeRuleManualCascade()`, `removeAllRulesManualCascade()`) are available for finer\n overrides.\n \n-### Standalone action dispatch incidental BC\n+### Standalone actions\n \n-Alongside the new standalone-action dispatch (additive feature), two incidental changes can break code that relied on\n-prior behavior:\n+Standalone-action dispatch (`Module::$actionMap`, `Module::$actionNamespace`, and `yii\\web\\Action`) is an additive\n+feature. The notes below cover the incidental BC it introduces and a resolution-scope caveat to be aware of.\n+\n+#### Incidental BC\n+\n+Two incidental changes can break code that relied on prior behavior:\n \n - `yii\\base\\Action::$controller` is now nullable. Subclass overrides and any code that read `$action->controller`\n unchecked must add a `null` check.\n@@ -482,6 +486,14 @@ prior behavior:\n no longer matches when the action runs standalone. To preserve the previous behavior of always matching, leave\n `controllers` empty on the rule.\n \n+#### `actionMap` resolution scope\n+\n+`yii\\base\\Module::$actionMap` is consulted only by the module whose `runAction()` handles the route (typically the\n+application). Unlike `Module::$controllerMap`, it is not resolved recursively across sub-modules during nested-route\n+dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`. To expose a standalone action\n+under a sub-module, use convention-based discovery through `yii\\base\\Module::$actionNamespace` (which is resolved\n+recursively), or register the action in the dispatching module's `actionMap`.\n+\n ### View no longer assumes jQuery (`View::registerJs()`)\n \n `yii\\web\\View::registerJs()` no longer calls `JqueryAsset::register($this)` automatically when the script position is\n"},{"subtask_id":"s7","comment":"_๐งน Nitpick_ | _๐ต Trivial_ | _๐ค Low value_\n\n**Move module construction inside the `try` for consistent `$_SERVER` cleanup.**\n\nHere the `Module` is created (Line 241-243) before the `try` while `REQUEST_METHOD` is already mutated (Line 238-239). If construction ever throws, `restoreRequestMethod()` won't run and the GET override leaks to later tests. The allow-path test (Line 216-234) already does this correctly by constructing inside the `try`.\n\n\n<details>\n<summary>โป๏ธ Align with the allow-path test structure</summary>\n\n```diff\n $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n $_SERVER['REQUEST_METHOD'] = 'GET';\n\n- $module = new Module('mymod', Yii::$app);\n-\n- $module->actionMap = ['guarded' => GuardedAction::class];\n-\n try {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n $this->expectException(MethodNotAllowedHttpException::class);\n\n $module->runAction('guarded');\n } finally {\n $this->restoreRequestMethod($originalMethod);\n }\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\n {\n $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n $_SERVER['REQUEST_METHOD'] = 'GET';\n\n try {\n $module = new Module('mymod', Yii::$app);\n\n $module->actionMap = ['guarded' => GuardedAction::class];\n\n $this->expectException(MethodNotAllowedHttpException::class);\n\n $module->runAction('guarded');\n } finally {\n $this->restoreRequestMethod($originalMethod);\n }\n }\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[error] 236-252: testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod accesses the super-global variable $_SERVER. (undefined)\n\n(Superglobals)\n\n---\n\n[error] 236-252: testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod accesses the super-global variable $_SERVER. (undefined)\n\n(Superglobals)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/web/WebActionTest.php` around lines 236 - 252, Move the\nModule construction and its actionMap setup into the try block so\n$_SERVER['REQUEST_METHOD'] is always restored: set $_SERVER['REQUEST_METHOD'] =\n'GET' before the try, then inside the try create the new Module('mymod',\nYii::$app), assign $module->actionMap = ['guarded' => GuardedAction::class],\ncall $this->expectException(MethodNotAllowedHttpException::class) and\n$module->runAction('guarded'), and keep the finally block calling\n$this->restoreRequestMethod($originalMethod) to guarantee cleanup even if Module\nconstruction throws.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:capybara -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/web/WebActionTest.php b/tests/framework/web/WebActionTest.php\nindex 4bbcbe6e58c..12969303bc7 100644\n--- a/tests/framework/web/WebActionTest.php\n+++ b/tests/framework/web/WebActionTest.php\n@@ -14,8 +14,15 @@\n use Yii;\n use yii\\base\\Module;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\MethodNotAllowedHttpException;\n+use yii\\web\\ServerErrorHttpException;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n use yiiunit\\framework\\web\\stub\\standalone\\CoerceIntAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\GuardedAction;\n use yiiunit\\framework\\web\\stub\\standalone\\LegacyConstructorWebAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\ModuleServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\NullableServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\RequiredServiceAction;\n use yiiunit\\TestCase;\n \n /**\n@@ -136,4 +143,122 @@ public function testLegacyConstructorWebActionObservesNullIdInInit(): void\n 'Unique ID must combine the module ID and the route segment.',\n );\n }\n+\n+ public function testWebActionInjectsNullForUnresolvableNullableService(): void\n+ {\n+ $action = new NullableServiceAction('optional', null);\n+\n+ $result = $action->runWithParams([]);\n+\n+ self::assertSame(\n+ 'null',\n+ $result,\n+ \"Unresolvable nullable service must inject 'null'.\",\n+ );\n+ }\n+\n+ public function testThrowServerErrorHttpExceptionWhenStandaloneDependencyIsUnresolvable(): void\n+ {\n+ $action = new RequiredServiceAction('required', null);\n+\n+ $this->expectException(ServerErrorHttpException::class);\n+ $this->expectExceptionMessage(\n+ 'Could not load required service: dependency',\n+ );\n+\n+ $action->runWithParams([]);\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleComponent(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set('service', ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module component must satisfy the typed parameter.',\n+ );\n+ self::assertStringStartsWith(\n+ 'Component:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged Component.',\n+ );\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleDiDefinition(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set(ActionTestService::class, ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module DI definition must satisfy the typed parameter.',\n+ );\n+ self::assertStringContainsString(\n+ 'DI:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged as module DI.',\n+ );\n+ }\n+\n+ public function testStandaloneActionRunsWhenVerbFilterAllowsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'POST';\n+\n+ try {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ self::assertSame(\n+ 'ok',\n+ $module->runAction('guarded'),\n+ 'Allowed verb must let the standalone action run.',\n+ );\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'GET';\n+\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ try {\n+ $this->expectException(MethodNotAllowedHttpException::class);\n+\n+ $module->runAction('guarded');\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ private function restoreRequestMethod(string|null $method): void\n+ {\n+ if ($method === null) {\n+ unset($_SERVER['REQUEST_METHOD']);\n+\n+ return;\n+ }\n+\n+ $_SERVER['REQUEST_METHOD'] = $method;\n+ }\n }\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Use PHP method-call syntax in the route example.**\\n\\n`parent.runAction('child/ping')` is not valid PHP notation and may mislead readers during migration. Prefer a PHP-style call or explicitly mark it as pseudocode.\\n\\n<details>\\n<summary>Suggested doc tweak</summary>\\n\\n```diff\\n- dispatch: `parent.runAction('child/ping')` does not match `child.actionMap['ping']`.\\n+ dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`.\\n```\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@framework/UPGRADE-22.md` at line 493, The example uses JavaScript-style\\nnotation parent.runAction('child/ping') which is invalid in PHP; update the\\nroute example to use PHP method-call syntax (e.g., call the parent object's\\nmethod in PHP form) or explicitly mark it as pseudocode so readers aren't\\nmisledโmodify the occurrence of parent.runAction('child/ping') to a proper PHP\\ncall and ensure consistency with the referenced child.actionMap['ping']\\nterminology in the surrounding text.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 15ddf5a\",\n \"revised_diff\": \"diff --git a/framework/UPGRADE-22.md b/framework/UPGRADE-22.md\\nindex ce3eebf3396..05f26a4e368 100644\\n--- a/framework/UPGRADE-22.md\\n+++ b/framework/UPGRADE-22.md\\n@@ -471,10 +471,14 @@ extension points (`removeItemSoftCascade()`, `removeItemManualCascade()`, `updat\\n `updateRuleManualCascade()`, `removeRuleManualCascade()`, `removeAllRulesManualCascade()`) are available for finer\\n overrides.\\n \\n-### Standalone action dispatch incidental BC\\n+### Standalone actions\\n \\n-Alongside the new standalone-action dispatch (additive feature), two incidental changes can break code that relied on\\n-prior behavior:\\n+Standalone-action dispatch (`Module::$actionMap`, `Module::$actionNamespace`, and `yii\\\\web\\\\Action`) is an additive\\n+feature. The notes below cover the incidental BC it introduces and a resolution-scope caveat to be aware of.\\n+\\n+#### Incidental BC\\n+\\n+Two incidental changes can break code that relied on prior behavior:\\n \\n - `yii\\\\base\\\\Action::$controller` is now nullable. Subclass overrides and any code that read `$action->controller`\\n unchecked must add a `null` check.\\n@@ -482,6 +486,14 @@ prior behavior:\\n no longer matches when the action runs standalone. To preserve the previous behavior of always matching, leave\\n `controllers` empty on the rule.\\n \\n+#### `actionMap` resolution scope\\n+\\n+`yii\\\\base\\\\Module::$actionMap` is consulted only by the module whose `runAction()` handles the route (typically the\\n+application). Unlike `Module::$controllerMap`, it is not resolved recursively across sub-modules during nested-route\\n+dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`. To expose a standalone action\\n+under a sub-module, use convention-based discovery through `yii\\\\base\\\\Module::$actionNamespace` (which is resolved\\n+recursively), or register the action in the dispatching module's `actionMap`.\\n+\\n ### View no longer assumes jQuery (`View::registerJs()`)\\n \\n `yii\\\\web\\\\View::registerJs()` no longer calls `JqueryAsset::register($this)` automatically when the script position is\\n\"\n },\n {\n \"subtask_id\": \"s7\",\n \"comment\": \"_๐งน Nitpick_ | _๐ต Trivial_ | _๐ค Low value_\\n\\n**Move module construction inside the `try` for consistent `$_SERVER` cleanup.**\\n\\nHere the `Module` is created (Line 241-243) before the `try` while `REQUEST_METHOD` is already mutated (Line 238-239). If construction ever throws, `restoreRequestMethod()` won't run and the GET override leaks to later tests. The allow-path test (Line 216-234) already does this correctly by constructing inside the `try`.\\n\\n\\n<details>\\n<summary>โป๏ธ Align with the allow-path test structure</summary>\\n\\n```diff\\n $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n $_SERVER['REQUEST_METHOD'] = 'GET';\\n\\n- $module = new Module('mymod', Yii::$app);\\n-\\n- $module->actionMap = ['guarded' => GuardedAction::class];\\n-\\n try {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['guarded' => GuardedAction::class];\\n+\\n $this->expectException(MethodNotAllowedHttpException::class);\\n\\n $module->runAction('guarded');\\n } finally {\\n $this->restoreRequestMethod($originalMethod);\\n }\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\\n {\\n $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n $_SERVER['REQUEST_METHOD'] = 'GET';\\n\\n try {\\n $module = new Module('mymod', Yii::$app);\\n\\n $module->actionMap = ['guarded' => GuardedAction::class];\\n\\n $this->expectException(MethodNotAllowedHttpException::class);\\n\\n $module->runAction('guarded');\\n } finally {\\n $this->restoreRequestMethod($originalMethod);\\n }\\n }\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[error] 236-252: testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod accesses the super-global variable $_SERVER. (undefined)\\n\\n(Superglobals)\\n\\n---\\n\\n[error] 236-252: testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod accesses the super-global variable $_SERVER. (undefined)\\n\\n(Superglobals)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/web/WebActionTest.php` around lines 236 - 252, Move the\\nModule construction and its actionMap setup into the try block so\\n$_SERVER['REQUEST_METHOD'] is always restored: set $_SERVER['REQUEST_METHOD'] =\\n'GET' before the try, then inside the try create the new Module('mymod',\\nYii::$app), assign $module->actionMap = ['guarded' => GuardedAction::class],\\ncall $this->expectException(MethodNotAllowedHttpException::class) and\\n$module->runAction('guarded'), and keep the finally block calling\\n$this->restoreRequestMethod($originalMethod) to guarantee cleanup even if Module\\nconstruction throws.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:capybara -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/web/WebActionTest.php b/tests/framework/web/WebActionTest.php\\nindex 4bbcbe6e58c..12969303bc7 100644\\n--- a/tests/framework/web/WebActionTest.php\\n+++ b/tests/framework/web/WebActionTest.php\\n@@ -14,8 +14,15 @@\\n use Yii;\\n use yii\\\\base\\\\Module;\\n use yii\\\\web\\\\BadRequestHttpException;\\n+use yii\\\\web\\\\MethodNotAllowedHttpException;\\n+use yii\\\\web\\\\ServerErrorHttpException;\\n+use yiiunit\\\\framework\\\\base\\\\stub\\\\standalone\\\\ActionTestService;\\n use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\CoerceIntAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\GuardedAction;\\n use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\LegacyConstructorWebAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\ModuleServiceAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\NullableServiceAction;\\n+use yiiunit\\\\framework\\\\web\\\\stub\\\\standalone\\\\RequiredServiceAction;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -136,4 +143,122 @@ public function testLegacyConstructorWebActionObservesNullIdInInit(): void\\n 'Unique ID must combine the module ID and the route segment.',\\n );\\n }\\n+\\n+ public function testWebActionInjectsNullForUnresolvableNullableService(): void\\n+ {\\n+ $action = new NullableServiceAction('optional', null);\\n+\\n+ $result = $action->runWithParams([]);\\n+\\n+ self::assertSame(\\n+ 'null',\\n+ $result,\\n+ \\\"Unresolvable nullable service must inject 'null'.\\\",\\n+ );\\n+ }\\n+\\n+ public function testThrowServerErrorHttpExceptionWhenStandaloneDependencyIsUnresolvable(): void\\n+ {\\n+ $action = new RequiredServiceAction('required', null);\\n+\\n+ $this->expectException(ServerErrorHttpException::class);\\n+ $this->expectExceptionMessage(\\n+ 'Could not load required service: dependency',\\n+ );\\n+\\n+ $action->runWithParams([]);\\n+ }\\n+\\n+ public function testWebActionResolvesServiceViaModuleComponent(): void\\n+ {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\\n+\\n+ $module->set('service', ActionTestService::class);\\n+\\n+ $result = $module->runAction('svc');\\n+\\n+ self::assertSame(\\n+ 'svc',\\n+ $result,\\n+ 'Module component must satisfy the typed parameter.',\\n+ );\\n+ self::assertStringStartsWith(\\n+ 'Component:',\\n+ Yii::$app->requestedParams['service'],\\n+ 'Resolution path must be tagged Component.',\\n+ );\\n+ }\\n+\\n+ public function testWebActionResolvesServiceViaModuleDiDefinition(): void\\n+ {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\\n+\\n+ $module->set(ActionTestService::class, ActionTestService::class);\\n+\\n+ $result = $module->runAction('svc');\\n+\\n+ self::assertSame(\\n+ 'svc',\\n+ $result,\\n+ 'Module DI definition must satisfy the typed parameter.',\\n+ );\\n+ self::assertStringContainsString(\\n+ 'DI:',\\n+ Yii::$app->requestedParams['service'],\\n+ 'Resolution path must be tagged as module DI.',\\n+ );\\n+ }\\n+\\n+ public function testStandaloneActionRunsWhenVerbFilterAllowsMethod(): void\\n+ {\\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n+ $_SERVER['REQUEST_METHOD'] = 'POST';\\n+\\n+ try {\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['guarded' => GuardedAction::class];\\n+\\n+ self::assertSame(\\n+ 'ok',\\n+ $module->runAction('guarded'),\\n+ 'Allowed verb must let the standalone action run.',\\n+ );\\n+ } finally {\\n+ $this->restoreRequestMethod($originalMethod);\\n+ }\\n+ }\\n+\\n+ public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\\n+ {\\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\\n+ $_SERVER['REQUEST_METHOD'] = 'GET';\\n+\\n+ $module = new Module('mymod', Yii::$app);\\n+\\n+ $module->actionMap = ['guarded' => GuardedAction::class];\\n+\\n+ try {\\n+ $this->expectException(MethodNotAllowedHttpException::class);\\n+\\n+ $module->runAction('guarded');\\n+ } finally {\\n+ $this->restoreRequestMethod($originalMethod);\\n+ }\\n+ }\\n+\\n+ private function restoreRequestMethod(string|null $method): void\\n+ {\\n+ if ($method === null) {\\n+ unset($_SERVER['REQUEST_METHOD']);\\n+\\n+ return;\\n+ }\\n+\\n+ $_SERVER['REQUEST_METHOD'] = $method;\\n+ }\\n }\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 31153757114..b500b9a0520 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -72,6 +72,7 @@ Yii Framework 2 Change Log\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\n - Bug: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$actionNamespace` (terabytesoftw)\n+- Bug: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions (terabytesoftw)\n \n 2.0.56 under development\n ------------------------\ndiff --git a/framework/UPGRADE-22.md b/framework/UPGRADE-22.md\nindex ce3eebf3396..05f26a4e368 100644\n--- a/framework/UPGRADE-22.md\n+++ b/framework/UPGRADE-22.md\n@@ -471,10 +471,14 @@ extension points (`removeItemSoftCascade()`, `removeItemManualCascade()`, `updat\n `updateRuleManualCascade()`, `removeRuleManualCascade()`, `removeAllRulesManualCascade()`) are available for finer\n overrides.\n \n-### Standalone action dispatch incidental BC\n+### Standalone actions\n \n-Alongside the new standalone-action dispatch (additive feature), two incidental changes can break code that relied on\n-prior behavior:\n+Standalone-action dispatch (`Module::$actionMap`, `Module::$actionNamespace`, and `yii\\web\\Action`) is an additive\n+feature. The notes below cover the incidental BC it introduces and a resolution-scope caveat to be aware of.\n+\n+#### Incidental BC\n+\n+Two incidental changes can break code that relied on prior behavior:\n \n - `yii\\base\\Action::$controller` is now nullable. Subclass overrides and any code that read `$action->controller`\n unchecked must add a `null` check.\n@@ -482,6 +486,14 @@ prior behavior:\n no longer matches when the action runs standalone. To preserve the previous behavior of always matching, leave\n `controllers` empty on the rule.\n \n+#### `actionMap` resolution scope\n+\n+`yii\\base\\Module::$actionMap` is consulted only by the module whose `runAction()` handles the route (typically the\n+application). Unlike `Module::$controllerMap`, it is not resolved recursively across sub-modules during nested-route\n+dispatch: `$parent->runAction('child/ping')` does not match `child.actionMap['ping']`. To expose a standalone action\n+under a sub-module, use convention-based discovery through `yii\\base\\Module::$actionNamespace` (which is resolved\n+recursively), or register the action in the dispatching module's `actionMap`.\n+\n ### View no longer assumes jQuery (`View::registerJs()`)\n \n `yii\\web\\View::registerJs()` no longer calls `JqueryAsset::register($this)` automatically when the script position is\ndiff --git a/framework/base/Module.php b/framework/base/Module.php\nindex 33e765d7eeb..53e2b6c126d 100644\n--- a/framework/base/Module.php\n+++ b/framework/base/Module.php\n@@ -110,6 +110,11 @@ class Module extends ServiceLocator\n *\n * Routes whose first segment is not present here fall through to the legacy controller pipeline unchanged.\n *\n+ * Resolution scope: this map is consulted only by the module whose {@see runAction()} handles the route (typically\n+ * the application). Unlike {@see $controllerMap}, it is NOT resolved recursively across sub-modules during\n+ * nested-route dispatch. To expose a standalone action under a sub-module, rely on {@see $actionNamespace} (which\n+ * IS resolved recursively), or register the action in the dispatching module's {@see $actionMap}.\n+ *\n * @since 22.0\n */\n public array $actionMap = [];\ndiff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php\nindex 94775c14ac5..62edf165dc3 100644\n--- a/framework/helpers/BaseUrl.php\n+++ b/framework/helpers/BaseUrl.php\n@@ -10,6 +10,7 @@\n \n use Yii;\n use yii\\base\\InvalidArgumentException;\n+use yii\\base\\InvalidConfigException;\n \n /**\n * BaseUrl provides concrete implementation for [[Url]].\n@@ -337,12 +338,19 @@ public static function previous($name = null)\n * $this->registerLinkTag(['rel' => 'canonical', 'href' => Url::canonical()]);\n * ```\n *\n+ * When no controller is active (for example, a standalone action dispatched through\n+ * [[\\yii\\base\\Module::$actionMap]] or [[\\yii\\base\\Module::$actionNamespace]]), the route falls back to\n+ * [[\\yii\\base\\Application::$requestedRoute]] and no action parameters are appended.\n+ *\n * @return string the canonical URL of the currently requested page\n */\n public static function canonical()\n {\n- $params = Yii::$app->controller->actionParams;\n- $params[0] = Yii::$app->controller->getRoute();\n+ $controller = Yii::$app->controller;\n+\n+ $params = $controller !== null ? $controller->actionParams : [];\n+\n+ $params[0] = static::resolveCurrentRoute();\n \n return static::getUrlManager()->createAbsoluteUrl($params);\n }\n@@ -429,11 +437,42 @@ public static function isRelative($url)\n public static function current(array $params = [], $scheme = false)\n {\n $currentParams = Yii::$app->getRequest()->getQueryParams();\n- $currentParams[0] = '/' . Yii::$app->controller->getRoute();\n+ $currentParams[0] = '/' . static::resolveCurrentRoute();\n $route = array_replace_recursive($currentParams, $params);\n return static::toRoute($route, $scheme);\n }\n \n+ /**\n+ * Resolves the route of the currently requested page.\n+ *\n+ * Returns the active controller's [[\\yii\\web\\Controller::getRoute()|route]] when a controller is handling the\n+ * request. For standalone actions dispatched without a hosting controller (through [[\\yii\\base\\Module::$actionMap]]\n+ * or [[\\yii\\base\\Module::$actionNamespace]]), falls back to [[\\yii\\base\\Application::$requestedRoute]].\n+ *\n+ * @throws InvalidConfigException if no controller is active and [[\\yii\\base\\Application::$requestedRoute]] is\n+ * empty.\n+ *\n+ * @return string Route of the currently requested page, without a leading slash.\n+ *\n+ * @since 22.0\n+ */\n+ protected static function resolveCurrentRoute(): string\n+ {\n+ if (Yii::$app->controller !== null) {\n+ return Yii::$app->controller->getRoute();\n+ }\n+\n+ $requestedRoute = Yii::$app->requestedRoute;\n+\n+ if ($requestedRoute !== null && $requestedRoute !== '') {\n+ return $requestedRoute;\n+ }\n+\n+ throw new InvalidConfigException(\n+ 'Unable to determine the current route: no active controller and \"Application::$requestedRoute\" is empty.',\n+ );\n+ }\n+\n /**\n * @return \\yii\\web\\UrlManager URL manager used to create URLs\n * @since 2.0.8\n\ndiff --git a/tests/framework/base/StandaloneActionTest.php b/tests/framework/base/StandaloneActionTest.php\nindex b88eef03e71..4a32492b922 100644\n--- a/tests/framework/base/StandaloneActionTest.php\n+++ b/tests/framework/base/StandaloneActionTest.php\n@@ -10,6 +10,7 @@\n \n namespace yiiunit\\framework\\base;\n \n+use PHPUnit\\Framework\\Attributes\\Group;\n use Yii;\n use yii\\base\\ActionEvent;\n use yii\\base\\Controller;\n@@ -20,6 +21,7 @@\n use yiiunit\\framework\\base\\stub\\standalone\\CancelingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\GreetAction;\n use yiiunit\\framework\\base\\stub\\standalone\\InjectingAction;\n+use yiiunit\\framework\\base\\stub\\standalone\\LifecycleRecordingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\MethodInjectingAction;\n use yiiunit\\framework\\base\\stub\\standalone\\NoRunAction;\n use yiiunit\\framework\\base\\stub\\standalone\\StubController;\n@@ -29,15 +31,14 @@\n /**\n * Unit tests for {@see \\yii\\base\\Action} when invoked standalone (without a hosting controller).\n *\n- * Covers the nullable `$controller` contract, module-aware {@see \\yii\\base\\Action::getUniqueId()} fallback,\n- * DI-based parameter resolution on `run()` via {@see \\yii\\di\\Container::resolveCallableDependencies()}, the\n- * `beforeRun()` cancellation hook, and behavior attachment via the action's own event triggers.\n+ * Covers the nullable `$controller` contract, module-aware {@see \\yii\\base\\Action::getUniqueId()} fallback, DI-based\n+ * parameter resolution on `run()` via {@see \\yii\\di\\Container::resolveCallableDependencies()}, the `beforeRun()`\n+ * cancellation hook, and behavior attachment via the action's own event triggers.\n *\n * @author Wilmer Arambula <terabytesoftw@gmail.com>\n * @since 22.0\n- *\n- * @group base\n */\n+#[Group('base')]\n final class StandaloneActionTest extends TestCase\n {\n protected function setUp(): void\n@@ -187,6 +188,24 @@ public function testStandaloneRunResolvesParamsViaContainer(): void\n );\n }\n \n+ public function testAfterRunFiresAfterStandaloneRun(): void\n+ {\n+ $action = new LifecycleRecordingAction('lifecycle', null);\n+\n+ $result = $action->runWithParams([]);\n+\n+ self::assertSame(\n+ 'done',\n+ $result,\n+ 'Result must propagate from run.',\n+ );\n+ self::assertSame(\n+ ['before', 'run', 'after'],\n+ $action->calls,\n+ 'Order: beforeRun, run, afterRun.',\n+ );\n+ }\n+\n public function testThrowInvalidConfigExceptionWhenActionHasNoRunMethod(): void\n {\n $action = new NoRunAction('broken', null);\ndiff --git a/tests/framework/base/stub/standalone/LifecycleRecordingAction.php b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\nnew file mode 100644\nindex 00000000000..541bada0626\n--- /dev/null\n+++ b/tests/framework/base/stub/standalone/LifecycleRecordingAction.php\n@@ -0,0 +1,44 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\base\\stub\\standalone;\n+\n+use yii\\base\\Action;\n+\n+/**\n+ * Action recording the `beforeRun()`, `run()`, and `afterRun()` call order for standalone lifecycle tests.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class LifecycleRecordingAction extends Action\n+{\n+ /** @var list<string> */\n+ public array $calls = [];\n+\n+ public function run(): string\n+ {\n+ $this->calls[] = 'run';\n+\n+ return 'done';\n+ }\n+\n+ protected function beforeRun(): bool\n+ {\n+ $this->calls[] = 'before';\n+\n+ return true;\n+ }\n+\n+ protected function afterRun(): void\n+ {\n+ $this->calls[] = 'after';\n+ }\n+}\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex e67bc13078c..81468d56c04 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -1,5 +1,7 @@\n <?php\n \n+declare(strict_types=1);\n+\n /**\n * @link https://www.yiiframework.com/\n * @copyright Copyright (c) 2008 Yii Software LLC\n@@ -8,8 +10,10 @@\n \n namespace yiiunit\\framework\\helpers;\n \n+use PHPUnit\\Framework\\Attributes\\Group;\n use Yii;\n use yii\\base\\Action;\n+use yii\\base\\InvalidConfigException;\n use yii\\base\\Module;\n use yii\\helpers\\Url;\n use yii\\web\\Controller;\n@@ -18,9 +22,9 @@\n use yiiunit\\TestCase;\n \n /**\n- * UrlTest.\n- * @group helpers\n+ * Unit tests for {@see \\yii\\helpers\\Url}.\n */\n+#[Group('helpers')]\n class UrlTest extends TestCase\n {\n protected function setUp(): void\n@@ -296,6 +300,48 @@ public function testCanonical(): void\n $this->removeMockedAction();\n }\n \n+ public function testCurrentFallsBackToRequestedRouteWhenControllerIsNull(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = 'page/view';\n+\n+ Yii::$app->request->setQueryParams(['id' => 10]);\n+\n+ self::assertSame(\n+ '/base/index.php?r=page%2Fview&id=10',\n+ Url::current(),\n+ '`requestedRoute` must supply the route when no controller is active.',\n+ );\n+ }\n+\n+ public function testCanonicalFallsBackToRequestedRouteWhenControllerIsNull(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = 'page/view';\n+\n+ self::assertSame(\n+ 'http://example.com/base/index.php?r=page%2Fview',\n+ Url::canonical(),\n+ '`requestedRoute` must supply the canonical route when no controller is active.',\n+ );\n+ }\n+\n+ public function testThrowInvalidConfigExceptionWhenCurrentRouteCannotBeResolved(): void\n+ {\n+ $this->removeMockedAction();\n+\n+ Yii::$app->requestedRoute = null;\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage(\n+ 'Unable to determine the current route: no active controller and \"Application::$requestedRoute\" is empty.',\n+ );\n+\n+ Url::current();\n+ }\n+\n public function testIsRelative(): void\n {\n $this->assertTrue(Url::isRelative('/test/index.php'));\ndiff --git a/tests/framework/web/WebActionTest.php b/tests/framework/web/WebActionTest.php\nindex 4bbcbe6e58c..12969303bc7 100644\n--- a/tests/framework/web/WebActionTest.php\n+++ b/tests/framework/web/WebActionTest.php\n@@ -14,8 +14,15 @@\n use Yii;\n use yii\\base\\Module;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\MethodNotAllowedHttpException;\n+use yii\\web\\ServerErrorHttpException;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n use yiiunit\\framework\\web\\stub\\standalone\\CoerceIntAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\GuardedAction;\n use yiiunit\\framework\\web\\stub\\standalone\\LegacyConstructorWebAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\ModuleServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\NullableServiceAction;\n+use yiiunit\\framework\\web\\stub\\standalone\\RequiredServiceAction;\n use yiiunit\\TestCase;\n \n /**\n@@ -136,4 +143,122 @@ public function testLegacyConstructorWebActionObservesNullIdInInit(): void\n 'Unique ID must combine the module ID and the route segment.',\n );\n }\n+\n+ public function testWebActionInjectsNullForUnresolvableNullableService(): void\n+ {\n+ $action = new NullableServiceAction('optional', null);\n+\n+ $result = $action->runWithParams([]);\n+\n+ self::assertSame(\n+ 'null',\n+ $result,\n+ \"Unresolvable nullable service must inject 'null'.\",\n+ );\n+ }\n+\n+ public function testThrowServerErrorHttpExceptionWhenStandaloneDependencyIsUnresolvable(): void\n+ {\n+ $action = new RequiredServiceAction('required', null);\n+\n+ $this->expectException(ServerErrorHttpException::class);\n+ $this->expectExceptionMessage(\n+ 'Could not load required service: dependency',\n+ );\n+\n+ $action->runWithParams([]);\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleComponent(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set('service', ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module component must satisfy the typed parameter.',\n+ );\n+ self::assertStringStartsWith(\n+ 'Component:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged Component.',\n+ );\n+ }\n+\n+ public function testWebActionResolvesServiceViaModuleDiDefinition(): void\n+ {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['svc' => ModuleServiceAction::class];\n+\n+ $module->set(ActionTestService::class, ActionTestService::class);\n+\n+ $result = $module->runAction('svc');\n+\n+ self::assertSame(\n+ 'svc',\n+ $result,\n+ 'Module DI definition must satisfy the typed parameter.',\n+ );\n+ self::assertStringContainsString(\n+ 'DI:',\n+ Yii::$app->requestedParams['service'],\n+ 'Resolution path must be tagged as module DI.',\n+ );\n+ }\n+\n+ public function testStandaloneActionRunsWhenVerbFilterAllowsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'POST';\n+\n+ try {\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ self::assertSame(\n+ 'ok',\n+ $module->runAction('guarded'),\n+ 'Allowed verb must let the standalone action run.',\n+ );\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ public function testThrowMethodNotAllowedHttpExceptionWhenVerbFilterRejectsMethod(): void\n+ {\n+ $originalMethod = $_SERVER['REQUEST_METHOD'] ?? null;\n+ $_SERVER['REQUEST_METHOD'] = 'GET';\n+\n+ $module = new Module('mymod', Yii::$app);\n+\n+ $module->actionMap = ['guarded' => GuardedAction::class];\n+\n+ try {\n+ $this->expectException(MethodNotAllowedHttpException::class);\n+\n+ $module->runAction('guarded');\n+ } finally {\n+ $this->restoreRequestMethod($originalMethod);\n+ }\n+ }\n+\n+ private function restoreRequestMethod(string|null $method): void\n+ {\n+ if ($method === null) {\n+ unset($_SERVER['REQUEST_METHOD']);\n+\n+ return;\n+ }\n+\n+ $_SERVER['REQUEST_METHOD'] = $method;\n+ }\n }\ndiff --git a/tests/framework/web/stub/standalone/GuardedAction.php b/tests/framework/web/stub/standalone/GuardedAction.php\nnew file mode 100644\nindex 00000000000..ca75bc9687f\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/GuardedAction.php\n@@ -0,0 +1,38 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\filters\\VerbFilter;\n+use yii\\web\\Action;\n+\n+/**\n+ * Standalone action guarded by a {@see VerbFilter} behavior, used to test real filters through module dispatch.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class GuardedAction extends Action\n+{\n+ public function behaviors(): array\n+ {\n+ return [\n+ 'verbs' => [\n+ 'class' => VerbFilter::class,\n+ 'actions' => ['guarded' => ['POST']],\n+ ],\n+ ];\n+ }\n+\n+ public function run(): string\n+ {\n+ return 'ok';\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/ModuleServiceAction.php b/tests/framework/web/stub/standalone/ModuleServiceAction.php\nnew file mode 100644\nindex 00000000000..5b02ac8dba2\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/ModuleServiceAction.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n+\n+/**\n+ * Action whose `run()` depends on a typed service, used to test module component and module DI resolution paths.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class ModuleServiceAction extends Action\n+{\n+ public function run(ActionTestService $service): string\n+ {\n+ return $service->name();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/NullableServiceAction.php b/tests/framework/web/stub/standalone/NullableServiceAction.php\nnew file mode 100644\nindex 00000000000..783a71f3833\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/NullableServiceAction.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+use yiiunit\\framework\\base\\stub\\standalone\\ActionTestService;\n+\n+/**\n+ * Action used for testing nullable service injection in {@see \\yii\\web\\Action::resolveStandaloneParams()}.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class NullableServiceAction extends Action\n+{\n+ public function run(?ActionTestService $service): string\n+ {\n+ return $service === null ? 'null' : $service->name();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/RequiredServiceAction.php b/tests/framework/web/stub/standalone/RequiredServiceAction.php\nnew file mode 100644\nindex 00000000000..6b71de8a1e4\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/RequiredServiceAction.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+use yii\\web\\Action;\n+\n+/**\n+ * Action whose `run()` requires an unresolvable non-nullable dependency, used to assert HTTP-aware DI failure mapping.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class RequiredServiceAction extends Action\n+{\n+ public function run(UnregisteredDependency $dependency): string\n+ {\n+ return $dependency->value();\n+ }\n+}\ndiff --git a/tests/framework/web/stub/standalone/UnregisteredDependency.php b/tests/framework/web/stub/standalone/UnregisteredDependency.php\nnew file mode 100644\nindex 00000000000..de15c2e2052\n--- /dev/null\n+++ b/tests/framework/web/stub/standalone/UnregisteredDependency.php\n@@ -0,0 +1,25 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\web\\stub\\standalone;\n+\n+/**\n+ * Service never registered in any container, used to force an unresolvable non-nullable dependency.\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 22.0\n+ */\n+final class UnregisteredDependency\n+{\n+ public function value(): string\n+ {\n+ return 'never';\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":8,"string":"8"},"num_changed_files":{"kind":"number","value":13,"string":"13"}}},{"rowIdx":34258,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20892"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20892,"string":"20,892"},"base_sha":{"kind":"string","value":"1b37da4fd1d4bfd0ab1a23eee5618efd45dbaf96"},"head_sha":{"kind":"string","value":"446ae2532595144a53d3205825e9f5f953f230f6"},"task":{"kind":"string","value":"Sync to master brach.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `build/controllers/` needed for: Sync to master brach.","scope_files":["build/controllers/MimeTypeController.php"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/` needed for: Sync to master brach.","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/helpers/` needed for: Sync to master brach.","scope_files":["framework/helpers/mimeAliases.php"]},{"subtask_id":"s4","goal":"Implement the changes under `framework/web/` needed for: Sync to master brach.","scope_files":["framework/web/JsonParser.php","framework/web/Request.php","framework/web/RequestParserInterface.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/helpers/` needed for: Sync to master brach.","scope_files":["tests/framework/helpers/FileHelperTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/helpers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/helpers/mimeAliases.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `framework/web/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/web/JsonParser.php\",\n \"framework/web/Request.php\",\n \"framework/web/RequestParserInterface.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/helpers/FileHelperTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["build/controllers/MimeTypeController.php"],"solution_diff":"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n \n /**\n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s2","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex ddf2c269d45..31153757114 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -84,6 +84,10 @@ Yii Framework 2 Change Log\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s3","scope_files":["framework/helpers/mimeAliases.php"],"solution_diff":"diff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\nindex c225d6f8f3b..29f37f875f9 100644\n--- a/framework/helpers/mimeAliases.php\n+++ b/framework/helpers/mimeAliases.php\n@@ -23,4 +23,5 @@\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n","summary":"Edited 1 file(s) in framework/helpers/"},{"subtask_id":"s4","scope_files":["framework/web/JsonParser.php","framework/web/Request.php","framework/web/RequestParserInterface.php"],"solution_diff":"diff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\nindex a1147fbaa31..8410fec1430 100644\n--- a/framework/web/JsonParser.php\n+++ b/framework/web/JsonParser.php\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|\\stdClass parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\n */\n public function parse($rawBody, $contentType)\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\nindex 008e7eeca30..d88eaf08b75 100644\n--- a/framework/web/Request.php\n+++ b/framework/web/Request.php\n@@ -41,7 +41,7 @@\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\n * not given.\n * @property string $baseUrl The relative URL for the application.\n- * @property array|object $bodyParams The request parameters given in the request body.\n+ * @property mixed $bodyParams The request parameters given in the request body.\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\n * not available.\n * @property-read CookieCollection $cookies The cookie collection.\n@@ -578,7 +578,7 @@ public function setRawBody($rawBody)\n $this->_rawBody = $rawBody;\n }\n \n- /** @var array|object */\n+ /** @var mixed */\n private $_bodyParams;\n \n /**\n@@ -587,7 +587,7 @@ public function setRawBody($rawBody)\n * Request parameters are determined using the parsers configured in [[parsers]] property.\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\n * to parse the [[rawBody|request body]].\n- * @return array|object the request parameters given in the request body.\n+ * @return mixed the request parameters given in the request body.\n * @throws \\yii\\base\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\n * @see getMethod()\n * @see getBodyParam()\n@@ -637,7 +637,7 @@ public function getBodyParams()\n /**\n * Sets the request body parameters.\n *\n- * @param array|object $values the request body parameters (name-value pairs)\n+ * @param mixed $values the request body parameters (name-value pairs)\n * @see getBodyParams()\n */\n public function setBodyParams($values)\n@@ -677,7 +677,7 @@ public function getBodyParam($name, $defaultValue = null)\n *\n * @param string|null $name the parameter name\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\n- * @return ($name is null ? array|object : mixed)\n+ * @return mixed\n */\n public function post($name = null, $defaultValue = null)\n {\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\nindex 5c1d5bcb41a..0164289d88e 100644\n--- a/framework/web/RequestParserInterface.php\n+++ b/framework/web/RequestParserInterface.php\n@@ -20,7 +20,7 @@ interface RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|object parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n */\n public function parse($rawBody, $contentType);\n }\n\n","summary":"Edited 3 file(s) in framework/web/"},{"subtask_id":"s5","scope_files":["tests/framework/helpers/FileHelperTest.php"],"solution_diff":"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\nindex 9a9fe8870ac..41dbd8f5af0 100644\n--- a/tests/framework/helpers/FileHelperTest.php\n+++ b/tests/framework/helpers/FileHelperTest.php\n@@ -1301,6 +1301,18 @@ public static function getExtensionsByMimeTypeProvider(): array\n 'pjpeg',\n ],\n ],\n+ [\n+ 'application/x-rar-compressed',\n+ [\n+ 'rar',\n+ ],\n+ ],\n+ [\n+ 'application/x-rar',\n+ [\n+ 'rar',\n+ ],\n+ ],\n ];\n }\n \n@@ -1321,6 +1333,10 @@ public static function getExtensionByMimeTypeProvider(): array\n ['application/json', false, 'json'],\n ['image/jpeg', true, 'jpg'],\n ['image/jpeg', false, 'jpeg'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar-compressed', false, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n+ ['application/x-rar', false, 'rar'],\n ];\n }\n }\n","summary":"Edited 1 file(s) in tests/framework/helpers/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\\nindex d8709cdca6e..2549f67ea23 100644\\n--- a/build/controllers/MimeTypeController.php\\n+++ b/build/controllers/MimeTypeController.php\\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\\n 'application/bmp' => 'image/bmp',\\n 'application/x-bmp' => 'image/bmp',\\n 'application/x-win-bitmap' => 'image/bmp',\\n+ 'application/x-rar' => 'application/x-rar-compressed',\\n ];\\n \\n /**\\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex ddf2c269d45..31153757114 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -84,6 +84,10 @@ Yii Framework 2 Change Log\\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\\\db\\\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\\n - Bug #20878: Fix `@var` annotation for `yii\\\\db\\\\Query::$from` (mspirkov)\\n - Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/helpers/mimeAliases.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\\nindex c225d6f8f3b..29f37f875f9 100644\\n--- a/framework/helpers/mimeAliases.php\\n+++ b/framework/helpers/mimeAliases.php\\n@@ -23,4 +23,5 @@\\n 'application/bmp' => 'image/bmp',\\n 'application/x-bmp' => 'image/bmp',\\n 'application/x-win-bitmap' => 'image/bmp',\\n+ 'application/x-rar' => 'application/x-rar-compressed',\\n ];\\n\",\n \"summary\": \"Edited 1 file(s) in framework/helpers/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"framework/web/JsonParser.php\",\n \"framework/web/Request.php\",\n \"framework/web/RequestParserInterface.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\\nindex a1147fbaa31..8410fec1430 100644\\n--- a/framework/web/JsonParser.php\\n+++ b/framework/web/JsonParser.php\\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\\n * Parses a HTTP request body.\\n * @param string $rawBody the raw HTTP request body.\\n * @param string $contentType the content type specified for the request body.\\n- * @return array|\\\\stdClass parameters parsed from the request body\\n+ * @return mixed parameters parsed from the request body\\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\\n */\\n public function parse($rawBody, $contentType)\\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\\nindex 008e7eeca30..d88eaf08b75 100644\\n--- a/framework/web/Request.php\\n+++ b/framework/web/Request.php\\n@@ -41,7 +41,7 @@\\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\\n * not given.\\n * @property string $baseUrl The relative URL for the application.\\n- * @property array|object $bodyParams The request parameters given in the request body.\\n+ * @property mixed $bodyParams The request parameters given in the request body.\\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\\n * not available.\\n * @property-read CookieCollection $cookies The cookie collection.\\n@@ -578,7 +578,7 @@ public function setRawBody($rawBody)\\n $this->_rawBody = $rawBody;\\n }\\n \\n- /** @var array|object */\\n+ /** @var mixed */\\n private $_bodyParams;\\n \\n /**\\n@@ -587,7 +587,7 @@ public function setRawBody($rawBody)\\n * Request parameters are determined using the parsers configured in [[parsers]] property.\\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\\n * to parse the [[rawBody|request body]].\\n- * @return array|object the request parameters given in the request body.\\n+ * @return mixed the request parameters given in the request body.\\n * @throws \\\\yii\\\\base\\\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\\n * @see getMethod()\\n * @see getBodyParam()\\n@@ -637,7 +637,7 @@ public function getBodyParams()\\n /**\\n * Sets the request body parameters.\\n *\\n- * @param array|object $values the request body parameters (name-value pairs)\\n+ * @param mixed $values the request body parameters (name-value pairs)\\n * @see getBodyParams()\\n */\\n public function setBodyParams($values)\\n@@ -677,7 +677,7 @@ public function getBodyParam($name, $defaultValue = null)\\n *\\n * @param string|null $name the parameter name\\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\\n- * @return ($name is null ? array|object : mixed)\\n+ * @return mixed\\n */\\n public function post($name = null, $defaultValue = null)\\n {\\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\\nindex 5c1d5bcb41a..0164289d88e 100644\\n--- a/framework/web/RequestParserInterface.php\\n+++ b/framework/web/RequestParserInterface.php\\n@@ -20,7 +20,7 @@ interface RequestParserInterface\\n * Parses a HTTP request body.\\n * @param string $rawBody the raw HTTP request body.\\n * @param string $contentType the content type specified for the request body.\\n- * @return array|object parameters parsed from the request body\\n+ * @return mixed parameters parsed from the request body\\n */\\n public function parse($rawBody, $contentType);\\n }\\n\\n\",\n \"summary\": \"Edited 3 file(s) in framework/web/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/helpers/FileHelperTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\\nindex 9a9fe8870ac..41dbd8f5af0 100644\\n--- a/tests/framework/helpers/FileHelperTest.php\\n+++ b/tests/framework/helpers/FileHelperTest.php\\n@@ -1301,6 +1301,18 @@ public static function getExtensionsByMimeTypeProvider(): array\\n 'pjpeg',\\n ],\\n ],\\n+ [\\n+ 'application/x-rar-compressed',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n+ [\\n+ 'application/x-rar',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n ];\\n }\\n \\n@@ -1321,6 +1333,10 @@ public static function getExtensionByMimeTypeProvider(): array\\n ['application/json', false, 'json'],\\n ['image/jpeg', true, 'jpg'],\\n ['image/jpeg', false, 'jpeg'],\\n+ ['application/x-rar-compressed', true, 'rar'],\\n+ ['application/x-rar-compressed', false, 'rar'],\\n+ ['application/x-rar', true, 'rar'],\\n+ ['application/x-rar', false, 'rar'],\\n ];\\n }\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/helpers/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n \n /**\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex ddf2c269d45..31153757114 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -84,6 +84,10 @@ Yii Framework 2 Change Log\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\nindex c225d6f8f3b..29f37f875f9 100644\n--- a/framework/helpers/mimeAliases.php\n+++ b/framework/helpers/mimeAliases.php\n@@ -23,4 +23,5 @@\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\ndiff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\nindex a1147fbaa31..8410fec1430 100644\n--- a/framework/web/JsonParser.php\n+++ b/framework/web/JsonParser.php\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|\\stdClass parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\n */\n public function parse($rawBody, $contentType)\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\nindex 008e7eeca30..d88eaf08b75 100644\n--- a/framework/web/Request.php\n+++ b/framework/web/Request.php\n@@ -41,7 +41,7 @@\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\n * not given.\n * @property string $baseUrl The relative URL for the application.\n- * @property array|object $bodyParams The request parameters given in the request body.\n+ * @property mixed $bodyParams The request parameters given in the request body.\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\n * not available.\n * @property-read CookieCollection $cookies The cookie collection.\n@@ -578,7 +578,7 @@ public function setRawBody($rawBody)\n $this->_rawBody = $rawBody;\n }\n \n- /** @var array|object */\n+ /** @var mixed */\n private $_bodyParams;\n \n /**\n@@ -587,7 +587,7 @@ public function setRawBody($rawBody)\n * Request parameters are determined using the parsers configured in [[parsers]] property.\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\n * to parse the [[rawBody|request body]].\n- * @return array|object the request parameters given in the request body.\n+ * @return mixed the request parameters given in the request body.\n * @throws \\yii\\base\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\n * @see getMethod()\n * @see getBodyParam()\n@@ -637,7 +637,7 @@ public function getBodyParams()\n /**\n * Sets the request body parameters.\n *\n- * @param array|object $values the request body parameters (name-value pairs)\n+ * @param mixed $values the request body parameters (name-value pairs)\n * @see getBodyParams()\n */\n public function setBodyParams($values)\n@@ -677,7 +677,7 @@ public function getBodyParam($name, $defaultValue = null)\n *\n * @param string|null $name the parameter name\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\n- * @return ($name is null ? array|object : mixed)\n+ * @return mixed\n */\n public function post($name = null, $defaultValue = null)\n {\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\nindex 5c1d5bcb41a..0164289d88e 100644\n--- a/framework/web/RequestParserInterface.php\n+++ b/framework/web/RequestParserInterface.php\n@@ -20,7 +20,7 @@ interface RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|object parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n */\n public function parse($rawBody, $contentType);\n }\n\ndiff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\nindex 9a9fe8870ac..41dbd8f5af0 100644\n--- a/tests/framework/helpers/FileHelperTest.php\n+++ b/tests/framework/helpers/FileHelperTest.php\n@@ -1301,6 +1301,18 @@ public static function getExtensionsByMimeTypeProvider(): array\n 'pjpeg',\n ],\n ],\n+ [\n+ 'application/x-rar-compressed',\n+ [\n+ 'rar',\n+ ],\n+ ],\n+ [\n+ 'application/x-rar',\n+ [\n+ 'rar',\n+ ],\n+ ],\n ];\n }\n \n@@ -1321,6 +1333,10 @@ public static function getExtensionByMimeTypeProvider(): array\n ['application/json', false, 'json'],\n ['image/jpeg', true, 'jpg'],\n ['image/jpeg', false, 'jpeg'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar-compressed', false, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n+ ['application/x-rar', false, 'rar'],\n ];\n }\n }\n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":7,"string":"7"}}},{"rowIdx":34259,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20891"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20891,"string":"20,891"},"base_sha":{"kind":"string","value":"1b2fc6812bae97674d885021c64b20f8616710e3"},"head_sha":{"kind":"string","value":"7c76543e65eb30ff3603c7ab6d9133c6b478888c"},"task":{"kind":"string","value":"Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `framework/` needed for: Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/web/` needed for: Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`","scope_files":["framework/web/JsonParser.php","framework/web/Request.php","framework/web/RequestParserInterface.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `framework/` needed for: Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/web/` needed for: Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`\",\n \"scope_files\": [\n \"framework/web/JsonParser.php\",\n \"framework/web/Request.php\",\n \"framework/web/RequestParserInterface.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b355f2e7d36..4bba8cbfa39 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -13,6 +13,9 @@ Yii Framework 2 Change Log\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n - Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s2","scope_files":["framework/web/JsonParser.php","framework/web/Request.php","framework/web/RequestParserInterface.php"],"solution_diff":"diff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\nindex a1147fbaa31..8410fec1430 100644\n--- a/framework/web/JsonParser.php\n+++ b/framework/web/JsonParser.php\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|\\stdClass parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\n */\n public function parse($rawBody, $contentType)\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\nindex 86694222f75..59b9f0cb7c9 100644\n--- a/framework/web/Request.php\n+++ b/framework/web/Request.php\n@@ -41,7 +41,7 @@\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\n * not given.\n * @property string $baseUrl The relative URL for the application.\n- * @property array|object $bodyParams The request parameters given in the request body.\n+ * @property mixed $bodyParams The request parameters given in the request body.\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\n * not available.\n * @property-read CookieCollection $cookies The cookie collection.\n@@ -583,7 +583,7 @@ public function setRawBody($rawBody)\n $this->_rawBody = $rawBody;\n }\n \n- /** @var array|object */\n+ /** @var mixed */\n private $_bodyParams;\n \n /**\n@@ -592,7 +592,7 @@ public function setRawBody($rawBody)\n * Request parameters are determined using the parsers configured in [[parsers]] property.\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\n * to parse the [[rawBody|request body]].\n- * @return array|object the request parameters given in the request body.\n+ * @return mixed the request parameters given in the request body.\n * @throws \\yii\\base\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\n * @see getMethod()\n * @see getBodyParam()\n@@ -642,7 +642,7 @@ public function getBodyParams()\n /**\n * Sets the request body parameters.\n *\n- * @param array|object $values the request body parameters (name-value pairs)\n+ * @param mixed $values the request body parameters (name-value pairs)\n * @see getBodyParams()\n */\n public function setBodyParams($values)\n@@ -682,7 +682,7 @@ public function getBodyParam($name, $defaultValue = null)\n *\n * @param string|null $name the parameter name\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\n- * @return ($name is null ? array|object : mixed)\n+ * @return mixed\n */\n public function post($name = null, $defaultValue = null)\n {\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\nindex 5c1d5bcb41a..0164289d88e 100644\n--- a/framework/web/RequestParserInterface.php\n+++ b/framework/web/RequestParserInterface.php\n@@ -20,7 +20,7 @@ interface RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|object parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n */\n public function parse($rawBody, $contentType);\n }\n","summary":"Edited 3 file(s) in framework/web/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex b355f2e7d36..4bba8cbfa39 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -13,6 +13,9 @@ Yii Framework 2 Change Log\\n - Bug #20878: Fix `@var` annotation for `yii\\\\db\\\\Query::$from` (mspirkov)\\n - Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n - Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/web/JsonParser.php\",\n \"framework/web/Request.php\",\n \"framework/web/RequestParserInterface.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\\nindex a1147fbaa31..8410fec1430 100644\\n--- a/framework/web/JsonParser.php\\n+++ b/framework/web/JsonParser.php\\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\\n * Parses a HTTP request body.\\n * @param string $rawBody the raw HTTP request body.\\n * @param string $contentType the content type specified for the request body.\\n- * @return array|\\\\stdClass parameters parsed from the request body\\n+ * @return mixed parameters parsed from the request body\\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\\n */\\n public function parse($rawBody, $contentType)\\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\\nindex 86694222f75..59b9f0cb7c9 100644\\n--- a/framework/web/Request.php\\n+++ b/framework/web/Request.php\\n@@ -41,7 +41,7 @@\\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\\n * not given.\\n * @property string $baseUrl The relative URL for the application.\\n- * @property array|object $bodyParams The request parameters given in the request body.\\n+ * @property mixed $bodyParams The request parameters given in the request body.\\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\\n * not available.\\n * @property-read CookieCollection $cookies The cookie collection.\\n@@ -583,7 +583,7 @@ public function setRawBody($rawBody)\\n $this->_rawBody = $rawBody;\\n }\\n \\n- /** @var array|object */\\n+ /** @var mixed */\\n private $_bodyParams;\\n \\n /**\\n@@ -592,7 +592,7 @@ public function setRawBody($rawBody)\\n * Request parameters are determined using the parsers configured in [[parsers]] property.\\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\\n * to parse the [[rawBody|request body]].\\n- * @return array|object the request parameters given in the request body.\\n+ * @return mixed the request parameters given in the request body.\\n * @throws \\\\yii\\\\base\\\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\\n * @see getMethod()\\n * @see getBodyParam()\\n@@ -642,7 +642,7 @@ public function getBodyParams()\\n /**\\n * Sets the request body parameters.\\n *\\n- * @param array|object $values the request body parameters (name-value pairs)\\n+ * @param mixed $values the request body parameters (name-value pairs)\\n * @see getBodyParams()\\n */\\n public function setBodyParams($values)\\n@@ -682,7 +682,7 @@ public function getBodyParam($name, $defaultValue = null)\\n *\\n * @param string|null $name the parameter name\\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\\n- * @return ($name is null ? array|object : mixed)\\n+ * @return mixed\\n */\\n public function post($name = null, $defaultValue = null)\\n {\\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\\nindex 5c1d5bcb41a..0164289d88e 100644\\n--- a/framework/web/RequestParserInterface.php\\n+++ b/framework/web/RequestParserInterface.php\\n@@ -20,7 +20,7 @@ interface RequestParserInterface\\n * Parses a HTTP request body.\\n * @param string $rawBody the raw HTTP request body.\\n * @param string $contentType the content type specified for the request body.\\n- * @return array|object parameters parsed from the request body\\n+ * @return mixed parameters parsed from the request body\\n */\\n public function parse($rawBody, $contentType);\\n }\\n\",\n \"summary\": \"Edited 3 file(s) in framework/web/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s2","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Complete the type-doc update for `bodyParams` to avoid conflicting contracts.**\n\nThese new `mixed` annotations conflict with existing docs that still state `array|object` (Line 44 `@property $bodyParams`, Line 595 `getBodyParams()` return). Please align those remaining docblocks so the request body type contract is consistent across `Request`.\n \n\n\nAlso applies to: 645-645, 685-685\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@framework/web/Request.php` at line 586, Update the remaining docblocks so the\nRequest body type is consistent with the new mixed annotation: change the\nclass-level `@property` for $bodyParams and the `@return/`@var docblocks on\ngetBodyParams (and the other two occurrences noted) from \"array|object\" to\n\"mixed\" so all references (property $bodyParams, method getBodyParams, and the\nother docblocks around those locations) use the same mixed type contract.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commits b988e46 to 7c76543","revised_diff":"diff --git a/framework/web/Request.php b/framework/web/Request.php\nindex 86694222f75..59b9f0cb7c9 100644\n--- a/framework/web/Request.php\n+++ b/framework/web/Request.php\n@@ -41,7 +41,7 @@\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\n * not given.\n * @property string $baseUrl The relative URL for the application.\n- * @property array|object $bodyParams The request parameters given in the request body.\n+ * @property mixed $bodyParams The request parameters given in the request body.\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\n * not available.\n * @property-read CookieCollection $cookies The cookie collection.\n@@ -583,7 +583,7 @@ public function setRawBody($rawBody)\n $this->_rawBody = $rawBody;\n }\n \n- /** @var array|object */\n+ /** @var mixed */\n private $_bodyParams;\n \n /**\n@@ -592,7 +592,7 @@ public function setRawBody($rawBody)\n * Request parameters are determined using the parsers configured in [[parsers]] property.\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\n * to parse the [[rawBody|request body]].\n- * @return array|object the request parameters given in the request body.\n+ * @return mixed the request parameters given in the request body.\n * @throws \\yii\\base\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\n * @see getMethod()\n * @see getBodyParam()\n@@ -642,7 +642,7 @@ public function getBodyParams()\n /**\n * Sets the request body parameters.\n *\n- * @param array|object $values the request body parameters (name-value pairs)\n+ * @param mixed $values the request body parameters (name-value pairs)\n * @see getBodyParams()\n */\n public function setBodyParams($values)\n@@ -682,7 +682,7 @@ public function getBodyParam($name, $defaultValue = null)\n *\n * @param string|null $name the parameter name\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\n- * @return ($name is null ? array|object : mixed)\n+ * @return mixed\n */\n public function post($name = null, $defaultValue = null)\n {\n"}],"string":"[\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Complete the type-doc update for `bodyParams` to avoid conflicting contracts.**\\n\\nThese new `mixed` annotations conflict with existing docs that still state `array|object` (Line 44 `@property $bodyParams`, Line 595 `getBodyParams()` return). Please align those remaining docblocks so the request body type contract is consistent across `Request`.\\n \\n\\n\\nAlso applies to: 645-645, 685-685\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@framework/web/Request.php` at line 586, Update the remaining docblocks so the\\nRequest body type is consistent with the new mixed annotation: change the\\nclass-level `@property` for $bodyParams and the `@return/`@var docblocks on\\ngetBodyParams (and the other two occurrences noted) from \\\"array|object\\\" to\\n\\\"mixed\\\" so all references (property $bodyParams, method getBodyParams, and the\\nother docblocks around those locations) use the same mixed type contract.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commits b988e46 to 7c76543\",\n \"revised_diff\": \"diff --git a/framework/web/Request.php b/framework/web/Request.php\\nindex 86694222f75..59b9f0cb7c9 100644\\n--- a/framework/web/Request.php\\n+++ b/framework/web/Request.php\\n@@ -41,7 +41,7 @@\\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\\n * not given.\\n * @property string $baseUrl The relative URL for the application.\\n- * @property array|object $bodyParams The request parameters given in the request body.\\n+ * @property mixed $bodyParams The request parameters given in the request body.\\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\\n * not available.\\n * @property-read CookieCollection $cookies The cookie collection.\\n@@ -583,7 +583,7 @@ public function setRawBody($rawBody)\\n $this->_rawBody = $rawBody;\\n }\\n \\n- /** @var array|object */\\n+ /** @var mixed */\\n private $_bodyParams;\\n \\n /**\\n@@ -592,7 +592,7 @@ public function setRawBody($rawBody)\\n * Request parameters are determined using the parsers configured in [[parsers]] property.\\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\\n * to parse the [[rawBody|request body]].\\n- * @return array|object the request parameters given in the request body.\\n+ * @return mixed the request parameters given in the request body.\\n * @throws \\\\yii\\\\base\\\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\\n * @see getMethod()\\n * @see getBodyParam()\\n@@ -642,7 +642,7 @@ public function getBodyParams()\\n /**\\n * Sets the request body parameters.\\n *\\n- * @param array|object $values the request body parameters (name-value pairs)\\n+ * @param mixed $values the request body parameters (name-value pairs)\\n * @see getBodyParams()\\n */\\n public function setBodyParams($values)\\n@@ -682,7 +682,7 @@ public function getBodyParam($name, $defaultValue = null)\\n *\\n * @param string|null $name the parameter name\\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\\n- * @return ($name is null ? array|object : mixed)\\n+ * @return mixed\\n */\\n public function post($name = null, $defaultValue = null)\\n {\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b355f2e7d36..4bba8cbfa39 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -13,6 +13,9 @@ Yii Framework 2 Change Log\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n - Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n+- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBodyParams()`, and `Request::post()` (mspirkov)\n+- Bug #20891: Fix `@param` annotation for `$values` in `Request::setBodyParams()` (mspirkov)\n+- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php\nindex a1147fbaa31..8410fec1430 100644\n--- a/framework/web/JsonParser.php\n+++ b/framework/web/JsonParser.php\n@@ -43,7 +43,7 @@ class JsonParser implements RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|\\stdClass parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n * @throws BadRequestHttpException if the body contains invalid json and [[throwException]] is `true`.\n */\n public function parse($rawBody, $contentType)\ndiff --git a/framework/web/Request.php b/framework/web/Request.php\nindex 86694222f75..59b9f0cb7c9 100644\n--- a/framework/web/Request.php\n+++ b/framework/web/Request.php\n@@ -41,7 +41,7 @@\n * @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is\n * not given.\n * @property string $baseUrl The relative URL for the application.\n- * @property array|object $bodyParams The request parameters given in the request body.\n+ * @property mixed $bodyParams The request parameters given in the request body.\n * @property-read string $contentType Request content-type. Empty string is returned if this information is\n * not available.\n * @property-read CookieCollection $cookies The cookie collection.\n@@ -583,7 +583,7 @@ public function setRawBody($rawBody)\n $this->_rawBody = $rawBody;\n }\n \n- /** @var array|object */\n+ /** @var mixed */\n private $_bodyParams;\n \n /**\n@@ -592,7 +592,7 @@ public function setRawBody($rawBody)\n * Request parameters are determined using the parsers configured in [[parsers]] property.\n * If no parsers are configured for the current [[contentType]] it uses the PHP function `mb_parse_str()`\n * to parse the [[rawBody|request body]].\n- * @return array|object the request parameters given in the request body.\n+ * @return mixed the request parameters given in the request body.\n * @throws \\yii\\base\\InvalidConfigException if a registered parser does not implement the [[RequestParserInterface]].\n * @see getMethod()\n * @see getBodyParam()\n@@ -642,7 +642,7 @@ public function getBodyParams()\n /**\n * Sets the request body parameters.\n *\n- * @param array|object $values the request body parameters (name-value pairs)\n+ * @param mixed $values the request body parameters (name-value pairs)\n * @see getBodyParams()\n */\n public function setBodyParams($values)\n@@ -682,7 +682,7 @@ public function getBodyParam($name, $defaultValue = null)\n *\n * @param string|null $name the parameter name\n * @param mixed $defaultValue the default parameter value if the parameter does not exist.\n- * @return ($name is null ? array|object : mixed)\n+ * @return mixed\n */\n public function post($name = null, $defaultValue = null)\n {\ndiff --git a/framework/web/RequestParserInterface.php b/framework/web/RequestParserInterface.php\nindex 5c1d5bcb41a..0164289d88e 100644\n--- a/framework/web/RequestParserInterface.php\n+++ b/framework/web/RequestParserInterface.php\n@@ -20,7 +20,7 @@ interface RequestParserInterface\n * Parses a HTTP request body.\n * @param string $rawBody the raw HTTP request body.\n * @param string $contentType the content type specified for the request body.\n- * @return array|object parameters parsed from the request body\n+ * @return mixed parameters parsed from the request body\n */\n public function parse($rawBody, $contentType);\n }\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":4,"string":"4"}}},{"rowIdx":34260,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20884"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20884,"string":"20,884"},"base_sha":{"kind":"string","value":"7d6cf45aeb1f119cc4e23132190437ce5391cf7f"},"head_sha":{"kind":"string","value":"029a8d30920a8287478561eade0d9ee39c016ab7"},"task":{"kind":"string","value":"Can we add an additional mime-type for RAR?\n\nThe list of mime-types at https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types and in the framework only includes the `application/x-rar-compressed` type. \n\nhttps://github.com/yiisoft/yii2/blob/22889d314ab4ea20df00e594d4ef7fb09fa55f5a/framework/helpers/mimeExtensions.php#L805\n\nHowever, the finfo function can return `application/x-rar` for a RAR archive. \n\neg\n\n```php\n(new finfo(FILEINFO_MIME_TYPE))->buffer('archive.rar'); // application/x-rar\n```\n\nCan we add this additional variant, or is this already an edge case that doesn't belong in the framework?\n\nFix #20497: Add alias for application/x-rar-compressed (#20884)\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Tests added? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues | #20497\r\n\r\n## What does this PR do?\r\n\r\nAdds `application/x-rar` as an alias for `application/x-rar-compressed` so `FileHelper::getExtensionsByMimeType()` resolves both variants returned by PHP's `finfo`.\r\n\r\n`framework/helpers/mimeAliases.php` gets the new entry; the same line is mirrored in `build/controllers/MimeTypeController::$_aliases` (regeneration source of truth). Regression cases for `application/x-rar` and `application/x-rar-compressed` added to `FileHelperTest::getExtensionsByMimeTypeProvider` and `getExtensionByMimeTypeProvider`.\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `build/controllers/` needed for: Can we add an additional mime-type for RAR?","scope_files":["build/controllers/MimeTypeController.php"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/` needed for: Can we add an additional mime-type for RAR?","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/helpers/` needed for: Can we add an additional mime-type for RAR?","scope_files":["framework/helpers/mimeAliases.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/helpers/` needed for: Can we add an additional mime-type for RAR?","scope_files":["tests/framework/helpers/FileHelperTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Can we add an additional mime-type for RAR?\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/` needed for: Can we add an additional mime-type for RAR?\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/helpers/` needed for: Can we add an additional mime-type for RAR?\",\n \"scope_files\": [\n \"framework/helpers/mimeAliases.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/` needed for: Can we add an additional mime-type for RAR?\",\n \"scope_files\": [\n \"tests/framework/helpers/FileHelperTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["build/controllers/MimeTypeController.php"],"solution_diff":"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n \n /**\n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s2","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex d220536ddb5..b355f2e7d36 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -12,6 +12,7 @@ Yii Framework 2 Change Log\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s3","scope_files":["framework/helpers/mimeAliases.php"],"solution_diff":"diff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\nindex c225d6f8f3b..29f37f875f9 100644\n--- a/framework/helpers/mimeAliases.php\n+++ b/framework/helpers/mimeAliases.php\n@@ -23,4 +23,5 @@\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n\n","summary":"Edited 1 file(s) in framework/helpers/"},{"subtask_id":"s4","scope_files":["tests/framework/helpers/FileHelperTest.php"],"solution_diff":"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\nindex 785e22ae25d..f365cc4d273 100644\n--- a/tests/framework/helpers/FileHelperTest.php\n+++ b/tests/framework/helpers/FileHelperTest.php\n@@ -1308,6 +1308,18 @@ public static function getExtensionsByMimeTypeProvider(): array\n 'pjpeg',\n ],\n ],\n+ [\n+ 'application/x-rar-compressed',\n+ [\n+ 'rar',\n+ ],\n+ ],\n+ [\n+ 'application/x-rar',\n+ [\n+ 'rar',\n+ ],\n+ ],\n ];\n }\n \n@@ -1330,6 +1342,10 @@ public static function getExtensionByMimeTypeProvider(): array\n ['application/json', false, 'json'],\n ['image/jpeg', true, 'jpg'],\n ['image/jpeg', false, 'jpeg'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar-compressed', false, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n+ ['application/x-rar', false, 'rar'],\n ];\n }\n }\n","summary":"Edited 1 file(s) in tests/framework/helpers/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\\nindex d8709cdca6e..2549f67ea23 100644\\n--- a/build/controllers/MimeTypeController.php\\n+++ b/build/controllers/MimeTypeController.php\\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\\n 'application/bmp' => 'image/bmp',\\n 'application/x-bmp' => 'image/bmp',\\n 'application/x-win-bitmap' => 'image/bmp',\\n+ 'application/x-rar' => 'application/x-rar-compressed',\\n ];\\n \\n /**\\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex d220536ddb5..b355f2e7d36 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -12,6 +12,7 @@ Yii Framework 2 Change Log\\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\\\db\\\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\\n - Bug #20878: Fix `@var` annotation for `yii\\\\db\\\\Query::$from` (mspirkov)\\n - Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/helpers/mimeAliases.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\\nindex c225d6f8f3b..29f37f875f9 100644\\n--- a/framework/helpers/mimeAliases.php\\n+++ b/framework/helpers/mimeAliases.php\\n@@ -23,4 +23,5 @@\\n 'application/bmp' => 'image/bmp',\\n 'application/x-bmp' => 'image/bmp',\\n 'application/x-win-bitmap' => 'image/bmp',\\n+ 'application/x-rar' => 'application/x-rar-compressed',\\n ];\\n\\n\",\n \"summary\": \"Edited 1 file(s) in framework/helpers/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/helpers/FileHelperTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\\nindex 785e22ae25d..f365cc4d273 100644\\n--- a/tests/framework/helpers/FileHelperTest.php\\n+++ b/tests/framework/helpers/FileHelperTest.php\\n@@ -1308,6 +1308,18 @@ public static function getExtensionsByMimeTypeProvider(): array\\n 'pjpeg',\\n ],\\n ],\\n+ [\\n+ 'application/x-rar-compressed',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n+ [\\n+ 'application/x-rar',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n ];\\n }\\n \\n@@ -1330,6 +1342,10 @@ public static function getExtensionByMimeTypeProvider(): array\\n ['application/json', false, 'json'],\\n ['image/jpeg', true, 'jpg'],\\n ['image/jpeg', false, 'jpeg'],\\n+ ['application/x-rar-compressed', true, 'rar'],\\n+ ['application/x-rar-compressed', false, 'rar'],\\n+ ['application/x-rar', true, 'rar'],\\n+ ['application/x-rar', false, 'rar'],\\n ];\\n }\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/helpers/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s4","comment":"_๐งน Nitpick_ | _๐ต Trivial_ | _๐ค Low value_\n\n**Consider adding test cases with `preferShort=true` for completeness.**\n\nWhile the current test cases with `preferShort=false` are correct, adding test cases with `preferShort=true` would provide more comprehensive coverage. Since `rar` is already 3 characters (meeting the short preference threshold), both cases should return `'rar'`, but testing both confirms the behavior explicitly.\n\n\n\n<details>\n<summary>Optional: Add test cases with preferShort=true</summary>\n\n```diff\n ['image/jpeg', false, 'jpeg'],\n ['application/x-rar-compressed', false, 'rar'],\n ['application/x-rar', false, 'rar'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n ];\n```\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/helpers/FileHelperTest.php` around lines 1345 - 1346, Add\nparallel test cases in FileHelperTest that call the same helper with\npreferShort=true for the MIME types 'application/x-rar-compressed' and\n'application/x-rar' and assert the returned extension is 'rar'; update the data\nprovider or test array that currently contains ['application/x-rar-compressed',\nfalse, 'rar'] and ['application/x-rar', false, 'rar'] by adding matching entries\nwith true as the second element (i.e., ['application/x-rar-compressed', true,\n'rar'] and ['application/x-rar', true, 'rar']) so the test explicitly verifies\nbehavior when preferShort=true.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 029a8d3","revised_diff":"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\nindex 785e22ae25d..f365cc4d273 100644\n--- a/tests/framework/helpers/FileHelperTest.php\n+++ b/tests/framework/helpers/FileHelperTest.php\n@@ -1308,6 +1308,18 @@ public static function getExtensionsByMimeTypeProvider(): array\n 'pjpeg',\n ],\n ],\n+ [\n+ 'application/x-rar-compressed',\n+ [\n+ 'rar',\n+ ],\n+ ],\n+ [\n+ 'application/x-rar',\n+ [\n+ 'rar',\n+ ],\n+ ],\n ];\n }\n \n@@ -1330,6 +1342,10 @@ public static function getExtensionByMimeTypeProvider(): array\n ['application/json', false, 'json'],\n ['image/jpeg', true, 'jpg'],\n ['image/jpeg', false, 'jpeg'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar-compressed', false, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n+ ['application/x-rar', false, 'rar'],\n ];\n }\n }\n"}],"string":"[\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"_๐งน Nitpick_ | _๐ต Trivial_ | _๐ค Low value_\\n\\n**Consider adding test cases with `preferShort=true` for completeness.**\\n\\nWhile the current test cases with `preferShort=false` are correct, adding test cases with `preferShort=true` would provide more comprehensive coverage. Since `rar` is already 3 characters (meeting the short preference threshold), both cases should return `'rar'`, but testing both confirms the behavior explicitly.\\n\\n\\n\\n<details>\\n<summary>Optional: Add test cases with preferShort=true</summary>\\n\\n```diff\\n ['image/jpeg', false, 'jpeg'],\\n ['application/x-rar-compressed', false, 'rar'],\\n ['application/x-rar', false, 'rar'],\\n+ ['application/x-rar-compressed', true, 'rar'],\\n+ ['application/x-rar', true, 'rar'],\\n ];\\n```\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/helpers/FileHelperTest.php` around lines 1345 - 1346, Add\\nparallel test cases in FileHelperTest that call the same helper with\\npreferShort=true for the MIME types 'application/x-rar-compressed' and\\n'application/x-rar' and assert the returned extension is 'rar'; update the data\\nprovider or test array that currently contains ['application/x-rar-compressed',\\nfalse, 'rar'] and ['application/x-rar', false, 'rar'] by adding matching entries\\nwith true as the second element (i.e., ['application/x-rar-compressed', true,\\n'rar'] and ['application/x-rar', true, 'rar']) so the test explicitly verifies\\nbehavior when preferShort=true.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 029a8d3\",\n \"revised_diff\": \"diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\\nindex 785e22ae25d..f365cc4d273 100644\\n--- a/tests/framework/helpers/FileHelperTest.php\\n+++ b/tests/framework/helpers/FileHelperTest.php\\n@@ -1308,6 +1308,18 @@ public static function getExtensionsByMimeTypeProvider(): array\\n 'pjpeg',\\n ],\\n ],\\n+ [\\n+ 'application/x-rar-compressed',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n+ [\\n+ 'application/x-rar',\\n+ [\\n+ 'rar',\\n+ ],\\n+ ],\\n ];\\n }\\n \\n@@ -1330,6 +1342,10 @@ public static function getExtensionByMimeTypeProvider(): array\\n ['application/json', false, 'json'],\\n ['image/jpeg', true, 'jpg'],\\n ['image/jpeg', false, 'jpeg'],\\n+ ['application/x-rar-compressed', true, 'rar'],\\n+ ['application/x-rar-compressed', false, 'rar'],\\n+ ['application/x-rar', true, 'rar'],\\n+ ['application/x-rar', false, 'rar'],\\n ];\\n }\\n }\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -47,6 +47,7 @@ class MimeTypeController extends Controller\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n \n /**\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex d220536ddb5..b355f2e7d36 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -12,6 +12,7 @@ Yii Framework 2 Change Log\n - Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n - Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n+- Enh #20884: Add `application/x-rar` as an alias of `application/x-rar-compressed` in MIME aliases (WarLikeLaux)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/helpers/mimeAliases.php b/framework/helpers/mimeAliases.php\nindex c225d6f8f3b..29f37f875f9 100644\n--- a/framework/helpers/mimeAliases.php\n+++ b/framework/helpers/mimeAliases.php\n@@ -23,4 +23,5 @@\n 'application/bmp' => 'image/bmp',\n 'application/x-bmp' => 'image/bmp',\n 'application/x-win-bitmap' => 'image/bmp',\n+ 'application/x-rar' => 'application/x-rar-compressed',\n ];\n\ndiff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php\nindex 785e22ae25d..f365cc4d273 100644\n--- a/tests/framework/helpers/FileHelperTest.php\n+++ b/tests/framework/helpers/FileHelperTest.php\n@@ -1308,6 +1308,18 @@ public static function getExtensionsByMimeTypeProvider(): array\n 'pjpeg',\n ],\n ],\n+ [\n+ 'application/x-rar-compressed',\n+ [\n+ 'rar',\n+ ],\n+ ],\n+ [\n+ 'application/x-rar',\n+ [\n+ 'rar',\n+ ],\n+ ],\n ];\n }\n \n@@ -1330,6 +1342,10 @@ public static function getExtensionByMimeTypeProvider(): array\n ['application/json', false, 'json'],\n ['image/jpeg', true, 'jpg'],\n ['image/jpeg', false, 'jpeg'],\n+ ['application/x-rar-compressed', true, 'rar'],\n+ ['application/x-rar-compressed', false, 'rar'],\n+ ['application/x-rar', true, 'rar'],\n+ ['application/x-rar', false, 'rar'],\n ];\n }\n }\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":4,"string":"4"}}},{"rowIdx":34261,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20881"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20881,"string":"20,881"},"base_sha":{"kind":"string","value":"2ab8eaf777bff2ba6c942f4d1b77a5929d4246ee"},"head_sha":{"kind":"string","value":"645d7d54f0a1570a0e88e72844141e4a684c6558"},"task":{"kind":"string","value":"Sync to master brach.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Sync to master brach.","scope_files":["composer.lock","phpstan-baseline.neon","phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `docs/guide/` needed for: Sync to master brach.","scope_files":["docs/guide/test-fixtures.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/` needed for: Sync to master brach.","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s4","goal":"Implement the changes under `framework/db/` needed for: Sync to master brach.","scope_files":["framework/db/BaseActiveRecord.php","framework/db/Query.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/base/db/` needed for: Sync to master brach.","scope_files":["tests/base/db/BaseActiveQuery.php","tests/base/db/BaseActiveRecord.php","tests/base/db/BaseCommand.php","tests/base/db/BaseQuery.php","tests/base/db/BaseSchema.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/data/ar/` needed for: Sync to master brach.","scope_files":["tests/data/ar/Category.php","tests/data/ar/Customer.php","tests/data/ar/CustomerQuery.php","tests/data/ar/CustomerWithAlias.php","tests/data/ar/DefaultPk.php","tests/data/ar/Item.php","tests/data/ar/NullValues.php","tests/data/ar/Order.php","tests/data/ar/OrderItem.php","tests/data/ar/OrderWithConstructor.php","tests/data/ar/TestTrigger.php","tests/data/ar/Type.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/ar/` needed for: Sync to master brach.","scope_files":["tests/framework/ar/ActiveRecordTestTrait.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/db/` needed for: Sync to master brach.","scope_files":["tests/framework/db/GetTablesAliasTestTrait.php"]},{"subtask_id":"s9","goal":"Implement the changes under `tests/framework/db/mssql/` needed for: Sync to master brach.","scope_files":["tests/framework/db/mssql/ActiveRecordTest.php","tests/framework/db/mssql/CommandTest.php","tests/framework/db/mssql/SchemaTest.php"]},{"subtask_id":"s10","goal":"Implement the changes under `tests/framework/db/mysql/` needed for: Sync to master brach.","scope_files":["tests/framework/db/mysql/ActiveRecordTest.php","tests/framework/db/mysql/CommandTest.php","tests/framework/db/mysql/QueryBuilderTest.php"]},{"subtask_id":"s11","goal":"Implement the changes under `tests/framework/db/mysql/connection/` needed for: Sync to master brach.","scope_files":["tests/framework/db/mysql/connection/DeadLockTest.php"]},{"subtask_id":"s12","goal":"Implement the changes under `tests/framework/db/oci/` needed for: Sync to master brach.","scope_files":["tests/framework/db/oci/ActiveRecordTest.php","tests/framework/db/oci/CommandTest.php","tests/framework/db/oci/SchemaTest.php"]},{"subtask_id":"s13","goal":"Implement the changes under `tests/framework/db/pgsql/` needed for: Sync to master brach.","scope_files":["tests/framework/db/pgsql/ActiveFixtureTest.php","tests/framework/db/pgsql/ActiveRecordTest.php","tests/framework/db/pgsql/BaseActiveRecordTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"composer.lock\",\n \"phpstan-baseline.neon\",\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `docs/guide/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"docs/guide/test-fixtures.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `framework/db/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/db/BaseActiveRecord.php\",\n \"framework/db/Query.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/base/db/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/base/db/BaseActiveQuery.php\",\n \"tests/base/db/BaseActiveRecord.php\",\n \"tests/base/db/BaseCommand.php\",\n \"tests/base/db/BaseQuery.php\",\n \"tests/base/db/BaseSchema.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/data/ar/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/data/ar/Category.php\",\n \"tests/data/ar/Customer.php\",\n \"tests/data/ar/CustomerQuery.php\",\n \"tests/data/ar/CustomerWithAlias.php\",\n \"tests/data/ar/DefaultPk.php\",\n \"tests/data/ar/Item.php\",\n \"tests/data/ar/NullValues.php\",\n \"tests/data/ar/Order.php\",\n \"tests/data/ar/OrderItem.php\",\n \"tests/data/ar/OrderWithConstructor.php\",\n \"tests/data/ar/TestTrigger.php\",\n \"tests/data/ar/Type.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/ar/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/ar/ActiveRecordTestTrait.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/db/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/GetTablesAliasTestTrait.php\"\n ]\n },\n {\n \"subtask_id\": \"s9\",\n \"goal\": \"Implement the changes under `tests/framework/db/mssql/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/mssql/ActiveRecordTest.php\",\n \"tests/framework/db/mssql/CommandTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s10\",\n \"goal\": \"Implement the changes under `tests/framework/db/mysql/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/mysql/ActiveRecordTest.php\",\n \"tests/framework/db/mysql/CommandTest.php\",\n \"tests/framework/db/mysql/QueryBuilderTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s11\",\n \"goal\": \"Implement the changes under `tests/framework/db/mysql/connection/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/mysql/connection/DeadLockTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s12\",\n \"goal\": \"Implement the changes under `tests/framework/db/oci/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/oci/ActiveRecordTest.php\",\n \"tests/framework/db/oci/CommandTest.php\",\n \"tests/framework/db/oci/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s13\",\n \"goal\": \"Implement the changes under `tests/framework/db/pgsql/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/pgsql/ActiveFixtureTest.php\",\n \"tests/framework/db/pgsql/ActiveRecordTest.php\",\n \"tests/framework/db/pgsql/BaseActiveRecordTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["composer.lock","phpstan-baseline.neon","phpstan.dist.neon"],"solution_diff":"diff --git a/composer.lock b/composer.lock\nindex f9f75af4753..595956640b4 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -389,16 +389,16 @@\n },\n {\n \"name\": \"composer/composer\",\n- \"version\": \"2.9.7\",\n+ \"version\": \"2.9.8\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/composer/composer.git\",\n- \"reference\": \"82a2fbd1372a98d7915cfb092acf05207d9b4113\"\n+ \"reference\": \"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/composer/composer/zipball/82a2fbd1372a98d7915cfb092acf05207d9b4113\",\n- \"reference\": \"82a2fbd1372a98d7915cfb092acf05207d9b4113\",\n+ \"url\": \"https://api.github.com/repos/composer/composer/zipball/39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\",\n+ \"reference\": \"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -486,7 +486,7 @@\n \"irc\": \"ircs://irc.libera.chat:6697/composer\",\n \"issues\": \"https://github.com/composer/composer/issues\",\n \"security\": \"https://github.com/composer/composer/security/policy\",\n- \"source\": \"https://github.com/composer/composer/tree/2.9.7\"\n+ \"source\": \"https://github.com/composer/composer/tree/2.9.8\"\n },\n \"funding\": [\n {\n@@ -498,7 +498,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-04-14T11:31:52+00:00\"\n+ \"time\": \"2026-05-13T07:28:38+00:00\"\n },\n {\n \"name\": \"composer/metadata-minifier\",\n@@ -3458,16 +3458,16 @@\n },\n {\n \"name\": \"symfony/console\",\n- \"version\": \"v7.4.9\",\n+ \"version\": \"v7.4.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/console.git\",\n- \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\"\n+ \"reference\": \"ed0107e43ab452aa77ae99e005b95e56b556e075\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n- \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n+ \"url\": \"https://api.github.com/repos/symfony/console/zipball/ed0107e43ab452aa77ae99e005b95e56b556e075\",\n+ \"reference\": \"ed0107e43ab452aa77ae99e005b95e56b556e075\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3532,7 +3532,7 @@\n \"terminal\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/console/tree/v7.4.9\"\n+ \"source\": \"https://github.com/symfony/console/tree/v7.4.11\"\n },\n \"funding\": [\n {\n@@ -3552,7 +3552,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-22T15:21:55+00:00\"\n+ \"time\": \"2026-05-13T12:04:42+00:00\"\n },\n {\n \"name\": \"symfony/deprecation-contracts\",\n@@ -3627,16 +3627,16 @@\n },\n {\n \"name\": \"symfony/filesystem\",\n- \"version\": \"v8.0.9\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/filesystem.git\",\n- \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\"\n+ \"reference\": \"224db910898ce1317b892a9a1338f1f8f17eb7c7\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n- \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n+ \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/224db910898ce1317b892a9a1338f1f8f17eb7c7\",\n+ \"reference\": \"224db910898ce1317b892a9a1338f1f8f17eb7c7\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3673,7 +3673,7 @@\n \"description\": \"Provides basic utilities for the filesystem\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.9\"\n+ \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -3693,7 +3693,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-18T13:51:42+00:00\"\n+ \"time\": \"2026-05-11T16:39:47+00:00\"\n },\n {\n \"name\": \"symfony/finder\",\n@@ -4424,16 +4424,16 @@\n },\n {\n \"name\": \"symfony/process\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/process.git\",\n- \"reference\": \"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\"\n+ \"reference\": \"26d89e459f037d2873300605d0a07e7a8ef84db0\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/process/zipball/cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\",\n- \"reference\": \"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\",\n+ \"url\": \"https://api.github.com/repos/symfony/process/zipball/26d89e459f037d2873300605d0a07e7a8ef84db0\",\n+ \"reference\": \"26d89e459f037d2873300605d0a07e7a8ef84db0\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4465,7 +4465,7 @@\n \"description\": \"Executes commands in sub-processes\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/process/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/process/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -4485,7 +4485,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-05-11T16:56:32+00:00\"\n },\n {\n \"name\": \"symfony/service-contracts\",\n@@ -4576,16 +4576,16 @@\n },\n {\n \"name\": \"symfony/string\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/string.git\",\n- \"reference\": \"ae9488f874d7603f9d2dfbf120203882b645d963\"\n+ \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/string/zipball/ae9488f874d7603f9d2dfbf120203882b645d963\",\n- \"reference\": \"ae9488f874d7603f9d2dfbf120203882b645d963\",\n+ \"url\": \"https://api.github.com/repos/symfony/string/zipball/39be2ad058a3c0bd558edca23e65f009865d75ff\",\n+ \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4642,7 +4642,7 @@\n \"utf8\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/string/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/string/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -4662,7 +4662,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-05-13T12:07:53+00:00\"\n },\n {\n \"name\": \"theseer/tokenizer\",\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex 3f78050b8ad..a7a2f9b5440 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -450,774 +450,12 @@ parameters:\n \t\t\tcount: 1\n \t\t\tpath: framework/test/DbFixture.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$category in PHPDoc tag @var does not match assigned variable \\$categories\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$address\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer_id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$email\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$isNewRecord\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsFor8\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$name\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$quantity\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$relatedRecords\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$status\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$subtotal\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$total\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomerId\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrdersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$bookItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 12\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicit\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicitA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntax\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntaxA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFKViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfile\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfileIndexOrdered\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 31\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$itemsIndexed\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$movieItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$quantityOrderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$custom\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$item\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$order\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeNoJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeWithJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$id on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$orderItems on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\<yiiunit\\\\data\\\\ar\\\\Order\\>\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQueryInterface\\:\\:active\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canGetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canSetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:getOrders\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:hasProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:isRelationPopulated\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:refresh\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:unlinkAll\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateCounters\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined static method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateAllCounters\\(\\)\\.$#'\n-\t\t\tidentifier: staticMethod.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method afterSave\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 23\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertArrayHasKey\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 30\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertCount\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 92\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEmpty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEquals\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 97\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertFalse\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 22\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertInstanceOf\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 19\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNotNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 16\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertTrue\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 39\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canGetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canSetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getCustomerClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderWithNullFKClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$books on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$id on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 10\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$items on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$name on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$orders on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$ordersWithItems on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$primaryKey on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$relatedRecords on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot call method isRelationPopulated\\(\\) on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: method.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Class yiiunit\\\\extensions\\\\redis\\\\ActiveRecordTest not found\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 1 parameter, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 2 parameters, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on yiiunit\\\\data\\\\ar\\\\OrderItemWithConstructor\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$customer contains unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$this has invalid type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: varTag.trait\n-\t\t\tcount: 27\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var with type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\|yiiunit\\\\TestCase is not subtype of native type \\$this\\(yiiunit\\\\base\\\\db\\\\BaseActiveRecord\\)\\.$#'\n-\t\t\tidentifier: varTag.nativeType\n-\t\t\tcount: 33\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$stringcol \\(string\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$total \\(string\\) does not accept int\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$count might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer in PHPDoc tag @var does not match assigned variable \\$class\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$orders might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableChecks\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableForeignKeys\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTablePrimaryKey\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableUniques\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$foreignKeys on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\Command\\:\\:queryOne\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on array\\{\\}\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$expression might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseQuery.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$condition with type array\\|string is not subtype of native type array\\.$#'\n \t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n \t\t\tpath: tests/base/db/BaseQueryBuilder.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$dimension\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseSchema.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type array\\|bool\\|yii\\\\db\\\\Constraint\\|null\\.$#'\n \t\t\tidentifier: parameter.phpDocType\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 6a59f2fbff4..389a680492c 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -15,8 +15,6 @@ parameters:\n - tests/data\n - tests/framework/*/stubs/*\n - tests/framework/*/mocks/*\n- # TODO: Analyze these directories\n- - tests/framework/db\n \n bootstrapFiles:\n - framework/BaseYii.php\n\n","summary":"Edited 3 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["docs/guide/test-fixtures.md"],"solution_diff":"diff --git a/docs/guide/test-fixtures.md b/docs/guide/test-fixtures.md\nindex 414a3db9e3f..ac655725930 100644\n--- a/docs/guide/test-fixtures.md\n+++ b/docs/guide/test-fixtures.md\n@@ -36,6 +36,10 @@ class UserFixture extends ActiveFixture\n }\n ```\n \n+These examples use the `app\\tests\\fixtures` namespace because the fixture classes are referenced directly\n+by application tests. The `yii fixture` command has its own default namespace, `tests\\unit\\fixtures`.\n+If your fixture classes use another namespace, configure the command or pass the `--namespace` option.\n+\n > Tip: Each `ActiveFixture` is about preparing a DB table for testing purpose. You may specify the table\n > by setting either the [[yii\\test\\ActiveFixture::tableName]] property or the [[yii\\test\\ActiveFixture::modelClass]]\n > property. If the latter, the table name will be taken from the `ActiveRecord` class specified by `modelClass`.\n@@ -178,7 +182,7 @@ different tests. We thus recommend that you organize the data files in a hierarc\n your class namespaces. For example,\n \n ```\n-# under folder tests\\unit\\fixtures\n+# under the folder that matches your fixture namespace, for example tests\\unit\\fixtures\n \n data\\\n components\\\n@@ -243,7 +247,9 @@ Fixture classes name should not be plural.\n \n ### Loading fixtures\n \n-Fixture classes should be suffixed by `Fixture`. By default, fixtures will be searched under `tests\\unit\\fixtures` namespace, you can\n+Fixture classes should be suffixed by `Fixture`. By default, the `yii fixture` command searches for them\n+under the `tests\\unit\\fixtures` namespace. This command default is independent from the fixture namespaces\n+used by application tests. You can\n change this behavior with config or command options. You can exclude some fixtures due load or unload by specifying `-` before its name like `-User`.\n \n To load fixture, run the following command:\n@@ -277,7 +283,7 @@ yii fixture \"*\"\n yii fixture \"*, -DoNotLoadThisOne\"\n \n // load fixtures, but search them in different namespace. By default namespace is: tests\\unit\\fixtures.\n-yii fixture User --namespace='alias\\my\\custom\\namespace'\n+yii fixture User --namespace='app\\tests\\fixtures'\n \n // load global fixture `some\\name\\space\\CustomFixture` before other fixtures will be loaded.\n // By default this option is set to `InitDbFixture` to disable/enable integrity checks. You can specify several\n@@ -310,7 +316,7 @@ Same command options like: `namespace`, `globalFixtures` also can be applied to\n \n While command line options allow us to configure the fixture command\n on-the-fly, sometimes we may want to configure the command once for all. For example, you can configure\n-different fixture path as follows:\n+a different fixture namespace as follows:\n \n ```\n 'controllerMap' => [\n","summary":"Edited 1 file(s) in docs/guide/"},{"subtask_id":"s3","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex efe898b3051..6416cbd74e6 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -75,11 +75,13 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n-- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n-- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n-- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20875: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20875: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20875: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n+- Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s4","scope_files":["framework/db/BaseActiveRecord.php","framework/db/Query.php"],"solution_diff":"diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\nindex 194eff2def8..464e9056d9f 100644\n--- a/framework/db/BaseActiveRecord.php\n+++ b/framework/db/BaseActiveRecord.php\n@@ -1816,12 +1816,16 @@ private function isValueDifferent($newValue, $oldValue)\n * }\n * ```\n *\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\n+ * @template TModels of array\n+ *\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\n * - an active record instance;\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\n * @since 2.0.50\n+ *\n+ * @param-out TModels $models\n */\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\n {\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\nindex 5709702ef9b..932640d0f16 100644\n--- a/framework/db/Query.php\n+++ b/framework/db/Query.php\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\n */\n public $distinct = false;\n /**\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\n * This is used to construct the FROM clause in a SQL statement.\n * @see from()\n */\n","summary":"Edited 2 file(s) in framework/db/"},{"subtask_id":"s5","scope_files":["tests/base/db/BaseActiveQuery.php","tests/base/db/BaseActiveRecord.php","tests/base/db/BaseCommand.php","tests/base/db/BaseQuery.php","tests/base/db/BaseSchema.php"],"solution_diff":"diff --git a/tests/base/db/BaseActiveQuery.php b/tests/base/db/BaseActiveQuery.php\nindex 70ffda75a38..32c29f5b897 100644\n--- a/tests/base/db/BaseActiveQuery.php\n+++ b/tests/base/db/BaseActiveQuery.php\n@@ -296,9 +296,7 @@ public function testGetTableNamesWontFillFrom(): void\n */\n public function testDeeplyNestedTableRelationWith(): void\n {\n- /** @var Category $category */\n $categories = Category::find()->with('orders')->indexBy('id')->all();\n-\n $category = $categories[1];\n $this->assertNotNull($category);\n $orders = $category->orders;\ndiff --git a/tests/base/db/BaseActiveRecord.php b/tests/base/db/BaseActiveRecord.php\nindex e0d3e2aeddf..f6584f819e2 100644\n--- a/tests/base/db/BaseActiveRecord.php\n+++ b/tests/base/db/BaseActiveRecord.php\n@@ -42,7 +42,6 @@\n use yiiunit\\data\\ar\\Type;\n use yiiunit\\data\\ar\\CroppedType;\n use yiiunit\\framework\\ar\\ActiveRecordTestTrait;\n-use yiiunit\\TestCase;\n \n abstract class BaseActiveRecord extends DatabaseTestCase\n {\n@@ -57,6 +56,8 @@ protected function setUp(): void\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Customer>\n */\n public function getCustomerClass()\n {\n@@ -65,6 +66,8 @@ public function getCustomerClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Item>\n */\n public function getItemClass()\n {\n@@ -73,6 +76,8 @@ public function getItemClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Order>\n */\n public function getOrderClass()\n {\n@@ -81,6 +86,8 @@ public function getOrderClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItem>\n */\n public function getOrderItemClass()\n {\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\n }\n \n /**\n- * @return string\n+ * {@inheritdoc}\n+ *\n+ * @return class-string<Category>\n */\n public function getCategoryClass()\n {\n@@ -97,6 +106,8 @@ public function getCategoryClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderWithNullFK>\n */\n public function getOrderWithNullFKClass()\n {\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItemWithNullFK>\n */\n public function getOrderItemWithNullFKmClass()\n {\n@@ -154,7 +167,6 @@ public function testFindExists(): void\n \n public function testFindColumn(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\n }\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\n */\n public function testDeeplyNestedTableRelation2(): void\n {\n- /** @var Category $category */\n $category = Category::findOne(1);\n $this->assertNotNull($category);\n $orders = $category->orders;\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\n $record = new NullValues();\n \n // this is to simulate empty html form submission\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var1 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var2 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var3 = '';\n $record->stringcol = '';\n \n@@ -813,35 +827,11 @@ public function testJoinWithEager(): void\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\n }\n \n- public static function aliasMethodProvider(): array\n- {\n- return [\n- ['explicit'], // c\n- // ['querysyntax'], // {{@customer}}\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\n- // later getRelationAlias() could be added\n- ];\n- }\n-\n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- *\n- * @dataProvider aliasMethodProvider\n- *\n- * @param string $aliasMethod Whether alias is specified explicitly or using the query syntax {{@tablename}}.\n- */\n- public function testJoinWithAlias(string $aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -852,13 +842,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -867,13 +851,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -882,13 +860,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -899,32 +871,15 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -932,48 +887,35 @@ public function testJoinWithAlias(string $aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n-\n- // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n+\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with count and query\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $count = $query->count('[[c.id]]');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $count = $query->count('{{@customer}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $count = $query->count($query->applyAlias('customer', 'id'));\n- }\n+ $count = $query->count('[[c.id]]');\n $this->assertEquals(3, $count);\n $orders = $query->all();\n $this->assertCount(3, $orders);\n@@ -982,28 +924,16 @@ public function testJoinWithAlias(string $aliasMethod): void\n /** @var Order $order */\n $order = Order::findOne(1);\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\n- if ($aliasMethod === 'explicit') {\n- $customer = $customerQuery->where(['o.id' => 1])->one();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\n- }\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\n $this->assertNotNull($customer);\n $this->assertEquals(1, $customer->id);\n \n // join with sub-relation called inside Closure\n $orders = Order::find()->joinWith([\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\n+ 'items' => function (ActiveQuery $q) {\n $q->orderBy('item.id');\n $q->joinWith(['category c']);\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ])->orderBy('order.id')->all();\n $this->assertCount(1, $orders);\n@@ -1393,13 +1323,9 @@ public function testDefaultValues(): void\n \n public function testUnlinkAllViaTable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n // via table with delete\n@@ -1837,7 +1763,6 @@ public function testIndexByAfterLoadingRelations(): void\n */\n public function testNoTablenameReplacement(): void\n {\n- /** @var Customer $customer */\n $class = $this->getCustomerClass();\n $customer = new $class();\n $customer->name = 'Some {{weird}} name';\n@@ -2086,7 +2011,7 @@ public function testResetNotSavedRelation(): void\n {\n $order = new Order();\n $order->customer_id = 1;\n- $order->total = 0;\n+ $order->total = '0';\n \n $orderItem = new OrderItem();\n $order->orderItems;\n@@ -2159,7 +2084,6 @@ public static function providerForUnlinkDelete(): array\n */\n public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $order = $orderClass::findOne(2);\n@@ -2170,7 +2094,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n $this->assertCount(0, $order->itemsFor8);\n $this->assertCount(2, $order->orderItemsWithNullFK);\n \n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\n $this->assertCount(1, $orderItemClass::findAll([\n 'order_id' => 2,\n@@ -2184,7 +2107,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n \n public function testVirtualRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n $order = $orderClass::findOne(2);\n $order->virtualCustomerId = $order->customer_id;\n@@ -2229,7 +2151,6 @@ public function testGetAttributeLabel($model): void\n public function testLoadRelations(): void\n {\n // Test eager loading relations for multiple primary models using loadRelationsFor().\n- /** @var Customer[] $customers */\n $customers = Customer::find()->all();\n Customer::loadRelationsFor($customers, ['orders.items']);\n foreach ($customers as $customer) {\n@@ -2240,7 +2161,6 @@ public function testLoadRelations(): void\n }\n \n // Test eager loading relations as arrays.\n- /** @var array $customers */\n $customers = Customer::find()->asArray(true)->all();\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\n $query->asArray(false);\ndiff --git a/tests/base/db/BaseCommand.php b/tests/base/db/BaseCommand.php\nindex 9cf4ce0bf33..0d02039630f 100644\n--- a/tests/base/db/BaseCommand.php\n+++ b/tests/base/db/BaseCommand.php\n@@ -18,11 +18,13 @@\n use ArrayObject;\n use yii\\caching\\ArrayCache;\n use yii\\db\\Connection;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DataReader;\n use yii\\db\\Exception;\n use yii\\db\\Expression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\TableSchema;\n \n abstract class BaseCommand extends DatabaseTestCase\n {\n@@ -290,7 +292,7 @@ public function testFetchMode(): void\n // FETCH_NUM, customized in query method\n $sql = 'SELECT * FROM {{customer}}';\n $command = $db->createCommand($sql);\n- $result = $command->queryOne([], PDO::FETCH_NUM);\n+ $result = $command->queryOne(PDO::FETCH_NUM);\n $this->assertTrue(\\is_array($result) && isset($result[0]));\n }\n \n@@ -682,6 +684,9 @@ public function testInsertExpression(): void\n break;\n case 'oci':\n $expression = 'EXTRACT(YEAR FROM sysdate)';\n+ break;\n+ default:\n+ $this->fail(\"Unexpected driver name: {$this->driverName}\");\n }\n \n $command = $db->createCommand();\n@@ -1126,8 +1131,8 @@ public static function addPrimaryKeyProvider(): array\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1141,15 +1146,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\n ],\n )->execute();\n \n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\n-\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\n \n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\n-\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1195,8 +1201,8 @@ public static function addForeignKeyProvider(): array\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1214,7 +1220,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->addForeignKey(\n $name,\n@@ -1224,12 +1231,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n (array) $refColumns,\n )->execute();\n \n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\n \n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1250,32 +1258,40 @@ public function testCreateDropIndex(): void\n 'int2' => 'integer not null',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n+\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n }\n \n public static function addUniqueProvider(): array\n@@ -1312,8 +1328,8 @@ public static function addUniqueProvider(): array\n public function testAddDropUnique(string $name, string $tableName, $columns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1327,15 +1343,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\n-\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\n \n $db->createCommand()->dropUnique($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1352,6 +1369,7 @@ public function testAddDropCheck(): void\n $name = 'test_ck_constraint';\n \n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1362,18 +1380,16 @@ public function testAddDropCheck(): void\n ['int1' => 'integer'],\n )->execute();\n \n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n \n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\n-\n- $this->assertMatchesRegularExpression(\n- '/^.*int1.*>.*1.*$/',\n- $schema->getTableChecks($tableName, true)[0]->expression\n- );\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\n \n $db->createCommand()->dropCheck($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n }\n \n public function testAddDropDefaultValue(): void\n@@ -1442,7 +1458,7 @@ public function testQueryCache(): void\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n \n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n- $db->cache(function (Connection $db) use ($command, $update): void {\n+ $db->cache(function (Connection $db) use ($command): void {\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n }, 10);\n@@ -1554,40 +1570,50 @@ public function testAutoRefreshTableSchema(): void\n $tableName = 'test';\n $fkName = 'test_fk';\n \n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\n+ $schema = $db->getSchema();\n+\n+ if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n }\n \n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n \n $db->createCommand()->createTable($tableName, [\n 'id' => 'pk',\n 'fk' => 'int',\n 'name' => 'string',\n ])->execute();\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\n+ $initialSchema = $schema->getTableSchema($tableName);\n $this->assertNotNull($initialSchema);\n \n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\n+ $newSchema = $schema->getTableSchema($tableName);\n $this->assertNotEquals($initialSchema, $newSchema);\n \n if ($this->driverName !== 'sqlite') {\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\n \n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\n }\n \n $db->createCommand()->dropTable($tableName)->execute();\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n }\n \n public function testTransaction(): void\ndiff --git a/tests/base/db/BaseQuery.php b/tests/base/db/BaseQuery.php\nindex 4799fd29f09..1e5f837cb79 100644\n--- a/tests/base/db/BaseQuery.php\n+++ b/tests/base/db/BaseQuery.php\n@@ -721,7 +721,7 @@ public function testQueryCache(): void\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\n \n- $db->cache(function (Connection $db) use ($query, $update): void {\n+ $db->cache(function (Connection $db) use ($query): void {\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\n }, 10);\ndiff --git a/tests/base/db/BaseSchema.php b/tests/base/db/BaseSchema.php\nindex c00ef204544..0b3bdf1579f 100644\n--- a/tests/base/db/BaseSchema.php\n+++ b/tests/base/db/BaseSchema.php\n@@ -17,11 +17,11 @@\n use yii\\caching\\FileCache;\n use yii\\db\\CheckConstraint;\n use yii\\db\\ColumnSchema;\n-use yii\\db\\Connection;\n use yii\\db\\Constraint;\n use yii\\db\\Expression;\n use yii\\db\\ForeignKeyConstraint;\n use yii\\db\\IndexConstraint;\n+use yii\\db\\pgsql\\ColumnSchema as PgsqlColumnSchema;\n use yii\\db\\Schema;\n use yii\\db\\TableSchema;\n \n@@ -125,10 +125,7 @@ public function testGetNonExistingTableSchema(): void\n \n public function testSchemaCache(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $schema->db->enableSchemaCache = true;\n@@ -546,6 +543,7 @@ public function testColumnSchema(): void\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \"defaultValue of column $name does not match.\");\n }\n if (isset($expected['dimension'])) { // PgSQL only\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\n $this->assertSame($expected['dimension'], $column->dimension, \"dimension of column $name does not match\");\n }\n }\n","summary":"Edited 5 file(s) in tests/base/db/"},{"subtask_id":"s6","scope_files":["tests/data/ar/Category.php","tests/data/ar/Customer.php","tests/data/ar/CustomerQuery.php","tests/data/ar/CustomerWithAlias.php","tests/data/ar/DefaultPk.php","tests/data/ar/Item.php","tests/data/ar/NullValues.php","tests/data/ar/Order.php","tests/data/ar/OrderItem.php","tests/data/ar/OrderWithConstructor.php","tests/data/ar/TestTrigger.php","tests/data/ar/Type.php"],"solution_diff":"diff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\nindex 7472cfe7068..158862635cb 100644\n--- a/tests/data/ar/Category.php\n+++ b/tests/data/ar/Category.php\n@@ -13,6 +13,11 @@\n *\n * @property int $id\n * @property string $name\n+ *\n+ * @property-read Item[] $items\n+ * @property-read Item[] $limitedItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read Order[] $orders\n */\n class Category extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\nindex 18b96c02399..37405d963a8 100644\n--- a/tests/data/ar/Customer.php\n+++ b/tests/data/ar/Customer.php\n@@ -21,8 +21,21 @@\n * @property string $email\n * @property string $address\n * @property int $status\n+ * @property 1|0|'1'|'0'|bool $bool_status\n *\n * @method static CustomerQuery findBySql($sql, $params = [])\n+ *\n+ * @property-read Profile $profile\n+ * @property-read Order[] $ordersPlain\n+ * @property-read Order[] $orders\n+ * @property-read Order[] $expensiveOrders\n+ * @property-read Order[] $ordersWithItems\n+ * @property-read Order[] $expensiveOrdersWithNullFK\n+ * @property-read Order[] $ordersWithNullFK\n+ * @property-read Order[] $orders2\n+ * @property-read Item[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read Item[] $items\n */\n class Customer extends ActiveRecord\n {\n@@ -113,7 +126,7 @@ public function afterSave($insert, $changedAttributes): void\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\nindex bf0850ab064..41a50ca0557 100644\n--- a/tests/data/ar/CustomerQuery.php\n+++ b/tests/data/ar/CustomerQuery.php\n@@ -14,7 +14,8 @@\n \n /**\n * CustomerQuery.\n- * @extends ActiveQuery<CustomerWithAlias>\n+ * @template TModel of Customer = Customer\n+ * @extends ActiveQuery<TModel>\n */\n class CustomerQuery extends ActiveQuery\n {\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\nindex eaa32613e8b..0aee1182f96 100644\n--- a/tests/data/ar/CustomerWithAlias.php\n+++ b/tests/data/ar/CustomerWithAlias.php\n@@ -2,24 +2,9 @@\n \n namespace yiiunit\\data\\ar;\n \n-/**\n- * Class Customer.\n- *\n- * @property int $id\n- * @property string $name\n- * @property string $email\n- * @property string $address\n- * @property int $status\n- *\n- * @method static CustomerQuery findBySql($sql, $params = [])\n- */\n-class CustomerWithAlias extends ActiveRecord\n+class CustomerWithAlias extends Customer\n {\n- final public const STATUS_ACTIVE = 1;\n- final public const STATUS_INACTIVE = 2;\n-\n public $status2;\n-\n public $sumTotal;\n \n public static function tableName()\n@@ -29,7 +14,7 @@ public static function tableName()\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\nindex 7c66ed78f14..ce265ef98fa 100644\n--- a/tests/data/ar/DefaultPk.php\n+++ b/tests/data/ar/DefaultPk.php\n@@ -13,6 +13,7 @@\n *\n * @author Jan Waล <janek.jan@gmail.com>\n * @property int $id\n+ * @property string $type\n */\n class DefaultPk extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\nindex cfd8345eb46..ff41d1da8a8 100644\n--- a/tests/data/ar/Item.php\n+++ b/tests/data/ar/Item.php\n@@ -14,6 +14,8 @@\n * @property int $id\n * @property string $name\n * @property int $category_id\n+ *\n+ * @property-read Category $category\n */\n class Item extends ActiveRecord\n {\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\nindex ea9307e505b..c62f750eda6 100644\n--- a/tests/data/ar/NullValues.php\n+++ b/tests/data/ar/NullValues.php\n@@ -12,10 +12,10 @@\n * Class NullValues.\n *\n * @property int $id\n- * @property int $var1\n- * @property int $var2\n- * @property int $var3\n- * @property string $stringcol\n+ * @property int|null $var1\n+ * @property int|null $var2\n+ * @property int|null $var3\n+ * @property string|null $stringcol\n */\n class NullValues extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\nindex 57c26a5aaeb..e2ebf0f462f 100644\n--- a/tests/data/ar/Order.php\n+++ b/tests/data/ar/Order.php\n@@ -18,9 +18,34 @@\n * @property int $created_at\n * @property string $total\n *\n+ * @property-read Customer $customer\n+ * @property-read Customer $customer2\n+ * @property-read Customer $virtualCustomer\n+ * @property-read Customer $customerJoinedWithProfile\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\n+ * @property-read Item[] $books\n+ * @property-read Item[] $books2\n+ * @property-read Item[] $booksExplicit\n+ * @property-read Item[] $booksExplicitA\n+ * @property-read Item[] $bookItems\n+ * @property-read Item[] $booksViaTable\n+ * @property-read Item[] $booksWithNullFK\n+ * @property-read Item[] $booksWithNullFKViaTable\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\n * @property-read Item[] $cheapItemsUsingViaWithCallable\n+ * @property-read Item[] $items\n * @property-read Item[] $itemsFor8\n+ * @property-read Item[] $itemsIndexed\n+ * @property-read Item[] $itemsInOrder1\n+ * @property-read Item[] $itemsInOrder2\n+ * @property-read Item[] $itemsWithNullFK\n+ * @property-read Item[] $limitedItems\n+ * @property-read Item[] $movieItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read OrderItem[] $orderItems3\n+ * @property-read OrderItem[] $orderItemsWithNullFK\n+ * @property-read OrderItem[] $quantityOrderItems\n */\n class Order extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\nindex 65747e34444..46446b0c1fc 100644\n--- a/tests/data/ar/OrderItem.php\n+++ b/tests/data/ar/OrderItem.php\n@@ -17,6 +17,12 @@\n * @property int $item_id\n * @property int $quantity\n * @property string $subtotal\n+ *\n+ * @property Order $order\n+ * @property Item $item\n+ * @property self $orderItemCompositeWithJoin\n+ * @property self $orderItemCompositeNoJoin\n+ * @property Order $custom\n */\n class OrderItem extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\nindex b1c478044a2..99af491825a 100644\n--- a/tests/data/ar/OrderWithConstructor.php\n+++ b/tests/data/ar/OrderWithConstructor.php\n@@ -20,7 +20,7 @@\n * @property int $created_at\n * @property string $total\n *\n- * @property OrderItemWithConstructor $orderItems\n+ * @property OrderItemWithConstructor[] $orderItems\n * @property CustomerWithConstructor $customer\n * @property CustomerWithConstructor $customerJoinedWithProfile\n */\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\nindex d384f0a4f94..247913ed80c 100644\n--- a/tests/data/ar/TestTrigger.php\n+++ b/tests/data/ar/TestTrigger.php\n@@ -13,6 +13,7 @@\n *\n * @property int $id\n * @property string $stringcol\n+ * @property mixed $RV\n */\n class TestTrigger extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\nindex 2ad398d5994..abc952f3277 100644\n--- a/tests/data/ar/Type.php\n+++ b/tests/data/ar/Type.php\n@@ -11,19 +11,20 @@\n /**\n * Model representing type table.\n *\n+ * @property string $bigint_col\n * @property int $int_col\n * @property int $int_col2 DEFAULT 1\n * @property int $smallint_col DEFAULT 1\n * @property string $char_col\n * @property string $char_col2 DEFAULT 'something'\n * @property string $char_col3\n- * @property float $float_col\n+ * @property float|numeric-string $float_col\n * @property float $float_col2 DEFAULT '1.23'\n * @property string $blob_col\n * @property float $numeric_col DEFAULT '33.22'\n * @property string $time DEFAULT '2002-01-01 00:00:00'\n- * @property bool $bool_col\n- * @property bool $bool_col2 DEFAULT 1\n+ * @property 1|0|'1'|'0'|bool $bool_col\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\n */\n class Type extends ActiveRecord\n {\n","summary":"Edited 12 file(s) in tests/data/ar/"},{"subtask_id":"s7","scope_files":["tests/framework/ar/ActiveRecordTestTrait.php"],"solution_diff":"diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\nindex 98484ec7b4a..77d3fea1b57 100644\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\n@@ -11,7 +11,6 @@\n use yiiunit\\extensions\\redis\\ActiveRecordTest;\n use Exception;\n use yii\\base\\Event;\n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\BaseActiveRecord;\n use yii\\db\\Expression;\n use yiiunit\\data\\ar\\Customer;\n@@ -25,36 +24,43 @@\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\n * in the extensions.\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\n+ *\n+ * @phpstan-require-extends TestCase\n */\n trait ActiveRecordTestTrait\n {\n- /** @var TestCase $this */\n /**\n * This method should return the classname of Customer class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getCustomerClass();\n \n /**\n * This method should return the classname of Order class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderClass();\n \n /**\n * This method should return the classname of OrderItem class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderItemClass();\n \n /**\n * This method should return the classname of Item class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getItemClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderWithNullFKClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderItemWithNullFKmClass();\n \n /**\n@@ -66,9 +72,7 @@ public function afterSave(): void\n \n public function testFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // find one\n $result = $customerClass::find();\n $this->assertInstanceOf('\\\\yii\\\\db\\\\ActiveQueryInterface', $result);\n@@ -129,7 +133,6 @@ public function testFind(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\n \n public function testHasAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n $customer = new $customerClass();\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\n \n public function testFindScalar(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // query scalar\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\n $this->assertEquals('user2', $customerName);\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\n \n public function testFindColumn(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\n }\n \n public function testFindIndexBy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\n $this->assertCount(3, $customers);\n@@ -232,10 +228,8 @@ public function testFindIndexBy(): void\n \n public function testFindIndexByAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy + asArray\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\n $this->assertCount(3, $customers);\n@@ -277,9 +271,7 @@ public function testFindIndexByAsArray(): void\n \n public function testRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $this->assertFalse($customer->refresh());\n \n@@ -291,12 +283,9 @@ public function testRefresh(): void\n \n public function testEquals(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customerA = new $customerClass();\n $customerB = new $customerClass();\n $this->assertFalse($customerA->equals($customerB));\n@@ -319,10 +308,8 @@ public function testEquals(): void\n \n public function testFindCount(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(3, $customerClass::find()->count());\n \n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\n@@ -339,10 +326,8 @@ public function testFindCount(): void\n \n public function testFindLimit(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // all()\n $customers = $customerClass::find()->all();\n $this->assertCount(3, $customers);\n@@ -386,10 +371,8 @@ public function testFindLimit(): void\n \n public function testFindComplexCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\n \n@@ -402,10 +385,8 @@ public function testFindComplexCondition(): void\n \n public function testFindNullValues(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $customer->name = null;\n $customer->save(false);\n@@ -418,10 +399,8 @@ public function testFindNullValues(): void\n \n public function testExists(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\n@@ -434,10 +413,8 @@ public function testExists(): void\n \n public function testFindLazy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertFalse($customer->isRelationPopulated('orders'));\n $orders = $customer->orders;\n@@ -462,12 +439,9 @@ public function testFindLazy(): void\n \n public function testFindEager(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -499,10 +473,8 @@ public function testFindEager(): void\n \n public function testFindLazyVia(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $this->assertEquals(1, $order->id);\n@@ -513,10 +485,8 @@ public function testFindLazyVia(): void\n \n public function testFindLazyVia2(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $order->id = 100;\n@@ -525,10 +495,8 @@ public function testFindLazyVia2(): void\n \n public function testFindEagerViaRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\n $this->assertCount(3, $orders);\n $order = $orders[0];\n@@ -541,10 +509,8 @@ public function testFindEagerViaRelation(): void\n \n public function testFindNestedRelation(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -578,10 +544,8 @@ public function testFindNestedRelation(): void\n */\n public function testFindEagerViaRelationPreserveOrder(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n /*\n Item (name, category_id)\n@@ -641,7 +605,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\n // different order in via table\n public function testFindEagerViaRelationPreserveOrderB(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\n@@ -671,21 +634,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\n \n public function testLink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n \n // has many\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer->link('orders', $order);\n $this->afterSave();\n@@ -696,7 +654,7 @@ public function testLink(): void\n \n // belongs to\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer = $customerClass::findOne(1);\n $this->assertNull($order->customer);\n@@ -724,16 +682,11 @@ public function testLink(): void\n \n public function testUnlink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many without delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->ordersWithNullFK);\n@@ -775,20 +728,13 @@ public function testUnlink(): void\n \n public function testUnlinkAll(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many with delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n@@ -841,11 +787,7 @@ public function testUnlinkAll(): void\n \n public function testUnlinkAllAndConditionSetNull(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderWithNullFKClass();\n \n // in this test all orders are owned by customer 1\n@@ -867,11 +809,7 @@ public function testUnlinkAllAndConditionSetNull(): void\n \n public function testUnlinkAllAndConditionDelete(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n \n // in this test all orders are owned by customer 1\n@@ -896,9 +834,7 @@ public function testUnlinkAllAndConditionDelete(): void\n \n public function testInsert(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->email = 'user4@example.com';\n $customer->name = 'user4';\n@@ -920,9 +856,7 @@ public function testInsert(): void\n \n public function testExplicitPkOnAutoIncrement(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->id = 1337;\n $customer->email = 'user1337@example.com';\n@@ -939,9 +873,7 @@ public function testExplicitPkOnAutoIncrement(): void\n \n public function testUpdate(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // save\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n@@ -982,9 +914,7 @@ public function testUpdate(): void\n \n public function testUpdateAttributes(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1017,9 +947,7 @@ public function testUpdateAttributes(): void\n \n public function testUpdateCounters(): void\n {\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // updateCounters\n $pk = ['order_id' => 2, 'item_id' => 4];\n $orderItem = $orderItemClass::findOne($pk);\n@@ -1048,9 +976,7 @@ public function testUpdateCounters(): void\n \n public function testDelete(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // delete\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1080,23 +1006,21 @@ public function testDelete(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = true;\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(1, $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = false;\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(0, $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['status' => true])->all();\n $this->assertCount(2, $customers);\n@@ -1107,11 +1031,8 @@ public function testBooleanAttribute(): void\n \n public function testAfterFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterFindCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\n@@ -1143,6 +1064,7 @@ public function testAfterFind(): void\n ], $afterFindCalls);\n $afterFindCalls = [];\n \n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\n } else {\n@@ -1164,9 +1086,7 @@ public function testAfterFind(): void\n \n public function testAfterRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterRefreshCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\n@@ -1185,9 +1105,7 @@ public function testAfterRefresh(): void\n \n public function testFindEmptyInCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $customers = $customerClass::find()->where(['id' => [1]])->all();\n $this->assertCount(1, $customers);\n@@ -1204,9 +1122,6 @@ public function testFindEmptyInCondition(): void\n \n public function testFindEagerIndexBy(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n@@ -1229,7 +1144,6 @@ public function testFindEagerIndexBy(): void\n \n public function testAttributeAccess(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $model = new $customerClass();\n \n@@ -1247,8 +1161,6 @@ public function testAttributeAccess(): void\n $baseModel = new $customerClass();\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\n \n-\n- /** @var ActiveRecord $customer */\n $customer = new $customerClass();\n $this->assertInstanceOf($customerClass, $customer);\n \n@@ -1272,8 +1184,8 @@ public function testAttributeAccess(): void\n $this->assertFalse($customer->canSetProperty('orderItems'));\n \n try {\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\n $customer->orderItems = [new $itemClass()];\n $this->fail('setter call above MUST throw Exception');\n } catch (Exception $e) {\n@@ -1293,7 +1205,6 @@ public function testAttributeAccess(): void\n */\n public function testViaWithCallable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n","summary":"Edited 1 file(s) in tests/framework/ar/"},{"subtask_id":"s8","scope_files":["tests/framework/db/GetTablesAliasTestTrait.php"],"solution_diff":"diff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\nindex f148be0be97..e5cb5d5f98a 100644\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\n public function testGetTableNamesIsFromObjectGenerateException(): void\n {\n $query = $this->createQuery();\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $query->from = new stdClass();\n \n $this->expectException('\\yii\\base\\InvalidConfigException');\n","summary":"Edited 1 file(s) in tests/framework/db/"},{"subtask_id":"s9","scope_files":["tests/framework/db/mssql/ActiveRecordTest.php","tests/framework/db/mssql/CommandTest.php","tests/framework/db/mssql/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\nindex 9486910479a..a9fbbe32175 100644\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\n@@ -52,10 +52,10 @@ public function testCastValues(): void\n $this->assertSame('1337', trim((string) $model->char_col));\n $this->assertSame('test', $model->char_col2);\n $this->assertSame('test123', $model->char_col3);\n- //$this->assertSame(3.742, $model->float_col);\n- //$this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame('3.742', $model->float_col);\n+ $this->assertSame(42.1337, $model->float_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n /**\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\nindex adecd27db0b..dc9e5532e7e 100644\n--- a/tests/framework/db/mssql/CommandTest.php\n+++ b/tests/framework/db/mssql/CommandTest.php\n@@ -115,12 +115,16 @@ public function testAddDropDefaultValue(): void\n 'int1' => 'integer',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n+\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\n \n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n }\n \n public static function batchInsertSqlProvider(): array\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 71f1b10c545..5ea92c3a6b9 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\db\\mssql;\n \n use yii\\base\\NotSupportedException;\n-use yii\\db\\Connection;\n use yii\\db\\Constraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n use yii\\db\\mssql\\TableSchema;\n@@ -52,10 +52,7 @@ public static function constraintsProvider(): array\n \n public function testGetStringFieldsSize(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $columns = $schema->getTableSchema('type', false)->columns;\n@@ -82,6 +79,8 @@ public function testGetStringFieldsSize(): void\n $expectedSize = null;\n $expectedDbType = 'text';\n break;\n+ default:\n+ $this->fail(\"Unexpected column name: {$name}\");\n }\n \n $this->assertEquals($expectedType, $type);\n@@ -328,6 +327,8 @@ public function testResolveTableNames(\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n+\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n $this->assertNotEmpty($primaryKeys);\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n@@ -359,6 +360,8 @@ public function testInsertWithCompositePrimaryKey(): void\n public function testGetViewNamesWithDefaultSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(Schema::class, $schema);\n+\n $viewNames = $schema->getViewNames();\n $this->assertContains('animal_view', $viewNames);\n }\n","summary":"Edited 3 file(s) in tests/framework/db/mssql/"},{"subtask_id":"s10","scope_files":["tests/framework/db/mysql/ActiveRecordTest.php","tests/framework/db/mysql/CommandTest.php","tests/framework/db/mysql/QueryBuilderTest.php"],"solution_diff":"diff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\nindex febbfdbec5f..acc648ed446 100644\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\n@@ -46,8 +46,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n public function testJsonColumn(): void\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\nindex b87ced8b56d..a61eea818ba 100644\n--- a/tests/framework/db/mysql/CommandTest.php\n+++ b/tests/framework/db/mysql/CommandTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\db\\mysql;\n \n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\base\\db\\BaseCommand;\n \n /**\n@@ -30,6 +31,7 @@ public function testAddDropCheckSeveral(): void\n \n $tableName = 'test_ck_several';\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\ndiff --git a/tests/framework/db/mysql/QueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php\nindex 5987790e6c0..ae9a19245f9 100644\n--- a/tests/framework/db/mysql/QueryBuilderTest.php\n+++ b/tests/framework/db/mysql/QueryBuilderTest.php\n@@ -18,6 +18,7 @@\n use yii\\db\\JsonExpression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\mysql\\QueryBuilder;\n use yiiunit\\base\\db\\BaseQueryBuilder;\n \n /**\n@@ -33,6 +34,7 @@ final class QueryBuilderTest extends BaseQueryBuilder\n \n public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -65,6 +67,7 @@ public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\n \n public function testBuildOrderByAndLimitWithLimitOnly(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -96,6 +99,7 @@ public function testBuildOrderByAndLimitWithLimitOnly(): void\n \n public function testBuildOrderByAndLimitWithOffsetOnly(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -176,6 +180,7 @@ public function testBuildOrderByAndLimitWithOrderByWithoutPagination(): void\n \n public function testBuildOrderByAndLimitWithZeroLimit(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -207,6 +212,7 @@ public function testBuildOrderByAndLimitWithZeroLimit(): void\n \n public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -240,6 +246,7 @@ public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\n \n public function testBuildOrderByAndLimitWithExpressionLimitAndOffset(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n","summary":"Edited 3 file(s) in tests/framework/db/mysql/"},{"subtask_id":"s11","scope_files":["tests/framework/db/mysql/connection/DeadLockTest.php"],"solution_diff":"diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\nindex 38fc5e553e0..daaa8f8e019 100644\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\n@@ -267,6 +267,8 @@ private function childrenUpdateLocked()\n * In case of error in child process its execution bubbles up to phpunit to continue\n * all the rest tests. So, all the rest tests in this case will run both in the child\n * and parent processes. Such mess must be prevented with child's own error handler.\n+ *\n+ * @phpstan-impure\n */\n private function setErrorHandler(): void\n {\n","summary":"Edited 1 file(s) in tests/framework/db/mysql/connection/"},{"subtask_id":"s12","scope_files":["tests/framework/db/oci/ActiveRecordTest.php","tests/framework/db/oci/CommandTest.php","tests/framework/db/oci/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\nindex 7b4f724cf4a..e2132cdc7e7 100644\n--- a/tests/framework/db/oci/ActiveRecordTest.php\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\n@@ -8,7 +8,6 @@\n \n namespace yiiunit\\framework\\db\\oci;\n \n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\ActiveQuery;\n use yiiunit\\data\\ar\\BitValues;\n use yiiunit\\data\\ar\\DefaultPk;\n@@ -52,8 +51,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- $this->assertEquals('1', $model->bool_col);\n- $this->assertEquals('0', $model->bool_col2);\n+ $this->assertSame('1', $model->bool_col);\n+ $this->assertSame('0', $model->bool_col2);\n }\n \n public function testDefaultValues(): void\n@@ -83,7 +82,6 @@ public function testDefaultValues(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -158,23 +156,21 @@ public function testBit(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = '1';\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('1', $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = '0';\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('0', $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\n $this->assertCount(2, $customers);\n@@ -183,25 +179,11 @@ public function testBooleanAttribute(): void\n $this->assertCount(1, $customers);\n }\n \n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- *\n- * @dataProvider aliasMethodProvider\n- *\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n- */\n- public function testJoinWithAlias(string $aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -212,13 +194,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -227,13 +203,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -242,13 +212,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -259,32 +223,14 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -292,36 +238,31 @@ public function testJoinWithAlias(string $aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n }\n }\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\nindex 8ca4181904d..552ce9378e2 100644\n--- a/tests/framework/db/oci/CommandTest.php\n+++ b/tests/framework/db/oci/CommandTest.php\n@@ -508,7 +508,7 @@ public function testQueryCache(): void\n \n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\n \n- $db->cache(function (Connection $db) use ($update): void {\n+ $db->cache(function (Connection $db): void {\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n \n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\nindex b90051c6c8c..1668aa5a63a 100644\n--- a/tests/framework/db/oci/SchemaTest.php\n+++ b/tests/framework/db/oci/SchemaTest.php\n@@ -11,8 +11,9 @@\n namespace yiiunit\\framework\\db\\oci;\n \n use Exception;\n+use PHPUnit\\Framework\\Attributes\\Group;\n use yii\\db\\CheckConstraint;\n-use yii\\db\\oci\\Schema;\n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -235,7 +236,6 @@ public function testFindUniqueIndexes(): void\n 'someCol3' => 'string',\n ])->execute();\n \n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\n@@ -279,8 +279,10 @@ public function testFindUniqueIndexes(): void\n public function testLobIndexesExcluded(): void\n {\n $db = $this->getConnection();\n+ $dbSchema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\n \n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\n $db->createCommand()->dropTable('lob_test')->execute();\n }\n \n@@ -288,7 +290,7 @@ public function testLobIndexesExcluded(): void\n 'CREATE TABLE \"lob_test\" (\"id\" NUMBER(10) NOT NULL, \"content\" CLOB, \"data\" BLOB, PRIMARY KEY (\"id\"))'\n )->execute();\n \n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\n \n $this->assertCount(1, $indexes);\n \n","summary":"Edited 3 file(s) in tests/framework/db/oci/"},{"subtask_id":"s13","scope_files":["tests/framework/db/pgsql/ActiveFixtureTest.php","tests/framework/db/pgsql/ActiveRecordTest.php","tests/framework/db/pgsql/BaseActiveRecordTest.php"],"solution_diff":"diff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\nindex 281874d55e3..5c8f4a99398 100644\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\n@@ -8,7 +8,9 @@\n \n namespace yiiunit\\framework\\db\\pgsql;\n \n+use yiiunit\\data\\ar\\Customer;\n use yiiunit\\framework\\test\\CustomerDbTestCase;\n+use yiiunit\\framework\\test\\CustomerFixture;\n \n /**\n * @group db\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\n $test = new CustomerDbTestCase();\n $test->setUp();\n $fixture = $test->getFixture('customers');\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n \n $sequenceName = $fixture->getTableSchema()->sequenceName;\n $sequenceNextVal = $this->getConnection()->createCommand(\"SELECT currval('$sequenceName')\")->queryScalar();\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\n+\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\n \n $test->tearDown();\n }\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 1a0366ff6a6..549eaab62d1 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -33,9 +33,6 @@ class ActiveRecordTest extends BaseActiveRecord\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -61,7 +58,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -319,6 +315,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -327,6 +329,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n final public const STATUS_DELETED = 0;\n@@ -348,12 +362,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\nindex fd6762f5eb9..d4290c40474 100644\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\n@@ -39,8 +39,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array json_col\n+ * @property int $id\n+ * @property array $json_col\n */\n class ArrayAndJsonType extends ActiveRecord\n {\n","summary":"Edited 3 file(s) in tests/framework/db/pgsql/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"composer.lock\",\n \"phpstan-baseline.neon\",\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/composer.lock b/composer.lock\\nindex f9f75af4753..595956640b4 100644\\n--- a/composer.lock\\n+++ b/composer.lock\\n@@ -389,16 +389,16 @@\\n },\\n {\\n \\\"name\\\": \\\"composer/composer\\\",\\n- \\\"version\\\": \\\"2.9.7\\\",\\n+ \\\"version\\\": \\\"2.9.8\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/composer/composer.git\\\",\\n- \\\"reference\\\": \\\"82a2fbd1372a98d7915cfb092acf05207d9b4113\\\"\\n+ \\\"reference\\\": \\\"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/composer/composer/zipball/82a2fbd1372a98d7915cfb092acf05207d9b4113\\\",\\n- \\\"reference\\\": \\\"82a2fbd1372a98d7915cfb092acf05207d9b4113\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/composer/composer/zipball/39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\\\",\\n+ \\\"reference\\\": \\\"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -486,7 +486,7 @@\\n \\\"irc\\\": \\\"ircs://irc.libera.chat:6697/composer\\\",\\n \\\"issues\\\": \\\"https://github.com/composer/composer/issues\\\",\\n \\\"security\\\": \\\"https://github.com/composer/composer/security/policy\\\",\\n- \\\"source\\\": \\\"https://github.com/composer/composer/tree/2.9.7\\\"\\n+ \\\"source\\\": \\\"https://github.com/composer/composer/tree/2.9.8\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -498,7 +498,7 @@\\n \\\"type\\\": \\\"github\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-04-14T11:31:52+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-13T07:28:38+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"composer/metadata-minifier\\\",\\n@@ -3458,16 +3458,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/console\\\",\\n- \\\"version\\\": \\\"v7.4.9\\\",\\n+ \\\"version\\\": \\\"v7.4.11\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/console.git\\\",\\n- \\\"reference\\\": \\\"d7d2b64a45a89d607865927b176fa51c33ddbb58\\\"\\n+ \\\"reference\\\": \\\"ed0107e43ab452aa77ae99e005b95e56b556e075\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\\\",\\n- \\\"reference\\\": \\\"d7d2b64a45a89d607865927b176fa51c33ddbb58\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/console/zipball/ed0107e43ab452aa77ae99e005b95e56b556e075\\\",\\n+ \\\"reference\\\": \\\"ed0107e43ab452aa77ae99e005b95e56b556e075\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3532,7 +3532,7 @@\\n \\\"terminal\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/console/tree/v7.4.9\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/console/tree/v7.4.11\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3552,7 +3552,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-04-22T15:21:55+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-13T12:04:42+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/deprecation-contracts\\\",\\n@@ -3627,16 +3627,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/filesystem\\\",\\n- \\\"version\\\": \\\"v8.0.9\\\",\\n+ \\\"version\\\": \\\"v8.0.11\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/filesystem.git\\\",\\n- \\\"reference\\\": \\\"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\"\\n+ \\\"reference\\\": \\\"224db910898ce1317b892a9a1338f1f8f17eb7c7\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\",\\n- \\\"reference\\\": \\\"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/filesystem/zipball/224db910898ce1317b892a9a1338f1f8f17eb7c7\\\",\\n+ \\\"reference\\\": \\\"224db910898ce1317b892a9a1338f1f8f17eb7c7\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3673,7 +3673,7 @@\\n \\\"description\\\": \\\"Provides basic utilities for the filesystem\\\",\\n \\\"homepage\\\": \\\"https://symfony.com\\\",\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/filesystem/tree/v8.0.9\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/filesystem/tree/v8.0.11\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3693,7 +3693,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-04-18T13:51:42+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-11T16:39:47+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/finder\\\",\\n@@ -4424,16 +4424,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/process\\\",\\n- \\\"version\\\": \\\"v8.0.8\\\",\\n+ \\\"version\\\": \\\"v8.0.11\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/process.git\\\",\\n- \\\"reference\\\": \\\"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\\\"\\n+ \\\"reference\\\": \\\"26d89e459f037d2873300605d0a07e7a8ef84db0\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/process/zipball/cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\\\",\\n- \\\"reference\\\": \\\"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/process/zipball/26d89e459f037d2873300605d0a07e7a8ef84db0\\\",\\n+ \\\"reference\\\": \\\"26d89e459f037d2873300605d0a07e7a8ef84db0\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -4465,7 +4465,7 @@\\n \\\"description\\\": \\\"Executes commands in sub-processes\\\",\\n \\\"homepage\\\": \\\"https://symfony.com\\\",\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/process/tree/v8.0.8\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/process/tree/v8.0.11\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4485,7 +4485,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-03-30T15:14:47+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-11T16:56:32+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/service-contracts\\\",\\n@@ -4576,16 +4576,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/string\\\",\\n- \\\"version\\\": \\\"v8.0.8\\\",\\n+ \\\"version\\\": \\\"v8.0.11\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/string.git\\\",\\n- \\\"reference\\\": \\\"ae9488f874d7603f9d2dfbf120203882b645d963\\\"\\n+ \\\"reference\\\": \\\"39be2ad058a3c0bd558edca23e65f009865d75ff\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/string/zipball/ae9488f874d7603f9d2dfbf120203882b645d963\\\",\\n- \\\"reference\\\": \\\"ae9488f874d7603f9d2dfbf120203882b645d963\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/string/zipball/39be2ad058a3c0bd558edca23e65f009865d75ff\\\",\\n+ \\\"reference\\\": \\\"39be2ad058a3c0bd558edca23e65f009865d75ff\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -4642,7 +4642,7 @@\\n \\\"utf8\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/string/tree/v8.0.8\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/string/tree/v8.0.11\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4662,7 +4662,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-03-30T15:14:47+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-13T12:07:53+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"theseer/tokenizer\\\",\\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\\nindex 3f78050b8ad..a7a2f9b5440 100644\\n--- a/phpstan-baseline.neon\\n+++ b/phpstan-baseline.neon\\n@@ -450,774 +450,12 @@ parameters:\\n \\t\\t\\tcount: 1\\n \\t\\t\\tpath: framework/test/DbFixture.php\\n \\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveQuery.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$category in PHPDoc tag @var does not match assigned variable \\\\$categories\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.differentVariable\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveQuery.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$address\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$customer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$customer_id\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$email\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$id\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$isNewRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$itemsFor8\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$itemsWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$name\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 13\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orderItemsWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$ordersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$quantity\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$relatedRecords\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$status\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$subtotal\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$total\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$virtualCustomer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$virtualCustomerId\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$expensiveOrders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$expensiveOrdersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$ordersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$limitedItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orders2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\CustomerWithAlias\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\CustomerWithAlias\\\\:\\\\:\\\\$orders2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$bookItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$books\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 12\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$books2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksExplicit\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksExplicitA\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksQuerysyntax\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksQuerysyntaxA\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksViaTable\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksWithNullFKViaTable\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customer2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customerJoinedWithProfile\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customerJoinedWithProfileIndexOrdered\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 31\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$itemsIndexed\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$limitedItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$movieItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$quantityOrderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$custom\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$item\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$order\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$orderItemCompositeNoJoin\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$orderItemCompositeWithJoin\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to property \\\\$id on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to property \\\\$orderItems on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQuery\\\\:\\\\:applyAlias\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 7\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQuery\\\\<yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\>\\\\:\\\\:applyAlias\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 7\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:active\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:canGetProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:canSetProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:getOrders\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:hasProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:isRelationPopulated\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:refresh\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:unlinkAll\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:updateCounters\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined static method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:updateAllCounters\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: staticMethod.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method afterSave\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 23\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertArrayHasKey\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 30\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertCount\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 92\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertEmpty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertEquals\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 97\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertFalse\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 22\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertInstanceOf\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 19\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertNotNull\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 8\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertNull\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 16\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertTrue\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 39\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method canGetProperty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method canSetProperty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getCustomerClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getOrderClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getOrderWithNullFKClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$books on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$id on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 10\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$items on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$name on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$orders on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$ordersWithItems on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$primaryKey on null\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$relatedRecords on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot call method isRelationPopulated\\\\(\\\\) on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: method.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Class yiiunit\\\\\\\\extensions\\\\\\\\redis\\\\\\\\ActiveRecordTest not found\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:with\\\\(\\\\) invoked with 1 parameter, 0 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 13\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:with\\\\(\\\\) invoked with 2 parameters, 0 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Offset 0 does not exist on yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItemWithConstructor\\\\.$#'\\n-\\t\\t\\tidentifier: offsetAccess.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var for variable \\\\$customer contains unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var for variable \\\\$this has invalid type yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.trait\\n-\\t\\t\\tcount: 27\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var with type yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\|yiiunit\\\\\\\\TestCase is not subtype of native type \\\\$this\\\\(yiiunit\\\\\\\\base\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.nativeType\\n-\\t\\t\\tcount: 33\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$stringcol \\\\(string\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var1 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var1 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var2 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var2 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var3 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var3 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$total \\\\(string\\\\) does not accept int\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$count might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$customer in PHPDoc tag @var does not match assigned variable \\\\$class\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.differentVariable\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$customer might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$orders might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Anonymous function has an unused use \\\\$update\\\\.$#'\\n-\\t\\t\\tidentifier: closure.unusedUse\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableChecks\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableForeignKeys\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTablePrimaryKey\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableUniques\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$foreignKeys on null\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\Command\\\\:\\\\:queryOne\\\\(\\\\) invoked with 2 parameters, 0\\\\-1 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Offset 0 does not exist on array\\\\{\\\\}\\\\.$#'\\n-\\t\\t\\tidentifier: offsetAccess.notFound\\n-\\t\\t\\tcount: 8\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$expression might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Anonymous function has an unused use \\\\$update\\\\.$#'\\n-\\t\\t\\tidentifier: closure.unusedUse\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseQuery.php\\n-\\n \\t\\t-\\n \\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$condition with type array\\\\|string is not subtype of native type array\\\\.$#'\\n \\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n \\t\\t\\tpath: tests/base/db/BaseQueryBuilder.php\\n \\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ColumnSchema\\\\:\\\\:\\\\$dimension\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseSchema.php\\n-\\n \\t\\t-\\n \\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expected with type mixed is not subtype of native type array\\\\|bool\\\\|yii\\\\\\\\db\\\\\\\\Constraint\\\\|null\\\\.$#'\\n \\t\\t\\tidentifier: parameter.phpDocType\\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 6a59f2fbff4..389a680492c 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -15,8 +15,6 @@ parameters:\\n - tests/data\\n - tests/framework/*/stubs/*\\n - tests/framework/*/mocks/*\\n- # TODO: Analyze these directories\\n- - tests/framework/db\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\\n\",\n \"summary\": \"Edited 3 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"docs/guide/test-fixtures.md\"\n ],\n \"solution_diff\": \"diff --git a/docs/guide/test-fixtures.md b/docs/guide/test-fixtures.md\\nindex 414a3db9e3f..ac655725930 100644\\n--- a/docs/guide/test-fixtures.md\\n+++ b/docs/guide/test-fixtures.md\\n@@ -36,6 +36,10 @@ class UserFixture extends ActiveFixture\\n }\\n ```\\n \\n+These examples use the `app\\\\tests\\\\fixtures` namespace because the fixture classes are referenced directly\\n+by application tests. The `yii fixture` command has its own default namespace, `tests\\\\unit\\\\fixtures`.\\n+If your fixture classes use another namespace, configure the command or pass the `--namespace` option.\\n+\\n > Tip: Each `ActiveFixture` is about preparing a DB table for testing purpose. You may specify the table\\n > by setting either the [[yii\\\\test\\\\ActiveFixture::tableName]] property or the [[yii\\\\test\\\\ActiveFixture::modelClass]]\\n > property. If the latter, the table name will be taken from the `ActiveRecord` class specified by `modelClass`.\\n@@ -178,7 +182,7 @@ different tests. We thus recommend that you organize the data files in a hierarc\\n your class namespaces. For example,\\n \\n ```\\n-# under folder tests\\\\unit\\\\fixtures\\n+# under the folder that matches your fixture namespace, for example tests\\\\unit\\\\fixtures\\n \\n data\\\\\\n components\\\\\\n@@ -243,7 +247,9 @@ Fixture classes name should not be plural.\\n \\n ### Loading fixtures\\n \\n-Fixture classes should be suffixed by `Fixture`. By default, fixtures will be searched under `tests\\\\unit\\\\fixtures` namespace, you can\\n+Fixture classes should be suffixed by `Fixture`. By default, the `yii fixture` command searches for them\\n+under the `tests\\\\unit\\\\fixtures` namespace. This command default is independent from the fixture namespaces\\n+used by application tests. You can\\n change this behavior with config or command options. You can exclude some fixtures due load or unload by specifying `-` before its name like `-User`.\\n \\n To load fixture, run the following command:\\n@@ -277,7 +283,7 @@ yii fixture \\\"*\\\"\\n yii fixture \\\"*, -DoNotLoadThisOne\\\"\\n \\n // load fixtures, but search them in different namespace. By default namespace is: tests\\\\unit\\\\fixtures.\\n-yii fixture User --namespace='alias\\\\my\\\\custom\\\\namespace'\\n+yii fixture User --namespace='app\\\\tests\\\\fixtures'\\n \\n // load global fixture `some\\\\name\\\\space\\\\CustomFixture` before other fixtures will be loaded.\\n // By default this option is set to `InitDbFixture` to disable/enable integrity checks. You can specify several\\n@@ -310,7 +316,7 @@ Same command options like: `namespace`, `globalFixtures` also can be applied to\\n \\n While command line options allow us to configure the fixture command\\n on-the-fly, sometimes we may want to configure the command once for all. For example, you can configure\\n-different fixture path as follows:\\n+a different fixture namespace as follows:\\n \\n ```\\n 'controllerMap' => [\\n\",\n \"summary\": \"Edited 1 file(s) in docs/guide/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex efe898b3051..6416cbd74e6 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -75,11 +75,13 @@ Yii Framework 2 Change Log\\n 2.0.56 under development\\n ------------------------\\n \\n-- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n-- Enh #20785: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n-- Bug #20785: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n-- Bug #20785: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n+- Enh #20875: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n+- Bug #20875: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n+- Bug #20875: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\\\db\\\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\\n+- Bug #20878: Fix `@var` annotation for `yii\\\\db\\\\Query::$from` (mspirkov)\\n - Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n \\n \\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"framework/db/BaseActiveRecord.php\",\n \"framework/db/Query.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\\nindex 194eff2def8..464e9056d9f 100644\\n--- a/framework/db/BaseActiveRecord.php\\n+++ b/framework/db/BaseActiveRecord.php\\n@@ -1816,12 +1816,16 @@ private function isValueDifferent($newValue, $oldValue)\\n * }\\n * ```\\n *\\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\\n+ * @template TModels of array\\n+ *\\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\\n * - an active record instance;\\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\\n * @since 2.0.50\\n+ *\\n+ * @param-out TModels $models\\n */\\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\\n {\\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\\nindex 5709702ef9b..932640d0f16 100644\\n--- a/framework/db/Query.php\\n+++ b/framework/db/Query.php\\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\\n */\\n public $distinct = false;\\n /**\\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\\n * This is used to construct the FROM clause in a SQL statement.\\n * @see from()\\n */\\n\",\n \"summary\": \"Edited 2 file(s) in framework/db/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/base/db/BaseActiveQuery.php\",\n \"tests/base/db/BaseActiveRecord.php\",\n \"tests/base/db/BaseCommand.php\",\n \"tests/base/db/BaseQuery.php\",\n \"tests/base/db/BaseSchema.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/base/db/BaseActiveQuery.php b/tests/base/db/BaseActiveQuery.php\\nindex 70ffda75a38..32c29f5b897 100644\\n--- a/tests/base/db/BaseActiveQuery.php\\n+++ b/tests/base/db/BaseActiveQuery.php\\n@@ -296,9 +296,7 @@ public function testGetTableNamesWontFillFrom(): void\\n */\\n public function testDeeplyNestedTableRelationWith(): void\\n {\\n- /** @var Category $category */\\n $categories = Category::find()->with('orders')->indexBy('id')->all();\\n-\\n $category = $categories[1];\\n $this->assertNotNull($category);\\n $orders = $category->orders;\\ndiff --git a/tests/base/db/BaseActiveRecord.php b/tests/base/db/BaseActiveRecord.php\\nindex e0d3e2aeddf..f6584f819e2 100644\\n--- a/tests/base/db/BaseActiveRecord.php\\n+++ b/tests/base/db/BaseActiveRecord.php\\n@@ -42,7 +42,6 @@\\n use yiiunit\\\\data\\\\ar\\\\Type;\\n use yiiunit\\\\data\\\\ar\\\\CroppedType;\\n use yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait;\\n-use yiiunit\\\\TestCase;\\n \\n abstract class BaseActiveRecord extends DatabaseTestCase\\n {\\n@@ -57,6 +56,8 @@ protected function setUp(): void\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Customer>\\n */\\n public function getCustomerClass()\\n {\\n@@ -65,6 +66,8 @@ public function getCustomerClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Item>\\n */\\n public function getItemClass()\\n {\\n@@ -73,6 +76,8 @@ public function getItemClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Order>\\n */\\n public function getOrderClass()\\n {\\n@@ -81,6 +86,8 @@ public function getOrderClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderItem>\\n */\\n public function getOrderItemClass()\\n {\\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\\n }\\n \\n /**\\n- * @return string\\n+ * {@inheritdoc}\\n+ *\\n+ * @return class-string<Category>\\n */\\n public function getCategoryClass()\\n {\\n@@ -97,6 +106,8 @@ public function getCategoryClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderWithNullFK>\\n */\\n public function getOrderWithNullFKClass()\\n {\\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderItemWithNullFK>\\n */\\n public function getOrderItemWithNullFKmClass()\\n {\\n@@ -154,7 +167,6 @@ public function testFindExists(): void\\n \\n public function testFindColumn(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\\n }\\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\\n */\\n public function testDeeplyNestedTableRelation2(): void\\n {\\n- /** @var Category $category */\\n $category = Category::findOne(1);\\n $this->assertNotNull($category);\\n $orders = $category->orders;\\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\\n $record = new NullValues();\\n \\n // this is to simulate empty html form submission\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var1 = '';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var2 = '';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var3 = '';\\n $record->stringcol = '';\\n \\n@@ -813,35 +827,11 @@ public function testJoinWithEager(): void\\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\\n }\\n \\n- public static function aliasMethodProvider(): array\\n- {\\n- return [\\n- ['explicit'], // c\\n- // ['querysyntax'], // {{@customer}}\\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\\n- // later getRelationAlias() could be added\\n- ];\\n- }\\n-\\n- /**\\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\\n- *\\n- * @dataProvider aliasMethodProvider\\n- *\\n- * @param string $aliasMethod Whether alias is specified explicitly or using the query syntax {{@tablename}}.\\n- */\\n- public function testJoinWithAlias(string $aliasMethod): void\\n+ public function testJoinWithAlias(): void\\n {\\n // left join and eager loading\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\\n $this->assertCount(3, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -852,13 +842,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // inner join filtering and eager loading\\n $query = Order::find()->innerJoinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -867,13 +851,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // inner join filtering without eager loading\\n $query = Order::find()->innerJoinWith(['customer c'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -882,13 +860,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // join with via-relation\\n $query = Order::find()->innerJoinWith(['books b']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(1, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -899,32 +871,15 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // joining sub relations\\n $query = Order::find()->innerJoinWith([\\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->orderBy('{{i}}.id');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->orderBy('{{@item}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->orderBy($q->applyAlias('item', 'id'));\\n- }\\n+ 'items i' => function (ActiveQuery $q) {\\n+ $q->orderBy('{{i}}.id');\\n },\\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ 'items.category c' => function (ActiveQuery $q) {\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ]);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('{{i}}.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@item}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\\n- }\\n+\\n+ $orders = $query->orderBy('{{i}}.id')->all();\\n $this->assertCount(1, $orders);\\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\\n $this->assertEquals(2, $orders[0]->id);\\n@@ -932,48 +887,35 @@ public function testJoinWithAlias(string $aliasMethod): void\\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\\n \\n- // join with ON condition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod);\\n- $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n-\\n- // join with ON condition and alias in relation definition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicit';\\n+ $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n+\\n+ $relationName = 'booksExplicitA';\\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n \\n // join with count and query\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $count = $query->count('[[c.id]]');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $count = $query->count('{{@customer}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $count = $query->count($query->applyAlias('customer', 'id'));\\n- }\\n+ $count = $query->count('[[c.id]]');\\n $this->assertEquals(3, $count);\\n $orders = $query->all();\\n $this->assertCount(3, $orders);\\n@@ -982,28 +924,16 @@ public function testJoinWithAlias(string $aliasMethod): void\\n /** @var Order $order */\\n $order = Order::findOne(1);\\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $customer = $customerQuery->where(['o.id' => 1])->one();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\\n- }\\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\\n $this->assertNotNull($customer);\\n $this->assertEquals(1, $customer->id);\\n \\n // join with sub-relation called inside Closure\\n $orders = Order::find()->joinWith([\\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\\n+ 'items' => function (ActiveQuery $q) {\\n $q->orderBy('item.id');\\n $q->joinWith(['category c']);\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ])->orderBy('order.id')->all();\\n $this->assertCount(1, $orders);\\n@@ -1393,13 +1323,9 @@ public function testDefaultValues(): void\\n \\n public function testUnlinkAllViaTable(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n // via table with delete\\n@@ -1837,7 +1763,6 @@ public function testIndexByAfterLoadingRelations(): void\\n */\\n public function testNoTablenameReplacement(): void\\n {\\n- /** @var Customer $customer */\\n $class = $this->getCustomerClass();\\n $customer = new $class();\\n $customer->name = 'Some {{weird}} name';\\n@@ -2086,7 +2011,7 @@ public function testResetNotSavedRelation(): void\\n {\\n $order = new Order();\\n $order->customer_id = 1;\\n- $order->total = 0;\\n+ $order->total = '0';\\n \\n $orderItem = new OrderItem();\\n $order->orderItems;\\n@@ -2159,7 +2084,6 @@ public static function providerForUnlinkDelete(): array\\n */\\n public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n $order = $orderClass::findOne(2);\\n@@ -2170,7 +2094,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\\n $this->assertCount(0, $order->itemsFor8);\\n $this->assertCount(2, $order->orderItemsWithNullFK);\\n \\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\\n $this->assertCount(1, $orderItemClass::findAll([\\n 'order_id' => 2,\\n@@ -2184,7 +2107,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\\n \\n public function testVirtualRelation(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n $order = $orderClass::findOne(2);\\n $order->virtualCustomerId = $order->customer_id;\\n@@ -2229,7 +2151,6 @@ public function testGetAttributeLabel($model): void\\n public function testLoadRelations(): void\\n {\\n // Test eager loading relations for multiple primary models using loadRelationsFor().\\n- /** @var Customer[] $customers */\\n $customers = Customer::find()->all();\\n Customer::loadRelationsFor($customers, ['orders.items']);\\n foreach ($customers as $customer) {\\n@@ -2240,7 +2161,6 @@ public function testLoadRelations(): void\\n }\\n \\n // Test eager loading relations as arrays.\\n- /** @var array $customers */\\n $customers = Customer::find()->asArray(true)->all();\\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\\n $query->asArray(false);\\ndiff --git a/tests/base/db/BaseCommand.php b/tests/base/db/BaseCommand.php\\nindex 9cf4ce0bf33..0d02039630f 100644\\n--- a/tests/base/db/BaseCommand.php\\n+++ b/tests/base/db/BaseCommand.php\\n@@ -18,11 +18,13 @@\\n use ArrayObject;\\n use yii\\\\caching\\\\ArrayCache;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yii\\\\db\\\\DataReader;\\n use yii\\\\db\\\\Exception;\\n use yii\\\\db\\\\Expression;\\n use yii\\\\db\\\\Query;\\n use yii\\\\db\\\\Schema;\\n+use yii\\\\db\\\\TableSchema;\\n \\n abstract class BaseCommand extends DatabaseTestCase\\n {\\n@@ -290,7 +292,7 @@ public function testFetchMode(): void\\n // FETCH_NUM, customized in query method\\n $sql = 'SELECT * FROM {{customer}}';\\n $command = $db->createCommand($sql);\\n- $result = $command->queryOne([], PDO::FETCH_NUM);\\n+ $result = $command->queryOne(PDO::FETCH_NUM);\\n $this->assertTrue(\\\\is_array($result) && isset($result[0]));\\n }\\n \\n@@ -682,6 +684,9 @@ public function testInsertExpression(): void\\n break;\\n case 'oci':\\n $expression = 'EXTRACT(YEAR FROM sysdate)';\\n+ break;\\n+ default:\\n+ $this->fail(\\\"Unexpected driver name: {$this->driverName}\\\");\\n }\\n \\n $command = $db->createCommand();\\n@@ -1126,8 +1131,8 @@ public static function addPrimaryKeyProvider(): array\\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1141,15 +1146,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\\n ],\\n )->execute();\\n \\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\\n-\\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\\n \\n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\\n-\\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1195,8 +1201,8 @@ public static function addForeignKeyProvider(): array\\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1214,7 +1220,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->addForeignKey(\\n $name,\\n@@ -1224,12 +1231,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n (array) $refColumns,\\n )->execute();\\n \\n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\\n \\n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1250,32 +1258,40 @@ public function testCreateDropIndex(): void\\n 'int2' => 'integer not null',\\n ])->execute();\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n+\\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n }\\n \\n public static function addUniqueProvider(): array\\n@@ -1312,8 +1328,8 @@ public static function addUniqueProvider(): array\\n public function testAddDropUnique(string $name, string $tableName, $columns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1327,15 +1343,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\\n-\\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\\n \\n $db->createCommand()->dropUnique($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1352,6 +1369,7 @@ public function testAddDropCheck(): void\\n $name = 'test_ck_constraint';\\n \\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1362,18 +1380,16 @@ public function testAddDropCheck(): void\\n ['int1' => 'integer'],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n \\n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\\n-\\n- $this->assertMatchesRegularExpression(\\n- '/^.*int1.*>.*1.*$/',\\n- $schema->getTableChecks($tableName, true)[0]->expression\\n- );\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\\n \\n $db->createCommand()->dropCheck($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n }\\n \\n public function testAddDropDefaultValue(): void\\n@@ -1442,7 +1458,7 @@ public function testQueryCache(): void\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n \\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\\n- $db->cache(function (Connection $db) use ($command, $update): void {\\n+ $db->cache(function (Connection $db) use ($command): void {\\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n }, 10);\\n@@ -1554,40 +1570,50 @@ public function testAutoRefreshTableSchema(): void\\n $tableName = 'test';\\n $fkName = 'test_fk';\\n \\n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\\n+ $schema = $db->getSchema();\\n+\\n+ if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n \\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n \\n $db->createCommand()->createTable($tableName, [\\n 'id' => 'pk',\\n 'fk' => 'int',\\n 'name' => 'string',\\n ])->execute();\\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $initialSchema = $schema->getTableSchema($tableName);\\n $this->assertNotNull($initialSchema);\\n \\n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $newSchema = $schema->getTableSchema($tableName);\\n $this->assertNotEquals($initialSchema, $newSchema);\\n \\n if ($this->driverName !== 'sqlite') {\\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\\n \\n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\\n }\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n }\\n \\n public function testTransaction(): void\\ndiff --git a/tests/base/db/BaseQuery.php b/tests/base/db/BaseQuery.php\\nindex 4799fd29f09..1e5f837cb79 100644\\n--- a/tests/base/db/BaseQuery.php\\n+++ b/tests/base/db/BaseQuery.php\\n@@ -721,7 +721,7 @@ public function testQueryCache(): void\\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\\n \\n- $db->cache(function (Connection $db) use ($query, $update): void {\\n+ $db->cache(function (Connection $db) use ($query): void {\\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\\n }, 10);\\ndiff --git a/tests/base/db/BaseSchema.php b/tests/base/db/BaseSchema.php\\nindex c00ef204544..0b3bdf1579f 100644\\n--- a/tests/base/db/BaseSchema.php\\n+++ b/tests/base/db/BaseSchema.php\\n@@ -17,11 +17,11 @@\\n use yii\\\\caching\\\\FileCache;\\n use yii\\\\db\\\\CheckConstraint;\\n use yii\\\\db\\\\ColumnSchema;\\n-use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Constraint;\\n use yii\\\\db\\\\Expression;\\n use yii\\\\db\\\\ForeignKeyConstraint;\\n use yii\\\\db\\\\IndexConstraint;\\n+use yii\\\\db\\\\pgsql\\\\ColumnSchema as PgsqlColumnSchema;\\n use yii\\\\db\\\\Schema;\\n use yii\\\\db\\\\TableSchema;\\n \\n@@ -125,10 +125,7 @@ public function testGetNonExistingTableSchema(): void\\n \\n public function testSchemaCache(): void\\n {\\n- /** @var Connection $db */\\n $db = $this->getConnection();\\n-\\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $schema->db->enableSchemaCache = true;\\n@@ -546,6 +543,7 @@ public function testColumnSchema(): void\\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \\\"defaultValue of column $name does not match.\\\");\\n }\\n if (isset($expected['dimension'])) { // PgSQL only\\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\\n $this->assertSame($expected['dimension'], $column->dimension, \\\"dimension of column $name does not match\\\");\\n }\\n }\\n\",\n \"summary\": \"Edited 5 file(s) in tests/base/db/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/data/ar/Category.php\",\n \"tests/data/ar/Customer.php\",\n \"tests/data/ar/CustomerQuery.php\",\n \"tests/data/ar/CustomerWithAlias.php\",\n \"tests/data/ar/DefaultPk.php\",\n \"tests/data/ar/Item.php\",\n \"tests/data/ar/NullValues.php\",\n \"tests/data/ar/Order.php\",\n \"tests/data/ar/OrderItem.php\",\n \"tests/data/ar/OrderWithConstructor.php\",\n \"tests/data/ar/TestTrigger.php\",\n \"tests/data/ar/Type.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\\nindex 7472cfe7068..158862635cb 100644\\n--- a/tests/data/ar/Category.php\\n+++ b/tests/data/ar/Category.php\\n@@ -13,6 +13,11 @@\\n *\\n * @property int $id\\n * @property string $name\\n+ *\\n+ * @property-read Item[] $items\\n+ * @property-read Item[] $limitedItems\\n+ * @property-read OrderItem[] $orderItems\\n+ * @property-read Order[] $orders\\n */\\n class Category extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\\nindex 18b96c02399..37405d963a8 100644\\n--- a/tests/data/ar/Customer.php\\n+++ b/tests/data/ar/Customer.php\\n@@ -21,8 +21,21 @@\\n * @property string $email\\n * @property string $address\\n * @property int $status\\n+ * @property 1|0|'1'|'0'|bool $bool_status\\n *\\n * @method static CustomerQuery findBySql($sql, $params = [])\\n+ *\\n+ * @property-read Profile $profile\\n+ * @property-read Order[] $ordersPlain\\n+ * @property-read Order[] $orders\\n+ * @property-read Order[] $expensiveOrders\\n+ * @property-read Order[] $ordersWithItems\\n+ * @property-read Order[] $expensiveOrdersWithNullFK\\n+ * @property-read Order[] $ordersWithNullFK\\n+ * @property-read Order[] $orders2\\n+ * @property-read Item[] $orderItems\\n+ * @property-read OrderItem[] $orderItems2\\n+ * @property-read Item[] $items\\n */\\n class Customer extends ActiveRecord\\n {\\n@@ -113,7 +126,7 @@ public function afterSave($insert, $changedAttributes): void\\n \\n /**\\n * {@inheritdoc}\\n- * @return CustomerQuery\\n+ * @return CustomerQuery<static>\\n */\\n public static function find()\\n {\\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\\nindex bf0850ab064..41a50ca0557 100644\\n--- a/tests/data/ar/CustomerQuery.php\\n+++ b/tests/data/ar/CustomerQuery.php\\n@@ -14,7 +14,8 @@\\n \\n /**\\n * CustomerQuery.\\n- * @extends ActiveQuery<CustomerWithAlias>\\n+ * @template TModel of Customer = Customer\\n+ * @extends ActiveQuery<TModel>\\n */\\n class CustomerQuery extends ActiveQuery\\n {\\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\\nindex eaa32613e8b..0aee1182f96 100644\\n--- a/tests/data/ar/CustomerWithAlias.php\\n+++ b/tests/data/ar/CustomerWithAlias.php\\n@@ -2,24 +2,9 @@\\n \\n namespace yiiunit\\\\data\\\\ar;\\n \\n-/**\\n- * Class Customer.\\n- *\\n- * @property int $id\\n- * @property string $name\\n- * @property string $email\\n- * @property string $address\\n- * @property int $status\\n- *\\n- * @method static CustomerQuery findBySql($sql, $params = [])\\n- */\\n-class CustomerWithAlias extends ActiveRecord\\n+class CustomerWithAlias extends Customer\\n {\\n- final public const STATUS_ACTIVE = 1;\\n- final public const STATUS_INACTIVE = 2;\\n-\\n public $status2;\\n-\\n public $sumTotal;\\n \\n public static function tableName()\\n@@ -29,7 +14,7 @@ public static function tableName()\\n \\n /**\\n * {@inheritdoc}\\n- * @return CustomerQuery\\n+ * @return CustomerQuery<static>\\n */\\n public static function find()\\n {\\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\\nindex 7c66ed78f14..ce265ef98fa 100644\\n--- a/tests/data/ar/DefaultPk.php\\n+++ b/tests/data/ar/DefaultPk.php\\n@@ -13,6 +13,7 @@\\n *\\n * @author Jan Waล <janek.jan@gmail.com>\\n * @property int $id\\n+ * @property string $type\\n */\\n class DefaultPk extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\\nindex cfd8345eb46..ff41d1da8a8 100644\\n--- a/tests/data/ar/Item.php\\n+++ b/tests/data/ar/Item.php\\n@@ -14,6 +14,8 @@\\n * @property int $id\\n * @property string $name\\n * @property int $category_id\\n+ *\\n+ * @property-read Category $category\\n */\\n class Item extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\\nindex ea9307e505b..c62f750eda6 100644\\n--- a/tests/data/ar/NullValues.php\\n+++ b/tests/data/ar/NullValues.php\\n@@ -12,10 +12,10 @@\\n * Class NullValues.\\n *\\n * @property int $id\\n- * @property int $var1\\n- * @property int $var2\\n- * @property int $var3\\n- * @property string $stringcol\\n+ * @property int|null $var1\\n+ * @property int|null $var2\\n+ * @property int|null $var3\\n+ * @property string|null $stringcol\\n */\\n class NullValues extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\\nindex 57c26a5aaeb..e2ebf0f462f 100644\\n--- a/tests/data/ar/Order.php\\n+++ b/tests/data/ar/Order.php\\n@@ -18,9 +18,34 @@\\n * @property int $created_at\\n * @property string $total\\n *\\n+ * @property-read Customer $customer\\n+ * @property-read Customer $customer2\\n+ * @property-read Customer $virtualCustomer\\n+ * @property-read Customer $customerJoinedWithProfile\\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\\n+ * @property-read Item[] $books\\n+ * @property-read Item[] $books2\\n+ * @property-read Item[] $booksExplicit\\n+ * @property-read Item[] $booksExplicitA\\n+ * @property-read Item[] $bookItems\\n+ * @property-read Item[] $booksViaTable\\n+ * @property-read Item[] $booksWithNullFK\\n+ * @property-read Item[] $booksWithNullFKViaTable\\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\\n * @property-read Item[] $cheapItemsUsingViaWithCallable\\n+ * @property-read Item[] $items\\n * @property-read Item[] $itemsFor8\\n+ * @property-read Item[] $itemsIndexed\\n+ * @property-read Item[] $itemsInOrder1\\n+ * @property-read Item[] $itemsInOrder2\\n+ * @property-read Item[] $itemsWithNullFK\\n+ * @property-read Item[] $limitedItems\\n+ * @property-read Item[] $movieItems\\n+ * @property-read OrderItem[] $orderItems\\n+ * @property-read OrderItem[] $orderItems2\\n+ * @property-read OrderItem[] $orderItems3\\n+ * @property-read OrderItem[] $orderItemsWithNullFK\\n+ * @property-read OrderItem[] $quantityOrderItems\\n */\\n class Order extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\\nindex 65747e34444..46446b0c1fc 100644\\n--- a/tests/data/ar/OrderItem.php\\n+++ b/tests/data/ar/OrderItem.php\\n@@ -17,6 +17,12 @@\\n * @property int $item_id\\n * @property int $quantity\\n * @property string $subtotal\\n+ *\\n+ * @property Order $order\\n+ * @property Item $item\\n+ * @property self $orderItemCompositeWithJoin\\n+ * @property self $orderItemCompositeNoJoin\\n+ * @property Order $custom\\n */\\n class OrderItem extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\\nindex b1c478044a2..99af491825a 100644\\n--- a/tests/data/ar/OrderWithConstructor.php\\n+++ b/tests/data/ar/OrderWithConstructor.php\\n@@ -20,7 +20,7 @@\\n * @property int $created_at\\n * @property string $total\\n *\\n- * @property OrderItemWithConstructor $orderItems\\n+ * @property OrderItemWithConstructor[] $orderItems\\n * @property CustomerWithConstructor $customer\\n * @property CustomerWithConstructor $customerJoinedWithProfile\\n */\\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\\nindex d384f0a4f94..247913ed80c 100644\\n--- a/tests/data/ar/TestTrigger.php\\n+++ b/tests/data/ar/TestTrigger.php\\n@@ -13,6 +13,7 @@\\n *\\n * @property int $id\\n * @property string $stringcol\\n+ * @property mixed $RV\\n */\\n class TestTrigger extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\\nindex 2ad398d5994..abc952f3277 100644\\n--- a/tests/data/ar/Type.php\\n+++ b/tests/data/ar/Type.php\\n@@ -11,19 +11,20 @@\\n /**\\n * Model representing type table.\\n *\\n+ * @property string $bigint_col\\n * @property int $int_col\\n * @property int $int_col2 DEFAULT 1\\n * @property int $smallint_col DEFAULT 1\\n * @property string $char_col\\n * @property string $char_col2 DEFAULT 'something'\\n * @property string $char_col3\\n- * @property float $float_col\\n+ * @property float|numeric-string $float_col\\n * @property float $float_col2 DEFAULT '1.23'\\n * @property string $blob_col\\n * @property float $numeric_col DEFAULT '33.22'\\n * @property string $time DEFAULT '2002-01-01 00:00:00'\\n- * @property bool $bool_col\\n- * @property bool $bool_col2 DEFAULT 1\\n+ * @property 1|0|'1'|'0'|bool $bool_col\\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\\n */\\n class Type extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 12 file(s) in tests/data/ar/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/ar/ActiveRecordTestTrait.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\\nindex 98484ec7b4a..77d3fea1b57 100644\\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\\n@@ -11,7 +11,6 @@\\n use yiiunit\\\\extensions\\\\redis\\\\ActiveRecordTest;\\n use Exception;\\n use yii\\\\base\\\\Event;\\n-use yii\\\\db\\\\ActiveRecordInterface;\\n use yii\\\\db\\\\BaseActiveRecord;\\n use yii\\\\db\\\\Expression;\\n use yiiunit\\\\data\\\\ar\\\\Customer;\\n@@ -25,36 +24,43 @@\\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\\n * in the extensions.\\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\\n+ *\\n+ * @phpstan-require-extends TestCase\\n */\\n trait ActiveRecordTestTrait\\n {\\n- /** @var TestCase $this */\\n /**\\n * This method should return the classname of Customer class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getCustomerClass();\\n \\n /**\\n * This method should return the classname of Order class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getOrderClass();\\n \\n /**\\n * This method should return the classname of OrderItem class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getOrderItemClass();\\n \\n /**\\n * This method should return the classname of Item class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getItemClass();\\n \\n+ /**\\n+ * @return class-string<BaseActiveRecord>\\n+ */\\n abstract public function getOrderWithNullFKClass();\\n \\n+ /**\\n+ * @return class-string<BaseActiveRecord>\\n+ */\\n abstract public function getOrderItemWithNullFKmClass();\\n \\n /**\\n@@ -66,9 +72,7 @@ public function afterSave(): void\\n \\n public function testFind(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // find one\\n $result = $customerClass::find();\\n $this->assertInstanceOf('\\\\\\\\yii\\\\\\\\db\\\\\\\\ActiveQueryInterface', $result);\\n@@ -129,7 +133,6 @@ public function testFind(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\\n \\n public function testHasAttribute(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n $customer = new $customerClass();\\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\\n \\n public function testFindScalar(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // query scalar\\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\\n $this->assertEquals('user2', $customerName);\\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\\n \\n public function testFindColumn(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\\n }\\n \\n public function testFindIndexBy(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // indexBy\\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\\n $this->assertCount(3, $customers);\\n@@ -232,10 +228,8 @@ public function testFindIndexBy(): void\\n \\n public function testFindIndexByAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // indexBy + asArray\\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\\n $this->assertCount(3, $customers);\\n@@ -277,9 +271,7 @@ public function testFindIndexByAsArray(): void\\n \\n public function testRefresh(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $this->assertFalse($customer->refresh());\\n \\n@@ -291,12 +283,9 @@ public function testRefresh(): void\\n \\n public function testEquals(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customerA = new $customerClass();\\n $customerB = new $customerClass();\\n $this->assertFalse($customerA->equals($customerB));\\n@@ -319,10 +308,8 @@ public function testEquals(): void\\n \\n public function testFindCount(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(3, $customerClass::find()->count());\\n \\n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\\n@@ -339,10 +326,8 @@ public function testFindCount(): void\\n \\n public function testFindLimit(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // all()\\n $customers = $customerClass::find()->all();\\n $this->assertCount(3, $customers);\\n@@ -386,10 +371,8 @@ public function testFindLimit(): void\\n \\n public function testFindComplexCondition(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\\n \\n@@ -402,10 +385,8 @@ public function testFindComplexCondition(): void\\n \\n public function testFindNullValues(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $customer->name = null;\\n $customer->save(false);\\n@@ -418,10 +399,8 @@ public function testFindNullValues(): void\\n \\n public function testExists(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\\n@@ -434,10 +413,8 @@ public function testExists(): void\\n \\n public function testFindLazy(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $this->assertFalse($customer->isRelationPopulated('orders'));\\n $orders = $customer->orders;\\n@@ -462,12 +439,9 @@ public function testFindLazy(): void\\n \\n public function testFindEager(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\\n ksort($customers);\\n $this->assertCount(3, $customers);\\n@@ -499,10 +473,8 @@ public function testFindEager(): void\\n \\n public function testFindLazyVia(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Order $order */\\n $order = $orderClass::findOne(1);\\n $this->assertEquals(1, $order->id);\\n@@ -513,10 +485,8 @@ public function testFindLazyVia(): void\\n \\n public function testFindLazyVia2(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Order $order */\\n $order = $orderClass::findOne(1);\\n $order->id = 100;\\n@@ -525,10 +495,8 @@ public function testFindLazyVia2(): void\\n \\n public function testFindEagerViaRelation(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\\n $this->assertCount(3, $orders);\\n $order = $orders[0];\\n@@ -541,10 +509,8 @@ public function testFindEagerViaRelation(): void\\n \\n public function testFindNestedRelation(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\\n ksort($customers);\\n $this->assertCount(3, $customers);\\n@@ -578,10 +544,8 @@ public function testFindNestedRelation(): void\\n */\\n public function testFindEagerViaRelationPreserveOrder(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n /*\\n Item (name, category_id)\\n@@ -641,7 +605,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\\n // different order in via table\\n public function testFindEagerViaRelationPreserveOrderB(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\\n@@ -671,21 +634,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\\n \\n public function testLink(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->orders);\\n \\n // has many\\n $order = new $orderClass();\\n- $order->total = 100;\\n+ $order->total = '100';\\n $this->assertTrue($order->isNewRecord);\\n $customer->link('orders', $order);\\n $this->afterSave();\\n@@ -696,7 +654,7 @@ public function testLink(): void\\n \\n // belongs to\\n $order = new $orderClass();\\n- $order->total = 100;\\n+ $order->total = '100';\\n $this->assertTrue($order->isNewRecord);\\n $customer = $customerClass::findOne(1);\\n $this->assertNull($order->customer);\\n@@ -724,16 +682,11 @@ public function testLink(): void\\n \\n public function testUnlink(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // has many without delete\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->ordersWithNullFK);\\n@@ -775,20 +728,13 @@ public function testUnlink(): void\\n \\n public function testUnlinkAll(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // has many with delete\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->orders);\\n@@ -841,11 +787,7 @@ public function testUnlinkAll(): void\\n \\n public function testUnlinkAllAndConditionSetNull(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var BaseActiveRecord $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderWithNullFKClass();\\n \\n // in this test all orders are owned by customer 1\\n@@ -867,11 +809,7 @@ public function testUnlinkAllAndConditionSetNull(): void\\n \\n public function testUnlinkAllAndConditionDelete(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var BaseActiveRecord $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n // in this test all orders are owned by customer 1\\n@@ -896,9 +834,7 @@ public function testUnlinkAllAndConditionDelete(): void\\n \\n public function testInsert(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->email = 'user4@example.com';\\n $customer->name = 'user4';\\n@@ -920,9 +856,7 @@ public function testInsert(): void\\n \\n public function testExplicitPkOnAutoIncrement(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->id = 1337;\\n $customer->email = 'user1337@example.com';\\n@@ -939,9 +873,7 @@ public function testExplicitPkOnAutoIncrement(): void\\n \\n public function testUpdate(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // save\\n /** @var Customer $customer */\\n $customer = $customerClass::findOne(2);\\n@@ -982,9 +914,7 @@ public function testUpdate(): void\\n \\n public function testUpdateAttributes(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Customer $customer */\\n $customer = $customerClass::findOne(2);\\n $this->assertInstanceOf($customerClass, $customer);\\n@@ -1017,9 +947,7 @@ public function testUpdateAttributes(): void\\n \\n public function testUpdateCounters(): void\\n {\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // updateCounters\\n $pk = ['order_id' => 2, 'item_id' => 4];\\n $orderItem = $orderItemClass::findOne($pk);\\n@@ -1048,9 +976,7 @@ public function testUpdateCounters(): void\\n \\n public function testDelete(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // delete\\n $customer = $customerClass::findOne(2);\\n $this->assertInstanceOf($customerClass, $customer);\\n@@ -1080,23 +1006,21 @@ public function testDelete(): void\\n */\\n public function testBooleanAttribute(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n $customer->email = 'mail@example.com';\\n- $customer->status = true;\\n+ $customer->status = 1;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals(1, $customer->status);\\n+ $this->assertSame(1, $customer->status);\\n \\n- $customer->status = false;\\n+ $customer->status = 0;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals(0, $customer->status);\\n+ $this->assertSame(0, $customer->status);\\n \\n $customers = $customerClass::find()->where(['status' => true])->all();\\n $this->assertCount(2, $customers);\\n@@ -1107,11 +1031,8 @@ public function testBooleanAttribute(): void\\n \\n public function testAfterFind(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $afterFindCalls = [];\\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\\n@@ -1143,6 +1064,7 @@ public function testAfterFind(): void\\n ], $afterFindCalls);\\n $afterFindCalls = [];\\n \\n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\\n } else {\\n@@ -1164,9 +1086,7 @@ public function testAfterFind(): void\\n \\n public function testAfterRefresh(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $afterRefreshCalls = [];\\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\\n@@ -1185,9 +1105,7 @@ public function testAfterRefresh(): void\\n \\n public function testFindEmptyInCondition(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $customers = $customerClass::find()->where(['id' => [1]])->all();\\n $this->assertCount(1, $customers);\\n@@ -1204,9 +1122,6 @@ public function testFindEmptyInCondition(): void\\n \\n public function testFindEagerIndexBy(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n /** @var Order $order */\\n@@ -1229,7 +1144,6 @@ public function testFindEagerIndexBy(): void\\n \\n public function testAttributeAccess(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $model = new $customerClass();\\n \\n@@ -1247,8 +1161,6 @@ public function testAttributeAccess(): void\\n $baseModel = new $customerClass();\\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\\n \\n-\\n- /** @var ActiveRecord $customer */\\n $customer = new $customerClass();\\n $this->assertInstanceOf($customerClass, $customer);\\n \\n@@ -1272,8 +1184,8 @@ public function testAttributeAccess(): void\\n $this->assertFalse($customer->canSetProperty('orderItems'));\\n \\n try {\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\\n $customer->orderItems = [new $itemClass()];\\n $this->fail('setter call above MUST throw Exception');\\n } catch (Exception $e) {\\n@@ -1293,7 +1205,6 @@ public function testAttributeAccess(): void\\n */\\n public function testViaWithCallable(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n /** @var Order $order */\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/ar/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/db/GetTablesAliasTestTrait.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\\nindex f148be0be97..e5cb5d5f98a 100644\\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\\n public function testGetTableNamesIsFromObjectGenerateException(): void\\n {\\n $query = $this->createQuery();\\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\\n $query->from = new stdClass();\\n \\n $this->expectException('\\\\yii\\\\base\\\\InvalidConfigException');\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/db/\"\n },\n {\n \"subtask_id\": \"s9\",\n \"scope_files\": [\n \"tests/framework/db/mssql/ActiveRecordTest.php\",\n \"tests/framework/db/mssql/CommandTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\\nindex 9486910479a..a9fbbe32175 100644\\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\\n@@ -52,10 +52,10 @@ public function testCastValues(): void\\n $this->assertSame('1337', trim((string) $model->char_col));\\n $this->assertSame('test', $model->char_col2);\\n $this->assertSame('test123', $model->char_col3);\\n- //$this->assertSame(3.742, $model->float_col);\\n- //$this->assertSame(42.1337, $model->float_col2);\\n- //$this->assertSame(true, $model->bool_col);\\n- //$this->assertSame(false, $model->bool_col2);\\n+ $this->assertSame('3.742', $model->float_col);\\n+ $this->assertSame(42.1337, $model->float_col2);\\n+ $this->assertSame(1, $model->bool_col);\\n+ $this->assertSame(0, $model->bool_col2);\\n }\\n \\n /**\\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\\nindex adecd27db0b..dc9e5532e7e 100644\\n--- a/tests/framework/db/mssql/CommandTest.php\\n+++ b/tests/framework/db/mssql/CommandTest.php\\n@@ -115,12 +115,16 @@ public function testAddDropDefaultValue(): void\\n 'int1' => 'integer',\\n ])->execute();\\n \\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertEmpty($defaultValues);\\n+\\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\\n \\n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertEmpty($defaultValues);\\n }\\n \\n public static function batchInsertSqlProvider(): array\\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex 71f1b10c545..5ea92c3a6b9 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -9,8 +9,8 @@\\n namespace yiiunit\\\\framework\\\\db\\\\mssql;\\n \\n use yii\\\\base\\\\NotSupportedException;\\n-use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Constraint;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n use yii\\\\db\\\\mssql\\\\TableSchema;\\n@@ -52,10 +52,7 @@ public static function constraintsProvider(): array\\n \\n public function testGetStringFieldsSize(): void\\n {\\n- /** @var Connection $db */\\n $db = $this->getConnection();\\n-\\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $columns = $schema->getTableSchema('type', false)->columns;\\n@@ -82,6 +79,8 @@ public function testGetStringFieldsSize(): void\\n $expectedSize = null;\\n $expectedDbType = 'text';\\n break;\\n+ default:\\n+ $this->fail(\\\"Unexpected column name: {$name}\\\");\\n }\\n \\n $this->assertEquals($expectedType, $type);\\n@@ -328,6 +327,8 @@ public function testResolveTableNames(\\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n {\\n $schema = $this->getConnection(true, true)->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n+\\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n $this->assertNotEmpty($primaryKeys);\\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n@@ -359,6 +360,8 @@ public function testInsertWithCompositePrimaryKey(): void\\n public function testGetViewNamesWithDefaultSchema(): void\\n {\\n $schema = $this->getConnection(true, true)->getSchema();\\n+ $this->assertInstanceOf(Schema::class, $schema);\\n+\\n $viewNames = $schema->getViewNames();\\n $this->assertContains('animal_view', $viewNames);\\n }\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/mssql/\"\n },\n {\n \"subtask_id\": \"s10\",\n \"scope_files\": [\n \"tests/framework/db/mysql/ActiveRecordTest.php\",\n \"tests/framework/db/mysql/CommandTest.php\",\n \"tests/framework/db/mysql/QueryBuilderTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\\nindex febbfdbec5f..acc648ed446 100644\\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\\n@@ -46,8 +46,8 @@ public function testCastValues(): void\\n $this->assertSame('test123', $model->char_col3);\\n $this->assertSame(3.742, $model->float_col);\\n $this->assertSame(42.1337, $model->float_col2);\\n- //$this->assertSame(true, $model->bool_col);\\n- //$this->assertSame(false, $model->bool_col2);\\n+ $this->assertSame(1, $model->bool_col);\\n+ $this->assertSame(0, $model->bool_col2);\\n }\\n \\n public function testJsonColumn(): void\\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\\nindex b87ced8b56d..a61eea818ba 100644\\n--- a/tests/framework/db/mysql/CommandTest.php\\n+++ b/tests/framework/db/mysql/CommandTest.php\\n@@ -8,6 +8,7 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\mysql;\\n \\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yiiunit\\\\base\\\\db\\\\BaseCommand;\\n \\n /**\\n@@ -30,6 +31,7 @@ public function testAddDropCheckSeveral(): void\\n \\n $tableName = 'test_ck_several';\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\ndiff --git a/tests/framework/db/mysql/QueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php\\nindex 5987790e6c0..ae9a19245f9 100644\\n--- a/tests/framework/db/mysql/QueryBuilderTest.php\\n+++ b/tests/framework/db/mysql/QueryBuilderTest.php\\n@@ -18,6 +18,7 @@\\n use yii\\\\db\\\\JsonExpression;\\n use yii\\\\db\\\\Query;\\n use yii\\\\db\\\\Schema;\\n+use yii\\\\db\\\\mysql\\\\QueryBuilder;\\n use yiiunit\\\\base\\\\db\\\\BaseQueryBuilder;\\n \\n /**\\n@@ -33,6 +34,7 @@ final class QueryBuilderTest extends BaseQueryBuilder\\n \\n public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n@@ -65,6 +67,7 @@ public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\\n \\n public function testBuildOrderByAndLimitWithLimitOnly(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n@@ -96,6 +99,7 @@ public function testBuildOrderByAndLimitWithLimitOnly(): void\\n \\n public function testBuildOrderByAndLimitWithOffsetOnly(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n@@ -176,6 +180,7 @@ public function testBuildOrderByAndLimitWithOrderByWithoutPagination(): void\\n \\n public function testBuildOrderByAndLimitWithZeroLimit(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n@@ -207,6 +212,7 @@ public function testBuildOrderByAndLimitWithZeroLimit(): void\\n \\n public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n@@ -240,6 +246,7 @@ public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\\n \\n public function testBuildOrderByAndLimitWithExpressionLimitAndOffset(): void\\n {\\n+ /** @var QueryBuilder $qb */\\n $qb = $this->getConnection(false)->getQueryBuilder();\\n \\n $query = (new Query())\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/mysql/\"\n },\n {\n \"subtask_id\": \"s11\",\n \"scope_files\": [\n \"tests/framework/db/mysql/connection/DeadLockTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\\nindex 38fc5e553e0..daaa8f8e019 100644\\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\\n@@ -267,6 +267,8 @@ private function childrenUpdateLocked()\\n * In case of error in child process its execution bubbles up to phpunit to continue\\n * all the rest tests. So, all the rest tests in this case will run both in the child\\n * and parent processes. Such mess must be prevented with child's own error handler.\\n+ *\\n+ * @phpstan-impure\\n */\\n private function setErrorHandler(): void\\n {\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/db/mysql/connection/\"\n },\n {\n \"subtask_id\": \"s12\",\n \"scope_files\": [\n \"tests/framework/db/oci/ActiveRecordTest.php\",\n \"tests/framework/db/oci/CommandTest.php\",\n \"tests/framework/db/oci/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\\nindex 7b4f724cf4a..e2132cdc7e7 100644\\n--- a/tests/framework/db/oci/ActiveRecordTest.php\\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\\n@@ -8,7 +8,6 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\oci;\\n \\n-use yii\\\\db\\\\ActiveRecordInterface;\\n use yii\\\\db\\\\ActiveQuery;\\n use yiiunit\\\\data\\\\ar\\\\BitValues;\\n use yiiunit\\\\data\\\\ar\\\\DefaultPk;\\n@@ -52,8 +51,8 @@ public function testCastValues(): void\\n $this->assertSame('test123', $model->char_col3);\\n $this->assertSame(3.742, $model->float_col);\\n $this->assertSame(42.1337, $model->float_col2);\\n- $this->assertEquals('1', $model->bool_col);\\n- $this->assertEquals('0', $model->bool_col2);\\n+ $this->assertSame('1', $model->bool_col);\\n+ $this->assertSame('0', $model->bool_col2);\\n }\\n \\n public function testDefaultValues(): void\\n@@ -83,7 +82,6 @@ public function testDefaultValues(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -158,23 +156,21 @@ public function testBit(): void\\n */\\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n $customer->email = 'mail@example.com';\\n- $customer->status = '1';\\n+ $customer->status = 1;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals('1', $customer->status);\\n+ $this->assertSame(1, $customer->status);\\n \\n- $customer->status = '0';\\n+ $customer->status = 0;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals('0', $customer->status);\\n+ $this->assertSame(0, $customer->status);\\n \\n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\\n $this->assertCount(2, $customers);\\n@@ -183,25 +179,11 @@ public function testBooleanAttribute(): void\\n $this->assertCount(1, $customers);\\n }\\n \\n- /**\\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\\n- *\\n- * @dataProvider aliasMethodProvider\\n- *\\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\\n- */\\n- public function testJoinWithAlias(string $aliasMethod): void\\n+ public function testJoinWithAlias(): void\\n {\\n // left join and eager loading\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\\n $this->assertCount(3, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -212,13 +194,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // inner join filtering and eager loading\\n $query = Order::find()->innerJoinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -227,13 +203,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // inner join filtering without eager loading\\n $query = Order::find()->innerJoinWith(['customer c'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -242,13 +212,7 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // join with via-relation\\n $query = Order::find()->innerJoinWith(['books b']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(1, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -259,32 +223,14 @@ public function testJoinWithAlias(string $aliasMethod): void\\n \\n // joining sub relations\\n $query = Order::find()->innerJoinWith([\\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->orderBy('{{i}}.id');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->orderBy('{{@item}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->orderBy($q->applyAlias('item', 'id'));\\n- }\\n+ 'items i' => function (ActiveQuery $q) {\\n+ $q->orderBy('{{i}}.id');\\n },\\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ 'items.category c' => function (ActiveQuery $q) {\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ]);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('{{i}}.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@item}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('{{i}}.id')->all();\\n $this->assertCount(1, $orders);\\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\\n $this->assertEquals(2, $orders[0]->id);\\n@@ -292,36 +238,31 @@ public function testJoinWithAlias(string $aliasMethod): void\\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\\n \\n- // join with ON condition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod);\\n- $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicit';\\n+ $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n \\n // join with ON condition and alias in relation definition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicitA';\\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n }\\n }\\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\\nindex 8ca4181904d..552ce9378e2 100644\\n--- a/tests/framework/db/oci/CommandTest.php\\n+++ b/tests/framework/db/oci/CommandTest.php\\n@@ -508,7 +508,7 @@ public function testQueryCache(): void\\n \\n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\\n \\n- $db->cache(function (Connection $db) use ($update): void {\\n+ $db->cache(function (Connection $db): void {\\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\\n \\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\\nindex b90051c6c8c..1668aa5a63a 100644\\n--- a/tests/framework/db/oci/SchemaTest.php\\n+++ b/tests/framework/db/oci/SchemaTest.php\\n@@ -11,8 +11,9 @@\\n namespace yiiunit\\\\framework\\\\db\\\\oci;\\n \\n use Exception;\\n+use PHPUnit\\\\Framework\\\\Attributes\\\\Group;\\n use yii\\\\db\\\\CheckConstraint;\\n-use yii\\\\db\\\\oci\\\\Schema;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n use yiiunit\\\\base\\\\db\\\\BaseSchema;\\n \\n@@ -235,7 +236,6 @@ public function testFindUniqueIndexes(): void\\n 'someCol3' => 'string',\\n ])->execute();\\n \\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\\n@@ -279,8 +279,10 @@ public function testFindUniqueIndexes(): void\\n public function testLobIndexesExcluded(): void\\n {\\n $db = $this->getConnection();\\n+ $dbSchema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\\n \\n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\\n $db->createCommand()->dropTable('lob_test')->execute();\\n }\\n \\n@@ -288,7 +290,7 @@ public function testLobIndexesExcluded(): void\\n 'CREATE TABLE \\\"lob_test\\\" (\\\"id\\\" NUMBER(10) NOT NULL, \\\"content\\\" CLOB, \\\"data\\\" BLOB, PRIMARY KEY (\\\"id\\\"))'\\n )->execute();\\n \\n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\\n \\n $this->assertCount(1, $indexes);\\n \\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/oci/\"\n },\n {\n \"subtask_id\": \"s13\",\n \"scope_files\": [\n \"tests/framework/db/pgsql/ActiveFixtureTest.php\",\n \"tests/framework/db/pgsql/ActiveRecordTest.php\",\n \"tests/framework/db/pgsql/BaseActiveRecordTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\\nindex 281874d55e3..5c8f4a99398 100644\\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\\n@@ -8,7 +8,9 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\pgsql;\\n \\n+use yiiunit\\\\data\\\\ar\\\\Customer;\\n use yiiunit\\\\framework\\\\test\\\\CustomerDbTestCase;\\n+use yiiunit\\\\framework\\\\test\\\\CustomerFixture;\\n \\n /**\\n * @group db\\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\\n $test = new CustomerDbTestCase();\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\\n \\n $sequenceName = $fixture->getTableSchema()->sequenceName;\\n $sequenceNextVal = $this->getConnection()->createCommand(\\\"SELECT currval('$sequenceName')\\\")->queryScalar();\\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\\n+\\n+ $customer2 = $fixture->getModel('customer2');\\n+ $this->assertInstanceOf(Customer::class, $customer2);\\n+\\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\\n \\n $test->tearDown();\\n }\\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\\nindex 1a0366ff6a6..549eaab62d1 100644\\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\\n@@ -33,9 +33,6 @@ class ActiveRecordTest extends BaseActiveRecord\\n \\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n@@ -61,7 +58,6 @@ public function testBooleanAttribute(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -319,6 +315,12 @@ public static function arrayValuesProvider(): array\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property bool|null $bool_col\\n+ * @property bool|null $default_true\\n+ * @property bool|null $default_false\\n+ */\\n class BoolAR extends ActiveRecord\\n {\\n public static function tableName()\\n@@ -327,6 +329,18 @@ public static function tableName()\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property string $username\\n+ * @property string $auth_key\\n+ * @property string $password_hash\\n+ * @property string|null $password_reset_token\\n+ * @property string $email\\n+ * @property int $role\\n+ * @property int $status\\n+ * @property int $created_at\\n+ * @property int $updated_at\\n+ */\\n class UserAR extends ActiveRecord\\n {\\n final public const STATUS_DELETED = 0;\\n@@ -348,12 +362,12 @@ public function behaviors()\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array intarray_col\\n- * @property array textarray2_col\\n- * @property array json_col\\n- * @property array jsonb_col\\n- * @property array jsonarray_col\\n+ * @property int $id\\n+ * @property array $intarray_col\\n+ * @property array $textarray2_col\\n+ * @property array $json_col\\n+ * @property array $jsonb_col\\n+ * @property array $jsonarray_col\\n */\\n class ArrayAndJsonTypes extends ActiveRecord\\n {\\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\nindex fd6762f5eb9..d4290c40474 100644\\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n@@ -39,8 +39,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array json_col\\n+ * @property int $id\\n+ * @property array $json_col\\n */\\n class ArrayAndJsonType extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/pgsql/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Verify where isMariaDb() is called and what static type is used nearby.\nrg -n -C3 '\\bisMariaDb\\s*\\(' tests/framework/db/mysql/QueryBuilderTest.php\nrg -n -C3 'class QueryBuilder|function isMariaDb\\s*\\(' framework/db/mysql/QueryBuilder.php framework/db/QueryBuilder.php\nrg -n -C3 '@var .*QueryBuilder|assertInstanceOf\\(.*QueryBuilder' tests/framework/db/mysql/QueryBuilderTest.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 2886\n\n---\n\n๐ Script executed:\n\n```shell\n# Check how $qb is initialized/typed in the test file\nhead -100 tests/framework/db/mysql/QueryBuilderTest.php | cat -n\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 3470\n\n---\n\n๐ Script executed:\n\n```shell\n# Check BaseQueryBuilder to understand getConnection() return type\nfind . -name BaseQueryBuilder.php | head -5\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 93\n\n---\n\n๐ Script executed:\n\n```shell\n# Read BaseQueryBuilder to check getConnection() return type\ncat -n ./tests/base/db/BaseQueryBuilder.php | head -150\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 6062\n\n---\n\n๐ Script executed:\n\n```shell\n# Check Connection::getQueryBuilder() return type - this is what's actually called in the test\nrg -n -A 5 'public function getQueryBuilder' framework/db/Connection.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 193\n\n---\n\n๐ Script executed:\n\n```shell\n# Check Schema::getQueryBuilder() return type - this is what Connection delegates to\nrg -n -A 5 'public function getQueryBuilder' framework/db/Schema.php framework/db/mysql/Schema.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 378\n\n---\n\n๐ Script executed:\n\n```shell\n# Get full method signature and return type for Schema::getQueryBuilder()\nsed -n '240,260p' framework/db/Schema.php | cat -n\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 769\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if mysql/Schema overrides getQueryBuilder() with a more specific return type\nrg -n -A 5 'public function getQueryBuilder' framework/db/mysql/Schema.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 38\n\n---\n\n๐ Script executed:\n\n```shell\n# Check mysql/Schema::createQueryBuilder() to see what concrete type is actually returned\nrg -n -A 5 'public function createQueryBuilder' framework/db/mysql/Schema.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 210\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if mysql/Schema::createQueryBuilder() has a return type hint\nsed -n '255,265p' framework/db/mysql/Schema.php | cat -n\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 442\n\n---\n\n๐ Script executed:\n\n```shell\n# Check what QueryBuilder class is imported/used in mysql/Schema.php\nhead -40 framework/db/mysql/Schema.php | cat -n\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 1250\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if mysql/Schema has explicit return type declarations (PHP 7.4+ style)\nrg -n 'public function.*:\\s' framework/db/mysql/Schema.php | head -20\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 38\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if there are explicit PHP return type hints anywhere\nrg -n ':\\s*(QueryBuilder|mysql\\\\QueryBuilder)' framework/db/mysql/Schema.php framework/db/Schema.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 38\n\n---\n\n๐ Script executed:\n\n```shell\n# Let's check the complete inheritance: what does mysql\\Schema inherit and what methods does it have?\nsed -n '1,100p' framework/db/mysql/Schema.php | grep -E '(class Schema|function (getQueryBuilder|createQueryBuilder)|public function)'\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 125\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if mysql/Schema defines getQueryBuilder method\ngrep -n 'getQueryBuilder' framework/db/mysql/Schema.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 38\n\n---\n\n๐ Script executed:\n\n```shell\n# Check if PHPStan is relying on doc comments or explicit return type hints\n# Look for any return type declarations in PHP 7.4+ format\nrg -n 'public function createQueryBuilder.*:' framework/db/\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 38\n\n---\n\n๐ Script executed:\n\n```shell\n# Check complete imports and namespace context in mysql/Schema.php\nhead -150 framework/db/mysql/Schema.php | grep -E '(^use |^namespace |QueryBuilder)'\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 418\n\n---\n\n\n\n</details>\n\n**Avoid masking MySQL-specific API calls behind a baseline suppression.**\n\nAt Line 502, this suppresses undefined `isMariaDb()` calls on `yii\\db\\QueryBuilder`; the test's `$qb` variable is typed as the base `QueryBuilder` class because `Schema::getQueryBuilder()` declares `@return QueryBuilder` and `mysql\\Schema` does not override this method with a proper return type. Prefer either:\n- Overriding `getQueryBuilder()` in `mysql\\Schema` to declare return type as `mysql\\QueryBuilder`\n- Adding explicit return type hint to `mysql\\Schema::createQueryBuilder()`\n- Locally casting/asserting `$qb` to `mysql\\QueryBuilder` in the test\n\nThis removes the need for the baseline entry and properly types the variable for MySQL-specific calls.\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@phpstan-baseline.neon` around lines 501 - 506, The baseline suppresses calls\nto mysql-specific method isMariaDb() on yii\\db\\QueryBuilder; fix by making the\nconcrete types explicit: either override Schema::getQueryBuilder() in\nmysql\\Schema to return mysql\\QueryBuilder, or add a concrete return type to\nmysql\\Schema::createQueryBuilder(), or change the test\n(tests/framework/db/mysql/QueryBuilderTest.php) to cast/assert $qb as\nmysql\\QueryBuilder before calling isMariaDb(); update the signature(s) so $qb is\ntyped as mysql\\QueryBuilder and then remove the phpstan baseline entry.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->\n\nโ
Confirmed as addressed by @terabytesoftw\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex 3f78050b8ad..a7a2f9b5440 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -450,774 +450,12 @@ parameters:\n \t\t\tcount: 1\n \t\t\tpath: framework/test/DbFixture.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$category in PHPDoc tag @var does not match assigned variable \\$categories\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$address\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer_id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$email\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$isNewRecord\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsFor8\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$name\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$quantity\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$relatedRecords\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$status\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$subtotal\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$total\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomerId\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrdersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$bookItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 12\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicit\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicitA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntax\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntaxA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFKViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfile\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfileIndexOrdered\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 31\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$itemsIndexed\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$movieItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$quantityOrderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$custom\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$item\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$order\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeNoJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeWithJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$id on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$orderItems on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\<yiiunit\\\\data\\\\ar\\\\Order\\>\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQueryInterface\\:\\:active\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canGetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canSetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:getOrders\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:hasProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:isRelationPopulated\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:refresh\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:unlinkAll\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateCounters\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined static method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateAllCounters\\(\\)\\.$#'\n-\t\t\tidentifier: staticMethod.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method afterSave\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 23\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertArrayHasKey\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 30\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertCount\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 92\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEmpty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEquals\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 97\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertFalse\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 22\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertInstanceOf\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 19\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNotNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 16\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertTrue\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 39\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canGetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canSetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getCustomerClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderWithNullFKClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$books on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$id on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 10\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$items on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$name on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$orders on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$ordersWithItems on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$primaryKey on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$relatedRecords on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot call method isRelationPopulated\\(\\) on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: method.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Class yiiunit\\\\extensions\\\\redis\\\\ActiveRecordTest not found\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 1 parameter, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 2 parameters, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on yiiunit\\\\data\\\\ar\\\\OrderItemWithConstructor\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$customer contains unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$this has invalid type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: varTag.trait\n-\t\t\tcount: 27\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var with type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\|yiiunit\\\\TestCase is not subtype of native type \\$this\\(yiiunit\\\\base\\\\db\\\\BaseActiveRecord\\)\\.$#'\n-\t\t\tidentifier: varTag.nativeType\n-\t\t\tcount: 33\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$stringcol \\(string\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$total \\(string\\) does not accept int\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$count might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer in PHPDoc tag @var does not match assigned variable \\$class\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$orders might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableChecks\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableForeignKeys\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTablePrimaryKey\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableUniques\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$foreignKeys on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\Command\\:\\:queryOne\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on array\\{\\}\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$expression might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseQuery.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$condition with type array\\|string is not subtype of native type array\\.$#'\n \t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n \t\t\tpath: tests/base/db/BaseQueryBuilder.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$dimension\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseSchema.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type array\\|bool\\|yii\\\\db\\\\Constraint\\|null\\.$#'\n \t\t\tidentifier: parameter.phpDocType\n"},{"subtask_id":"s6","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Incorrect type annotation for `$custom` property.**\n\nThe `getCustom()` method returns `Order::find()`, which is an `ActiveQuery` object (or `ActiveQueryInterface`), not an `Order` instance. The PHPDoc should reflect the query object type, not the model type.\n\n\n\n\n<details>\n<summary>๐ Proposed fix</summary>\n\n```diff\n-* `@property` Order $custom\n+* `@property` \\yii\\db\\ActiveQueryInterface $custom\n```\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/data/ar/OrderItem.php` at line 25, The PHPDoc for the $custom property\nis incorrect: it declares Order but getCustom() returns an ActiveQuery\n(Order::find()); update the docblock in OrderItem.php to type the $custom\nproperty as the query type used (e.g., ActiveQuery|ActiveQueryInterface or\n\\yii\\db\\ActiveQuery) instead of Order so it matches the return value of\ngetCustom().\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\nindex 65747e34444..46446b0c1fc 100644\n--- a/tests/data/ar/OrderItem.php\n+++ b/tests/data/ar/OrderItem.php\n@@ -17,6 +17,12 @@\n * @property int $item_id\n * @property int $quantity\n * @property string $subtotal\n+ *\n+ * @property Order $order\n+ * @property Item $item\n+ * @property self $orderItemCompositeWithJoin\n+ * @property self $orderItemCompositeNoJoin\n+ * @property Order $custom\n */\n class OrderItem extends ActiveRecord\n {\n"},{"subtask_id":"s13","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Add missing `is_deleted` property to PHPDoc.**\n\nThe `is_deleted` column is added to the `bool_user` table at line 148 and is used in test assertions at lines 157-159, but it's not documented in the PHPDoc block.\n\n\n\n\n<details>\n<summary>๐ Add the missing property annotation</summary>\n\n```diff\n /**\n * `@property` int $id\n * `@property` string $username\n * `@property` string $auth_key\n * `@property` string $password_hash\n * `@property` string|null $password_reset_token\n * `@property` string $email\n * `@property` int $role\n * `@property` int $status\n * `@property` int $created_at\n * `@property` int $updated_at\n+ * `@property` bool $is_deleted\n */\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n/**\n * `@property` int $id\n * `@property` string $username\n * `@property` string $auth_key\n * `@property` string $password_hash\n * `@property` string|null $password_reset_token\n * `@property` string $email\n * `@property` int $role\n * `@property` int $status\n * `@property` int $created_at\n * `@property` int $updated_at\n * `@property` bool $is_deleted\n */\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 332 - 343, Add\nthe missing property annotation for the is_deleted column to the class PHPDoc\nblock: add a line like \"@property int $is_deleted\" (matching the style used for\nother DB-backed fields) in the PHPDoc above the test class so the property is\ndocumented for the bool_user column and the assertions referencing is_deleted\ncan be understood by static tools.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:puma -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 1a0366ff6a6..549eaab62d1 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -33,9 +33,6 @@ class ActiveRecordTest extends BaseActiveRecord\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -61,7 +58,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -319,6 +315,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -327,6 +329,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n final public const STATUS_DELETED = 0;\n@@ -348,12 +362,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n<details>\\n<summary>๐งฉ Analysis chain</summary>\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Verify where isMariaDb() is called and what static type is used nearby.\\nrg -n -C3 '\\\\bisMariaDb\\\\s*\\\\(' tests/framework/db/mysql/QueryBuilderTest.php\\nrg -n -C3 'class QueryBuilder|function isMariaDb\\\\s*\\\\(' framework/db/mysql/QueryBuilder.php framework/db/QueryBuilder.php\\nrg -n -C3 '@var .*QueryBuilder|assertInstanceOf\\\\(.*QueryBuilder' tests/framework/db/mysql/QueryBuilderTest.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 2886\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check how $qb is initialized/typed in the test file\\nhead -100 tests/framework/db/mysql/QueryBuilderTest.php | cat -n\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 3470\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check BaseQueryBuilder to understand getConnection() return type\\nfind . -name BaseQueryBuilder.php | head -5\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 93\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Read BaseQueryBuilder to check getConnection() return type\\ncat -n ./tests/base/db/BaseQueryBuilder.php | head -150\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 6062\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check Connection::getQueryBuilder() return type - this is what's actually called in the test\\nrg -n -A 5 'public function getQueryBuilder' framework/db/Connection.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 193\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check Schema::getQueryBuilder() return type - this is what Connection delegates to\\nrg -n -A 5 'public function getQueryBuilder' framework/db/Schema.php framework/db/mysql/Schema.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 378\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Get full method signature and return type for Schema::getQueryBuilder()\\nsed -n '240,260p' framework/db/Schema.php | cat -n\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 769\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if mysql/Schema overrides getQueryBuilder() with a more specific return type\\nrg -n -A 5 'public function getQueryBuilder' framework/db/mysql/Schema.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 38\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check mysql/Schema::createQueryBuilder() to see what concrete type is actually returned\\nrg -n -A 5 'public function createQueryBuilder' framework/db/mysql/Schema.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 210\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if mysql/Schema::createQueryBuilder() has a return type hint\\nsed -n '255,265p' framework/db/mysql/Schema.php | cat -n\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 442\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check what QueryBuilder class is imported/used in mysql/Schema.php\\nhead -40 framework/db/mysql/Schema.php | cat -n\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 1250\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if mysql/Schema has explicit return type declarations (PHP 7.4+ style)\\nrg -n 'public function.*:\\\\s' framework/db/mysql/Schema.php | head -20\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 38\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if there are explicit PHP return type hints anywhere\\nrg -n ':\\\\s*(QueryBuilder|mysql\\\\\\\\QueryBuilder)' framework/db/mysql/Schema.php framework/db/Schema.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 38\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Let's check the complete inheritance: what does mysql\\\\Schema inherit and what methods does it have?\\nsed -n '1,100p' framework/db/mysql/Schema.php | grep -E '(class Schema|function (getQueryBuilder|createQueryBuilder)|public function)'\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 125\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if mysql/Schema defines getQueryBuilder method\\ngrep -n 'getQueryBuilder' framework/db/mysql/Schema.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 38\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check if PHPStan is relying on doc comments or explicit return type hints\\n# Look for any return type declarations in PHP 7.4+ format\\nrg -n 'public function createQueryBuilder.*:' framework/db/\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 38\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n# Check complete imports and namespace context in mysql/Schema.php\\nhead -150 framework/db/mysql/Schema.php | grep -E '(^use |^namespace |QueryBuilder)'\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 418\\n\\n---\\n\\n\\n\\n</details>\\n\\n**Avoid masking MySQL-specific API calls behind a baseline suppression.**\\n\\nAt Line 502, this suppresses undefined `isMariaDb()` calls on `yii\\\\db\\\\QueryBuilder`; the test's `$qb` variable is typed as the base `QueryBuilder` class because `Schema::getQueryBuilder()` declares `@return QueryBuilder` and `mysql\\\\Schema` does not override this method with a proper return type. Prefer either:\\n- Overriding `getQueryBuilder()` in `mysql\\\\Schema` to declare return type as `mysql\\\\QueryBuilder`\\n- Adding explicit return type hint to `mysql\\\\Schema::createQueryBuilder()`\\n- Locally casting/asserting `$qb` to `mysql\\\\QueryBuilder` in the test\\n\\nThis removes the need for the baseline entry and properly types the variable for MySQL-specific calls.\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@phpstan-baseline.neon` around lines 501 - 506, The baseline suppresses calls\\nto mysql-specific method isMariaDb() on yii\\\\db\\\\QueryBuilder; fix by making the\\nconcrete types explicit: either override Schema::getQueryBuilder() in\\nmysql\\\\Schema to return mysql\\\\QueryBuilder, or add a concrete return type to\\nmysql\\\\Schema::createQueryBuilder(), or change the test\\n(tests/framework/db/mysql/QueryBuilderTest.php) to cast/assert $qb as\\nmysql\\\\QueryBuilder before calling isMariaDb(); update the signature(s) so $qb is\\ntyped as mysql\\\\QueryBuilder and then remove the phpstan baseline entry.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\\n\\nโ
Confirmed as addressed by @terabytesoftw\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\\nindex 3f78050b8ad..a7a2f9b5440 100644\\n--- a/phpstan-baseline.neon\\n+++ b/phpstan-baseline.neon\\n@@ -450,774 +450,12 @@ parameters:\\n \\t\\t\\tcount: 1\\n \\t\\t\\tpath: framework/test/DbFixture.php\\n \\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveQuery.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$category in PHPDoc tag @var does not match assigned variable \\\\$categories\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.differentVariable\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveQuery.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$address\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$customer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$customer_id\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$email\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$id\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$isNewRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$itemsFor8\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$itemsWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$name\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 13\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orderItemsWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$ordersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$quantity\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$relatedRecords\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$status\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$subtotal\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$total\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$virtualCustomer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:\\\\$virtualCustomerId\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$expensiveOrders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$expensiveOrdersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\:\\\\:\\\\$ordersWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$limitedItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Category\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orders\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$orders2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\CustomerWithAlias\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\CustomerWithAlias\\\\:\\\\:\\\\$orders2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$bookItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$books\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 12\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$books2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksExplicit\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksExplicitA\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksQuerysyntax\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksQuerysyntaxA\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksViaTable\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksWithNullFK\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$booksWithNullFKViaTable\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customer\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customer2\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customerJoinedWithProfile\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$customerJoinedWithProfileIndexOrdered\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$items\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 31\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$itemsIndexed\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$limitedItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$movieItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$orderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 9\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$quantityOrderItems\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$custom\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$item\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$order\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 6\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$orderItemCompositeNoJoin\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItem\\\\:\\\\:\\\\$orderItemCompositeWithJoin\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to property \\\\$id on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to property \\\\$orderItems on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQuery\\\\:\\\\:applyAlias\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 7\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQuery\\\\<yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\>\\\\:\\\\:applyAlias\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 7\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:active\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:canGetProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:canSetProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:getOrders\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:hasProperty\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:isRelationPopulated\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:refresh\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 5\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:unlinkAll\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:updateCounters\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined static method yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\:\\\\:updateAllCounters\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: staticMethod.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method afterSave\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 23\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertArrayHasKey\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 30\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertCount\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 92\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertEmpty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertEquals\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 97\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertFalse\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 22\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertInstanceOf\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 19\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertNotNull\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 8\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertNull\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 16\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method assertTrue\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 39\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method canGetProperty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method canSetProperty\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getCustomerClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getOrderClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to method getOrderWithNullFKClass\\\\(\\\\) on an unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$books on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$id on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 10\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$items on array\\\\<mixed\\\\>\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$name on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$orders on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$ordersWithItems on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$primaryKey on null\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$relatedRecords on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot call method isRelationPopulated\\\\(\\\\) on array\\\\|yii\\\\\\\\db\\\\\\\\ActiveRecordInterface\\\\.$#'\\n-\\t\\t\\tidentifier: method.nonObject\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Class yiiunit\\\\\\\\extensions\\\\\\\\redis\\\\\\\\ActiveRecordTest not found\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:with\\\\(\\\\) invoked with 1 parameter, 0 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 13\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\ActiveQueryInterface\\\\:\\\\:with\\\\(\\\\) invoked with 2 parameters, 0 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Offset 0 does not exist on yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\OrderItemWithConstructor\\\\.$#'\\n-\\t\\t\\tidentifier: offsetAccess.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var for variable \\\\$customer contains unknown class yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecord\\\\.$#'\\n-\\t\\t\\tidentifier: class.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var for variable \\\\$this has invalid type yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.trait\\n-\\t\\t\\tcount: 27\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^PHPDoc tag @var with type yiiunit\\\\\\\\framework\\\\\\\\ar\\\\\\\\ActiveRecordTestTrait\\\\|yiiunit\\\\\\\\TestCase is not subtype of native type \\\\$this\\\\(yiiunit\\\\\\\\base\\\\\\\\db\\\\\\\\BaseActiveRecord\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.nativeType\\n-\\t\\t\\tcount: 33\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$stringcol \\\\(string\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var1 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var1 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var2 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var2 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var3 \\\\(int\\\\) does not accept null\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\NullValues\\\\:\\\\:\\\\$var3 \\\\(int\\\\) does not accept string\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$total \\\\(string\\\\) does not accept int\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$count might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$customer in PHPDoc tag @var does not match assigned variable \\\\$class\\\\.$#'\\n-\\t\\t\\tidentifier: varTag.differentVariable\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$customer might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$orders might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseActiveRecord.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Anonymous function has an unused use \\\\$update\\\\.$#'\\n-\\t\\t\\tidentifier: closure.unusedUse\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableChecks\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableForeignKeys\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 4\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTablePrimaryKey\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Call to an undefined method yii\\\\\\\\db\\\\\\\\Schema\\\\:\\\\:getTableUniques\\\\(\\\\)\\\\.$#'\\n-\\t\\t\\tidentifier: method.notFound\\n-\\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Cannot access property \\\\$foreignKeys on null\\\\.$#'\\n-\\t\\t\\tidentifier: property.nonObject\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Method yii\\\\\\\\db\\\\\\\\Command\\\\:\\\\:queryOne\\\\(\\\\) invoked with 2 parameters, 0\\\\-1 required\\\\.$#'\\n-\\t\\t\\tidentifier: arguments.count\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Offset 0 does not exist on array\\\\{\\\\}\\\\.$#'\\n-\\t\\t\\tidentifier: offsetAccess.notFound\\n-\\t\\t\\tcount: 8\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Variable \\\\$expression might not be defined\\\\.$#'\\n-\\t\\t\\tidentifier: variable.undefined\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseCommand.php\\n-\\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Anonymous function has an unused use \\\\$update\\\\.$#'\\n-\\t\\t\\tidentifier: closure.unusedUse\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseQuery.php\\n-\\n \\t\\t-\\n \\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$condition with type array\\\\|string is not subtype of native type array\\\\.$#'\\n \\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n \\t\\t\\tpath: tests/base/db/BaseQueryBuilder.php\\n \\n-\\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\db\\\\\\\\ColumnSchema\\\\:\\\\:\\\\$dimension\\\\.$#'\\n-\\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/db/BaseSchema.php\\n-\\n \\t\\t-\\n \\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expected with type mixed is not subtype of native type array\\\\|bool\\\\|yii\\\\\\\\db\\\\\\\\Constraint\\\\|null\\\\.$#'\\n \\t\\t\\tidentifier: parameter.phpDocType\\n\"\n },\n {\n \"subtask_id\": \"s6\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Incorrect type annotation for `$custom` property.**\\n\\nThe `getCustom()` method returns `Order::find()`, which is an `ActiveQuery` object (or `ActiveQueryInterface`), not an `Order` instance. The PHPDoc should reflect the query object type, not the model type.\\n\\n\\n\\n\\n<details>\\n<summary>๐ Proposed fix</summary>\\n\\n```diff\\n-* `@property` Order $custom\\n+* `@property` \\\\yii\\\\db\\\\ActiveQueryInterface $custom\\n```\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/data/ar/OrderItem.php` at line 25, The PHPDoc for the $custom property\\nis incorrect: it declares Order but getCustom() returns an ActiveQuery\\n(Order::find()); update the docblock in OrderItem.php to type the $custom\\nproperty as the query type used (e.g., ActiveQuery|ActiveQueryInterface or\\n\\\\yii\\\\db\\\\ActiveQuery) instead of Order so it matches the return value of\\ngetCustom().\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\\nindex 65747e34444..46446b0c1fc 100644\\n--- a/tests/data/ar/OrderItem.php\\n+++ b/tests/data/ar/OrderItem.php\\n@@ -17,6 +17,12 @@\\n * @property int $item_id\\n * @property int $quantity\\n * @property string $subtotal\\n+ *\\n+ * @property Order $order\\n+ * @property Item $item\\n+ * @property self $orderItemCompositeWithJoin\\n+ * @property self $orderItemCompositeNoJoin\\n+ * @property Order $custom\\n */\\n class OrderItem extends ActiveRecord\\n {\\n\"\n },\n {\n \"subtask_id\": \"s13\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Add missing `is_deleted` property to PHPDoc.**\\n\\nThe `is_deleted` column is added to the `bool_user` table at line 148 and is used in test assertions at lines 157-159, but it's not documented in the PHPDoc block.\\n\\n\\n\\n\\n<details>\\n<summary>๐ Add the missing property annotation</summary>\\n\\n```diff\\n /**\\n * `@property` int $id\\n * `@property` string $username\\n * `@property` string $auth_key\\n * `@property` string $password_hash\\n * `@property` string|null $password_reset_token\\n * `@property` string $email\\n * `@property` int $role\\n * `@property` int $status\\n * `@property` int $created_at\\n * `@property` int $updated_at\\n+ * `@property` bool $is_deleted\\n */\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n/**\\n * `@property` int $id\\n * `@property` string $username\\n * `@property` string $auth_key\\n * `@property` string $password_hash\\n * `@property` string|null $password_reset_token\\n * `@property` string $email\\n * `@property` int $role\\n * `@property` int $status\\n * `@property` int $created_at\\n * `@property` int $updated_at\\n * `@property` bool $is_deleted\\n */\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 332 - 343, Add\\nthe missing property annotation for the is_deleted column to the class PHPDoc\\nblock: add a line like \\\"@property int $is_deleted\\\" (matching the style used for\\nother DB-backed fields) in the PHPDoc above the test class so the property is\\ndocumented for the bool_user column and the assertions referencing is_deleted\\ncan be understood by static tools.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:puma -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\\nindex 1a0366ff6a6..549eaab62d1 100644\\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\\n@@ -33,9 +33,6 @@ class ActiveRecordTest extends BaseActiveRecord\\n \\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n@@ -61,7 +58,6 @@ public function testBooleanAttribute(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -319,6 +315,12 @@ public static function arrayValuesProvider(): array\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property bool|null $bool_col\\n+ * @property bool|null $default_true\\n+ * @property bool|null $default_false\\n+ */\\n class BoolAR extends ActiveRecord\\n {\\n public static function tableName()\\n@@ -327,6 +329,18 @@ public static function tableName()\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property string $username\\n+ * @property string $auth_key\\n+ * @property string $password_hash\\n+ * @property string|null $password_reset_token\\n+ * @property string $email\\n+ * @property int $role\\n+ * @property int $status\\n+ * @property int $created_at\\n+ * @property int $updated_at\\n+ */\\n class UserAR extends ActiveRecord\\n {\\n final public const STATUS_DELETED = 0;\\n@@ -348,12 +362,12 @@ public function behaviors()\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array intarray_col\\n- * @property array textarray2_col\\n- * @property array json_col\\n- * @property array jsonb_col\\n- * @property array jsonarray_col\\n+ * @property int $id\\n+ * @property array $intarray_col\\n+ * @property array $textarray2_col\\n+ * @property array $json_col\\n+ * @property array $jsonb_col\\n+ * @property array $jsonarray_col\\n */\\n class ArrayAndJsonTypes extends ActiveRecord\\n {\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/composer.lock b/composer.lock\nindex f9f75af4753..595956640b4 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -389,16 +389,16 @@\n },\n {\n \"name\": \"composer/composer\",\n- \"version\": \"2.9.7\",\n+ \"version\": \"2.9.8\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/composer/composer.git\",\n- \"reference\": \"82a2fbd1372a98d7915cfb092acf05207d9b4113\"\n+ \"reference\": \"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/composer/composer/zipball/82a2fbd1372a98d7915cfb092acf05207d9b4113\",\n- \"reference\": \"82a2fbd1372a98d7915cfb092acf05207d9b4113\",\n+ \"url\": \"https://api.github.com/repos/composer/composer/zipball/39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\",\n+ \"reference\": \"39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -486,7 +486,7 @@\n \"irc\": \"ircs://irc.libera.chat:6697/composer\",\n \"issues\": \"https://github.com/composer/composer/issues\",\n \"security\": \"https://github.com/composer/composer/security/policy\",\n- \"source\": \"https://github.com/composer/composer/tree/2.9.7\"\n+ \"source\": \"https://github.com/composer/composer/tree/2.9.8\"\n },\n \"funding\": [\n {\n@@ -498,7 +498,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-04-14T11:31:52+00:00\"\n+ \"time\": \"2026-05-13T07:28:38+00:00\"\n },\n {\n \"name\": \"composer/metadata-minifier\",\n@@ -3458,16 +3458,16 @@\n },\n {\n \"name\": \"symfony/console\",\n- \"version\": \"v7.4.9\",\n+ \"version\": \"v7.4.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/console.git\",\n- \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\"\n+ \"reference\": \"ed0107e43ab452aa77ae99e005b95e56b556e075\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n- \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n+ \"url\": \"https://api.github.com/repos/symfony/console/zipball/ed0107e43ab452aa77ae99e005b95e56b556e075\",\n+ \"reference\": \"ed0107e43ab452aa77ae99e005b95e56b556e075\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3532,7 +3532,7 @@\n \"terminal\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/console/tree/v7.4.9\"\n+ \"source\": \"https://github.com/symfony/console/tree/v7.4.11\"\n },\n \"funding\": [\n {\n@@ -3552,7 +3552,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-22T15:21:55+00:00\"\n+ \"time\": \"2026-05-13T12:04:42+00:00\"\n },\n {\n \"name\": \"symfony/deprecation-contracts\",\n@@ -3627,16 +3627,16 @@\n },\n {\n \"name\": \"symfony/filesystem\",\n- \"version\": \"v8.0.9\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/filesystem.git\",\n- \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\"\n+ \"reference\": \"224db910898ce1317b892a9a1338f1f8f17eb7c7\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n- \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n+ \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/224db910898ce1317b892a9a1338f1f8f17eb7c7\",\n+ \"reference\": \"224db910898ce1317b892a9a1338f1f8f17eb7c7\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3673,7 +3673,7 @@\n \"description\": \"Provides basic utilities for the filesystem\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.9\"\n+ \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -3693,7 +3693,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-18T13:51:42+00:00\"\n+ \"time\": \"2026-05-11T16:39:47+00:00\"\n },\n {\n \"name\": \"symfony/finder\",\n@@ -4424,16 +4424,16 @@\n },\n {\n \"name\": \"symfony/process\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/process.git\",\n- \"reference\": \"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\"\n+ \"reference\": \"26d89e459f037d2873300605d0a07e7a8ef84db0\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/process/zipball/cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\",\n- \"reference\": \"cb8939aff03470d1a9d1d1b66d08c6fa71b3bbdc\",\n+ \"url\": \"https://api.github.com/repos/symfony/process/zipball/26d89e459f037d2873300605d0a07e7a8ef84db0\",\n+ \"reference\": \"26d89e459f037d2873300605d0a07e7a8ef84db0\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4465,7 +4465,7 @@\n \"description\": \"Executes commands in sub-processes\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/process/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/process/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -4485,7 +4485,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-05-11T16:56:32+00:00\"\n },\n {\n \"name\": \"symfony/service-contracts\",\n@@ -4576,16 +4576,16 @@\n },\n {\n \"name\": \"symfony/string\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.11\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/string.git\",\n- \"reference\": \"ae9488f874d7603f9d2dfbf120203882b645d963\"\n+ \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/string/zipball/ae9488f874d7603f9d2dfbf120203882b645d963\",\n- \"reference\": \"ae9488f874d7603f9d2dfbf120203882b645d963\",\n+ \"url\": \"https://api.github.com/repos/symfony/string/zipball/39be2ad058a3c0bd558edca23e65f009865d75ff\",\n+ \"reference\": \"39be2ad058a3c0bd558edca23e65f009865d75ff\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4642,7 +4642,7 @@\n \"utf8\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/string/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/string/tree/v8.0.11\"\n },\n \"funding\": [\n {\n@@ -4662,7 +4662,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-05-13T12:07:53+00:00\"\n },\n {\n \"name\": \"theseer/tokenizer\",\ndiff --git a/docs/guide/test-fixtures.md b/docs/guide/test-fixtures.md\nindex 414a3db9e3f..ac655725930 100644\n--- a/docs/guide/test-fixtures.md\n+++ b/docs/guide/test-fixtures.md\n@@ -36,6 +36,10 @@ class UserFixture extends ActiveFixture\n }\n ```\n \n+These examples use the `app\\tests\\fixtures` namespace because the fixture classes are referenced directly\n+by application tests. The `yii fixture` command has its own default namespace, `tests\\unit\\fixtures`.\n+If your fixture classes use another namespace, configure the command or pass the `--namespace` option.\n+\n > Tip: Each `ActiveFixture` is about preparing a DB table for testing purpose. You may specify the table\n > by setting either the [[yii\\test\\ActiveFixture::tableName]] property or the [[yii\\test\\ActiveFixture::modelClass]]\n > property. If the latter, the table name will be taken from the `ActiveRecord` class specified by `modelClass`.\n@@ -178,7 +182,7 @@ different tests. We thus recommend that you organize the data files in a hierarc\n your class namespaces. For example,\n \n ```\n-# under folder tests\\unit\\fixtures\n+# under the folder that matches your fixture namespace, for example tests\\unit\\fixtures\n \n data\\\n components\\\n@@ -243,7 +247,9 @@ Fixture classes name should not be plural.\n \n ### Loading fixtures\n \n-Fixture classes should be suffixed by `Fixture`. By default, fixtures will be searched under `tests\\unit\\fixtures` namespace, you can\n+Fixture classes should be suffixed by `Fixture`. By default, the `yii fixture` command searches for them\n+under the `tests\\unit\\fixtures` namespace. This command default is independent from the fixture namespaces\n+used by application tests. You can\n change this behavior with config or command options. You can exclude some fixtures due load or unload by specifying `-` before its name like `-User`.\n \n To load fixture, run the following command:\n@@ -277,7 +283,7 @@ yii fixture \"*\"\n yii fixture \"*, -DoNotLoadThisOne\"\n \n // load fixtures, but search them in different namespace. By default namespace is: tests\\unit\\fixtures.\n-yii fixture User --namespace='alias\\my\\custom\\namespace'\n+yii fixture User --namespace='app\\tests\\fixtures'\n \n // load global fixture `some\\name\\space\\CustomFixture` before other fixtures will be loaded.\n // By default this option is set to `InitDbFixture` to disable/enable integrity checks. You can specify several\n@@ -310,7 +316,7 @@ Same command options like: `namespace`, `globalFixtures` also can be applied to\n \n While command line options allow us to configure the fixture command\n on-the-fly, sometimes we may want to configure the command once for all. For example, you can configure\n-different fixture path as follows:\n+a different fixture namespace as follows:\n \n ```\n 'controllerMap' => [\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex efe898b3051..6416cbd74e6 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -75,11 +75,13 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n-- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n-- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n-- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20875: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20875: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20875: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n+- Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \ndiff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\nindex 194eff2def8..464e9056d9f 100644\n--- a/framework/db/BaseActiveRecord.php\n+++ b/framework/db/BaseActiveRecord.php\n@@ -1816,12 +1816,16 @@ private function isValueDifferent($newValue, $oldValue)\n * }\n * ```\n *\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\n+ * @template TModels of array\n+ *\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\n * - an active record instance;\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\n * @since 2.0.50\n+ *\n+ * @param-out TModels $models\n */\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\n {\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\nindex 5709702ef9b..932640d0f16 100644\n--- a/framework/db/Query.php\n+++ b/framework/db/Query.php\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\n */\n public $distinct = false;\n /**\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\n * This is used to construct the FROM clause in a SQL statement.\n * @see from()\n */\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex 3f78050b8ad..a7a2f9b5440 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -450,774 +450,12 @@ parameters:\n \t\t\tcount: 1\n \t\t\tpath: framework/test/DbFixture.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$category in PHPDoc tag @var does not match assigned variable \\$categories\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveQuery.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$address\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$customer_id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$email\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$id\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$isNewRecord\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsFor8\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$itemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$name\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orderItemsWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$quantity\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$relatedRecords\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$status\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$subtotal\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$total\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ActiveRecordInterface\\:\\:\\$virtualCustomerId\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$expensiveOrdersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\BaseActiveRecord\\:\\:\\$ordersWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Category\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\CustomerWithAlias\\:\\:\\$orders2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$bookItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 12\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$books2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicit\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksExplicitA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntax\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksQuerysyntaxA\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFK\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$booksWithNullFKViaTable\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customer2\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfile\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$customerJoinedWithProfileIndexOrdered\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$items\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 31\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$itemsIndexed\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$limitedItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$movieItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$orderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 9\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$quantityOrderItems\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$custom\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$item\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$order\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 6\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeNoJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\ar\\\\OrderItem\\:\\:\\$orderItemCompositeWithJoin\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$id on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Access to property \\$orderItems on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQuery\\<yiiunit\\\\data\\\\ar\\\\Order\\>\\:\\:applyAlias\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 7\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveQueryInterface\\:\\:active\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canGetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:canSetProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:getOrders\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:hasProperty\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:isRelationPopulated\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:refresh\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 5\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:unlinkAll\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateCounters\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined static method yii\\\\db\\\\ActiveRecordInterface\\:\\:updateAllCounters\\(\\)\\.$#'\n-\t\t\tidentifier: staticMethod.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method afterSave\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 23\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertArrayHasKey\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 30\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertCount\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 92\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEmpty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertEquals\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 97\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertFalse\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 22\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertInstanceOf\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 19\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNotNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertNull\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 16\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method assertTrue\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 39\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canGetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method canSetProperty\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getCustomerClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to method getOrderWithNullFKClass\\(\\) on an unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$books on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$id on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 10\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$items on array\\<mixed\\>\\|yii\\\\db\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$name on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$orders on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$ordersWithItems on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$primaryKey on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$relatedRecords on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot call method isRelationPopulated\\(\\) on array\\|yii\\\\db\\\\ActiveRecordInterface\\.$#'\n-\t\t\tidentifier: method.nonObject\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Class yiiunit\\\\extensions\\\\redis\\\\ActiveRecordTest not found\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 1 parameter, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 13\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\ActiveQueryInterface\\:\\:with\\(\\) invoked with 2 parameters, 0 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on yiiunit\\\\data\\\\ar\\\\OrderItemWithConstructor\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$customer contains unknown class yiiunit\\\\framework\\\\ar\\\\ActiveRecord\\.$#'\n-\t\t\tidentifier: class.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var for variable \\$this has invalid type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\.$#'\n-\t\t\tidentifier: varTag.trait\n-\t\t\tcount: 27\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^PHPDoc tag @var with type yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait\\|yiiunit\\\\TestCase is not subtype of native type \\$this\\(yiiunit\\\\base\\\\db\\\\BaseActiveRecord\\)\\.$#'\n-\t\t\tidentifier: varTag.nativeType\n-\t\t\tcount: 33\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$stringcol \\(string\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var1 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var2 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept null\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\NullValues\\:\\:\\$var3 \\(int\\) does not accept string\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$total \\(string\\) does not accept int\\.$#'\n-\t\t\tidentifier: assign.propertyType\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$count might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer in PHPDoc tag @var does not match assigned variable \\$class\\.$#'\n-\t\t\tidentifier: varTag.differentVariable\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$customer might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$orders might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseActiveRecord.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableChecks\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableForeignKeys\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 4\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTablePrimaryKey\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getTableUniques\\(\\)\\.$#'\n-\t\t\tidentifier: method.notFound\n-\t\t\tcount: 3\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Cannot access property \\$foreignKeys on null\\.$#'\n-\t\t\tidentifier: property.nonObject\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Method yii\\\\db\\\\Command\\:\\:queryOne\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#'\n-\t\t\tidentifier: arguments.count\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Offset 0 does not exist on array\\{\\}\\.$#'\n-\t\t\tidentifier: offsetAccess.notFound\n-\t\t\tcount: 8\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Variable \\$expression might not be defined\\.$#'\n-\t\t\tidentifier: variable.undefined\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseCommand.php\n-\n-\t\t-\n-\t\t\tmessage: '#^Anonymous function has an unused use \\$update\\.$#'\n-\t\t\tidentifier: closure.unusedUse\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseQuery.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$condition with type array\\|string is not subtype of native type array\\.$#'\n \t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n \t\t\tpath: tests/base/db/BaseQueryBuilder.php\n \n-\t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$dimension\\.$#'\n-\t\t\tidentifier: property.notFound\n-\t\t\tcount: 1\n-\t\t\tpath: tests/base/db/BaseSchema.php\n-\n \t\t-\n \t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type array\\|bool\\|yii\\\\db\\\\Constraint\\|null\\.$#'\n \t\t\tidentifier: parameter.phpDocType\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 6a59f2fbff4..389a680492c 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -15,8 +15,6 @@ parameters:\n - tests/data\n - tests/framework/*/stubs/*\n - tests/framework/*/mocks/*\n- # TODO: Analyze these directories\n- - tests/framework/db\n \n bootstrapFiles:\n - framework/BaseYii.php\n\ndiff --git a/tests/base/db/BaseActiveQuery.php b/tests/base/db/BaseActiveQuery.php\nindex 70ffda75a38..32c29f5b897 100644\n--- a/tests/base/db/BaseActiveQuery.php\n+++ b/tests/base/db/BaseActiveQuery.php\n@@ -296,9 +296,7 @@ public function testGetTableNamesWontFillFrom(): void\n */\n public function testDeeplyNestedTableRelationWith(): void\n {\n- /** @var Category $category */\n $categories = Category::find()->with('orders')->indexBy('id')->all();\n-\n $category = $categories[1];\n $this->assertNotNull($category);\n $orders = $category->orders;\ndiff --git a/tests/base/db/BaseActiveRecord.php b/tests/base/db/BaseActiveRecord.php\nindex e0d3e2aeddf..f6584f819e2 100644\n--- a/tests/base/db/BaseActiveRecord.php\n+++ b/tests/base/db/BaseActiveRecord.php\n@@ -42,7 +42,6 @@\n use yiiunit\\data\\ar\\Type;\n use yiiunit\\data\\ar\\CroppedType;\n use yiiunit\\framework\\ar\\ActiveRecordTestTrait;\n-use yiiunit\\TestCase;\n \n abstract class BaseActiveRecord extends DatabaseTestCase\n {\n@@ -57,6 +56,8 @@ protected function setUp(): void\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Customer>\n */\n public function getCustomerClass()\n {\n@@ -65,6 +66,8 @@ public function getCustomerClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Item>\n */\n public function getItemClass()\n {\n@@ -73,6 +76,8 @@ public function getItemClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Order>\n */\n public function getOrderClass()\n {\n@@ -81,6 +86,8 @@ public function getOrderClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItem>\n */\n public function getOrderItemClass()\n {\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\n }\n \n /**\n- * @return string\n+ * {@inheritdoc}\n+ *\n+ * @return class-string<Category>\n */\n public function getCategoryClass()\n {\n@@ -97,6 +106,8 @@ public function getCategoryClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderWithNullFK>\n */\n public function getOrderWithNullFKClass()\n {\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItemWithNullFK>\n */\n public function getOrderItemWithNullFKmClass()\n {\n@@ -154,7 +167,6 @@ public function testFindExists(): void\n \n public function testFindColumn(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\n }\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\n */\n public function testDeeplyNestedTableRelation2(): void\n {\n- /** @var Category $category */\n $category = Category::findOne(1);\n $this->assertNotNull($category);\n $orders = $category->orders;\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\n $record = new NullValues();\n \n // this is to simulate empty html form submission\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var1 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var2 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var3 = '';\n $record->stringcol = '';\n \n@@ -813,35 +827,11 @@ public function testJoinWithEager(): void\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\n }\n \n- public static function aliasMethodProvider(): array\n- {\n- return [\n- ['explicit'], // c\n- // ['querysyntax'], // {{@customer}}\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\n- // later getRelationAlias() could be added\n- ];\n- }\n-\n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- *\n- * @dataProvider aliasMethodProvider\n- *\n- * @param string $aliasMethod Whether alias is specified explicitly or using the query syntax {{@tablename}}.\n- */\n- public function testJoinWithAlias(string $aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -852,13 +842,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -867,13 +851,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -882,13 +860,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -899,32 +871,15 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -932,48 +887,35 @@ public function testJoinWithAlias(string $aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n-\n- // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n+\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with count and query\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $count = $query->count('[[c.id]]');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $count = $query->count('{{@customer}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $count = $query->count($query->applyAlias('customer', 'id'));\n- }\n+ $count = $query->count('[[c.id]]');\n $this->assertEquals(3, $count);\n $orders = $query->all();\n $this->assertCount(3, $orders);\n@@ -982,28 +924,16 @@ public function testJoinWithAlias(string $aliasMethod): void\n /** @var Order $order */\n $order = Order::findOne(1);\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\n- if ($aliasMethod === 'explicit') {\n- $customer = $customerQuery->where(['o.id' => 1])->one();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\n- }\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\n $this->assertNotNull($customer);\n $this->assertEquals(1, $customer->id);\n \n // join with sub-relation called inside Closure\n $orders = Order::find()->joinWith([\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\n+ 'items' => function (ActiveQuery $q) {\n $q->orderBy('item.id');\n $q->joinWith(['category c']);\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ])->orderBy('order.id')->all();\n $this->assertCount(1, $orders);\n@@ -1393,13 +1323,9 @@ public function testDefaultValues(): void\n \n public function testUnlinkAllViaTable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n // via table with delete\n@@ -1837,7 +1763,6 @@ public function testIndexByAfterLoadingRelations(): void\n */\n public function testNoTablenameReplacement(): void\n {\n- /** @var Customer $customer */\n $class = $this->getCustomerClass();\n $customer = new $class();\n $customer->name = 'Some {{weird}} name';\n@@ -2086,7 +2011,7 @@ public function testResetNotSavedRelation(): void\n {\n $order = new Order();\n $order->customer_id = 1;\n- $order->total = 0;\n+ $order->total = '0';\n \n $orderItem = new OrderItem();\n $order->orderItems;\n@@ -2159,7 +2084,6 @@ public static function providerForUnlinkDelete(): array\n */\n public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $order = $orderClass::findOne(2);\n@@ -2170,7 +2094,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n $this->assertCount(0, $order->itemsFor8);\n $this->assertCount(2, $order->orderItemsWithNullFK);\n \n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\n $this->assertCount(1, $orderItemClass::findAll([\n 'order_id' => 2,\n@@ -2184,7 +2107,6 @@ public function testUnlinkWithViaOnCondition(bool $delete, int $count): void\n \n public function testVirtualRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n $order = $orderClass::findOne(2);\n $order->virtualCustomerId = $order->customer_id;\n@@ -2229,7 +2151,6 @@ public function testGetAttributeLabel($model): void\n public function testLoadRelations(): void\n {\n // Test eager loading relations for multiple primary models using loadRelationsFor().\n- /** @var Customer[] $customers */\n $customers = Customer::find()->all();\n Customer::loadRelationsFor($customers, ['orders.items']);\n foreach ($customers as $customer) {\n@@ -2240,7 +2161,6 @@ public function testLoadRelations(): void\n }\n \n // Test eager loading relations as arrays.\n- /** @var array $customers */\n $customers = Customer::find()->asArray(true)->all();\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\n $query->asArray(false);\ndiff --git a/tests/base/db/BaseCommand.php b/tests/base/db/BaseCommand.php\nindex 9cf4ce0bf33..0d02039630f 100644\n--- a/tests/base/db/BaseCommand.php\n+++ b/tests/base/db/BaseCommand.php\n@@ -18,11 +18,13 @@\n use ArrayObject;\n use yii\\caching\\ArrayCache;\n use yii\\db\\Connection;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DataReader;\n use yii\\db\\Exception;\n use yii\\db\\Expression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\TableSchema;\n \n abstract class BaseCommand extends DatabaseTestCase\n {\n@@ -290,7 +292,7 @@ public function testFetchMode(): void\n // FETCH_NUM, customized in query method\n $sql = 'SELECT * FROM {{customer}}';\n $command = $db->createCommand($sql);\n- $result = $command->queryOne([], PDO::FETCH_NUM);\n+ $result = $command->queryOne(PDO::FETCH_NUM);\n $this->assertTrue(\\is_array($result) && isset($result[0]));\n }\n \n@@ -682,6 +684,9 @@ public function testInsertExpression(): void\n break;\n case 'oci':\n $expression = 'EXTRACT(YEAR FROM sysdate)';\n+ break;\n+ default:\n+ $this->fail(\"Unexpected driver name: {$this->driverName}\");\n }\n \n $command = $db->createCommand();\n@@ -1126,8 +1131,8 @@ public static function addPrimaryKeyProvider(): array\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1141,15 +1146,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\n ],\n )->execute();\n \n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\n-\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\n \n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\n-\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1195,8 +1201,8 @@ public static function addForeignKeyProvider(): array\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1214,7 +1220,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->addForeignKey(\n $name,\n@@ -1224,12 +1231,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n (array) $refColumns,\n )->execute();\n \n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\n \n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1250,32 +1258,40 @@ public function testCreateDropIndex(): void\n 'int2' => 'integer not null',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n+\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n }\n \n public static function addUniqueProvider(): array\n@@ -1312,8 +1328,8 @@ public static function addUniqueProvider(): array\n public function testAddDropUnique(string $name, string $tableName, $columns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1327,15 +1343,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\n-\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\n \n $db->createCommand()->dropUnique($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1352,6 +1369,7 @@ public function testAddDropCheck(): void\n $name = 'test_ck_constraint';\n \n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1362,18 +1380,16 @@ public function testAddDropCheck(): void\n ['int1' => 'integer'],\n )->execute();\n \n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n \n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\n-\n- $this->assertMatchesRegularExpression(\n- '/^.*int1.*>.*1.*$/',\n- $schema->getTableChecks($tableName, true)[0]->expression\n- );\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\n \n $db->createCommand()->dropCheck($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n }\n \n public function testAddDropDefaultValue(): void\n@@ -1442,7 +1458,7 @@ public function testQueryCache(): void\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n \n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n- $db->cache(function (Connection $db) use ($command, $update): void {\n+ $db->cache(function (Connection $db) use ($command): void {\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n }, 10);\n@@ -1554,40 +1570,50 @@ public function testAutoRefreshTableSchema(): void\n $tableName = 'test';\n $fkName = 'test_fk';\n \n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\n+ $schema = $db->getSchema();\n+\n+ if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n }\n \n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n \n $db->createCommand()->createTable($tableName, [\n 'id' => 'pk',\n 'fk' => 'int',\n 'name' => 'string',\n ])->execute();\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\n+ $initialSchema = $schema->getTableSchema($tableName);\n $this->assertNotNull($initialSchema);\n \n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\n+ $newSchema = $schema->getTableSchema($tableName);\n $this->assertNotEquals($initialSchema, $newSchema);\n \n if ($this->driverName !== 'sqlite') {\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\n \n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\n }\n \n $db->createCommand()->dropTable($tableName)->execute();\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n }\n \n public function testTransaction(): void\ndiff --git a/tests/base/db/BaseQuery.php b/tests/base/db/BaseQuery.php\nindex 4799fd29f09..1e5f837cb79 100644\n--- a/tests/base/db/BaseQuery.php\n+++ b/tests/base/db/BaseQuery.php\n@@ -721,7 +721,7 @@ public function testQueryCache(): void\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\n \n- $db->cache(function (Connection $db) use ($query, $update): void {\n+ $db->cache(function (Connection $db) use ($query): void {\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\n }, 10);\ndiff --git a/tests/base/db/BaseSchema.php b/tests/base/db/BaseSchema.php\nindex c00ef204544..0b3bdf1579f 100644\n--- a/tests/base/db/BaseSchema.php\n+++ b/tests/base/db/BaseSchema.php\n@@ -17,11 +17,11 @@\n use yii\\caching\\FileCache;\n use yii\\db\\CheckConstraint;\n use yii\\db\\ColumnSchema;\n-use yii\\db\\Connection;\n use yii\\db\\Constraint;\n use yii\\db\\Expression;\n use yii\\db\\ForeignKeyConstraint;\n use yii\\db\\IndexConstraint;\n+use yii\\db\\pgsql\\ColumnSchema as PgsqlColumnSchema;\n use yii\\db\\Schema;\n use yii\\db\\TableSchema;\n \n@@ -125,10 +125,7 @@ public function testGetNonExistingTableSchema(): void\n \n public function testSchemaCache(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $schema->db->enableSchemaCache = true;\n@@ -546,6 +543,7 @@ public function testColumnSchema(): void\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \"defaultValue of column $name does not match.\");\n }\n if (isset($expected['dimension'])) { // PgSQL only\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\n $this->assertSame($expected['dimension'], $column->dimension, \"dimension of column $name does not match\");\n }\n }\ndiff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\nindex 7472cfe7068..158862635cb 100644\n--- a/tests/data/ar/Category.php\n+++ b/tests/data/ar/Category.php\n@@ -13,6 +13,11 @@\n *\n * @property int $id\n * @property string $name\n+ *\n+ * @property-read Item[] $items\n+ * @property-read Item[] $limitedItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read Order[] $orders\n */\n class Category extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\nindex 18b96c02399..37405d963a8 100644\n--- a/tests/data/ar/Customer.php\n+++ b/tests/data/ar/Customer.php\n@@ -21,8 +21,21 @@\n * @property string $email\n * @property string $address\n * @property int $status\n+ * @property 1|0|'1'|'0'|bool $bool_status\n *\n * @method static CustomerQuery findBySql($sql, $params = [])\n+ *\n+ * @property-read Profile $profile\n+ * @property-read Order[] $ordersPlain\n+ * @property-read Order[] $orders\n+ * @property-read Order[] $expensiveOrders\n+ * @property-read Order[] $ordersWithItems\n+ * @property-read Order[] $expensiveOrdersWithNullFK\n+ * @property-read Order[] $ordersWithNullFK\n+ * @property-read Order[] $orders2\n+ * @property-read Item[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read Item[] $items\n */\n class Customer extends ActiveRecord\n {\n@@ -113,7 +126,7 @@ public function afterSave($insert, $changedAttributes): void\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\nindex bf0850ab064..41a50ca0557 100644\n--- a/tests/data/ar/CustomerQuery.php\n+++ b/tests/data/ar/CustomerQuery.php\n@@ -14,7 +14,8 @@\n \n /**\n * CustomerQuery.\n- * @extends ActiveQuery<CustomerWithAlias>\n+ * @template TModel of Customer = Customer\n+ * @extends ActiveQuery<TModel>\n */\n class CustomerQuery extends ActiveQuery\n {\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\nindex eaa32613e8b..0aee1182f96 100644\n--- a/tests/data/ar/CustomerWithAlias.php\n+++ b/tests/data/ar/CustomerWithAlias.php\n@@ -2,24 +2,9 @@\n \n namespace yiiunit\\data\\ar;\n \n-/**\n- * Class Customer.\n- *\n- * @property int $id\n- * @property string $name\n- * @property string $email\n- * @property string $address\n- * @property int $status\n- *\n- * @method static CustomerQuery findBySql($sql, $params = [])\n- */\n-class CustomerWithAlias extends ActiveRecord\n+class CustomerWithAlias extends Customer\n {\n- final public const STATUS_ACTIVE = 1;\n- final public const STATUS_INACTIVE = 2;\n-\n public $status2;\n-\n public $sumTotal;\n \n public static function tableName()\n@@ -29,7 +14,7 @@ public static function tableName()\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\nindex 7c66ed78f14..ce265ef98fa 100644\n--- a/tests/data/ar/DefaultPk.php\n+++ b/tests/data/ar/DefaultPk.php\n@@ -13,6 +13,7 @@\n *\n * @author Jan Waล <janek.jan@gmail.com>\n * @property int $id\n+ * @property string $type\n */\n class DefaultPk extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\nindex cfd8345eb46..ff41d1da8a8 100644\n--- a/tests/data/ar/Item.php\n+++ b/tests/data/ar/Item.php\n@@ -14,6 +14,8 @@\n * @property int $id\n * @property string $name\n * @property int $category_id\n+ *\n+ * @property-read Category $category\n */\n class Item extends ActiveRecord\n {\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\nindex ea9307e505b..c62f750eda6 100644\n--- a/tests/data/ar/NullValues.php\n+++ b/tests/data/ar/NullValues.php\n@@ -12,10 +12,10 @@\n * Class NullValues.\n *\n * @property int $id\n- * @property int $var1\n- * @property int $var2\n- * @property int $var3\n- * @property string $stringcol\n+ * @property int|null $var1\n+ * @property int|null $var2\n+ * @property int|null $var3\n+ * @property string|null $stringcol\n */\n class NullValues extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\nindex 57c26a5aaeb..e2ebf0f462f 100644\n--- a/tests/data/ar/Order.php\n+++ b/tests/data/ar/Order.php\n@@ -18,9 +18,34 @@\n * @property int $created_at\n * @property string $total\n *\n+ * @property-read Customer $customer\n+ * @property-read Customer $customer2\n+ * @property-read Customer $virtualCustomer\n+ * @property-read Customer $customerJoinedWithProfile\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\n+ * @property-read Item[] $books\n+ * @property-read Item[] $books2\n+ * @property-read Item[] $booksExplicit\n+ * @property-read Item[] $booksExplicitA\n+ * @property-read Item[] $bookItems\n+ * @property-read Item[] $booksViaTable\n+ * @property-read Item[] $booksWithNullFK\n+ * @property-read Item[] $booksWithNullFKViaTable\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\n * @property-read Item[] $cheapItemsUsingViaWithCallable\n+ * @property-read Item[] $items\n * @property-read Item[] $itemsFor8\n+ * @property-read Item[] $itemsIndexed\n+ * @property-read Item[] $itemsInOrder1\n+ * @property-read Item[] $itemsInOrder2\n+ * @property-read Item[] $itemsWithNullFK\n+ * @property-read Item[] $limitedItems\n+ * @property-read Item[] $movieItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read OrderItem[] $orderItems3\n+ * @property-read OrderItem[] $orderItemsWithNullFK\n+ * @property-read OrderItem[] $quantityOrderItems\n */\n class Order extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\nindex 65747e34444..46446b0c1fc 100644\n--- a/tests/data/ar/OrderItem.php\n+++ b/tests/data/ar/OrderItem.php\n@@ -17,6 +17,12 @@\n * @property int $item_id\n * @property int $quantity\n * @property string $subtotal\n+ *\n+ * @property Order $order\n+ * @property Item $item\n+ * @property self $orderItemCompositeWithJoin\n+ * @property self $orderItemCompositeNoJoin\n+ * @property Order $custom\n */\n class OrderItem extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\nindex b1c478044a2..99af491825a 100644\n--- a/tests/data/ar/OrderWithConstructor.php\n+++ b/tests/data/ar/OrderWithConstructor.php\n@@ -20,7 +20,7 @@\n * @property int $created_at\n * @property string $total\n *\n- * @property OrderItemWithConstructor $orderItems\n+ * @property OrderItemWithConstructor[] $orderItems\n * @property CustomerWithConstructor $customer\n * @property CustomerWithConstructor $customerJoinedWithProfile\n */\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\nindex d384f0a4f94..247913ed80c 100644\n--- a/tests/data/ar/TestTrigger.php\n+++ b/tests/data/ar/TestTrigger.php\n@@ -13,6 +13,7 @@\n *\n * @property int $id\n * @property string $stringcol\n+ * @property mixed $RV\n */\n class TestTrigger extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\nindex 2ad398d5994..abc952f3277 100644\n--- a/tests/data/ar/Type.php\n+++ b/tests/data/ar/Type.php\n@@ -11,19 +11,20 @@\n /**\n * Model representing type table.\n *\n+ * @property string $bigint_col\n * @property int $int_col\n * @property int $int_col2 DEFAULT 1\n * @property int $smallint_col DEFAULT 1\n * @property string $char_col\n * @property string $char_col2 DEFAULT 'something'\n * @property string $char_col3\n- * @property float $float_col\n+ * @property float|numeric-string $float_col\n * @property float $float_col2 DEFAULT '1.23'\n * @property string $blob_col\n * @property float $numeric_col DEFAULT '33.22'\n * @property string $time DEFAULT '2002-01-01 00:00:00'\n- * @property bool $bool_col\n- * @property bool $bool_col2 DEFAULT 1\n+ * @property 1|0|'1'|'0'|bool $bool_col\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\n */\n class Type extends ActiveRecord\n {\ndiff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\nindex 98484ec7b4a..77d3fea1b57 100644\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\n@@ -11,7 +11,6 @@\n use yiiunit\\extensions\\redis\\ActiveRecordTest;\n use Exception;\n use yii\\base\\Event;\n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\BaseActiveRecord;\n use yii\\db\\Expression;\n use yiiunit\\data\\ar\\Customer;\n@@ -25,36 +24,43 @@\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\n * in the extensions.\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\n+ *\n+ * @phpstan-require-extends TestCase\n */\n trait ActiveRecordTestTrait\n {\n- /** @var TestCase $this */\n /**\n * This method should return the classname of Customer class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getCustomerClass();\n \n /**\n * This method should return the classname of Order class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderClass();\n \n /**\n * This method should return the classname of OrderItem class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderItemClass();\n \n /**\n * This method should return the classname of Item class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getItemClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderWithNullFKClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderItemWithNullFKmClass();\n \n /**\n@@ -66,9 +72,7 @@ public function afterSave(): void\n \n public function testFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // find one\n $result = $customerClass::find();\n $this->assertInstanceOf('\\\\yii\\\\db\\\\ActiveQueryInterface', $result);\n@@ -129,7 +133,6 @@ public function testFind(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\n \n public function testHasAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n $customer = new $customerClass();\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\n \n public function testFindScalar(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // query scalar\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\n $this->assertEquals('user2', $customerName);\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\n \n public function testFindColumn(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\n }\n \n public function testFindIndexBy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\n $this->assertCount(3, $customers);\n@@ -232,10 +228,8 @@ public function testFindIndexBy(): void\n \n public function testFindIndexByAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy + asArray\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\n $this->assertCount(3, $customers);\n@@ -277,9 +271,7 @@ public function testFindIndexByAsArray(): void\n \n public function testRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $this->assertFalse($customer->refresh());\n \n@@ -291,12 +283,9 @@ public function testRefresh(): void\n \n public function testEquals(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customerA = new $customerClass();\n $customerB = new $customerClass();\n $this->assertFalse($customerA->equals($customerB));\n@@ -319,10 +308,8 @@ public function testEquals(): void\n \n public function testFindCount(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(3, $customerClass::find()->count());\n \n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\n@@ -339,10 +326,8 @@ public function testFindCount(): void\n \n public function testFindLimit(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // all()\n $customers = $customerClass::find()->all();\n $this->assertCount(3, $customers);\n@@ -386,10 +371,8 @@ public function testFindLimit(): void\n \n public function testFindComplexCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\n \n@@ -402,10 +385,8 @@ public function testFindComplexCondition(): void\n \n public function testFindNullValues(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $customer->name = null;\n $customer->save(false);\n@@ -418,10 +399,8 @@ public function testFindNullValues(): void\n \n public function testExists(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\n@@ -434,10 +413,8 @@ public function testExists(): void\n \n public function testFindLazy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertFalse($customer->isRelationPopulated('orders'));\n $orders = $customer->orders;\n@@ -462,12 +439,9 @@ public function testFindLazy(): void\n \n public function testFindEager(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -499,10 +473,8 @@ public function testFindEager(): void\n \n public function testFindLazyVia(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $this->assertEquals(1, $order->id);\n@@ -513,10 +485,8 @@ public function testFindLazyVia(): void\n \n public function testFindLazyVia2(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $order->id = 100;\n@@ -525,10 +495,8 @@ public function testFindLazyVia2(): void\n \n public function testFindEagerViaRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\n $this->assertCount(3, $orders);\n $order = $orders[0];\n@@ -541,10 +509,8 @@ public function testFindEagerViaRelation(): void\n \n public function testFindNestedRelation(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -578,10 +544,8 @@ public function testFindNestedRelation(): void\n */\n public function testFindEagerViaRelationPreserveOrder(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n /*\n Item (name, category_id)\n@@ -641,7 +605,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\n // different order in via table\n public function testFindEagerViaRelationPreserveOrderB(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\n@@ -671,21 +634,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\n \n public function testLink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n \n // has many\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer->link('orders', $order);\n $this->afterSave();\n@@ -696,7 +654,7 @@ public function testLink(): void\n \n // belongs to\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer = $customerClass::findOne(1);\n $this->assertNull($order->customer);\n@@ -724,16 +682,11 @@ public function testLink(): void\n \n public function testUnlink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many without delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->ordersWithNullFK);\n@@ -775,20 +728,13 @@ public function testUnlink(): void\n \n public function testUnlinkAll(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many with delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n@@ -841,11 +787,7 @@ public function testUnlinkAll(): void\n \n public function testUnlinkAllAndConditionSetNull(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderWithNullFKClass();\n \n // in this test all orders are owned by customer 1\n@@ -867,11 +809,7 @@ public function testUnlinkAllAndConditionSetNull(): void\n \n public function testUnlinkAllAndConditionDelete(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n \n // in this test all orders are owned by customer 1\n@@ -896,9 +834,7 @@ public function testUnlinkAllAndConditionDelete(): void\n \n public function testInsert(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->email = 'user4@example.com';\n $customer->name = 'user4';\n@@ -920,9 +856,7 @@ public function testInsert(): void\n \n public function testExplicitPkOnAutoIncrement(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->id = 1337;\n $customer->email = 'user1337@example.com';\n@@ -939,9 +873,7 @@ public function testExplicitPkOnAutoIncrement(): void\n \n public function testUpdate(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // save\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n@@ -982,9 +914,7 @@ public function testUpdate(): void\n \n public function testUpdateAttributes(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1017,9 +947,7 @@ public function testUpdateAttributes(): void\n \n public function testUpdateCounters(): void\n {\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // updateCounters\n $pk = ['order_id' => 2, 'item_id' => 4];\n $orderItem = $orderItemClass::findOne($pk);\n@@ -1048,9 +976,7 @@ public function testUpdateCounters(): void\n \n public function testDelete(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // delete\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1080,23 +1006,21 @@ public function testDelete(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = true;\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(1, $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = false;\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(0, $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['status' => true])->all();\n $this->assertCount(2, $customers);\n@@ -1107,11 +1031,8 @@ public function testBooleanAttribute(): void\n \n public function testAfterFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterFindCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\n@@ -1143,6 +1064,7 @@ public function testAfterFind(): void\n ], $afterFindCalls);\n $afterFindCalls = [];\n \n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\n } else {\n@@ -1164,9 +1086,7 @@ public function testAfterFind(): void\n \n public function testAfterRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterRefreshCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\n@@ -1185,9 +1105,7 @@ public function testAfterRefresh(): void\n \n public function testFindEmptyInCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $customers = $customerClass::find()->where(['id' => [1]])->all();\n $this->assertCount(1, $customers);\n@@ -1204,9 +1122,6 @@ public function testFindEmptyInCondition(): void\n \n public function testFindEagerIndexBy(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n@@ -1229,7 +1144,6 @@ public function testFindEagerIndexBy(): void\n \n public function testAttributeAccess(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $model = new $customerClass();\n \n@@ -1247,8 +1161,6 @@ public function testAttributeAccess(): void\n $baseModel = new $customerClass();\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\n \n-\n- /** @var ActiveRecord $customer */\n $customer = new $customerClass();\n $this->assertInstanceOf($customerClass, $customer);\n \n@@ -1272,8 +1184,8 @@ public function testAttributeAccess(): void\n $this->assertFalse($customer->canSetProperty('orderItems'));\n \n try {\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\n $customer->orderItems = [new $itemClass()];\n $this->fail('setter call above MUST throw Exception');\n } catch (Exception $e) {\n@@ -1293,7 +1205,6 @@ public function testAttributeAccess(): void\n */\n public function testViaWithCallable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\ndiff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\nindex f148be0be97..e5cb5d5f98a 100644\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\n public function testGetTableNamesIsFromObjectGenerateException(): void\n {\n $query = $this->createQuery();\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $query->from = new stdClass();\n \n $this->expectException('\\yii\\base\\InvalidConfigException');\ndiff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\nindex 9486910479a..a9fbbe32175 100644\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\n@@ -52,10 +52,10 @@ public function testCastValues(): void\n $this->assertSame('1337', trim((string) $model->char_col));\n $this->assertSame('test', $model->char_col2);\n $this->assertSame('test123', $model->char_col3);\n- //$this->assertSame(3.742, $model->float_col);\n- //$this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame('3.742', $model->float_col);\n+ $this->assertSame(42.1337, $model->float_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n /**\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\nindex adecd27db0b..dc9e5532e7e 100644\n--- a/tests/framework/db/mssql/CommandTest.php\n+++ b/tests/framework/db/mssql/CommandTest.php\n@@ -115,12 +115,16 @@ public function testAddDropDefaultValue(): void\n 'int1' => 'integer',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n+\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\n \n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n }\n \n public static function batchInsertSqlProvider(): array\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 71f1b10c545..5ea92c3a6b9 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\db\\mssql;\n \n use yii\\base\\NotSupportedException;\n-use yii\\db\\Connection;\n use yii\\db\\Constraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n use yii\\db\\mssql\\TableSchema;\n@@ -52,10 +52,7 @@ public static function constraintsProvider(): array\n \n public function testGetStringFieldsSize(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $columns = $schema->getTableSchema('type', false)->columns;\n@@ -82,6 +79,8 @@ public function testGetStringFieldsSize(): void\n $expectedSize = null;\n $expectedDbType = 'text';\n break;\n+ default:\n+ $this->fail(\"Unexpected column name: {$name}\");\n }\n \n $this->assertEquals($expectedType, $type);\n@@ -328,6 +327,8 @@ public function testResolveTableNames(\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n+\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n $this->assertNotEmpty($primaryKeys);\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n@@ -359,6 +360,8 @@ public function testInsertWithCompositePrimaryKey(): void\n public function testGetViewNamesWithDefaultSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(Schema::class, $schema);\n+\n $viewNames = $schema->getViewNames();\n $this->assertContains('animal_view', $viewNames);\n }\ndiff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\nindex febbfdbec5f..acc648ed446 100644\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\n@@ -46,8 +46,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n public function testJsonColumn(): void\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\nindex b87ced8b56d..a61eea818ba 100644\n--- a/tests/framework/db/mysql/CommandTest.php\n+++ b/tests/framework/db/mysql/CommandTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\db\\mysql;\n \n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\base\\db\\BaseCommand;\n \n /**\n@@ -30,6 +31,7 @@ public function testAddDropCheckSeveral(): void\n \n $tableName = 'test_ck_several';\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\ndiff --git a/tests/framework/db/mysql/QueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php\nindex 5987790e6c0..ae9a19245f9 100644\n--- a/tests/framework/db/mysql/QueryBuilderTest.php\n+++ b/tests/framework/db/mysql/QueryBuilderTest.php\n@@ -18,6 +18,7 @@\n use yii\\db\\JsonExpression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\mysql\\QueryBuilder;\n use yiiunit\\base\\db\\BaseQueryBuilder;\n \n /**\n@@ -33,6 +34,7 @@ final class QueryBuilderTest extends BaseQueryBuilder\n \n public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -65,6 +67,7 @@ public function testBuildOrderByAndLimitWithOffsetAndLimit(): void\n \n public function testBuildOrderByAndLimitWithLimitOnly(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -96,6 +99,7 @@ public function testBuildOrderByAndLimitWithLimitOnly(): void\n \n public function testBuildOrderByAndLimitWithOffsetOnly(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -176,6 +180,7 @@ public function testBuildOrderByAndLimitWithOrderByWithoutPagination(): void\n \n public function testBuildOrderByAndLimitWithZeroLimit(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -207,6 +212,7 @@ public function testBuildOrderByAndLimitWithZeroLimit(): void\n \n public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\n@@ -240,6 +246,7 @@ public function testBuildOrderByAndLimitWithExplicitOrderBy(): void\n \n public function testBuildOrderByAndLimitWithExpressionLimitAndOffset(): void\n {\n+ /** @var QueryBuilder $qb */\n $qb = $this->getConnection(false)->getQueryBuilder();\n \n $query = (new Query())\ndiff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\nindex 38fc5e553e0..daaa8f8e019 100644\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\n@@ -267,6 +267,8 @@ private function childrenUpdateLocked()\n * In case of error in child process its execution bubbles up to phpunit to continue\n * all the rest tests. So, all the rest tests in this case will run both in the child\n * and parent processes. Such mess must be prevented with child's own error handler.\n+ *\n+ * @phpstan-impure\n */\n private function setErrorHandler(): void\n {\ndiff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\nindex 7b4f724cf4a..e2132cdc7e7 100644\n--- a/tests/framework/db/oci/ActiveRecordTest.php\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\n@@ -8,7 +8,6 @@\n \n namespace yiiunit\\framework\\db\\oci;\n \n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\ActiveQuery;\n use yiiunit\\data\\ar\\BitValues;\n use yiiunit\\data\\ar\\DefaultPk;\n@@ -52,8 +51,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- $this->assertEquals('1', $model->bool_col);\n- $this->assertEquals('0', $model->bool_col2);\n+ $this->assertSame('1', $model->bool_col);\n+ $this->assertSame('0', $model->bool_col2);\n }\n \n public function testDefaultValues(): void\n@@ -83,7 +82,6 @@ public function testDefaultValues(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -158,23 +156,21 @@ public function testBit(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = '1';\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('1', $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = '0';\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('0', $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\n $this->assertCount(2, $customers);\n@@ -183,25 +179,11 @@ public function testBooleanAttribute(): void\n $this->assertCount(1, $customers);\n }\n \n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- *\n- * @dataProvider aliasMethodProvider\n- *\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n- */\n- public function testJoinWithAlias(string $aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -212,13 +194,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -227,13 +203,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -242,13 +212,7 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -259,32 +223,14 @@ public function testJoinWithAlias(string $aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -292,36 +238,31 @@ public function testJoinWithAlias(string $aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n }\n }\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\nindex 8ca4181904d..552ce9378e2 100644\n--- a/tests/framework/db/oci/CommandTest.php\n+++ b/tests/framework/db/oci/CommandTest.php\n@@ -508,7 +508,7 @@ public function testQueryCache(): void\n \n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\n \n- $db->cache(function (Connection $db) use ($update): void {\n+ $db->cache(function (Connection $db): void {\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n \n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\nindex b90051c6c8c..1668aa5a63a 100644\n--- a/tests/framework/db/oci/SchemaTest.php\n+++ b/tests/framework/db/oci/SchemaTest.php\n@@ -11,8 +11,9 @@\n namespace yiiunit\\framework\\db\\oci;\n \n use Exception;\n+use PHPUnit\\Framework\\Attributes\\Group;\n use yii\\db\\CheckConstraint;\n-use yii\\db\\oci\\Schema;\n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -235,7 +236,6 @@ public function testFindUniqueIndexes(): void\n 'someCol3' => 'string',\n ])->execute();\n \n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\n@@ -279,8 +279,10 @@ public function testFindUniqueIndexes(): void\n public function testLobIndexesExcluded(): void\n {\n $db = $this->getConnection();\n+ $dbSchema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\n \n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\n $db->createCommand()->dropTable('lob_test')->execute();\n }\n \n@@ -288,7 +290,7 @@ public function testLobIndexesExcluded(): void\n 'CREATE TABLE \"lob_test\" (\"id\" NUMBER(10) NOT NULL, \"content\" CLOB, \"data\" BLOB, PRIMARY KEY (\"id\"))'\n )->execute();\n \n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\n \n $this->assertCount(1, $indexes);\n \ndiff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\nindex 281874d55e3..5c8f4a99398 100644\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\n@@ -8,7 +8,9 @@\n \n namespace yiiunit\\framework\\db\\pgsql;\n \n+use yiiunit\\data\\ar\\Customer;\n use yiiunit\\framework\\test\\CustomerDbTestCase;\n+use yiiunit\\framework\\test\\CustomerFixture;\n \n /**\n * @group db\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\n $test = new CustomerDbTestCase();\n $test->setUp();\n $fixture = $test->getFixture('customers');\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n \n $sequenceName = $fixture->getTableSchema()->sequenceName;\n $sequenceNextVal = $this->getConnection()->createCommand(\"SELECT currval('$sequenceName')\")->queryScalar();\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\n+\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\n \n $test->tearDown();\n }\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 1a0366ff6a6..549eaab62d1 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -33,9 +33,6 @@ class ActiveRecordTest extends BaseActiveRecord\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -61,7 +58,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -319,6 +315,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -327,6 +329,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n final public const STATUS_DELETED = 0;\n@@ -348,12 +362,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\nindex fd6762f5eb9..d4290c40474 100644\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\n@@ -39,8 +39,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array json_col\n+ * @property int $id\n+ * @property array $json_col\n */\n class ArrayAndJsonType extends ActiveRecord\n {\n"},"num_subtasks":{"kind":"number","value":13,"string":"13"},"num_changed_files":{"kind":"number","value":39,"string":"39"}}},{"rowIdx":34262,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20878"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20878,"string":"20,878"},"base_sha":{"kind":"string","value":"ff66e6a8548034043c416b71cbd572ce811e8f23"},"head_sha":{"kind":"string","value":"a75e4ce0bade2864f790126a6aa2b83099167c9e"},"task":{"kind":"string","value":"Analyze the `yiiunit\\framework\\db` namespace using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["phpstan-baseline-7x.neon","phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/db/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["framework/db/BaseActiveRecord.php","framework/db/Query.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/data/ar/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/data/ar/Category.php","tests/data/ar/Customer.php","tests/data/ar/CustomerQuery.php","tests/data/ar/CustomerWithAlias.php","tests/data/ar/DefaultPk.php","tests/data/ar/Item.php","tests/data/ar/NullValues.php","tests/data/ar/Order.php","tests/data/ar/OrderItem.php","tests/data/ar/OrderWithConstructor.php","tests/data/ar/TestTrigger.php","tests/data/ar/Type.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/ar/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/ar/ActiveRecordTestTrait.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/framework/db/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/ActiveQueryTest.php","tests/framework/db/ActiveRecordTest.php","tests/framework/db/CommandTest.php","tests/framework/db/GetTablesAliasTestTrait.php","tests/framework/db/QueryTest.php","tests/framework/db/SchemaTest.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/db/cubrid/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/cubrid/SchemaTest.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/db/mssql/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/mssql/ActiveRecordTest.php","tests/framework/db/mssql/CommandTest.php","tests/framework/db/mssql/SchemaTest.php"]},{"subtask_id":"s9","goal":"Implement the changes under `tests/framework/db/mysql/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/mysql/ActiveRecordTest.php","tests/framework/db/mysql/CommandTest.php"]},{"subtask_id":"s10","goal":"Implement the changes under `tests/framework/db/mysql/connection/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/mysql/connection/DeadLockTest.php"]},{"subtask_id":"s11","goal":"Implement the changes under `tests/framework/db/oci/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/oci/ActiveRecordTest.php","tests/framework/db/oci/CommandTest.php","tests/framework/db/oci/SchemaTest.php"]},{"subtask_id":"s12","goal":"Implement the changes under `tests/framework/db/pgsql/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan","scope_files":["tests/framework/db/pgsql/ActiveFixtureTest.php","tests/framework/db/pgsql/ActiveRecordTest.php","tests/framework/db/pgsql/BaseActiveRecordTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"phpstan-baseline-7x.neon\",\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/db/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/db/BaseActiveRecord.php\",\n \"framework/db/Query.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/data/ar/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/data/ar/Category.php\",\n \"tests/data/ar/Customer.php\",\n \"tests/data/ar/CustomerQuery.php\",\n \"tests/data/ar/CustomerWithAlias.php\",\n \"tests/data/ar/DefaultPk.php\",\n \"tests/data/ar/Item.php\",\n \"tests/data/ar/NullValues.php\",\n \"tests/data/ar/Order.php\",\n \"tests/data/ar/OrderItem.php\",\n \"tests/data/ar/OrderWithConstructor.php\",\n \"tests/data/ar/TestTrigger.php\",\n \"tests/data/ar/Type.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/ar/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/ar/ActiveRecordTestTrait.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/framework/db/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/ActiveQueryTest.php\",\n \"tests/framework/db/ActiveRecordTest.php\",\n \"tests/framework/db/CommandTest.php\",\n \"tests/framework/db/GetTablesAliasTestTrait.php\",\n \"tests/framework/db/QueryTest.php\",\n \"tests/framework/db/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/db/cubrid/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/cubrid/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/db/mssql/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/mssql/ActiveRecordTest.php\",\n \"tests/framework/db/mssql/CommandTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s9\",\n \"goal\": \"Implement the changes under `tests/framework/db/mysql/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/mysql/ActiveRecordTest.php\",\n \"tests/framework/db/mysql/CommandTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s10\",\n \"goal\": \"Implement the changes under `tests/framework/db/mysql/connection/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/mysql/connection/DeadLockTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s11\",\n \"goal\": \"Implement the changes under `tests/framework/db/oci/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/oci/ActiveRecordTest.php\",\n \"tests/framework/db/oci/CommandTest.php\",\n \"tests/framework/db/oci/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s12\",\n \"goal\": \"Implement the changes under `tests/framework/db/pgsql/` needed for: Analyze the `yiiunit\\\\framework\\\\db` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/db/pgsql/ActiveFixtureTest.php\",\n \"tests/framework/db/pgsql/ActiveRecordTest.php\",\n \"tests/framework/db/pgsql/BaseActiveRecordTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan-baseline-7x.neon","phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon\nindex 13be3e5bae1..6be48e7c140 100644\n--- a/phpstan-baseline-7x.neon\n+++ b/phpstan-baseline-7x.neon\n@@ -77,3 +77,39 @@ parameters:\n \t\t\tidentifier: class.notFound\n \t\t\tcount: 1\n \t\t\tpath: tests/framework/behaviors/AttributeTypecastBehaviorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Off on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\IntBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant On on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\IntBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\StringBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\Status\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\StatusTypeInt\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\StatusTypeString\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 608efda39af..7e5863e16c0 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -15,10 +15,9 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n+ - tests/framework/db/enums\n - tests/framework/*/stubs/*\n - tests/framework/*/mocks/*\n- # TODO: Analyze these directories\n- - tests/framework/db\n \n bootstrapFiles:\n - framework/BaseYii.php\n\n","summary":"Edited 2 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex a1ae1155dc9..d220536ddb5 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,11 +4,13 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n-- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n-- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n-- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20875: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20875: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20875: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n+- Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s3","scope_files":["framework/db/BaseActiveRecord.php","framework/db/Query.php"],"solution_diff":"diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\nindex 3be60fbd81e..bd1e4ee22d7 100644\n--- a/framework/db/BaseActiveRecord.php\n+++ b/framework/db/BaseActiveRecord.php\n@@ -1817,12 +1817,16 @@ private function isValueDifferent($newValue, $oldValue)\n * }\n * ```\n *\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\n+ * @template TModels of array\n+ *\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\n * - an active record instance;\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\n * @since 2.0.50\n+ *\n+ * @param-out TModels $models\n */\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\n {\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\nindex 722bde08705..dbf9ab3b982 100644\n--- a/framework/db/Query.php\n+++ b/framework/db/Query.php\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\n */\n public $distinct = false;\n /**\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\n * This is used to construct the FROM clause in a SQL statement.\n * @see from()\n */\n","summary":"Edited 2 file(s) in framework/db/"},{"subtask_id":"s4","scope_files":["tests/data/ar/Category.php","tests/data/ar/Customer.php","tests/data/ar/CustomerQuery.php","tests/data/ar/CustomerWithAlias.php","tests/data/ar/DefaultPk.php","tests/data/ar/Item.php","tests/data/ar/NullValues.php","tests/data/ar/Order.php","tests/data/ar/OrderItem.php","tests/data/ar/OrderWithConstructor.php","tests/data/ar/TestTrigger.php","tests/data/ar/Type.php"],"solution_diff":"diff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\nindex 7472cfe7068..158862635cb 100644\n--- a/tests/data/ar/Category.php\n+++ b/tests/data/ar/Category.php\n@@ -13,6 +13,11 @@\n *\n * @property int $id\n * @property string $name\n+ *\n+ * @property-read Item[] $items\n+ * @property-read Item[] $limitedItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read Order[] $orders\n */\n class Category extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\nindex 92321e8aa77..c3d78850105 100644\n--- a/tests/data/ar/Customer.php\n+++ b/tests/data/ar/Customer.php\n@@ -21,8 +21,21 @@\n * @property string $email\n * @property string $address\n * @property int $status\n+ * @property 1|0|'1'|'0'|bool $bool_status\n *\n * @method static CustomerQuery findBySql($sql, $params = [])\n+ *\n+ * @property-read Profile $profile\n+ * @property-read Order[] $ordersPlain\n+ * @property-read Order[] $orders\n+ * @property-read Order[] $expensiveOrders\n+ * @property-read Order[] $ordersWithItems\n+ * @property-read Order[] $expensiveOrdersWithNullFK\n+ * @property-read Order[] $ordersWithNullFK\n+ * @property-read Order[] $orders2\n+ * @property-read Item[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read Item[] $items\n */\n class Customer extends ActiveRecord\n {\n@@ -109,7 +122,7 @@ public function afterSave($insert, $changedAttributes): void\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\nindex c1447148e2d..21db28c8856 100644\n--- a/tests/data/ar/CustomerQuery.php\n+++ b/tests/data/ar/CustomerQuery.php\n@@ -14,7 +14,8 @@\n \n /**\n * CustomerQuery.\n- * @extends ActiveQuery<CustomerWithAlias>\n+ * @template TModel of Customer = Customer\n+ * @extends ActiveQuery<TModel>\n */\n class CustomerQuery extends ActiveQuery\n {\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\nindex 99b78c1a300..81c766ae5e4 100644\n--- a/tests/data/ar/CustomerWithAlias.php\n+++ b/tests/data/ar/CustomerWithAlias.php\n@@ -2,34 +2,11 @@\n \n namespace yiiunit\\data\\ar;\n \n-/**\n- * Class Customer.\n- *\n- * @property int $id\n- * @property string $name\n- * @property string $email\n- * @property string $address\n- * @property int $status\n- *\n- * @method static CustomerQuery findBySql($sql, $params = [])\n- */\n-class CustomerWithAlias extends ActiveRecord\n+class CustomerWithAlias extends Customer\n {\n- public const STATUS_ACTIVE = 1;\n- public const STATUS_INACTIVE = 2;\n-\n- public $status2;\n-\n- public $sumTotal;\n-\n- public static function tableName()\n- {\n- return 'customer';\n- }\n-\n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\nindex 7c66ed78f14..ce265ef98fa 100644\n--- a/tests/data/ar/DefaultPk.php\n+++ b/tests/data/ar/DefaultPk.php\n@@ -13,6 +13,7 @@\n *\n * @author Jan Waล <janek.jan@gmail.com>\n * @property int $id\n+ * @property string $type\n */\n class DefaultPk extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\nindex cfd8345eb46..ff41d1da8a8 100644\n--- a/tests/data/ar/Item.php\n+++ b/tests/data/ar/Item.php\n@@ -14,6 +14,8 @@\n * @property int $id\n * @property string $name\n * @property int $category_id\n+ *\n+ * @property-read Category $category\n */\n class Item extends ActiveRecord\n {\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\nindex ea9307e505b..c62f750eda6 100644\n--- a/tests/data/ar/NullValues.php\n+++ b/tests/data/ar/NullValues.php\n@@ -12,10 +12,10 @@\n * Class NullValues.\n *\n * @property int $id\n- * @property int $var1\n- * @property int $var2\n- * @property int $var3\n- * @property string $stringcol\n+ * @property int|null $var1\n+ * @property int|null $var2\n+ * @property int|null $var3\n+ * @property string|null $stringcol\n */\n class NullValues extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\nindex 57c26a5aaeb..e2ebf0f462f 100644\n--- a/tests/data/ar/Order.php\n+++ b/tests/data/ar/Order.php\n@@ -18,9 +18,34 @@\n * @property int $created_at\n * @property string $total\n *\n+ * @property-read Customer $customer\n+ * @property-read Customer $customer2\n+ * @property-read Customer $virtualCustomer\n+ * @property-read Customer $customerJoinedWithProfile\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\n+ * @property-read Item[] $books\n+ * @property-read Item[] $books2\n+ * @property-read Item[] $booksExplicit\n+ * @property-read Item[] $booksExplicitA\n+ * @property-read Item[] $bookItems\n+ * @property-read Item[] $booksViaTable\n+ * @property-read Item[] $booksWithNullFK\n+ * @property-read Item[] $booksWithNullFKViaTable\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\n * @property-read Item[] $cheapItemsUsingViaWithCallable\n+ * @property-read Item[] $items\n * @property-read Item[] $itemsFor8\n+ * @property-read Item[] $itemsIndexed\n+ * @property-read Item[] $itemsInOrder1\n+ * @property-read Item[] $itemsInOrder2\n+ * @property-read Item[] $itemsWithNullFK\n+ * @property-read Item[] $limitedItems\n+ * @property-read Item[] $movieItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read OrderItem[] $orderItems3\n+ * @property-read OrderItem[] $orderItemsWithNullFK\n+ * @property-read OrderItem[] $quantityOrderItems\n */\n class Order extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\nindex 65747e34444..46446b0c1fc 100644\n--- a/tests/data/ar/OrderItem.php\n+++ b/tests/data/ar/OrderItem.php\n@@ -17,6 +17,12 @@\n * @property int $item_id\n * @property int $quantity\n * @property string $subtotal\n+ *\n+ * @property Order $order\n+ * @property Item $item\n+ * @property self $orderItemCompositeWithJoin\n+ * @property self $orderItemCompositeNoJoin\n+ * @property Order $custom\n */\n class OrderItem extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\nindex 2da91a170a9..e4f8c34c66d 100644\n--- a/tests/data/ar/OrderWithConstructor.php\n+++ b/tests/data/ar/OrderWithConstructor.php\n@@ -20,7 +20,7 @@\n * @property int $created_at\n * @property string $total\n *\n- * @property OrderItemWithConstructor $orderItems\n+ * @property OrderItemWithConstructor[] $orderItems\n * @property CustomerWithConstructor $customer\n * @property CustomerWithConstructor $customerJoinedWithProfile\n */\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\nindex d384f0a4f94..247913ed80c 100644\n--- a/tests/data/ar/TestTrigger.php\n+++ b/tests/data/ar/TestTrigger.php\n@@ -13,6 +13,7 @@\n *\n * @property int $id\n * @property string $stringcol\n+ * @property mixed $RV\n */\n class TestTrigger extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\nindex 2ad398d5994..abc952f3277 100644\n--- a/tests/data/ar/Type.php\n+++ b/tests/data/ar/Type.php\n@@ -11,19 +11,20 @@\n /**\n * Model representing type table.\n *\n+ * @property string $bigint_col\n * @property int $int_col\n * @property int $int_col2 DEFAULT 1\n * @property int $smallint_col DEFAULT 1\n * @property string $char_col\n * @property string $char_col2 DEFAULT 'something'\n * @property string $char_col3\n- * @property float $float_col\n+ * @property float|numeric-string $float_col\n * @property float $float_col2 DEFAULT '1.23'\n * @property string $blob_col\n * @property float $numeric_col DEFAULT '33.22'\n * @property string $time DEFAULT '2002-01-01 00:00:00'\n- * @property bool $bool_col\n- * @property bool $bool_col2 DEFAULT 1\n+ * @property 1|0|'1'|'0'|bool $bool_col\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\n */\n class Type extends ActiveRecord\n {\n","summary":"Edited 12 file(s) in tests/data/ar/"},{"subtask_id":"s5","scope_files":["tests/framework/ar/ActiveRecordTestTrait.php"],"solution_diff":"diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\nindex b62f2578306..1f31724a1eb 100644\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\n@@ -11,7 +11,6 @@\n use yiiunit\\extensions\\redis\\ActiveRecordTest;\n use Exception;\n use yii\\base\\Event;\n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\BaseActiveRecord;\n use yii\\db\\Expression;\n use yiiunit\\data\\ar\\Customer;\n@@ -25,36 +24,43 @@\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\n * in the extensions.\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\n+ *\n+ * @phpstan-require-extends TestCase\n */\n trait ActiveRecordTestTrait\n {\n- /** @var TestCase $this */\n /**\n * This method should return the classname of Customer class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getCustomerClass();\n \n /**\n * This method should return the classname of Order class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderClass();\n \n /**\n * This method should return the classname of OrderItem class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderItemClass();\n \n /**\n * This method should return the classname of Item class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getItemClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderWithNullFKClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderItemWithNullFKmClass();\n \n /**\n@@ -66,9 +72,7 @@ public function afterSave()\n \n public function testFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // find one\n $result = $customerClass::find();\n $this->assertInstanceOf('\\\\yii\\\\db\\\\ActiveQueryInterface', $result);\n@@ -129,7 +133,6 @@ public function testFind(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\n \n public function testHasAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n $customer = new $customerClass();\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\n \n public function testFindScalar(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // query scalar\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\n $this->assertEquals('user2', $customerName);\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\n \n public function testFindColumn(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\n }\n \n public function testFindIndexBy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\n $this->assertCount(3, $customers);\n@@ -234,10 +230,8 @@ public function testFindIndexBy(): void\n \n public function testFindIndexByAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy + asArray\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\n $this->assertCount(3, $customers);\n@@ -281,9 +275,7 @@ public function testFindIndexByAsArray(): void\n \n public function testRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $this->assertFalse($customer->refresh());\n \n@@ -295,12 +287,9 @@ public function testRefresh(): void\n \n public function testEquals(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customerA = new $customerClass();\n $customerB = new $customerClass();\n $this->assertFalse($customerA->equals($customerB));\n@@ -323,10 +312,8 @@ public function testEquals(): void\n \n public function testFindCount(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(3, $customerClass::find()->count());\n \n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\n@@ -343,10 +330,8 @@ public function testFindCount(): void\n \n public function testFindLimit(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // all()\n $customers = $customerClass::find()->all();\n $this->assertCount(3, $customers);\n@@ -390,10 +375,8 @@ public function testFindLimit(): void\n \n public function testFindComplexCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\n \n@@ -406,10 +389,8 @@ public function testFindComplexCondition(): void\n \n public function testFindNullValues(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $customer->name = null;\n $customer->save(false);\n@@ -422,10 +403,8 @@ public function testFindNullValues(): void\n \n public function testExists(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\n@@ -438,10 +417,8 @@ public function testExists(): void\n \n public function testFindLazy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertFalse($customer->isRelationPopulated('orders'));\n $orders = $customer->orders;\n@@ -466,12 +443,9 @@ public function testFindLazy(): void\n \n public function testFindEager(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -503,10 +477,8 @@ public function testFindEager(): void\n \n public function testFindLazyVia(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $this->assertEquals(1, $order->id);\n@@ -517,10 +489,8 @@ public function testFindLazyVia(): void\n \n public function testFindLazyVia2(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $order->id = 100;\n@@ -529,10 +499,8 @@ public function testFindLazyVia2(): void\n \n public function testFindEagerViaRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\n $this->assertCount(3, $orders);\n $order = $orders[0];\n@@ -545,10 +513,8 @@ public function testFindEagerViaRelation(): void\n \n public function testFindNestedRelation(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -582,10 +548,8 @@ public function testFindNestedRelation(): void\n */\n public function testFindEagerViaRelationPreserveOrder(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n /*\n Item (name, category_id)\n@@ -645,7 +609,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\n // different order in via table\n public function testFindEagerViaRelationPreserveOrderB(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\n@@ -675,21 +638,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\n \n public function testLink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n \n // has many\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer->link('orders', $order);\n $this->afterSave();\n@@ -700,7 +658,7 @@ public function testLink(): void\n \n // belongs to\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer = $customerClass::findOne(1);\n $this->assertNull($order->customer);\n@@ -728,16 +686,11 @@ public function testLink(): void\n \n public function testUnlink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many without delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->ordersWithNullFK);\n@@ -779,20 +732,13 @@ public function testUnlink(): void\n \n public function testUnlinkAll(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many with delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n@@ -845,11 +791,7 @@ public function testUnlinkAll(): void\n \n public function testUnlinkAllAndConditionSetNull(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderWithNullFKClass();\n \n // in this test all orders are owned by customer 1\n@@ -871,11 +813,7 @@ public function testUnlinkAllAndConditionSetNull(): void\n \n public function testUnlinkAllAndConditionDelete(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n \n // in this test all orders are owned by customer 1\n@@ -900,9 +838,7 @@ public function testUnlinkAllAndConditionDelete(): void\n \n public function testInsert(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->email = 'user4@example.com';\n $customer->name = 'user4';\n@@ -924,9 +860,7 @@ public function testInsert(): void\n \n public function testExplicitPkOnAutoIncrement(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->id = 1337;\n $customer->email = 'user1337@example.com';\n@@ -943,9 +877,7 @@ public function testExplicitPkOnAutoIncrement(): void\n \n public function testUpdate(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // save\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n@@ -986,9 +918,7 @@ public function testUpdate(): void\n \n public function testUpdateAttributes(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1021,9 +951,7 @@ public function testUpdateAttributes(): void\n \n public function testUpdateCounters(): void\n {\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // updateCounters\n $pk = ['order_id' => 2, 'item_id' => 4];\n $orderItem = $orderItemClass::findOne($pk);\n@@ -1052,9 +980,7 @@ public function testUpdateCounters(): void\n \n public function testDelete(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // delete\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1084,23 +1010,21 @@ public function testDelete(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = true;\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(1, $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = false;\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(0, $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['status' => true])->all();\n $this->assertCount(2, $customers);\n@@ -1111,11 +1035,8 @@ public function testBooleanAttribute(): void\n \n public function testAfterFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterFindCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\n@@ -1147,6 +1068,7 @@ public function testAfterFind(): void\n ], $afterFindCalls);\n $afterFindCalls = [];\n \n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\n } else {\n@@ -1168,9 +1090,7 @@ public function testAfterFind(): void\n \n public function testAfterRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterRefreshCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\n@@ -1189,9 +1109,7 @@ public function testAfterRefresh(): void\n \n public function testFindEmptyInCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $customers = $customerClass::find()->where(['id' => [1]])->all();\n $this->assertCount(1, $customers);\n@@ -1208,9 +1126,6 @@ public function testFindEmptyInCondition(): void\n \n public function testFindEagerIndexBy(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n@@ -1233,7 +1148,6 @@ public function testFindEagerIndexBy(): void\n \n public function testAttributeAccess(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $model = new $customerClass();\n \n@@ -1251,8 +1165,6 @@ public function testAttributeAccess(): void\n $baseModel = new $customerClass();\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\n \n-\n- /** @var ActiveRecord $customer */\n $customer = new $customerClass();\n $this->assertInstanceOf($customerClass, $customer);\n \n@@ -1276,8 +1188,8 @@ public function testAttributeAccess(): void\n $this->assertFalse($customer->canSetProperty('orderItems'));\n \n try {\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\n $customer->orderItems = [new $itemClass()];\n $this->fail('setter call above MUST throw Exception');\n } catch (Exception $e) {\n@@ -1297,7 +1209,6 @@ public function testAttributeAccess(): void\n */\n public function testViaWithCallable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n","summary":"Edited 1 file(s) in tests/framework/ar/"},{"subtask_id":"s6","scope_files":["tests/framework/db/ActiveQueryTest.php","tests/framework/db/ActiveRecordTest.php","tests/framework/db/CommandTest.php","tests/framework/db/GetTablesAliasTestTrait.php","tests/framework/db/QueryTest.php","tests/framework/db/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php\nindex 3baa552c7b8..e2293ce38e8 100644\n--- a/tests/framework/db/ActiveQueryTest.php\n+++ b/tests/framework/db/ActiveQueryTest.php\n@@ -294,9 +294,7 @@ public function testGetTableNamesWontFillFrom(): void\n */\n public function testDeeplyNestedTableRelationWith(): void\n {\n- /** @var Category $category */\n $categories = Category::find()->with('orders')->indexBy('id')->all();\n-\n $category = $categories[1];\n $this->assertNotNull($category);\n $orders = $category->orders;\ndiff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php\nindex 4427989a168..fd9cbeda278 100644\n--- a/tests/framework/db/ActiveRecordTest.php\n+++ b/tests/framework/db/ActiveRecordTest.php\n@@ -42,7 +42,6 @@\n use yiiunit\\data\\ar\\CroppedType;\n use yiiunit\\framework\\ar\\ActiveRecordTestTrait;\n use yiiunit\\framework\\db\\cubrid\\ActiveRecordTest as CubridActiveRecordTest;\n-use yiiunit\\TestCase;\n \n abstract class ActiveRecordTest extends DatabaseTestCase\n {\n@@ -57,6 +56,8 @@ protected function setUp(): void\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Customer>\n */\n public function getCustomerClass()\n {\n@@ -65,6 +66,8 @@ public function getCustomerClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Item>\n */\n public function getItemClass()\n {\n@@ -73,6 +76,8 @@ public function getItemClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Order>\n */\n public function getOrderClass()\n {\n@@ -81,6 +86,8 @@ public function getOrderClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItem>\n */\n public function getOrderItemClass()\n {\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\n }\n \n /**\n- * @return string\n+ * {@inheritdoc}\n+ *\n+ * @return class-string<Category>\n */\n public function getCategoryClass()\n {\n@@ -97,6 +106,8 @@ public function getCategoryClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderWithNullFK>\n */\n public function getOrderWithNullFKClass()\n {\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItemWithNullFK>\n */\n public function getOrderItemWithNullFKmClass()\n {\n@@ -154,7 +167,6 @@ public function testFindExists(): void\n \n public function testFindColumn(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\n }\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\n */\n public function testDeeplyNestedTableRelation2(): void\n {\n- /** @var Category $category */\n $category = Category::findOne(1);\n $this->assertNotNull($category);\n $orders = $category->orders;\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\n $record = new NullValues();\n \n // this is to simulate empty html form submission\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var1 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var2 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var3 = '';\n $record->stringcol = '';\n \n@@ -813,33 +827,14 @@ public function testJoinWithEager(): void\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\n }\n \n- public static function aliasMethodProvider(): array\n- {\n- return [\n- ['explicit'], // c\n- // ['querysyntax'], // {{@customer}}\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\n- // later getRelationAlias() could be added\n- ];\n- }\n-\n /**\n * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- * @dataProvider aliasMethodProvider\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n */\n- public function testJoinWithAlias($aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -850,13 +845,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -865,13 +854,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -880,13 +863,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -897,32 +874,15 @@ public function testJoinWithAlias($aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -930,48 +890,35 @@ public function testJoinWithAlias($aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n-\n- // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n+\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with count and query\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $count = $query->count('[[c.id]]');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $count = $query->count('{{@customer}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $count = $query->count($query->applyAlias('customer', 'id'));\n- }\n+ $count = $query->count('[[c.id]]');\n $this->assertEquals(3, $count);\n $orders = $query->all();\n $this->assertCount(3, $orders);\n@@ -980,28 +927,16 @@ public function testJoinWithAlias($aliasMethod): void\n /** @var Order $order */\n $order = Order::findOne(1);\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\n- if ($aliasMethod === 'explicit') {\n- $customer = $customerQuery->where(['o.id' => 1])->one();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\n- }\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\n $this->assertNotNull($customer);\n $this->assertEquals(1, $customer->id);\n \n // join with sub-relation called inside Closure\n $orders = Order::find()->joinWith([\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\n+ 'items' => function (ActiveQuery $q) {\n $q->orderBy('item.id');\n $q->joinWith(['category c']);\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ])->orderBy('order.id')->all();\n $this->assertCount(1, $orders);\n@@ -1393,13 +1328,9 @@ public function testDefaultValues(): void\n \n public function testUnlinkAllViaTable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n // via table with delete\n@@ -1837,7 +1768,6 @@ public function testIndexByAfterLoadingRelations(): void\n */\n public function testNoTablenameReplacement(): void\n {\n- /** @var Customer $customer */\n $class = $this->getCustomerClass();\n $customer = new $class();\n $customer->name = 'Some {{weird}} name';\n@@ -2078,7 +2008,7 @@ public function testResetNotSavedRelation(): void\n {\n $order = new Order();\n $order->customer_id = 1;\n- $order->total = 0;\n+ $order->total = '0';\n \n $orderItem = new OrderItem();\n $order->orderItems;\n@@ -2147,7 +2077,6 @@ public static function providerForUnlinkDelete(): array\n */\n public function testUnlinkWithViaOnCondition($delete, $count): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $order = $orderClass::findOne(2);\n@@ -2158,7 +2087,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\n $this->assertCount(0, $order->itemsFor8);\n $this->assertCount(2, $order->orderItemsWithNullFK);\n \n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\n $this->assertCount(1, $orderItemClass::findAll([\n 'order_id' => 2,\n@@ -2172,7 +2100,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\n \n public function testVirtualRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n $order = $orderClass::findOne(2);\n $order->virtualCustomerId = $order->customer_id;\n@@ -2217,7 +2144,6 @@ public function testGetAttributeLabel($model): void\n public function testLoadRelations(): void\n {\n // Test eager loading relations for multiple primary models using loadRelationsFor().\n- /** @var Customer[] $customers */\n $customers = Customer::find()->all();\n Customer::loadRelationsFor($customers, ['orders.items']);\n foreach ($customers as $customer) {\n@@ -2228,7 +2154,6 @@ public function testLoadRelations(): void\n }\n \n // Test eager loading relations as arrays.\n- /** @var array $customers */\n $customers = Customer::find()->asArray(true)->all();\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\n $query->asArray(false);\ndiff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php\nindex 38b5ac5d5b8..ada47dd1067 100644\n--- a/tests/framework/db/CommandTest.php\n+++ b/tests/framework/db/CommandTest.php\n@@ -17,11 +17,13 @@\n use ArrayObject;\n use yii\\caching\\ArrayCache;\n use yii\\db\\Connection;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DataReader;\n use yii\\db\\Exception;\n use yii\\db\\Expression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\TableSchema;\n \n abstract class CommandTest extends DatabaseTestCase\n {\n@@ -293,7 +295,7 @@ public function testFetchMode(): void\n // FETCH_NUM, customized in query method\n $sql = 'SELECT * FROM {{customer}}';\n $command = $db->createCommand($sql);\n- $result = $command->queryOne([], PDO::FETCH_NUM);\n+ $result = $command->queryOne(PDO::FETCH_NUM);\n $this->assertTrue(\\is_array($result) && isset($result[0]));\n }\n \n@@ -668,6 +670,9 @@ public function testInsertExpression(): void\n break;\n case 'oci':\n $expression = 'EXTRACT(YEAR FROM sysdate)';\n+ break;\n+ default:\n+ $this->fail(\"Unexpected driver name: {$this->driverName}\");\n }\n \n $command = $db->createCommand();\n@@ -1111,8 +1116,8 @@ public static function addPrimaryKeyProvider(): array\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1126,15 +1131,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\n ],\n )->execute();\n \n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\n-\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\n \n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\n-\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1180,8 +1186,8 @@ public static function addForeignKeyProvider(): array\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1199,7 +1205,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->addForeignKey(\n $name,\n@@ -1209,12 +1216,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n (array) $refColumns,\n )->execute();\n \n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\n \n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1235,32 +1243,40 @@ public function testCreateDropIndex(): void\n 'int2' => 'integer not null',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n+\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n }\n \n public static function addUniqueProvider(): array\n@@ -1297,8 +1313,8 @@ public static function addUniqueProvider(): array\n public function testAddDropUnique(string $name, string $tableName, $columns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1312,15 +1328,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\n-\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\n \n $db->createCommand()->dropUnique($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1337,6 +1354,7 @@ public function testAddDropCheck(): void\n $name = 'test_ck_constraint';\n \n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1347,18 +1365,16 @@ public function testAddDropCheck(): void\n ['int1' => 'integer'],\n )->execute();\n \n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n \n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\n-\n- $this->assertMatchesRegularExpression(\n- '/^.*int1.*>.*1.*$/',\n- $schema->getTableChecks($tableName, true)[0]->expression\n- );\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\n \n $db->createCommand()->dropCheck($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n }\n \n public function testAddDropDefaultValue(): void\n@@ -1427,7 +1443,7 @@ public function testQueryCache(): void\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n \n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n- $db->cache(function (Connection $db) use ($command, $update) {\n+ $db->cache(function (Connection $db) use ($command) {\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n }, 10);\n@@ -1539,40 +1555,50 @@ public function testAutoRefreshTableSchema(): void\n $tableName = 'test';\n $fkName = 'test_fk';\n \n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\n+ $schema = $db->getSchema();\n+\n+ if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n }\n \n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n \n $db->createCommand()->createTable($tableName, [\n 'id' => 'pk',\n 'fk' => 'int',\n 'name' => 'string',\n ])->execute();\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\n+ $initialSchema = $schema->getTableSchema($tableName);\n $this->assertNotNull($initialSchema);\n \n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\n+ $newSchema = $schema->getTableSchema($tableName);\n $this->assertNotEquals($initialSchema, $newSchema);\n \n if ($this->driverName !== 'sqlite') {\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\n \n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\n }\n \n $db->createCommand()->dropTable($tableName)->execute();\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n }\n \n public function testTransaction(): void\ndiff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\nindex 33450c53377..89d5e0811e6 100644\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\n public function testGetTableNamesIsFromObjectGenerateException(): void\n {\n $query = $this->createQuery();\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $query->from = new stdClass();\n \n $this->expectException('\\yii\\base\\InvalidConfigException');\ndiff --git a/tests/framework/db/QueryTest.php b/tests/framework/db/QueryTest.php\nindex 6b007abe40d..f81bbfc7b0e 100644\n--- a/tests/framework/db/QueryTest.php\n+++ b/tests/framework/db/QueryTest.php\n@@ -722,7 +722,7 @@ public function testQueryCache(): void\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\n \n- $db->cache(function (Connection $db) use ($query, $update) {\n+ $db->cache(function (Connection $db) use ($query) {\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\n }, 10);\ndiff --git a/tests/framework/db/SchemaTest.php b/tests/framework/db/SchemaTest.php\nindex ac722ae0625..a2eec6443cd 100644\n--- a/tests/framework/db/SchemaTest.php\n+++ b/tests/framework/db/SchemaTest.php\n@@ -18,6 +18,7 @@\n use yii\\db\\Expression;\n use yii\\db\\ForeignKeyConstraint;\n use yii\\db\\IndexConstraint;\n+use yii\\db\\pgsql\\ColumnSchema as PgsqlColumnSchema;\n use yii\\db\\Schema;\n use yii\\db\\TableSchema;\n \n@@ -121,10 +122,7 @@ public function testGetNonExistingTableSchema(): void\n \n public function testSchemaCache(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $schema->db->enableSchemaCache = true;\n@@ -536,6 +534,7 @@ public function testColumnSchema(): void\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \"defaultValue of column $name does not match.\");\n }\n if (isset($expected['dimension'])) { // PgSQL only\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\n $this->assertSame($expected['dimension'], $column->dimension, \"dimension of column $name does not match\");\n }\n }\n","summary":"Edited 6 file(s) in tests/framework/db/"},{"subtask_id":"s7","scope_files":["tests/framework/db/cubrid/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/cubrid/SchemaTest.php b/tests/framework/db/cubrid/SchemaTest.php\nindex 2855a6733a8..3e405371f2c 100644\n--- a/tests/framework/db/cubrid/SchemaTest.php\n+++ b/tests/framework/db/cubrid/SchemaTest.php\n@@ -91,7 +91,7 @@ public static function constraintsProvider(): array\n {\n $result = parent::constraintsProvider();\n foreach ($result as $name => $constraints) {\n- $result[$name][2] = static::convertPropertiesToAnycase($constraints[2]);\n+ $result[$name][2] = self::convertPropertiesToAnycase($constraints[2]);\n }\n $result['1: check'][2] = false;\n unset($result['1: index'][2][0]);\n@@ -118,7 +118,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\n if (!$isProperty && \\is_array($object)) {\n $result = [];\n foreach ($object as $name => $value) {\n- $result[] = static::convertPropertiesToAnycase($value);\n+ $result[] = self::convertPropertiesToAnycase($value);\n }\n \n return $result;\n@@ -126,7 +126,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\n \n if (\\is_object($object)) {\n foreach (array_keys((array) $object) as $name) {\n- $object->$name = static::convertPropertiesToAnycase($object->$name, true);\n+ $object->$name = self::convertPropertiesToAnycase($object->$name, true);\n }\n } elseif (\\is_array($object) || \\is_string($object)) {\n $object = new AnyCaseValue($object);\n","summary":"Edited 1 file(s) in tests/framework/db/cubrid/"},{"subtask_id":"s8","scope_files":["tests/framework/db/mssql/ActiveRecordTest.php","tests/framework/db/mssql/CommandTest.php","tests/framework/db/mssql/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\nindex ccb2b150652..df957efeabd 100644\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\n@@ -50,10 +50,10 @@ public function testCastValues(): void\n $this->assertSame('1337', trim((string) $model->char_col));\n $this->assertSame('test', $model->char_col2);\n $this->assertSame('test123', $model->char_col3);\n- //$this->assertSame(3.742, $model->float_col);\n- //$this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame('3.742', $model->float_col);\n+ $this->assertSame(42.1337, $model->float_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n /**\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\nindex 9198054fa74..162d2a436f5 100644\n--- a/tests/framework/db/mssql/CommandTest.php\n+++ b/tests/framework/db/mssql/CommandTest.php\n@@ -114,12 +114,16 @@ public function testAddDropDefaultValue(): void\n 'int1' => 'integer',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n+\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\n \n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n }\n \n public static function batchInsertSqlProvider(): array\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 03e58a4fa6d..9927879e94b 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,6 +10,7 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Constraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n use yii\\db\\mssql\\TableSchema;\n@@ -50,10 +51,7 @@ public static function constraintsProvider(): array\n \n public function testGetStringFieldsSize(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $columns = $schema->getTableSchema('type', false)->columns;\n@@ -80,6 +78,8 @@ public function testGetStringFieldsSize(): void\n $expectedSize = null;\n $expectedDbType = 'text';\n break;\n+ default:\n+ $this->fail(\"Unexpected column name: {$name}\");\n }\n \n $this->assertEquals($expectedType, $type);\n@@ -328,6 +328,8 @@ public function testResolveTableNames(\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n+\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n $this->assertNotEmpty($primaryKeys);\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n@@ -359,6 +361,8 @@ public function testInsertWithCompositePrimaryKey(): void\n public function testGetViewNamesWithDefaultSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(Schema::class, $schema);\n+\n $viewNames = $schema->getViewNames();\n $this->assertContains('animal_view', $viewNames);\n }\n","summary":"Edited 3 file(s) in tests/framework/db/mssql/"},{"subtask_id":"s9","scope_files":["tests/framework/db/mysql/ActiveRecordTest.php","tests/framework/db/mysql/CommandTest.php"],"solution_diff":"diff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\nindex 1509a57fc9b..65d5793c02d 100644\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\n@@ -44,8 +44,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n public function testJsonColumn(): void\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\nindex f77f6122607..a98f07d8fbd 100644\n--- a/tests/framework/db/mysql/CommandTest.php\n+++ b/tests/framework/db/mysql/CommandTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\db\\mysql;\n \n+use yii\\db\\ConstraintFinderInterface;\n+\n /**\n * @group db\n * @group mysql\n@@ -28,6 +30,7 @@ public function testAddDropCheckSeveral(): void\n \n $tableName = 'test_ck_several';\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n","summary":"Edited 2 file(s) in tests/framework/db/mysql/"},{"subtask_id":"s10","scope_files":["tests/framework/db/mysql/connection/DeadLockTest.php"],"solution_diff":"diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\nindex ed6bb74cecd..8008c52266e 100644\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\n@@ -284,6 +284,8 @@ private function childrenUpdateLocked()\n * In case of error in child process its execution bubbles up to phpunit to continue\n * all the rest tests. So, all the rest tests in this case will run both in the child\n * and parent processes. Such mess must be prevented with child's own error handler.\n+ *\n+ * @phpstan-impure\n */\n private function setErrorHandler(): void\n {\n","summary":"Edited 1 file(s) in tests/framework/db/mysql/connection/"},{"subtask_id":"s11","scope_files":["tests/framework/db/oci/ActiveRecordTest.php","tests/framework/db/oci/CommandTest.php","tests/framework/db/oci/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\nindex 98be9d4b110..693ffd3e845 100644\n--- a/tests/framework/db/oci/ActiveRecordTest.php\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\n@@ -8,7 +8,6 @@\n \n namespace yiiunit\\framework\\db\\oci;\n \n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\ActiveQuery;\n use yiiunit\\data\\ar\\BitValues;\n use yiiunit\\data\\ar\\DefaultPk;\n@@ -50,8 +49,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- $this->assertEquals('1', $model->bool_col);\n- $this->assertEquals('0', $model->bool_col2);\n+ $this->assertSame('1', $model->bool_col);\n+ $this->assertSame('0', $model->bool_col2);\n }\n \n public function testDefaultValues(): void\n@@ -81,7 +80,6 @@ public function testDefaultValues(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -156,23 +154,21 @@ public function testBit(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = '1';\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('1', $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = '0';\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('0', $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\n $this->assertCount(2, $customers);\n@@ -181,23 +177,11 @@ public function testBooleanAttribute(): void\n $this->assertCount(1, $customers);\n }\n \n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- * @dataProvider aliasMethodProvider\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n- */\n- public function testJoinWithAlias($aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -208,13 +192,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -223,13 +201,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -238,13 +210,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -255,32 +221,14 @@ public function testJoinWithAlias($aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -288,36 +236,31 @@ public function testJoinWithAlias($aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n }\n }\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\nindex 4d881f93482..54566dd9f0b 100644\n--- a/tests/framework/db/oci/CommandTest.php\n+++ b/tests/framework/db/oci/CommandTest.php\n@@ -150,7 +150,7 @@ public function testQueryCache(): void\n \n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\n \n- $db->cache(function (Connection $db) use ($update) {\n+ $db->cache(function (Connection $db) {\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n \n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\nindex e9edf8e2756..745ba8f8a7d 100644\n--- a/tests/framework/db/oci/SchemaTest.php\n+++ b/tests/framework/db/oci/SchemaTest.php\n@@ -10,6 +10,7 @@\n \n use Exception;\n use yii\\db\\CheckConstraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\framework\\db\\AnyValue;\n \n /**\n@@ -196,7 +197,6 @@ public function testFindUniqueIndexes(): void\n 'someCol3' => 'string',\n ])->execute();\n \n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\n@@ -240,8 +240,10 @@ public function testFindUniqueIndexes(): void\n public function testLobIndexesExcluded(): void\n {\n $db = $this->getConnection();\n+ $dbSchema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\n \n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\n $db->createCommand()->dropTable('lob_test')->execute();\n }\n \n@@ -249,7 +251,7 @@ public function testLobIndexesExcluded(): void\n 'CREATE TABLE \"lob_test\" (\"id\" NUMBER(10) NOT NULL, \"content\" CLOB, \"data\" BLOB, PRIMARY KEY (\"id\"))'\n )->execute();\n \n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\n \n $this->assertCount(1, $indexes);\n \n","summary":"Edited 3 file(s) in tests/framework/db/oci/"},{"subtask_id":"s12","scope_files":["tests/framework/db/pgsql/ActiveFixtureTest.php","tests/framework/db/pgsql/ActiveRecordTest.php","tests/framework/db/pgsql/BaseActiveRecordTest.php"],"solution_diff":"diff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\nindex 281874d55e3..5c8f4a99398 100644\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\n@@ -8,7 +8,9 @@\n \n namespace yiiunit\\framework\\db\\pgsql;\n \n+use yiiunit\\data\\ar\\Customer;\n use yiiunit\\framework\\test\\CustomerDbTestCase;\n+use yiiunit\\framework\\test\\CustomerFixture;\n \n /**\n * @group db\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\n $test = new CustomerDbTestCase();\n $test->setUp();\n $fixture = $test->getFixture('customers');\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n \n $sequenceName = $fixture->getTableSchema()->sequenceName;\n $sequenceNextVal = $this->getConnection()->createCommand(\"SELECT currval('$sequenceName')\")->queryScalar();\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\n+\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\n \n $test->tearDown();\n }\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 545b6808165..6d149c9995b 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\yiiunit\\framework\\db\\ActiveRecordTest\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -316,6 +318,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n public const STATUS_DELETED = 0;\n@@ -337,12 +351,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\nindex c0af29e83f1..dad892a4749 100644\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\n@@ -38,8 +38,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array json_col\n+ * @property int $id\n+ * @property array $json_col\n */\n class ArrayAndJsonType extends ActiveRecord\n {\n","summary":"Edited 3 file(s) in tests/framework/db/pgsql/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan-baseline-7x.neon\",\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon\\nindex 13be3e5bae1..6be48e7c140 100644\\n--- a/phpstan-baseline-7x.neon\\n+++ b/phpstan-baseline-7x.neon\\n@@ -77,3 +77,39 @@ parameters:\\n \\t\\t\\tidentifier: class.notFound\\n \\t\\t\\tcount: 1\\n \\t\\t\\tpath: tests/framework/behaviors/AttributeTypecastBehaviorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant Off on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\stubs\\\\\\\\IntBackedStatus\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant On on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\stubs\\\\\\\\IntBackedStatus\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\stubs\\\\\\\\StringBackedStatus\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\enums\\\\\\\\Status\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/CommandTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\enums\\\\\\\\StatusTypeInt\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/CommandTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\\\\\framework\\\\\\\\db\\\\\\\\enums\\\\\\\\StatusTypeString\\\\.$#'\\n+\\t\\t\\tidentifier: class.notFound\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/db/CommandTest.php\\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 608efda39af..7e5863e16c0 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -15,10 +15,9 @@ parameters:\\n excludePaths:\\n analyse:\\n - tests/data\\n+ - tests/framework/db/enums\\n - tests/framework/*/stubs/*\\n - tests/framework/*/mocks/*\\n- # TODO: Analyze these directories\\n- - tests/framework/db\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\\n\",\n \"summary\": \"Edited 2 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex a1ae1155dc9..d220536ddb5 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -4,11 +4,13 @@ Yii Framework 2 Change Log\\n 2.0.56 under development\\n ------------------------\\n \\n-- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n-- Enh #20785: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n-- Bug #20785: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n-- Bug #20785: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n+- Enh #20875: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n+- Bug #20875: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n+- Bug #20875: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\\\db\\\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\\n+- Bug #20878: Fix `@var` annotation for `yii\\\\db\\\\Query::$from` (mspirkov)\\n - Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n \\n \\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/db/BaseActiveRecord.php\",\n \"framework/db/Query.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\\nindex 3be60fbd81e..bd1e4ee22d7 100644\\n--- a/framework/db/BaseActiveRecord.php\\n+++ b/framework/db/BaseActiveRecord.php\\n@@ -1817,12 +1817,16 @@ private function isValueDifferent($newValue, $oldValue)\\n * }\\n * ```\\n *\\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\\n+ * @template TModels of array\\n+ *\\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\\n * - an active record instance;\\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\\n * @since 2.0.50\\n+ *\\n+ * @param-out TModels $models\\n */\\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\\n {\\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\\nindex 722bde08705..dbf9ab3b982 100644\\n--- a/framework/db/Query.php\\n+++ b/framework/db/Query.php\\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\\n */\\n public $distinct = false;\\n /**\\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\\n * This is used to construct the FROM clause in a SQL statement.\\n * @see from()\\n */\\n\",\n \"summary\": \"Edited 2 file(s) in framework/db/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/data/ar/Category.php\",\n \"tests/data/ar/Customer.php\",\n \"tests/data/ar/CustomerQuery.php\",\n \"tests/data/ar/CustomerWithAlias.php\",\n \"tests/data/ar/DefaultPk.php\",\n \"tests/data/ar/Item.php\",\n \"tests/data/ar/NullValues.php\",\n \"tests/data/ar/Order.php\",\n \"tests/data/ar/OrderItem.php\",\n \"tests/data/ar/OrderWithConstructor.php\",\n \"tests/data/ar/TestTrigger.php\",\n \"tests/data/ar/Type.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\\nindex 7472cfe7068..158862635cb 100644\\n--- a/tests/data/ar/Category.php\\n+++ b/tests/data/ar/Category.php\\n@@ -13,6 +13,11 @@\\n *\\n * @property int $id\\n * @property string $name\\n+ *\\n+ * @property-read Item[] $items\\n+ * @property-read Item[] $limitedItems\\n+ * @property-read OrderItem[] $orderItems\\n+ * @property-read Order[] $orders\\n */\\n class Category extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\\nindex 92321e8aa77..c3d78850105 100644\\n--- a/tests/data/ar/Customer.php\\n+++ b/tests/data/ar/Customer.php\\n@@ -21,8 +21,21 @@\\n * @property string $email\\n * @property string $address\\n * @property int $status\\n+ * @property 1|0|'1'|'0'|bool $bool_status\\n *\\n * @method static CustomerQuery findBySql($sql, $params = [])\\n+ *\\n+ * @property-read Profile $profile\\n+ * @property-read Order[] $ordersPlain\\n+ * @property-read Order[] $orders\\n+ * @property-read Order[] $expensiveOrders\\n+ * @property-read Order[] $ordersWithItems\\n+ * @property-read Order[] $expensiveOrdersWithNullFK\\n+ * @property-read Order[] $ordersWithNullFK\\n+ * @property-read Order[] $orders2\\n+ * @property-read Item[] $orderItems\\n+ * @property-read OrderItem[] $orderItems2\\n+ * @property-read Item[] $items\\n */\\n class Customer extends ActiveRecord\\n {\\n@@ -109,7 +122,7 @@ public function afterSave($insert, $changedAttributes): void\\n \\n /**\\n * {@inheritdoc}\\n- * @return CustomerQuery\\n+ * @return CustomerQuery<static>\\n */\\n public static function find()\\n {\\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\\nindex c1447148e2d..21db28c8856 100644\\n--- a/tests/data/ar/CustomerQuery.php\\n+++ b/tests/data/ar/CustomerQuery.php\\n@@ -14,7 +14,8 @@\\n \\n /**\\n * CustomerQuery.\\n- * @extends ActiveQuery<CustomerWithAlias>\\n+ * @template TModel of Customer = Customer\\n+ * @extends ActiveQuery<TModel>\\n */\\n class CustomerQuery extends ActiveQuery\\n {\\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\\nindex 99b78c1a300..81c766ae5e4 100644\\n--- a/tests/data/ar/CustomerWithAlias.php\\n+++ b/tests/data/ar/CustomerWithAlias.php\\n@@ -2,34 +2,11 @@\\n \\n namespace yiiunit\\\\data\\\\ar;\\n \\n-/**\\n- * Class Customer.\\n- *\\n- * @property int $id\\n- * @property string $name\\n- * @property string $email\\n- * @property string $address\\n- * @property int $status\\n- *\\n- * @method static CustomerQuery findBySql($sql, $params = [])\\n- */\\n-class CustomerWithAlias extends ActiveRecord\\n+class CustomerWithAlias extends Customer\\n {\\n- public const STATUS_ACTIVE = 1;\\n- public const STATUS_INACTIVE = 2;\\n-\\n- public $status2;\\n-\\n- public $sumTotal;\\n-\\n- public static function tableName()\\n- {\\n- return 'customer';\\n- }\\n-\\n /**\\n * {@inheritdoc}\\n- * @return CustomerQuery\\n+ * @return CustomerQuery<static>\\n */\\n public static function find()\\n {\\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\\nindex 7c66ed78f14..ce265ef98fa 100644\\n--- a/tests/data/ar/DefaultPk.php\\n+++ b/tests/data/ar/DefaultPk.php\\n@@ -13,6 +13,7 @@\\n *\\n * @author Jan Waล <janek.jan@gmail.com>\\n * @property int $id\\n+ * @property string $type\\n */\\n class DefaultPk extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\\nindex cfd8345eb46..ff41d1da8a8 100644\\n--- a/tests/data/ar/Item.php\\n+++ b/tests/data/ar/Item.php\\n@@ -14,6 +14,8 @@\\n * @property int $id\\n * @property string $name\\n * @property int $category_id\\n+ *\\n+ * @property-read Category $category\\n */\\n class Item extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\\nindex ea9307e505b..c62f750eda6 100644\\n--- a/tests/data/ar/NullValues.php\\n+++ b/tests/data/ar/NullValues.php\\n@@ -12,10 +12,10 @@\\n * Class NullValues.\\n *\\n * @property int $id\\n- * @property int $var1\\n- * @property int $var2\\n- * @property int $var3\\n- * @property string $stringcol\\n+ * @property int|null $var1\\n+ * @property int|null $var2\\n+ * @property int|null $var3\\n+ * @property string|null $stringcol\\n */\\n class NullValues extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\\nindex 57c26a5aaeb..e2ebf0f462f 100644\\n--- a/tests/data/ar/Order.php\\n+++ b/tests/data/ar/Order.php\\n@@ -18,9 +18,34 @@\\n * @property int $created_at\\n * @property string $total\\n *\\n+ * @property-read Customer $customer\\n+ * @property-read Customer $customer2\\n+ * @property-read Customer $virtualCustomer\\n+ * @property-read Customer $customerJoinedWithProfile\\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\\n+ * @property-read Item[] $books\\n+ * @property-read Item[] $books2\\n+ * @property-read Item[] $booksExplicit\\n+ * @property-read Item[] $booksExplicitA\\n+ * @property-read Item[] $bookItems\\n+ * @property-read Item[] $booksViaTable\\n+ * @property-read Item[] $booksWithNullFK\\n+ * @property-read Item[] $booksWithNullFKViaTable\\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\\n * @property-read Item[] $cheapItemsUsingViaWithCallable\\n+ * @property-read Item[] $items\\n * @property-read Item[] $itemsFor8\\n+ * @property-read Item[] $itemsIndexed\\n+ * @property-read Item[] $itemsInOrder1\\n+ * @property-read Item[] $itemsInOrder2\\n+ * @property-read Item[] $itemsWithNullFK\\n+ * @property-read Item[] $limitedItems\\n+ * @property-read Item[] $movieItems\\n+ * @property-read OrderItem[] $orderItems\\n+ * @property-read OrderItem[] $orderItems2\\n+ * @property-read OrderItem[] $orderItems3\\n+ * @property-read OrderItem[] $orderItemsWithNullFK\\n+ * @property-read OrderItem[] $quantityOrderItems\\n */\\n class Order extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\\nindex 65747e34444..46446b0c1fc 100644\\n--- a/tests/data/ar/OrderItem.php\\n+++ b/tests/data/ar/OrderItem.php\\n@@ -17,6 +17,12 @@\\n * @property int $item_id\\n * @property int $quantity\\n * @property string $subtotal\\n+ *\\n+ * @property Order $order\\n+ * @property Item $item\\n+ * @property self $orderItemCompositeWithJoin\\n+ * @property self $orderItemCompositeNoJoin\\n+ * @property Order $custom\\n */\\n class OrderItem extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\\nindex 2da91a170a9..e4f8c34c66d 100644\\n--- a/tests/data/ar/OrderWithConstructor.php\\n+++ b/tests/data/ar/OrderWithConstructor.php\\n@@ -20,7 +20,7 @@\\n * @property int $created_at\\n * @property string $total\\n *\\n- * @property OrderItemWithConstructor $orderItems\\n+ * @property OrderItemWithConstructor[] $orderItems\\n * @property CustomerWithConstructor $customer\\n * @property CustomerWithConstructor $customerJoinedWithProfile\\n */\\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\\nindex d384f0a4f94..247913ed80c 100644\\n--- a/tests/data/ar/TestTrigger.php\\n+++ b/tests/data/ar/TestTrigger.php\\n@@ -13,6 +13,7 @@\\n *\\n * @property int $id\\n * @property string $stringcol\\n+ * @property mixed $RV\\n */\\n class TestTrigger extends ActiveRecord\\n {\\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\\nindex 2ad398d5994..abc952f3277 100644\\n--- a/tests/data/ar/Type.php\\n+++ b/tests/data/ar/Type.php\\n@@ -11,19 +11,20 @@\\n /**\\n * Model representing type table.\\n *\\n+ * @property string $bigint_col\\n * @property int $int_col\\n * @property int $int_col2 DEFAULT 1\\n * @property int $smallint_col DEFAULT 1\\n * @property string $char_col\\n * @property string $char_col2 DEFAULT 'something'\\n * @property string $char_col3\\n- * @property float $float_col\\n+ * @property float|numeric-string $float_col\\n * @property float $float_col2 DEFAULT '1.23'\\n * @property string $blob_col\\n * @property float $numeric_col DEFAULT '33.22'\\n * @property string $time DEFAULT '2002-01-01 00:00:00'\\n- * @property bool $bool_col\\n- * @property bool $bool_col2 DEFAULT 1\\n+ * @property 1|0|'1'|'0'|bool $bool_col\\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\\n */\\n class Type extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 12 file(s) in tests/data/ar/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/ar/ActiveRecordTestTrait.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\\nindex b62f2578306..1f31724a1eb 100644\\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\\n@@ -11,7 +11,6 @@\\n use yiiunit\\\\extensions\\\\redis\\\\ActiveRecordTest;\\n use Exception;\\n use yii\\\\base\\\\Event;\\n-use yii\\\\db\\\\ActiveRecordInterface;\\n use yii\\\\db\\\\BaseActiveRecord;\\n use yii\\\\db\\\\Expression;\\n use yiiunit\\\\data\\\\ar\\\\Customer;\\n@@ -25,36 +24,43 @@\\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\\n * in the extensions.\\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\\n+ *\\n+ * @phpstan-require-extends TestCase\\n */\\n trait ActiveRecordTestTrait\\n {\\n- /** @var TestCase $this */\\n /**\\n * This method should return the classname of Customer class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getCustomerClass();\\n \\n /**\\n * This method should return the classname of Order class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getOrderClass();\\n \\n /**\\n * This method should return the classname of OrderItem class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getOrderItemClass();\\n \\n /**\\n * This method should return the classname of Item class.\\n- * @return string\\n+ * @return class-string<BaseActiveRecord>\\n */\\n abstract public function getItemClass();\\n \\n+ /**\\n+ * @return class-string<BaseActiveRecord>\\n+ */\\n abstract public function getOrderWithNullFKClass();\\n \\n+ /**\\n+ * @return class-string<BaseActiveRecord>\\n+ */\\n abstract public function getOrderItemWithNullFKmClass();\\n \\n /**\\n@@ -66,9 +72,7 @@ public function afterSave()\\n \\n public function testFind(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // find one\\n $result = $customerClass::find();\\n $this->assertInstanceOf('\\\\\\\\yii\\\\\\\\db\\\\\\\\ActiveQueryInterface', $result);\\n@@ -129,7 +133,6 @@ public function testFind(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\\n \\n public function testHasAttribute(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n $customer = new $customerClass();\\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\\n \\n public function testFindScalar(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // query scalar\\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\\n $this->assertEquals('user2', $customerName);\\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\\n \\n public function testFindColumn(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\\n }\\n \\n public function testFindIndexBy(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // indexBy\\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\\n $this->assertCount(3, $customers);\\n@@ -234,10 +230,8 @@ public function testFindIndexBy(): void\\n \\n public function testFindIndexByAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // indexBy + asArray\\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\\n $this->assertCount(3, $customers);\\n@@ -281,9 +275,7 @@ public function testFindIndexByAsArray(): void\\n \\n public function testRefresh(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $this->assertFalse($customer->refresh());\\n \\n@@ -295,12 +287,9 @@ public function testRefresh(): void\\n \\n public function testEquals(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customerA = new $customerClass();\\n $customerB = new $customerClass();\\n $this->assertFalse($customerA->equals($customerB));\\n@@ -323,10 +312,8 @@ public function testEquals(): void\\n \\n public function testFindCount(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(3, $customerClass::find()->count());\\n \\n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\\n@@ -343,10 +330,8 @@ public function testFindCount(): void\\n \\n public function testFindLimit(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // all()\\n $customers = $customerClass::find()->all();\\n $this->assertCount(3, $customers);\\n@@ -390,10 +375,8 @@ public function testFindLimit(): void\\n \\n public function testFindComplexCondition(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\\n \\n@@ -406,10 +389,8 @@ public function testFindComplexCondition(): void\\n \\n public function testFindNullValues(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $customer->name = null;\\n $customer->save(false);\\n@@ -422,10 +403,8 @@ public function testFindNullValues(): void\\n \\n public function testExists(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\\n@@ -438,10 +417,8 @@ public function testExists(): void\\n \\n public function testFindLazy(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $this->assertFalse($customer->isRelationPopulated('orders'));\\n $orders = $customer->orders;\\n@@ -466,12 +443,9 @@ public function testFindLazy(): void\\n \\n public function testFindEager(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\\n ksort($customers);\\n $this->assertCount(3, $customers);\\n@@ -503,10 +477,8 @@ public function testFindEager(): void\\n \\n public function testFindLazyVia(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Order $order */\\n $order = $orderClass::findOne(1);\\n $this->assertEquals(1, $order->id);\\n@@ -517,10 +489,8 @@ public function testFindLazyVia(): void\\n \\n public function testFindLazyVia2(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Order $order */\\n $order = $orderClass::findOne(1);\\n $order->id = 100;\\n@@ -529,10 +499,8 @@ public function testFindLazyVia2(): void\\n \\n public function testFindEagerViaRelation(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\\n $this->assertCount(3, $orders);\\n $order = $orders[0];\\n@@ -545,10 +513,8 @@ public function testFindEagerViaRelation(): void\\n \\n public function testFindNestedRelation(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\\n ksort($customers);\\n $this->assertCount(3, $customers);\\n@@ -582,10 +548,8 @@ public function testFindNestedRelation(): void\\n */\\n public function testFindEagerViaRelationPreserveOrder(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n /*\\n Item (name, category_id)\\n@@ -645,7 +609,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\\n // different order in via table\\n public function testFindEagerViaRelationPreserveOrderB(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\\n@@ -675,21 +638,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\\n \\n public function testLink(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->orders);\\n \\n // has many\\n $order = new $orderClass();\\n- $order->total = 100;\\n+ $order->total = '100';\\n $this->assertTrue($order->isNewRecord);\\n $customer->link('orders', $order);\\n $this->afterSave();\\n@@ -700,7 +658,7 @@ public function testLink(): void\\n \\n // belongs to\\n $order = new $orderClass();\\n- $order->total = 100;\\n+ $order->total = '100';\\n $this->assertTrue($order->isNewRecord);\\n $customer = $customerClass::findOne(1);\\n $this->assertNull($order->customer);\\n@@ -728,16 +686,11 @@ public function testLink(): void\\n \\n public function testUnlink(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // has many without delete\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->ordersWithNullFK);\\n@@ -779,20 +732,13 @@ public function testUnlink(): void\\n \\n public function testUnlinkAll(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // has many with delete\\n $customer = $customerClass::findOne(2);\\n $this->assertCount(2, $customer->orders);\\n@@ -845,11 +791,7 @@ public function testUnlinkAll(): void\\n \\n public function testUnlinkAllAndConditionSetNull(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var BaseActiveRecord $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderWithNullFKClass();\\n \\n // in this test all orders are owned by customer 1\\n@@ -871,11 +813,7 @@ public function testUnlinkAllAndConditionSetNull(): void\\n \\n public function testUnlinkAllAndConditionDelete(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var BaseActiveRecord $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n // in this test all orders are owned by customer 1\\n@@ -900,9 +838,7 @@ public function testUnlinkAllAndConditionDelete(): void\\n \\n public function testInsert(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->email = 'user4@example.com';\\n $customer->name = 'user4';\\n@@ -924,9 +860,7 @@ public function testInsert(): void\\n \\n public function testExplicitPkOnAutoIncrement(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->id = 1337;\\n $customer->email = 'user1337@example.com';\\n@@ -943,9 +877,7 @@ public function testExplicitPkOnAutoIncrement(): void\\n \\n public function testUpdate(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // save\\n /** @var Customer $customer */\\n $customer = $customerClass::findOne(2);\\n@@ -986,9 +918,7 @@ public function testUpdate(): void\\n \\n public function testUpdateAttributes(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n /** @var Customer $customer */\\n $customer = $customerClass::findOne(2);\\n $this->assertInstanceOf($customerClass, $customer);\\n@@ -1021,9 +951,7 @@ public function testUpdateAttributes(): void\\n \\n public function testUpdateCounters(): void\\n {\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // updateCounters\\n $pk = ['order_id' => 2, 'item_id' => 4];\\n $orderItem = $orderItemClass::findOne($pk);\\n@@ -1052,9 +980,7 @@ public function testUpdateCounters(): void\\n \\n public function testDelete(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n // delete\\n $customer = $customerClass::findOne(2);\\n $this->assertInstanceOf($customerClass, $customer);\\n@@ -1084,23 +1010,21 @@ public function testDelete(): void\\n */\\n public function testBooleanAttribute(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n $customer->email = 'mail@example.com';\\n- $customer->status = true;\\n+ $customer->status = 1;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals(1, $customer->status);\\n+ $this->assertSame(1, $customer->status);\\n \\n- $customer->status = false;\\n+ $customer->status = 0;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals(0, $customer->status);\\n+ $this->assertSame(0, $customer->status);\\n \\n $customers = $customerClass::find()->where(['status' => true])->all();\\n $this->assertCount(2, $customers);\\n@@ -1111,11 +1035,8 @@ public function testBooleanAttribute(): void\\n \\n public function testAfterFind(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var BaseActiveRecord $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $afterFindCalls = [];\\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\\n@@ -1147,6 +1068,7 @@ public function testAfterFind(): void\\n ], $afterFindCalls);\\n $afterFindCalls = [];\\n \\n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\\n } else {\\n@@ -1168,9 +1090,7 @@ public function testAfterFind(): void\\n \\n public function testAfterRefresh(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $afterRefreshCalls = [];\\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\\n@@ -1189,9 +1109,7 @@ public function testAfterRefresh(): void\\n \\n public function testFindEmptyInCondition(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n \\n $customers = $customerClass::find()->where(['id' => [1]])->all();\\n $this->assertCount(1, $customers);\\n@@ -1208,9 +1126,6 @@ public function testFindEmptyInCondition(): void\\n \\n public function testFindEagerIndexBy(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n /** @var Order $order */\\n@@ -1233,7 +1148,6 @@ public function testFindEagerIndexBy(): void\\n \\n public function testAttributeAccess(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $model = new $customerClass();\\n \\n@@ -1251,8 +1165,6 @@ public function testAttributeAccess(): void\\n $baseModel = new $customerClass();\\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\\n \\n-\\n- /** @var ActiveRecord $customer */\\n $customer = new $customerClass();\\n $this->assertInstanceOf($customerClass, $customer);\\n \\n@@ -1276,8 +1188,8 @@ public function testAttributeAccess(): void\\n $this->assertFalse($customer->canSetProperty('orderItems'));\\n \\n try {\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\\n $customer->orderItems = [new $itemClass()];\\n $this->fail('setter call above MUST throw Exception');\\n } catch (Exception $e) {\\n@@ -1297,7 +1209,6 @@ public function testAttributeAccess(): void\\n */\\n public function testViaWithCallable(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n /** @var Order $order */\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/ar/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/framework/db/ActiveQueryTest.php\",\n \"tests/framework/db/ActiveRecordTest.php\",\n \"tests/framework/db/CommandTest.php\",\n \"tests/framework/db/GetTablesAliasTestTrait.php\",\n \"tests/framework/db/QueryTest.php\",\n \"tests/framework/db/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php\\nindex 3baa552c7b8..e2293ce38e8 100644\\n--- a/tests/framework/db/ActiveQueryTest.php\\n+++ b/tests/framework/db/ActiveQueryTest.php\\n@@ -294,9 +294,7 @@ public function testGetTableNamesWontFillFrom(): void\\n */\\n public function testDeeplyNestedTableRelationWith(): void\\n {\\n- /** @var Category $category */\\n $categories = Category::find()->with('orders')->indexBy('id')->all();\\n-\\n $category = $categories[1];\\n $this->assertNotNull($category);\\n $orders = $category->orders;\\ndiff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php\\nindex 4427989a168..fd9cbeda278 100644\\n--- a/tests/framework/db/ActiveRecordTest.php\\n+++ b/tests/framework/db/ActiveRecordTest.php\\n@@ -42,7 +42,6 @@\\n use yiiunit\\\\data\\\\ar\\\\CroppedType;\\n use yiiunit\\\\framework\\\\ar\\\\ActiveRecordTestTrait;\\n use yiiunit\\\\framework\\\\db\\\\cubrid\\\\ActiveRecordTest as CubridActiveRecordTest;\\n-use yiiunit\\\\TestCase;\\n \\n abstract class ActiveRecordTest extends DatabaseTestCase\\n {\\n@@ -57,6 +56,8 @@ protected function setUp(): void\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Customer>\\n */\\n public function getCustomerClass()\\n {\\n@@ -65,6 +66,8 @@ public function getCustomerClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Item>\\n */\\n public function getItemClass()\\n {\\n@@ -73,6 +76,8 @@ public function getItemClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<Order>\\n */\\n public function getOrderClass()\\n {\\n@@ -81,6 +86,8 @@ public function getOrderClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderItem>\\n */\\n public function getOrderItemClass()\\n {\\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\\n }\\n \\n /**\\n- * @return string\\n+ * {@inheritdoc}\\n+ *\\n+ * @return class-string<Category>\\n */\\n public function getCategoryClass()\\n {\\n@@ -97,6 +106,8 @@ public function getCategoryClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderWithNullFK>\\n */\\n public function getOrderWithNullFKClass()\\n {\\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\\n \\n /**\\n * {@inheritdoc}\\n+ *\\n+ * @return class-string<OrderItemWithNullFK>\\n */\\n public function getOrderItemWithNullFKmClass()\\n {\\n@@ -154,7 +167,6 @@ public function testFindExists(): void\\n \\n public function testFindColumn(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\\n }\\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\\n */\\n public function testDeeplyNestedTableRelation2(): void\\n {\\n- /** @var Category $category */\\n $category = Category::findOne(1);\\n $this->assertNotNull($category);\\n $orders = $category->orders;\\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\\n $record = new NullValues();\\n \\n // this is to simulate empty html form submission\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var1 = '';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var2 = '';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $record->var3 = '';\\n $record->stringcol = '';\\n \\n@@ -813,33 +827,14 @@ public function testJoinWithEager(): void\\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\\n }\\n \\n- public static function aliasMethodProvider(): array\\n- {\\n- return [\\n- ['explicit'], // c\\n- // ['querysyntax'], // {{@customer}}\\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\\n- // later getRelationAlias() could be added\\n- ];\\n- }\\n-\\n /**\\n * Tests the alias syntax for joinWith: 'alias' => 'relation'.\\n- * @dataProvider aliasMethodProvider\\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\\n */\\n- public function testJoinWithAlias($aliasMethod): void\\n+ public function testJoinWithAlias(): void\\n {\\n // left join and eager loading\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\\n $this->assertCount(3, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -850,13 +845,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // inner join filtering and eager loading\\n $query = Order::find()->innerJoinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -865,13 +854,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // inner join filtering without eager loading\\n $query = Order::find()->innerJoinWith(['customer c'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -880,13 +863,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // join with via-relation\\n $query = Order::find()->innerJoinWith(['books b']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(1, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -897,32 +874,15 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // joining sub relations\\n $query = Order::find()->innerJoinWith([\\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->orderBy('{{i}}.id');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->orderBy('{{@item}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->orderBy($q->applyAlias('item', 'id'));\\n- }\\n+ 'items i' => function (ActiveQuery $q) {\\n+ $q->orderBy('{{i}}.id');\\n },\\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ 'items.category c' => function (ActiveQuery $q) {\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ]);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('{{i}}.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@item}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\\n- }\\n+\\n+ $orders = $query->orderBy('{{i}}.id')->all();\\n $this->assertCount(1, $orders);\\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\\n $this->assertEquals(2, $orders[0]->id);\\n@@ -930,48 +890,35 @@ public function testJoinWithAlias($aliasMethod): void\\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\\n \\n- // join with ON condition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod);\\n- $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n-\\n- // join with ON condition and alias in relation definition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicit';\\n+ $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n+\\n+ $relationName = 'booksExplicitA';\\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n \\n // join with count and query\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $count = $query->count('[[c.id]]');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $count = $query->count('{{@customer}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $count = $query->count($query->applyAlias('customer', 'id'));\\n- }\\n+ $count = $query->count('[[c.id]]');\\n $this->assertEquals(3, $count);\\n $orders = $query->all();\\n $this->assertCount(3, $orders);\\n@@ -980,28 +927,16 @@ public function testJoinWithAlias($aliasMethod): void\\n /** @var Order $order */\\n $order = Order::findOne(1);\\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $customer = $customerQuery->where(['o.id' => 1])->one();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\\n- }\\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\\n $this->assertNotNull($customer);\\n $this->assertEquals(1, $customer->id);\\n \\n // join with sub-relation called inside Closure\\n $orders = Order::find()->joinWith([\\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\\n+ 'items' => function (ActiveQuery $q) {\\n $q->orderBy('item.id');\\n $q->joinWith(['category c']);\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ])->orderBy('order.id')->all();\\n $this->assertCount(1, $orders);\\n@@ -1393,13 +1328,9 @@ public function testDefaultValues(): void\\n \\n public function testUnlinkAllViaTable(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemClass();\\n- /** @var ActiveRecordInterface $itemClass */\\n $itemClass = $this->getItemClass();\\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\\n \\n // via table with delete\\n@@ -1837,7 +1768,6 @@ public function testIndexByAfterLoadingRelations(): void\\n */\\n public function testNoTablenameReplacement(): void\\n {\\n- /** @var Customer $customer */\\n $class = $this->getCustomerClass();\\n $customer = new $class();\\n $customer->name = 'Some {{weird}} name';\\n@@ -2078,7 +2008,7 @@ public function testResetNotSavedRelation(): void\\n {\\n $order = new Order();\\n $order->customer_id = 1;\\n- $order->total = 0;\\n+ $order->total = '0';\\n \\n $orderItem = new OrderItem();\\n $order->orderItems;\\n@@ -2147,7 +2077,6 @@ public static function providerForUnlinkDelete(): array\\n */\\n public function testUnlinkWithViaOnCondition($delete, $count): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n \\n $order = $orderClass::findOne(2);\\n@@ -2158,7 +2087,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\\n $this->assertCount(0, $order->itemsFor8);\\n $this->assertCount(2, $order->orderItemsWithNullFK);\\n \\n- /** @var ActiveRecordInterface $orderItemClass */\\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\\n $this->assertCount(1, $orderItemClass::findAll([\\n 'order_id' => 2,\\n@@ -2172,7 +2100,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\\n \\n public function testVirtualRelation(): void\\n {\\n- /** @var ActiveRecordInterface $orderClass */\\n $orderClass = $this->getOrderClass();\\n $order = $orderClass::findOne(2);\\n $order->virtualCustomerId = $order->customer_id;\\n@@ -2217,7 +2144,6 @@ public function testGetAttributeLabel($model): void\\n public function testLoadRelations(): void\\n {\\n // Test eager loading relations for multiple primary models using loadRelationsFor().\\n- /** @var Customer[] $customers */\\n $customers = Customer::find()->all();\\n Customer::loadRelationsFor($customers, ['orders.items']);\\n foreach ($customers as $customer) {\\n@@ -2228,7 +2154,6 @@ public function testLoadRelations(): void\\n }\\n \\n // Test eager loading relations as arrays.\\n- /** @var array $customers */\\n $customers = Customer::find()->asArray(true)->all();\\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\\n $query->asArray(false);\\ndiff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php\\nindex 38b5ac5d5b8..ada47dd1067 100644\\n--- a/tests/framework/db/CommandTest.php\\n+++ b/tests/framework/db/CommandTest.php\\n@@ -17,11 +17,13 @@\\n use ArrayObject;\\n use yii\\\\caching\\\\ArrayCache;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yii\\\\db\\\\DataReader;\\n use yii\\\\db\\\\Exception;\\n use yii\\\\db\\\\Expression;\\n use yii\\\\db\\\\Query;\\n use yii\\\\db\\\\Schema;\\n+use yii\\\\db\\\\TableSchema;\\n \\n abstract class CommandTest extends DatabaseTestCase\\n {\\n@@ -293,7 +295,7 @@ public function testFetchMode(): void\\n // FETCH_NUM, customized in query method\\n $sql = 'SELECT * FROM {{customer}}';\\n $command = $db->createCommand($sql);\\n- $result = $command->queryOne([], PDO::FETCH_NUM);\\n+ $result = $command->queryOne(PDO::FETCH_NUM);\\n $this->assertTrue(\\\\is_array($result) && isset($result[0]));\\n }\\n \\n@@ -668,6 +670,9 @@ public function testInsertExpression(): void\\n break;\\n case 'oci':\\n $expression = 'EXTRACT(YEAR FROM sysdate)';\\n+ break;\\n+ default:\\n+ $this->fail(\\\"Unexpected driver name: {$this->driverName}\\\");\\n }\\n \\n $command = $db->createCommand();\\n@@ -1111,8 +1116,8 @@ public static function addPrimaryKeyProvider(): array\\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1126,15 +1131,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\\n ],\\n )->execute();\\n \\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\\n-\\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\\n \\n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\\n-\\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1180,8 +1186,8 @@ public static function addForeignKeyProvider(): array\\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1199,7 +1205,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->addForeignKey(\\n $name,\\n@@ -1209,12 +1216,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n (array) $refColumns,\\n )->execute();\\n \\n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\\n \\n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1235,32 +1243,40 @@ public function testCreateDropIndex(): void\\n 'int2' => 'integer not null',\\n ])->execute();\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n+\\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n }\\n \\n public static function addUniqueProvider(): array\\n@@ -1297,8 +1313,8 @@ public static function addUniqueProvider(): array\\n public function testAddDropUnique(string $name, string $tableName, $columns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1312,15 +1328,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\\n-\\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\\n \\n $db->createCommand()->dropUnique($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1337,6 +1354,7 @@ public function testAddDropCheck(): void\\n $name = 'test_ck_constraint';\\n \\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1347,18 +1365,16 @@ public function testAddDropCheck(): void\\n ['int1' => 'integer'],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n \\n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\\n-\\n- $this->assertMatchesRegularExpression(\\n- '/^.*int1.*>.*1.*$/',\\n- $schema->getTableChecks($tableName, true)[0]->expression\\n- );\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\\n \\n $db->createCommand()->dropCheck($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n }\\n \\n public function testAddDropDefaultValue(): void\\n@@ -1427,7 +1443,7 @@ public function testQueryCache(): void\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n \\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\\n- $db->cache(function (Connection $db) use ($command, $update) {\\n+ $db->cache(function (Connection $db) use ($command) {\\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n }, 10);\\n@@ -1539,40 +1555,50 @@ public function testAutoRefreshTableSchema(): void\\n $tableName = 'test';\\n $fkName = 'test_fk';\\n \\n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\\n+ $schema = $db->getSchema();\\n+\\n+ if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n \\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n \\n $db->createCommand()->createTable($tableName, [\\n 'id' => 'pk',\\n 'fk' => 'int',\\n 'name' => 'string',\\n ])->execute();\\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $initialSchema = $schema->getTableSchema($tableName);\\n $this->assertNotNull($initialSchema);\\n \\n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $newSchema = $schema->getTableSchema($tableName);\\n $this->assertNotEquals($initialSchema, $newSchema);\\n \\n if ($this->driverName !== 'sqlite') {\\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\\n \\n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\\n }\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n }\\n \\n public function testTransaction(): void\\ndiff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\\nindex 33450c53377..89d5e0811e6 100644\\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\\n public function testGetTableNamesIsFromObjectGenerateException(): void\\n {\\n $query = $this->createQuery();\\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\\n $query->from = new stdClass();\\n \\n $this->expectException('\\\\yii\\\\base\\\\InvalidConfigException');\\ndiff --git a/tests/framework/db/QueryTest.php b/tests/framework/db/QueryTest.php\\nindex 6b007abe40d..f81bbfc7b0e 100644\\n--- a/tests/framework/db/QueryTest.php\\n+++ b/tests/framework/db/QueryTest.php\\n@@ -722,7 +722,7 @@ public function testQueryCache(): void\\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\\n \\n- $db->cache(function (Connection $db) use ($query, $update) {\\n+ $db->cache(function (Connection $db) use ($query) {\\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\\n }, 10);\\ndiff --git a/tests/framework/db/SchemaTest.php b/tests/framework/db/SchemaTest.php\\nindex ac722ae0625..a2eec6443cd 100644\\n--- a/tests/framework/db/SchemaTest.php\\n+++ b/tests/framework/db/SchemaTest.php\\n@@ -18,6 +18,7 @@\\n use yii\\\\db\\\\Expression;\\n use yii\\\\db\\\\ForeignKeyConstraint;\\n use yii\\\\db\\\\IndexConstraint;\\n+use yii\\\\db\\\\pgsql\\\\ColumnSchema as PgsqlColumnSchema;\\n use yii\\\\db\\\\Schema;\\n use yii\\\\db\\\\TableSchema;\\n \\n@@ -121,10 +122,7 @@ public function testGetNonExistingTableSchema(): void\\n \\n public function testSchemaCache(): void\\n {\\n- /** @var Connection $db */\\n $db = $this->getConnection();\\n-\\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $schema->db->enableSchemaCache = true;\\n@@ -536,6 +534,7 @@ public function testColumnSchema(): void\\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \\\"defaultValue of column $name does not match.\\\");\\n }\\n if (isset($expected['dimension'])) { // PgSQL only\\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\\n $this->assertSame($expected['dimension'], $column->dimension, \\\"dimension of column $name does not match\\\");\\n }\\n }\\n\",\n \"summary\": \"Edited 6 file(s) in tests/framework/db/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/db/cubrid/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/cubrid/SchemaTest.php b/tests/framework/db/cubrid/SchemaTest.php\\nindex 2855a6733a8..3e405371f2c 100644\\n--- a/tests/framework/db/cubrid/SchemaTest.php\\n+++ b/tests/framework/db/cubrid/SchemaTest.php\\n@@ -91,7 +91,7 @@ public static function constraintsProvider(): array\\n {\\n $result = parent::constraintsProvider();\\n foreach ($result as $name => $constraints) {\\n- $result[$name][2] = static::convertPropertiesToAnycase($constraints[2]);\\n+ $result[$name][2] = self::convertPropertiesToAnycase($constraints[2]);\\n }\\n $result['1: check'][2] = false;\\n unset($result['1: index'][2][0]);\\n@@ -118,7 +118,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\\n if (!$isProperty && \\\\is_array($object)) {\\n $result = [];\\n foreach ($object as $name => $value) {\\n- $result[] = static::convertPropertiesToAnycase($value);\\n+ $result[] = self::convertPropertiesToAnycase($value);\\n }\\n \\n return $result;\\n@@ -126,7 +126,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\\n \\n if (\\\\is_object($object)) {\\n foreach (array_keys((array) $object) as $name) {\\n- $object->$name = static::convertPropertiesToAnycase($object->$name, true);\\n+ $object->$name = self::convertPropertiesToAnycase($object->$name, true);\\n }\\n } elseif (\\\\is_array($object) || \\\\is_string($object)) {\\n $object = new AnyCaseValue($object);\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/db/cubrid/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/db/mssql/ActiveRecordTest.php\",\n \"tests/framework/db/mssql/CommandTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\\nindex ccb2b150652..df957efeabd 100644\\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\\n@@ -50,10 +50,10 @@ public function testCastValues(): void\\n $this->assertSame('1337', trim((string) $model->char_col));\\n $this->assertSame('test', $model->char_col2);\\n $this->assertSame('test123', $model->char_col3);\\n- //$this->assertSame(3.742, $model->float_col);\\n- //$this->assertSame(42.1337, $model->float_col2);\\n- //$this->assertSame(true, $model->bool_col);\\n- //$this->assertSame(false, $model->bool_col2);\\n+ $this->assertSame('3.742', $model->float_col);\\n+ $this->assertSame(42.1337, $model->float_col2);\\n+ $this->assertSame(1, $model->bool_col);\\n+ $this->assertSame(0, $model->bool_col2);\\n }\\n \\n /**\\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\\nindex 9198054fa74..162d2a436f5 100644\\n--- a/tests/framework/db/mssql/CommandTest.php\\n+++ b/tests/framework/db/mssql/CommandTest.php\\n@@ -114,12 +114,16 @@ public function testAddDropDefaultValue(): void\\n 'int1' => 'integer',\\n ])->execute();\\n \\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertEmpty($defaultValues);\\n+\\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\\n \\n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\\n+ $this->assertEmpty($defaultValues);\\n }\\n \\n public static function batchInsertSqlProvider(): array\\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex 03e58a4fa6d..9927879e94b 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -10,6 +10,7 @@\\n \\n use yii\\\\base\\\\NotSupportedException;\\n use yii\\\\db\\\\Constraint;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n use yii\\\\db\\\\mssql\\\\TableSchema;\\n@@ -50,10 +51,7 @@ public static function constraintsProvider(): array\\n \\n public function testGetStringFieldsSize(): void\\n {\\n- /** @var Connection $db */\\n $db = $this->getConnection();\\n-\\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $columns = $schema->getTableSchema('type', false)->columns;\\n@@ -80,6 +78,8 @@ public function testGetStringFieldsSize(): void\\n $expectedSize = null;\\n $expectedDbType = 'text';\\n break;\\n+ default:\\n+ $this->fail(\\\"Unexpected column name: {$name}\\\");\\n }\\n \\n $this->assertEquals($expectedType, $type);\\n@@ -328,6 +328,8 @@ public function testResolveTableNames(\\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n {\\n $schema = $this->getConnection(true, true)->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n+\\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n $this->assertNotEmpty($primaryKeys);\\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n@@ -359,6 +361,8 @@ public function testInsertWithCompositePrimaryKey(): void\\n public function testGetViewNamesWithDefaultSchema(): void\\n {\\n $schema = $this->getConnection(true, true)->getSchema();\\n+ $this->assertInstanceOf(Schema::class, $schema);\\n+\\n $viewNames = $schema->getViewNames();\\n $this->assertContains('animal_view', $viewNames);\\n }\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/mssql/\"\n },\n {\n \"subtask_id\": \"s9\",\n \"scope_files\": [\n \"tests/framework/db/mysql/ActiveRecordTest.php\",\n \"tests/framework/db/mysql/CommandTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\\nindex 1509a57fc9b..65d5793c02d 100644\\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\\n@@ -44,8 +44,8 @@ public function testCastValues(): void\\n $this->assertSame('test123', $model->char_col3);\\n $this->assertSame(3.742, $model->float_col);\\n $this->assertSame(42.1337, $model->float_col2);\\n- //$this->assertSame(true, $model->bool_col);\\n- //$this->assertSame(false, $model->bool_col2);\\n+ $this->assertSame(1, $model->bool_col);\\n+ $this->assertSame(0, $model->bool_col2);\\n }\\n \\n public function testJsonColumn(): void\\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\\nindex f77f6122607..a98f07d8fbd 100644\\n--- a/tests/framework/db/mysql/CommandTest.php\\n+++ b/tests/framework/db/mysql/CommandTest.php\\n@@ -8,6 +8,8 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\mysql;\\n \\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n+\\n /**\\n * @group db\\n * @group mysql\\n@@ -28,6 +30,7 @@ public function testAddDropCheckSeveral(): void\\n \\n $tableName = 'test_ck_several';\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/db/mysql/\"\n },\n {\n \"subtask_id\": \"s10\",\n \"scope_files\": [\n \"tests/framework/db/mysql/connection/DeadLockTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\\nindex ed6bb74cecd..8008c52266e 100644\\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\\n@@ -284,6 +284,8 @@ private function childrenUpdateLocked()\\n * In case of error in child process its execution bubbles up to phpunit to continue\\n * all the rest tests. So, all the rest tests in this case will run both in the child\\n * and parent processes. Such mess must be prevented with child's own error handler.\\n+ *\\n+ * @phpstan-impure\\n */\\n private function setErrorHandler(): void\\n {\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/db/mysql/connection/\"\n },\n {\n \"subtask_id\": \"s11\",\n \"scope_files\": [\n \"tests/framework/db/oci/ActiveRecordTest.php\",\n \"tests/framework/db/oci/CommandTest.php\",\n \"tests/framework/db/oci/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\\nindex 98be9d4b110..693ffd3e845 100644\\n--- a/tests/framework/db/oci/ActiveRecordTest.php\\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\\n@@ -8,7 +8,6 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\oci;\\n \\n-use yii\\\\db\\\\ActiveRecordInterface;\\n use yii\\\\db\\\\ActiveQuery;\\n use yiiunit\\\\data\\\\ar\\\\BitValues;\\n use yiiunit\\\\data\\\\ar\\\\DefaultPk;\\n@@ -50,8 +49,8 @@ public function testCastValues(): void\\n $this->assertSame('test123', $model->char_col3);\\n $this->assertSame(3.742, $model->float_col);\\n $this->assertSame(42.1337, $model->float_col2);\\n- $this->assertEquals('1', $model->bool_col);\\n- $this->assertEquals('0', $model->bool_col2);\\n+ $this->assertSame('1', $model->bool_col);\\n+ $this->assertSame('0', $model->bool_col2);\\n }\\n \\n public function testDefaultValues(): void\\n@@ -81,7 +80,6 @@ public function testDefaultValues(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -156,23 +154,21 @@ public function testBit(): void\\n */\\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n $customer->email = 'mail@example.com';\\n- $customer->status = '1';\\n+ $customer->status = 1;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals('1', $customer->status);\\n+ $this->assertSame(1, $customer->status);\\n \\n- $customer->status = '0';\\n+ $customer->status = 0;\\n $customer->save(false);\\n \\n $customer->refresh();\\n- $this->assertEquals('0', $customer->status);\\n+ $this->assertSame(0, $customer->status);\\n \\n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\\n $this->assertCount(2, $customers);\\n@@ -181,23 +177,11 @@ public function testBooleanAttribute(): void\\n $this->assertCount(1, $customers);\\n }\\n \\n- /**\\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\\n- * @dataProvider aliasMethodProvider\\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\\n- */\\n- public function testJoinWithAlias($aliasMethod): void\\n+ public function testJoinWithAlias(): void\\n {\\n // left join and eager loading\\n- /** @var ActiveQuery $query */\\n $query = Order::find()->joinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\\n $this->assertCount(3, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -208,13 +192,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // inner join filtering and eager loading\\n $query = Order::find()->innerJoinWith(['customer c']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -223,13 +201,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // inner join filtering without eager loading\\n $query = Order::find()->innerJoinWith(['customer c'], false);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(2, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -238,13 +210,7 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // join with via-relation\\n $query = Order::find()->innerJoinWith(['books b']);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\\n- }\\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\\n $this->assertCount(2, $orders);\\n $this->assertEquals(1, $orders[0]->id);\\n $this->assertEquals(3, $orders[1]->id);\\n@@ -255,32 +221,14 @@ public function testJoinWithAlias($aliasMethod): void\\n \\n // joining sub relations\\n $query = Order::find()->innerJoinWith([\\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->orderBy('{{i}}.id');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->orderBy('{{@item}}.id');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->orderBy($q->applyAlias('item', 'id'));\\n- }\\n+ 'items i' => function (ActiveQuery $q) {\\n+ $q->orderBy('{{i}}.id');\\n },\\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\\n- if ($aliasMethod === 'explicit') {\\n- $q->where('{{c}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $q->where('{{@category}}.[[id]] = 2');\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $q->where([$q->applyAlias('category', 'id') => 2]);\\n- }\\n+ 'items.category c' => function (ActiveQuery $q) {\\n+ $q->where('{{c}}.[[id]] = 2');\\n },\\n ]);\\n- if ($aliasMethod === 'explicit') {\\n- $orders = $query->orderBy('{{i}}.id')->all();\\n- } elseif ($aliasMethod === 'querysyntax') {\\n- $orders = $query->orderBy('{{@item}}.id')->all();\\n- } elseif ($aliasMethod === 'applyAlias') {\\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\\n- }\\n+ $orders = $query->orderBy('{{i}}.id')->all();\\n $this->assertCount(1, $orders);\\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\\n $this->assertEquals(2, $orders[0]->id);\\n@@ -288,36 +236,31 @@ public function testJoinWithAlias($aliasMethod): void\\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\\n \\n- // join with ON condition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod);\\n- $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicit';\\n+ $orders = Order::find()->joinWith([\\\"$relationName b\\\"])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n \\n // join with ON condition and alias in relation definition\\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n- $this->assertCount(3, $orders);\\n- $this->assertEquals(1, $orders[0]->id);\\n- $this->assertEquals(2, $orders[1]->id);\\n- $this->assertEquals(3, $orders[2]->id);\\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n- $this->assertCount(2, $orders[0]->$relationName);\\n- $this->assertCount(0, $orders[1]->$relationName);\\n- $this->assertCount(1, $orders[2]->$relationName);\\n- }\\n+ $relationName = 'booksExplicitA';\\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\\n+ $this->assertCount(3, $orders);\\n+ $this->assertEquals(1, $orders[0]->id);\\n+ $this->assertEquals(2, $orders[1]->id);\\n+ $this->assertEquals(3, $orders[2]->id);\\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\\n+ $this->assertCount(2, $orders[0]->$relationName);\\n+ $this->assertCount(0, $orders[1]->$relationName);\\n+ $this->assertCount(1, $orders[2]->$relationName);\\n }\\n }\\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\\nindex 4d881f93482..54566dd9f0b 100644\\n--- a/tests/framework/db/oci/CommandTest.php\\n+++ b/tests/framework/db/oci/CommandTest.php\\n@@ -150,7 +150,7 @@ public function testQueryCache(): void\\n \\n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\\n \\n- $db->cache(function (Connection $db) use ($update) {\\n+ $db->cache(function (Connection $db) {\\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\\n \\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\\nindex e9edf8e2756..745ba8f8a7d 100644\\n--- a/tests/framework/db/oci/SchemaTest.php\\n+++ b/tests/framework/db/oci/SchemaTest.php\\n@@ -10,6 +10,7 @@\\n \\n use Exception;\\n use yii\\\\db\\\\CheckConstraint;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n \\n /**\\n@@ -196,7 +197,6 @@ public function testFindUniqueIndexes(): void\\n 'someCol3' => 'string',\\n ])->execute();\\n \\n- /** @var Schema $schema */\\n $schema = $db->schema;\\n \\n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\\n@@ -240,8 +240,10 @@ public function testFindUniqueIndexes(): void\\n public function testLobIndexesExcluded(): void\\n {\\n $db = $this->getConnection();\\n+ $dbSchema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\\n \\n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\\n $db->createCommand()->dropTable('lob_test')->execute();\\n }\\n \\n@@ -249,7 +251,7 @@ public function testLobIndexesExcluded(): void\\n 'CREATE TABLE \\\"lob_test\\\" (\\\"id\\\" NUMBER(10) NOT NULL, \\\"content\\\" CLOB, \\\"data\\\" BLOB, PRIMARY KEY (\\\"id\\\"))'\\n )->execute();\\n \\n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\\n \\n $this->assertCount(1, $indexes);\\n \\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/oci/\"\n },\n {\n \"subtask_id\": \"s12\",\n \"scope_files\": [\n \"tests/framework/db/pgsql/ActiveFixtureTest.php\",\n \"tests/framework/db/pgsql/ActiveRecordTest.php\",\n \"tests/framework/db/pgsql/BaseActiveRecordTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\\nindex 281874d55e3..5c8f4a99398 100644\\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\\n@@ -8,7 +8,9 @@\\n \\n namespace yiiunit\\\\framework\\\\db\\\\pgsql;\\n \\n+use yiiunit\\\\data\\\\ar\\\\Customer;\\n use yiiunit\\\\framework\\\\test\\\\CustomerDbTestCase;\\n+use yiiunit\\\\framework\\\\test\\\\CustomerFixture;\\n \\n /**\\n * @group db\\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\\n $test = new CustomerDbTestCase();\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\\n \\n $sequenceName = $fixture->getTableSchema()->sequenceName;\\n $sequenceNextVal = $this->getConnection()->createCommand(\\\"SELECT currval('$sequenceName')\\\")->queryScalar();\\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\\n+\\n+ $customer2 = $fixture->getModel('customer2');\\n+ $this->assertInstanceOf(Customer::class, $customer2);\\n+\\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\\n \\n $test->tearDown();\\n }\\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\\nindex 545b6808165..6d149c9995b 100644\\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\\\yiiunit\\\\framework\\\\db\\\\ActiveRecordTest\\n \\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property bool|null $bool_col\\n+ * @property bool|null $default_true\\n+ * @property bool|null $default_false\\n+ */\\n class BoolAR extends ActiveRecord\\n {\\n public static function tableName()\\n@@ -316,6 +318,18 @@ public static function tableName()\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property string $username\\n+ * @property string $auth_key\\n+ * @property string $password_hash\\n+ * @property string|null $password_reset_token\\n+ * @property string $email\\n+ * @property int $role\\n+ * @property int $status\\n+ * @property int $created_at\\n+ * @property int $updated_at\\n+ */\\n class UserAR extends ActiveRecord\\n {\\n public const STATUS_DELETED = 0;\\n@@ -337,12 +351,12 @@ public function behaviors()\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array intarray_col\\n- * @property array textarray2_col\\n- * @property array json_col\\n- * @property array jsonb_col\\n- * @property array jsonarray_col\\n+ * @property int $id\\n+ * @property array $intarray_col\\n+ * @property array $textarray2_col\\n+ * @property array $json_col\\n+ * @property array $jsonb_col\\n+ * @property array $jsonarray_col\\n */\\n class ArrayAndJsonTypes extends ActiveRecord\\n {\\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\nindex c0af29e83f1..dad892a4749 100644\\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n@@ -38,8 +38,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array json_col\\n+ * @property int $id\\n+ * @property array $json_col\\n */\\n class ArrayAndJsonType extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/db/pgsql/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s4","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Fix PHPDoc type mismatch for `orderItems2`.**\n\nLine 37 documents `@property-read Item[] $orderItems2`, but `getOrderItems2()` (Line 104-108) returns `hasMany(OrderItem::class, ...)`. This gives wrong type info to PHPStan and IDEs.\n\n<details>\n<summary>Suggested diff</summary>\n\n```diff\n- * `@property-read` Item[] $orderItems2\n+ * `@property-read` OrderItem[] $orderItems2\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@property-read` OrderItem[] $orderItems2\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/data/ar/Customer.php` at line 37, Update the PHPDoc for the Customer\nmodel to match the actual relation type returned by getOrderItems2(): replace\nthe incorrect `@property-read` Item[] $orderItems2 with `@property-read` OrderItem[]\n$orderItems2 (or the correct fully-qualified OrderItem class name) so\nPHPStan/IDEs see the hasMany(OrderItem::class, ...) return type; ensure the\nannotation in Customer.php references the same OrderItem symbol used in\ngetOrderItems2() to keep types consistent.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\nindex 92321e8aa77..c3d78850105 100644\n--- a/tests/data/ar/Customer.php\n+++ b/tests/data/ar/Customer.php\n@@ -21,8 +21,21 @@\n * @property string $email\n * @property string $address\n * @property int $status\n+ * @property 1|0|'1'|'0'|bool $bool_status\n *\n * @method static CustomerQuery findBySql($sql, $params = [])\n+ *\n+ * @property-read Profile $profile\n+ * @property-read Order[] $ordersPlain\n+ * @property-read Order[] $orders\n+ * @property-read Order[] $expensiveOrders\n+ * @property-read Order[] $ordersWithItems\n+ * @property-read Order[] $expensiveOrdersWithNullFK\n+ * @property-read Order[] $ordersWithNullFK\n+ * @property-read Order[] $orders2\n+ * @property-read Item[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read Item[] $items\n */\n class Customer extends ActiveRecord\n {\n@@ -109,7 +122,7 @@ public function afterSave($insert, $changedAttributes): void\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\n"},{"subtask_id":"s6","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Search for queryOne signature and implementation to confirm parameter behavior\nrg -n -A 10 'function queryOne' --type=php framework/db/Command.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 603\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Get the test code around line 298-299\nsed -n '295,305p' tests/framework/db/CommandTest.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 453\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Find and examine queryInternal implementation to understand fetchMode handling\nrg -n -A 20 'function queryInternal' --type=php framework/db/Command.php | head -50\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 992\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Search for how fetchMode is used in the command class, particularly with empty array\nrg -n 'FETCH_NUM|FETCH_ASSOC' --type=php framework/db/Command.php | head -20\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 102\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Get more context of queryInternal to see how it handles fetchMode parameter\nsed -n '1164,1250p' framework/db/Command.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 3036\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Look for any method that processes empty array fetchMode\nrg -n 'if.*fetchMode' --type=php framework/db/Command.php | head -20\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 104\n\n---\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Check how the PDO fetch mode is actually applied in the query execution\nrg -n 'setFetchMode|PDO::FETCH' --type=php framework/db/Command.php | head -30\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 652\n\n---\n\n\n\n</details>\n\n**Confirm queryOne([]) doesn't explicitly set PDO::FETCH_NUM mode.**\n\nWhen `queryOne([])` is called, the empty array passes through `queryInternal('fetch', [])`. Since `[] !== null`, the check on line 1192 (`if ($fetchMode === null)`) does not apply, and `[]` is passed to `call_user_func_array([$this->pdoStatement, 'fetch'], [])`. This calls `fetch()` with no arguments, which uses the PDOStatement's default fetch mode (typically `PDO::FETCH_BOTH`), not the explicit `PDO::FETCH_NUM` mentioned in the test comment.\n\nThe test still passes because `FETCH_BOTH` includes numeric keys, but the behavior is not the same as explicitly setting `PDO::FETCH_NUM`. If the test relied on `FETCH_NUM` semantics specifically (e.g., only numeric keys), this change could cause issues.\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/CommandTest.php` at line 298, The test reveals that\npassing an empty array to queryOne([]) ends up bypassing the fetch-mode null\ncheck in queryInternal and results in calling\ncall_user_func_array([$this->pdoStatement, 'fetch'], []) which relies on PDO's\ndefault fetch mode; update queryOne and/or queryInternal so that an empty array\nis treated the same as null (or explicitly sets PDO::FETCH_NUM) before calling\nfetch: detect when $fetchMode is an empty array and convert it to null (or\nreplace it with PDO::FETCH_NUM), ensuring the conditional if ($fetchMode ===\nnull) and the subsequent call_user_func_array invocation use the intended fetch\nmode and preserve existing behavior for callers of queryOne and queryInternal.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php\nindex 38b5ac5d5b8..ada47dd1067 100644\n--- a/tests/framework/db/CommandTest.php\n+++ b/tests/framework/db/CommandTest.php\n@@ -17,11 +17,13 @@\n use ArrayObject;\n use yii\\caching\\ArrayCache;\n use yii\\db\\Connection;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DataReader;\n use yii\\db\\Exception;\n use yii\\db\\Expression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\TableSchema;\n \n abstract class CommandTest extends DatabaseTestCase\n {\n@@ -293,7 +295,7 @@ public function testFetchMode(): void\n // FETCH_NUM, customized in query method\n $sql = 'SELECT * FROM {{customer}}';\n $command = $db->createCommand($sql);\n- $result = $command->queryOne([], PDO::FETCH_NUM);\n+ $result = $command->queryOne(PDO::FETCH_NUM);\n $this->assertTrue(\\is_array($result) && isset($result[0]));\n }\n \n@@ -668,6 +670,9 @@ public function testInsertExpression(): void\n break;\n case 'oci':\n $expression = 'EXTRACT(YEAR FROM sysdate)';\n+ break;\n+ default:\n+ $this->fail(\"Unexpected driver name: {$this->driverName}\");\n }\n \n $command = $db->createCommand();\n@@ -1111,8 +1116,8 @@ public static function addPrimaryKeyProvider(): array\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1126,15 +1131,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\n ],\n )->execute();\n \n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\n-\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\n \n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\n-\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1180,8 +1186,8 @@ public static function addForeignKeyProvider(): array\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1199,7 +1205,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->addForeignKey(\n $name,\n@@ -1209,12 +1216,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n (array) $refColumns,\n )->execute();\n \n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\n \n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1235,32 +1243,40 @@ public function testCreateDropIndex(): void\n 'int2' => 'integer not null',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n+\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n }\n \n public static function addUniqueProvider(): array\n@@ -1297,8 +1313,8 @@ public static function addUniqueProvider(): array\n public function testAddDropUnique(string $name, string $tableName, $columns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1312,15 +1328,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\n-\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\n \n $db->createCommand()->dropUnique($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1337,6 +1354,7 @@ public function testAddDropCheck(): void\n $name = 'test_ck_constraint';\n \n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1347,18 +1365,16 @@ public function testAddDropCheck(): void\n ['int1' => 'integer'],\n )->execute();\n \n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n \n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\n-\n- $this->assertMatchesRegularExpression(\n- '/^.*int1.*>.*1.*$/',\n- $schema->getTableChecks($tableName, true)[0]->expression\n- );\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\n \n $db->createCommand()->dropCheck($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n }\n \n public function testAddDropDefaultValue(): void\n@@ -1427,7 +1443,7 @@ public function testQueryCache(): void\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n \n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n- $db->cache(function (Connection $db) use ($command, $update) {\n+ $db->cache(function (Connection $db) use ($command) {\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n }, 10);\n@@ -1539,40 +1555,50 @@ public function testAutoRefreshTableSchema(): void\n $tableName = 'test';\n $fkName = 'test_fk';\n \n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\n+ $schema = $db->getSchema();\n+\n+ if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n }\n \n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n \n $db->createCommand()->createTable($tableName, [\n 'id' => 'pk',\n 'fk' => 'int',\n 'name' => 'string',\n ])->execute();\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\n+ $initialSchema = $schema->getTableSchema($tableName);\n $this->assertNotNull($initialSchema);\n \n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\n+ $newSchema = $schema->getTableSchema($tableName);\n $this->assertNotEquals($initialSchema, $newSchema);\n \n if ($this->driverName !== 'sqlite') {\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\n \n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\n }\n \n $db->createCommand()->dropTable($tableName)->execute();\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n }\n \n public function testTransaction(): void\n"},{"subtask_id":"s12","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**`default_true/default_false` PHPDoc is too narrow for new records.**\n\nLine 310 and Line 311 should allow `null` because this file explicitly asserts null values before `loadDefaultValues()`.\n\n<details>\n<summary>Proposed fix</summary>\n\n```diff\n- * `@property` bool $default_true\n- * `@property` bool $default_false\n+ * `@property` bool|null $default_true\n+ * `@property` bool|null $default_false\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@property` bool|null $default_true\n * `@property` bool|null $default_false\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 310 - 311, Update\nthe PHPDoc for the properties default_true and default_false in ActiveRecordTest\n(the class containing the tests that call loadDefaultValues()) to allow null\nvalues (change their types from bool to bool|null) so new records that are\nasserted null before loadDefaultValues() match the declaration; update the\n`@property` annotations for default_true and default_false accordingly.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 545b6808165..6d149c9995b 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\yiiunit\\framework\\db\\ActiveRecordTest\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -316,6 +318,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n public const STATUS_DELETED = 0;\n@@ -337,12 +351,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\n"},{"subtask_id":"s12","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**`$id` should be documented as scalar, not array.**\n\nLine 354 documents `id` as `array`, which misleads static analysis for a primary-key field.\n\n<details>\n<summary>Proposed fix</summary>\n\n```diff\n- * `@property` array $id\n+ * `@property` int $id\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@property` int $id\n * `@property` array $intarray_col\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 354 - 355, The\ndocblock incorrectly annotates the primary key as an arrayโupdate the `@property`\nannotation for $id to a scalar type (e.g., \"@property int $id\" or \"@property\nscalar $id\") instead of \"@property array $id\" in the ActiveRecordTest class\ndocblock so static analysis treats the primary key as a scalar; leave \"@property\narray $intarray_col\" unchanged.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 545b6808165..6d149c9995b 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\yiiunit\\framework\\db\\ActiveRecordTest\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -316,6 +318,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n public const STATUS_DELETED = 0;\n@@ -337,12 +351,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\n"},{"subtask_id":"s12","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Incorrect PHPDoc type for primary key `id`.**\n\nLine 41 should use a scalar PK type instead of `array`.\n\n<details>\n<summary>Proposed fix</summary>\n\n```diff\n- * `@property` array $id\n+ * `@property` int $id\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@property` int $id\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/pgsql/BaseActiveRecordTest.php` at line 41, The PHPDoc for\nthe primary key `id` is incorrect (declared as array); update the PHPDoc on\nBaseActiveRecordTest to use a scalar PK type (e.g., \"@property int|string $id\"\nor a single scalar type appropriate for your DB) so tools and static analyzers\ntreat the id as a scalar rather than an array; locate the docblock containing\n\"@property array $id\" and replace \"array\" with the chosen scalar type.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\nindex c0af29e83f1..dad892a4749 100644\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\n@@ -38,8 +38,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array json_col\n+ * @property int $id\n+ * @property array $json_col\n */\n class ArrayAndJsonType extends ActiveRecord\n {\n"}],"string":"[\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Fix PHPDoc type mismatch for `orderItems2`.**\\n\\nLine 37 documents `@property-read Item[] $orderItems2`, but `getOrderItems2()` (Line 104-108) returns `hasMany(OrderItem::class, ...)`. This gives wrong type info to PHPStan and IDEs.\\n\\n<details>\\n<summary>Suggested diff</summary>\\n\\n```diff\\n- * `@property-read` Item[] $orderItems2\\n+ * `@property-read` OrderItem[] $orderItems2\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@property-read` OrderItem[] $orderItems2\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/data/ar/Customer.php` at line 37, Update the PHPDoc for the Customer\\nmodel to match the actual relation type returned by getOrderItems2(): replace\\nthe incorrect `@property-read` Item[] $orderItems2 with `@property-read` OrderItem[]\\n$orderItems2 (or the correct fully-qualified OrderItem class name) so\\nPHPStan/IDEs see the hasMany(OrderItem::class, ...) return type; ensure the\\nannotation in Customer.php references the same OrderItem symbol used in\\ngetOrderItems2() to keep types consistent.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\\nindex 92321e8aa77..c3d78850105 100644\\n--- a/tests/data/ar/Customer.php\\n+++ b/tests/data/ar/Customer.php\\n@@ -21,8 +21,21 @@\\n * @property string $email\\n * @property string $address\\n * @property int $status\\n+ * @property 1|0|'1'|'0'|bool $bool_status\\n *\\n * @method static CustomerQuery findBySql($sql, $params = [])\\n+ *\\n+ * @property-read Profile $profile\\n+ * @property-read Order[] $ordersPlain\\n+ * @property-read Order[] $orders\\n+ * @property-read Order[] $expensiveOrders\\n+ * @property-read Order[] $ordersWithItems\\n+ * @property-read Order[] $expensiveOrdersWithNullFK\\n+ * @property-read Order[] $ordersWithNullFK\\n+ * @property-read Order[] $orders2\\n+ * @property-read Item[] $orderItems\\n+ * @property-read OrderItem[] $orderItems2\\n+ * @property-read Item[] $items\\n */\\n class Customer extends ActiveRecord\\n {\\n@@ -109,7 +122,7 @@ public function afterSave($insert, $changedAttributes): void\\n \\n /**\\n * {@inheritdoc}\\n- * @return CustomerQuery\\n+ * @return CustomerQuery<static>\\n */\\n public static function find()\\n {\\n\"\n },\n {\n \"subtask_id\": \"s6\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n<details>\\n<summary>๐งฉ Analysis chain</summary>\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Search for queryOne signature and implementation to confirm parameter behavior\\nrg -n -A 10 'function queryOne' --type=php framework/db/Command.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 603\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Get the test code around line 298-299\\nsed -n '295,305p' tests/framework/db/CommandTest.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 453\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Find and examine queryInternal implementation to understand fetchMode handling\\nrg -n -A 20 'function queryInternal' --type=php framework/db/Command.php | head -50\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 992\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Search for how fetchMode is used in the command class, particularly with empty array\\nrg -n 'FETCH_NUM|FETCH_ASSOC' --type=php framework/db/Command.php | head -20\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 102\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Get more context of queryInternal to see how it handles fetchMode parameter\\nsed -n '1164,1250p' framework/db/Command.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 3036\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Look for any method that processes empty array fetchMode\\nrg -n 'if.*fetchMode' --type=php framework/db/Command.php | head -20\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 104\\n\\n---\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Check how the PDO fetch mode is actually applied in the query execution\\nrg -n 'setFetchMode|PDO::FETCH' --type=php framework/db/Command.php | head -30\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 652\\n\\n---\\n\\n\\n\\n</details>\\n\\n**Confirm queryOne([]) doesn't explicitly set PDO::FETCH_NUM mode.**\\n\\nWhen `queryOne([])` is called, the empty array passes through `queryInternal('fetch', [])`. Since `[] !== null`, the check on line 1192 (`if ($fetchMode === null)`) does not apply, and `[]` is passed to `call_user_func_array([$this->pdoStatement, 'fetch'], [])`. This calls `fetch()` with no arguments, which uses the PDOStatement's default fetch mode (typically `PDO::FETCH_BOTH`), not the explicit `PDO::FETCH_NUM` mentioned in the test comment.\\n\\nThe test still passes because `FETCH_BOTH` includes numeric keys, but the behavior is not the same as explicitly setting `PDO::FETCH_NUM`. If the test relied on `FETCH_NUM` semantics specifically (e.g., only numeric keys), this change could cause issues.\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/CommandTest.php` at line 298, The test reveals that\\npassing an empty array to queryOne([]) ends up bypassing the fetch-mode null\\ncheck in queryInternal and results in calling\\ncall_user_func_array([$this->pdoStatement, 'fetch'], []) which relies on PDO's\\ndefault fetch mode; update queryOne and/or queryInternal so that an empty array\\nis treated the same as null (or explicitly sets PDO::FETCH_NUM) before calling\\nfetch: detect when $fetchMode is an empty array and convert it to null (or\\nreplace it with PDO::FETCH_NUM), ensuring the conditional if ($fetchMode ===\\nnull) and the subsequent call_user_func_array invocation use the intended fetch\\nmode and preserve existing behavior for callers of queryOne and queryInternal.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php\\nindex 38b5ac5d5b8..ada47dd1067 100644\\n--- a/tests/framework/db/CommandTest.php\\n+++ b/tests/framework/db/CommandTest.php\\n@@ -17,11 +17,13 @@\\n use ArrayObject;\\n use yii\\\\caching\\\\ArrayCache;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\ConstraintFinderInterface;\\n use yii\\\\db\\\\DataReader;\\n use yii\\\\db\\\\Exception;\\n use yii\\\\db\\\\Expression;\\n use yii\\\\db\\\\Query;\\n use yii\\\\db\\\\Schema;\\n+use yii\\\\db\\\\TableSchema;\\n \\n abstract class CommandTest extends DatabaseTestCase\\n {\\n@@ -293,7 +295,7 @@ public function testFetchMode(): void\\n // FETCH_NUM, customized in query method\\n $sql = 'SELECT * FROM {{customer}}';\\n $command = $db->createCommand($sql);\\n- $result = $command->queryOne([], PDO::FETCH_NUM);\\n+ $result = $command->queryOne(PDO::FETCH_NUM);\\n $this->assertTrue(\\\\is_array($result) && isset($result[0]));\\n }\\n \\n@@ -668,6 +670,9 @@ public function testInsertExpression(): void\\n break;\\n case 'oci':\\n $expression = 'EXTRACT(YEAR FROM sysdate)';\\n+ break;\\n+ default:\\n+ $this->fail(\\\"Unexpected driver name: {$this->driverName}\\\");\\n }\\n \\n $command = $db->createCommand();\\n@@ -1111,8 +1116,8 @@ public static function addPrimaryKeyProvider(): array\\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1126,15 +1131,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\\n ],\\n )->execute();\\n \\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\\n-\\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\\n \\n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\\n-\\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\\n+ $this->assertNull($primaryKey);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1180,8 +1186,8 @@ public static function addForeignKeyProvider(): array\\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1199,7 +1205,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->addForeignKey(\\n $name,\\n@@ -1209,12 +1216,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\\n (array) $refColumns,\\n )->execute();\\n \\n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\\n \\n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\\n+ $this->assertEmpty($foreignKeys);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1235,32 +1243,40 @@ public function testCreateDropIndex(): void\\n 'int2' => 'integer not null',\\n ])->execute();\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n+\\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n \\n $db->createCommand()->dropIndex($name, $tableName)->execute();\\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEmpty($indexes);\\n \\n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\\n+ $indexes = $schema->getTableIndexes($tableName, true);\\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\\n+ $this->assertTrue($indexes[0]->isUnique);\\n }\\n \\n public static function addUniqueProvider(): array\\n@@ -1297,8 +1313,8 @@ public static function addUniqueProvider(): array\\n public function testAddDropUnique(string $name, string $tableName, $columns): void\\n {\\n $db = $this->getConnection(false);\\n-\\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1312,15 +1328,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\\n ],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\\n-\\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\\n \\n $db->createCommand()->dropUnique($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\\n+ $uniques = $schema->getTableUniques($tableName, true);\\n+ $this->assertEmpty($uniques);\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n@@ -1337,6 +1354,7 @@ public function testAddDropCheck(): void\\n $name = 'test_ck_constraint';\\n \\n $schema = $db->getSchema();\\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\\n \\n if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n@@ -1347,18 +1365,16 @@ public function testAddDropCheck(): void\\n ['int1' => 'integer'],\\n )->execute();\\n \\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n \\n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\\n-\\n- $this->assertMatchesRegularExpression(\\n- '/^.*int1.*>.*1.*$/',\\n- $schema->getTableChecks($tableName, true)[0]->expression\\n- );\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\\n \\n $db->createCommand()->dropCheck($name, $tableName)->execute();\\n-\\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\\n+ $checks = $schema->getTableChecks($tableName, true);\\n+ $this->assertEmpty($checks);\\n }\\n \\n public function testAddDropDefaultValue(): void\\n@@ -1427,7 +1443,7 @@ public function testQueryCache(): void\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n \\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\\n- $db->cache(function (Connection $db) use ($command, $update) {\\n+ $db->cache(function (Connection $db) use ($command) {\\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\\n }, 10);\\n@@ -1539,40 +1555,50 @@ public function testAutoRefreshTableSchema(): void\\n $tableName = 'test';\\n $fkName = 'test_fk';\\n \\n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\\n+ $schema = $db->getSchema();\\n+\\n+ if ($schema->getTableSchema($tableName) !== null) {\\n $db->createCommand()->dropTable($tableName)->execute();\\n }\\n \\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n \\n $db->createCommand()->createTable($tableName, [\\n 'id' => 'pk',\\n 'fk' => 'int',\\n 'name' => 'string',\\n ])->execute();\\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $initialSchema = $schema->getTableSchema($tableName);\\n $this->assertNotNull($initialSchema);\\n \\n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\\n+ $newSchema = $schema->getTableSchema($tableName);\\n $this->assertNotEquals($initialSchema, $newSchema);\\n \\n if ($this->driverName !== 'sqlite') {\\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->foreignKeys);\\n \\n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\\n \\n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\\n+ /** @var TableSchema|null */\\n+ $tableSchema = $schema->getTableSchema($tableName);\\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\\n }\\n \\n $db->createCommand()->dropTable($tableName)->execute();\\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\\n+ $this->assertNull($schema->getTableSchema($tableName));\\n }\\n \\n public function testTransaction(): void\\n\"\n },\n {\n \"subtask_id\": \"s12\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**`default_true/default_false` PHPDoc is too narrow for new records.**\\n\\nLine 310 and Line 311 should allow `null` because this file explicitly asserts null values before `loadDefaultValues()`.\\n\\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n- * `@property` bool $default_true\\n- * `@property` bool $default_false\\n+ * `@property` bool|null $default_true\\n+ * `@property` bool|null $default_false\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@property` bool|null $default_true\\n * `@property` bool|null $default_false\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 310 - 311, Update\\nthe PHPDoc for the properties default_true and default_false in ActiveRecordTest\\n(the class containing the tests that call loadDefaultValues()) to allow null\\nvalues (change their types from bool to bool|null) so new records that are\\nasserted null before loadDefaultValues() match the declaration; update the\\n`@property` annotations for default_true and default_false accordingly.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\\nindex 545b6808165..6d149c9995b 100644\\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\\\yiiunit\\\\framework\\\\db\\\\ActiveRecordTest\\n \\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property bool|null $bool_col\\n+ * @property bool|null $default_true\\n+ * @property bool|null $default_false\\n+ */\\n class BoolAR extends ActiveRecord\\n {\\n public static function tableName()\\n@@ -316,6 +318,18 @@ public static function tableName()\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property string $username\\n+ * @property string $auth_key\\n+ * @property string $password_hash\\n+ * @property string|null $password_reset_token\\n+ * @property string $email\\n+ * @property int $role\\n+ * @property int $status\\n+ * @property int $created_at\\n+ * @property int $updated_at\\n+ */\\n class UserAR extends ActiveRecord\\n {\\n public const STATUS_DELETED = 0;\\n@@ -337,12 +351,12 @@ public function behaviors()\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array intarray_col\\n- * @property array textarray2_col\\n- * @property array json_col\\n- * @property array jsonb_col\\n- * @property array jsonarray_col\\n+ * @property int $id\\n+ * @property array $intarray_col\\n+ * @property array $textarray2_col\\n+ * @property array $json_col\\n+ * @property array $jsonb_col\\n+ * @property array $jsonarray_col\\n */\\n class ArrayAndJsonTypes extends ActiveRecord\\n {\\n\"\n },\n {\n \"subtask_id\": \"s12\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**`$id` should be documented as scalar, not array.**\\n\\nLine 354 documents `id` as `array`, which misleads static analysis for a primary-key field.\\n\\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n- * `@property` array $id\\n+ * `@property` int $id\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@property` int $id\\n * `@property` array $intarray_col\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/pgsql/ActiveRecordTest.php` around lines 354 - 355, The\\ndocblock incorrectly annotates the primary key as an arrayโupdate the `@property`\\nannotation for $id to a scalar type (e.g., \\\"@property int $id\\\" or \\\"@property\\nscalar $id\\\") instead of \\\"@property array $id\\\" in the ActiveRecordTest class\\ndocblock so static analysis treats the primary key as a scalar; leave \\\"@property\\narray $intarray_col\\\" unchanged.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\\nindex 545b6808165..6d149c9995b 100644\\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\\\yiiunit\\\\framework\\\\db\\\\ActiveRecordTest\\n \\n public function testBooleanAttribute(): void\\n {\\n- /** @var TestCase|ActiveRecordTestTrait $this */\\n-\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n $customer = new $customerClass();\\n $customer->name = 'boolean customer';\\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\\n \\n public function testFindAsArray(): void\\n {\\n- /** @var ActiveRecordInterface $customerClass */\\n $customerClass = $this->getCustomerClass();\\n \\n // asArray\\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property bool|null $bool_col\\n+ * @property bool|null $default_true\\n+ * @property bool|null $default_false\\n+ */\\n class BoolAR extends ActiveRecord\\n {\\n public static function tableName()\\n@@ -316,6 +318,18 @@ public static function tableName()\\n }\\n }\\n \\n+/**\\n+ * @property int $id\\n+ * @property string $username\\n+ * @property string $auth_key\\n+ * @property string $password_hash\\n+ * @property string|null $password_reset_token\\n+ * @property string $email\\n+ * @property int $role\\n+ * @property int $status\\n+ * @property int $created_at\\n+ * @property int $updated_at\\n+ */\\n class UserAR extends ActiveRecord\\n {\\n public const STATUS_DELETED = 0;\\n@@ -337,12 +351,12 @@ public function behaviors()\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array intarray_col\\n- * @property array textarray2_col\\n- * @property array json_col\\n- * @property array jsonb_col\\n- * @property array jsonarray_col\\n+ * @property int $id\\n+ * @property array $intarray_col\\n+ * @property array $textarray2_col\\n+ * @property array $json_col\\n+ * @property array $jsonb_col\\n+ * @property array $jsonarray_col\\n */\\n class ArrayAndJsonTypes extends ActiveRecord\\n {\\n\"\n },\n {\n \"subtask_id\": \"s12\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Incorrect PHPDoc type for primary key `id`.**\\n\\nLine 41 should use a scalar PK type instead of `array`.\\n\\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n- * `@property` array $id\\n+ * `@property` int $id\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@property` int $id\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/pgsql/BaseActiveRecordTest.php` at line 41, The PHPDoc for\\nthe primary key `id` is incorrect (declared as array); update the PHPDoc on\\nBaseActiveRecordTest to use a scalar PK type (e.g., \\\"@property int|string $id\\\"\\nor a single scalar type appropriate for your DB) so tools and static analyzers\\ntreat the id as a scalar rather than an array; locate the docblock containing\\n\\\"@property array $id\\\" and replace \\\"array\\\" with the chosen scalar type.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\nindex c0af29e83f1..dad892a4749 100644\\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\\n@@ -38,8 +38,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\\n \\n /**\\n * {@inheritdoc}\\n- * @property array id\\n- * @property array json_col\\n+ * @property int $id\\n+ * @property array $json_col\\n */\\n class ArrayAndJsonType extends ActiveRecord\\n {\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex a1ae1155dc9..d220536ddb5 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,11 +4,13 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n-- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n-- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n-- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n-- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Bug #20873: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20875: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20875: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20875: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20875: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #20878: Add `@param-out` annotation for `$models` in `yii\\db\\BaseActiveRecord::loadRelationsFor()` (mspirkov)\n+- Bug #20878: Fix `@var` annotation for `yii\\db\\Query::$from` (mspirkov)\n - Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \ndiff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php\nindex 3be60fbd81e..bd1e4ee22d7 100644\n--- a/framework/db/BaseActiveRecord.php\n+++ b/framework/db/BaseActiveRecord.php\n@@ -1817,12 +1817,16 @@ private function isValueDifferent($newValue, $oldValue)\n * }\n * ```\n *\n- * @param array|ActiveRecordInterface[] $models array of primary models. Each model should have the same type and can be:\n+ * @template TModels of array\n+ *\n+ * @param TModels $models array of primary models. Each model should have the same type and can be:\n * - an active record instance;\n * - active record instance represented by array (i.e. active record was loaded using [[ActiveQuery::asArray()]]).\n * @param string|array $relationNames the names of the relations of primary models to be loaded from database. See [[ActiveQueryInterface::with()]] on how to specify this argument.\n * @param bool $asArray whether to load each related model as an array or an object (if the relation itself does not specify that).\n * @since 2.0.50\n+ *\n+ * @param-out TModels $models\n */\n public static function loadRelationsFor(&$models, $relationNames, $asArray = false)\n {\ndiff --git a/framework/db/Query.php b/framework/db/Query.php\nindex 722bde08705..dbf9ab3b982 100644\n--- a/framework/db/Query.php\n+++ b/framework/db/Query.php\n@@ -70,7 +70,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface\n */\n public $distinct = false;\n /**\n- * @var array|null the table(s) to be selected from. For example, `['user', 'post']`.\n+ * @var array|string|null the table(s) to be selected from. For example, `['user', 'post']`.\n * This is used to construct the FROM clause in a SQL statement.\n * @see from()\n */\ndiff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon\nindex 13be3e5bae1..6be48e7c140 100644\n--- a/phpstan-baseline-7x.neon\n+++ b/phpstan-baseline-7x.neon\n@@ -77,3 +77,39 @@ parameters:\n \t\t\tidentifier: class.notFound\n \t\t\tcount: 1\n \t\t\tpath: tests/framework/behaviors/AttributeTypecastBehaviorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Off on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\IntBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant On on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\IntBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\stubs\\\\StringBackedStatus\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/ColumnSchemaBackedEnumTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\Status\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\StatusTypeInt\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to constant Active on an unknown class yiiunit\\\\framework\\\\db\\\\enums\\\\StatusTypeString\\.$#'\n+\t\t\tidentifier: class.notFound\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/db/CommandTest.php\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 608efda39af..7e5863e16c0 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -15,10 +15,9 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n+ - tests/framework/db/enums\n - tests/framework/*/stubs/*\n - tests/framework/*/mocks/*\n- # TODO: Analyze these directories\n- - tests/framework/db\n \n bootstrapFiles:\n - framework/BaseYii.php\n\ndiff --git a/tests/data/ar/Category.php b/tests/data/ar/Category.php\nindex 7472cfe7068..158862635cb 100644\n--- a/tests/data/ar/Category.php\n+++ b/tests/data/ar/Category.php\n@@ -13,6 +13,11 @@\n *\n * @property int $id\n * @property string $name\n+ *\n+ * @property-read Item[] $items\n+ * @property-read Item[] $limitedItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read Order[] $orders\n */\n class Category extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php\nindex 92321e8aa77..c3d78850105 100644\n--- a/tests/data/ar/Customer.php\n+++ b/tests/data/ar/Customer.php\n@@ -21,8 +21,21 @@\n * @property string $email\n * @property string $address\n * @property int $status\n+ * @property 1|0|'1'|'0'|bool $bool_status\n *\n * @method static CustomerQuery findBySql($sql, $params = [])\n+ *\n+ * @property-read Profile $profile\n+ * @property-read Order[] $ordersPlain\n+ * @property-read Order[] $orders\n+ * @property-read Order[] $expensiveOrders\n+ * @property-read Order[] $ordersWithItems\n+ * @property-read Order[] $expensiveOrdersWithNullFK\n+ * @property-read Order[] $ordersWithNullFK\n+ * @property-read Order[] $orders2\n+ * @property-read Item[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read Item[] $items\n */\n class Customer extends ActiveRecord\n {\n@@ -109,7 +122,7 @@ public function afterSave($insert, $changedAttributes): void\n \n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php\nindex c1447148e2d..21db28c8856 100644\n--- a/tests/data/ar/CustomerQuery.php\n+++ b/tests/data/ar/CustomerQuery.php\n@@ -14,7 +14,8 @@\n \n /**\n * CustomerQuery.\n- * @extends ActiveQuery<CustomerWithAlias>\n+ * @template TModel of Customer = Customer\n+ * @extends ActiveQuery<TModel>\n */\n class CustomerQuery extends ActiveQuery\n {\ndiff --git a/tests/data/ar/CustomerWithAlias.php b/tests/data/ar/CustomerWithAlias.php\nindex 99b78c1a300..81c766ae5e4 100644\n--- a/tests/data/ar/CustomerWithAlias.php\n+++ b/tests/data/ar/CustomerWithAlias.php\n@@ -2,34 +2,11 @@\n \n namespace yiiunit\\data\\ar;\n \n-/**\n- * Class Customer.\n- *\n- * @property int $id\n- * @property string $name\n- * @property string $email\n- * @property string $address\n- * @property int $status\n- *\n- * @method static CustomerQuery findBySql($sql, $params = [])\n- */\n-class CustomerWithAlias extends ActiveRecord\n+class CustomerWithAlias extends Customer\n {\n- public const STATUS_ACTIVE = 1;\n- public const STATUS_INACTIVE = 2;\n-\n- public $status2;\n-\n- public $sumTotal;\n-\n- public static function tableName()\n- {\n- return 'customer';\n- }\n-\n /**\n * {@inheritdoc}\n- * @return CustomerQuery\n+ * @return CustomerQuery<static>\n */\n public static function find()\n {\ndiff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php\nindex 7c66ed78f14..ce265ef98fa 100644\n--- a/tests/data/ar/DefaultPk.php\n+++ b/tests/data/ar/DefaultPk.php\n@@ -13,6 +13,7 @@\n *\n * @author Jan Waล <janek.jan@gmail.com>\n * @property int $id\n+ * @property string $type\n */\n class DefaultPk extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php\nindex cfd8345eb46..ff41d1da8a8 100644\n--- a/tests/data/ar/Item.php\n+++ b/tests/data/ar/Item.php\n@@ -14,6 +14,8 @@\n * @property int $id\n * @property string $name\n * @property int $category_id\n+ *\n+ * @property-read Category $category\n */\n class Item extends ActiveRecord\n {\ndiff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php\nindex ea9307e505b..c62f750eda6 100644\n--- a/tests/data/ar/NullValues.php\n+++ b/tests/data/ar/NullValues.php\n@@ -12,10 +12,10 @@\n * Class NullValues.\n *\n * @property int $id\n- * @property int $var1\n- * @property int $var2\n- * @property int $var3\n- * @property string $stringcol\n+ * @property int|null $var1\n+ * @property int|null $var2\n+ * @property int|null $var3\n+ * @property string|null $stringcol\n */\n class NullValues extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php\nindex 57c26a5aaeb..e2ebf0f462f 100644\n--- a/tests/data/ar/Order.php\n+++ b/tests/data/ar/Order.php\n@@ -18,9 +18,34 @@\n * @property int $created_at\n * @property string $total\n *\n+ * @property-read Customer $customer\n+ * @property-read Customer $customer2\n+ * @property-read Customer $virtualCustomer\n+ * @property-read Customer $customerJoinedWithProfile\n+ * @property-read Customer $customerJoinedWithProfileIndexOrdered\n+ * @property-read Item[] $books\n+ * @property-read Item[] $books2\n+ * @property-read Item[] $booksExplicit\n+ * @property-read Item[] $booksExplicitA\n+ * @property-read Item[] $bookItems\n+ * @property-read Item[] $booksViaTable\n+ * @property-read Item[] $booksWithNullFK\n+ * @property-read Item[] $booksWithNullFKViaTable\n * @property-read Item[] $expensiveItemsUsingViaWithCallable\n * @property-read Item[] $cheapItemsUsingViaWithCallable\n+ * @property-read Item[] $items\n * @property-read Item[] $itemsFor8\n+ * @property-read Item[] $itemsIndexed\n+ * @property-read Item[] $itemsInOrder1\n+ * @property-read Item[] $itemsInOrder2\n+ * @property-read Item[] $itemsWithNullFK\n+ * @property-read Item[] $limitedItems\n+ * @property-read Item[] $movieItems\n+ * @property-read OrderItem[] $orderItems\n+ * @property-read OrderItem[] $orderItems2\n+ * @property-read OrderItem[] $orderItems3\n+ * @property-read OrderItem[] $orderItemsWithNullFK\n+ * @property-read OrderItem[] $quantityOrderItems\n */\n class Order extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php\nindex 65747e34444..46446b0c1fc 100644\n--- a/tests/data/ar/OrderItem.php\n+++ b/tests/data/ar/OrderItem.php\n@@ -17,6 +17,12 @@\n * @property int $item_id\n * @property int $quantity\n * @property string $subtotal\n+ *\n+ * @property Order $order\n+ * @property Item $item\n+ * @property self $orderItemCompositeWithJoin\n+ * @property self $orderItemCompositeNoJoin\n+ * @property Order $custom\n */\n class OrderItem extends ActiveRecord\n {\ndiff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php\nindex 2da91a170a9..e4f8c34c66d 100644\n--- a/tests/data/ar/OrderWithConstructor.php\n+++ b/tests/data/ar/OrderWithConstructor.php\n@@ -20,7 +20,7 @@\n * @property int $created_at\n * @property string $total\n *\n- * @property OrderItemWithConstructor $orderItems\n+ * @property OrderItemWithConstructor[] $orderItems\n * @property CustomerWithConstructor $customer\n * @property CustomerWithConstructor $customerJoinedWithProfile\n */\ndiff --git a/tests/data/ar/TestTrigger.php b/tests/data/ar/TestTrigger.php\nindex d384f0a4f94..247913ed80c 100644\n--- a/tests/data/ar/TestTrigger.php\n+++ b/tests/data/ar/TestTrigger.php\n@@ -13,6 +13,7 @@\n *\n * @property int $id\n * @property string $stringcol\n+ * @property mixed $RV\n */\n class TestTrigger extends ActiveRecord\n {\ndiff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php\nindex 2ad398d5994..abc952f3277 100644\n--- a/tests/data/ar/Type.php\n+++ b/tests/data/ar/Type.php\n@@ -11,19 +11,20 @@\n /**\n * Model representing type table.\n *\n+ * @property string $bigint_col\n * @property int $int_col\n * @property int $int_col2 DEFAULT 1\n * @property int $smallint_col DEFAULT 1\n * @property string $char_col\n * @property string $char_col2 DEFAULT 'something'\n * @property string $char_col3\n- * @property float $float_col\n+ * @property float|numeric-string $float_col\n * @property float $float_col2 DEFAULT '1.23'\n * @property string $blob_col\n * @property float $numeric_col DEFAULT '33.22'\n * @property string $time DEFAULT '2002-01-01 00:00:00'\n- * @property bool $bool_col\n- * @property bool $bool_col2 DEFAULT 1\n+ * @property 1|0|'1'|'0'|bool $bool_col\n+ * @property 1|0|'1'|'0'|bool $bool_col2 DEFAULT 1\n */\n class Type extends ActiveRecord\n {\ndiff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php\nindex b62f2578306..1f31724a1eb 100644\n--- a/tests/framework/ar/ActiveRecordTestTrait.php\n+++ b/tests/framework/ar/ActiveRecordTestTrait.php\n@@ -11,7 +11,6 @@\n use yiiunit\\extensions\\redis\\ActiveRecordTest;\n use Exception;\n use yii\\base\\Event;\n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\BaseActiveRecord;\n use yii\\db\\Expression;\n use yiiunit\\data\\ar\\Customer;\n@@ -25,36 +24,43 @@\n * but also used in the test suites of `redis`, `mongodb`, `elasticsearch` and `sphinx` AR implementations\n * in the extensions.\n * @see https://github.com/yiisoft/yii2-redis/blob/a920547708c4a7091896923abc2499bc8c1c0a3b/tests/bootstrap.php#L17-L26\n+ *\n+ * @phpstan-require-extends TestCase\n */\n trait ActiveRecordTestTrait\n {\n- /** @var TestCase $this */\n /**\n * This method should return the classname of Customer class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getCustomerClass();\n \n /**\n * This method should return the classname of Order class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderClass();\n \n /**\n * This method should return the classname of OrderItem class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getOrderItemClass();\n \n /**\n * This method should return the classname of Item class.\n- * @return string\n+ * @return class-string<BaseActiveRecord>\n */\n abstract public function getItemClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderWithNullFKClass();\n \n+ /**\n+ * @return class-string<BaseActiveRecord>\n+ */\n abstract public function getOrderItemWithNullFKmClass();\n \n /**\n@@ -66,9 +72,7 @@ public function afterSave()\n \n public function testFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // find one\n $result = $customerClass::find();\n $this->assertInstanceOf('\\\\yii\\\\db\\\\ActiveQueryInterface', $result);\n@@ -129,7 +133,6 @@ public function testFind(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -165,7 +168,6 @@ public function testFindAsArray(): void\n \n public function testHasAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n $customer = new $customerClass();\n@@ -185,10 +187,8 @@ public function testHasAttribute(): void\n \n public function testFindScalar(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // query scalar\n $customerName = $customerClass::find()->where(['id' => 2])->scalar('name');\n $this->assertEquals('user2', $customerName);\n@@ -202,19 +202,15 @@ public function testFindScalar(): void\n \n public function testFindColumn(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], $customerClass::find()->orderBy(['name' => SORT_ASC])->column('name'));\n $this->assertEquals(['user3', 'user2', 'user1'], $customerClass::find()->orderBy(['name' => SORT_DESC])->column('name'));\n }\n \n public function testFindIndexBy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy\n $customers = $customerClass::find()->indexBy('name')->orderBy('id')->all();\n $this->assertCount(3, $customers);\n@@ -234,10 +230,8 @@ public function testFindIndexBy(): void\n \n public function testFindIndexByAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // indexBy + asArray\n $customers = $customerClass::find()->asArray()->indexBy('name')->all();\n $this->assertCount(3, $customers);\n@@ -281,9 +275,7 @@ public function testFindIndexByAsArray(): void\n \n public function testRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $this->assertFalse($customer->refresh());\n \n@@ -295,12 +287,9 @@ public function testRefresh(): void\n \n public function testEquals(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customerA = new $customerClass();\n $customerB = new $customerClass();\n $this->assertFalse($customerA->equals($customerB));\n@@ -323,10 +312,8 @@ public function testEquals(): void\n \n public function testFindCount(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(3, $customerClass::find()->count());\n \n $this->assertEquals(1, $customerClass::find()->where(['id' => 1])->count());\n@@ -343,10 +330,8 @@ public function testFindCount(): void\n \n public function testFindLimit(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // all()\n $customers = $customerClass::find()->all();\n $this->assertCount(3, $customers);\n@@ -390,10 +375,8 @@ public function testFindLimit(): void\n \n public function testFindComplexCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());\n $this->assertCount(2, $customerClass::find()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all());\n \n@@ -406,10 +389,8 @@ public function testFindComplexCondition(): void\n \n public function testFindNullValues(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $customer->name = null;\n $customer->save(false);\n@@ -422,10 +403,8 @@ public function testFindNullValues(): void\n \n public function testExists(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertTrue($customerClass::find()->where(['id' => 2])->exists());\n $this->assertFalse($customerClass::find()->where(['id' => 5])->exists());\n $this->assertTrue($customerClass::find()->where(['name' => 'user1'])->exists());\n@@ -438,10 +417,8 @@ public function testExists(): void\n \n public function testFindLazy(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertFalse($customer->isRelationPopulated('orders'));\n $orders = $customer->orders;\n@@ -466,12 +443,9 @@ public function testFindLazy(): void\n \n public function testFindEager(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -503,10 +477,8 @@ public function testFindEager(): void\n \n public function testFindLazyVia(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $this->assertEquals(1, $order->id);\n@@ -517,10 +489,8 @@ public function testFindLazyVia(): void\n \n public function testFindLazyVia2(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Order $order */\n $order = $orderClass::findOne(1);\n $order->id = 100;\n@@ -529,10 +499,8 @@ public function testFindLazyVia2(): void\n \n public function testFindEagerViaRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $orders = $orderClass::find()->with('items')->orderBy('id')->all();\n $this->assertCount(3, $orders);\n $order = $orders[0];\n@@ -545,10 +513,8 @@ public function testFindEagerViaRelation(): void\n \n public function testFindNestedRelation(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customers = $customerClass::find()->with('orders', 'orders.items')->indexBy('id')->all();\n ksort($customers);\n $this->assertCount(3, $customers);\n@@ -582,10 +548,8 @@ public function testFindNestedRelation(): void\n */\n public function testFindEagerViaRelationPreserveOrder(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n /*\n Item (name, category_id)\n@@ -645,7 +609,6 @@ public function testFindEagerViaRelationPreserveOrder(): void\n // different order in via table\n public function testFindEagerViaRelationPreserveOrderB(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $orders = $orderClass::find()->with('itemsInOrder2')->orderBy('created_at')->all();\n@@ -675,21 +638,16 @@ public function testFindEagerViaRelationPreserveOrderB(): void\n \n public function testLink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n \n // has many\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer->link('orders', $order);\n $this->afterSave();\n@@ -700,7 +658,7 @@ public function testLink(): void\n \n // belongs to\n $order = new $orderClass();\n- $order->total = 100;\n+ $order->total = '100';\n $this->assertTrue($order->isNewRecord);\n $customer = $customerClass::findOne(1);\n $this->assertNull($order->customer);\n@@ -728,16 +686,11 @@ public function testLink(): void\n \n public function testUnlink(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many without delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->ordersWithNullFK);\n@@ -779,20 +732,13 @@ public function testUnlink(): void\n \n public function testUnlinkAll(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderWithNullFKClass */\n $orderWithNullFKClass = $this->getOrderWithNullFKClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n- /** @var TestCase|ActiveRecordTestTrait $this */\n // has many with delete\n $customer = $customerClass::findOne(2);\n $this->assertCount(2, $customer->orders);\n@@ -845,11 +791,7 @@ public function testUnlinkAll(): void\n \n public function testUnlinkAllAndConditionSetNull(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderWithNullFKClass();\n \n // in this test all orders are owned by customer 1\n@@ -871,11 +813,7 @@ public function testUnlinkAllAndConditionSetNull(): void\n \n public function testUnlinkAllAndConditionDelete(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var BaseActiveRecord $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n \n // in this test all orders are owned by customer 1\n@@ -900,9 +838,7 @@ public function testUnlinkAllAndConditionDelete(): void\n \n public function testInsert(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->email = 'user4@example.com';\n $customer->name = 'user4';\n@@ -924,9 +860,7 @@ public function testInsert(): void\n \n public function testExplicitPkOnAutoIncrement(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->id = 1337;\n $customer->email = 'user1337@example.com';\n@@ -943,9 +877,7 @@ public function testExplicitPkOnAutoIncrement(): void\n \n public function testUpdate(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // save\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n@@ -986,9 +918,7 @@ public function testUpdate(): void\n \n public function testUpdateAttributes(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n /** @var Customer $customer */\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1021,9 +951,7 @@ public function testUpdateAttributes(): void\n \n public function testUpdateCounters(): void\n {\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // updateCounters\n $pk = ['order_id' => 2, 'item_id' => 4];\n $orderItem = $orderItemClass::findOne($pk);\n@@ -1052,9 +980,7 @@ public function testUpdateCounters(): void\n \n public function testDelete(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n // delete\n $customer = $customerClass::findOne(2);\n $this->assertInstanceOf($customerClass, $customer);\n@@ -1084,23 +1010,21 @@ public function testDelete(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = true;\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(1, $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = false;\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals(0, $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['status' => true])->all();\n $this->assertCount(2, $customers);\n@@ -1111,11 +1035,8 @@ public function testBooleanAttribute(): void\n \n public function testAfterFind(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var BaseActiveRecord $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterFindCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {\n@@ -1147,6 +1068,7 @@ public function testAfterFind(): void\n ], $afterFindCalls);\n $afterFindCalls = [];\n \n+ // @phpstan-ignore class.notFound (Installing yiisoft/yii2-redis for this line of code seems redundant, so we ignore this error)\n if ($this instanceof ActiveRecordTest) { // TODO redis does not support orderBy() yet\n $customer = $customerClass::find()->where(['id' => [1, 2]])->with('orders')->all();\n } else {\n@@ -1168,9 +1090,7 @@ public function testAfterFind(): void\n \n public function testAfterRefresh(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $afterRefreshCalls = [];\n Event::on(BaseActiveRecord::class, BaseActiveRecord::EVENT_AFTER_REFRESH, function ($event) use (&$afterRefreshCalls) {\n@@ -1189,9 +1109,7 @@ public function testAfterRefresh(): void\n \n public function testFindEmptyInCondition(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n- /** @var TestCase|ActiveRecordTestTrait $this */\n \n $customers = $customerClass::find()->where(['id' => [1]])->all();\n $this->assertCount(1, $customers);\n@@ -1208,9 +1126,6 @@ public function testFindEmptyInCondition(): void\n \n public function testFindEagerIndexBy(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\n@@ -1233,7 +1148,6 @@ public function testFindEagerIndexBy(): void\n \n public function testAttributeAccess(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $model = new $customerClass();\n \n@@ -1251,8 +1165,6 @@ public function testAttributeAccess(): void\n $baseModel = new $customerClass();\n $this->assertFalse($baseModel->hasProperty('unExistingColumn'));\n \n-\n- /** @var ActiveRecord $customer */\n $customer = new $customerClass();\n $this->assertInstanceOf($customerClass, $customer);\n \n@@ -1276,8 +1188,8 @@ public function testAttributeAccess(): void\n $this->assertFalse($customer->canSetProperty('orderItems'));\n \n try {\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n+ // @phpstan-ignore assign.propertyReadOnly (We intentionally assign a value to a read-only property to test the class's behavior in this case)\n $customer->orderItems = [new $itemClass()];\n $this->fail('setter call above MUST throw Exception');\n } catch (Exception $e) {\n@@ -1297,7 +1209,6 @@ public function testAttributeAccess(): void\n */\n public function testViaWithCallable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n /** @var Order $order */\ndiff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php\nindex 3baa552c7b8..e2293ce38e8 100644\n--- a/tests/framework/db/ActiveQueryTest.php\n+++ b/tests/framework/db/ActiveQueryTest.php\n@@ -294,9 +294,7 @@ public function testGetTableNamesWontFillFrom(): void\n */\n public function testDeeplyNestedTableRelationWith(): void\n {\n- /** @var Category $category */\n $categories = Category::find()->with('orders')->indexBy('id')->all();\n-\n $category = $categories[1];\n $this->assertNotNull($category);\n $orders = $category->orders;\ndiff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php\nindex 4427989a168..fd9cbeda278 100644\n--- a/tests/framework/db/ActiveRecordTest.php\n+++ b/tests/framework/db/ActiveRecordTest.php\n@@ -42,7 +42,6 @@\n use yiiunit\\data\\ar\\CroppedType;\n use yiiunit\\framework\\ar\\ActiveRecordTestTrait;\n use yiiunit\\framework\\db\\cubrid\\ActiveRecordTest as CubridActiveRecordTest;\n-use yiiunit\\TestCase;\n \n abstract class ActiveRecordTest extends DatabaseTestCase\n {\n@@ -57,6 +56,8 @@ protected function setUp(): void\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Customer>\n */\n public function getCustomerClass()\n {\n@@ -65,6 +66,8 @@ public function getCustomerClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Item>\n */\n public function getItemClass()\n {\n@@ -73,6 +76,8 @@ public function getItemClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<Order>\n */\n public function getOrderClass()\n {\n@@ -81,6 +86,8 @@ public function getOrderClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItem>\n */\n public function getOrderItemClass()\n {\n@@ -88,7 +95,9 @@ public function getOrderItemClass()\n }\n \n /**\n- * @return string\n+ * {@inheritdoc}\n+ *\n+ * @return class-string<Category>\n */\n public function getCategoryClass()\n {\n@@ -97,6 +106,8 @@ public function getCategoryClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderWithNullFK>\n */\n public function getOrderWithNullFKClass()\n {\n@@ -105,6 +116,8 @@ public function getOrderWithNullFKClass()\n \n /**\n * {@inheritdoc}\n+ *\n+ * @return class-string<OrderItemWithNullFK>\n */\n public function getOrderItemWithNullFKmClass()\n {\n@@ -154,7 +167,6 @@ public function testFindExists(): void\n \n public function testFindColumn(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n $this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->select('[[name]]')->column());\n $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['[[name]]' => SORT_DESC])->select('[[name]]')->column());\n }\n@@ -263,7 +275,6 @@ public function testDeeplyNestedTableRelation(): void\n */\n public function testDeeplyNestedTableRelation2(): void\n {\n- /** @var Category $category */\n $category = Category::findOne(1);\n $this->assertNotNull($category);\n $orders = $category->orders;\n@@ -335,8 +346,11 @@ public function testStoreEmpty(): void\n $record = new NullValues();\n \n // this is to simulate empty html form submission\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var1 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var2 = '';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $record->var3 = '';\n $record->stringcol = '';\n \n@@ -813,33 +827,14 @@ public function testJoinWithEager(): void\n $this->assertEquals($eagerItemsCount, $lazyItemsCount);\n }\n \n- public static function aliasMethodProvider(): array\n- {\n- return [\n- ['explicit'], // c\n- // ['querysyntax'], // {{@customer}}\n- // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated\n- // later getRelationAlias() could be added\n- ];\n- }\n-\n /**\n * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- * @dataProvider aliasMethodProvider\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n */\n- public function testJoinWithAlias($aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -850,13 +845,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -865,13 +854,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -880,13 +863,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -897,32 +874,15 @@ public function testJoinWithAlias($aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -930,48 +890,35 @@ public function testJoinWithAlias($aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n-\n- // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n+\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with count and query\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $count = $query->count('[[c.id]]');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $count = $query->count('{{@customer}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $count = $query->count($query->applyAlias('customer', 'id'));\n- }\n+ $count = $query->count('[[c.id]]');\n $this->assertEquals(3, $count);\n $orders = $query->all();\n $this->assertCount(3, $orders);\n@@ -980,28 +927,16 @@ public function testJoinWithAlias($aliasMethod): void\n /** @var Order $order */\n $order = Order::findOne(1);\n $customerQuery = $order->getCustomer()->innerJoinWith(['orders o'], false);\n- if ($aliasMethod === 'explicit') {\n- $customer = $customerQuery->where(['o.id' => 1])->one();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $customer = $customerQuery->where(['{{@order}}.id' => 1])->one();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $customer = $customerQuery->where([$query->applyAlias('order', 'id') => 1])->one();\n- }\n+ $customer = $customerQuery->where(['o.id' => 1])->one();\n $this->assertNotNull($customer);\n $this->assertEquals(1, $customer->id);\n \n // join with sub-relation called inside Closure\n $orders = Order::find()->joinWith([\n- 'items' => function (ActiveQuery $q) use ($aliasMethod) {\n+ 'items' => function (ActiveQuery $q) {\n $q->orderBy('item.id');\n $q->joinWith(['category c']);\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ])->orderBy('order.id')->all();\n $this->assertCount(1, $orders);\n@@ -1393,13 +1328,9 @@ public function testDefaultValues(): void\n \n public function testUnlinkAllViaTable(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemClass();\n- /** @var ActiveRecordInterface $itemClass */\n $itemClass = $this->getItemClass();\n- /** @var ActiveRecordInterface $orderItemsWithNullFKClass */\n $orderItemsWithNullFKClass = $this->getOrderItemWithNullFKmClass();\n \n // via table with delete\n@@ -1837,7 +1768,6 @@ public function testIndexByAfterLoadingRelations(): void\n */\n public function testNoTablenameReplacement(): void\n {\n- /** @var Customer $customer */\n $class = $this->getCustomerClass();\n $customer = new $class();\n $customer->name = 'Some {{weird}} name';\n@@ -2078,7 +2008,7 @@ public function testResetNotSavedRelation(): void\n {\n $order = new Order();\n $order->customer_id = 1;\n- $order->total = 0;\n+ $order->total = '0';\n \n $orderItem = new OrderItem();\n $order->orderItems;\n@@ -2147,7 +2077,6 @@ public static function providerForUnlinkDelete(): array\n */\n public function testUnlinkWithViaOnCondition($delete, $count): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n \n $order = $orderClass::findOne(2);\n@@ -2158,7 +2087,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\n $this->assertCount(0, $order->itemsFor8);\n $this->assertCount(2, $order->orderItemsWithNullFK);\n \n- /** @var ActiveRecordInterface $orderItemClass */\n $orderItemClass = $this->getOrderItemWithNullFKmClass();\n $this->assertCount(1, $orderItemClass::findAll([\n 'order_id' => 2,\n@@ -2172,7 +2100,6 @@ public function testUnlinkWithViaOnCondition($delete, $count): void\n \n public function testVirtualRelation(): void\n {\n- /** @var ActiveRecordInterface $orderClass */\n $orderClass = $this->getOrderClass();\n $order = $orderClass::findOne(2);\n $order->virtualCustomerId = $order->customer_id;\n@@ -2217,7 +2144,6 @@ public function testGetAttributeLabel($model): void\n public function testLoadRelations(): void\n {\n // Test eager loading relations for multiple primary models using loadRelationsFor().\n- /** @var Customer[] $customers */\n $customers = Customer::find()->all();\n Customer::loadRelationsFor($customers, ['orders.items']);\n foreach ($customers as $customer) {\n@@ -2228,7 +2154,6 @@ public function testLoadRelations(): void\n }\n \n // Test eager loading relations as arrays.\n- /** @var array $customers */\n $customers = Customer::find()->asArray(true)->all();\n Customer::loadRelationsFor($customers, ['orders.items' => function ($query) {\n $query->asArray(false);\ndiff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php\nindex 38b5ac5d5b8..ada47dd1067 100644\n--- a/tests/framework/db/CommandTest.php\n+++ b/tests/framework/db/CommandTest.php\n@@ -17,11 +17,13 @@\n use ArrayObject;\n use yii\\caching\\ArrayCache;\n use yii\\db\\Connection;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DataReader;\n use yii\\db\\Exception;\n use yii\\db\\Expression;\n use yii\\db\\Query;\n use yii\\db\\Schema;\n+use yii\\db\\TableSchema;\n \n abstract class CommandTest extends DatabaseTestCase\n {\n@@ -293,7 +295,7 @@ public function testFetchMode(): void\n // FETCH_NUM, customized in query method\n $sql = 'SELECT * FROM {{customer}}';\n $command = $db->createCommand($sql);\n- $result = $command->queryOne([], PDO::FETCH_NUM);\n+ $result = $command->queryOne(PDO::FETCH_NUM);\n $this->assertTrue(\\is_array($result) && isset($result[0]));\n }\n \n@@ -668,6 +670,9 @@ public function testInsertExpression(): void\n break;\n case 'oci':\n $expression = 'EXTRACT(YEAR FROM sysdate)';\n+ break;\n+ default:\n+ $this->fail(\"Unexpected driver name: {$this->driverName}\");\n }\n \n $command = $db->createCommand();\n@@ -1111,8 +1116,8 @@ public static function addPrimaryKeyProvider(): array\n public function testAddDropPrimaryKey(string $name, string $tableName, $pk): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1126,15 +1131,16 @@ public function testAddDropPrimaryKey(string $name, string $tableName, $pk): voi\n ],\n )->execute();\n \n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->addPrimaryKey($name, $tableName, $pk)->execute();\n-\n- $this->assertSame((array) $pk, $schema->getTablePrimaryKey($tableName, true)->columnNames);\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertSame((array) $pk, $primaryKey->columnNames);\n \n $db->createCommand()->dropPrimaryKey($name, $tableName)->execute();\n-\n- $this->assertNull($schema->getTablePrimaryKey($tableName, true));\n+ $primaryKey = $schema->getTablePrimaryKey($tableName, true);\n+ $this->assertNull($primaryKey);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1180,8 +1186,8 @@ public static function addForeignKeyProvider(): array\n public function testAddDropForeignKey(string $name, string $tableName, $fkColumns, $refColumns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1199,7 +1205,8 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->addForeignKey(\n $name,\n@@ -1209,12 +1216,13 @@ public function testAddDropForeignKey(string $name, string $tableName, $fkColumn\n (array) $refColumns,\n )->execute();\n \n- $this->assertSame((array) $fkColumns, $schema->getTableForeignKeys($tableName, true)[0]->columnNames);\n- $this->assertSame((array) $refColumns, $schema->getTableForeignKeys($tableName, true)[0]->foreignColumnNames);\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertSame((array) $fkColumns, $foreignKeys[0]->columnNames);\n+ $this->assertSame((array) $refColumns, $foreignKeys[0]->foreignColumnNames);\n \n $db->createCommand()->dropForeignKey($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableForeignKeys($tableName, true));\n+ $foreignKeys = $schema->getTableForeignKeys($tableName, true);\n+ $this->assertEmpty($foreignKeys);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1235,32 +1243,40 @@ public function testCreateDropIndex(): void\n 'int2' => 'integer not null',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n+\n $db->createCommand()->createIndex($name, $tableName, ['int1'])->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'])->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n $this->assertFalse($schema->getTableIndexes($tableName, true)[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n $db->createCommand()->createIndex($name, $tableName, ['int1'], true)->execute();\n- $this->assertEquals(['int1'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n \n $db->createCommand()->dropIndex($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableIndexes($tableName, true));\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEmpty($indexes);\n \n $db->createCommand()->createIndex($name, $tableName, ['int1', 'int2'], true)->execute();\n- $this->assertEquals(['int1', 'int2'], $schema->getTableIndexes($tableName, true)[0]->columnNames);\n- $this->assertTrue($schema->getTableIndexes($tableName, true)[0]->isUnique);\n+ $indexes = $schema->getTableIndexes($tableName, true);\n+ $this->assertEquals(['int1', 'int2'], $indexes[0]->columnNames);\n+ $this->assertTrue($indexes[0]->isUnique);\n }\n \n public static function addUniqueProvider(): array\n@@ -1297,8 +1313,8 @@ public static function addUniqueProvider(): array\n public function testAddDropUnique(string $name, string $tableName, $columns): void\n {\n $db = $this->getConnection(false);\n-\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1312,15 +1328,16 @@ public function testAddDropUnique(string $name, string $tableName, $columns): vo\n ],\n )->execute();\n \n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->addUnique($name, $tableName, $columns)->execute();\n-\n- $this->assertSame((array) $columns, $schema->getTableUniques($tableName, true)[0]->columnNames);\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertSame((array) $columns, $uniques[0]->columnNames);\n \n $db->createCommand()->dropUnique($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableUniques($tableName, true));\n+ $uniques = $schema->getTableUniques($tableName, true);\n+ $this->assertEmpty($uniques);\n \n $db->createCommand()->dropTable($tableName)->execute();\n }\n@@ -1337,6 +1354,7 @@ public function testAddDropCheck(): void\n $name = 'test_ck_constraint';\n \n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n@@ -1347,18 +1365,16 @@ public function testAddDropCheck(): void\n ['int1' => 'integer'],\n )->execute();\n \n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n \n $db->createCommand()->addCheck($name, $tableName, '[[int1]] > 1')->execute();\n-\n- $this->assertMatchesRegularExpression(\n- '/^.*int1.*>.*1.*$/',\n- $schema->getTableChecks($tableName, true)[0]->expression\n- );\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*int1.*>.*1.*$/', $checks[0]->expression);\n \n $db->createCommand()->dropCheck($name, $tableName)->execute();\n-\n- $this->assertEmpty($schema->getTableChecks($tableName, true));\n+ $checks = $schema->getTableChecks($tableName, true);\n+ $this->assertEmpty($checks);\n }\n \n public function testAddDropDefaultValue(): void\n@@ -1427,7 +1443,7 @@ public function testQueryCache(): void\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n \n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n- $db->cache(function (Connection $db) use ($command, $update) {\n+ $db->cache(function (Connection $db) use ($command) {\n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\n $this->assertEquals('user1', $command->noCache()->bindValue(':id', 1)->queryScalar());\n }, 10);\n@@ -1539,40 +1555,50 @@ public function testAutoRefreshTableSchema(): void\n $tableName = 'test';\n $fkName = 'test_fk';\n \n- if ($db->getSchema()->getTableSchema($tableName) !== null) {\n+ $schema = $db->getSchema();\n+\n+ if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\n }\n \n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n \n $db->createCommand()->createTable($tableName, [\n 'id' => 'pk',\n 'fk' => 'int',\n 'name' => 'string',\n ])->execute();\n- $initialSchema = $db->getSchema()->getTableSchema($tableName);\n+ $initialSchema = $schema->getTableSchema($tableName);\n $this->assertNotNull($initialSchema);\n \n $db->createCommand()->addColumn($tableName, 'value', 'integer')->execute();\n- $newSchema = $db->getSchema()->getTableSchema($tableName);\n+ $newSchema = $schema->getTableSchema($tableName);\n $this->assertNotEquals($initialSchema, $newSchema);\n \n if ($this->driverName !== 'sqlite') {\n $db->createCommand()->addForeignKey($fkName, $tableName, 'fk', $tableName, 'id')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->dropForeignKey($fkName, $tableName)->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->foreignKeys);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->foreignKeys);\n \n $db->createCommand()->addCommentOnColumn($tableName, 'id', 'Test comment')->execute();\n- $this->assertNotEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertNotEmpty($tableSchema->getColumn('id')->comment);\n \n $db->createCommand()->dropCommentFromColumn($tableName, 'id')->execute();\n- $this->assertEmpty($db->getSchema()->getTableSchema($tableName)->getColumn('id')->comment);\n+ /** @var TableSchema|null */\n+ $tableSchema = $schema->getTableSchema($tableName);\n+ $this->assertEmpty($tableSchema->getColumn('id')->comment);\n }\n \n $db->createCommand()->dropTable($tableName)->execute();\n- $this->assertNull($db->getSchema()->getTableSchema($tableName));\n+ $this->assertNull($schema->getTableSchema($tableName));\n }\n \n public function testTransaction(): void\ndiff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php\nindex 33450c53377..89d5e0811e6 100644\n--- a/tests/framework/db/GetTablesAliasTestTrait.php\n+++ b/tests/framework/db/GetTablesAliasTestTrait.php\n@@ -75,6 +75,7 @@ public function testGetTableNamesIsFromString(): void\n public function testGetTableNamesIsFromObjectGenerateException(): void\n {\n $query = $this->createQuery();\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $query->from = new stdClass();\n \n $this->expectException('\\yii\\base\\InvalidConfigException');\ndiff --git a/tests/framework/db/QueryTest.php b/tests/framework/db/QueryTest.php\nindex 6b007abe40d..f81bbfc7b0e 100644\n--- a/tests/framework/db/QueryTest.php\n+++ b/tests/framework/db/QueryTest.php\n@@ -722,7 +722,7 @@ public function testQueryCache(): void\n $this->assertEquals('user11', $query->where(['id' => 1])->scalar($db), 'When both Connection and Query have cache enabled, we get cached value');\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db), 'When Query has disabled cache, we get actual data');\n \n- $db->cache(function (Connection $db) use ($query, $update) {\n+ $db->cache(function (Connection $db) use ($query) {\n $this->assertEquals('user1', $query->noCache()->where(['id' => 1])->scalar($db));\n $this->assertEquals('user11', $query->cache()->where(['id' => 1])->scalar($db));\n }, 10);\ndiff --git a/tests/framework/db/SchemaTest.php b/tests/framework/db/SchemaTest.php\nindex ac722ae0625..a2eec6443cd 100644\n--- a/tests/framework/db/SchemaTest.php\n+++ b/tests/framework/db/SchemaTest.php\n@@ -18,6 +18,7 @@\n use yii\\db\\Expression;\n use yii\\db\\ForeignKeyConstraint;\n use yii\\db\\IndexConstraint;\n+use yii\\db\\pgsql\\ColumnSchema as PgsqlColumnSchema;\n use yii\\db\\Schema;\n use yii\\db\\TableSchema;\n \n@@ -121,10 +122,7 @@ public function testGetNonExistingTableSchema(): void\n \n public function testSchemaCache(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $schema->db->enableSchemaCache = true;\n@@ -536,6 +534,7 @@ public function testColumnSchema(): void\n $this->assertEquals($expected['defaultValue'], $column->defaultValue, \"defaultValue of column $name does not match.\");\n }\n if (isset($expected['dimension'])) { // PgSQL only\n+ $this->assertInstanceOf(PgsqlColumnSchema::class, $column);\n $this->assertSame($expected['dimension'], $column->dimension, \"dimension of column $name does not match\");\n }\n }\ndiff --git a/tests/framework/db/cubrid/SchemaTest.php b/tests/framework/db/cubrid/SchemaTest.php\nindex 2855a6733a8..3e405371f2c 100644\n--- a/tests/framework/db/cubrid/SchemaTest.php\n+++ b/tests/framework/db/cubrid/SchemaTest.php\n@@ -91,7 +91,7 @@ public static function constraintsProvider(): array\n {\n $result = parent::constraintsProvider();\n foreach ($result as $name => $constraints) {\n- $result[$name][2] = static::convertPropertiesToAnycase($constraints[2]);\n+ $result[$name][2] = self::convertPropertiesToAnycase($constraints[2]);\n }\n $result['1: check'][2] = false;\n unset($result['1: index'][2][0]);\n@@ -118,7 +118,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\n if (!$isProperty && \\is_array($object)) {\n $result = [];\n foreach ($object as $name => $value) {\n- $result[] = static::convertPropertiesToAnycase($value);\n+ $result[] = self::convertPropertiesToAnycase($value);\n }\n \n return $result;\n@@ -126,7 +126,7 @@ private static function convertPropertiesToAnycase($object, $isProperty = false)\n \n if (\\is_object($object)) {\n foreach (array_keys((array) $object) as $name) {\n- $object->$name = static::convertPropertiesToAnycase($object->$name, true);\n+ $object->$name = self::convertPropertiesToAnycase($object->$name, true);\n }\n } elseif (\\is_array($object) || \\is_string($object)) {\n $object = new AnyCaseValue($object);\ndiff --git a/tests/framework/db/mssql/ActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php\nindex ccb2b150652..df957efeabd 100644\n--- a/tests/framework/db/mssql/ActiveRecordTest.php\n+++ b/tests/framework/db/mssql/ActiveRecordTest.php\n@@ -50,10 +50,10 @@ public function testCastValues(): void\n $this->assertSame('1337', trim((string) $model->char_col));\n $this->assertSame('test', $model->char_col2);\n $this->assertSame('test123', $model->char_col3);\n- //$this->assertSame(3.742, $model->float_col);\n- //$this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame('3.742', $model->float_col);\n+ $this->assertSame(42.1337, $model->float_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n /**\ndiff --git a/tests/framework/db/mssql/CommandTest.php b/tests/framework/db/mssql/CommandTest.php\nindex 9198054fa74..162d2a436f5 100644\n--- a/tests/framework/db/mssql/CommandTest.php\n+++ b/tests/framework/db/mssql/CommandTest.php\n@@ -114,12 +114,16 @@ public function testAddDropDefaultValue(): void\n 'int1' => 'integer',\n ])->execute();\n \n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n+\n $db->createCommand()->addDefaultValue($name, $tableName, 'int1', 41)->execute();\n- $this->assertMatchesRegularExpression('/^.*41.*$/', $schema->getTableDefaultValues($tableName, true)[0]->value);\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertMatchesRegularExpression('/^.*41.*$/', $defaultValues[0]->value);\n \n $db->createCommand()->dropDefaultValue($name, $tableName)->execute();\n- $this->assertEmpty($schema->getTableDefaultValues($tableName, true));\n+ $defaultValues = $schema->getTableDefaultValues($tableName, true);\n+ $this->assertEmpty($defaultValues);\n }\n \n public static function batchInsertSqlProvider(): array\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 03e58a4fa6d..9927879e94b 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,6 +10,7 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Constraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n use yii\\db\\mssql\\TableSchema;\n@@ -50,10 +51,7 @@ public static function constraintsProvider(): array\n \n public function testGetStringFieldsSize(): void\n {\n- /** @var Connection $db */\n $db = $this->getConnection();\n-\n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $columns = $schema->getTableSchema('type', false)->columns;\n@@ -80,6 +78,8 @@ public function testGetStringFieldsSize(): void\n $expectedSize = null;\n $expectedDbType = 'text';\n break;\n+ default:\n+ $this->fail(\"Unexpected column name: {$name}\");\n }\n \n $this->assertEquals($expectedType, $type);\n@@ -328,6 +328,8 @@ public function testResolveTableNames(\n public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n+\n $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n $this->assertNotEmpty($primaryKeys);\n $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n@@ -359,6 +361,8 @@ public function testInsertWithCompositePrimaryKey(): void\n public function testGetViewNamesWithDefaultSchema(): void\n {\n $schema = $this->getConnection(true, true)->getSchema();\n+ $this->assertInstanceOf(Schema::class, $schema);\n+\n $viewNames = $schema->getViewNames();\n $this->assertContains('animal_view', $viewNames);\n }\ndiff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php\nindex 1509a57fc9b..65d5793c02d 100644\n--- a/tests/framework/db/mysql/ActiveRecordTest.php\n+++ b/tests/framework/db/mysql/ActiveRecordTest.php\n@@ -44,8 +44,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- //$this->assertSame(true, $model->bool_col);\n- //$this->assertSame(false, $model->bool_col2);\n+ $this->assertSame(1, $model->bool_col);\n+ $this->assertSame(0, $model->bool_col2);\n }\n \n public function testJsonColumn(): void\ndiff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php\nindex f77f6122607..a98f07d8fbd 100644\n--- a/tests/framework/db/mysql/CommandTest.php\n+++ b/tests/framework/db/mysql/CommandTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\db\\mysql;\n \n+use yii\\db\\ConstraintFinderInterface;\n+\n /**\n * @group db\n * @group mysql\n@@ -28,6 +30,7 @@ public function testAddDropCheckSeveral(): void\n \n $tableName = 'test_ck_several';\n $schema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $schema);\n \n if ($schema->getTableSchema($tableName) !== null) {\n $db->createCommand()->dropTable($tableName)->execute();\ndiff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php\nindex ed6bb74cecd..8008c52266e 100644\n--- a/tests/framework/db/mysql/connection/DeadLockTest.php\n+++ b/tests/framework/db/mysql/connection/DeadLockTest.php\n@@ -284,6 +284,8 @@ private function childrenUpdateLocked()\n * In case of error in child process its execution bubbles up to phpunit to continue\n * all the rest tests. So, all the rest tests in this case will run both in the child\n * and parent processes. Such mess must be prevented with child's own error handler.\n+ *\n+ * @phpstan-impure\n */\n private function setErrorHandler(): void\n {\ndiff --git a/tests/framework/db/oci/ActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php\nindex 98be9d4b110..693ffd3e845 100644\n--- a/tests/framework/db/oci/ActiveRecordTest.php\n+++ b/tests/framework/db/oci/ActiveRecordTest.php\n@@ -8,7 +8,6 @@\n \n namespace yiiunit\\framework\\db\\oci;\n \n-use yii\\db\\ActiveRecordInterface;\n use yii\\db\\ActiveQuery;\n use yiiunit\\data\\ar\\BitValues;\n use yiiunit\\data\\ar\\DefaultPk;\n@@ -50,8 +49,8 @@ public function testCastValues(): void\n $this->assertSame('test123', $model->char_col3);\n $this->assertSame(3.742, $model->float_col);\n $this->assertSame(42.1337, $model->float_col2);\n- $this->assertEquals('1', $model->bool_col);\n- $this->assertEquals('0', $model->bool_col2);\n+ $this->assertSame('1', $model->bool_col);\n+ $this->assertSame('0', $model->bool_col2);\n }\n \n public function testDefaultValues(): void\n@@ -81,7 +80,6 @@ public function testDefaultValues(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -156,23 +154,21 @@ public function testBit(): void\n */\n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n $customer->email = 'mail@example.com';\n- $customer->status = '1';\n+ $customer->status = 1;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('1', $customer->status);\n+ $this->assertSame(1, $customer->status);\n \n- $customer->status = '0';\n+ $customer->status = 0;\n $customer->save(false);\n \n $customer->refresh();\n- $this->assertEquals('0', $customer->status);\n+ $this->assertSame(0, $customer->status);\n \n $customers = $customerClass::find()->where(['[[status]]' => '1'])->all();\n $this->assertCount(2, $customers);\n@@ -181,23 +177,11 @@ public function testBooleanAttribute(): void\n $this->assertCount(1, $customers);\n }\n \n- /**\n- * Tests the alias syntax for joinWith: 'alias' => 'relation'.\n- * @dataProvider aliasMethodProvider\n- * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}\n- */\n- public function testJoinWithAlias($aliasMethod): void\n+ public function testJoinWithAlias(): void\n {\n // left join and eager loading\n- /** @var ActiveQuery $query */\n $query = Order::find()->joinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('c.id DESC, order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@customer}}.id DESC, {{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('customer', 'id') . ' DESC,' . $query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->orderBy('c.id DESC, order.id')->all();\n $this->assertCount(3, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -208,13 +192,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering and eager loading\n $query = Order::find()->innerJoinWith(['customer c']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -223,13 +201,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // inner join filtering without eager loading\n $query = Order::find()->innerJoinWith(['customer c'], false);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where('{{@customer}}.[[id]]=2')->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('customer', 'id') => 2])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where('{{c}}.[[id]]=2')->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(2, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -238,13 +210,7 @@ public function testJoinWithAlias($aliasMethod): void\n \n // join with via-relation\n $query = Order::find()->innerJoinWith(['books b']);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->where(['{{@item}}.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('{{@order}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->where([$query->applyAlias('book', 'name') => 'Yii 1.1 Application Development Cookbook'])->orderBy($query->applyAlias('order', 'id'))->all();\n- }\n+ $orders = $query->where(['b.name' => 'Yii 1.1 Application Development Cookbook'])->orderBy('order.id')->all();\n $this->assertCount(2, $orders);\n $this->assertEquals(1, $orders[0]->id);\n $this->assertEquals(3, $orders[1]->id);\n@@ -255,32 +221,14 @@ public function testJoinWithAlias($aliasMethod): void\n \n // joining sub relations\n $query = Order::find()->innerJoinWith([\n- 'items i' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->orderBy('{{i}}.id');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->orderBy('{{@item}}.id');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->orderBy($q->applyAlias('item', 'id'));\n- }\n+ 'items i' => function (ActiveQuery $q) {\n+ $q->orderBy('{{i}}.id');\n },\n- 'items.category c' => function (ActiveQuery $q) use ($aliasMethod) {\n- if ($aliasMethod === 'explicit') {\n- $q->where('{{c}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'querysyntax') {\n- $q->where('{{@category}}.[[id]] = 2');\n- } elseif ($aliasMethod === 'applyAlias') {\n- $q->where([$q->applyAlias('category', 'id') => 2]);\n- }\n+ 'items.category c' => function (ActiveQuery $q) {\n+ $q->where('{{c}}.[[id]] = 2');\n },\n ]);\n- if ($aliasMethod === 'explicit') {\n- $orders = $query->orderBy('{{i}}.id')->all();\n- } elseif ($aliasMethod === 'querysyntax') {\n- $orders = $query->orderBy('{{@item}}.id')->all();\n- } elseif ($aliasMethod === 'applyAlias') {\n- $orders = $query->orderBy($query->applyAlias('item', 'id'))->all();\n- }\n+ $orders = $query->orderBy('{{i}}.id')->all();\n $this->assertCount(1, $orders);\n $this->assertTrue($orders[0]->isRelationPopulated('items'));\n $this->assertEquals(2, $orders[0]->id);\n@@ -288,36 +236,31 @@ public function testJoinWithAlias($aliasMethod): void\n $this->assertTrue($orders[0]->items[0]->isRelationPopulated('category'));\n $this->assertEquals(2, $orders[0]->items[0]->category->id);\n \n- // join with ON condition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod);\n- $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicit';\n+ $orders = Order::find()->joinWith([\"$relationName b\"])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n \n // join with ON condition and alias in relation definition\n- if ($aliasMethod === 'explicit' || $aliasMethod === 'querysyntax') {\n- $relationName = 'books' . ucfirst($aliasMethod) . 'A';\n- $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n- $this->assertCount(3, $orders);\n- $this->assertEquals(1, $orders[0]->id);\n- $this->assertEquals(2, $orders[1]->id);\n- $this->assertEquals(3, $orders[2]->id);\n- $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n- $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n- $this->assertCount(2, $orders[0]->$relationName);\n- $this->assertCount(0, $orders[1]->$relationName);\n- $this->assertCount(1, $orders[2]->$relationName);\n- }\n+ $relationName = 'booksExplicitA';\n+ $orders = Order::find()->joinWith([(string)$relationName])->orderBy('order.id')->all();\n+ $this->assertCount(3, $orders);\n+ $this->assertEquals(1, $orders[0]->id);\n+ $this->assertEquals(2, $orders[1]->id);\n+ $this->assertEquals(3, $orders[2]->id);\n+ $this->assertTrue($orders[0]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[1]->isRelationPopulated($relationName));\n+ $this->assertTrue($orders[2]->isRelationPopulated($relationName));\n+ $this->assertCount(2, $orders[0]->$relationName);\n+ $this->assertCount(0, $orders[1]->$relationName);\n+ $this->assertCount(1, $orders[2]->$relationName);\n }\n }\ndiff --git a/tests/framework/db/oci/CommandTest.php b/tests/framework/db/oci/CommandTest.php\nindex 4d881f93482..54566dd9f0b 100644\n--- a/tests/framework/db/oci/CommandTest.php\n+++ b/tests/framework/db/oci/CommandTest.php\n@@ -150,7 +150,7 @@ public function testQueryCache(): void\n \n $this->assertEquals('user1', $command->bindValue(':id', 1)->queryScalar());\n \n- $db->cache(function (Connection $db) use ($update) {\n+ $db->cache(function (Connection $db) {\n $command = $db->createCommand('SELECT [[name]] FROM {{customer}} WHERE [[id]] = :id');\n \n $this->assertEquals('user11', $command->bindValue(':id', 1)->queryScalar());\ndiff --git a/tests/framework/db/oci/SchemaTest.php b/tests/framework/db/oci/SchemaTest.php\nindex e9edf8e2756..745ba8f8a7d 100644\n--- a/tests/framework/db/oci/SchemaTest.php\n+++ b/tests/framework/db/oci/SchemaTest.php\n@@ -10,6 +10,7 @@\n \n use Exception;\n use yii\\db\\CheckConstraint;\n+use yii\\db\\ConstraintFinderInterface;\n use yiiunit\\framework\\db\\AnyValue;\n \n /**\n@@ -196,7 +197,6 @@ public function testFindUniqueIndexes(): void\n 'someCol3' => 'string',\n ])->execute();\n \n- /** @var Schema $schema */\n $schema = $db->schema;\n \n $uniqueIndexes = $schema->findUniqueIndexes($schema->getTableSchema('uniqueIndex', true));\n@@ -240,8 +240,10 @@ public function testFindUniqueIndexes(): void\n public function testLobIndexesExcluded(): void\n {\n $db = $this->getConnection();\n+ $dbSchema = $db->getSchema();\n+ $this->assertInstanceOf(ConstraintFinderInterface::class, $dbSchema);\n \n- if ($db->getSchema()->getTableSchema('lob_test') !== null) {\n+ if ($dbSchema->getTableSchema('lob_test') !== null) {\n $db->createCommand()->dropTable('lob_test')->execute();\n }\n \n@@ -249,7 +251,7 @@ public function testLobIndexesExcluded(): void\n 'CREATE TABLE \"lob_test\" (\"id\" NUMBER(10) NOT NULL, \"content\" CLOB, \"data\" BLOB, PRIMARY KEY (\"id\"))'\n )->execute();\n \n- $indexes = $db->getSchema()->getTableIndexes('lob_test', true);\n+ $indexes = $dbSchema->getTableIndexes('lob_test', true);\n \n $this->assertCount(1, $indexes);\n \ndiff --git a/tests/framework/db/pgsql/ActiveFixtureTest.php b/tests/framework/db/pgsql/ActiveFixtureTest.php\nindex 281874d55e3..5c8f4a99398 100644\n--- a/tests/framework/db/pgsql/ActiveFixtureTest.php\n+++ b/tests/framework/db/pgsql/ActiveFixtureTest.php\n@@ -8,7 +8,9 @@\n \n namespace yiiunit\\framework\\db\\pgsql;\n \n+use yiiunit\\data\\ar\\Customer;\n use yiiunit\\framework\\test\\CustomerDbTestCase;\n+use yiiunit\\framework\\test\\CustomerFixture;\n \n /**\n * @group db\n@@ -24,10 +26,15 @@ public function testFixturesLoadingResetsSeqence(): void\n $test = new CustomerDbTestCase();\n $test->setUp();\n $fixture = $test->getFixture('customers');\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n \n $sequenceName = $fixture->getTableSchema()->sequenceName;\n $sequenceNextVal = $this->getConnection()->createCommand(\"SELECT currval('$sequenceName')\")->queryScalar();\n- $this->assertEquals($fixture->getModel('customer2')->id + 1, $sequenceNextVal);\n+\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+\n+ $this->assertEquals($customer2->id + 1, $sequenceNextVal);\n \n $test->tearDown();\n }\ndiff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php\nindex 545b6808165..6d149c9995b 100644\n--- a/tests/framework/db/pgsql/ActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/ActiveRecordTest.php\n@@ -29,9 +29,6 @@ class ActiveRecordTest extends \\yiiunit\\framework\\db\\ActiveRecordTest\n \n public function testBooleanAttribute(): void\n {\n- /** @var TestCase|ActiveRecordTestTrait $this */\n-\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n $customer = new $customerClass();\n $customer->name = 'boolean customer';\n@@ -57,7 +54,6 @@ public function testBooleanAttribute(): void\n \n public function testFindAsArray(): void\n {\n- /** @var ActiveRecordInterface $customerClass */\n $customerClass = $this->getCustomerClass();\n \n // asArray\n@@ -308,6 +304,12 @@ public static function arrayValuesProvider(): array\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property bool|null $bool_col\n+ * @property bool|null $default_true\n+ * @property bool|null $default_false\n+ */\n class BoolAR extends ActiveRecord\n {\n public static function tableName()\n@@ -316,6 +318,18 @@ public static function tableName()\n }\n }\n \n+/**\n+ * @property int $id\n+ * @property string $username\n+ * @property string $auth_key\n+ * @property string $password_hash\n+ * @property string|null $password_reset_token\n+ * @property string $email\n+ * @property int $role\n+ * @property int $status\n+ * @property int $created_at\n+ * @property int $updated_at\n+ */\n class UserAR extends ActiveRecord\n {\n public const STATUS_DELETED = 0;\n@@ -337,12 +351,12 @@ public function behaviors()\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array intarray_col\n- * @property array textarray2_col\n- * @property array json_col\n- * @property array jsonb_col\n- * @property array jsonarray_col\n+ * @property int $id\n+ * @property array $intarray_col\n+ * @property array $textarray2_col\n+ * @property array $json_col\n+ * @property array $jsonb_col\n+ * @property array $jsonarray_col\n */\n class ArrayAndJsonTypes extends ActiveRecord\n {\ndiff --git a/tests/framework/db/pgsql/BaseActiveRecordTest.php b/tests/framework/db/pgsql/BaseActiveRecordTest.php\nindex c0af29e83f1..dad892a4749 100644\n--- a/tests/framework/db/pgsql/BaseActiveRecordTest.php\n+++ b/tests/framework/db/pgsql/BaseActiveRecordTest.php\n@@ -38,8 +38,8 @@ public function testJsonDirtyAttributesWithDataChange($actual, $modified): void\n \n /**\n * {@inheritdoc}\n- * @property array id\n- * @property array json_col\n+ * @property int $id\n+ * @property array $json_col\n */\n class ArrayAndJsonType extends ActiveRecord\n {\n"},"num_subtasks":{"kind":"number","value":12,"string":"12"},"num_changed_files":{"kind":"number","value":37,"string":"37"}}},{"rowIdx":34263,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20877"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20877,"string":"20,877"},"base_sha":{"kind":"string","value":"95d8df577f6d0e49b2b3539b67cbbf8fc8de0514"},"head_sha":{"kind":"string","value":"c360844a44762d80f3c92151e0b136a84a1b6987"},"task":{"kind":"string","value":"Fix #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues | #7616 \r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `framework/` needed for: Fix #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/web/` needed for: Fix #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output","scope_files":["framework/web/ErrorHandler.php","framework/web/ErrorHandlerRenderEvent.php"]},{"subtask_id":"s3","goal":"Implement the changes under `tests/framework/web/` needed for: Fix #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output","scope_files":["tests/framework/web/ErrorHandlerTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `framework/` needed for: Fix #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/web/` needed for: Fix #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output\",\n \"scope_files\": [\n \"framework/web/ErrorHandler.php\",\n \"framework/web/ErrorHandlerRenderEvent.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `tests/framework/web/` needed for: Fix #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output\",\n \"scope_files\": [\n \"tests/framework/web/ErrorHandlerTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 0d83c0d7557..a1ae1155dc9 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -9,6 +9,7 @@ Yii Framework 2 Change Log\n - Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n - Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n - Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s2","scope_files":["framework/web/ErrorHandler.php","framework/web/ErrorHandlerRenderEvent.php"],"solution_diff":"diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\nindex a383725a073..517f6dee23b 100644\n--- a/framework/web/ErrorHandler.php\n+++ b/framework/web/ErrorHandler.php\n@@ -8,12 +8,15 @@\n \n namespace yii\\web;\n \n+use Throwable;\n use Yii;\n use yii\\base\\ErrorException;\n use yii\\base\\Exception;\n use yii\\base\\UserException;\n use yii\\helpers\\VarDumper;\n \n+use function is_string;\n+\n /**\n * ErrorHandler handles uncaught PHP errors and exceptions.\n *\n@@ -31,6 +34,15 @@\n */\n class ErrorHandler extends \\yii\\base\\ErrorHandler\n {\n+ /**\n+ * @event ErrorHandlerRenderEvent an event that is triggered after HTML error content is rendered.\n+ *\n+ * Event handlers may modify [[ErrorHandlerRenderEvent::$output]].\n+ *\n+ * @since 2.0.56\n+ */\n+ public const EVENT_AFTER_RENDER = 'afterRender';\n+\n /**\n * @var int maximum number of source code lines to be displayed. Defaults to 19.\n */\n@@ -136,6 +148,14 @@ protected function renderException($exception)\n $response->data = $this->convertExceptionToArray($exception);\n }\n \n+ if ($response->format === Response::FORMAT_HTML) {\n+ if (is_string($response->data)) {\n+ $response->data = $this->triggerAfterRender($exception, $response->data);\n+ } elseif (is_string($response->content)) {\n+ $response->content = $this->triggerAfterRender($exception, $response->content);\n+ }\n+ }\n+\n $response->send();\n }\n \n@@ -186,6 +206,25 @@ public function htmlEncode($text)\n return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');\n }\n \n+ /**\n+ * Triggers [[EVENT_AFTER_RENDER]] and returns the final HTML content.\n+ *\n+ * @since 2.0.56\n+ */\n+ protected function triggerAfterRender(Throwable $exception, string $output): string\n+ {\n+ if ($this->hasEventHandlers(self::EVENT_AFTER_RENDER)) {\n+ $event = new ErrorHandlerRenderEvent();\n+ $event->exception = $exception;\n+ $event->output = $output;\n+ $this->trigger(self::EVENT_AFTER_RENDER, $event);\n+\n+ return $event->output;\n+ }\n+\n+ return $output;\n+ }\n+\n /**\n * Adds informational links to the given PHP type/class.\n * @param string $code type/class name to be linkified.\ndiff --git a/framework/web/ErrorHandlerRenderEvent.php b/framework/web/ErrorHandlerRenderEvent.php\nnew file mode 100644\nindex 00000000000..ff03b6e85ba\n--- /dev/null\n+++ b/framework/web/ErrorHandlerRenderEvent.php\n@@ -0,0 +1,30 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yii\\web;\n+\n+use Throwable;\n+use yii\\base\\Event;\n+\n+/**\n+ * ErrorHandlerRenderEvent represents events triggered by [[ErrorHandler]].\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ */\n+class ErrorHandlerRenderEvent extends Event\n+{\n+ /**\n+ * @var \\Throwable|null Exception being rendered.\n+ */\n+ public ?Throwable $exception = null;\n+ /**\n+ * @var string Rendered HTML output.\n+ */\n+ public string $output = '';\n+}\n\n","summary":"Edited 2 file(s) in framework/web/"},{"subtask_id":"s3","scope_files":["tests/framework/web/ErrorHandlerTest.php"],"solution_diff":"diff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex 06022646645..1e98bb3e9aa 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -13,6 +13,7 @@\n use yii\\base\\ErrorException;\n use yii\\web\\Application;\n use Yii;\n+use yii\\web\\ErrorHandlerRenderEvent;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\View;\n use yiiunit\\TestCase;\n@@ -124,6 +125,80 @@ public function testClearAssetFilesInErrorActionView(): void\n $this->assertStringNotContainsString('<script', $out);\n }\n \n+ public function testAfterRenderEventCanModifyOutput(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $exception = new Exception('Some Exception');\n+\n+ $actualException = null;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\n+ $actualException = $event->exception;\n+ $event->output .= \"\\n<!--after-render-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertSame($exception, $actualException);\n+ $this->assertStringContainsString('<!--after-render-->', Yii::$app->response->data);\n+ }\n+\n+ public function testAfterRenderEventCanModifyOutputInErrorActionView(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+ $handler->errorAction = 'test/error';\n+\n+ $exception = new NotFoundHttpException('Resource not found');\n+\n+ $actualException = null;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\n+ $actualException = $event->exception;\n+ $event->output .= \"\\n<!--after-render-error-action-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertSame($exception, $actualException);\n+ $this->assertStringContainsString('<!--after-render-error-action-->', Yii::$app->response->data);\n+ }\n+\n+ public function testAfterRenderEventCanModifyOutputForPhpErrors(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $exception = new ErrorException('PHP Warning', E_WARNING, E_WARNING, __FILE__, __LINE__);\n+\n+ $handler->exception = $exception;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event): void {\n+ $event->output .= \"\\n<!--php-error-after-render-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertStringContainsString('<!--php-error-after-render-->', Yii::$app->response->data);\n+ }\n+\n public function testRenderCallStackItem(): void\n {\n $handler = Yii::$app->getErrorHandler();\n","summary":"Edited 1 file(s) in tests/framework/web/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 0d83c0d7557..a1ae1155dc9 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -9,6 +9,7 @@ Yii Framework 2 Change Log\\n - Bug #20785: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n - Bug #20785: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n - Enh #20785: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+- Enh #7616: Add `yii\\\\web\\\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\\\web\\\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/web/ErrorHandler.php\",\n \"framework/web/ErrorHandlerRenderEvent.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\\nindex a383725a073..517f6dee23b 100644\\n--- a/framework/web/ErrorHandler.php\\n+++ b/framework/web/ErrorHandler.php\\n@@ -8,12 +8,15 @@\\n \\n namespace yii\\\\web;\\n \\n+use Throwable;\\n use Yii;\\n use yii\\\\base\\\\ErrorException;\\n use yii\\\\base\\\\Exception;\\n use yii\\\\base\\\\UserException;\\n use yii\\\\helpers\\\\VarDumper;\\n \\n+use function is_string;\\n+\\n /**\\n * ErrorHandler handles uncaught PHP errors and exceptions.\\n *\\n@@ -31,6 +34,15 @@\\n */\\n class ErrorHandler extends \\\\yii\\\\base\\\\ErrorHandler\\n {\\n+ /**\\n+ * @event ErrorHandlerRenderEvent an event that is triggered after HTML error content is rendered.\\n+ *\\n+ * Event handlers may modify [[ErrorHandlerRenderEvent::$output]].\\n+ *\\n+ * @since 2.0.56\\n+ */\\n+ public const EVENT_AFTER_RENDER = 'afterRender';\\n+\\n /**\\n * @var int maximum number of source code lines to be displayed. Defaults to 19.\\n */\\n@@ -136,6 +148,14 @@ protected function renderException($exception)\\n $response->data = $this->convertExceptionToArray($exception);\\n }\\n \\n+ if ($response->format === Response::FORMAT_HTML) {\\n+ if (is_string($response->data)) {\\n+ $response->data = $this->triggerAfterRender($exception, $response->data);\\n+ } elseif (is_string($response->content)) {\\n+ $response->content = $this->triggerAfterRender($exception, $response->content);\\n+ }\\n+ }\\n+\\n $response->send();\\n }\\n \\n@@ -186,6 +206,25 @@ public function htmlEncode($text)\\n return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');\\n }\\n \\n+ /**\\n+ * Triggers [[EVENT_AFTER_RENDER]] and returns the final HTML content.\\n+ *\\n+ * @since 2.0.56\\n+ */\\n+ protected function triggerAfterRender(Throwable $exception, string $output): string\\n+ {\\n+ if ($this->hasEventHandlers(self::EVENT_AFTER_RENDER)) {\\n+ $event = new ErrorHandlerRenderEvent();\\n+ $event->exception = $exception;\\n+ $event->output = $output;\\n+ $this->trigger(self::EVENT_AFTER_RENDER, $event);\\n+\\n+ return $event->output;\\n+ }\\n+\\n+ return $output;\\n+ }\\n+\\n /**\\n * Adds informational links to the given PHP type/class.\\n * @param string $code type/class name to be linkified.\\ndiff --git a/framework/web/ErrorHandlerRenderEvent.php b/framework/web/ErrorHandlerRenderEvent.php\\nnew file mode 100644\\nindex 00000000000..ff03b6e85ba\\n--- /dev/null\\n+++ b/framework/web/ErrorHandlerRenderEvent.php\\n@@ -0,0 +1,30 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yii\\\\web;\\n+\\n+use Throwable;\\n+use yii\\\\base\\\\Event;\\n+\\n+/**\\n+ * ErrorHandlerRenderEvent represents events triggered by [[ErrorHandler]].\\n+ *\\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\\n+ * @since 2.0.56\\n+ */\\n+class ErrorHandlerRenderEvent extends Event\\n+{\\n+ /**\\n+ * @var \\\\Throwable|null Exception being rendered.\\n+ */\\n+ public ?Throwable $exception = null;\\n+ /**\\n+ * @var string Rendered HTML output.\\n+ */\\n+ public string $output = '';\\n+}\\n\\n\",\n \"summary\": \"Edited 2 file(s) in framework/web/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"tests/framework/web/ErrorHandlerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\\nindex 06022646645..1e98bb3e9aa 100644\\n--- a/tests/framework/web/ErrorHandlerTest.php\\n+++ b/tests/framework/web/ErrorHandlerTest.php\\n@@ -13,6 +13,7 @@\\n use yii\\\\base\\\\ErrorException;\\n use yii\\\\web\\\\Application;\\n use Yii;\\n+use yii\\\\web\\\\ErrorHandlerRenderEvent;\\n use yii\\\\web\\\\NotFoundHttpException;\\n use yii\\\\web\\\\View;\\n use yiiunit\\\\TestCase;\\n@@ -124,6 +125,80 @@ public function testClearAssetFilesInErrorActionView(): void\\n $this->assertStringNotContainsString('<script', $out);\\n }\\n \\n+ public function testAfterRenderEventCanModifyOutput(): void\\n+ {\\n+ /** @var ErrorHandler $handler */\\n+ $handler = Yii::$app->getErrorHandler();\\n+\\n+ $exception = new Exception('Some Exception');\\n+\\n+ $actualException = null;\\n+\\n+ $handler->on(\\n+ ErrorHandler::EVENT_AFTER_RENDER,\\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\\n+ $actualException = $event->exception;\\n+ $event->output .= \\\"\\\\n<!--after-render-->\\\";\\n+ }\\n+ );\\n+\\n+ ob_start(); // suppress response output\\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\\n+ ob_get_clean();\\n+\\n+ $this->assertSame($exception, $actualException);\\n+ $this->assertStringContainsString('<!--after-render-->', Yii::$app->response->data);\\n+ }\\n+\\n+ public function testAfterRenderEventCanModifyOutputInErrorActionView(): void\\n+ {\\n+ /** @var ErrorHandler $handler */\\n+ $handler = Yii::$app->getErrorHandler();\\n+ $handler->errorAction = 'test/error';\\n+\\n+ $exception = new NotFoundHttpException('Resource not found');\\n+\\n+ $actualException = null;\\n+\\n+ $handler->on(\\n+ ErrorHandler::EVENT_AFTER_RENDER,\\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\\n+ $actualException = $event->exception;\\n+ $event->output .= \\\"\\\\n<!--after-render-error-action-->\\\";\\n+ }\\n+ );\\n+\\n+ ob_start(); // suppress response output\\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\\n+ ob_get_clean();\\n+\\n+ $this->assertSame($exception, $actualException);\\n+ $this->assertStringContainsString('<!--after-render-error-action-->', Yii::$app->response->data);\\n+ }\\n+\\n+ public function testAfterRenderEventCanModifyOutputForPhpErrors(): void\\n+ {\\n+ /** @var ErrorHandler $handler */\\n+ $handler = Yii::$app->getErrorHandler();\\n+\\n+ $exception = new ErrorException('PHP Warning', E_WARNING, E_WARNING, __FILE__, __LINE__);\\n+\\n+ $handler->exception = $exception;\\n+\\n+ $handler->on(\\n+ ErrorHandler::EVENT_AFTER_RENDER,\\n+ static function (ErrorHandlerRenderEvent $event): void {\\n+ $event->output .= \\\"\\\\n<!--php-error-after-render-->\\\";\\n+ }\\n+ );\\n+\\n+ ob_start(); // suppress response output\\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\\n+ ob_get_clean();\\n+\\n+ $this->assertStringContainsString('<!--php-error-after-render-->', Yii::$app->response->data);\\n+ }\\n+\\n public function testRenderCallStackItem(): void\\n {\\n $handler = Yii::$app->getErrorHandler();\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/web/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 0d83c0d7557..a1ae1155dc9 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -9,6 +9,7 @@ Yii Framework 2 Change Log\n - Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n - Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n - Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+- Enh #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output (terabytesoftw)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\nindex a383725a073..517f6dee23b 100644\n--- a/framework/web/ErrorHandler.php\n+++ b/framework/web/ErrorHandler.php\n@@ -8,12 +8,15 @@\n \n namespace yii\\web;\n \n+use Throwable;\n use Yii;\n use yii\\base\\ErrorException;\n use yii\\base\\Exception;\n use yii\\base\\UserException;\n use yii\\helpers\\VarDumper;\n \n+use function is_string;\n+\n /**\n * ErrorHandler handles uncaught PHP errors and exceptions.\n *\n@@ -31,6 +34,15 @@\n */\n class ErrorHandler extends \\yii\\base\\ErrorHandler\n {\n+ /**\n+ * @event ErrorHandlerRenderEvent an event that is triggered after HTML error content is rendered.\n+ *\n+ * Event handlers may modify [[ErrorHandlerRenderEvent::$output]].\n+ *\n+ * @since 2.0.56\n+ */\n+ public const EVENT_AFTER_RENDER = 'afterRender';\n+\n /**\n * @var int maximum number of source code lines to be displayed. Defaults to 19.\n */\n@@ -136,6 +148,14 @@ protected function renderException($exception)\n $response->data = $this->convertExceptionToArray($exception);\n }\n \n+ if ($response->format === Response::FORMAT_HTML) {\n+ if (is_string($response->data)) {\n+ $response->data = $this->triggerAfterRender($exception, $response->data);\n+ } elseif (is_string($response->content)) {\n+ $response->content = $this->triggerAfterRender($exception, $response->content);\n+ }\n+ }\n+\n $response->send();\n }\n \n@@ -186,6 +206,25 @@ public function htmlEncode($text)\n return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');\n }\n \n+ /**\n+ * Triggers [[EVENT_AFTER_RENDER]] and returns the final HTML content.\n+ *\n+ * @since 2.0.56\n+ */\n+ protected function triggerAfterRender(Throwable $exception, string $output): string\n+ {\n+ if ($this->hasEventHandlers(self::EVENT_AFTER_RENDER)) {\n+ $event = new ErrorHandlerRenderEvent();\n+ $event->exception = $exception;\n+ $event->output = $output;\n+ $this->trigger(self::EVENT_AFTER_RENDER, $event);\n+\n+ return $event->output;\n+ }\n+\n+ return $output;\n+ }\n+\n /**\n * Adds informational links to the given PHP type/class.\n * @param string $code type/class name to be linkified.\ndiff --git a/framework/web/ErrorHandlerRenderEvent.php b/framework/web/ErrorHandlerRenderEvent.php\nnew file mode 100644\nindex 00000000000..ff03b6e85ba\n--- /dev/null\n+++ b/framework/web/ErrorHandlerRenderEvent.php\n@@ -0,0 +1,30 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yii\\web;\n+\n+use Throwable;\n+use yii\\base\\Event;\n+\n+/**\n+ * ErrorHandlerRenderEvent represents events triggered by [[ErrorHandler]].\n+ *\n+ * @author Wilmer Arambula <terabytesoftw@gmail.com>\n+ * @since 2.0.56\n+ */\n+class ErrorHandlerRenderEvent extends Event\n+{\n+ /**\n+ * @var \\Throwable|null Exception being rendered.\n+ */\n+ public ?Throwable $exception = null;\n+ /**\n+ * @var string Rendered HTML output.\n+ */\n+ public string $output = '';\n+}\n\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex 06022646645..1e98bb3e9aa 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -13,6 +13,7 @@\n use yii\\base\\ErrorException;\n use yii\\web\\Application;\n use Yii;\n+use yii\\web\\ErrorHandlerRenderEvent;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\View;\n use yiiunit\\TestCase;\n@@ -124,6 +125,80 @@ public function testClearAssetFilesInErrorActionView(): void\n $this->assertStringNotContainsString('<script', $out);\n }\n \n+ public function testAfterRenderEventCanModifyOutput(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $exception = new Exception('Some Exception');\n+\n+ $actualException = null;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\n+ $actualException = $event->exception;\n+ $event->output .= \"\\n<!--after-render-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertSame($exception, $actualException);\n+ $this->assertStringContainsString('<!--after-render-->', Yii::$app->response->data);\n+ }\n+\n+ public function testAfterRenderEventCanModifyOutputInErrorActionView(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+ $handler->errorAction = 'test/error';\n+\n+ $exception = new NotFoundHttpException('Resource not found');\n+\n+ $actualException = null;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event) use (&$actualException): void {\n+ $actualException = $event->exception;\n+ $event->output .= \"\\n<!--after-render-error-action-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertSame($exception, $actualException);\n+ $this->assertStringContainsString('<!--after-render-error-action-->', Yii::$app->response->data);\n+ }\n+\n+ public function testAfterRenderEventCanModifyOutputForPhpErrors(): void\n+ {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $exception = new ErrorException('PHP Warning', E_WARNING, E_WARNING, __FILE__, __LINE__);\n+\n+ $handler->exception = $exception;\n+\n+ $handler->on(\n+ ErrorHandler::EVENT_AFTER_RENDER,\n+ static function (ErrorHandlerRenderEvent $event): void {\n+ $event->output .= \"\\n<!--php-error-after-render-->\";\n+ }\n+ );\n+\n+ ob_start(); // suppress response output\n+ $this->invokeMethod($handler, 'renderException', [$exception]);\n+ ob_get_clean();\n+\n+ $this->assertStringContainsString('<!--php-error-after-render-->', Yii::$app->response->data);\n+ }\n+\n public function testRenderCallStackItem(): void\n {\n $handler = Yii::$app->getErrorHandler();\n"},"num_subtasks":{"kind":"number","value":3,"string":"3"},"num_changed_files":{"kind":"number","value":4,"string":"4"}}},{"rowIdx":34264,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20876"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20876,"string":"20,876"},"base_sha":{"kind":"string","value":"532d02f22f4df59ec9cec3a3c8ae27b4585841fa"},"head_sha":{"kind":"string","value":"fd73f904838fd358b2920a4f171d6997545858d5"},"task":{"kind":"string","value":"Sync to master brach.\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Sync to master brach.","scope_files":[".git-blame-ignore-revs","composer.lock","phpstan-baseline.neon","phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `build/controllers/` needed for: Sync to master brach.","scope_files":["build/controllers/MimeTypeController.php","build/controllers/PhpDocController.php"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/` needed for: Sync to master brach.","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s4","goal":"Implement the changes under `framework/base/` needed for: Sync to master brach.","scope_files":["framework/base/Model.php","framework/base/View.php"]},{"subtask_id":"s5","goal":"Implement the changes under `framework/db/` needed for: Sync to master brach.","scope_files":["framework/db/Connection.php"]},{"subtask_id":"s6","goal":"Implement the changes under `framework/log/` needed for: Sync to master brach.","scope_files":["framework/log/Target.php"]},{"subtask_id":"s7","goal":"Implement the changes under `framework/validators/` needed for: Sync to master brach.","scope_files":["framework/validators/CompareValidator.php","framework/validators/Validator.php"]},{"subtask_id":"s8","goal":"Implement the changes under `framework/web/` needed for: Sync to master brach.","scope_files":["framework/web/ErrorHandler.php"]},{"subtask_id":"s9","goal":"Implement the changes under `tests/base/log/` needed for: Sync to master brach.","scope_files":["tests/base/log/BaseDbTarget.php"]},{"subtask_id":"s10","goal":"Implement the changes under `tests/base/validators/` needed for: Sync to master brach.","scope_files":["tests/base/validators/BaseUniqueValidator.php"]},{"subtask_id":"s11","goal":"Implement the changes under `tests/base/web/` needed for: Sync to master brach.","scope_files":["tests/base/web/BaseFormatter.php"]},{"subtask_id":"s12","goal":"Implement the changes under `tests/base/web/session/` needed for: Sync to master brach.","scope_files":["tests/base/web/session/BaseDbSession.php"]},{"subtask_id":"s13","goal":"Implement the changes under `tests/data/ar/` needed for: Sync to master brach.","scope_files":["tests/data/ar/Cat.php"]},{"subtask_id":"s14","goal":"Implement the changes under `tests/data/validators/models/` needed for: Sync to master brach.","scope_files":["tests/data/validators/models/FakedValidationModel.php","tests/data/validators/models/ValidatorTestMainModel.php","tests/data/validators/models/ValidatorTestRefModel.php"]},{"subtask_id":"s15","goal":"Implement the changes under `tests/framework/base/` needed for: Sync to master brach.","scope_files":["tests/framework/base/BaseObjectTest.php","tests/framework/base/BehaviorTest.php","tests/framework/base/ComponentTest.php","tests/framework/base/DynamicModelTest.php","tests/framework/base/ModelTest.php","tests/framework/base/ViewTest.php"]},{"subtask_id":"s16","goal":"Implement the changes under `tests/framework/base/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/base/stubs/AnonymousComponentClass.php","tests/framework/base/stubs/AnonymousModelClass.php"]},{"subtask_id":"s17","goal":"Implement the changes under `tests/framework/console/` needed for: Sync to master brach.","scope_files":["tests/framework/console/ControllerTest.php"]},{"subtask_id":"s18","goal":"Implement the changes under `tests/framework/console/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/console/stubs/FakeController.php","tests/framework/console/stubs/FakeHelpController.php","tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php","tests/framework/console/stubs/FakeInjectionController.php"]},{"subtask_id":"s19","goal":"Implement the changes under `tests/framework/db/mssql/` needed for: Sync to master brach.","scope_files":["tests/framework/db/mssql/QueryBuilderTest.php","tests/framework/db/mssql/SchemaTest.php"]},{"subtask_id":"s20","goal":"Implement the changes under `tests/framework/grid/` needed for: Sync to master brach.","scope_files":["tests/framework/grid/GridViewTest.php"]},{"subtask_id":"s21","goal":"Implement the changes under `tests/framework/helpers/` needed for: Sync to master brach.","scope_files":["tests/framework/helpers/ConsoleTest.php","tests/framework/helpers/HtmlTest.php","tests/framework/helpers/JsonTest.php","tests/framework/helpers/UrlTest.php"]},{"subtask_id":"s22","goal":"Implement the changes under `tests/framework/helpers/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/helpers/stubs/HtmlTestModel.php","tests/framework/helpers/stubs/JsonModel.php","tests/framework/helpers/stubs/MyHtml.php"]},{"subtask_id":"s23","goal":"Implement the changes under `tests/framework/i18n/` needed for: Sync to master brach.","scope_files":["tests/framework/i18n/FormatterDateTest.php","tests/framework/i18n/FormatterNumberTest.php","tests/framework/i18n/LocaleTest.php"]},{"subtask_id":"s24","goal":"Implement the changes under `tests/framework/log/` needed for: Sync to master brach.","scope_files":["tests/framework/log/DispatcherTest.php","tests/framework/log/EmailTargetTest.php","tests/framework/log/LoggerTest.php","tests/framework/log/SyslogTargetTest.php"]},{"subtask_id":"s25","goal":"Implement the changes under `tests/framework/mail/` needed for: Sync to master brach.","scope_files":["tests/framework/mail/BaseMailerTest.php","tests/framework/mail/BaseMessageTest.php"]},{"subtask_id":"s26","goal":"Implement the changes under `tests/framework/mail/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/mail/stubs/TestMailer.php","tests/framework/mail/stubs/TestMessage.php","tests/framework/mail/stubs/TestMessageWithException.php"]},{"subtask_id":"s27","goal":"Implement the changes under `tests/framework/mutex/` needed for: Sync to master brach.","scope_files":["tests/framework/mutex/DbMutexTest.php","tests/framework/mutex/MutexTest.php","tests/framework/mutex/OracleMutexTest.php"]},{"subtask_id":"s28","goal":"Implement the changes under `tests/framework/rbac/` needed for: Sync to master brach.","scope_files":["tests/framework/rbac/DbManagerTestCase.php","tests/framework/rbac/ManagerTestCase.php","tests/framework/rbac/PhpManagerTest.php"]},{"subtask_id":"s29","goal":"Implement the changes under `tests/framework/rest/` needed for: Sync to master brach.","scope_files":["tests/framework/rest/IndexActionTest.php"]},{"subtask_id":"s30","goal":"Implement the changes under `tests/framework/test/` needed for: Sync to master brach.","scope_files":["tests/framework/test/ActiveFixtureTest.php"]},{"subtask_id":"s31","goal":"Implement the changes under `tests/framework/validators/` needed for: Sync to master brach.","scope_files":["tests/framework/validators/FileValidatorTest.php","tests/framework/validators/FilterValidatorTest.php","tests/framework/validators/RequiredValidatorTest.php","tests/framework/validators/SafeValidatorTest.php","tests/framework/validators/TrimValidatorTest.php","tests/framework/validators/ValidatorTest.php"]},{"subtask_id":"s32","goal":"Implement the changes under `tests/framework/validators/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/validators/stubs/ModelForReqValidator.php","tests/framework/validators/stubs/ViewStub.php"]},{"subtask_id":"s33","goal":"Implement the changes under `tests/framework/web/` needed for: Sync to master brach.","scope_files":["tests/framework/web/ControllerTest.php","tests/framework/web/ErrorActionTest.php","tests/framework/web/ErrorHandlerTest.php","tests/framework/web/GroupUrlRuleTest.php","tests/framework/web/JsonResponseFormatterTest.php","tests/framework/web/MultipartFormDataParserTest.php","tests/framework/web/UploadedFileTest.php","tests/framework/web/UserIdentity.php","tests/framework/web/UserTest.php","tests/framework/web/XmlResponseFormatterTest.php"]},{"subtask_id":"s34","goal":"Implement the changes under `tests/framework/web/stubs/` needed for: Sync to master brach.","scope_files":["tests/framework/web/stubs/FakeController.php","tests/framework/web/stubs/FakeInjectionController.php","tests/framework/web/stubs/FakeTypedParamsController.php","tests/framework/web/stubs/ModelBindingStub.php"]},{"subtask_id":"s35","goal":"Implement the changes under `tests/framework/widgets/` needed for: Sync to master brach.","scope_files":["tests/framework/widgets/ActiveFieldTest.php","tests/framework/widgets/ActiveFormTest.php","tests/framework/widgets/DetailViewTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \".git-blame-ignore-revs\",\n \"composer.lock\",\n \"phpstan-baseline.neon\",\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\",\n \"build/controllers/PhpDocController.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `framework/base/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/base/Model.php\",\n \"framework/base/View.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `framework/db/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/db/Connection.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `framework/log/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/log/Target.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `framework/validators/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/validators/CompareValidator.php\",\n \"framework/validators/Validator.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `framework/web/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"framework/web/ErrorHandler.php\"\n ]\n },\n {\n \"subtask_id\": \"s9\",\n \"goal\": \"Implement the changes under `tests/base/log/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/base/log/BaseDbTarget.php\"\n ]\n },\n {\n \"subtask_id\": \"s10\",\n \"goal\": \"Implement the changes under `tests/base/validators/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/base/validators/BaseUniqueValidator.php\"\n ]\n },\n {\n \"subtask_id\": \"s11\",\n \"goal\": \"Implement the changes under `tests/base/web/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/base/web/BaseFormatter.php\"\n ]\n },\n {\n \"subtask_id\": \"s12\",\n \"goal\": \"Implement the changes under `tests/base/web/session/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/base/web/session/BaseDbSession.php\"\n ]\n },\n {\n \"subtask_id\": \"s13\",\n \"goal\": \"Implement the changes under `tests/data/ar/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/data/ar/Cat.php\"\n ]\n },\n {\n \"subtask_id\": \"s14\",\n \"goal\": \"Implement the changes under `tests/data/validators/models/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/data/validators/models/FakedValidationModel.php\",\n \"tests/data/validators/models/ValidatorTestMainModel.php\",\n \"tests/data/validators/models/ValidatorTestRefModel.php\"\n ]\n },\n {\n \"subtask_id\": \"s15\",\n \"goal\": \"Implement the changes under `tests/framework/base/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/base/BaseObjectTest.php\",\n \"tests/framework/base/BehaviorTest.php\",\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/DynamicModelTest.php\",\n \"tests/framework/base/ModelTest.php\",\n \"tests/framework/base/ViewTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s16\",\n \"goal\": \"Implement the changes under `tests/framework/base/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/base/stubs/AnonymousComponentClass.php\",\n \"tests/framework/base/stubs/AnonymousModelClass.php\"\n ]\n },\n {\n \"subtask_id\": \"s17\",\n \"goal\": \"Implement the changes under `tests/framework/console/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/console/ControllerTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s18\",\n \"goal\": \"Implement the changes under `tests/framework/console/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/console/stubs/FakeController.php\",\n \"tests/framework/console/stubs/FakeHelpController.php\",\n \"tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\",\n \"tests/framework/console/stubs/FakeInjectionController.php\"\n ]\n },\n {\n \"subtask_id\": \"s19\",\n \"goal\": \"Implement the changes under `tests/framework/db/mssql/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/db/mssql/QueryBuilderTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s20\",\n \"goal\": \"Implement the changes under `tests/framework/grid/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/grid/GridViewTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s21\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/helpers/ConsoleTest.php\",\n \"tests/framework/helpers/HtmlTest.php\",\n \"tests/framework/helpers/JsonTest.php\",\n \"tests/framework/helpers/UrlTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s22\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/helpers/stubs/HtmlTestModel.php\",\n \"tests/framework/helpers/stubs/JsonModel.php\",\n \"tests/framework/helpers/stubs/MyHtml.php\"\n ]\n },\n {\n \"subtask_id\": \"s23\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/i18n/FormatterDateTest.php\",\n \"tests/framework/i18n/FormatterNumberTest.php\",\n \"tests/framework/i18n/LocaleTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s24\",\n \"goal\": \"Implement the changes under `tests/framework/log/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/log/DispatcherTest.php\",\n \"tests/framework/log/EmailTargetTest.php\",\n \"tests/framework/log/LoggerTest.php\",\n \"tests/framework/log/SyslogTargetTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s25\",\n \"goal\": \"Implement the changes under `tests/framework/mail/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/mail/BaseMailerTest.php\",\n \"tests/framework/mail/BaseMessageTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s26\",\n \"goal\": \"Implement the changes under `tests/framework/mail/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/mail/stubs/TestMailer.php\",\n \"tests/framework/mail/stubs/TestMessage.php\",\n \"tests/framework/mail/stubs/TestMessageWithException.php\"\n ]\n },\n {\n \"subtask_id\": \"s27\",\n \"goal\": \"Implement the changes under `tests/framework/mutex/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\",\n \"tests/framework/mutex/MutexTest.php\",\n \"tests/framework/mutex/OracleMutexTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s28\",\n \"goal\": \"Implement the changes under `tests/framework/rbac/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/rbac/DbManagerTestCase.php\",\n \"tests/framework/rbac/ManagerTestCase.php\",\n \"tests/framework/rbac/PhpManagerTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s29\",\n \"goal\": \"Implement the changes under `tests/framework/rest/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/rest/IndexActionTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s30\",\n \"goal\": \"Implement the changes under `tests/framework/test/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/test/ActiveFixtureTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s31\",\n \"goal\": \"Implement the changes under `tests/framework/validators/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/validators/FileValidatorTest.php\",\n \"tests/framework/validators/FilterValidatorTest.php\",\n \"tests/framework/validators/RequiredValidatorTest.php\",\n \"tests/framework/validators/SafeValidatorTest.php\",\n \"tests/framework/validators/TrimValidatorTest.php\",\n \"tests/framework/validators/ValidatorTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s32\",\n \"goal\": \"Implement the changes under `tests/framework/validators/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/validators/stubs/ModelForReqValidator.php\",\n \"tests/framework/validators/stubs/ViewStub.php\"\n ]\n },\n {\n \"subtask_id\": \"s33\",\n \"goal\": \"Implement the changes under `tests/framework/web/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/web/ControllerTest.php\",\n \"tests/framework/web/ErrorActionTest.php\",\n \"tests/framework/web/ErrorHandlerTest.php\",\n \"tests/framework/web/GroupUrlRuleTest.php\",\n \"tests/framework/web/JsonResponseFormatterTest.php\",\n \"tests/framework/web/MultipartFormDataParserTest.php\",\n \"tests/framework/web/UploadedFileTest.php\",\n \"tests/framework/web/UserIdentity.php\",\n \"tests/framework/web/UserTest.php\",\n \"tests/framework/web/XmlResponseFormatterTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s34\",\n \"goal\": \"Implement the changes under `tests/framework/web/stubs/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/web/stubs/FakeController.php\",\n \"tests/framework/web/stubs/FakeInjectionController.php\",\n \"tests/framework/web/stubs/FakeTypedParamsController.php\",\n \"tests/framework/web/stubs/ModelBindingStub.php\"\n ]\n },\n {\n \"subtask_id\": \"s35\",\n \"goal\": \"Implement the changes under `tests/framework/widgets/` needed for: Sync to master brach.\",\n \"scope_files\": [\n \"tests/framework/widgets/ActiveFieldTest.php\",\n \"tests/framework/widgets/ActiveFormTest.php\",\n \"tests/framework/widgets/DetailViewTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".git-blame-ignore-revs","composer.lock","phpstan-baseline.neon","phpstan.dist.neon"],"solution_diff":"diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs\nindex ce85e65af96..881b51a65e3 100644\n--- a/.git-blame-ignore-revs\n+++ b/.git-blame-ignore-revs\n@@ -24,3 +24,5 @@ da20adc82aef3eb5ae0bad3889fe6695e6424f06\n 7a7d2a9c06c099de8064729ca3fc95fb24241b75\n # Fixed error PHPCS latest version in `PHP 8.5`\n f66d5c8864712aef233b8131c2f99721101f61d0\n+# Fixed build broke code style\n+32d0a922b47ba23fc8d17b3947f8c8ff0b014a31\ndiff --git a/composer.lock b/composer.lock\nindex 24a8ebbc363..f9f75af4753 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -320,16 +320,16 @@\n },\n {\n \"name\": \"composer/class-map-generator\",\n- \"version\": \"1.7.2\",\n+ \"version\": \"1.7.3\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/composer/class-map-generator.git\",\n- \"reference\": \"6a9c2f0970022ab00dc58c07d0685dd712f2231b\"\n+ \"reference\": \"86d8208fc3c649a3a999daf1a63c25201be2990f\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/composer/class-map-generator/zipball/6a9c2f0970022ab00dc58c07d0685dd712f2231b\",\n- \"reference\": \"6a9c2f0970022ab00dc58c07d0685dd712f2231b\",\n+ \"url\": \"https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f\",\n+ \"reference\": \"86d8208fc3c649a3a999daf1a63c25201be2990f\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -373,7 +373,7 @@\n ],\n \"support\": {\n \"issues\": \"https://github.com/composer/class-map-generator/issues\",\n- \"source\": \"https://github.com/composer/class-map-generator/tree/1.7.2\"\n+ \"source\": \"https://github.com/composer/class-map-generator/tree/1.7.3\"\n },\n \"funding\": [\n {\n@@ -385,7 +385,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-03-30T15:36:56+00:00\"\n+ \"time\": \"2026-05-05T09:17:07+00:00\"\n },\n {\n \"name\": \"composer/composer\",\n@@ -869,16 +869,16 @@\n },\n {\n \"name\": \"dealerdirect/phpcodesniffer-composer-installer\",\n- \"version\": \"v1.2.0\",\n+ \"version\": \"v1.2.1\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/PHPCSStandards/composer-installer.git\",\n- \"reference\": \"845eb62303d2ca9b289ef216356568ccc075ffd1\"\n+ \"reference\": \"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/845eb62303d2ca9b289ef216356568ccc075ffd1\",\n- \"reference\": \"845eb62303d2ca9b289ef216356568ccc075ffd1\",\n+ \"url\": \"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/963f0c67bffde0eac41b56be71ac0e8ba132f0bd\",\n+ \"reference\": \"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -961,20 +961,20 @@\n \"type\": \"thanks_dev\"\n }\n ],\n- \"time\": \"2025-11-11T04:32:07+00:00\"\n+ \"time\": \"2026-05-06T08:26:05+00:00\"\n },\n {\n \"name\": \"justinrainbow/json-schema\",\n- \"version\": \"6.8.0\",\n+ \"version\": \"6.8.2\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/jsonrainbow/json-schema.git\",\n- \"reference\": \"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\"\n+ \"reference\": \"2c89ebb95ca9cedc9347f780333f7b25792dcb76\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/jsonrainbow/json-schema/zipball/89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\",\n- \"reference\": \"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\",\n+ \"url\": \"https://api.github.com/repos/jsonrainbow/json-schema/zipball/2c89ebb95ca9cedc9347f780333f7b25792dcb76\",\n+ \"reference\": \"2c89ebb95ca9cedc9347f780333f7b25792dcb76\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -984,7 +984,7 @@\n },\n \"require-dev\": {\n \"friendsofphp/php-cs-fixer\": \"3.3.0\",\n- \"json-schema/json-schema-test-suite\": \"^23.2\",\n+ \"json-schema/json-schema-test-suite\": \"dev-main\",\n \"marc-mabe/php-enum-phpstan\": \"^2.0\",\n \"phpspec/prophecy\": \"^1.19\",\n \"phpstan/phpstan\": \"^1.12\",\n@@ -1034,9 +1034,9 @@\n ],\n \"support\": {\n \"issues\": \"https://github.com/jsonrainbow/json-schema/issues\",\n- \"source\": \"https://github.com/jsonrainbow/json-schema/tree/6.8.0\"\n+ \"source\": \"https://github.com/jsonrainbow/json-schema/tree/6.8.2\"\n },\n- \"time\": \"2026-04-02T12:43:11+00:00\"\n+ \"time\": \"2026-05-05T05:39:01+00:00\"\n },\n {\n \"name\": \"marc-mabe/php-enum\",\n@@ -1426,11 +1426,11 @@\n },\n {\n \"name\": \"phpstan/phpstan\",\n- \"version\": \"2.1.50\",\n+ \"version\": \"2.1.54\",\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\",\n- \"reference\": \"d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\",\n+ \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd\",\n+ \"reference\": \"8be50c3992107dc837b17da4d140fbbdf9a5c5bd\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -1475,7 +1475,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-04-17T13:10:32+00:00\"\n+ \"time\": \"2026-04-29T13:31:09+00:00\"\n },\n {\n \"name\": \"phpstan/phpstan-phpunit\",\n@@ -3458,16 +3458,16 @@\n },\n {\n \"name\": \"symfony/console\",\n- \"version\": \"v7.4.8\",\n+ \"version\": \"v7.4.9\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/console.git\",\n- \"reference\": \"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\"\n+ \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\",\n- \"reference\": \"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\",\n+ \"url\": \"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n+ \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3532,7 +3532,7 @@\n \"terminal\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/console/tree/v7.4.8\"\n+ \"source\": \"https://github.com/symfony/console/tree/v7.4.9\"\n },\n \"funding\": [\n {\n@@ -3552,20 +3552,20 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T13:54:39+00:00\"\n+ \"time\": \"2026-04-22T15:21:55+00:00\"\n },\n {\n \"name\": \"symfony/deprecation-contracts\",\n- \"version\": \"v3.6.0\",\n+ \"version\": \"v3.7.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/deprecation-contracts.git\",\n- \"reference\": \"63afe740e99a13ba87ec199bb07bbdee937a5b62\"\n+ \"reference\": \"50f59d1f3ca46d41ac911f97a78626b6756af35b\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62\",\n- \"reference\": \"63afe740e99a13ba87ec199bb07bbdee937a5b62\",\n+ \"url\": \"https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b\",\n+ \"reference\": \"50f59d1f3ca46d41ac911f97a78626b6756af35b\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3578,7 +3578,7 @@\n \"name\": \"symfony/contracts\"\n },\n \"branch-alias\": {\n- \"dev-main\": \"3.6-dev\"\n+ \"dev-main\": \"3.7-dev\"\n }\n },\n \"autoload\": {\n@@ -3603,7 +3603,7 @@\n \"description\": \"A generic function and convention to trigger deprecation notices\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/deprecation-contracts/tree/v3.6.0\"\n+ \"source\": \"https://github.com/symfony/deprecation-contracts/tree/v3.7.0\"\n },\n \"funding\": [\n {\n@@ -3614,25 +3614,29 @@\n \"url\": \"https://github.com/fabpot\",\n \"type\": \"github\"\n },\n+ {\n+ \"url\": \"https://github.com/nicolas-grekas\",\n+ \"type\": \"github\"\n+ },\n {\n \"url\": \"https://tidelift.com/funding/github/packagist/symfony/symfony\",\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2024-09-25T14:21:43+00:00\"\n+ \"time\": \"2026-04-13T15:52:40+00:00\"\n },\n {\n \"name\": \"symfony/filesystem\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.9\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/filesystem.git\",\n- \"reference\": \"66b769ae743ce2d13e435528fbef4af03d623e5a\"\n+ \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/66b769ae743ce2d13e435528fbef4af03d623e5a\",\n- \"reference\": \"66b769ae743ce2d13e435528fbef4af03d623e5a\",\n+ \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n+ \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3669,7 +3673,7 @@\n \"description\": \"Provides basic utilities for the filesystem\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.9\"\n },\n \"funding\": [\n {\n@@ -3689,7 +3693,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-04-18T13:51:42+00:00\"\n },\n {\n \"name\": \"symfony/finder\",\n@@ -3761,7 +3765,7 @@\n },\n {\n \"name\": \"symfony/polyfill-ctype\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-ctype.git\",\n@@ -3820,7 +3824,7 @@\n \"portable\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-ctype/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-ctype/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -3844,16 +3848,16 @@\n },\n {\n \"name\": \"symfony/polyfill-intl-grapheme\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-intl-grapheme.git\",\n- \"reference\": \"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\"\n+ \"reference\": \"4864388bfbd3001ce88e234fab652acd91fdc57e\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df\",\n- \"reference\": \"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\",\n+ \"url\": \"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e\",\n+ \"reference\": \"4864388bfbd3001ce88e234fab652acd91fdc57e\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3902,7 +3906,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -3922,11 +3926,11 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-10T16:19:22+00:00\"\n+ \"time\": \"2026-04-26T13:13:48+00:00\"\n },\n {\n \"name\": \"symfony/polyfill-intl-normalizer\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-intl-normalizer.git\",\n@@ -3987,7 +3991,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4011,7 +4015,7 @@\n },\n {\n \"name\": \"symfony/polyfill-mbstring\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-mbstring.git\",\n@@ -4072,7 +4076,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-mbstring/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-mbstring/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4096,7 +4100,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php73\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php73.git\",\n@@ -4152,7 +4156,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php73/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php73/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4176,7 +4180,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php80\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php80.git\",\n@@ -4236,7 +4240,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php80/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php80/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4260,7 +4264,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php81\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php81.git\",\n@@ -4316,7 +4320,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php81/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php81/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4340,7 +4344,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php84\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php84.git\",\n@@ -4396,7 +4400,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php84/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php84/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4485,16 +4489,16 @@\n },\n {\n \"name\": \"symfony/service-contracts\",\n- \"version\": \"v3.6.1\",\n+ \"version\": \"v3.7.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/service-contracts.git\",\n- \"reference\": \"45112560a3ba2d715666a509a0bc9521d10b6c43\"\n+ \"reference\": \"d25d82433a80eba6aa0e6c24b61d7370d99e444a\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43\",\n- \"reference\": \"45112560a3ba2d715666a509a0bc9521d10b6c43\",\n+ \"url\": \"https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a\",\n+ \"reference\": \"d25d82433a80eba6aa0e6c24b61d7370d99e444a\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4512,7 +4516,7 @@\n \"name\": \"symfony/contracts\"\n },\n \"branch-alias\": {\n- \"dev-main\": \"3.6-dev\"\n+ \"dev-main\": \"3.7-dev\"\n }\n },\n \"autoload\": {\n@@ -4548,7 +4552,7 @@\n \"standards\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/service-contracts/tree/v3.6.1\"\n+ \"source\": \"https://github.com/symfony/service-contracts/tree/v3.7.0\"\n },\n \"funding\": [\n {\n@@ -4568,7 +4572,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2025-07-15T11:30:57+00:00\"\n+ \"time\": \"2026-03-28T09:44:51+00:00\"\n },\n {\n \"name\": \"symfony/string\",\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex dbdba693f2a..3f78050b8ad 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -1225,79 +1225,379 @@ parameters:\n \t\t\tpath: tests/base/db/BaseSchema.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\log\\\\Target\\:\\:\\$db\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$as f\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/log/BaseDbTarget.php\n+\t\t\tpath: tests/framework/base/ComponentTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to private property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$p2\\.$#'\n+\t\t\tidentifier: property.private\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/base/ComponentTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Parameter &\\$args by\\-ref type of method yiiunit\\\\framework\\\\base\\\\stub\\\\controller\\\\InjectingController\\:\\:bindInjectedFor\\(\\) expects array\\<int, mixed\\>, array given\\.$#'\n+\t\t\tidentifier: parameterByRef.type\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/base/stub/controller/InjectingController.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$a_field\\.$#'\n+\t\t\tmessage: '#^Parameter &\\$requestedParams by\\-ref type of method yiiunit\\\\framework\\\\base\\\\stub\\\\controller\\\\InjectingController\\:\\:bindInjectedFor\\(\\) expects array\\<string, string\\>, array given\\.$#'\n+\t\t\tidentifier: parameterByRef.type\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/base/stub/controller/InjectingController.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/captcha/CaptchaTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Return type \\(void\\) of method yiiunit\\\\framework\\\\console\\\\controllers\\\\FixtureConsoledController\\:\\:stdout\\(\\) should be compatible with return type \\(bool\\|int\\) of method yii\\\\console\\\\Controller\\<yii\\\\console\\\\Application\\>\\:\\:stdout\\(\\)$#'\n+\t\t\tidentifier: method.childReturnType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseExistValidator.php\n+\t\t\tpath: tests/framework/console/controllers/FixtureControllerTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestMainModel\\:\\:\\$id\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&yii\\\\web\\\\User\\:\\:\\$identityCLass\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/filters/AccessRuleTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$id\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/grid/CheckboxColumnTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$ref\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/grid/GridViewTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$extension with type array is incompatible with native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/helpers/FileHelperTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @throws with type yii\\\\base\\\\InvalidConfigException\\|yii\\\\base\\\\InvalidParamException\\|yii\\\\db\\\\Exception is not subtype of Throwable$#'\n+\t\t\tidentifier: throws.notThrowable\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/DbMessageSourceTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type bool\\|string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 2\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$email \\(string\\) does not accept array\\<int, string\\>\\.$#'\n-\t\t\tidentifier: assign.propertyType\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expectedException with type mixed is not subtype of native type string\\|null\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$value with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_length with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$name \\(string\\) does not accept array\\<int, string\\>\\.$#'\n-\t\t\tidentifier: assign.propertyType\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_shortLength with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$total \\(string\\) does not accept int\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_shortWeight with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_weight with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$arguments with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expectedException with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$message with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:attach\\(\\) should return \\$this\\(yiiunit\\\\framework\\\\log\\\\TestMessage\\) but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:attachContent\\(\\) should return \\$this\\(yiiunit\\\\framework\\\\log\\\\TestMessage\\) but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:embed\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:embedContent\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getBcc\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getCc\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getCharset\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getFrom\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getReplyTo\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getSubject\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getTo\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @var with type yii\\\\log\\\\Target is not subtype of native type PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\.$#'\n+\t\t\tidentifier: varTag.nativeType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/log/TargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\rbac\\\\BaseManager\\:\\:\\$defaultRoles \\(array\\<string\\>\\) does not accept Closure\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/rbac/ManagerTestCase.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\rbac\\\\BaseManager\\:\\:\\$defaultRoles \\(array\\<string\\>\\) does not accept string\\.$#'\n \t\t\tidentifier: assign.propertyType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/rbac/ManagerTestCase.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\console\\\\Application\\|yii\\\\web\\\\Application\\<yii\\\\web\\\\IdentityInterface\\>\\:\\:\\$sessionDb\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$dataProvider with type yii\\\\data\\\\DataProviderInterface is not subtype of native type yii\\\\data\\\\ArrayDataProvider\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/rest/SerializerTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/BooleanValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/CompareValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel\\:\\:\\$attr_compare\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/web/session/BaseDbSession.php\n+\t\t\tpath: tests/framework/validators/CompareValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$as f\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/EmailValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_ with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/base/ComponentTest.php\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to private property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$p2\\.$#'\n-\t\t\tidentifier: property.private\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$allowedExtensions with type array\\|string is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n \t\t\tcount: 3\n-\t\t\tpath: tests/framework/base/ComponentTest.php\n+\t\t\tpath: tests/framework/validators/FilterValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Return type \\(void\\) of method yiiunit\\\\framework\\\\console\\\\controllers\\\\FixtureConsoledController\\:\\:stdout\\(\\) should be compatible with return type \\(bool\\|int\\) of method yii\\\\console\\\\Controller\\<yii\\\\console\\\\Application\\>\\:\\:stdout\\(\\)$#'\n-\t\t\tidentifier: method.childReturnType\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/IpValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$badIp with type mixed is not subtype of native type array\\|bool\\|int\\|string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/validators/IpValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/NumberValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RangeValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RegularExpressionValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RequiredValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/StringValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/TrimValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/UrlValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$appendTimestamp with type bool\\|string is not subtype of native type bool\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/console/controllers/FixtureControllerTest.php\n+\t\t\tpath: tests/framework/web/AssetBundleTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&yii\\\\web\\\\User\\:\\:\\$identityCLass\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$data with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/web/JsonResponseFormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @var for property yiiunit\\\\framework\\\\widgets\\\\ActiveFieldTest\\:\\:\\$helperModel with type yii\\\\base\\\\DynamicModel is not subtype of native type yiiunit\\\\framework\\\\widgets\\\\ActiveFieldTestModel\\.$#'\n+\t\t\tidentifier: property.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/ActiveFieldTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$categories\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/filters/AccessRuleTest.php\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$email\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$name\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\widgets\\\\Breadcrumbs\\:\\:\\$homeLink \\(array\\|null\\) does not accept false\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/BreadcrumbsTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\widgets\\\\Breadcrumbs\\:\\:\\$tag \\(string\\) does not accept false\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/BreadcrumbsTest.php\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..6a59f2fbff4 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -13,25 +13,10 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n- - tests/framework/base/stub\n- - tests/framework/di/stubs\n- - tests/framework/filters/stubs\n+ - tests/framework/*/stubs/*\n+ - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/grid\n- - tests/framework/helpers\n- - tests/framework/i18n\n- - tests/framework/log\n- - tests/framework/mail\n- - tests/framework/models\n- - tests/framework/mutex\n- - tests/framework/rbac\n- - tests/framework/requirements\n- - tests/framework/rest\n- - tests/framework/test\n- - tests/framework/validators\n- - tests/framework/web\n- - tests/framework/widgets\n \n bootstrapFiles:\n - framework/BaseYii.php\n\n","summary":"Edited 4 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["build/controllers/MimeTypeController.php","build/controllers/PhpDocController.php"],"solution_diff":"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex 20d17853c93..d8709cdca6e 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -117,6 +117,7 @@ private function generateMimeTypesFile($outFile, $content)\n \n $content = <<<EOD\n <?php\n+\n /**\n * MIME types.\n *\n@@ -129,6 +130,7 @@ private function generateMimeTypesFile($outFile, $content)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n \\$mimeTypes = $array;\n \n # fix for bundled libmagic bug, see also https://github.com/yiisoft/yii2/issues/19925\n@@ -152,6 +154,7 @@ private function generateMimeAliasesFile($outFile)\n $array = VarDumper::export($this->_aliases);\n $content = <<<EOD\n <?php\n+\n /**\n * MIME aliases.\n *\n@@ -160,6 +163,7 @@ private function generateMimeAliasesFile($outFile)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n return $array;\n \n EOD;\n@@ -211,6 +215,7 @@ private function generateMimeExtensionsFile($outFile, $content)\n \n $content = <<<EOD\n <?php\n+\n /**\n * MIME type extensions.\n *\n@@ -224,6 +229,7 @@ private function generateMimeExtensionsFile($outFile, $content)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n return $array;\n \n EOD;\ndiff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\nindex 2a603c818cf..bc4f3ea5f09 100644\n--- a/build/controllers/PhpDocController.php\n+++ b/build/controllers/PhpDocController.php\n@@ -345,6 +345,7 @@ protected function fixFileDoc(&$lines)\n }\n $lines = array_merge([\n '<?php',\n+ '',\n '/**',\n ' * @link https://www.yiiframework.com/',\n ' * @copyright Copyright (c) 2008 Yii Software LLC',\n@@ -367,6 +368,7 @@ protected function fixDocBlockIndentation(&$lines)\n $codeBlock = false;\n $listIndent = '';\n $tag = false;\n+ $phpstanType = false;\n $indent = '';\n foreach ($lines as $i => $line) {\n if (preg_match('~^(\\s*)/\\*\\*$~', $line, $matches)) {\n@@ -380,6 +382,7 @@ protected function fixDocBlockIndentation(&$lines)\n $codeBlock = false;\n $listIndent = '';\n $tag = false;\n+ $phpstanType = false;\n } elseif ($docBlock) {\n $line = ltrim($line);\n if (strpos($line, '*') === 0) {\n@@ -389,12 +392,23 @@ protected function fixDocBlockIndentation(&$lines)\n $line = substr($line, 1);\n }\n $docLine = str_replace(\"\\t\", ' ', rtrim($line));\n+ if ($phpstanType && $docLine !== '' && strpos($docLine, '@') !== 0) {\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\n+ continue;\n+ }\n+ $phpstanType = false;\n if (empty($docLine)) {\n $listIndent = '';\n } elseif (strpos($docLine, '@') === 0) {\n $listIndent = '';\n $codeBlock = false;\n $tag = true;\n+ if (preg_match('/^@phpstan-type(?:\\s|$)/', $docLine)) {\n+ $tag = false;\n+ $phpstanType = true;\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\n+ continue;\n+ }\n $docLine = preg_replace('/\\s+/', ' ', $docLine);\n $docLine = $this->fixParamTypes($docLine);\n } elseif (preg_match('/^(~~~|```)/', $docLine)) {\n@@ -699,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\n }\n if ($propertyPart) {\n preg_match(\n- '/@property(?:-read|-write)?\\s+([\\\\\\\\\\w\\|\\[\\]]+)\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n+ '/@property(?:-read|-write)?\\s+' . self::TYPE_REG_EXP\n+ . '\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n $line,\n $matches\n );\n \n- if (isset($matches[2])) {\n- $lastPropertyName = $matches[2];\n+ if (isset($matches[1])) {\n+ $lastPropertyName = $matches[1];\n }\n \n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\n","summary":"Edited 2 file(s) in build/controllers/"},{"subtask_id":"s3","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 535d29716f5..d6d48dff3fd 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -72,35 +72,46 @@ Yii Framework 2 Change Log\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\n \n-2.0.55 under development\n+2.0.56 under development\n ------------------------\n \n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+\n+\n+2.0.55 May 09, 2026\n+-------------------\n+\n+- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\n+- Bug #20159: Fix chroot resolve null route (gozoro)\n+- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\n - Bug #20705: Replace `$this` with `self` in generics in Psalm annotations (mspirkov)\n - Bug #20715: Adjust `JSON` helper error message assertions for `PHP 8.6` compatibility in `JsonTest` class (terabytesoftw)\n-- Enh #20714: Allow overriding the `yii\\grid\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\n-- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\n-- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\n-- Enh #20729: Add default types in `@template` annotations (mspirkov)\n-- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\n - Bug #20733: Replace `$this` with `static` and `covariant static` in generics in PHPStan and PHPDoc annotations (mspirkov)\n - Bug #20735: Fix `@param` annotations for `$name` in `Request::get()` and `Request::post()` (mspirkov)\n-- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\n - Bug #20738: Fix `@var` annotations for `Application::$requestedParams`, `AssetBundle::$basePath`, `AssetBundle::$baseUrl`, `MultiFieldSession::$writeCallback` (mspirkov)\n - Bug #20738: Fix `@return` annotations for `User::getAuthManager()` and `User::getAccessChecker()` (mspirkov)\n - Bug #20738: Fix `@param` annotation for `$value` parameter in `AssetManager::setConverter()` (mspirkov)\n - Bug #20739: Fix `@var` annotation for `BaseYii::$app` (mspirkov)\n-- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\n - Bug #20746: Fix `@var` annotations for `DbDependency::$db` and `DbDependency::$sql` (mspirkov)\n - Bug #20750: Fix `@return` annotation for `yii\\console\\Controller::runAction()` (mspirkov)\n - Bug #20750: Add the missing `@property-write` annotation to `yii\\console\\Controller` (mspirkov)\n - Bug #20751: Fix `@param` annotation for `$param` parameter in `Sort::parseSortParam()` (mspirkov)\n-- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\n - Bug #20764: Fix `@return` annotation for `Model::rules()` (mspirkov)\n-- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\n-- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\n-- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\n-- Bug #20159: Fix chroot resolve null route (gozoro)\n - Bug #20856: Fix passing generics to `BatchQueryResult` (mspirkov)\n+- Bug: CVE-2026-39850, Isolate internal variables in `View::renderPhpFile()` and `ErrorHandler::renderFile()` to prevent parameter collisions from overriding included file paths (samdark)\n+- Enh #20714: Allow overriding the `yii\\grid\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\n+- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\n+- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\n+- Enh #20729: Add default types in `@template` annotations (mspirkov)\n+- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\n+- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\n+- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\n+- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\n+- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\n \n \n 2.0.54 January 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s4","scope_files":["framework/base/Model.php","framework/base/View.php"],"solution_diff":"diff --git a/framework/base/Model.php b/framework/base/Model.php\nindex 0186202e2f0..8bae86953ba 100644\n--- a/framework/base/Model.php\n+++ b/framework/base/Model.php\n@@ -38,7 +38,7 @@\n *\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\n *\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\n * array of errors for all attributes, similar to the following:\n *\n * ```\n@@ -581,8 +581,9 @@ public function hasErrors($attribute = null)\n /**\n * Returns the errors for all attributes or a single attribute.\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\n+ * all attributes, the result is a two-dimensional array, like the following:\n *\n * ```\n * [\ndiff --git a/framework/base/View.php b/framework/base/View.php\nindex 98e2cd69eeb..658ffb963af 100644\n--- a/framework/base/View.php\n+++ b/framework/base/View.php\n@@ -333,11 +333,14 @@ public function afterRender($viewFile, $params, &$output)\n public function renderPhpFile($_file_, $_params_ = [])\n {\n $_obInitialLevel_ = ob_get_level();\n+ $_renderer_ = function () {\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\n+ require func_get_arg(0);\n+ };\n ob_start();\n ob_implicit_flush(false);\n- extract($_params_, EXTR_OVERWRITE);\n try {\n- require $_file_;\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\n return ob_get_clean();\n } catch (\\Exception $e) {\n while (ob_get_level() > $_obInitialLevel_) {\n","summary":"Edited 2 file(s) in framework/base/"},{"subtask_id":"s5","scope_files":["framework/db/Connection.php"],"solution_diff":"diff --git a/framework/db/Connection.php b/framework/db/Connection.php\nindex a52e8fbdc6a..929eedf1dd3 100644\n--- a/framework/db/Connection.php\n+++ b/framework/db/Connection.php\n@@ -121,8 +121,7 @@\n * @property-read PDO $masterPdo The PDO instance for the currently active master connection.\n * @property QueryBuilder $queryBuilder The query builder for the current DB connection. Note that the type of\n * this property differs in getter and setter. See [[getQueryBuilder()]] and [[setQueryBuilder()]] for details.\n- * @property-read Schema $schema The schema information for the database opened by this\n- * connection.\n+ * @property-read Schema $schema The schema information for the database opened by this connection.\n * @property-read string $serverVersion Server version as a string.\n * @property-read Connection|null $slave The currently active slave connection. `null` is returned if there is\n * no slave available and `$fallbackToMaster` is false.\n","summary":"Edited 1 file(s) in framework/db/"},{"subtask_id":"s6","scope_files":["framework/log/Target.php"],"solution_diff":"diff --git a/framework/log/Target.php b/framework/log/Target.php\nindex 428fb150e14..780c9a05f34 100644\n--- a/framework/log/Target.php\n+++ b/framework/log/Target.php\n@@ -28,7 +28,9 @@\n * satisfying both filter conditions will be handled. Additionally, you\n * may specify [[except]] to exclude messages of certain categories.\n *\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\n","summary":"Edited 1 file(s) in framework/log/"},{"subtask_id":"s7","scope_files":["framework/validators/CompareValidator.php","framework/validators/Validator.php"],"solution_diff":"diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\nindex 2068d1cb9f1..4981179d7cc 100644\n--- a/framework/validators/CompareValidator.php\n+++ b/framework/validators/CompareValidator.php\n@@ -93,7 +93,7 @@ class CompareValidator extends Validator\n */\n public $operator = '==';\n /**\n- * @var string the user-defined error message. It may contain the following placeholders which\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\n * will be replaced accordingly by the validator:\n *\n * - `{attribute}`: the label of the attribute being validated\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\nindex f324cd2b91e..1f4aeba6d14 100644\n--- a/framework/validators/Validator.php\n+++ b/framework/validators/Validator.php\n@@ -322,6 +322,8 @@ public function validateAttribute($model, $attribute)\n * @param mixed $value the data value to be validated.\n * @param string|null $error the error message to be returned, if the validation fails.\n * @return bool whether the data is valid.\n+ *\n+ * @param-out string|null $error\n */\n public function validate($value, &$error = null)\n {\n","summary":"Edited 2 file(s) in framework/validators/"},{"subtask_id":"s8","scope_files":["framework/web/ErrorHandler.php"],"solution_diff":"diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\nindex 0df7d920ffc..212bec48e46 100644\n--- a/framework/web/ErrorHandler.php\n+++ b/framework/web/ErrorHandler.php\n@@ -305,10 +305,13 @@ public function renderFile($_file_, $_params_)\n {\n $_params_['handler'] = $this;\n if ($this->exception instanceof ErrorException || !Yii::$app->has('view')) {\n+ $_renderer_ = function () {\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\n+ require Yii::getAlias(func_get_arg(0));\n+ };\n ob_start();\n ob_implicit_flush(false);\n- extract($_params_, EXTR_OVERWRITE);\n- require Yii::getAlias($_file_);\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\n \n return ob_get_clean();\n }\n","summary":"Edited 1 file(s) in framework/web/"},{"subtask_id":"s9","scope_files":["tests/base/log/BaseDbTarget.php"],"solution_diff":"diff --git a/tests/base/log/BaseDbTarget.php b/tests/base/log/BaseDbTarget.php\nindex 7594e83d671..0292973f28f 100644\n--- a/tests/base/log/BaseDbTarget.php\n+++ b/tests/base/log/BaseDbTarget.php\n@@ -9,8 +9,6 @@\n namespace yiiunit\\base\\log;\n \n use yii\\console\\Application;\n-use yii\\console\\Controller;\n-use yii\\base\\InvalidParamException;\n use yii\\db\\Exception;\n use yii\\base\\InvalidConfigException;\n use Yii;\n@@ -18,6 +16,7 @@\n use yii\\console\\ExitCode;\n use yii\\db\\Connection;\n use yii\\db\\Query;\n+use yii\\log\\DbTarget;\n use yii\\log\\Logger;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -171,7 +170,10 @@ public function testTransactionRollBack(): void\n // current db connection should still have a transaction\n $this->assertNotNull($db->transaction);\n // log db connection should not have transaction\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\n+\n+ $dbTarget = Yii::$app->log->targets['db'];\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\n+ $this->assertNull($dbTarget->db->transaction);\n \n $tx->rollBack();\n \n","summary":"Edited 1 file(s) in tests/base/log/"},{"subtask_id":"s10","scope_files":["tests/base/validators/BaseUniqueValidator.php"],"solution_diff":"diff --git a/tests/base/validators/BaseUniqueValidator.php b/tests/base/validators/BaseUniqueValidator.php\nindex 3b5951683d4..0eee34af0ea 100644\n--- a/tests/base/validators/BaseUniqueValidator.php\n+++ b/tests/base/validators/BaseUniqueValidator.php\n@@ -72,6 +72,7 @@ public function testValidateInvalidAttribute(): void\n \n /** @var Customer $customerModel */\n $customerModel = Customer::findOne(1);\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->name = ['test array data'];\n $validator->validateAttribute($customerModel, 'name');\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\n@@ -79,6 +80,7 @@ public function testValidateInvalidAttribute(): void\n $customerModel->clearErrors();\n \n $customerModel->name = 'test data';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\n $validator->targetAttribute = ['email', 'name'];\n $validator->validateAttribute($customerModel, 'name');\n@@ -410,7 +412,7 @@ public function testAmbiguousColumnName(): void\n ]);\n $model = new Order();\n $model->customer_id = 1;\n- $model->total = 800;\n+ $model->total = '800';\n $model->save(false);\n $validator->validateAttribute($model, 'id');\n $this->assertFalse($model->hasErrors());\n","summary":"Edited 1 file(s) in tests/base/validators/"},{"subtask_id":"s11","scope_files":["tests/base/web/BaseFormatter.php"],"solution_diff":"diff --git a/tests/base/web/BaseFormatter.php b/tests/base/web/BaseFormatter.php\nindex b5d7831b9e2..1a188fc342a 100644\n--- a/tests/base/web/BaseFormatter.php\n+++ b/tests/base/web/BaseFormatter.php\n@@ -12,6 +12,9 @@\n use yii\\web\\Response;\n use yii\\web\\ResponseFormatterInterface;\n \n+/**\n+ * @template TFormatter of ResponseFormatterInterface\n+ */\n abstract class BaseFormatter extends TestCase\n {\n /**\n@@ -19,7 +22,7 @@ abstract class BaseFormatter extends TestCase\n */\n public $response;\n /**\n- * @var ResponseFormatterInterface\n+ * @var TFormatter\n */\n public $formatter;\n \n@@ -31,7 +34,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return ResponseFormatterInterface\n+ * @return TFormatter\n */\n abstract protected function getFormatterInstance();\n \n","summary":"Edited 1 file(s) in tests/base/web/"},{"subtask_id":"s12","scope_files":["tests/base/web/session/BaseDbSession.php"],"solution_diff":"diff --git a/tests/base/web/session/BaseDbSession.php b/tests/base/web/session/BaseDbSession.php\nindex 43fff89a696..33c6c1be6a4 100644\n--- a/tests/base/web/session/BaseDbSession.php\n+++ b/tests/base/web/session/BaseDbSession.php\n@@ -15,6 +15,7 @@\n use yii\\db\\Connection;\n use yii\\db\\Migration;\n use yii\\db\\Query;\n+use yii\\web\\Application;\n use yii\\web\\DbSession;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\framework\\web\\session\\SessionTestTrait;\n@@ -260,11 +261,14 @@ public function testInstantiate(): void\n 'db' => 'sessionDb',\n ]);\n \n- $this->assertSame(Yii::$app->sessionDb, $session->db);\n+ /** @var Application&object{sessionDb: Connection} */\n+ $app = Yii::$app;\n+\n+ $this->assertSame($app->sessionDb, $session->db);\n $this->assertSame(300, $session->timeout);\n $session->close();\n \n- Yii::$app->set('db', Yii::$app->sessionDb);\n+ Yii::$app->set('db', $app->sessionDb);\n Yii::$app->set('sessionDb', null);\n ini_set('session.gc_maxlifetime', $oldTimeout);\n }\n","summary":"Edited 1 file(s) in tests/base/web/session/"},{"subtask_id":"s13","scope_files":["tests/data/ar/Cat.php"],"solution_diff":"diff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\nindex e2592a80be5..a7ac3000ea1 100644\n--- a/tests/data/ar/Cat.php\n+++ b/tests/data/ar/Cat.php\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\n \n /**\n * This is to test if __isset catches the exception.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getException(): never\n@@ -43,7 +43,7 @@ public function getException(): never\n \n /**\n * This is to test if __isset catches the error.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getThrowable()\n","summary":"Edited 1 file(s) in tests/data/ar/"},{"subtask_id":"s14","scope_files":["tests/data/validators/models/FakedValidationModel.php","tests/data/validators/models/ValidatorTestMainModel.php","tests/data/validators/models/ValidatorTestRefModel.php"],"solution_diff":"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\nindex 33e35049f15..4f2245b1abc 100644\n--- a/tests/data/validators/models/FakedValidationModel.php\n+++ b/tests/data/validators/models/FakedValidationModel.php\n@@ -10,6 +10,33 @@\n \n use yii\\base\\Model;\n \n+/**\n+ * @property mixed $attr\n+ * @property mixed $attr_url\n+ * @property mixed $attr_string\n+ * @property mixed $attr_reg1\n+ * @property mixed $attr_number\n+ * @property mixed $attr_ip\n+ * @property mixed $attr_array\n+ * @property mixed $attr_array_skipped\n+ * @property mixed $attr_files\n+ * @property mixed $attr_one\n+ * @property mixed $attr_two\n+ * @property mixed $attr_empty1\n+ * @property mixed $attr_empty2\n+ * @property mixed $attr_email\n+ * @property mixed $attr_date\n+ * @property mixed $attr_timestamp\n+ * @property mixed $attr_test\n+ * @property mixed $attr_test_val\n+ * @property mixed $attr_test_repeat\n+ * @property mixed $attrA\n+ * @property mixed $attrB\n+ * @property mixed $attrC\n+ * @property mixed $attrD\n+ * @property mixed $attr_image\n+ * @property mixed $attr_images\n+ */\n class FakedValidationModel extends Model\n {\n public $val_attr_a;\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\nindex 73faaf22f39..1752079bc08 100644\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\n@@ -10,6 +10,9 @@\n \n use yiiunit\\data\\ar\\ActiveRecord;\n \n+/**\n+ * @property int $id\n+ */\n class ValidatorTestMainModel extends ActiveRecord\n {\n public $testMainVal = 1;\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\nindex 8642dc317c9..0bdb0c71f83 100644\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\n@@ -11,9 +11,9 @@\n use yiiunit\\data\\ar\\ActiveRecord;\n \n /**\n- * @property int id\n- * @property string a_field\n- * @property int ref\n+ * @property int $id\n+ * @property string $a_field\n+ * @property int $ref\n */\n class ValidatorTestRefModel extends ActiveRecord\n {\n","summary":"Edited 3 file(s) in tests/data/validators/models/"},{"subtask_id":"s15","scope_files":["tests/framework/base/BaseObjectTest.php","tests/framework/base/BehaviorTest.php","tests/framework/base/ComponentTest.php","tests/framework/base/DynamicModelTest.php","tests/framework/base/ModelTest.php","tests/framework/base/ViewTest.php"],"solution_diff":"diff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\nindex 566fa195ef4..586ffbe4fa4 100644\n--- a/tests/framework/base/BaseObjectTest.php\n+++ b/tests/framework/base/BaseObjectTest.php\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->object->Caption;\n }\n \n@@ -82,8 +81,7 @@ public function testSetProperty(): void\n $this->object->Text = $value;\n $this->assertEquals($value, $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->object->NewMember = $value;\n }\n \n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->object->unknownMethod();\n }\n \ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\nindex a64f82606e0..fc7bf8b4c33 100644\n--- a/tests/framework/base/BehaviorTest.php\n+++ b/tests/framework/base/BehaviorTest.php\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\n $bar->attachBehavior('bar', $behavior);\n \n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $bar->nomagicBehaviorMethod();\n }\n }\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex 522cac4389a..bcdfe09547a 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -1069,7 +1069,7 @@ public function testDetachNotAttachedHandler(): void\n */\n public function testEventClosureDetachesItself(): void\n {\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\n \n $obj->trigger('barEventOnce');\n \ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\nindex 04924a21153..26837108962 100644\n--- a/tests/framework/base/DynamicModelTest.php\n+++ b/tests/framework/base/DynamicModelTest.php\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\n $this->assertTrue($model->canSetProperty('email'));\n $this->assertTrue($model->canSetProperty('name'));\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $age = $model->age;\n }\n \ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\nindex 1a9a9fdf38b..68ed7f6c201 100644\n--- a/tests/framework/base/ModelTest.php\n+++ b/tests/framework/base/ModelTest.php\n@@ -1395,7 +1395,7 @@ public function testValidateAttributeNames(): void\n \n public function testFormNameWithAnonymousClass(): void\n {\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\n \n self::expectException(\n InvalidConfigException::class,\ndiff --git a/tests/framework/base/ViewTest.php b/tests/framework/base/ViewTest.php\nindex 2ce36c48917..cdcf260f4a3 100644\n--- a/tests/framework/base/ViewTest.php\n+++ b/tests/framework/base/ViewTest.php\n@@ -108,6 +108,19 @@ public function testRelativePathInView(): void\n $this->assertSame($subViewContent, $view->render('@testviews/base'));\n }\n \n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\n+ {\n+ $view = new View();\n+\n+ $viewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'safe.php';\n+ file_put_contents($viewFile, '<?php echo \"safe view\";');\n+\n+ $secretFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'secret.txt';\n+ file_put_contents($secretFile, 'secret data');\n+\n+ $this->assertSame('safe view', $view->renderFile($viewFile, ['_file_' => $secretFile]));\n+ }\n+\n public function testAfterRender(): void\n {\n $view = new View();\n","summary":"Edited 6 file(s) in tests/framework/base/"},{"subtask_id":"s16","scope_files":["tests/framework/base/stubs/AnonymousComponentClass.php","tests/framework/base/stubs/AnonymousModelClass.php"],"solution_diff":"diff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousComponentClass.php\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousModelClass.php\nrename to tests/framework/base/stubs/AnonymousModelClass.php\n","summary":"Edited 2 file(s) in tests/framework/base/stubs/"},{"subtask_id":"s17","scope_files":["tests/framework/console/ControllerTest.php"],"solution_diff":"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\nindex f8d10f95f62..76dc8f149b4 100644\n--- a/tests/framework/console/ControllerTest.php\n+++ b/tests/framework/console/ControllerTest.php\n@@ -25,6 +25,10 @@\n use yii\\console\\Response;\n use yii\\helpers\\Console;\n use yiiunit\\framework\\console\\stubs\\DummyService;\n+use yiiunit\\framework\\console\\stubs\\FakeController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput;\n+use yiiunit\\framework\\console\\stubs\\FakeInjectionController;\n use yiiunit\\TestCase;\n \n /**\n@@ -43,9 +47,9 @@ protected function setUp(): void\n $this->mockApplication();\n \n Yii::$app->controllerMap = [\n- 'fake' => 'yiiunit\\framework\\console\\FakeController',\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\FakeHelpControllerWithoutOutput',\n- 'help' => 'yiiunit\\framework\\console\\FakeHelpController',\n+ 'fake' => 'yiiunit\\framework\\console\\stubs\\FakeController',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'help' => 'yiiunit\\framework\\console\\stubs\\FakeHelpController',\n ];\n }\n \n","summary":"Edited 1 file(s) in tests/framework/console/"},{"subtask_id":"s18","scope_files":["tests/framework/console/stubs/FakeController.php","tests/framework/console/stubs/FakeHelpController.php","tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php","tests/framework/console/stubs/FakeInjectionController.php"],"solution_diff":"diff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\nsimilarity index 98%\nrename from tests/framework/console/FakeController.php\nrename to tests/framework/console/stubs/FakeController.php\nindex ff92196c0c2..7bc4a4541d3 100644\n--- a/tests/framework/console/FakeController.php\n+++ b/tests/framework/console/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\Controller;\n use yii\\console\\Response;\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\nsimilarity index 93%\nrename from tests/framework/console/FakeHelpController.php\nrename to tests/framework/console/stubs/FakeHelpController.php\nindex 2846c94848f..ae23e2e0fd6 100644\n--- a/tests/framework/console/FakeHelpController.php\n+++ b/tests/framework/console/stubs/FakeHelpController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nsimilarity index 90%\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nindex d9586dd9610..22c5bc7696c 100644\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeInjectionController.php b/tests/framework/console/stubs/FakeInjectionController.php\nsimilarity index 89%\nrename from tests/framework/console/FakeInjectionController.php\nrename to tests/framework/console/stubs/FakeInjectionController.php\nindex 0019ef7ce15..ae57310e31b 100644\n--- a/tests/framework/console/FakeInjectionController.php\n+++ b/tests/framework/console/stubs/FakeInjectionController.php\n@@ -6,10 +6,9 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\data\\DataProviderInterface;\n-use yiiunit\\framework\\console\\stubs\\DummyService;\n use yii\\console\\Controller;\n use yii\\console\\Request;\n use yiiunit\\framework\\web\\Post;\n","summary":"Edited 4 file(s) in tests/framework/console/stubs/"},{"subtask_id":"s19","scope_files":["tests/framework/db/mssql/QueryBuilderTest.php","tests/framework/db/mssql/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\nindex 2e8f97e3058..7354abaf595 100644\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\n@@ -1028,4 +1028,98 @@ public static function buildFromDataProvider(): array\n \n return $data;\n }\n+\n+ public function testRenameTable(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameTable('old_table', 'new_table');\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\n+ }\n+\n+ public function testRenameColumn(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\n+ $this->assertSame(\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\", $sql);\n+ }\n+\n+ public function testSelectExists(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\n+ }\n+\n+ public function testCheckIntegrityEnableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityDisableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityFiltersOutViews(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true);\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\n+ $this->assertStringNotContainsString('animal_view', $sql);\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->resetSequence('non_existent_table');\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage(\"There is not sequence associated with table 'order_item'.\");\n+ $qb->resetSequence('order_item');\n+ }\n+\n+ public function testUpdateWithVarbinaryData(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $params = [];\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\n+ $this->assertSame([':qp0' => 1], $params);\n+ }\n+\n+ public function testCompositeInWithSubqueryThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $params = [];\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\n+ $this->expectException('yii\\base\\NotSupportedException');\n+ $qb->buildCondition($condition, $params);\n+ }\n+\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\n+ }\n+\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\n+ }\n }\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex b847556b70b..71f1b10c545 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,8 +10,10 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Connection;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\n","summary":"Edited 2 file(s) in tests/framework/db/mssql/"},{"subtask_id":"s20","scope_files":["tests/framework/grid/GridViewTest.php"],"solution_diff":"diff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\nindex e8cc90c548c..63e4653923b 100644\n--- a/tests/framework/grid/GridViewTest.php\n+++ b/tests/framework/grid/GridViewTest.php\n@@ -217,15 +217,18 @@ public function testHeaderLabels(): void\n ],\n ]);\n \n+ $gridDataProvider = $grid->dataProvider;\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\n+\n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n ]);\n $grid->renderTableHeader();\n \n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n 'attributes' => ['attr1', 'attr2'],\n","summary":"Edited 1 file(s) in tests/framework/grid/"},{"subtask_id":"s21","scope_files":["tests/framework/helpers/ConsoleTest.php","tests/framework/helpers/HtmlTest.php","tests/framework/helpers/JsonTest.php","tests/framework/helpers/UrlTest.php"],"solution_diff":"diff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\nindex de13fb2d2cb..7fb23470d7b 100644\n--- a/tests/framework/helpers/ConsoleTest.php\n+++ b/tests/framework/helpers/ConsoleTest.php\n@@ -444,9 +444,9 @@ public function testSelect(): void\n }\n \n /**\n- * @property string name\n- * @property array types\n- * @property string description\n+ * @property string $name\n+ * @property array $types\n+ * @property string $description\n */\n class TestConsoleModel extends DynamicModel\n {\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\nindex 6a0495651ee..6adb0ef2a63 100644\n--- a/tests/framework/helpers/HtmlTest.php\n+++ b/tests/framework/helpers/HtmlTest.php\n@@ -17,6 +17,8 @@\n use yii\\db\\ArrayExpression;\n use yii\\helpers\\Html;\n use yii\\helpers\\Url;\n+use yiiunit\\framework\\helpers\\stubs\\HtmlTestModel;\n+use yiiunit\\framework\\helpers\\stubs\\MyHtml;\n use yiiunit\\TestCase;\n \n /**\n@@ -1711,7 +1713,7 @@ public function testError(): void\n 'Custom error message generated by callback'\n );\n $this->assertEquals(\n- '<div>Error in yiiunit\\framework\\helpers\\HtmlTestModel - name</div>',\n+ '<div>Error in yiiunit\\framework\\helpers\\stubs\\HtmlTestModel - name</div>',\n Html::error($model, 'name', ['errorSource' => fn($model, $attribute) => 'Error in ' . $model::class . ' - ' . $attribute]),\n 'Custom error message generated by closure'\n );\n@@ -2243,57 +2245,3 @@ public static function getInputIdByNameDataProvider(): array\n ];\n }\n }\n-\n-/**\n- * Class MyHtml\n- * @package yiiunit\\framework\\helpers\n- */\n-class MyHtml extends Html\n-{\n- /**\n- * @param Model $model\n- * @param string $attribute\n- * @param array $options\n- */\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\n- {\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\n- $attribute = static::getAttributeName($attribute);\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n- }\n- }\n-}\n-\n-/**\n- * @property string name\n- * @property string title\n- * @property string alias\n- * @property array types\n- * @property string description\n- */\n-class HtmlTestModel extends DynamicModel\n-{\n- public function init(): void\n- {\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n- $this->defineAttribute($attribute);\n- }\n- }\n-\n- public function rules()\n- {\n- return [\n- ['name', 'required'],\n- ['name', 'string', 'max' => 100],\n- ['title', 'string', 'length' => 10],\n- ['alias', 'string', 'length' => [0, 20]],\n- ['description', 'string', 'max' => 500],\n- [['radio', 'checkbox'], 'boolean'],\n- ];\n- }\n-\n- public function customError()\n- {\n- return 'this is custom error message';\n- }\n-}\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\nindex 1b684b0859b..dd8489d1ac6 100644\n--- a/tests/framework/helpers/JsonTest.php\n+++ b/tests/framework/helpers/JsonTest.php\n@@ -15,8 +15,8 @@\n use DateTimeZone;\n use yii\\helpers\\Json;\n use yii\\web\\JsExpression;\n+use yiiunit\\framework\\helpers\\stubs\\JsonModel;\n use yiiunit\\framework\\web\\Post;\n-use yiiunit\\framework\\models\\JsonModel;\n use yiiunit\\TestCase;\n \n /**\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex 275f7522cec..e67bc13078c 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -64,13 +64,13 @@ protected function tearDown(): void\n */\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\n {\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\n+ Yii::$app->controller = $controller = new Controller(\n+ $controllerId,\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\n+ );\n+\n $controller->actionParams = $params;\n $controller->action = new Action($actionID, $controller);\n-\n- if ($moduleID !== null) {\n- $controller->module = new Module($moduleID);\n- }\n }\n \n protected function removeMockedAction()\n","summary":"Edited 4 file(s) in tests/framework/helpers/"},{"subtask_id":"s22","scope_files":["tests/framework/helpers/stubs/HtmlTestModel.php","tests/framework/helpers/stubs/JsonModel.php","tests/framework/helpers/stubs/MyHtml.php"],"solution_diff":"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\nnew file mode 100644\nindex 00000000000..078e10da545\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\n@@ -0,0 +1,47 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\DynamicModel;\n+\n+/**\n+ * @property string $name\n+ * @property string $title\n+ * @property string $alias\n+ * @property mixed $types\n+ * @property string $description\n+ * @property bool $radio\n+ * @property bool $checkbox\n+ */\n+class HtmlTestModel extends DynamicModel\n+{\n+ public function init(): void\n+ {\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n+ $this->defineAttribute($attribute);\n+ }\n+ }\n+\n+ public function rules()\n+ {\n+ return [\n+ ['name', 'required'],\n+ ['name', 'string', 'max' => 100],\n+ ['title', 'string', 'length' => 10],\n+ ['alias', 'string', 'length' => [0, 20]],\n+ ['description', 'string', 'max' => 500],\n+ [['radio', 'checkbox'], 'boolean'],\n+ ];\n+ }\n+\n+ public function customError()\n+ {\n+ return 'this is custom error message';\n+ }\n+}\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\nsimilarity index 90%\nrename from tests/framework/models/JsonModel.php\nrename to tests/framework/helpers/stubs/JsonModel.php\nindex 1c85db7ac1b..c41e6cb6b87 100644\n--- a/tests/framework/models/JsonModel.php\n+++ b/tests/framework/helpers/stubs/JsonModel.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\models;\n+namespace yiiunit\\framework\\helpers\\stubs;\n \n use JsonSerializable;\n use ReturnTypeWillChange;\n@@ -16,11 +16,13 @@\n * JSON serializable model for tests.\n *\n * {@inheritdoc}\n+ *\n+ * @property mixed $name\n */\n class JsonModel extends DynamicModel implements JsonSerializable\n {\n /**\n- * @var array\n+ * @var array|object\n */\n public $data = ['json' => 'serializable'];\n \ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\nnew file mode 100644\nindex 00000000000..673f1a9468b\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/MyHtml.php\n@@ -0,0 +1,32 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\Model;\n+use yii\\helpers\\Html;\n+\n+/**\n+ * Class MyHtml\n+ * @package yiiunit\\framework\\helpers\n+ */\n+class MyHtml extends Html\n+{\n+ /**\n+ * @param Model $model\n+ * @param string $attribute\n+ * @param array $options\n+ */\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\n+ {\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\n+ $attribute = static::getAttributeName($attribute);\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n+ }\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/helpers/stubs/"},{"subtask_id":"s23","scope_files":["tests/framework/i18n/FormatterDateTest.php","tests/framework/i18n/FormatterNumberTest.php","tests/framework/i18n/LocaleTest.php"],"solution_diff":"diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\nindex 5b9d5e0b4a3..9535075fa88 100644\n--- a/tests/framework/i18n/FormatterDateTest.php\n+++ b/tests/framework/i18n/FormatterDateTest.php\n@@ -22,7 +22,7 @@\n class FormatterDateTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \n@@ -367,18 +367,18 @@ public function testAsRelativeTime(): void\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\n \n // Invert all the DateIntervals\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\n@@ -423,7 +423,7 @@ public function testAsRelativeTime(): void\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\n $interval_0_seconds = new DateInterval('PT0S');\n- $interval_0_seconds->invert = true;\n+ $interval_0_seconds->invert = 1;\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\n \n // empty input\n@@ -495,19 +495,19 @@ public function testAsDuration(): void\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\n \n // Invert all the DateIntervals\n- $interval_0_seconds->invert = true;\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_0_seconds->invert = 1;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\n@@ -742,7 +742,7 @@ public function testDateOnlyValues(): void\n \n public function testIntlTimeOnlyValues()\n {\n- return $this->testTimeOnlyValues();\n+ $this->testTimeOnlyValues();\n }\n \n /**\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\nindex 034aa4501d4..073ac0778e5 100644\n--- a/tests/framework/i18n/FormatterNumberTest.php\n+++ b/tests/framework/i18n/FormatterNumberTest.php\n@@ -19,7 +19,7 @@\n class FormatterNumberTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\nindex 306d9dc1595..62505611cf7 100644\n--- a/tests/framework/i18n/LocaleTest.php\n+++ b/tests/framework/i18n/LocaleTest.php\n@@ -17,7 +17,7 @@\n class LocaleTest extends TestCase\n {\n /**\n- * @var Locale\n+ * @var Locale|null\n */\n protected $locale;\n \n","summary":"Edited 3 file(s) in tests/framework/i18n/"},{"subtask_id":"s24","scope_files":["tests/framework/log/DispatcherTest.php","tests/framework/log/EmailTargetTest.php","tests/framework/log/LoggerTest.php","tests/framework/log/SyslogTargetTest.php"],"solution_diff":"diff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\nindex 69e7ac695c7..0de25bedd9c 100644\n--- a/tests/framework/log/DispatcherTest.php\n+++ b/tests/framework/log/DispatcherTest.php\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\n \n /**\n * @group log\n+ *\n+ * @method static mixed microtime($get_as_float)\n */\n class DispatcherTest extends TestCase\n {\n@@ -324,7 +326,10 @@ public function testTargetThrow(): void\n $this->assertSame(1, $this->targetThrowFirstCount);\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\n+\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\n+ $this->assertIsArray($targetThrowSecondOutputs);\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\n }\n }\n }\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\nindex 0b5c5d95423..e1e48bda009 100644\n--- a/tests/framework/log/EmailTargetTest.php\n+++ b/tests/framework/log/EmailTargetTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\base\\InvalidConfigException;\n use yii\\log\\EmailTarget;\n use yii\\mail\\BaseMailer;\n@@ -21,7 +22,7 @@\n class EmailTargetTest extends TestCase\n {\n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var BaseMailer&MockObject\n */\n protected $mailer;\n \n@@ -75,7 +76,6 @@ public function testExportWithSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -121,7 +121,6 @@ public function testExportWithoutSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -157,7 +156,6 @@ public function testExportWithSendFailure(): void\n $message->method('send')->willReturn(false);\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\nindex f929e38655f..10e1828a03c 100644\n--- a/tests/framework/log/LoggerTest.php\n+++ b/tests/framework/log/LoggerTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n+use stdClass;\n use yii\\log\\Dispatcher;\n use yii\\log\\Logger;\n use yiiunit\\TestCase;\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\n protected $logger;\n \n /**\n- * @var Dispatcher|\\PHPUnit_Framework_MockObject_MockObject\n+ * @var Dispatcher&MockObject\n */\n protected $dispatcher;\n \n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\n $this->assertEquals('application', $this->logger->messages[0][2]);\n $this->assertEquals([\n 'file' => __FILE__,\n- 'line' => 66,\n+ 'line' => 68,\n 'function' => 'log',\n 'class' => $this->logger::class,\n 'type' => '->',\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\n */\n public function testLogWithFlush(): void\n {\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['flush']);\n \n $logger->flushInterval = 1;\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\n */\n public function testFlushWithoutDispatcher(): void\n {\n- $dispatcher = $this->getMockBuilder('\\stdClass')->getMock();\n+ $dispatcher = $this->createMock(stdClass::class);\n $dispatcher->expects($this->never())->method($this->anything());\n \n $this->logger->messages = ['anything'];\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $this->logger->dispatcher = $dispatcher;\n $this->logger->flush();\n $this->assertEmpty($this->logger->messages);\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\n ['duration' => 30],\n ];\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\n $logger->method('getProfiling')->willReturn($timings);\n $logger->expects($this->once())\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\n $messages = ['anyData'];\n $returnValue = 'return value';\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\n 'duration' => 5,\n ],\n ];\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\nindex 91659ac80cb..12ea5c77feb 100644\n--- a/tests/framework/log/SyslogTargetTest.php\n+++ b/tests/framework/log/SyslogTargetTest.php\n@@ -24,7 +24,7 @@ function closelog()\n }\n \n namespace yiiunit\\framework\\log {\n- use PHPUnit_Framework_MockObject_MockObject;\n+ use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\helpers\\VarDumper;\n use yii\\log\\Logger;\n use yii\\log\\SyslogTarget;\n@@ -34,6 +34,10 @@ function closelog()\n * Class SyslogTargetTest.\n *\n * @group log\n+ *\n+ * @method static mixed openlog($arguments)\n+ * @method static mixed syslog($arguments)\n+ * @method static mixed closelog($arguments)\n */\n class SyslogTargetTest extends TestCase\n {\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\n public static $functions = [];\n \n /**\n- * @var MockObject\n+ * @var SyslogTarget&MockObject\n */\n protected $syslogTarget;\n \n@@ -64,7 +68,7 @@ public function testExport(): void\n {\n $identity = 'identity string';\n $options = LOG_ODELAY | LOG_PID;\n- $facility = 'facility string';\n+ $facility = LOG_USER;\n $messages = [\n ['info message', Logger::LEVEL_INFO],\n ['error message', Logger::LEVEL_ERROR],\n@@ -75,7 +79,7 @@ public function testExport(): void\n ['profile end message', Logger::LEVEL_PROFILE_END],\n ];\n \n- /** @var SyslogTarget $syslogTarget */\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\n ->getMock();\n@@ -180,7 +184,7 @@ function (...$parameters) use ($matcher): void {\n */\n public function testFailedExport(): void\n {\n- /** @var SyslogTarget $syslogTarget */\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\n ->getMock();\n@@ -189,7 +193,7 @@ public function testFailedExport(): void\n \n $syslogTarget->identity = 'identity string';\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\n- $syslogTarget->facility = 'facility string';\n+ $syslogTarget->facility = LOG_USER;\n $syslogTarget->messages = [\n ['test', Logger::LEVEL_INFO],\n ];\n","summary":"Edited 4 file(s) in tests/framework/log/"},{"subtask_id":"s25","scope_files":["tests/framework/mail/BaseMailerTest.php","tests/framework/mail/BaseMessageTest.php"],"solution_diff":"diff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\nindex f2e6ef0a928..92713842ad7 100644\n--- a/tests/framework/mail/BaseMailerTest.php\n+++ b/tests/framework/mail/BaseMailerTest.php\n@@ -11,8 +11,8 @@\n use Yii;\n use yii\\base\\View;\n use yii\\helpers\\FileHelper;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n use yiiunit\\TestCase;\n \n /**\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestMailComponent()\n {\n- $component = new Mailer();\n+ $component = new TestMailer();\n $component->viewPath = $this->getTestFilePath();\n \n return $component;\n }\n \n /**\n- * @return Mailer mailer instance\n+ * @return TestMailer mailer instance\n */\n protected function getTestMailComponent()\n {\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\n \n public function testSetupView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $view = new View();\n $mailer->setView($view);\n@@ -95,14 +95,14 @@ public function testSetupView(): void\n */\n public function testGetDefaultView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $view = $mailer->getView();\n $this->assertIsObject($view, 'Unable to get default view!');\n }\n \n public function testCreateMessage(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $message = $mailer->compose();\n $this->assertIsObject($message, 'Unable to create message instance!');\n $this->assertEquals($mailer->messageClass, $message::class, 'Invalid message class!');\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\n */\n public function testDefaultMessageConfig(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $notPropertyConfig = [\n 'charset' => 'utf-16',\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\n $messageConfig = [...$notPropertyConfig, ...$propertyConfig];\n $mailer->messageConfig = $messageConfig;\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n \n foreach ($notPropertyConfig as $name => $value) {\n@@ -204,6 +205,7 @@ public function testCompose(): void\n $textViewFileContent = 'Plain text view file content';\n file_put_contents($textViewFileName, $textViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n 'text' => $textViewName,\n@@ -211,6 +213,7 @@ public function testCompose(): void\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose($htmlViewName);\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\n@@ -265,6 +268,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n ]);\n@@ -274,7 +278,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\n \n public function testUseFileTransport(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $this->assertFalse($mailer->useFileTransport);\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\n \n@@ -294,11 +298,9 @@ public function testUseFileTransport(): void\n \n public function testBeforeSendEvent(): void\n {\n- $message = new Message();\n-\n- /** @var Mailer $mailerMock */\n+ $message = new TestMessage();\n $mailerMock = $this->createPartialMock(\n- Mailer::class,\n+ TestMailer::class,\n [\n 'afterSend',\n 'beforeSend',\n@@ -311,160 +313,3 @@ public function testBeforeSendEvent(): void\n $mailerMock->send($message);\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class Mailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\Message';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n-\n- return true;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class Message extends BaseMessage\n-{\n- public $id;\n- public $encoding;\n- public $_charset;\n- public $_from;\n- public $_replyTo;\n- public $_to;\n- public $_cc;\n- public $_bcc;\n- public $_subject;\n- public $_textBody;\n- public $_htmlBody;\n-\n- public function getCharset()\n- {\n- return $this->_charset;\n- }\n-\n- public function setCharset($charset)\n- {\n- $this->_charset = $charset;\n-\n- return $this;\n- }\n-\n- public function getFrom()\n- {\n- return $this->_from;\n- }\n-\n- public function setFrom($from)\n- {\n- $this->_from = $from;\n-\n- return $this;\n- }\n-\n- public function getTo()\n- {\n- return $this->_to;\n- }\n-\n- public function setTo($to)\n- {\n- $this->_to = $to;\n-\n- return $this;\n- }\n-\n- public function getCc()\n- {\n- return $this->_cc;\n- }\n-\n- public function setCc($cc)\n- {\n- $this->_cc = $cc;\n-\n- return $this;\n- }\n-\n- public function getBcc()\n- {\n- return $this->_bcc;\n- }\n-\n- public function setBcc($bcc)\n- {\n- $this->_bcc = $bcc;\n-\n- return $this;\n- }\n-\n- public function getSubject()\n- {\n- return $this->_subject;\n- }\n-\n- public function setSubject($subject)\n- {\n- $this->_subject = $subject;\n-\n- return $this;\n- }\n-\n- public function getReplyTo()\n- {\n- return $this->_replyTo;\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- $this->_replyTo = $replyTo;\n-\n- return $this;\n- }\n-\n- public function setTextBody($text)\n- {\n- $this->_textBody = $text;\n-\n- return $this;\n- }\n-\n- public function setHtmlBody($html)\n- {\n- $this->_htmlBody = $html;\n-\n- return $this;\n- }\n-\n- public function attachContent($content, array $options = []): void\n- {\n- }\n-\n- public function attach($fileName, array $options = []): void\n- {\n- }\n-\n- public function embed($fileName, array $options = []): void\n- {\n- }\n-\n- public function embedContent($content, array $options = []): void\n- {\n- }\n-\n- public function toString()\n- {\n- $mailer = $this->mailer;\n- $this->mailer = null;\n- $s = var_export($this, true);\n- $this->mailer = $mailer;\n- return $s;\n- }\n-}\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\nindex e0006d72d4e..e0b8d1ce008 100644\n--- a/tests/framework/mail/BaseMessageTest.php\n+++ b/tests/framework/mail/BaseMessageTest.php\n@@ -10,8 +10,9 @@\n \n use Exception;\n use Yii;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMessageWithException;\n use yiiunit\\TestCase;\n \n /**\n@@ -29,7 +30,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestEmailComponent()\n {\n@@ -59,6 +60,7 @@ public function testSend(): void\n public function testToString(): void\n {\n $mailer = $this->getMailer();\n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n $this->assertEquals($message->toString(), '' . $message);\n }\n@@ -73,128 +75,3 @@ public function testExceptionToString(): void\n (string) $message;\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class TestMailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\TestMessage';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class TestMessage extends BaseMessage\n-{\n- public $text;\n- public $html;\n-\n- public function getCharset()\n- {\n- return '';\n- }\n-\n- public function setCharset($charset): void\n- {\n- }\n-\n- public function getFrom()\n- {\n- return '';\n- }\n-\n- public function setFrom($from): void\n- {\n- }\n-\n- public function getReplyTo()\n- {\n- return '';\n- }\n-\n- public function setReplyTo($replyTo): void\n- {\n- }\n-\n- public function getTo()\n- {\n- return '';\n- }\n-\n- public function setTo($to): void\n- {\n- }\n-\n- public function getCc()\n- {\n- return '';\n- }\n-\n- public function setCc($cc): void\n- {\n- }\n-\n- public function getBcc()\n- {\n- return '';\n- }\n-\n- public function setBcc($bcc): void\n- {\n- }\n-\n- public function getSubject()\n- {\n- return '';\n- }\n-\n- public function setSubject($subject): void\n- {\n- }\n-\n- public function setTextBody($text): void\n- {\n- $this->text = $text;\n- }\n-\n- public function setHtmlBody($html): void\n- {\n- $this->html = $html;\n- }\n-\n- public function attachContent($content, array $options = []): void\n- {\n- }\n-\n- public function attach($fileName, array $options = []): void\n- {\n- }\n-\n- public function embed($fileName, array $options = []): void\n- {\n- }\n-\n- public function embedContent($content, array $options = []): void\n- {\n- }\n-\n- public function toString()\n- {\n- return static::class;\n- }\n-}\n-\n-class TestMessageWithException extends TestMessage\n-{\n- public function toString()\n- {\n- throw new Exception('Test exception in toString.');\n- }\n-}\n","summary":"Edited 2 file(s) in tests/framework/mail/"},{"subtask_id":"s26","scope_files":["tests/framework/mail/stubs/TestMailer.php","tests/framework/mail/stubs/TestMessage.php","tests/framework/mail/stubs/TestMessageWithException.php"],"solution_diff":"diff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\nnew file mode 100644\nindex 00000000000..4e8a1e92403\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMailer.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMailer;\n+\n+/**\n+ * Test Mailer class.\n+ */\n+class TestMailer extends BaseMailer\n+{\n+ public $messageClass = TestMessage::class;\n+ public $sentMessages = [];\n+\n+ protected function sendMessage($message)\n+ {\n+ $this->sentMessages[] = $message;\n+\n+ return true;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\nnew file mode 100644\nindex 00000000000..34e469045ee\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessage.php\n@@ -0,0 +1,152 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMessage;\n+\n+/**\n+ * Test Message class.\n+ */\n+class TestMessage extends BaseMessage\n+{\n+ public $id;\n+ public $encoding;\n+ public $_charset;\n+ public $_from;\n+ public $_replyTo;\n+ public $_to;\n+ public $_cc;\n+ public $_bcc;\n+ public $_subject;\n+ public $_textBody;\n+ public $_htmlBody;\n+\n+ public function getCharset()\n+ {\n+ return $this->_charset;\n+ }\n+\n+ public function setCharset($charset)\n+ {\n+ $this->_charset = $charset;\n+\n+ return $this;\n+ }\n+\n+ public function getFrom()\n+ {\n+ return $this->_from;\n+ }\n+\n+ public function setFrom($from)\n+ {\n+ $this->_from = $from;\n+\n+ return $this;\n+ }\n+\n+ public function getTo()\n+ {\n+ return $this->_to;\n+ }\n+\n+ public function setTo($to)\n+ {\n+ $this->_to = $to;\n+\n+ return $this;\n+ }\n+\n+ public function getCc()\n+ {\n+ return $this->_cc;\n+ }\n+\n+ public function setCc($cc)\n+ {\n+ $this->_cc = $cc;\n+\n+ return $this;\n+ }\n+\n+ public function getBcc()\n+ {\n+ return $this->_bcc;\n+ }\n+\n+ public function setBcc($bcc)\n+ {\n+ $this->_bcc = $bcc;\n+\n+ return $this;\n+ }\n+\n+ public function getSubject()\n+ {\n+ return $this->_subject;\n+ }\n+\n+ public function setSubject($subject)\n+ {\n+ $this->_subject = $subject;\n+\n+ return $this;\n+ }\n+\n+ public function getReplyTo()\n+ {\n+ return $this->_replyTo;\n+ }\n+\n+ public function setReplyTo($replyTo)\n+ {\n+ $this->_replyTo = $replyTo;\n+\n+ return $this;\n+ }\n+\n+ public function setTextBody($text)\n+ {\n+ $this->_textBody = $text;\n+\n+ return $this;\n+ }\n+\n+ public function setHtmlBody($html)\n+ {\n+ $this->_htmlBody = $html;\n+\n+ return $this;\n+ }\n+\n+ public function attachContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function attach($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embed($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embedContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function toString()\n+ {\n+ $mailer = $this->mailer;\n+ $this->mailer = null;\n+ $s = var_export($this, true);\n+ $this->mailer = $mailer;\n+ return $s;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\nnew file mode 100644\nindex 00000000000..60903c687f8\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\n@@ -0,0 +1,19 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use Exception;\n+\n+class TestMessageWithException extends TestMessage\n+{\n+ public function toString()\n+ {\n+ throw new Exception('Test exception in toString.');\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/mail/stubs/"},{"subtask_id":"s27","scope_files":["tests/framework/mutex/DbMutexTest.php","tests/framework/mutex/MutexTest.php","tests/framework/mutex/OracleMutexTest.php"],"solution_diff":"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nnew file mode 100644\nindex 00000000000..324722b7585\n--- /dev/null\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -0,0 +1,73 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use Yii;\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\DbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ * @group db\n+ */\n+class DbMutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ],\n+ ]);\n+ }\n+\n+ public function testDbPropertyDefaultValue(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n+ $this->assertSame(Yii::$app->db, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConnectionObject(): void\n+ {\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\n+ $this->assertSame($connection, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConfigArray(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ]]);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testThrowsExceptionForInvalidDb(): void\n+ {\n+ $this->expectException(InvalidConfigException::class);\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\n+ }\n+}\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\nnew file mode 100644\nindex 00000000000..16d7dd2ef79\n--- /dev/null\n+++ b/tests/framework/mutex/MutexTest.php\n@@ -0,0 +1,79 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yiiunit\\framework\\mutex\\mocks\\DumbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class MutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ DumbMutex::$locked = false;\n+ }\n+\n+ public function testAcquireAndRelease(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertTrue($mutex->isAcquired('test'));\n+ $this->assertTrue($mutex->release('test'));\n+ $this->assertFalse($mutex->isAcquired('test'));\n+ }\n+\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertFalse($mutex->acquire('test'));\n+ $mutex->release('test');\n+ }\n+\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->release('test'));\n+ }\n+\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\n+ }\n+\n+ public function testAutoReleaseIsEnabledByDefault(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->autoRelease);\n+ }\n+\n+ public function testAutoReleaseCanBeDisabled(): void\n+ {\n+ $mutex = new DumbMutex(['autoRelease' => false]);\n+ $this->assertFalse($mutex->autoRelease);\n+ }\n+\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $mutex->acquire('test');\n+\n+ $countBefore = count($mutex->attemptsTime);\n+ $mutex->acquire('test');\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\n+\n+ $mutex->release('test');\n+ }\n+}\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\nnew file mode 100644\nindex 00000000000..01a6ca34cc3\n--- /dev/null\n+++ b/tests/framework/mutex/OracleMutexTest.php\n@@ -0,0 +1,115 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\OracleMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class OracleMutexTest extends TestCase\n+{\n+ public function testInitSucceedsWithOciDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testInitSucceedsWithOdbcDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'odbc'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testDefaultProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\n+ $this->assertFalse($mutex->releaseOnCommit);\n+ }\n+\n+ public function testCustomProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex([\n+ 'db' => $db,\n+ 'lockMode' => OracleMutex::MODE_NL,\n+ 'releaseOnCommit' => true,\n+ ]);\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\n+ $this->assertTrue($mutex->releaseOnCommit);\n+ }\n+\n+ /**\n+ * @dataProvider invalidDriverProvider\n+ */\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', $driverName],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\n+ new OracleMutex(['db' => $db]);\n+ }\n+\n+ public static function invalidDriverProvider(): array\n+ {\n+ return [\n+ 'mysql' => ['mysql'],\n+ 'pgsql' => ['pgsql'],\n+ 'sqlite' => ['sqlite'],\n+ 'sqlsrv' => ['sqlsrv'],\n+ ];\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/mutex/"},{"subtask_id":"s28","scope_files":["tests/framework/rbac/DbManagerTestCase.php","tests/framework/rbac/ManagerTestCase.php","tests/framework/rbac/PhpManagerTest.php"],"solution_diff":"diff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\nindex 9014e79c1db..ba66e8a20d8 100644\n--- a/tests/framework/rbac/DbManagerTestCase.php\n+++ b/tests/framework/rbac/DbManagerTestCase.php\n@@ -31,6 +31,8 @@\n \n /**\n * Base class for testing {@see DbManager}.\n+ *\n+ * @extends ManagerTestCase<DbManager>\n */\n abstract class DbManagerTestCase extends ManagerTestCase\n {\n@@ -38,7 +40,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\n protected static $driverName;\n \n /**\n- * @var Connection\n+ * @var Connection|null\n */\n protected $db;\n \ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\nindex dfa7d6b992c..6570a29db04 100644\n--- a/tests/framework/rbac/ManagerTestCase.php\n+++ b/tests/framework/rbac/ManagerTestCase.php\n@@ -32,16 +32,18 @@\n \n /**\n * Base class for testing {@see ManagerInterface}.\n+ *\n+ * @template TManager of BaseManager\n */\n abstract class ManagerTestCase extends TestCase\n {\n /**\n- * @var ManagerInterface|BaseManager\n+ * @var TManager\n */\n protected $auth;\n \n /**\n- * @return ManagerInterface\n+ * @return TManager\n */\n abstract protected function createManager();\n \n@@ -176,6 +178,11 @@ public function testAddRule(): void\n \n $rule = $this->auth->getRule($ruleName);\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Rule must round-trip as the original subclass.',\n+ );\n self::assertSame(\n $ruleName,\n $rule->name,\n@@ -193,6 +200,12 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('isAuthor');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Existing rule must load as the original subclass.',\n+ );\n+\n $rule->name = 'newName';\n $rule->reallyReally = false;\n \n@@ -207,6 +220,11 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('newName');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Renamed rule must remain the original subclass.',\n+ );\n self::assertSame(\n 'newName',\n $rule->name,\n@@ -223,6 +241,11 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('newName');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Subsequent reload must keep the subclass.',\n+ );\n self::assertTrue(\n $rule->reallyReally,\n 'Subsequent property update must persist.',\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\nindex 42367bcb4d0..f95baad958b 100644\n--- a/tests/framework/rbac/PhpManagerTest.php\n+++ b/tests/framework/rbac/PhpManagerTest.php\n@@ -18,6 +18,8 @@\n \n /**\n * Unit test for {@see \\yii\\rbac\\PhpManager}.\n+ *\n+ * @extends ManagerTestCase<ExposedPhpManager>\n */\n #[Group('rbac')]\n #[Group('rbac-php')]\n","summary":"Edited 3 file(s) in tests/framework/rbac/"},{"subtask_id":"s29","scope_files":["tests/framework/rest/IndexActionTest.php"],"solution_diff":"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex 11919269e50..077fd71a147 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n Pagination|bool|array $pagination,\n","summary":"Edited 1 file(s) in tests/framework/rest/"},{"subtask_id":"s30","scope_files":["tests/framework/test/ActiveFixtureTest.php"],"solution_diff":"diff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\nindex bdb1b0bfc82..f5ea8564de0 100644\n--- a/tests/framework/test/ActiveFixtureTest.php\n+++ b/tests/framework/test/ActiveFixtureTest.php\n@@ -43,7 +43,11 @@ public function testGetData(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(CustomerFixture::class, $fixture !== null ? $fixture::class : self::class);\n+ self::assertInstanceOf(\n+ CustomerFixture::class,\n+ $fixture,\n+ 'Customer fixture must be registered.',\n+ );\n $this->assertCount(2, $fixture);\n $this->assertEquals(1, $fixture['customer1']['id']);\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\n@@ -62,13 +66,28 @@ public function testGetModel(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(Customer::class, $fixture->getModel('customer1')::class);\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\n+ self::assertInstanceOf(\n+ CustomerFixture::class,\n+ $fixture,\n+ 'Customer fixture must be registered.',\n+ );\n+\n+ $customer1 = $fixture->getModel('customer1');\n+\n+ self::assertInstanceOf(\n+ Customer::class,\n+ $customer1,\n+ 'Customer model must be resolved by key.',\n+ );\n+\n+ $this->assertEquals(1, $customer1->id);\n+ $this->assertEquals('customer1@example.com', $customer1->email);\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\n \n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+ $this->assertEquals(2, $customer2->id);\n+ $this->assertEquals('customer2@example.com', $customer2->email);\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\n \n $test->tearDown();\n@@ -80,8 +99,10 @@ public function testDataDirectory(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(Customer::class, $directory);\n $this->assertEquals(1, $directory->id);\n $this->assertEquals('directory@example.com', $directory['email']);\n $test->tearDown();\n@@ -93,8 +114,10 @@ public function testDataPath(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer);\n $this->assertEquals(1, $customer->id);\n $this->assertEquals('customer1@example.com', $customer['email']);\n $test->tearDown();\n@@ -106,6 +129,7 @@ public function testTruncate(): void\n \n $test->setUp();\n $fixture = $test->getFixture('animals');\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\n $this->assertEmpty($fixture->data);\n $test->tearDown();\n }\n","summary":"Edited 1 file(s) in tests/framework/test/"},{"subtask_id":"s31","scope_files":["tests/framework/validators/FileValidatorTest.php","tests/framework/validators/FilterValidatorTest.php","tests/framework/validators/RequiredValidatorTest.php","tests/framework/validators/SafeValidatorTest.php","tests/framework/validators/TrimValidatorTest.php","tests/framework/validators/ValidatorTest.php"],"solution_diff":"diff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\nindex 2071a7a5387..789a1183405 100644\n--- a/tests/framework/validators/FileValidatorTest.php\n+++ b/tests/framework/validators/FileValidatorTest.php\n@@ -353,7 +353,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\n \n /**\n * @param array $params\n- * @return UploadedFile[]\n+ * @return UploadedFile|UploadedFile[]\n */\n protected function createTestFiles($params = [])\n {\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\nindex 9635b9dc1b7..bec0aca3686 100644\n--- a/tests/framework/validators/FilterValidatorTest.php\n+++ b/tests/framework/validators/FilterValidatorTest.php\n@@ -10,8 +10,8 @@\n \n use yii\\validators\\FilterValidator;\n use yii\\validators\\Validator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -87,7 +87,10 @@ public function testClientValidateAttributeReturnsNullWithoutClientScript(): voi\n {\n $val = new FilterValidator(['filter' => 'trim']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\n+ $this->assertNull(\n+ $val->clientValidateAttribute($m, 'attr_one', new ViewStub()),\n+ 'No `ClientValidatorScriptInterface` binding must yield `null`.',\n+ );\n }\n \n public function testGetClientOptionsDefault(): void\n@@ -106,10 +109,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class FilterViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\nindex aef333849a9..06553221616 100644\n--- a/tests/framework/validators/RequiredValidatorTest.php\n+++ b/tests/framework/validators/RequiredValidatorTest.php\n@@ -10,7 +10,6 @@\n \n namespace yiiunit\\framework\\validators;\n \n-use yii\\base\\Model;\n use yii\\validators\\RequiredValidator;\n use yii\\validators\\Validator;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n@@ -159,20 +158,3 @@ public function testErrorMessageWithoutRequiredValueShowsBlank(): void\n $this->assertStringNotContainsString('{requiredValue}', $errors[0]);\n }\n }\n-\n-class ModelForReqValidator extends Model\n-{\n- public $attr;\n-\n- public function rules()\n- {\n- return [\n- [['attr'], 'required'],\n- ];\n- }\n-\n- public function attributeLabels()\n- {\n- return ['attr' => '<b>Attr</b>'];\n- }\n-}\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\nindex 079cda410a7..c4eafa9243c 100644\n--- a/tests/framework/validators/SafeValidatorTest.php\n+++ b/tests/framework/validators/SafeValidatorTest.php\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n }\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\n \n $validator->validateAttributes($model, ['name', 'email']);\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n- $this->assertNull($model->email);\n+ $this->assertNull($model['email']);\n $this->assertFalse($model->hasErrors());\n }\n \n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\n \n $validator->validateAttribute($model, 'field');\n \n- $this->assertNull($model->field);\n+ $this->assertNull($model['field']);\n $this->assertFalse($model->hasErrors('field'));\n }\n \n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\n \n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\n \n+ $this->assertTrue(isset($model->username));\n $this->assertSame('admin', $model->username);\n- $this->assertNull($model->role);\n+ $this->assertNull($model['role']);\n }\n \n public function testValidationAlwaysPasses(): void\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\n $validator->validateAttribute($model, 'attr');\n \n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\n- $this->assertSame($value, $model->attr);\n+ $this->assertSame($value, $model['attr']);\n }\n }\n }\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\nindex 83fef90d20c..1739ca5646e 100644\n--- a/tests/framework/validators/TrimValidatorTest.php\n+++ b/tests/framework/validators/TrimValidatorTest.php\n@@ -38,6 +38,7 @@ public function testTrimWhitespace(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -48,6 +49,7 @@ public function testTrimTabs(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -59,6 +61,7 @@ public function testTrimCustomChars(): void\n \n $validator->validateAttribute($model, 'path');\n \n+ $this->assertTrue(isset($model->path));\n $this->assertSame('hello', $model->path);\n }\n \n@@ -69,6 +72,7 @@ public function testTrimEmptyString(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -79,6 +83,7 @@ public function testTrimNullValue(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -89,6 +94,7 @@ public function testTrimIntegerValue(): void\n \n $validator->validateAttribute($model, 'count');\n \n+ $this->assertTrue(isset($model->count));\n $this->assertSame('42', $model->count);\n }\n \n@@ -99,6 +105,7 @@ public function testTrimArray(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame(['foo', 'bar'], $model->tags);\n }\n \n@@ -111,6 +118,7 @@ public function testSkipOnArrayTrue(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame($original, $model->tags);\n }\n \n@@ -122,6 +130,7 @@ public function testSkipOnArrayTrueWithScalar(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -139,6 +148,7 @@ public function testTrimBooleanValue(): void\n \n $validator->validateAttribute($model, 'flag');\n \n+ $this->assertTrue(isset($model->flag));\n $this->assertSame('1', $model->flag);\n }\n \n@@ -149,6 +159,7 @@ public function testTrimWithModelRules(): void\n \n $model->validate();\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n $this->assertFalse($model->hasErrors());\n }\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\nindex 8b466f018f0..2ec03928235 100644\n--- a/tests/framework/validators/ValidatorTest.php\n+++ b/tests/framework/validators/ValidatorTest.php\n@@ -257,6 +257,8 @@ public function testClientValidateAttribute(): void\n \n $model = new FakedValidationModel();\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\n+ $this->assertInstanceOf(InlineValidator::class, $val);\n+\n $val->clientValidate = 'clientInlineVal';\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\n \n","summary":"Edited 6 file(s) in tests/framework/validators/"},{"subtask_id":"s32","scope_files":["tests/framework/validators/stubs/ModelForReqValidator.php","tests/framework/validators/stubs/ViewStub.php"],"solution_diff":"diff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\nnew file mode 100644\nindex 00000000000..3d4654c80ed\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\base\\Model;\n+\n+class ModelForReqValidator extends Model\n+{\n+ public $attr;\n+\n+ public function rules()\n+ {\n+ return [\n+ [['attr'], 'required'],\n+ ];\n+ }\n+\n+ public function attributeLabels()\n+ {\n+ return ['attr' => '<b>Attr</b>'];\n+ }\n+}\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\nnew file mode 100644\nindex 00000000000..a6a957ac910\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ViewStub.php\n@@ -0,0 +1,18 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\web\\View;\n+\n+class ViewStub extends View\n+{\n+ public function registerAssetBundle($name, $position = null)\n+ {\n+ }\n+}\n","summary":"Edited 2 file(s) in tests/framework/validators/stubs/"},{"subtask_id":"s33","scope_files":["tests/framework/web/ControllerTest.php","tests/framework/web/ErrorActionTest.php","tests/framework/web/ErrorHandlerTest.php","tests/framework/web/GroupUrlRuleTest.php","tests/framework/web/JsonResponseFormatterTest.php","tests/framework/web/MultipartFormDataParserTest.php","tests/framework/web/UploadedFileTest.php","tests/framework/web/UserIdentity.php","tests/framework/web/UserTest.php","tests/framework/web/XmlResponseFormatterTest.php"],"solution_diff":"diff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\nindex 471b9c7b229..09d06635607 100644\n--- a/tests/framework/web/ControllerTest.php\n+++ b/tests/framework/web/ControllerTest.php\n@@ -12,10 +12,10 @@\n \n use PHPUnit\\Framework\\Attributes\\Group;\n use yii\\web\\Application;\n-use yiiunit\\framework\\web\\FakeController;\n-use yiiunit\\framework\\web\\FakeInjectionController;\n-use yiiunit\\framework\\web\\FakeTypedParamsController;\n use yiiunit\\framework\\web\\FakeUnionTypesController;\n+use yiiunit\\framework\\web\\stubs\\FakeController;\n+use yiiunit\\framework\\web\\stubs\\FakeInjectionController;\n+use yiiunit\\framework\\web\\stubs\\FakeTypedParamsController;\n use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n use yii\\base\\Module;\n use yii\\data\\ArrayDataProvider;\n@@ -23,6 +23,7 @@\n use Yii;\n use yii\\base\\InlineAction;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\Controller;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\Response;\n use yii\\web\\ServerErrorHttpException;\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\nindex f36761369f2..6a492a18b8f 100644\n--- a/tests/framework/web/ErrorActionTest.php\n+++ b/tests/framework/web/ErrorActionTest.php\n@@ -113,13 +113,12 @@ public function testDefaultView(): void\n \n public function testLayout(): void\n {\n+ $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n $this->expectException(\\yii\\base\\ViewNotFoundException::class);\n+ $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n \n $this->getController([\n 'layout' => 'non-existing',\n ])->runAction('error');\n-\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n- $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n }\n }\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex 41d067957b8..aed6802c83b 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -58,7 +58,7 @@ public function testCorrectResponseCodeInErrorView(): void\n \n public function testFormatRaw(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_RAW;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_RAW;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -78,7 +78,7 @@ public function testFormatRaw(): void\n \n public function testFormatXml(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_XML;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_XML;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -104,7 +104,9 @@ public function testFormatXml(): void\n \n public function testClearAssetFilesInErrorView(): void\n {\n- Yii::$app->getView()->registerJsFile('somefile.js');\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJsFile('somefile.js');\n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n ob_start(); // suppress response output\n@@ -117,7 +119,10 @@ public function testClearAssetFilesInErrorView(): void\n public function testClearAssetFilesInErrorActionView(): void\n {\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\n- Yii::$app->getView()->registerJs(\"alert('hide me')\", View::POS_END);\n+\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJs(\"alert('hide me')\", View::POS_END);\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -280,6 +285,28 @@ public function testHtmlEncodeWithUnicodeSequence(): void\n \n $this->assertSame($expected, $handler->htmlEncode($text));\n }\n+\n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\n+ {\n+ $viewFile = tempnam(sys_get_temp_dir(), 'yii2-error-view-');\n+ $secretFile = tempnam(sys_get_temp_dir(), 'yii2-error-secret-');\n+\n+ file_put_contents($viewFile, '<?php echo \"safe error view\";');\n+ file_put_contents($secretFile, 'secret data');\n+\n+ try {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $this->assertSame(\n+ 'safe error view',\n+ $handler->renderFileForException($viewFile, ['_file_' => $secretFile], new ErrorException('test'))\n+ );\n+ } finally {\n+ @unlink($viewFile);\n+ @unlink($secretFile);\n+ }\n+ }\n }\n \n class ErrorHandler extends \\yii\\web\\ErrorHandler\n@@ -291,4 +318,11 @@ protected function shouldRenderSimpleHtml()\n {\n return false;\n }\n+\n+ public function renderFileForException($file, array $params, \\Throwable $exception): string\n+ {\n+ $this->exception = $exception;\n+\n+ return $this->renderFile($file, $params);\n+ }\n }\ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\nindex f97d639f04e..fee4ea9653a 100644\n--- a/tests/framework/web/GroupUrlRuleTest.php\n+++ b/tests/framework/web/GroupUrlRuleTest.php\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertNull($rules->rules[0]->verb);\n \n $config = [\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(2, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertContains('GET', $rules->rules[0]->verb);\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\nindex 6f3022195f3..ef015dc1f4a 100644\n--- a/tests/framework/web/JsonResponseFormatterTest.php\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\n@@ -19,12 +19,11 @@\n * @since 2.0.3\n *\n * @group web\n+ *\n+ * @extends BaseFormatter<JsonResponseFormatter>\n */\n class JsonResponseFormatterTest extends BaseFormatter\n {\n- /**\n- * @return JsonResponseFormatter\n- */\n protected function getFormatterInstance($configuration = [])\n {\n return new JsonResponseFormatter($configuration);\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\nindex 1aa7d33a0ce..68d0f6ce620 100644\n--- a/tests/framework/web/MultipartFormDataParserTest.php\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\n@@ -192,6 +192,7 @@ public function testForce(): void\n $_POST = [\n 'existingName' => 'value',\n ];\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [\n 'existingFile' => [\n 'name' => 'file.txt',\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\nindex f37f070a7a9..f2588b88ee5 100644\n--- a/tests/framework/web/UploadedFileTest.php\n+++ b/tests/framework/web/UploadedFileTest.php\n@@ -101,6 +101,7 @@ public function testSaveAs(): void\n \n public function testSaveFileFromMultipartFormDataParser(): void\n {\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [];\n UploadedFile::reset();\n $model = new ModelStub();\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\nindex a5c23e48b1f..5cae21fd03f 100644\n--- a/tests/framework/web/UserIdentity.php\n+++ b/tests/framework/web/UserIdentity.php\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\n \n public static function findIdentity($id)\n {\n- if (in_array($id, static::$ids)) {\n+ if (in_array($id, self::$ids)) {\n $identitiy = new static();\n $identitiy->_id = $id;\n return $identitiy;\n }\n+\n+ return null;\n }\n \n public static function findIdentityByAccessToken($token, $type = null): never\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\nindex de77673bb56..382f6f56e42 100644\n--- a/tests/framework/web/UserTest.php\n+++ b/tests/framework/web/UserTest.php\n@@ -14,7 +14,7 @@\n */\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n \n namespace yiiunit\\framework\\web;\n@@ -34,7 +34,7 @@ function time()\n class UserTest extends TestCase\n {\n /**\n- * @var int virtual time to be returned by mocked time() function.\n+ * @var int|null virtual time to be returned by mocked time() function.\n * Null means normal time() behavior.\n */\n public static $time;\n@@ -593,9 +593,9 @@ public function getCookies()\n \n class AccessChecker extends BaseObject implements CheckAccessInterface\n {\n- public function checkAccess($userId, $permissionName, $params = []): void\n+ public function checkAccess($userId, $permissionName, $params = []): bool\n {\n- // Implement checkAccess() method.\n+ return false;\n }\n }\n \ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\nindex 77e2cc4d657..5957d0237a9 100644\n--- a/tests/framework/web/XmlResponseFormatterTest.php\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\n@@ -18,12 +18,13 @@\n * @since 2.0\n *\n * @group web\n+ *\n+ * @extends BaseFormatter<XmlResponseFormatter>\n */\n class XmlResponseFormatterTest extends BaseFormatter\n {\n /**\n * @param array $options\n- * @return XmlResponseFormatter\n */\n protected function getFormatterInstance($options = [])\n {\n","summary":"Edited 10 file(s) in tests/framework/web/"},{"subtask_id":"s34","scope_files":["tests/framework/web/stubs/FakeController.php","tests/framework/web/stubs/FakeInjectionController.php","tests/framework/web/stubs/FakeTypedParamsController.php","tests/framework/web/stubs/ModelBindingStub.php"],"solution_diff":"diff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\nsimilarity index 91%\nrename from tests/framework/web/FakeController.php\nrename to tests/framework/web/stubs/FakeController.php\nindex e4b95a9e4c3..b72c2651de6 100644\n--- a/tests/framework/web/FakeController.php\n+++ b/tests/framework/web/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakeInjectionController.php b/tests/framework/web/stubs/FakeInjectionController.php\nsimilarity index 87%\nrename from tests/framework/web/FakeInjectionController.php\nrename to tests/framework/web/stubs/FakeInjectionController.php\nindex 8f21ea652b9..c6b36ea9a6f 100644\n--- a/tests/framework/web/FakeInjectionController.php\n+++ b/tests/framework/web/stubs/FakeInjectionController.php\n@@ -6,13 +6,12 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\data\\DataProviderInterface;\n use yii\\web\\Controller;\n use yii\\web\\Request;\n-use yiiunit\\framework\\web\\stubs\\VendorImage;\n-use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n+use yiiunit\\framework\\web\\Post;\n \n /**\n * @author Sam Mousa<sam@mousa.nl>\ndiff --git a/tests/framework/web/FakeTypedParamsController.php b/tests/framework/web/stubs/FakeTypedParamsController.php\nsimilarity index 95%\nrename from tests/framework/web/FakeTypedParamsController.php\nrename to tests/framework/web/stubs/FakeTypedParamsController.php\nindex 815319c5073..1142b654b0a 100644\n--- a/tests/framework/web/FakeTypedParamsController.php\n+++ b/tests/framework/web/stubs/FakeTypedParamsController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 39cd37dbdc0..395999f08fd 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build(): never\n {\n","summary":"Edited 4 file(s) in tests/framework/web/stubs/"},{"subtask_id":"s35","scope_files":["tests/framework/widgets/ActiveFieldTest.php","tests/framework/widgets/ActiveFormTest.php","tests/framework/widgets/DetailViewTest.php"],"solution_diff":"diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\nindex 0bc1ffe0441..a5db934eab3 100644\n--- a/tests/framework/widgets/ActiveFieldTest.php\n+++ b/tests/framework/widgets/ActiveFieldTest.php\n@@ -1512,6 +1512,8 @@ public function attributeHints()\n \n /**\n * Helper Classes.\n+ *\n+ * @property ActiveFieldTestModel $model\n */\n class ActiveFieldExtend extends ActiveField\n {\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\nindex 8e77db7332b..07c4da70fcc 100644\n--- a/tests/framework/widgets/ActiveFormTest.php\n+++ b/tests/framework/widgets/ActiveFormTest.php\n@@ -114,6 +114,7 @@ public function testIssue5356(): void\n \n $model->categories = 1;\n \n+\n ob_start();\n $form = ActiveForm::begin(\n [\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\nindex 6a6a2adf11e..a928e466910 100644\n--- a/tests/framework/widgets/DetailViewTest.php\n+++ b/tests/framework/widgets/DetailViewTest.php\n@@ -19,9 +19,6 @@\n */\n class DetailViewTest extends TestCase\n {\n- /** @var DetailView */\n- public $detailView;\n-\n protected function setUp(): void\n {\n parent::setUp();\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -58,11 +55,11 @@ public function testAttributeValue(): void\n ],\n ]);\n \n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\n }\n \n@@ -75,7 +72,7 @@ public function testUnicodeAttributeNames(): void\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -86,11 +83,11 @@ public function testUnicodeAttributeNames(): void\n \n $this->assertEquals(\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\n );\n $this->assertEquals(\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\n );\n }\n \n@@ -99,7 +96,7 @@ public function testAttributeVisible(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -161,7 +158,7 @@ public function testAttributeVisible(): void\n 'value' => 'Displayed id',\n 'visible' => true,\n ],\n- ], $this->detailView->attributes);\n+ ], $detailView->attributes);\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\n }\n \n@@ -172,7 +169,7 @@ public function testRelationAttribute(): void\n $model->related = new ModelMock();\n $model->related->id = 'related';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -181,13 +178,13 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\n \n // test null relation\n $model->related = null;\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -196,8 +193,8 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\n }\n \n public function testArrayableModel(): void\n@@ -221,11 +218,11 @@ public function testArrayableModel(): void\n $model->id = 1;\n $model->text = 'I`m arrayable';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testObjectModel(): void\n@@ -249,11 +246,11 @@ public function testObjectModel(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testArrayModel(): void\n@@ -278,18 +275,18 @@ public function testArrayModel(): void\n 'text' => 'I`m an array',\n ];\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testOptionsTags(): void\n {\n $expectedValue = '<tr><th tooltip=\"Tooltip\">Text</th><td class=\"bg-red\">I`m an array</td></tr>';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => [\n 'text' => 'I`m an array',\n ],\n@@ -303,9 +300,9 @@ public function testOptionsTags(): void\n ],\n ]);\n \n- foreach ($this->detailView->attributes as $index => $attribute) {\n- $a = $this->detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ foreach ($detailView->attributes as $index => $attribute) {\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $renderingResult);\n }\n }\n \n@@ -319,7 +316,7 @@ public function testShouldTriggerInitEvent(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n 'on init' => function () use (&$initTriggered): void {\n $initTriggered = true;\n@@ -344,6 +341,8 @@ class ArrayableMock implements Arrayable\n \n /**\n * Helper Class.\n+ *\n+ * @property mixed $related\n */\n class ModelMock extends Model\n {\n","summary":"Edited 3 file(s) in tests/framework/widgets/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".git-blame-ignore-revs\",\n \"composer.lock\",\n \"phpstan-baseline.neon\",\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs\\nindex ce85e65af96..881b51a65e3 100644\\n--- a/.git-blame-ignore-revs\\n+++ b/.git-blame-ignore-revs\\n@@ -24,3 +24,5 @@ da20adc82aef3eb5ae0bad3889fe6695e6424f06\\n 7a7d2a9c06c099de8064729ca3fc95fb24241b75\\n # Fixed error PHPCS latest version in `PHP 8.5`\\n f66d5c8864712aef233b8131c2f99721101f61d0\\n+# Fixed build broke code style\\n+32d0a922b47ba23fc8d17b3947f8c8ff0b014a31\\ndiff --git a/composer.lock b/composer.lock\\nindex 24a8ebbc363..f9f75af4753 100644\\n--- a/composer.lock\\n+++ b/composer.lock\\n@@ -320,16 +320,16 @@\\n },\\n {\\n \\\"name\\\": \\\"composer/class-map-generator\\\",\\n- \\\"version\\\": \\\"1.7.2\\\",\\n+ \\\"version\\\": \\\"1.7.3\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/composer/class-map-generator.git\\\",\\n- \\\"reference\\\": \\\"6a9c2f0970022ab00dc58c07d0685dd712f2231b\\\"\\n+ \\\"reference\\\": \\\"86d8208fc3c649a3a999daf1a63c25201be2990f\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/composer/class-map-generator/zipball/6a9c2f0970022ab00dc58c07d0685dd712f2231b\\\",\\n- \\\"reference\\\": \\\"6a9c2f0970022ab00dc58c07d0685dd712f2231b\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f\\\",\\n+ \\\"reference\\\": \\\"86d8208fc3c649a3a999daf1a63c25201be2990f\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -373,7 +373,7 @@\\n ],\\n \\\"support\\\": {\\n \\\"issues\\\": \\\"https://github.com/composer/class-map-generator/issues\\\",\\n- \\\"source\\\": \\\"https://github.com/composer/class-map-generator/tree/1.7.2\\\"\\n+ \\\"source\\\": \\\"https://github.com/composer/class-map-generator/tree/1.7.3\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -385,7 +385,7 @@\\n \\\"type\\\": \\\"github\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-03-30T15:36:56+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-05T09:17:07+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"composer/composer\\\",\\n@@ -869,16 +869,16 @@\\n },\\n {\\n \\\"name\\\": \\\"dealerdirect/phpcodesniffer-composer-installer\\\",\\n- \\\"version\\\": \\\"v1.2.0\\\",\\n+ \\\"version\\\": \\\"v1.2.1\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/PHPCSStandards/composer-installer.git\\\",\\n- \\\"reference\\\": \\\"845eb62303d2ca9b289ef216356568ccc075ffd1\\\"\\n+ \\\"reference\\\": \\\"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/845eb62303d2ca9b289ef216356568ccc075ffd1\\\",\\n- \\\"reference\\\": \\\"845eb62303d2ca9b289ef216356568ccc075ffd1\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/963f0c67bffde0eac41b56be71ac0e8ba132f0bd\\\",\\n+ \\\"reference\\\": \\\"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -961,20 +961,20 @@\\n \\\"type\\\": \\\"thanks_dev\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2025-11-11T04:32:07+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-06T08:26:05+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"justinrainbow/json-schema\\\",\\n- \\\"version\\\": \\\"6.8.0\\\",\\n+ \\\"version\\\": \\\"6.8.2\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/jsonrainbow/json-schema.git\\\",\\n- \\\"reference\\\": \\\"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\\\"\\n+ \\\"reference\\\": \\\"2c89ebb95ca9cedc9347f780333f7b25792dcb76\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/jsonrainbow/json-schema/zipball/89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\\\",\\n- \\\"reference\\\": \\\"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/jsonrainbow/json-schema/zipball/2c89ebb95ca9cedc9347f780333f7b25792dcb76\\\",\\n+ \\\"reference\\\": \\\"2c89ebb95ca9cedc9347f780333f7b25792dcb76\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -984,7 +984,7 @@\\n },\\n \\\"require-dev\\\": {\\n \\\"friendsofphp/php-cs-fixer\\\": \\\"3.3.0\\\",\\n- \\\"json-schema/json-schema-test-suite\\\": \\\"^23.2\\\",\\n+ \\\"json-schema/json-schema-test-suite\\\": \\\"dev-main\\\",\\n \\\"marc-mabe/php-enum-phpstan\\\": \\\"^2.0\\\",\\n \\\"phpspec/prophecy\\\": \\\"^1.19\\\",\\n \\\"phpstan/phpstan\\\": \\\"^1.12\\\",\\n@@ -1034,9 +1034,9 @@\\n ],\\n \\\"support\\\": {\\n \\\"issues\\\": \\\"https://github.com/jsonrainbow/json-schema/issues\\\",\\n- \\\"source\\\": \\\"https://github.com/jsonrainbow/json-schema/tree/6.8.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/jsonrainbow/json-schema/tree/6.8.2\\\"\\n },\\n- \\\"time\\\": \\\"2026-04-02T12:43:11+00:00\\\"\\n+ \\\"time\\\": \\\"2026-05-05T05:39:01+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"marc-mabe/php-enum\\\",\\n@@ -1426,11 +1426,11 @@\\n },\\n {\\n \\\"name\\\": \\\"phpstan/phpstan\\\",\\n- \\\"version\\\": \\\"2.1.50\\\",\\n+ \\\"version\\\": \\\"2.1.54\\\",\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/phpstan/phpstan/zipball/d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\\\",\\n- \\\"reference\\\": \\\"d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd\\\",\\n+ \\\"reference\\\": \\\"8be50c3992107dc837b17da4d140fbbdf9a5c5bd\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -1475,7 +1475,7 @@\\n \\\"type\\\": \\\"github\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-04-17T13:10:32+00:00\\\"\\n+ \\\"time\\\": \\\"2026-04-29T13:31:09+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"phpstan/phpstan-phpunit\\\",\\n@@ -3458,16 +3458,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/console\\\",\\n- \\\"version\\\": \\\"v7.4.8\\\",\\n+ \\\"version\\\": \\\"v7.4.9\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/console.git\\\",\\n- \\\"reference\\\": \\\"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\\\"\\n+ \\\"reference\\\": \\\"d7d2b64a45a89d607865927b176fa51c33ddbb58\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\\\",\\n- \\\"reference\\\": \\\"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\\\",\\n+ \\\"reference\\\": \\\"d7d2b64a45a89d607865927b176fa51c33ddbb58\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3532,7 +3532,7 @@\\n \\\"terminal\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/console/tree/v7.4.8\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/console/tree/v7.4.9\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3552,20 +3552,20 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-03-30T13:54:39+00:00\\\"\\n+ \\\"time\\\": \\\"2026-04-22T15:21:55+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/deprecation-contracts\\\",\\n- \\\"version\\\": \\\"v3.6.0\\\",\\n+ \\\"version\\\": \\\"v3.7.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/deprecation-contracts.git\\\",\\n- \\\"reference\\\": \\\"63afe740e99a13ba87ec199bb07bbdee937a5b62\\\"\\n+ \\\"reference\\\": \\\"50f59d1f3ca46d41ac911f97a78626b6756af35b\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62\\\",\\n- \\\"reference\\\": \\\"63afe740e99a13ba87ec199bb07bbdee937a5b62\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b\\\",\\n+ \\\"reference\\\": \\\"50f59d1f3ca46d41ac911f97a78626b6756af35b\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3578,7 +3578,7 @@\\n \\\"name\\\": \\\"symfony/contracts\\\"\\n },\\n \\\"branch-alias\\\": {\\n- \\\"dev-main\\\": \\\"3.6-dev\\\"\\n+ \\\"dev-main\\\": \\\"3.7-dev\\\"\\n }\\n },\\n \\\"autoload\\\": {\\n@@ -3603,7 +3603,7 @@\\n \\\"description\\\": \\\"A generic function and convention to trigger deprecation notices\\\",\\n \\\"homepage\\\": \\\"https://symfony.com\\\",\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/deprecation-contracts/tree/v3.6.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/deprecation-contracts/tree/v3.7.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3614,25 +3614,29 @@\\n \\\"url\\\": \\\"https://github.com/fabpot\\\",\\n \\\"type\\\": \\\"github\\\"\\n },\\n+ {\\n+ \\\"url\\\": \\\"https://github.com/nicolas-grekas\\\",\\n+ \\\"type\\\": \\\"github\\\"\\n+ },\\n {\\n \\\"url\\\": \\\"https://tidelift.com/funding/github/packagist/symfony/symfony\\\",\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2024-09-25T14:21:43+00:00\\\"\\n+ \\\"time\\\": \\\"2026-04-13T15:52:40+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/filesystem\\\",\\n- \\\"version\\\": \\\"v8.0.8\\\",\\n+ \\\"version\\\": \\\"v8.0.9\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/filesystem.git\\\",\\n- \\\"reference\\\": \\\"66b769ae743ce2d13e435528fbef4af03d623e5a\\\"\\n+ \\\"reference\\\": \\\"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/filesystem/zipball/66b769ae743ce2d13e435528fbef4af03d623e5a\\\",\\n- \\\"reference\\\": \\\"66b769ae743ce2d13e435528fbef4af03d623e5a\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\",\\n+ \\\"reference\\\": \\\"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3669,7 +3673,7 @@\\n \\\"description\\\": \\\"Provides basic utilities for the filesystem\\\",\\n \\\"homepage\\\": \\\"https://symfony.com\\\",\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/filesystem/tree/v8.0.8\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/filesystem/tree/v8.0.9\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3689,7 +3693,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-03-30T15:14:47+00:00\\\"\\n+ \\\"time\\\": \\\"2026-04-18T13:51:42+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/finder\\\",\\n@@ -3761,7 +3765,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-ctype\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-ctype.git\\\",\\n@@ -3820,7 +3824,7 @@\\n \\\"portable\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-ctype/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-ctype/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3844,16 +3848,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-intl-grapheme\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-intl-grapheme.git\\\",\\n- \\\"reference\\\": \\\"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\\\"\\n+ \\\"reference\\\": \\\"4864388bfbd3001ce88e234fab652acd91fdc57e\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df\\\",\\n- \\\"reference\\\": \\\"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e\\\",\\n+ \\\"reference\\\": \\\"4864388bfbd3001ce88e234fab652acd91fdc57e\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -3902,7 +3906,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -3922,11 +3926,11 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2026-04-10T16:19:22+00:00\\\"\\n+ \\\"time\\\": \\\"2026-04-26T13:13:48+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-intl-normalizer\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-intl-normalizer.git\\\",\\n@@ -3987,7 +3991,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4011,7 +4015,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-mbstring\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-mbstring.git\\\",\\n@@ -4072,7 +4076,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-mbstring/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-mbstring/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4096,7 +4100,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-php73\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-php73.git\\\",\\n@@ -4152,7 +4156,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-php73/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-php73/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4176,7 +4180,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-php80\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-php80.git\\\",\\n@@ -4236,7 +4240,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-php80/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-php80/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4260,7 +4264,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-php81\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-php81.git\\\",\\n@@ -4316,7 +4320,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-php81/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-php81/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4340,7 +4344,7 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/polyfill-php84\\\",\\n- \\\"version\\\": \\\"v1.36.0\\\",\\n+ \\\"version\\\": \\\"v1.37.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/polyfill-php84.git\\\",\\n@@ -4396,7 +4400,7 @@\\n \\\"shim\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/polyfill-php84/tree/v1.36.0\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/polyfill-php84/tree/v1.37.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4485,16 +4489,16 @@\\n },\\n {\\n \\\"name\\\": \\\"symfony/service-contracts\\\",\\n- \\\"version\\\": \\\"v3.6.1\\\",\\n+ \\\"version\\\": \\\"v3.7.0\\\",\\n \\\"source\\\": {\\n \\\"type\\\": \\\"git\\\",\\n \\\"url\\\": \\\"https://github.com/symfony/service-contracts.git\\\",\\n- \\\"reference\\\": \\\"45112560a3ba2d715666a509a0bc9521d10b6c43\\\"\\n+ \\\"reference\\\": \\\"d25d82433a80eba6aa0e6c24b61d7370d99e444a\\\"\\n },\\n \\\"dist\\\": {\\n \\\"type\\\": \\\"zip\\\",\\n- \\\"url\\\": \\\"https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43\\\",\\n- \\\"reference\\\": \\\"45112560a3ba2d715666a509a0bc9521d10b6c43\\\",\\n+ \\\"url\\\": \\\"https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a\\\",\\n+ \\\"reference\\\": \\\"d25d82433a80eba6aa0e6c24b61d7370d99e444a\\\",\\n \\\"shasum\\\": \\\"\\\"\\n },\\n \\\"require\\\": {\\n@@ -4512,7 +4516,7 @@\\n \\\"name\\\": \\\"symfony/contracts\\\"\\n },\\n \\\"branch-alias\\\": {\\n- \\\"dev-main\\\": \\\"3.6-dev\\\"\\n+ \\\"dev-main\\\": \\\"3.7-dev\\\"\\n }\\n },\\n \\\"autoload\\\": {\\n@@ -4548,7 +4552,7 @@\\n \\\"standards\\\"\\n ],\\n \\\"support\\\": {\\n- \\\"source\\\": \\\"https://github.com/symfony/service-contracts/tree/v3.6.1\\\"\\n+ \\\"source\\\": \\\"https://github.com/symfony/service-contracts/tree/v3.7.0\\\"\\n },\\n \\\"funding\\\": [\\n {\\n@@ -4568,7 +4572,7 @@\\n \\\"type\\\": \\\"tidelift\\\"\\n }\\n ],\\n- \\\"time\\\": \\\"2025-07-15T11:30:57+00:00\\\"\\n+ \\\"time\\\": \\\"2026-03-28T09:44:51+00:00\\\"\\n },\\n {\\n \\\"name\\\": \\\"symfony/string\\\",\\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\\nindex dbdba693f2a..3f78050b8ad 100644\\n--- a/phpstan-baseline.neon\\n+++ b/phpstan-baseline.neon\\n@@ -1225,79 +1225,379 @@ parameters:\\n \\t\\t\\tpath: tests/base/db/BaseSchema.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\log\\\\\\\\Target\\\\:\\\\:\\\\$db\\\\.$#'\\n+\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\base\\\\\\\\NewComponent\\\\:\\\\:\\\\$as f\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/log/BaseDbTarget.php\\n+\\t\\t\\tpath: tests/framework/base/ComponentTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to private property yiiunit\\\\\\\\data\\\\\\\\base\\\\\\\\NewComponent\\\\:\\\\:\\\\$p2\\\\.$#'\\n+\\t\\t\\tidentifier: property.private\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/base/ComponentTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Parameter &\\\\$args by\\\\-ref type of method yiiunit\\\\\\\\framework\\\\\\\\base\\\\\\\\stub\\\\\\\\controller\\\\\\\\InjectingController\\\\:\\\\:bindInjectedFor\\\\(\\\\) expects array\\\\<int, mixed\\\\>, array given\\\\.$#'\\n+\\t\\t\\tidentifier: parameterByRef.type\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/base/stub/controller/InjectingController.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\validators\\\\\\\\models\\\\\\\\ValidatorTestRefModel\\\\:\\\\:\\\\$a_field\\\\.$#'\\n+\\t\\t\\tmessage: '#^Parameter &\\\\$requestedParams by\\\\-ref type of method yiiunit\\\\\\\\framework\\\\\\\\base\\\\\\\\stub\\\\\\\\controller\\\\\\\\InjectingController\\\\:\\\\:bindInjectedFor\\\\(\\\\) expects array\\\\<string, string\\\\>, array given\\\\.$#'\\n+\\t\\t\\tidentifier: parameterByRef.type\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/base/stub/controller/InjectingController.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\BaseObject\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/captcha/CaptchaTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Return type \\\\(void\\\\) of method yiiunit\\\\\\\\framework\\\\\\\\console\\\\\\\\controllers\\\\\\\\FixtureConsoledController\\\\:\\\\:stdout\\\\(\\\\) should be compatible with return type \\\\(bool\\\\|int\\\\) of method yii\\\\\\\\console\\\\\\\\Controller\\\\<yii\\\\\\\\console\\\\\\\\Application\\\\>\\\\:\\\\:stdout\\\\(\\\\)$#'\\n+\\t\\t\\tidentifier: method.childReturnType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/validators/BaseExistValidator.php\\n+\\t\\t\\tpath: tests/framework/console/controllers/FixtureControllerTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\validators\\\\\\\\models\\\\\\\\ValidatorTestMainModel\\\\:\\\\:\\\\$id\\\\.$#'\\n+\\t\\t\\tmessage: '#^Access to an undefined property PHPUnit\\\\\\\\Framework\\\\\\\\MockObject\\\\\\\\MockObject&yii\\\\\\\\web\\\\\\\\User\\\\:\\\\:\\\\$identityCLass\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tpath: tests/framework/filters/AccessRuleTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\validators\\\\\\\\models\\\\\\\\ValidatorTestRefModel\\\\:\\\\:\\\\$id\\\\.$#'\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\BaseObject\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n-\\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/grid/CheckboxColumnTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\validators\\\\\\\\models\\\\\\\\ValidatorTestRefModel\\\\:\\\\:\\\\$ref\\\\.$#'\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\BaseObject\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/grid/GridViewTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$extension with type array is incompatible with native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/helpers/FileHelperTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @throws with type yii\\\\\\\\base\\\\\\\\InvalidConfigException\\\\|yii\\\\\\\\base\\\\\\\\InvalidParamException\\\\|yii\\\\\\\\db\\\\\\\\Exception is not subtype of Throwable$#'\\n+\\t\\t\\tidentifier: throws.notThrowable\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/i18n/DbMessageSourceTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expected with type mixed is not subtype of native type bool\\\\|string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 2\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterDateTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$email \\\\(string\\\\) does not accept array\\\\<int, string\\\\>\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expectedException with type mixed is not subtype of native type string\\\\|null\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 2\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterDateTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$value with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 2\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterDateTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$_length with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Customer\\\\:\\\\:\\\\$name \\\\(string\\\\) does not accept array\\\\<int, string\\\\>\\\\.$#'\\n-\\t\\t\\tidentifier: assign.propertyType\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$_shortLength with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Property yiiunit\\\\\\\\data\\\\\\\\ar\\\\\\\\Order\\\\:\\\\:\\\\$total \\\\(string\\\\) does not accept int\\\\.$#'\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$_shortWeight with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$_weight with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$arguments with type mixed is not subtype of native type array\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expected with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$expectedException with type mixed is not subtype of native type array\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$message with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/i18n/FormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:attach\\\\(\\\\) should return \\\\$this\\\\(yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\) but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:attachContent\\\\(\\\\) should return \\\\$this\\\\(yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\) but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:embed\\\\(\\\\) should return string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:embedContent\\\\(\\\\) should return string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getBcc\\\\(\\\\) should return array\\\\|string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getCc\\\\(\\\\) should return array\\\\|string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getCharset\\\\(\\\\) should return string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getFrom\\\\(\\\\) should return array\\\\|string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getReplyTo\\\\(\\\\) should return array\\\\|string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getSubject\\\\(\\\\) should return string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Method yiiunit\\\\\\\\framework\\\\\\\\log\\\\\\\\TestMessage\\\\:\\\\:getTo\\\\(\\\\) should return array\\\\|string but return statement is missing\\\\.$#'\\n+\\t\\t\\tidentifier: return.missing\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/log/EmailTargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @var with type yii\\\\\\\\log\\\\\\\\Target is not subtype of native type PHPUnit\\\\\\\\Framework\\\\\\\\MockObject\\\\\\\\MockObject\\\\.$#'\\n+\\t\\t\\tidentifier: varTag.nativeType\\n+\\t\\t\\tcount: 2\\n+\\t\\t\\tpath: tests/framework/log/TargetTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Property yii\\\\\\\\rbac\\\\\\\\BaseManager\\\\:\\\\:\\\\$defaultRoles \\\\(array\\\\<string\\\\>\\\\) does not accept Closure\\\\.$#'\\n+\\t\\t\\tidentifier: assign.propertyType\\n+\\t\\t\\tcount: 2\\n+\\t\\t\\tpath: tests/framework/rbac/ManagerTestCase.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Property yii\\\\\\\\rbac\\\\\\\\BaseManager\\\\:\\\\:\\\\$defaultRoles \\\\(array\\\\<string\\\\>\\\\) does not accept string\\\\.$#'\\n \\t\\t\\tidentifier: assign.propertyType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/validators/BaseUniqueValidator.php\\n+\\t\\t\\tpath: tests/framework/rbac/ManagerTestCase.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\console\\\\\\\\Application\\\\|yii\\\\\\\\web\\\\\\\\Application\\\\<yii\\\\\\\\web\\\\\\\\IdentityInterface\\\\>\\\\:\\\\:\\\\$sessionDb\\\\.$#'\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$dataProvider with type yii\\\\\\\\data\\\\\\\\DataProviderInterface is not subtype of native type yii\\\\\\\\data\\\\\\\\ArrayDataProvider\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/rest/SerializerTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/BooleanValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/CompareValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\validators\\\\\\\\models\\\\\\\\FakedValidationModel\\\\:\\\\:\\\\$attr_compare\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/base/web/session/BaseDbSession.php\\n+\\t\\t\\tpath: tests/framework/validators/CompareValidatorTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property yiiunit\\\\\\\\data\\\\\\\\base\\\\\\\\NewComponent\\\\:\\\\:\\\\$as f\\\\.$#'\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/EmailValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/FileValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$_ with type mixed is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/framework/base/ComponentTest.php\\n+\\t\\t\\tpath: tests/framework/validators/FileValidatorTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to private property yiiunit\\\\\\\\data\\\\\\\\base\\\\\\\\NewComponent\\\\:\\\\:\\\\$p2\\\\.$#'\\n-\\t\\t\\tidentifier: property.private\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$allowedExtensions with type array\\\\|string is not subtype of native type string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/validators/FileValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n \\t\\t\\tcount: 3\\n-\\t\\t\\tpath: tests/framework/base/ComponentTest.php\\n+\\t\\t\\tpath: tests/framework/validators/FilterValidatorTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Return type \\\\(void\\\\) of method yiiunit\\\\\\\\framework\\\\\\\\console\\\\\\\\controllers\\\\\\\\FixtureConsoledController\\\\:\\\\:stdout\\\\(\\\\) should be compatible with return type \\\\(bool\\\\|int\\\\) of method yii\\\\\\\\console\\\\\\\\Controller\\\\<yii\\\\\\\\console\\\\\\\\Application\\\\>\\\\:\\\\:stdout\\\\(\\\\)$#'\\n-\\t\\t\\tidentifier: method.childReturnType\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/IpValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$badIp with type mixed is not subtype of native type array\\\\|bool\\\\|int\\\\|string\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 2\\n+\\t\\t\\tpath: tests/framework/validators/IpValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/NumberValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/RangeValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/RegularExpressionValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/RequiredValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/StringValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/TrimValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\validators\\\\\\\\Validator\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/validators/UrlValidatorTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$appendTimestamp with type bool\\\\|string is not subtype of native type bool\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/framework/console/controllers/FixtureControllerTest.php\\n+\\t\\t\\tpath: tests/framework/web/AssetBundleTest.php\\n \\n \\t\\t-\\n-\\t\\t\\tmessage: '#^Access to an undefined property PHPUnit\\\\\\\\Framework\\\\\\\\MockObject\\\\\\\\MockObject&yii\\\\\\\\web\\\\\\\\User\\\\:\\\\:\\\\$identityCLass\\\\.$#'\\n+\\t\\t\\tmessage: '#^PHPDoc tag @param for parameter \\\\$data with type mixed is not subtype of native type array\\\\.$#'\\n+\\t\\t\\tidentifier: parameter.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/web/JsonResponseFormatterTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^PHPDoc tag @var for property yiiunit\\\\\\\\framework\\\\\\\\widgets\\\\\\\\ActiveFieldTest\\\\:\\\\:\\\\$helperModel with type yii\\\\\\\\base\\\\\\\\DynamicModel is not subtype of native type yiiunit\\\\\\\\framework\\\\\\\\widgets\\\\\\\\ActiveFieldTestModel\\\\.$#'\\n+\\t\\t\\tidentifier: property.phpDocType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/widgets/ActiveFieldTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\BaseObject\\\\:\\\\:\\\\$clientScript\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 4\\n+\\t\\t\\tpath: tests/framework/widgets/ActiveFormTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\DynamicModel\\\\:\\\\:\\\\$categories\\\\.$#'\\n \\t\\t\\tidentifier: property.notFound\\n \\t\\t\\tcount: 1\\n-\\t\\t\\tpath: tests/framework/filters/AccessRuleTest.php\\n+\\t\\t\\tpath: tests/framework/widgets/ActiveFormTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\DynamicModel\\\\:\\\\:\\\\$email\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/widgets/ActiveFormTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Access to an undefined property yii\\\\\\\\base\\\\\\\\DynamicModel\\\\:\\\\:\\\\$name\\\\.$#'\\n+\\t\\t\\tidentifier: property.notFound\\n+\\t\\t\\tcount: 3\\n+\\t\\t\\tpath: tests/framework/widgets/ActiveFormTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Property yii\\\\\\\\widgets\\\\\\\\Breadcrumbs\\\\:\\\\:\\\\$homeLink \\\\(array\\\\|null\\\\) does not accept false\\\\.$#'\\n+\\t\\t\\tidentifier: assign.propertyType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/widgets/BreadcrumbsTest.php\\n+\\n+\\t\\t-\\n+\\t\\t\\tmessage: '#^Property yii\\\\\\\\widgets\\\\\\\\Breadcrumbs\\\\:\\\\:\\\\$tag \\\\(string\\\\) does not accept false\\\\.$#'\\n+\\t\\t\\tidentifier: assign.propertyType\\n+\\t\\t\\tcount: 1\\n+\\t\\t\\tpath: tests/framework/widgets/BreadcrumbsTest.php\\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 4728321b2fe..6a59f2fbff4 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -13,25 +13,10 @@ parameters:\\n excludePaths:\\n analyse:\\n - tests/data\\n- - tests/framework/base/stub\\n- - tests/framework/di/stubs\\n- - tests/framework/filters/stubs\\n+ - tests/framework/*/stubs/*\\n+ - tests/framework/*/mocks/*\\n # TODO: Analyze these directories\\n - tests/framework/db\\n- - tests/framework/grid\\n- - tests/framework/helpers\\n- - tests/framework/i18n\\n- - tests/framework/log\\n- - tests/framework/mail\\n- - tests/framework/models\\n- - tests/framework/mutex\\n- - tests/framework/rbac\\n- - tests/framework/requirements\\n- - tests/framework/rest\\n- - tests/framework/test\\n- - tests/framework/validators\\n- - tests/framework/web\\n- - tests/framework/widgets\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\\n\",\n \"summary\": \"Edited 4 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"build/controllers/MimeTypeController.php\",\n \"build/controllers/PhpDocController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\\nindex 20d17853c93..d8709cdca6e 100644\\n--- a/build/controllers/MimeTypeController.php\\n+++ b/build/controllers/MimeTypeController.php\\n@@ -117,6 +117,7 @@ private function generateMimeTypesFile($outFile, $content)\\n \\n $content = <<<EOD\\n <?php\\n+\\n /**\\n * MIME types.\\n *\\n@@ -129,6 +130,7 @@ private function generateMimeTypesFile($outFile, $content)\\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\\n * otherwise they will be lost on next build.\\n */\\n+\\n \\\\$mimeTypes = $array;\\n \\n # fix for bundled libmagic bug, see also https://github.com/yiisoft/yii2/issues/19925\\n@@ -152,6 +154,7 @@ private function generateMimeAliasesFile($outFile)\\n $array = VarDumper::export($this->_aliases);\\n $content = <<<EOD\\n <?php\\n+\\n /**\\n * MIME aliases.\\n *\\n@@ -160,6 +163,7 @@ private function generateMimeAliasesFile($outFile)\\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\\n * otherwise they will be lost on next build.\\n */\\n+\\n return $array;\\n \\n EOD;\\n@@ -211,6 +215,7 @@ private function generateMimeExtensionsFile($outFile, $content)\\n \\n $content = <<<EOD\\n <?php\\n+\\n /**\\n * MIME type extensions.\\n *\\n@@ -224,6 +229,7 @@ private function generateMimeExtensionsFile($outFile, $content)\\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\\n * otherwise they will be lost on next build.\\n */\\n+\\n return $array;\\n \\n EOD;\\ndiff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\\nindex 2a603c818cf..bc4f3ea5f09 100644\\n--- a/build/controllers/PhpDocController.php\\n+++ b/build/controllers/PhpDocController.php\\n@@ -345,6 +345,7 @@ protected function fixFileDoc(&$lines)\\n }\\n $lines = array_merge([\\n '<?php',\\n+ '',\\n '/**',\\n ' * @link https://www.yiiframework.com/',\\n ' * @copyright Copyright (c) 2008 Yii Software LLC',\\n@@ -367,6 +368,7 @@ protected function fixDocBlockIndentation(&$lines)\\n $codeBlock = false;\\n $listIndent = '';\\n $tag = false;\\n+ $phpstanType = false;\\n $indent = '';\\n foreach ($lines as $i => $line) {\\n if (preg_match('~^(\\\\s*)/\\\\*\\\\*$~', $line, $matches)) {\\n@@ -380,6 +382,7 @@ protected function fixDocBlockIndentation(&$lines)\\n $codeBlock = false;\\n $listIndent = '';\\n $tag = false;\\n+ $phpstanType = false;\\n } elseif ($docBlock) {\\n $line = ltrim($line);\\n if (strpos($line, '*') === 0) {\\n@@ -389,12 +392,23 @@ protected function fixDocBlockIndentation(&$lines)\\n $line = substr($line, 1);\\n }\\n $docLine = str_replace(\\\"\\\\t\\\", ' ', rtrim($line));\\n+ if ($phpstanType && $docLine !== '' && strpos($docLine, '@') !== 0) {\\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\\n+ continue;\\n+ }\\n+ $phpstanType = false;\\n if (empty($docLine)) {\\n $listIndent = '';\\n } elseif (strpos($docLine, '@') === 0) {\\n $listIndent = '';\\n $codeBlock = false;\\n $tag = true;\\n+ if (preg_match('/^@phpstan-type(?:\\\\s|$)/', $docLine)) {\\n+ $tag = false;\\n+ $phpstanType = true;\\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\\n+ continue;\\n+ }\\n $docLine = preg_replace('/\\\\s+/', ' ', $docLine);\\n $docLine = $this->fixParamTypes($docLine);\\n } elseif (preg_match('/^(~~~|```)/', $docLine)) {\\n@@ -699,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\\n }\\n if ($propertyPart) {\\n preg_match(\\n- '/@property(?:-read|-write)?\\\\s+([\\\\\\\\\\\\\\\\\\\\w\\\\|\\\\[\\\\]]+)\\\\s+\\\\$([a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z0-9_\\\\x7f-\\\\xff]*)/',\\n+ '/@property(?:-read|-write)?\\\\s+' . self::TYPE_REG_EXP\\n+ . '\\\\s+\\\\$([a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z0-9_\\\\x7f-\\\\xff]*)/',\\n $line,\\n $matches\\n );\\n \\n- if (isset($matches[2])) {\\n- $lastPropertyName = $matches[2];\\n+ if (isset($matches[1])) {\\n+ $lastPropertyName = $matches[1];\\n }\\n \\n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\\n\",\n \"summary\": \"Edited 2 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 535d29716f5..d6d48dff3fd 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -72,35 +72,46 @@ Yii Framework 2 Change Log\\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\\n \\n-2.0.55 under development\\n+2.0.56 under development\\n ------------------------\\n \\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n+- Enh #20785: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n+- Bug #20785: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n+- Bug #20785: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n+\\n+\\n+2.0.55 May 09, 2026\\n+-------------------\\n+\\n+- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\\n+- Bug #20159: Fix chroot resolve null route (gozoro)\\n+- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\\n - Bug #20705: Replace `$this` with `self` in generics in Psalm annotations (mspirkov)\\n - Bug #20715: Adjust `JSON` helper error message assertions for `PHP 8.6` compatibility in `JsonTest` class (terabytesoftw)\\n-- Enh #20714: Allow overriding the `yii\\\\grid\\\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\\n-- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\\n-- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\\n-- Enh #20729: Add default types in `@template` annotations (mspirkov)\\n-- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\\n - Bug #20733: Replace `$this` with `static` and `covariant static` in generics in PHPStan and PHPDoc annotations (mspirkov)\\n - Bug #20735: Fix `@param` annotations for `$name` in `Request::get()` and `Request::post()` (mspirkov)\\n-- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\\n - Bug #20738: Fix `@var` annotations for `Application::$requestedParams`, `AssetBundle::$basePath`, `AssetBundle::$baseUrl`, `MultiFieldSession::$writeCallback` (mspirkov)\\n - Bug #20738: Fix `@return` annotations for `User::getAuthManager()` and `User::getAccessChecker()` (mspirkov)\\n - Bug #20738: Fix `@param` annotation for `$value` parameter in `AssetManager::setConverter()` (mspirkov)\\n - Bug #20739: Fix `@var` annotation for `BaseYii::$app` (mspirkov)\\n-- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\\n - Bug #20746: Fix `@var` annotations for `DbDependency::$db` and `DbDependency::$sql` (mspirkov)\\n - Bug #20750: Fix `@return` annotation for `yii\\\\console\\\\Controller::runAction()` (mspirkov)\\n - Bug #20750: Add the missing `@property-write` annotation to `yii\\\\console\\\\Controller` (mspirkov)\\n - Bug #20751: Fix `@param` annotation for `$param` parameter in `Sort::parseSortParam()` (mspirkov)\\n-- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\\n - Bug #20764: Fix `@return` annotation for `Model::rules()` (mspirkov)\\n-- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\\n-- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\\n-- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\\n-- Bug #20159: Fix chroot resolve null route (gozoro)\\n - Bug #20856: Fix passing generics to `BatchQueryResult` (mspirkov)\\n+- Bug: CVE-2026-39850, Isolate internal variables in `View::renderPhpFile()` and `ErrorHandler::renderFile()` to prevent parameter collisions from overriding included file paths (samdark)\\n+- Enh #20714: Allow overriding the `yii\\\\grid\\\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\\n+- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\\n+- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\\n+- Enh #20729: Add default types in `@template` annotations (mspirkov)\\n+- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\\n+- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\\n+- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\\n+- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\\n+- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\\n \\n \\n 2.0.54 January 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"framework/base/Model.php\",\n \"framework/base/View.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/base/Model.php b/framework/base/Model.php\\nindex 0186202e2f0..8bae86953ba 100644\\n--- a/framework/base/Model.php\\n+++ b/framework/base/Model.php\\n@@ -38,7 +38,7 @@\\n *\\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\\n *\\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\\n * array of errors for all attributes, similar to the following:\\n *\\n * ```\\n@@ -581,8 +581,9 @@ public function hasErrors($attribute = null)\\n /**\\n * Returns the errors for all attributes or a single attribute.\\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\\n+ * all attributes, the result is a two-dimensional array, like the following:\\n *\\n * ```\\n * [\\ndiff --git a/framework/base/View.php b/framework/base/View.php\\nindex 98e2cd69eeb..658ffb963af 100644\\n--- a/framework/base/View.php\\n+++ b/framework/base/View.php\\n@@ -333,11 +333,14 @@ public function afterRender($viewFile, $params, &$output)\\n public function renderPhpFile($_file_, $_params_ = [])\\n {\\n $_obInitialLevel_ = ob_get_level();\\n+ $_renderer_ = function () {\\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\\n+ require func_get_arg(0);\\n+ };\\n ob_start();\\n ob_implicit_flush(false);\\n- extract($_params_, EXTR_OVERWRITE);\\n try {\\n- require $_file_;\\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\\n return ob_get_clean();\\n } catch (\\\\Exception $e) {\\n while (ob_get_level() > $_obInitialLevel_) {\\n\",\n \"summary\": \"Edited 2 file(s) in framework/base/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"framework/db/Connection.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/db/Connection.php b/framework/db/Connection.php\\nindex a52e8fbdc6a..929eedf1dd3 100644\\n--- a/framework/db/Connection.php\\n+++ b/framework/db/Connection.php\\n@@ -121,8 +121,7 @@\\n * @property-read PDO $masterPdo The PDO instance for the currently active master connection.\\n * @property QueryBuilder $queryBuilder The query builder for the current DB connection. Note that the type of\\n * this property differs in getter and setter. See [[getQueryBuilder()]] and [[setQueryBuilder()]] for details.\\n- * @property-read Schema $schema The schema information for the database opened by this\\n- * connection.\\n+ * @property-read Schema $schema The schema information for the database opened by this connection.\\n * @property-read string $serverVersion Server version as a string.\\n * @property-read Connection|null $slave The currently active slave connection. `null` is returned if there is\\n * no slave available and `$fallbackToMaster` is false.\\n\",\n \"summary\": \"Edited 1 file(s) in framework/db/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"framework/log/Target.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/log/Target.php b/framework/log/Target.php\\nindex 428fb150e14..780c9a05f34 100644\\n--- a/framework/log/Target.php\\n+++ b/framework/log/Target.php\\n@@ -28,7 +28,9 @@\\n * satisfying both filter conditions will be handled. Additionally, you\\n * may specify [[except]] to exclude messages of certain categories.\\n *\\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\\n\",\n \"summary\": \"Edited 1 file(s) in framework/log/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"framework/validators/CompareValidator.php\",\n \"framework/validators/Validator.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\\nindex 2068d1cb9f1..4981179d7cc 100644\\n--- a/framework/validators/CompareValidator.php\\n+++ b/framework/validators/CompareValidator.php\\n@@ -93,7 +93,7 @@ class CompareValidator extends Validator\\n */\\n public $operator = '==';\\n /**\\n- * @var string the user-defined error message. It may contain the following placeholders which\\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\\n * will be replaced accordingly by the validator:\\n *\\n * - `{attribute}`: the label of the attribute being validated\\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\\nindex f324cd2b91e..1f4aeba6d14 100644\\n--- a/framework/validators/Validator.php\\n+++ b/framework/validators/Validator.php\\n@@ -322,6 +322,8 @@ public function validateAttribute($model, $attribute)\\n * @param mixed $value the data value to be validated.\\n * @param string|null $error the error message to be returned, if the validation fails.\\n * @return bool whether the data is valid.\\n+ *\\n+ * @param-out string|null $error\\n */\\n public function validate($value, &$error = null)\\n {\\n\",\n \"summary\": \"Edited 2 file(s) in framework/validators/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"framework/web/ErrorHandler.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\\nindex 0df7d920ffc..212bec48e46 100644\\n--- a/framework/web/ErrorHandler.php\\n+++ b/framework/web/ErrorHandler.php\\n@@ -305,10 +305,13 @@ public function renderFile($_file_, $_params_)\\n {\\n $_params_['handler'] = $this;\\n if ($this->exception instanceof ErrorException || !Yii::$app->has('view')) {\\n+ $_renderer_ = function () {\\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\\n+ require Yii::getAlias(func_get_arg(0));\\n+ };\\n ob_start();\\n ob_implicit_flush(false);\\n- extract($_params_, EXTR_OVERWRITE);\\n- require Yii::getAlias($_file_);\\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\\n \\n return ob_get_clean();\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in framework/web/\"\n },\n {\n \"subtask_id\": \"s9\",\n \"scope_files\": [\n \"tests/base/log/BaseDbTarget.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/base/log/BaseDbTarget.php b/tests/base/log/BaseDbTarget.php\\nindex 7594e83d671..0292973f28f 100644\\n--- a/tests/base/log/BaseDbTarget.php\\n+++ b/tests/base/log/BaseDbTarget.php\\n@@ -9,8 +9,6 @@\\n namespace yiiunit\\\\base\\\\log;\\n \\n use yii\\\\console\\\\Application;\\n-use yii\\\\console\\\\Controller;\\n-use yii\\\\base\\\\InvalidParamException;\\n use yii\\\\db\\\\Exception;\\n use yii\\\\base\\\\InvalidConfigException;\\n use Yii;\\n@@ -18,6 +16,7 @@\\n use yii\\\\console\\\\ExitCode;\\n use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Query;\\n+use yii\\\\log\\\\DbTarget;\\n use yii\\\\log\\\\Logger;\\n use yiiunit\\\\framework\\\\console\\\\controllers\\\\EchoMigrateController;\\n use yiiunit\\\\TestCase;\\n@@ -171,7 +170,10 @@ public function testTransactionRollBack(): void\\n // current db connection should still have a transaction\\n $this->assertNotNull($db->transaction);\\n // log db connection should not have transaction\\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\\n+\\n+ $dbTarget = Yii::$app->log->targets['db'];\\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\\n+ $this->assertNull($dbTarget->db->transaction);\\n \\n $tx->rollBack();\\n \\n\",\n \"summary\": \"Edited 1 file(s) in tests/base/log/\"\n },\n {\n \"subtask_id\": \"s10\",\n \"scope_files\": [\n \"tests/base/validators/BaseUniqueValidator.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/base/validators/BaseUniqueValidator.php b/tests/base/validators/BaseUniqueValidator.php\\nindex 3b5951683d4..0eee34af0ea 100644\\n--- a/tests/base/validators/BaseUniqueValidator.php\\n+++ b/tests/base/validators/BaseUniqueValidator.php\\n@@ -72,6 +72,7 @@ public function testValidateInvalidAttribute(): void\\n \\n /** @var Customer $customerModel */\\n $customerModel = Customer::findOne(1);\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $customerModel->name = ['test array data'];\\n $validator->validateAttribute($customerModel, 'name');\\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\\n@@ -79,6 +80,7 @@ public function testValidateInvalidAttribute(): void\\n $customerModel->clearErrors();\\n \\n $customerModel->name = 'test data';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\\n $validator->targetAttribute = ['email', 'name'];\\n $validator->validateAttribute($customerModel, 'name');\\n@@ -410,7 +412,7 @@ public function testAmbiguousColumnName(): void\\n ]);\\n $model = new Order();\\n $model->customer_id = 1;\\n- $model->total = 800;\\n+ $model->total = '800';\\n $model->save(false);\\n $validator->validateAttribute($model, 'id');\\n $this->assertFalse($model->hasErrors());\\n\",\n \"summary\": \"Edited 1 file(s) in tests/base/validators/\"\n },\n {\n \"subtask_id\": \"s11\",\n \"scope_files\": [\n \"tests/base/web/BaseFormatter.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/base/web/BaseFormatter.php b/tests/base/web/BaseFormatter.php\\nindex b5d7831b9e2..1a188fc342a 100644\\n--- a/tests/base/web/BaseFormatter.php\\n+++ b/tests/base/web/BaseFormatter.php\\n@@ -12,6 +12,9 @@\\n use yii\\\\web\\\\Response;\\n use yii\\\\web\\\\ResponseFormatterInterface;\\n \\n+/**\\n+ * @template TFormatter of ResponseFormatterInterface\\n+ */\\n abstract class BaseFormatter extends TestCase\\n {\\n /**\\n@@ -19,7 +22,7 @@ abstract class BaseFormatter extends TestCase\\n */\\n public $response;\\n /**\\n- * @var ResponseFormatterInterface\\n+ * @var TFormatter\\n */\\n public $formatter;\\n \\n@@ -31,7 +34,7 @@ protected function setUp(): void\\n }\\n \\n /**\\n- * @return ResponseFormatterInterface\\n+ * @return TFormatter\\n */\\n abstract protected function getFormatterInstance();\\n \\n\",\n \"summary\": \"Edited 1 file(s) in tests/base/web/\"\n },\n {\n \"subtask_id\": \"s12\",\n \"scope_files\": [\n \"tests/base/web/session/BaseDbSession.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/base/web/session/BaseDbSession.php b/tests/base/web/session/BaseDbSession.php\\nindex 43fff89a696..33c6c1be6a4 100644\\n--- a/tests/base/web/session/BaseDbSession.php\\n+++ b/tests/base/web/session/BaseDbSession.php\\n@@ -15,6 +15,7 @@\\n use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Migration;\\n use yii\\\\db\\\\Query;\\n+use yii\\\\web\\\\Application;\\n use yii\\\\web\\\\DbSession;\\n use yiiunit\\\\framework\\\\console\\\\controllers\\\\EchoMigrateController;\\n use yiiunit\\\\framework\\\\web\\\\session\\\\SessionTestTrait;\\n@@ -260,11 +261,14 @@ public function testInstantiate(): void\\n 'db' => 'sessionDb',\\n ]);\\n \\n- $this->assertSame(Yii::$app->sessionDb, $session->db);\\n+ /** @var Application&object{sessionDb: Connection} */\\n+ $app = Yii::$app;\\n+\\n+ $this->assertSame($app->sessionDb, $session->db);\\n $this->assertSame(300, $session->timeout);\\n $session->close();\\n \\n- Yii::$app->set('db', Yii::$app->sessionDb);\\n+ Yii::$app->set('db', $app->sessionDb);\\n Yii::$app->set('sessionDb', null);\\n ini_set('session.gc_maxlifetime', $oldTimeout);\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/base/web/session/\"\n },\n {\n \"subtask_id\": \"s13\",\n \"scope_files\": [\n \"tests/data/ar/Cat.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\\nindex e2592a80be5..a7ac3000ea1 100644\\n--- a/tests/data/ar/Cat.php\\n+++ b/tests/data/ar/Cat.php\\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\\n \\n /**\\n * This is to test if __isset catches the exception.\\n- * @throw DivisionByZeroError\\n+ * @throws DivisionByZeroError\\n * @return float|int\\n */\\n public function getException(): never\\n@@ -43,7 +43,7 @@ public function getException(): never\\n \\n /**\\n * This is to test if __isset catches the error.\\n- * @throw DivisionByZeroError\\n+ * @throws DivisionByZeroError\\n * @return float|int\\n */\\n public function getThrowable()\\n\",\n \"summary\": \"Edited 1 file(s) in tests/data/ar/\"\n },\n {\n \"subtask_id\": \"s14\",\n \"scope_files\": [\n \"tests/data/validators/models/FakedValidationModel.php\",\n \"tests/data/validators/models/ValidatorTestMainModel.php\",\n \"tests/data/validators/models/ValidatorTestRefModel.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\\nindex 33e35049f15..4f2245b1abc 100644\\n--- a/tests/data/validators/models/FakedValidationModel.php\\n+++ b/tests/data/validators/models/FakedValidationModel.php\\n@@ -10,6 +10,33 @@\\n \\n use yii\\\\base\\\\Model;\\n \\n+/**\\n+ * @property mixed $attr\\n+ * @property mixed $attr_url\\n+ * @property mixed $attr_string\\n+ * @property mixed $attr_reg1\\n+ * @property mixed $attr_number\\n+ * @property mixed $attr_ip\\n+ * @property mixed $attr_array\\n+ * @property mixed $attr_array_skipped\\n+ * @property mixed $attr_files\\n+ * @property mixed $attr_one\\n+ * @property mixed $attr_two\\n+ * @property mixed $attr_empty1\\n+ * @property mixed $attr_empty2\\n+ * @property mixed $attr_email\\n+ * @property mixed $attr_date\\n+ * @property mixed $attr_timestamp\\n+ * @property mixed $attr_test\\n+ * @property mixed $attr_test_val\\n+ * @property mixed $attr_test_repeat\\n+ * @property mixed $attrA\\n+ * @property mixed $attrB\\n+ * @property mixed $attrC\\n+ * @property mixed $attrD\\n+ * @property mixed $attr_image\\n+ * @property mixed $attr_images\\n+ */\\n class FakedValidationModel extends Model\\n {\\n public $val_attr_a;\\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\\nindex 73faaf22f39..1752079bc08 100644\\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\\n@@ -10,6 +10,9 @@\\n \\n use yiiunit\\\\data\\\\ar\\\\ActiveRecord;\\n \\n+/**\\n+ * @property int $id\\n+ */\\n class ValidatorTestMainModel extends ActiveRecord\\n {\\n public $testMainVal = 1;\\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\\nindex 8642dc317c9..0bdb0c71f83 100644\\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\\n@@ -11,9 +11,9 @@\\n use yiiunit\\\\data\\\\ar\\\\ActiveRecord;\\n \\n /**\\n- * @property int id\\n- * @property string a_field\\n- * @property int ref\\n+ * @property int $id\\n+ * @property string $a_field\\n+ * @property int $ref\\n */\\n class ValidatorTestRefModel extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/data/validators/models/\"\n },\n {\n \"subtask_id\": \"s15\",\n \"scope_files\": [\n \"tests/framework/base/BaseObjectTest.php\",\n \"tests/framework/base/BehaviorTest.php\",\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/DynamicModelTest.php\",\n \"tests/framework/base/ModelTest.php\",\n \"tests/framework/base/ViewTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\\nindex 566fa195ef4..586ffbe4fa4 100644\\n--- a/tests/framework/base/BaseObjectTest.php\\n+++ b/tests/framework/base/BaseObjectTest.php\\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\\n {\\n $this->assertSame('default', $this->object->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $value2 = $this->object->Caption;\\n }\\n \\n@@ -82,8 +81,7 @@ public function testSetProperty(): void\\n $this->object->Text = $value;\\n $this->assertEquals($value, $this->object->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $this->object->NewMember = $value;\\n }\\n \\n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\\n public function testCallUnknownMethod(): void\\n {\\n $this->expectException('yii\\\\base\\\\UnknownMethodException');\\n- // We intentionally call a non-existent method to test that an exception is thrown\\n- // @phpstan-ignore method.notFound\\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\\n $this->object->unknownMethod();\\n }\\n \\ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\\nindex a64f82606e0..fc7bf8b4c33 100644\\n--- a/tests/framework/base/BehaviorTest.php\\n+++ b/tests/framework/base/BehaviorTest.php\\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\\n $bar->attachBehavior('bar', $behavior);\\n \\n $this->expectException('yii\\\\base\\\\UnknownMethodException');\\n- // We intentionally call a non-existent method to test that an exception is thrown\\n- // @phpstan-ignore method.notFound\\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\\n $bar->nomagicBehaviorMethod();\\n }\\n }\\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\\nindex 522cac4389a..bcdfe09547a 100644\\n--- a/tests/framework/base/ComponentTest.php\\n+++ b/tests/framework/base/ComponentTest.php\\n@@ -1069,7 +1069,7 @@ public function testDetachNotAttachedHandler(): void\\n */\\n public function testEventClosureDetachesItself(): void\\n {\\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\\n \\n $obj->trigger('barEventOnce');\\n \\ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\\nindex 04924a21153..26837108962 100644\\n--- a/tests/framework/base/DynamicModelTest.php\\n+++ b/tests/framework/base/DynamicModelTest.php\\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\\n $this->assertTrue($model->canSetProperty('email'));\\n $this->assertTrue($model->canSetProperty('name'));\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $age = $model->age;\\n }\\n \\ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\\nindex 1a9a9fdf38b..68ed7f6c201 100644\\n--- a/tests/framework/base/ModelTest.php\\n+++ b/tests/framework/base/ModelTest.php\\n@@ -1395,7 +1395,7 @@ public function testValidateAttributeNames(): void\\n \\n public function testFormNameWithAnonymousClass(): void\\n {\\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\\n \\n self::expectException(\\n InvalidConfigException::class,\\ndiff --git a/tests/framework/base/ViewTest.php b/tests/framework/base/ViewTest.php\\nindex 2ce36c48917..cdcf260f4a3 100644\\n--- a/tests/framework/base/ViewTest.php\\n+++ b/tests/framework/base/ViewTest.php\\n@@ -108,6 +108,19 @@ public function testRelativePathInView(): void\\n $this->assertSame($subViewContent, $view->render('@testviews/base'));\\n }\\n \\n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\\n+ {\\n+ $view = new View();\\n+\\n+ $viewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'safe.php';\\n+ file_put_contents($viewFile, '<?php echo \\\"safe view\\\";');\\n+\\n+ $secretFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'secret.txt';\\n+ file_put_contents($secretFile, 'secret data');\\n+\\n+ $this->assertSame('safe view', $view->renderFile($viewFile, ['_file_' => $secretFile]));\\n+ }\\n+\\n public function testAfterRender(): void\\n {\\n $view = new View();\\n\",\n \"summary\": \"Edited 6 file(s) in tests/framework/base/\"\n },\n {\n \"subtask_id\": \"s16\",\n \"scope_files\": [\n \"tests/framework/base/stubs/AnonymousComponentClass.php\",\n \"tests/framework/base/stubs/AnonymousModelClass.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\\nsimilarity index 100%\\nrename from tests/framework/base/stub/AnonymousComponentClass.php\\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\\nsimilarity index 100%\\nrename from tests/framework/base/stub/AnonymousModelClass.php\\nrename to tests/framework/base/stubs/AnonymousModelClass.php\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/base/stubs/\"\n },\n {\n \"subtask_id\": \"s17\",\n \"scope_files\": [\n \"tests/framework/console/ControllerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\\nindex f8d10f95f62..76dc8f149b4 100644\\n--- a/tests/framework/console/ControllerTest.php\\n+++ b/tests/framework/console/ControllerTest.php\\n@@ -25,6 +25,10 @@\\n use yii\\\\console\\\\Response;\\n use yii\\\\helpers\\\\Console;\\n use yiiunit\\\\framework\\\\console\\\\stubs\\\\DummyService;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeInjectionController;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -43,9 +47,9 @@ protected function setUp(): void\\n $this->mockApplication();\\n \\n Yii::$app->controllerMap = [\\n- 'fake' => 'yiiunit\\\\framework\\\\console\\\\FakeController',\\n- 'fake_witout_output' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpControllerWithoutOutput',\\n- 'help' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpController',\\n+ 'fake' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController',\\n+ 'fake_without_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n+ 'help' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController',\\n ];\\n }\\n \\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/console/\"\n },\n {\n \"subtask_id\": \"s18\",\n \"scope_files\": [\n \"tests/framework/console/stubs/FakeController.php\",\n \"tests/framework/console/stubs/FakeHelpController.php\",\n \"tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\",\n \"tests/framework/console/stubs/FakeInjectionController.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\\nsimilarity index 98%\\nrename from tests/framework/console/FakeController.php\\nrename to tests/framework/console/stubs/FakeController.php\\nindex ff92196c0c2..7bc4a4541d3 100644\\n--- a/tests/framework/console/FakeController.php\\n+++ b/tests/framework/console/stubs/FakeController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\Controller;\\n use yii\\\\console\\\\Response;\\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\\nsimilarity index 93%\\nrename from tests/framework/console/FakeHelpController.php\\nrename to tests/framework/console/stubs/FakeHelpController.php\\nindex 2846c94848f..ae23e2e0fd6 100644\\n--- a/tests/framework/console/FakeHelpController.php\\n+++ b/tests/framework/console/stubs/FakeHelpController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\controllers\\\\HelpController;\\n \\ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\nsimilarity index 90%\\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\nindex d9586dd9610..22c5bc7696c 100644\\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\controllers\\\\HelpController;\\n \\ndiff --git a/tests/framework/console/FakeInjectionController.php b/tests/framework/console/stubs/FakeInjectionController.php\\nsimilarity index 89%\\nrename from tests/framework/console/FakeInjectionController.php\\nrename to tests/framework/console/stubs/FakeInjectionController.php\\nindex 0019ef7ce15..ae57310e31b 100644\\n--- a/tests/framework/console/FakeInjectionController.php\\n+++ b/tests/framework/console/stubs/FakeInjectionController.php\\n@@ -6,10 +6,9 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\data\\\\DataProviderInterface;\\n-use yiiunit\\\\framework\\\\console\\\\stubs\\\\DummyService;\\n use yii\\\\console\\\\Controller;\\n use yii\\\\console\\\\Request;\\n use yiiunit\\\\framework\\\\web\\\\Post;\\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/console/stubs/\"\n },\n {\n \"subtask_id\": \"s19\",\n \"scope_files\": [\n \"tests/framework/db/mssql/QueryBuilderTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\\nindex 2e8f97e3058..7354abaf595 100644\\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\\n@@ -1028,4 +1028,98 @@ public static function buildFromDataProvider(): array\\n \\n return $data;\\n }\\n+\\n+ public function testRenameTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->renameTable('old_table', 'new_table');\\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\\n+ }\\n+\\n+ public function testRenameColumn(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\\n+ $this->assertSame(\\\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\\\", $sql);\\n+ }\\n+\\n+ public function testSelectExists(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityEnableForTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityDisableForTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityFiltersOutViews(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(true);\\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\\n+ $this->assertStringNotContainsString('animal_view', $sql);\\n+ }\\n+\\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->resetSequence('non_existent_table');\\n+ }\\n+\\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage(\\\"There is not sequence associated with table 'order_item'.\\\");\\n+ $qb->resetSequence('order_item');\\n+ }\\n+\\n+ public function testUpdateWithVarbinaryData(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $params = [];\\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\\n+ $this->assertSame([':qp0' => 1], $params);\\n+ }\\n+\\n+ public function testCompositeInWithSubqueryThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $params = [];\\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\\n+ $this->expectException('yii\\\\base\\\\NotSupportedException');\\n+ $qb->buildCondition($condition, $params);\\n+ }\\n+\\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\\n+ }\\n+\\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\\n+ }\\n }\\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex b847556b70b..71f1b10c545 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -10,8 +10,10 @@\\n \\n use yii\\\\base\\\\NotSupportedException;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\Constraint;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n+use yii\\\\db\\\\mssql\\\\TableSchema;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n use yiiunit\\\\base\\\\db\\\\BaseSchema;\\n \\n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\\n \\n $this->assertEquals($selectResult['id'], $insertResult['id']);\\n }\\n+\\n+ public function testQuoteColumnNameWithBrackets(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableName(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableName');\\n+ $result = $method->invoke($schema, $name);\\n+ $this->assertSame($expectedCatalog, $result->catalogName);\\n+ $this->assertSame($expectedSchema, $result->schemaName);\\n+ $this->assertSame($expectedTable, $result->name);\\n+ $this->assertSame($expectedFullName, $result->fullName);\\n+ }\\n+\\n+ public static function resolveTableNameProvider(): array\\n+ {\\n+ return [\\n+ 'single part' => [\\n+ 'customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'two parts' => [\\n+ 'sales.customer',\\n+ null,\\n+ 'sales',\\n+ 'customer',\\n+ 'sales.customer',\\n+ ],\\n+ 'two parts default schema' => [\\n+ 'dbo.customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'three parts' => [\\n+ 'catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ 'four parts' => [\\n+ '[server1].catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function testSavepointOperations(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\\\")->execute();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\\\")->execute();\\n+ $db->getSchema()->rollBackSavepoint('sp1');\\n+ $db->transaction->commit();\\n+\\n+ $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\\\")->queryScalar();\\n+ $this->assertSame(0, $afterCount);\\n+ $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\\\")->queryScalar();\\n+ $this->assertSame(1, $beforeCount);\\n+\\n+ $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] = 'sp_test'\\\")->execute();\\n+ }\\n+\\n+ public function testReleaseSavepointIsNoOp(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->getSchema()->releaseSavepoint('sp1');\\n+ $this->assertTrue($db->transaction->getIsActive());\\n+ $db->transaction->rollBack();\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableNames(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $table = new TableSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableNames');\\n+ $method->invoke($schema, $table, $name);\\n+ $this->assertSame($expectedCatalog, $table->catalogName);\\n+ $this->assertSame($expectedSchema, $table->schemaName);\\n+ $this->assertSame($expectedTable, $table->name);\\n+ $this->assertSame($expectedFullName, $table->fullName);\\n+ }\\n+\\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n+ $this->assertNotEmpty($primaryKeys);\\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n+ }\\n+\\n+ public function testNullDefaultValueColumn(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $table = $schema->getTableSchema('null_values');\\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\\n+ }\\n+\\n+ public function testInsertWithCompositePrimaryKey(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $result = $db->getSchema()->insert('employee', [\\n+ 'id' => 100,\\n+ 'department_id' => 1,\\n+ 'first_name' => 'Test',\\n+ 'last_name' => 'User',\\n+ ]);\\n+ $this->assertSame('100', $result['id']);\\n+ $this->assertSame('1', $result['department_id']);\\n+\\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\\n+ }\\n+\\n+ public function testGetViewNamesWithDefaultSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $viewNames = $schema->getViewNames();\\n+ $this->assertContains('animal_view', $viewNames);\\n+ }\\n+\\n+ public function testFindUniqueIndexes(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\\n+ $this->assertNotEmpty($indexes);\\n+ }\\n+\\n+ public function testCreateColumnSchemaBuilder(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\\n+ $this->assertInstanceOf('yii\\\\db\\\\mssql\\\\ColumnSchemaBuilder', $builder);\\n+ }\\n }\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/db/mssql/\"\n },\n {\n \"subtask_id\": \"s20\",\n \"scope_files\": [\n \"tests/framework/grid/GridViewTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\\nindex e8cc90c548c..63e4653923b 100644\\n--- a/tests/framework/grid/GridViewTest.php\\n+++ b/tests/framework/grid/GridViewTest.php\\n@@ -217,15 +217,18 @@ public function testHeaderLabels(): void\\n ],\\n ]);\\n \\n+ $gridDataProvider = $grid->dataProvider;\\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\\n+\\n // NoAutoLabels::generateAttributeLabel() should not be called.\\n- $grid->dataProvider->setSort([\\n+ $gridDataProvider->setSort([\\n 'route' => '/',\\n 'urlManager' => $urlManager,\\n ]);\\n $grid->renderTableHeader();\\n \\n // NoAutoLabels::generateAttributeLabel() should not be called.\\n- $grid->dataProvider->setSort([\\n+ $gridDataProvider->setSort([\\n 'route' => '/',\\n 'urlManager' => $urlManager,\\n 'attributes' => ['attr1', 'attr2'],\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/grid/\"\n },\n {\n \"subtask_id\": \"s21\",\n \"scope_files\": [\n \"tests/framework/helpers/ConsoleTest.php\",\n \"tests/framework/helpers/HtmlTest.php\",\n \"tests/framework/helpers/JsonTest.php\",\n \"tests/framework/helpers/UrlTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\\nindex de13fb2d2cb..7fb23470d7b 100644\\n--- a/tests/framework/helpers/ConsoleTest.php\\n+++ b/tests/framework/helpers/ConsoleTest.php\\n@@ -444,9 +444,9 @@ public function testSelect(): void\\n }\\n \\n /**\\n- * @property string name\\n- * @property array types\\n- * @property string description\\n+ * @property string $name\\n+ * @property array $types\\n+ * @property string $description\\n */\\n class TestConsoleModel extends DynamicModel\\n {\\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\\nindex 6a0495651ee..6adb0ef2a63 100644\\n--- a/tests/framework/helpers/HtmlTest.php\\n+++ b/tests/framework/helpers/HtmlTest.php\\n@@ -17,6 +17,8 @@\\n use yii\\\\db\\\\ArrayExpression;\\n use yii\\\\helpers\\\\Html;\\n use yii\\\\helpers\\\\Url;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\HtmlTestModel;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\MyHtml;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -1711,7 +1713,7 @@ public function testError(): void\\n 'Custom error message generated by callback'\\n );\\n $this->assertEquals(\\n- '<div>Error in yiiunit\\\\framework\\\\helpers\\\\HtmlTestModel - name</div>',\\n+ '<div>Error in yiiunit\\\\framework\\\\helpers\\\\stubs\\\\HtmlTestModel - name</div>',\\n Html::error($model, 'name', ['errorSource' => fn($model, $attribute) => 'Error in ' . $model::class . ' - ' . $attribute]),\\n 'Custom error message generated by closure'\\n );\\n@@ -2243,57 +2245,3 @@ public static function getInputIdByNameDataProvider(): array\\n ];\\n }\\n }\\n-\\n-/**\\n- * Class MyHtml\\n- * @package yiiunit\\\\framework\\\\helpers\\n- */\\n-class MyHtml extends Html\\n-{\\n- /**\\n- * @param Model $model\\n- * @param string $attribute\\n- * @param array $options\\n- */\\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\\n- {\\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\\n- $attribute = static::getAttributeName($attribute);\\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\\n- }\\n- }\\n-}\\n-\\n-/**\\n- * @property string name\\n- * @property string title\\n- * @property string alias\\n- * @property array types\\n- * @property string description\\n- */\\n-class HtmlTestModel extends DynamicModel\\n-{\\n- public function init(): void\\n- {\\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\\n- $this->defineAttribute($attribute);\\n- }\\n- }\\n-\\n- public function rules()\\n- {\\n- return [\\n- ['name', 'required'],\\n- ['name', 'string', 'max' => 100],\\n- ['title', 'string', 'length' => 10],\\n- ['alias', 'string', 'length' => [0, 20]],\\n- ['description', 'string', 'max' => 500],\\n- [['radio', 'checkbox'], 'boolean'],\\n- ];\\n- }\\n-\\n- public function customError()\\n- {\\n- return 'this is custom error message';\\n- }\\n-}\\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\\nindex 1b684b0859b..dd8489d1ac6 100644\\n--- a/tests/framework/helpers/JsonTest.php\\n+++ b/tests/framework/helpers/JsonTest.php\\n@@ -15,8 +15,8 @@\\n use DateTimeZone;\\n use yii\\\\helpers\\\\Json;\\n use yii\\\\web\\\\JsExpression;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\JsonModel;\\n use yiiunit\\\\framework\\\\web\\\\Post;\\n-use yiiunit\\\\framework\\\\models\\\\JsonModel;\\n use yiiunit\\\\TestCase;\\n \\n /**\\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\\nindex 275f7522cec..e67bc13078c 100644\\n--- a/tests/framework/helpers/UrlTest.php\\n+++ b/tests/framework/helpers/UrlTest.php\\n@@ -64,13 +64,13 @@ protected function tearDown(): void\\n */\\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\\n {\\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\\n+ Yii::$app->controller = $controller = new Controller(\\n+ $controllerId,\\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\\n+ );\\n+\\n $controller->actionParams = $params;\\n $controller->action = new Action($actionID, $controller);\\n-\\n- if ($moduleID !== null) {\\n- $controller->module = new Module($moduleID);\\n- }\\n }\\n \\n protected function removeMockedAction()\\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/helpers/\"\n },\n {\n \"subtask_id\": \"s22\",\n \"scope_files\": [\n \"tests/framework/helpers/stubs/HtmlTestModel.php\",\n \"tests/framework/helpers/stubs/JsonModel.php\",\n \"tests/framework/helpers/stubs/MyHtml.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\\nnew file mode 100644\\nindex 00000000000..078e10da545\\n--- /dev/null\\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\\n@@ -0,0 +1,47 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n+\\n+use yii\\\\base\\\\DynamicModel;\\n+\\n+/**\\n+ * @property string $name\\n+ * @property string $title\\n+ * @property string $alias\\n+ * @property mixed $types\\n+ * @property string $description\\n+ * @property bool $radio\\n+ * @property bool $checkbox\\n+ */\\n+class HtmlTestModel extends DynamicModel\\n+{\\n+ public function init(): void\\n+ {\\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\\n+ $this->defineAttribute($attribute);\\n+ }\\n+ }\\n+\\n+ public function rules()\\n+ {\\n+ return [\\n+ ['name', 'required'],\\n+ ['name', 'string', 'max' => 100],\\n+ ['title', 'string', 'length' => 10],\\n+ ['alias', 'string', 'length' => [0, 20]],\\n+ ['description', 'string', 'max' => 500],\\n+ [['radio', 'checkbox'], 'boolean'],\\n+ ];\\n+ }\\n+\\n+ public function customError()\\n+ {\\n+ return 'this is custom error message';\\n+ }\\n+}\\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\\nsimilarity index 90%\\nrename from tests/framework/models/JsonModel.php\\nrename to tests/framework/helpers/stubs/JsonModel.php\\nindex 1c85db7ac1b..c41e6cb6b87 100644\\n--- a/tests/framework/models/JsonModel.php\\n+++ b/tests/framework/helpers/stubs/JsonModel.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\models;\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n \\n use JsonSerializable;\\n use ReturnTypeWillChange;\\n@@ -16,11 +16,13 @@\\n * JSON serializable model for tests.\\n *\\n * {@inheritdoc}\\n+ *\\n+ * @property mixed $name\\n */\\n class JsonModel extends DynamicModel implements JsonSerializable\\n {\\n /**\\n- * @var array\\n+ * @var array|object\\n */\\n public $data = ['json' => 'serializable'];\\n \\ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\\nnew file mode 100644\\nindex 00000000000..673f1a9468b\\n--- /dev/null\\n+++ b/tests/framework/helpers/stubs/MyHtml.php\\n@@ -0,0 +1,32 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n+\\n+use yii\\\\base\\\\Model;\\n+use yii\\\\helpers\\\\Html;\\n+\\n+/**\\n+ * Class MyHtml\\n+ * @package yiiunit\\\\framework\\\\helpers\\n+ */\\n+class MyHtml extends Html\\n+{\\n+ /**\\n+ * @param Model $model\\n+ * @param string $attribute\\n+ * @param array $options\\n+ */\\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\\n+ {\\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\\n+ $attribute = static::getAttributeName($attribute);\\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\\n+ }\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/helpers/stubs/\"\n },\n {\n \"subtask_id\": \"s23\",\n \"scope_files\": [\n \"tests/framework/i18n/FormatterDateTest.php\",\n \"tests/framework/i18n/FormatterNumberTest.php\",\n \"tests/framework/i18n/LocaleTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\\nindex 5b9d5e0b4a3..9535075fa88 100644\\n--- a/tests/framework/i18n/FormatterDateTest.php\\n+++ b/tests/framework/i18n/FormatterDateTest.php\\n@@ -22,7 +22,7 @@\\n class FormatterDateTest extends TestCase\\n {\\n /**\\n- * @var Formatter\\n+ * @var Formatter|null\\n */\\n protected $formatter;\\n \\n@@ -367,18 +367,18 @@ public function testAsRelativeTime(): void\\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\\n \\n // Invert all the DateIntervals\\n- $interval_1_second->invert = true;\\n- $interval_244_seconds->invert = true;\\n- $interval_1_minute->invert = true;\\n- $interval_33_minutes->invert = true;\\n- $interval_1_hour->invert = true;\\n- $interval_6_hours->invert = true;\\n- $interval_1_day->invert = true;\\n- $interval_89_days->invert = true;\\n- $interval_1_month->invert = true;\\n- $interval_5_months->invert = true;\\n- $interval_1_year->invert = true;\\n- $interval_12_years->invert = true;\\n+ $interval_1_second->invert = 1;\\n+ $interval_244_seconds->invert = 1;\\n+ $interval_1_minute->invert = 1;\\n+ $interval_33_minutes->invert = 1;\\n+ $interval_1_hour->invert = 1;\\n+ $interval_6_hours->invert = 1;\\n+ $interval_1_day->invert = 1;\\n+ $interval_89_days->invert = 1;\\n+ $interval_1_month->invert = 1;\\n+ $interval_5_months->invert = 1;\\n+ $interval_1_year->invert = 1;\\n+ $interval_12_years->invert = 1;\\n \\n // Pass a inverted DateInterval\\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\\n@@ -423,7 +423,7 @@ public function testAsRelativeTime(): void\\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\\n $interval_0_seconds = new DateInterval('PT0S');\\n- $interval_0_seconds->invert = true;\\n+ $interval_0_seconds->invert = 1;\\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\\n \\n // empty input\\n@@ -495,19 +495,19 @@ public function testAsDuration(): void\\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\\n \\n // Invert all the DateIntervals\\n- $interval_0_seconds->invert = true;\\n- $interval_1_second->invert = true;\\n- $interval_244_seconds->invert = true;\\n- $interval_1_minute->invert = true;\\n- $interval_33_minutes->invert = true;\\n- $interval_1_hour->invert = true;\\n- $interval_6_hours->invert = true;\\n- $interval_1_day->invert = true;\\n- $interval_89_days->invert = true;\\n- $interval_1_month->invert = true;\\n- $interval_5_months->invert = true;\\n- $interval_1_year->invert = true;\\n- $interval_12_years->invert = true;\\n+ $interval_0_seconds->invert = 1;\\n+ $interval_1_second->invert = 1;\\n+ $interval_244_seconds->invert = 1;\\n+ $interval_1_minute->invert = 1;\\n+ $interval_33_minutes->invert = 1;\\n+ $interval_1_hour->invert = 1;\\n+ $interval_6_hours->invert = 1;\\n+ $interval_1_day->invert = 1;\\n+ $interval_89_days->invert = 1;\\n+ $interval_1_month->invert = 1;\\n+ $interval_5_months->invert = 1;\\n+ $interval_1_year->invert = 1;\\n+ $interval_12_years->invert = 1;\\n \\n // Pass a inverted DateInterval\\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\\n@@ -742,7 +742,7 @@ public function testDateOnlyValues(): void\\n \\n public function testIntlTimeOnlyValues()\\n {\\n- return $this->testTimeOnlyValues();\\n+ $this->testTimeOnlyValues();\\n }\\n \\n /**\\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\\nindex 034aa4501d4..073ac0778e5 100644\\n--- a/tests/framework/i18n/FormatterNumberTest.php\\n+++ b/tests/framework/i18n/FormatterNumberTest.php\\n@@ -19,7 +19,7 @@\\n class FormatterNumberTest extends TestCase\\n {\\n /**\\n- * @var Formatter\\n+ * @var Formatter|null\\n */\\n protected $formatter;\\n \\ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\\nindex 306d9dc1595..62505611cf7 100644\\n--- a/tests/framework/i18n/LocaleTest.php\\n+++ b/tests/framework/i18n/LocaleTest.php\\n@@ -17,7 +17,7 @@\\n class LocaleTest extends TestCase\\n {\\n /**\\n- * @var Locale\\n+ * @var Locale|null\\n */\\n protected $locale;\\n \\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/i18n/\"\n },\n {\n \"subtask_id\": \"s24\",\n \"scope_files\": [\n \"tests/framework/log/DispatcherTest.php\",\n \"tests/framework/log/EmailTargetTest.php\",\n \"tests/framework/log/LoggerTest.php\",\n \"tests/framework/log/SyslogTargetTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\\nindex 69e7ac695c7..0de25bedd9c 100644\\n--- a/tests/framework/log/DispatcherTest.php\\n+++ b/tests/framework/log/DispatcherTest.php\\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\\n \\n /**\\n * @group log\\n+ *\\n+ * @method static mixed microtime($get_as_float)\\n */\\n class DispatcherTest extends TestCase\\n {\\n@@ -324,7 +326,10 @@ public function testTargetThrow(): void\\n $this->assertSame(1, $this->targetThrowFirstCount);\\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\\n+\\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\\n+ $this->assertIsArray($targetThrowSecondOutputs);\\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\\n }\\n }\\n }\\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\\nindex 0b5c5d95423..e1e48bda009 100644\\n--- a/tests/framework/log/EmailTargetTest.php\\n+++ b/tests/framework/log/EmailTargetTest.php\\n@@ -8,6 +8,7 @@\\n \\n namespace yiiunit\\\\framework\\\\log;\\n \\n+use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n use yii\\\\base\\\\InvalidConfigException;\\n use yii\\\\log\\\\EmailTarget;\\n use yii\\\\mail\\\\BaseMailer;\\n@@ -21,7 +22,7 @@\\n class EmailTargetTest extends TestCase\\n {\\n /**\\n- * @var PHPUnit_Framework_MockObject_MockObject\\n+ * @var BaseMailer&MockObject\\n */\\n protected $mailer;\\n \\n@@ -75,7 +76,6 @@ public function testExportWithSubject(): void\\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\n@@ -121,7 +121,6 @@ public function testExportWithoutSubject(): void\\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\n@@ -157,7 +156,6 @@ public function testExportWithSendFailure(): void\\n $message->method('send')->willReturn(false);\\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\\nindex f929e38655f..10e1828a03c 100644\\n--- a/tests/framework/log/LoggerTest.php\\n+++ b/tests/framework/log/LoggerTest.php\\n@@ -8,6 +8,8 @@\\n \\n namespace yiiunit\\\\framework\\\\log;\\n \\n+use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n+use stdClass;\\n use yii\\\\log\\\\Dispatcher;\\n use yii\\\\log\\\\Logger;\\n use yiiunit\\\\TestCase;\\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\\n protected $logger;\\n \\n /**\\n- * @var Dispatcher|\\\\PHPUnit_Framework_MockObject_MockObject\\n+ * @var Dispatcher&MockObject\\n */\\n protected $dispatcher;\\n \\n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\\n $this->assertEquals('application', $this->logger->messages[0][2]);\\n $this->assertEquals([\\n 'file' => __FILE__,\\n- 'line' => 66,\\n+ 'line' => 68,\\n 'function' => 'log',\\n 'class' => $this->logger::class,\\n 'type' => '->',\\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\\n */\\n public function testLogWithFlush(): void\\n {\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['flush']);\\n \\n $logger->flushInterval = 1;\\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\\n */\\n public function testFlushWithoutDispatcher(): void\\n {\\n- $dispatcher = $this->getMockBuilder('\\\\stdClass')->getMock();\\n+ $dispatcher = $this->createMock(stdClass::class);\\n $dispatcher->expects($this->never())->method($this->anything());\\n \\n $this->logger->messages = ['anything'];\\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\\n $this->logger->dispatcher = $dispatcher;\\n $this->logger->flush();\\n $this->assertEmpty($this->logger->messages);\\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\\n ['duration' => 30],\\n ];\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\\n $logger->method('getProfiling')->willReturn($timings);\\n $logger->expects($this->once())\\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\\n $messages = ['anyData'];\\n $returnValue = 'return value';\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\\n 'duration' => 5,\\n ],\\n ];\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\\nindex 91659ac80cb..12ea5c77feb 100644\\n--- a/tests/framework/log/SyslogTargetTest.php\\n+++ b/tests/framework/log/SyslogTargetTest.php\\n@@ -24,7 +24,7 @@ function closelog()\\n }\\n \\n namespace yiiunit\\\\framework\\\\log {\\n- use PHPUnit_Framework_MockObject_MockObject;\\n+ use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n use yii\\\\helpers\\\\VarDumper;\\n use yii\\\\log\\\\Logger;\\n use yii\\\\log\\\\SyslogTarget;\\n@@ -34,6 +34,10 @@ function closelog()\\n * Class SyslogTargetTest.\\n *\\n * @group log\\n+ *\\n+ * @method static mixed openlog($arguments)\\n+ * @method static mixed syslog($arguments)\\n+ * @method static mixed closelog($arguments)\\n */\\n class SyslogTargetTest extends TestCase\\n {\\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\\n public static $functions = [];\\n \\n /**\\n- * @var MockObject\\n+ * @var SyslogTarget&MockObject\\n */\\n protected $syslogTarget;\\n \\n@@ -64,7 +68,7 @@ public function testExport(): void\\n {\\n $identity = 'identity string';\\n $options = LOG_ODELAY | LOG_PID;\\n- $facility = 'facility string';\\n+ $facility = LOG_USER;\\n $messages = [\\n ['info message', Logger::LEVEL_INFO],\\n ['error message', Logger::LEVEL_ERROR],\\n@@ -75,7 +79,7 @@ public function testExport(): void\\n ['profile end message', Logger::LEVEL_PROFILE_END],\\n ];\\n \\n- /** @var SyslogTarget $syslogTarget */\\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\\n ->getMock();\\n@@ -180,7 +184,7 @@ function (...$parameters) use ($matcher): void {\\n */\\n public function testFailedExport(): void\\n {\\n- /** @var SyslogTarget $syslogTarget */\\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\\n ->getMock();\\n@@ -189,7 +193,7 @@ public function testFailedExport(): void\\n \\n $syslogTarget->identity = 'identity string';\\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\\n- $syslogTarget->facility = 'facility string';\\n+ $syslogTarget->facility = LOG_USER;\\n $syslogTarget->messages = [\\n ['test', Logger::LEVEL_INFO],\\n ];\\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/log/\"\n },\n {\n \"subtask_id\": \"s25\",\n \"scope_files\": [\n \"tests/framework/mail/BaseMailerTest.php\",\n \"tests/framework/mail/BaseMessageTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\\nindex f2e6ef0a928..92713842ad7 100644\\n--- a/tests/framework/mail/BaseMailerTest.php\\n+++ b/tests/framework/mail/BaseMailerTest.php\\n@@ -11,8 +11,8 @@\\n use Yii;\\n use yii\\\\base\\\\View;\\n use yii\\\\helpers\\\\FileHelper;\\n-use yii\\\\mail\\\\BaseMailer;\\n-use yii\\\\mail\\\\BaseMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMailer;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessage;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\\n }\\n \\n /**\\n- * @return Mailer test email component instance.\\n+ * @return TestMailer test email component instance.\\n */\\n protected function createTestMailComponent()\\n {\\n- $component = new Mailer();\\n+ $component = new TestMailer();\\n $component->viewPath = $this->getTestFilePath();\\n \\n return $component;\\n }\\n \\n /**\\n- * @return Mailer mailer instance\\n+ * @return TestMailer mailer instance\\n */\\n protected function getTestMailComponent()\\n {\\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\\n \\n public function testSetupView(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n \\n $view = new View();\\n $mailer->setView($view);\\n@@ -95,14 +95,14 @@ public function testSetupView(): void\\n */\\n public function testGetDefaultView(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $view = $mailer->getView();\\n $this->assertIsObject($view, 'Unable to get default view!');\\n }\\n \\n public function testCreateMessage(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $message = $mailer->compose();\\n $this->assertIsObject($message, 'Unable to create message instance!');\\n $this->assertEquals($mailer->messageClass, $message::class, 'Invalid message class!');\\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\\n */\\n public function testDefaultMessageConfig(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n \\n $notPropertyConfig = [\\n 'charset' => 'utf-16',\\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\\n $messageConfig = [...$notPropertyConfig, ...$propertyConfig];\\n $mailer->messageConfig = $messageConfig;\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose();\\n \\n foreach ($notPropertyConfig as $name => $value) {\\n@@ -204,6 +205,7 @@ public function testCompose(): void\\n $textViewFileContent = 'Plain text view file content';\\n file_put_contents($textViewFileName, $textViewFileContent);\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose([\\n 'html' => $htmlViewName,\\n 'text' => $textViewName,\\n@@ -211,6 +213,7 @@ public function testCompose(): void\\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose($htmlViewName);\\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\\n@@ -265,6 +268,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose([\\n 'html' => $htmlViewName,\\n ]);\\n@@ -274,7 +278,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\\n \\n public function testUseFileTransport(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $this->assertFalse($mailer->useFileTransport);\\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\\n \\n@@ -294,11 +298,9 @@ public function testUseFileTransport(): void\\n \\n public function testBeforeSendEvent(): void\\n {\\n- $message = new Message();\\n-\\n- /** @var Mailer $mailerMock */\\n+ $message = new TestMessage();\\n $mailerMock = $this->createPartialMock(\\n- Mailer::class,\\n+ TestMailer::class,\\n [\\n 'afterSend',\\n 'beforeSend',\\n@@ -311,160 +313,3 @@ public function testBeforeSendEvent(): void\\n $mailerMock->send($message);\\n }\\n }\\n-\\n-/**\\n- * Test Mailer class.\\n- */\\n-class Mailer extends BaseMailer\\n-{\\n- public $messageClass = 'yiiunit\\\\framework\\\\mail\\\\Message';\\n- public $sentMessages = [];\\n-\\n- protected function sendMessage($message)\\n- {\\n- $this->sentMessages[] = $message;\\n-\\n- return true;\\n- }\\n-}\\n-\\n-/**\\n- * Test Message class.\\n- */\\n-class Message extends BaseMessage\\n-{\\n- public $id;\\n- public $encoding;\\n- public $_charset;\\n- public $_from;\\n- public $_replyTo;\\n- public $_to;\\n- public $_cc;\\n- public $_bcc;\\n- public $_subject;\\n- public $_textBody;\\n- public $_htmlBody;\\n-\\n- public function getCharset()\\n- {\\n- return $this->_charset;\\n- }\\n-\\n- public function setCharset($charset)\\n- {\\n- $this->_charset = $charset;\\n-\\n- return $this;\\n- }\\n-\\n- public function getFrom()\\n- {\\n- return $this->_from;\\n- }\\n-\\n- public function setFrom($from)\\n- {\\n- $this->_from = $from;\\n-\\n- return $this;\\n- }\\n-\\n- public function getTo()\\n- {\\n- return $this->_to;\\n- }\\n-\\n- public function setTo($to)\\n- {\\n- $this->_to = $to;\\n-\\n- return $this;\\n- }\\n-\\n- public function getCc()\\n- {\\n- return $this->_cc;\\n- }\\n-\\n- public function setCc($cc)\\n- {\\n- $this->_cc = $cc;\\n-\\n- return $this;\\n- }\\n-\\n- public function getBcc()\\n- {\\n- return $this->_bcc;\\n- }\\n-\\n- public function setBcc($bcc)\\n- {\\n- $this->_bcc = $bcc;\\n-\\n- return $this;\\n- }\\n-\\n- public function getSubject()\\n- {\\n- return $this->_subject;\\n- }\\n-\\n- public function setSubject($subject)\\n- {\\n- $this->_subject = $subject;\\n-\\n- return $this;\\n- }\\n-\\n- public function getReplyTo()\\n- {\\n- return $this->_replyTo;\\n- }\\n-\\n- public function setReplyTo($replyTo)\\n- {\\n- $this->_replyTo = $replyTo;\\n-\\n- return $this;\\n- }\\n-\\n- public function setTextBody($text)\\n- {\\n- $this->_textBody = $text;\\n-\\n- return $this;\\n- }\\n-\\n- public function setHtmlBody($html)\\n- {\\n- $this->_htmlBody = $html;\\n-\\n- return $this;\\n- }\\n-\\n- public function attachContent($content, array $options = []): void\\n- {\\n- }\\n-\\n- public function attach($fileName, array $options = []): void\\n- {\\n- }\\n-\\n- public function embed($fileName, array $options = []): void\\n- {\\n- }\\n-\\n- public function embedContent($content, array $options = []): void\\n- {\\n- }\\n-\\n- public function toString()\\n- {\\n- $mailer = $this->mailer;\\n- $this->mailer = null;\\n- $s = var_export($this, true);\\n- $this->mailer = $mailer;\\n- return $s;\\n- }\\n-}\\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\\nindex e0006d72d4e..e0b8d1ce008 100644\\n--- a/tests/framework/mail/BaseMessageTest.php\\n+++ b/tests/framework/mail/BaseMessageTest.php\\n@@ -10,8 +10,9 @@\\n \\n use Exception;\\n use Yii;\\n-use yii\\\\mail\\\\BaseMailer;\\n-use yii\\\\mail\\\\BaseMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMailer;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessageWithException;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -29,7 +30,7 @@ protected function setUp(): void\\n }\\n \\n /**\\n- * @return Mailer test email component instance.\\n+ * @return TestMailer test email component instance.\\n */\\n protected function createTestEmailComponent()\\n {\\n@@ -59,6 +60,7 @@ public function testSend(): void\\n public function testToString(): void\\n {\\n $mailer = $this->getMailer();\\n+ /** @var TestMessage $message */\\n $message = $mailer->compose();\\n $this->assertEquals($message->toString(), '' . $message);\\n }\\n@@ -73,128 +75,3 @@ public function testExceptionToString(): void\\n (string) $message;\\n }\\n }\\n-\\n-/**\\n- * Test Mailer class.\\n- */\\n-class TestMailer extends BaseMailer\\n-{\\n- public $messageClass = 'yiiunit\\\\framework\\\\mail\\\\TestMessage';\\n- public $sentMessages = [];\\n-\\n- protected function sendMessage($message)\\n- {\\n- $this->sentMessages[] = $message;\\n- }\\n-}\\n-\\n-/**\\n- * Test Message class.\\n- */\\n-class TestMessage extends BaseMessage\\n-{\\n- public $text;\\n- public $html;\\n-\\n- public function getCharset()\\n- {\\n- return '';\\n- }\\n-\\n- public function setCharset($charset): void\\n- {\\n- }\\n-\\n- public function getFrom()\\n- {\\n- return '';\\n- }\\n-\\n- public function setFrom($from): void\\n- {\\n- }\\n-\\n- public function getReplyTo()\\n- {\\n- return '';\\n- }\\n-\\n- public function setReplyTo($replyTo): void\\n- {\\n- }\\n-\\n- public function getTo()\\n- {\\n- return '';\\n- }\\n-\\n- public function setTo($to): void\\n- {\\n- }\\n-\\n- public function getCc()\\n- {\\n- return '';\\n- }\\n-\\n- public function setCc($cc): void\\n- {\\n- }\\n-\\n- public function getBcc()\\n- {\\n- return '';\\n- }\\n-\\n- public function setBcc($bcc): void\\n- {\\n- }\\n-\\n- public function getSubject()\\n- {\\n- return '';\\n- }\\n-\\n- public function setSubject($subject): void\\n- {\\n- }\\n-\\n- public function setTextBody($text): void\\n- {\\n- $this->text = $text;\\n- }\\n-\\n- public function setHtmlBody($html): void\\n- {\\n- $this->html = $html;\\n- }\\n-\\n- public function attachContent($content, array $options = []): void\\n- {\\n- }\\n-\\n- public function attach($fileName, array $options = []): void\\n- {\\n- }\\n-\\n- public function embed($fileName, array $options = []): void\\n- {\\n- }\\n-\\n- public function embedContent($content, array $options = []): void\\n- {\\n- }\\n-\\n- public function toString()\\n- {\\n- return static::class;\\n- }\\n-}\\n-\\n-class TestMessageWithException extends TestMessage\\n-{\\n- public function toString()\\n- {\\n- throw new Exception('Test exception in toString.');\\n- }\\n-}\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/mail/\"\n },\n {\n \"subtask_id\": \"s26\",\n \"scope_files\": [\n \"tests/framework/mail/stubs/TestMailer.php\",\n \"tests/framework/mail/stubs/TestMessage.php\",\n \"tests/framework/mail/stubs/TestMessageWithException.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\\nnew file mode 100644\\nindex 00000000000..4e8a1e92403\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMailer.php\\n@@ -0,0 +1,27 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use yii\\\\mail\\\\BaseMailer;\\n+\\n+/**\\n+ * Test Mailer class.\\n+ */\\n+class TestMailer extends BaseMailer\\n+{\\n+ public $messageClass = TestMessage::class;\\n+ public $sentMessages = [];\\n+\\n+ protected function sendMessage($message)\\n+ {\\n+ $this->sentMessages[] = $message;\\n+\\n+ return true;\\n+ }\\n+}\\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\\nnew file mode 100644\\nindex 00000000000..34e469045ee\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMessage.php\\n@@ -0,0 +1,152 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use yii\\\\mail\\\\BaseMessage;\\n+\\n+/**\\n+ * Test Message class.\\n+ */\\n+class TestMessage extends BaseMessage\\n+{\\n+ public $id;\\n+ public $encoding;\\n+ public $_charset;\\n+ public $_from;\\n+ public $_replyTo;\\n+ public $_to;\\n+ public $_cc;\\n+ public $_bcc;\\n+ public $_subject;\\n+ public $_textBody;\\n+ public $_htmlBody;\\n+\\n+ public function getCharset()\\n+ {\\n+ return $this->_charset;\\n+ }\\n+\\n+ public function setCharset($charset)\\n+ {\\n+ $this->_charset = $charset;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getFrom()\\n+ {\\n+ return $this->_from;\\n+ }\\n+\\n+ public function setFrom($from)\\n+ {\\n+ $this->_from = $from;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getTo()\\n+ {\\n+ return $this->_to;\\n+ }\\n+\\n+ public function setTo($to)\\n+ {\\n+ $this->_to = $to;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getCc()\\n+ {\\n+ return $this->_cc;\\n+ }\\n+\\n+ public function setCc($cc)\\n+ {\\n+ $this->_cc = $cc;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getBcc()\\n+ {\\n+ return $this->_bcc;\\n+ }\\n+\\n+ public function setBcc($bcc)\\n+ {\\n+ $this->_bcc = $bcc;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getSubject()\\n+ {\\n+ return $this->_subject;\\n+ }\\n+\\n+ public function setSubject($subject)\\n+ {\\n+ $this->_subject = $subject;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getReplyTo()\\n+ {\\n+ return $this->_replyTo;\\n+ }\\n+\\n+ public function setReplyTo($replyTo)\\n+ {\\n+ $this->_replyTo = $replyTo;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function setTextBody($text)\\n+ {\\n+ $this->_textBody = $text;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function setHtmlBody($html)\\n+ {\\n+ $this->_htmlBody = $html;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function attachContent($content, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function attach($fileName, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function embed($fileName, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function embedContent($content, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function toString()\\n+ {\\n+ $mailer = $this->mailer;\\n+ $this->mailer = null;\\n+ $s = var_export($this, true);\\n+ $this->mailer = $mailer;\\n+ return $s;\\n+ }\\n+}\\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\\nnew file mode 100644\\nindex 00000000000..60903c687f8\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\\n@@ -0,0 +1,19 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use Exception;\\n+\\n+class TestMessageWithException extends TestMessage\\n+{\\n+ public function toString()\\n+ {\\n+ throw new Exception('Test exception in toString.');\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/mail/stubs/\"\n },\n {\n \"subtask_id\": \"s27\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\",\n \"tests/framework/mutex/MutexTest.php\",\n \"tests/framework/mutex/OracleMutexTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\\nnew file mode 100644\\nindex 00000000000..324722b7585\\n--- /dev/null\\n+++ b/tests/framework/mutex/DbMutexTest.php\\n@@ -0,0 +1,73 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use Yii;\\n+use yii\\\\base\\\\InvalidConfigException;\\n+use yii\\\\db\\\\Connection;\\n+use yii\\\\mutex\\\\DbMutex;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ * @group db\\n+ */\\n+class DbMutexTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => [\\n+ 'class' => Connection::class,\\n+ 'dsn' => 'sqlite::memory:',\\n+ ],\\n+ ],\\n+ ]);\\n+ }\\n+\\n+ public function testDbPropertyDefaultValue(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\\n+ $this->assertSame(Yii::$app->db, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyAcceptsConnectionObject(): void\\n+ {\\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\\n+ $this->assertSame($connection, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyAcceptsConfigArray(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\\n+ 'db' => [\\n+ 'class' => Connection::class,\\n+ 'dsn' => 'sqlite::memory:',\\n+ ],\\n+ ]]);\\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\\n+ }\\n+\\n+ public function testThrowsExceptionForInvalidDb(): void\\n+ {\\n+ $this->expectException(InvalidConfigException::class);\\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\\n+ }\\n+}\\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\\nnew file mode 100644\\nindex 00000000000..16d7dd2ef79\\n--- /dev/null\\n+++ b/tests/framework/mutex/MutexTest.php\\n@@ -0,0 +1,79 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use yiiunit\\\\framework\\\\mutex\\\\mocks\\\\DumbMutex;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ */\\n+class MutexTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ DumbMutex::$locked = false;\\n+ }\\n+\\n+ public function testAcquireAndRelease(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->acquire('test'));\\n+ $this->assertTrue($mutex->isAcquired('test'));\\n+ $this->assertTrue($mutex->release('test'));\\n+ $this->assertFalse($mutex->isAcquired('test'));\\n+ }\\n+\\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->acquire('test'));\\n+ $this->assertFalse($mutex->acquire('test'));\\n+ $mutex->release('test');\\n+ }\\n+\\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertFalse($mutex->release('test'));\\n+ }\\n+\\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\\n+ }\\n+\\n+ public function testAutoReleaseIsEnabledByDefault(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->autoRelease);\\n+ }\\n+\\n+ public function testAutoReleaseCanBeDisabled(): void\\n+ {\\n+ $mutex = new DumbMutex(['autoRelease' => false]);\\n+ $this->assertFalse($mutex->autoRelease);\\n+ }\\n+\\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $mutex->acquire('test');\\n+\\n+ $countBefore = count($mutex->attemptsTime);\\n+ $mutex->acquire('test');\\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\\n+\\n+ $mutex->release('test');\\n+ }\\n+}\\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\\nnew file mode 100644\\nindex 00000000000..01a6ca34cc3\\n--- /dev/null\\n+++ b/tests/framework/mutex/OracleMutexTest.php\\n@@ -0,0 +1,115 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use yii\\\\base\\\\InvalidConfigException;\\n+use yii\\\\db\\\\Connection;\\n+use yii\\\\mutex\\\\OracleMutex;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ */\\n+class OracleMutexTest extends TestCase\\n+{\\n+ public function testInitSucceedsWithOciDriver(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => $db,\\n+ ],\\n+ ]);\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame($db, $mutex->db);\\n+ }\\n+\\n+ public function testInitSucceedsWithOdbcDriver(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'odbc'],\\n+ ]);\\n+\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => $db,\\n+ ],\\n+ ]);\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame($db, $mutex->db);\\n+ }\\n+\\n+ public function testDefaultProperties(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\\n+ $this->assertFalse($mutex->releaseOnCommit);\\n+ }\\n+\\n+ public function testCustomProperties(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $mutex = new OracleMutex([\\n+ 'db' => $db,\\n+ 'lockMode' => OracleMutex::MODE_NL,\\n+ 'releaseOnCommit' => true,\\n+ ]);\\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\\n+ $this->assertTrue($mutex->releaseOnCommit);\\n+ }\\n+\\n+ /**\\n+ * @dataProvider invalidDriverProvider\\n+ */\\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', $driverName],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $this->expectException(InvalidConfigException::class);\\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\\n+ new OracleMutex(['db' => $db]);\\n+ }\\n+\\n+ public static function invalidDriverProvider(): array\\n+ {\\n+ return [\\n+ 'mysql' => ['mysql'],\\n+ 'pgsql' => ['pgsql'],\\n+ 'sqlite' => ['sqlite'],\\n+ 'sqlsrv' => ['sqlsrv'],\\n+ ];\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/mutex/\"\n },\n {\n \"subtask_id\": \"s28\",\n \"scope_files\": [\n \"tests/framework/rbac/DbManagerTestCase.php\",\n \"tests/framework/rbac/ManagerTestCase.php\",\n \"tests/framework/rbac/PhpManagerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\\nindex 9014e79c1db..ba66e8a20d8 100644\\n--- a/tests/framework/rbac/DbManagerTestCase.php\\n+++ b/tests/framework/rbac/DbManagerTestCase.php\\n@@ -31,6 +31,8 @@\\n \\n /**\\n * Base class for testing {@see DbManager}.\\n+ *\\n+ * @extends ManagerTestCase<DbManager>\\n */\\n abstract class DbManagerTestCase extends ManagerTestCase\\n {\\n@@ -38,7 +40,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\\n protected static $driverName;\\n \\n /**\\n- * @var Connection\\n+ * @var Connection|null\\n */\\n protected $db;\\n \\ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\\nindex dfa7d6b992c..6570a29db04 100644\\n--- a/tests/framework/rbac/ManagerTestCase.php\\n+++ b/tests/framework/rbac/ManagerTestCase.php\\n@@ -32,16 +32,18 @@\\n \\n /**\\n * Base class for testing {@see ManagerInterface}.\\n+ *\\n+ * @template TManager of BaseManager\\n */\\n abstract class ManagerTestCase extends TestCase\\n {\\n /**\\n- * @var ManagerInterface|BaseManager\\n+ * @var TManager\\n */\\n protected $auth;\\n \\n /**\\n- * @return ManagerInterface\\n+ * @return TManager\\n */\\n abstract protected function createManager();\\n \\n@@ -176,6 +178,11 @@ public function testAddRule(): void\\n \\n $rule = $this->auth->getRule($ruleName);\\n \\n+ self::assertInstanceOf(\\n+ AuthorRule::class,\\n+ $rule,\\n+ 'Rule must round-trip as the original subclass.',\\n+ );\\n self::assertSame(\\n $ruleName,\\n $rule->name,\\n@@ -193,6 +200,12 @@ public function testUpdateRule(): void\\n \\n $rule = $this->auth->getRule('isAuthor');\\n \\n+ self::assertInstanceOf(\\n+ AuthorRule::class,\\n+ $rule,\\n+ 'Existing rule must load as the original subclass.',\\n+ );\\n+\\n $rule->name = 'newName';\\n $rule->reallyReally = false;\\n \\n@@ -207,6 +220,11 @@ public function testUpdateRule(): void\\n \\n $rule = $this->auth->getRule('newName');\\n \\n+ self::assertInstanceOf(\\n+ AuthorRule::class,\\n+ $rule,\\n+ 'Renamed rule must remain the original subclass.',\\n+ );\\n self::assertSame(\\n 'newName',\\n $rule->name,\\n@@ -223,6 +241,11 @@ public function testUpdateRule(): void\\n \\n $rule = $this->auth->getRule('newName');\\n \\n+ self::assertInstanceOf(\\n+ AuthorRule::class,\\n+ $rule,\\n+ 'Subsequent reload must keep the subclass.',\\n+ );\\n self::assertTrue(\\n $rule->reallyReally,\\n 'Subsequent property update must persist.',\\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\\nindex 42367bcb4d0..f95baad958b 100644\\n--- a/tests/framework/rbac/PhpManagerTest.php\\n+++ b/tests/framework/rbac/PhpManagerTest.php\\n@@ -18,6 +18,8 @@\\n \\n /**\\n * Unit test for {@see \\\\yii\\\\rbac\\\\PhpManager}.\\n+ *\\n+ * @extends ManagerTestCase<ExposedPhpManager>\\n */\\n #[Group('rbac')]\\n #[Group('rbac-php')]\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/rbac/\"\n },\n {\n \"subtask_id\": \"s29\",\n \"scope_files\": [\n \"tests/framework/rest/IndexActionTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\\nindex 11919269e50..077fd71a147 100644\\n--- a/tests/framework/rest/IndexActionTest.php\\n+++ b/tests/framework/rest/IndexActionTest.php\\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\\n /**\\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\\n *\\n- * @param string $sql\\n- * @param array $params\\n- * @param string $expectedRawSql\\n+ * @param Pagination|array|false $pagination\\n+ * @param Sort|array|false $sort\\n+ * @param int|null $expectedPaginationPageSize\\n+ * @param int|null $expectedPaginationDefaultPageSize\\n+ * @param array $expectedSortOrders\\n+ * @param array|null $expectedSortDefaultOrder\\n */\\n public function testPrepareDataProviderWithPaginationAndSorting(\\n Pagination|bool|array $pagination,\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/rest/\"\n },\n {\n \"subtask_id\": \"s30\",\n \"scope_files\": [\n \"tests/framework/test/ActiveFixtureTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\\nindex bdb1b0bfc82..f5ea8564de0 100644\\n--- a/tests/framework/test/ActiveFixtureTest.php\\n+++ b/tests/framework/test/ActiveFixtureTest.php\\n@@ -43,7 +43,11 @@ public function testGetData(): void\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n \\n- $this->assertEquals(CustomerFixture::class, $fixture !== null ? $fixture::class : self::class);\\n+ self::assertInstanceOf(\\n+ CustomerFixture::class,\\n+ $fixture,\\n+ 'Customer fixture must be registered.',\\n+ );\\n $this->assertCount(2, $fixture);\\n $this->assertEquals(1, $fixture['customer1']['id']);\\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\\n@@ -62,13 +66,28 @@ public function testGetModel(): void\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n \\n- $this->assertEquals(Customer::class, $fixture->getModel('customer1')::class);\\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\\n+ self::assertInstanceOf(\\n+ CustomerFixture::class,\\n+ $fixture,\\n+ 'Customer fixture must be registered.',\\n+ );\\n+\\n+ $customer1 = $fixture->getModel('customer1');\\n+\\n+ self::assertInstanceOf(\\n+ Customer::class,\\n+ $customer1,\\n+ 'Customer model must be resolved by key.',\\n+ );\\n+\\n+ $this->assertEquals(1, $customer1->id);\\n+ $this->assertEquals('customer1@example.com', $customer1->email);\\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\\n \\n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\\n+ $customer2 = $fixture->getModel('customer2');\\n+ $this->assertInstanceOf(Customer::class, $customer2);\\n+ $this->assertEquals(2, $customer2->id);\\n+ $this->assertEquals('customer2@example.com', $customer2->email);\\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\\n \\n $test->tearDown();\\n@@ -80,8 +99,10 @@ public function testDataDirectory(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n- $directory = $fixture->getModel('directory');\\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\\n \\n+ $directory = $fixture->getModel('directory');\\n+ $this->assertInstanceOf(Customer::class, $directory);\\n $this->assertEquals(1, $directory->id);\\n $this->assertEquals('directory@example.com', $directory['email']);\\n $test->tearDown();\\n@@ -93,8 +114,10 @@ public function testDataPath(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n- $customer = $fixture->getModel('customer1');\\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\\n \\n+ $customer = $fixture->getModel('customer1');\\n+ $this->assertInstanceOf(Customer::class, $customer);\\n $this->assertEquals(1, $customer->id);\\n $this->assertEquals('customer1@example.com', $customer['email']);\\n $test->tearDown();\\n@@ -106,6 +129,7 @@ public function testTruncate(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('animals');\\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\\n $this->assertEmpty($fixture->data);\\n $test->tearDown();\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/test/\"\n },\n {\n \"subtask_id\": \"s31\",\n \"scope_files\": [\n \"tests/framework/validators/FileValidatorTest.php\",\n \"tests/framework/validators/FilterValidatorTest.php\",\n \"tests/framework/validators/RequiredValidatorTest.php\",\n \"tests/framework/validators/SafeValidatorTest.php\",\n \"tests/framework/validators/TrimValidatorTest.php\",\n \"tests/framework/validators/ValidatorTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\\nindex 2071a7a5387..789a1183405 100644\\n--- a/tests/framework/validators/FileValidatorTest.php\\n+++ b/tests/framework/validators/FileValidatorTest.php\\n@@ -353,7 +353,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\\n \\n /**\\n * @param array $params\\n- * @return UploadedFile[]\\n+ * @return UploadedFile|UploadedFile[]\\n */\\n protected function createTestFiles($params = [])\\n {\\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\\nindex 9635b9dc1b7..bec0aca3686 100644\\n--- a/tests/framework/validators/FilterValidatorTest.php\\n+++ b/tests/framework/validators/FilterValidatorTest.php\\n@@ -10,8 +10,8 @@\\n \\n use yii\\\\validators\\\\FilterValidator;\\n use yii\\\\validators\\\\Validator;\\n-use yii\\\\web\\\\View;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -87,7 +87,10 @@ public function testClientValidateAttributeReturnsNullWithoutClientScript(): voi\\n {\\n $val = new FilterValidator(['filter' => 'trim']);\\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\\n+ $this->assertNull(\\n+ $val->clientValidateAttribute($m, 'attr_one', new ViewStub()),\\n+ 'No `ClientValidatorScriptInterface` binding must yield `null`.',\\n+ );\\n }\\n \\n public function testGetClientOptionsDefault(): void\\n@@ -106,10 +109,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\\n $this->assertSame(1, $options['skipOnEmpty']);\\n }\\n }\\n-\\n-class FilterViewStub extends View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\\nindex aef333849a9..06553221616 100644\\n--- a/tests/framework/validators/RequiredValidatorTest.php\\n+++ b/tests/framework/validators/RequiredValidatorTest.php\\n@@ -10,7 +10,6 @@\\n \\n namespace yiiunit\\\\framework\\\\validators;\\n \\n-use yii\\\\base\\\\Model;\\n use yii\\\\validators\\\\RequiredValidator;\\n use yii\\\\validators\\\\Validator;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n@@ -159,20 +158,3 @@ public function testErrorMessageWithoutRequiredValueShowsBlank(): void\\n $this->assertStringNotContainsString('{requiredValue}', $errors[0]);\\n }\\n }\\n-\\n-class ModelForReqValidator extends Model\\n-{\\n- public $attr;\\n-\\n- public function rules()\\n- {\\n- return [\\n- [['attr'], 'required'],\\n- ];\\n- }\\n-\\n- public function attributeLabels()\\n- {\\n- return ['attr' => '<b>Attr</b>'];\\n- }\\n-}\\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\\nindex 079cda410a7..c4eafa9243c 100644\\n--- a/tests/framework/validators/SafeValidatorTest.php\\n+++ b/tests/framework/validators/SafeValidatorTest.php\\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n $this->assertFalse($model->hasErrors('name'));\\n }\\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\\n \\n $validator->validateAttributes($model, ['name', 'email']);\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n- $this->assertNull($model->email);\\n+ $this->assertNull($model['email']);\\n $this->assertFalse($model->hasErrors());\\n }\\n \\n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\\n \\n $validator->validateAttribute($model, 'field');\\n \\n- $this->assertNull($model->field);\\n+ $this->assertNull($model['field']);\\n $this->assertFalse($model->hasErrors('field'));\\n }\\n \\n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\\n \\n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\\n \\n+ $this->assertTrue(isset($model->username));\\n $this->assertSame('admin', $model->username);\\n- $this->assertNull($model->role);\\n+ $this->assertNull($model['role']);\\n }\\n \\n public function testValidationAlwaysPasses(): void\\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\\n $validator->validateAttribute($model, 'attr');\\n \\n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\\n- $this->assertSame($value, $model->attr);\\n+ $this->assertSame($value, $model['attr']);\\n }\\n }\\n }\\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\\nindex 83fef90d20c..1739ca5646e 100644\\n--- a/tests/framework/validators/TrimValidatorTest.php\\n+++ b/tests/framework/validators/TrimValidatorTest.php\\n@@ -38,6 +38,7 @@ public function testTrimWhitespace(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -48,6 +49,7 @@ public function testTrimTabs(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -59,6 +61,7 @@ public function testTrimCustomChars(): void\\n \\n $validator->validateAttribute($model, 'path');\\n \\n+ $this->assertTrue(isset($model->path));\\n $this->assertSame('hello', $model->path);\\n }\\n \\n@@ -69,6 +72,7 @@ public function testTrimEmptyString(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -79,6 +83,7 @@ public function testTrimNullValue(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -89,6 +94,7 @@ public function testTrimIntegerValue(): void\\n \\n $validator->validateAttribute($model, 'count');\\n \\n+ $this->assertTrue(isset($model->count));\\n $this->assertSame('42', $model->count);\\n }\\n \\n@@ -99,6 +105,7 @@ public function testTrimArray(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame(['foo', 'bar'], $model->tags);\\n }\\n \\n@@ -111,6 +118,7 @@ public function testSkipOnArrayTrue(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame($original, $model->tags);\\n }\\n \\n@@ -122,6 +130,7 @@ public function testSkipOnArrayTrueWithScalar(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -139,6 +148,7 @@ public function testTrimBooleanValue(): void\\n \\n $validator->validateAttribute($model, 'flag');\\n \\n+ $this->assertTrue(isset($model->flag));\\n $this->assertSame('1', $model->flag);\\n }\\n \\n@@ -149,6 +159,7 @@ public function testTrimWithModelRules(): void\\n \\n $model->validate();\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n $this->assertFalse($model->hasErrors());\\n }\\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\\nindex 8b466f018f0..2ec03928235 100644\\n--- a/tests/framework/validators/ValidatorTest.php\\n+++ b/tests/framework/validators/ValidatorTest.php\\n@@ -257,6 +257,8 @@ public function testClientValidateAttribute(): void\\n \\n $model = new FakedValidationModel();\\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\\n+ $this->assertInstanceOf(InlineValidator::class, $val);\\n+\\n $val->clientValidate = 'clientInlineVal';\\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\\n \\n\",\n \"summary\": \"Edited 6 file(s) in tests/framework/validators/\"\n },\n {\n \"subtask_id\": \"s32\",\n \"scope_files\": [\n \"tests/framework/validators/stubs/ModelForReqValidator.php\",\n \"tests/framework/validators/stubs/ViewStub.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\\nnew file mode 100644\\nindex 00000000000..3d4654c80ed\\n--- /dev/null\\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\\n@@ -0,0 +1,28 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\validators\\\\stubs;\\n+\\n+use yii\\\\base\\\\Model;\\n+\\n+class ModelForReqValidator extends Model\\n+{\\n+ public $attr;\\n+\\n+ public function rules()\\n+ {\\n+ return [\\n+ [['attr'], 'required'],\\n+ ];\\n+ }\\n+\\n+ public function attributeLabels()\\n+ {\\n+ return ['attr' => '<b>Attr</b>'];\\n+ }\\n+}\\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\\nnew file mode 100644\\nindex 00000000000..a6a957ac910\\n--- /dev/null\\n+++ b/tests/framework/validators/stubs/ViewStub.php\\n@@ -0,0 +1,18 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\validators\\\\stubs;\\n+\\n+use yii\\\\web\\\\View;\\n+\\n+class ViewStub extends View\\n+{\\n+ public function registerAssetBundle($name, $position = null)\\n+ {\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/validators/stubs/\"\n },\n {\n \"subtask_id\": \"s33\",\n \"scope_files\": [\n \"tests/framework/web/ControllerTest.php\",\n \"tests/framework/web/ErrorActionTest.php\",\n \"tests/framework/web/ErrorHandlerTest.php\",\n \"tests/framework/web/GroupUrlRuleTest.php\",\n \"tests/framework/web/JsonResponseFormatterTest.php\",\n \"tests/framework/web/MultipartFormDataParserTest.php\",\n \"tests/framework/web/UploadedFileTest.php\",\n \"tests/framework/web/UserIdentity.php\",\n \"tests/framework/web/UserTest.php\",\n \"tests/framework/web/XmlResponseFormatterTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\\nindex 471b9c7b229..09d06635607 100644\\n--- a/tests/framework/web/ControllerTest.php\\n+++ b/tests/framework/web/ControllerTest.php\\n@@ -12,10 +12,10 @@\\n \\n use PHPUnit\\\\Framework\\\\Attributes\\\\Group;\\n use yii\\\\web\\\\Application;\\n-use yiiunit\\\\framework\\\\web\\\\FakeController;\\n-use yiiunit\\\\framework\\\\web\\\\FakeInjectionController;\\n-use yiiunit\\\\framework\\\\web\\\\FakeTypedParamsController;\\n use yiiunit\\\\framework\\\\web\\\\FakeUnionTypesController;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakeController;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakeInjectionController;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakeTypedParamsController;\\n use yiiunit\\\\framework\\\\web\\\\stubs\\\\ModelBindingStub;\\n use yii\\\\base\\\\Module;\\n use yii\\\\data\\\\ArrayDataProvider;\\n@@ -23,6 +23,7 @@\\n use Yii;\\n use yii\\\\base\\\\InlineAction;\\n use yii\\\\web\\\\BadRequestHttpException;\\n+use yii\\\\web\\\\Controller;\\n use yii\\\\web\\\\NotFoundHttpException;\\n use yii\\\\web\\\\Response;\\n use yii\\\\web\\\\ServerErrorHttpException;\\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\\nindex f36761369f2..6a492a18b8f 100644\\n--- a/tests/framework/web/ErrorActionTest.php\\n+++ b/tests/framework/web/ErrorActionTest.php\\n@@ -113,13 +113,12 @@ public function testDefaultView(): void\\n \\n public function testLayout(): void\\n {\\n+ $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\');\\n $this->expectException(\\\\yii\\\\base\\\\ViewNotFoundException::class);\\n+ $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\\n \\n $this->getController([\\n 'layout' => 'non-existing',\\n ])->runAction('error');\\n-\\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\');\\n- $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\\n }\\n }\\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\\nindex 41d067957b8..aed6802c83b 100644\\n--- a/tests/framework/web/ErrorHandlerTest.php\\n+++ b/tests/framework/web/ErrorHandlerTest.php\\n@@ -58,7 +58,7 @@ public function testCorrectResponseCodeInErrorView(): void\\n \\n public function testFormatRaw(): void\\n {\\n- Yii::$app->response->format = yii\\\\web\\\\Response::FORMAT_RAW;\\n+ Yii::$app->response->format = \\\\yii\\\\web\\\\Response::FORMAT_RAW;\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n@@ -78,7 +78,7 @@ public function testFormatRaw(): void\\n \\n public function testFormatXml(): void\\n {\\n- Yii::$app->response->format = yii\\\\web\\\\Response::FORMAT_XML;\\n+ Yii::$app->response->format = \\\\yii\\\\web\\\\Response::FORMAT_XML;\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n@@ -104,7 +104,9 @@ public function testFormatXml(): void\\n \\n public function testClearAssetFilesInErrorView(): void\\n {\\n- Yii::$app->getView()->registerJsFile('somefile.js');\\n+ $view = Yii::$app->getView();\\n+ $this->assertInstanceOf(View::class, $view);\\n+ $view->registerJsFile('somefile.js');\\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n ob_start(); // suppress response output\\n@@ -117,7 +119,10 @@ public function testClearAssetFilesInErrorView(): void\\n public function testClearAssetFilesInErrorActionView(): void\\n {\\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\\n- Yii::$app->getView()->registerJs(\\\"alert('hide me')\\\", View::POS_END);\\n+\\n+ $view = Yii::$app->getView();\\n+ $this->assertInstanceOf(View::class, $view);\\n+ $view->registerJs(\\\"alert('hide me')\\\", View::POS_END);\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n@@ -280,6 +285,28 @@ public function testHtmlEncodeWithUnicodeSequence(): void\\n \\n $this->assertSame($expected, $handler->htmlEncode($text));\\n }\\n+\\n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\\n+ {\\n+ $viewFile = tempnam(sys_get_temp_dir(), 'yii2-error-view-');\\n+ $secretFile = tempnam(sys_get_temp_dir(), 'yii2-error-secret-');\\n+\\n+ file_put_contents($viewFile, '<?php echo \\\"safe error view\\\";');\\n+ file_put_contents($secretFile, 'secret data');\\n+\\n+ try {\\n+ /** @var ErrorHandler $handler */\\n+ $handler = Yii::$app->getErrorHandler();\\n+\\n+ $this->assertSame(\\n+ 'safe error view',\\n+ $handler->renderFileForException($viewFile, ['_file_' => $secretFile], new ErrorException('test'))\\n+ );\\n+ } finally {\\n+ @unlink($viewFile);\\n+ @unlink($secretFile);\\n+ }\\n+ }\\n }\\n \\n class ErrorHandler extends \\\\yii\\\\web\\\\ErrorHandler\\n@@ -291,4 +318,11 @@ protected function shouldRenderSimpleHtml()\\n {\\n return false;\\n }\\n+\\n+ public function renderFileForException($file, array $params, \\\\Throwable $exception): string\\n+ {\\n+ $this->exception = $exception;\\n+\\n+ return $this->renderFile($file, $params);\\n+ }\\n }\\ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\\nindex f97d639f04e..fee4ea9653a 100644\\n--- a/tests/framework/web/GroupUrlRuleTest.php\\n+++ b/tests/framework/web/GroupUrlRuleTest.php\\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertNull($rules->rules[0]->verb);\\n \\n $config = [\\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(1, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(1, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(2, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertContains('GET', $rules->rules[0]->verb);\\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\\nindex 6f3022195f3..ef015dc1f4a 100644\\n--- a/tests/framework/web/JsonResponseFormatterTest.php\\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\\n@@ -19,12 +19,11 @@\\n * @since 2.0.3\\n *\\n * @group web\\n+ *\\n+ * @extends BaseFormatter<JsonResponseFormatter>\\n */\\n class JsonResponseFormatterTest extends BaseFormatter\\n {\\n- /**\\n- * @return JsonResponseFormatter\\n- */\\n protected function getFormatterInstance($configuration = [])\\n {\\n return new JsonResponseFormatter($configuration);\\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\\nindex 1aa7d33a0ce..68d0f6ce620 100644\\n--- a/tests/framework/web/MultipartFormDataParserTest.php\\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\\n@@ -192,6 +192,7 @@ public function testForce(): void\\n $_POST = [\\n 'existingName' => 'value',\\n ];\\n+ /** @var array<string, mixed> $_FILES */\\n $_FILES = [\\n 'existingFile' => [\\n 'name' => 'file.txt',\\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\\nindex f37f070a7a9..f2588b88ee5 100644\\n--- a/tests/framework/web/UploadedFileTest.php\\n+++ b/tests/framework/web/UploadedFileTest.php\\n@@ -101,6 +101,7 @@ public function testSaveAs(): void\\n \\n public function testSaveFileFromMultipartFormDataParser(): void\\n {\\n+ /** @var array<string, mixed> $_FILES */\\n $_FILES = [];\\n UploadedFile::reset();\\n $model = new ModelStub();\\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\\nindex a5c23e48b1f..5cae21fd03f 100644\\n--- a/tests/framework/web/UserIdentity.php\\n+++ b/tests/framework/web/UserIdentity.php\\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\\n \\n public static function findIdentity($id)\\n {\\n- if (in_array($id, static::$ids)) {\\n+ if (in_array($id, self::$ids)) {\\n $identitiy = new static();\\n $identitiy->_id = $id;\\n return $identitiy;\\n }\\n+\\n+ return null;\\n }\\n \\n public static function findIdentityByAccessToken($token, $type = null): never\\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\\nindex de77673bb56..382f6f56e42 100644\\n--- a/tests/framework/web/UserTest.php\\n+++ b/tests/framework/web/UserTest.php\\n@@ -14,7 +14,7 @@\\n */\\n function time()\\n {\\n- return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?: \\\\time();\\n+ return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?? \\\\time();\\n }\\n \\n namespace yiiunit\\\\framework\\\\web;\\n@@ -34,7 +34,7 @@ function time()\\n class UserTest extends TestCase\\n {\\n /**\\n- * @var int virtual time to be returned by mocked time() function.\\n+ * @var int|null virtual time to be returned by mocked time() function.\\n * Null means normal time() behavior.\\n */\\n public static $time;\\n@@ -593,9 +593,9 @@ public function getCookies()\\n \\n class AccessChecker extends BaseObject implements CheckAccessInterface\\n {\\n- public function checkAccess($userId, $permissionName, $params = []): void\\n+ public function checkAccess($userId, $permissionName, $params = []): bool\\n {\\n- // Implement checkAccess() method.\\n+ return false;\\n }\\n }\\n \\ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\\nindex 77e2cc4d657..5957d0237a9 100644\\n--- a/tests/framework/web/XmlResponseFormatterTest.php\\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\\n@@ -18,12 +18,13 @@\\n * @since 2.0\\n *\\n * @group web\\n+ *\\n+ * @extends BaseFormatter<XmlResponseFormatter>\\n */\\n class XmlResponseFormatterTest extends BaseFormatter\\n {\\n /**\\n * @param array $options\\n- * @return XmlResponseFormatter\\n */\\n protected function getFormatterInstance($options = [])\\n {\\n\",\n \"summary\": \"Edited 10 file(s) in tests/framework/web/\"\n },\n {\n \"subtask_id\": \"s34\",\n \"scope_files\": [\n \"tests/framework/web/stubs/FakeController.php\",\n \"tests/framework/web/stubs/FakeInjectionController.php\",\n \"tests/framework/web/stubs/FakeTypedParamsController.php\",\n \"tests/framework/web/stubs/ModelBindingStub.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\\nsimilarity index 91%\\nrename from tests/framework/web/FakeController.php\\nrename to tests/framework/web/stubs/FakeController.php\\nindex e4b95a9e4c3..b72c2651de6 100644\\n--- a/tests/framework/web/FakeController.php\\n+++ b/tests/framework/web/stubs/FakeController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\web\\\\Controller;\\n \\ndiff --git a/tests/framework/web/FakeInjectionController.php b/tests/framework/web/stubs/FakeInjectionController.php\\nsimilarity index 87%\\nrename from tests/framework/web/FakeInjectionController.php\\nrename to tests/framework/web/stubs/FakeInjectionController.php\\nindex 8f21ea652b9..c6b36ea9a6f 100644\\n--- a/tests/framework/web/FakeInjectionController.php\\n+++ b/tests/framework/web/stubs/FakeInjectionController.php\\n@@ -6,13 +6,12 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\data\\\\DataProviderInterface;\\n use yii\\\\web\\\\Controller;\\n use yii\\\\web\\\\Request;\\n-use yiiunit\\\\framework\\\\web\\\\stubs\\\\VendorImage;\\n-use yiiunit\\\\framework\\\\web\\\\stubs\\\\ModelBindingStub;\\n+use yiiunit\\\\framework\\\\web\\\\Post;\\n \\n /**\\n * @author Sam Mousa<sam@mousa.nl>\\ndiff --git a/tests/framework/web/FakeTypedParamsController.php b/tests/framework/web/stubs/FakeTypedParamsController.php\\nsimilarity index 95%\\nrename from tests/framework/web/FakeTypedParamsController.php\\nrename to tests/framework/web/stubs/FakeTypedParamsController.php\\nindex 815319c5073..1142b654b0a 100644\\n--- a/tests/framework/web/FakeTypedParamsController.php\\n+++ b/tests/framework/web/stubs/FakeTypedParamsController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\web\\\\Controller;\\n \\ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\\nindex 39cd37dbdc0..395999f08fd 100644\\n--- a/tests/framework/web/stubs/ModelBindingStub.php\\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\\n@@ -8,8 +8,8 @@\\n class ModelBindingStub extends ActiveRecord\\n {\\n /**\\n- * @return self;\\n- * @throw NotFoundHttpException\\n+ * @return self\\n+ * @throws NotFoundHttpException\\n */\\n public static function build(): never\\n {\\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/web/stubs/\"\n },\n {\n \"subtask_id\": \"s35\",\n \"scope_files\": [\n \"tests/framework/widgets/ActiveFieldTest.php\",\n \"tests/framework/widgets/ActiveFormTest.php\",\n \"tests/framework/widgets/DetailViewTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\\nindex 0bc1ffe0441..a5db934eab3 100644\\n--- a/tests/framework/widgets/ActiveFieldTest.php\\n+++ b/tests/framework/widgets/ActiveFieldTest.php\\n@@ -1512,6 +1512,8 @@ public function attributeHints()\\n \\n /**\\n * Helper Classes.\\n+ *\\n+ * @property ActiveFieldTestModel $model\\n */\\n class ActiveFieldExtend extends ActiveField\\n {\\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\\nindex 8e77db7332b..07c4da70fcc 100644\\n--- a/tests/framework/widgets/ActiveFormTest.php\\n+++ b/tests/framework/widgets/ActiveFormTest.php\\n@@ -114,6 +114,7 @@ public function testIssue5356(): void\\n \\n $model->categories = 1;\\n \\n+\\n ob_start();\\n $form = ActiveForm::begin(\\n [\\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\\nindex 6a6a2adf11e..a928e466910 100644\\n--- a/tests/framework/widgets/DetailViewTest.php\\n+++ b/tests/framework/widgets/DetailViewTest.php\\n@@ -19,9 +19,6 @@\\n */\\n class DetailViewTest extends TestCase\\n {\\n- /** @var DetailView */\\n- public $detailView;\\n-\\n protected function setUp(): void\\n {\\n parent::setUp();\\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -58,11 +55,11 @@ public function testAttributeValue(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -75,7 +72,7 @@ public function testUnicodeAttributeNames(): void\\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -86,11 +83,11 @@ public function testUnicodeAttributeNames(): void\\n \\n $this->assertEquals(\\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\\n );\\n $this->assertEquals(\\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\\n );\\n }\\n \\n@@ -99,7 +96,7 @@ public function testAttributeVisible(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -161,7 +158,7 @@ public function testAttributeVisible(): void\\n 'value' => 'Displayed id',\\n 'visible' => true,\\n ],\\n- ], $this->detailView->attributes);\\n+ ], $detailView->attributes);\\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -172,7 +169,7 @@ public function testRelationAttribute(): void\\n $model->related = new ModelMock();\\n $model->related->id = 'related';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -181,13 +178,13 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\\n \\n // test null relation\\n $model->related = null;\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -196,8 +193,8 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\\n }\\n \\n public function testArrayableModel(): void\\n@@ -221,11 +218,11 @@ public function testArrayableModel(): void\\n $model->id = 1;\\n $model->text = 'I`m arrayable';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testObjectModel(): void\\n@@ -249,11 +246,11 @@ public function testObjectModel(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testArrayModel(): void\\n@@ -278,18 +275,18 @@ public function testArrayModel(): void\\n 'text' => 'I`m an array',\\n ];\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testOptionsTags(): void\\n {\\n $expectedValue = '<tr><th tooltip=\\\"Tooltip\\\">Text</th><td class=\\\"bg-red\\\">I`m an array</td></tr>';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => [\\n 'text' => 'I`m an array',\\n ],\\n@@ -303,9 +300,9 @@ public function testOptionsTags(): void\\n ],\\n ]);\\n \\n- foreach ($this->detailView->attributes as $index => $attribute) {\\n- $a = $this->detailView->renderAttribute($attribute, $index);\\n- $this->assertEquals($expectedValue, $a);\\n+ foreach ($detailView->attributes as $index => $attribute) {\\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\\n+ $this->assertEquals($expectedValue, $renderingResult);\\n }\\n }\\n \\n@@ -319,7 +316,7 @@ public function testShouldTriggerInitEvent(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n 'on init' => function () use (&$initTriggered): void {\\n $initTriggered = true;\\n@@ -344,6 +341,8 @@ class ArrayableMock implements Arrayable\\n \\n /**\\n * Helper Class.\\n+ *\\n+ * @property mixed $related\\n */\\n class ModelMock extends Model\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/widgets/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s19","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Harden savepoint test cleanup to avoid state leakage on failure.**\n\nThis test only deletes inserted data on the happy path. If an assertion/DB call fails earlier, rows can leak and destabilize later tests.\n\n \n<details>\n<summary>Proposed fix</summary>\n\n```diff\n public function testSavepointOperations(): void\n {\n $db = $this->getConnection(true, true);\n- $db->beginTransaction();\n- $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n- $db->getSchema()->createSavepoint('sp1');\n- $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n- $db->getSchema()->rollBackSavepoint('sp1');\n- $db->transaction->commit();\n-\n- $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n- $this->assertSame(0, $afterCount);\n- $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n- $this->assertSame(1, $beforeCount);\n-\n- $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ $token = 'sp_test_' . uniqid('', true);\n+ $afterToken = $token . '_after';\n+ try {\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('{$token}')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('{$afterToken}')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$afterToken}'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$token}'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+ } finally {\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] IN ('{$token}', '{$afterToken}')\")->execute();\n+ }\n }\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n public function testSavepointOperations(): void\n {\n $db = $this->getConnection(true, true);\n $token = 'sp_test_' . uniqid('', true);\n $afterToken = $token . '_after';\n try {\n $db->beginTransaction();\n $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('{$token}')\")->execute();\n $db->getSchema()->createSavepoint('sp1');\n $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('{$afterToken}')\")->execute();\n $db->getSchema()->rollBackSavepoint('sp1');\n $db->transaction->commit();\n\n $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$afterToken}'\")->queryScalar();\n $this->assertSame(0, $afterCount);\n $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$token}'\")->queryScalar();\n $this->assertSame(1, $beforeCount);\n } finally {\n $db->createCommand(\"DELETE FROM [profile] WHERE [description] IN ('{$token}', '{$afterToken}')\")->execute();\n }\n }\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[warning] 282-282: Avoid variables with short names like $db. Configured minimum length is 3. (undefined)\n\n(ShortVariable)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/mssql/SchemaTest.php` around lines 280 - 296, The\ntestSavepointOperations test can leak rows if an assertion fails; wrap the\ntransactional operations in a try/finally so cleanup always runs:\nbeginTransaction()/createSavepoint()/rollBackSavepoint()/commit should remain\ninside the try block, and in finally ensure the transaction is not left open\n(rollback if still active) and always execute DELETE statements to remove any\nrows with descriptions 'sp_test' or 'sp_test_after' (use the same\n$db->createCommand(...) DELETE calls), guaranteeing cleanup regardless of\nfailures.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex b847556b70b..71f1b10c545 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,8 +10,10 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Connection;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\n"},{"subtask_id":"s19","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Use isolated PK values and guaranteed cleanup in composite PK insert test.**\n\nFixed PK values (`id=100`, `department_id=1`) can collide with pre-existing/leaked data, causing non-deterministic failures.\n\n \n<details>\n<summary>Proposed fix</summary>\n\n```diff\n public function testInsertWithCompositePrimaryKey(): void\n {\n $db = $this->getConnection(true, true);\n- $result = $db->getSchema()->insert('employee', [\n- 'id' => 100,\n- 'department_id' => 1,\n- 'first_name' => 'Test',\n- 'last_name' => 'User',\n- ]);\n- $this->assertSame('100', $result['id']);\n- $this->assertSame('1', $result['department_id']);\n-\n- $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ $id = 100000 + random_int(1, 100000);\n+ $departmentId = 1;\n+ try {\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => $id,\n+ 'department_id' => $departmentId,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame((string)$id, $result['id']);\n+ $this->assertSame((string)$departmentId, $result['department_id']);\n+ } finally {\n+ $db->createCommand(\"DELETE FROM [employee] WHERE [id] = {$id} AND [department_id] = {$departmentId}\")->execute();\n+ }\n }\n```\n</details>\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[warning] 346-346: Avoid variables with short names like $db. Configured minimum length is 3. (undefined)\n\n(ShortVariable)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/db/mssql/SchemaTest.php` around lines 344 - 357, The\ntestInsertWithCompositePrimaryKey uses fixed PKs (id=100, department_id=1) which\ncan collide with existing data; update testInsertWithCompositePrimaryKey to\ngenerate unique PK values (e.g., use uniqid(), random_int() or a timestamp-based\nvalue) for 'id' and/or 'department_id', perform the insert via\n$db->getSchema()->insert, assert the returned PKs match the generated values,\nand ensure deterministic cleanup by deleting the row inside a try/finally (or\nwrapping insert/assert in try and calling $db->createCommand('DELETE FROM\n[employee] ...')->execute() in finally) so the test always removes the inserted\ncomposite key even on failure.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex b847556b70b..71f1b10c545 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,8 +10,10 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Connection;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\n"},{"subtask_id":"s29","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Type mismatch between docblock and method signature.**\n\nThe docblock now specifies `false` for `$pagination` and `$sort` parameters, but the method signature on lines 83-84 uses `bool`. This inconsistency can confuse static analysis tools and developers.\n\nSince the test logic strictly checks for `false` (lines 116, 123) and the data provider only passes `false` (line 188), the more accurate type is `false` rather than `bool`.\n\nConsider updating the method signature to match the docblock:\n\n<details>\n<summary>๐ง Align method signature with docblock</summary>\n\n```diff\n public function testPrepareDataProviderWithPaginationAndSorting(\n- Pagination|bool|array $pagination,\n- Sort|bool|array $sort,\n+ Pagination|array|false $pagination,\n+ Sort|array|false $sort,\n int|null $expectedPaginationPageSize = null,\n```\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/rest/IndexActionTest.php` around lines 75 - 76, The test\nmethod in IndexActionTest that currently declares parameters as bool $pagination\nand bool $sort should be updated to match the docblock (Pagination|array|false)\nand the test data: remove the bool type hints (leave the parameters untyped,\ne.g. $pagination = false, $sort = false) so the method accepts false values used\nin the assertions and data provider; locate the method in IndexActionTest (the\none with parameters $pagination and $sort around the current signature) and\nchange its signature to drop the bool type declarations.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:puma -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex 11919269e50..077fd71a147 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n Pagination|bool|array $pagination,\n"},{"subtask_id":"s33","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Rename short variable to satisfy PHPMD rule.**\n\nLine 116 uses `$ds`, which violates the configured minimum variable-name length and may fail static checks. Rename it to a descriptive name (for example `$dirSeparatorPattern`) and update Line 118 accordingly.\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[warning] 116-116: Avoid variables with short names like $ds. Configured minimum length is 3. (undefined)\n\n(ShortVariable)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/web/ErrorActionTest.php` around lines 116 - 118, Rename the\nshort variable $ds to a longer descriptive name (e.g. $dirSeparatorPattern)\nwhere it's set via preg_quote(DIRECTORY_SEPARATOR, '\\\\') and update the\nsubsequent expectExceptionMessageMatches call to use the new variable name;\nensure the concatenation inside expectExceptionMessageMatches still constructs\nthe same regex ('views' . $dirSeparatorPattern . 'layouts' .\n$dirSeparatorPattern . 'non-existing.php') and run PHPMD to verify the naming\nrule is satisfied.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\nindex f36761369f2..6a492a18b8f 100644\n--- a/tests/framework/web/ErrorActionTest.php\n+++ b/tests/framework/web/ErrorActionTest.php\n@@ -113,13 +113,12 @@ public function testDefaultView(): void\n \n public function testLayout(): void\n {\n+ $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n $this->expectException(\\yii\\base\\ViewNotFoundException::class);\n+ $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n \n $this->getController([\n 'layout' => 'non-existing',\n ])->runAction('error');\n-\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n- $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n }\n }\n"},{"subtask_id":"s34","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Fix conflicting return PHPDoc for a `never` method.**\n\nLine 11 declares `@return self`, but `build()` is typed as `never` and always throws. This docblock is inconsistent and should be removed or changed to `@return never`.\n\n \n\n<details>\n<summary>Suggested patch</summary>\n\n```diff\n- /**\n- * `@return` self\n- * `@throws` NotFoundHttpException\n- */\n+ /**\n+ * `@throws` NotFoundHttpException\n+ */\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n /**\n * `@throws` NotFoundHttpException\n */\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/web/stubs/ModelBindingStub.php` around lines 11 - 12, The\nPHPDoc for build() is inconsistent: it declares \"@return self\" while the method\nsignature and behavior are never (always throwing); update the docblock for the\nbuild() method in ModelBindingStub to reflect that it never returns by either\nremoving the \"@return\" line or changing it to \"@return never\", and ensure the\n`@throws` NotFoundHttpException (or other thrown exception) remains accurate so\nthe docblock matches the never-typed build() implementation.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 39cd37dbdc0..395999f08fd 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build(): never\n {\n"}],"string":"[\n {\n \"subtask_id\": \"s19\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Harden savepoint test cleanup to avoid state leakage on failure.**\\n\\nThis test only deletes inserted data on the happy path. If an assertion/DB call fails earlier, rows can leak and destabilize later tests.\\n\\n \\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n public function testSavepointOperations(): void\\n {\\n $db = $this->getConnection(true, true);\\n- $db->beginTransaction();\\n- $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\\\")->execute();\\n- $db->getSchema()->createSavepoint('sp1');\\n- $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\\\")->execute();\\n- $db->getSchema()->rollBackSavepoint('sp1');\\n- $db->transaction->commit();\\n-\\n- $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\\\")->queryScalar();\\n- $this->assertSame(0, $afterCount);\\n- $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\\\")->queryScalar();\\n- $this->assertSame(1, $beforeCount);\\n-\\n- $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] = 'sp_test'\\\")->execute();\\n+ $token = 'sp_test_' . uniqid('', true);\\n+ $afterToken = $token . '_after';\\n+ try {\\n+ $db->beginTransaction();\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('{$token}')\\\")->execute();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('{$afterToken}')\\\")->execute();\\n+ $db->getSchema()->rollBackSavepoint('sp1');\\n+ $db->transaction->commit();\\n+\\n+ $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$afterToken}'\\\")->queryScalar();\\n+ $this->assertSame(0, $afterCount);\\n+ $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$token}'\\\")->queryScalar();\\n+ $this->assertSame(1, $beforeCount);\\n+ } finally {\\n+ $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] IN ('{$token}', '{$afterToken}')\\\")->execute();\\n+ }\\n }\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n public function testSavepointOperations(): void\\n {\\n $db = $this->getConnection(true, true);\\n $token = 'sp_test_' . uniqid('', true);\\n $afterToken = $token . '_after';\\n try {\\n $db->beginTransaction();\\n $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('{$token}')\\\")->execute();\\n $db->getSchema()->createSavepoint('sp1');\\n $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('{$afterToken}')\\\")->execute();\\n $db->getSchema()->rollBackSavepoint('sp1');\\n $db->transaction->commit();\\n\\n $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$afterToken}'\\\")->queryScalar();\\n $this->assertSame(0, $afterCount);\\n $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = '{$token}'\\\")->queryScalar();\\n $this->assertSame(1, $beforeCount);\\n } finally {\\n $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] IN ('{$token}', '{$afterToken}')\\\")->execute();\\n }\\n }\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[warning] 282-282: Avoid variables with short names like $db. Configured minimum length is 3. (undefined)\\n\\n(ShortVariable)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/mssql/SchemaTest.php` around lines 280 - 296, The\\ntestSavepointOperations test can leak rows if an assertion fails; wrap the\\ntransactional operations in a try/finally so cleanup always runs:\\nbeginTransaction()/createSavepoint()/rollBackSavepoint()/commit should remain\\ninside the try block, and in finally ensure the transaction is not left open\\n(rollback if still active) and always execute DELETE statements to remove any\\nrows with descriptions 'sp_test' or 'sp_test_after' (use the same\\n$db->createCommand(...) DELETE calls), guaranteeing cleanup regardless of\\nfailures.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex b847556b70b..71f1b10c545 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -10,8 +10,10 @@\\n \\n use yii\\\\base\\\\NotSupportedException;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\Constraint;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n+use yii\\\\db\\\\mssql\\\\TableSchema;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n use yiiunit\\\\base\\\\db\\\\BaseSchema;\\n \\n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\\n \\n $this->assertEquals($selectResult['id'], $insertResult['id']);\\n }\\n+\\n+ public function testQuoteColumnNameWithBrackets(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableName(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableName');\\n+ $result = $method->invoke($schema, $name);\\n+ $this->assertSame($expectedCatalog, $result->catalogName);\\n+ $this->assertSame($expectedSchema, $result->schemaName);\\n+ $this->assertSame($expectedTable, $result->name);\\n+ $this->assertSame($expectedFullName, $result->fullName);\\n+ }\\n+\\n+ public static function resolveTableNameProvider(): array\\n+ {\\n+ return [\\n+ 'single part' => [\\n+ 'customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'two parts' => [\\n+ 'sales.customer',\\n+ null,\\n+ 'sales',\\n+ 'customer',\\n+ 'sales.customer',\\n+ ],\\n+ 'two parts default schema' => [\\n+ 'dbo.customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'three parts' => [\\n+ 'catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ 'four parts' => [\\n+ '[server1].catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function testSavepointOperations(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\\\")->execute();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\\\")->execute();\\n+ $db->getSchema()->rollBackSavepoint('sp1');\\n+ $db->transaction->commit();\\n+\\n+ $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\\\")->queryScalar();\\n+ $this->assertSame(0, $afterCount);\\n+ $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\\\")->queryScalar();\\n+ $this->assertSame(1, $beforeCount);\\n+\\n+ $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] = 'sp_test'\\\")->execute();\\n+ }\\n+\\n+ public function testReleaseSavepointIsNoOp(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->getSchema()->releaseSavepoint('sp1');\\n+ $this->assertTrue($db->transaction->getIsActive());\\n+ $db->transaction->rollBack();\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableNames(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $table = new TableSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableNames');\\n+ $method->invoke($schema, $table, $name);\\n+ $this->assertSame($expectedCatalog, $table->catalogName);\\n+ $this->assertSame($expectedSchema, $table->schemaName);\\n+ $this->assertSame($expectedTable, $table->name);\\n+ $this->assertSame($expectedFullName, $table->fullName);\\n+ }\\n+\\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n+ $this->assertNotEmpty($primaryKeys);\\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n+ }\\n+\\n+ public function testNullDefaultValueColumn(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $table = $schema->getTableSchema('null_values');\\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\\n+ }\\n+\\n+ public function testInsertWithCompositePrimaryKey(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $result = $db->getSchema()->insert('employee', [\\n+ 'id' => 100,\\n+ 'department_id' => 1,\\n+ 'first_name' => 'Test',\\n+ 'last_name' => 'User',\\n+ ]);\\n+ $this->assertSame('100', $result['id']);\\n+ $this->assertSame('1', $result['department_id']);\\n+\\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\\n+ }\\n+\\n+ public function testGetViewNamesWithDefaultSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $viewNames = $schema->getViewNames();\\n+ $this->assertContains('animal_view', $viewNames);\\n+ }\\n+\\n+ public function testFindUniqueIndexes(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\\n+ $this->assertNotEmpty($indexes);\\n+ }\\n+\\n+ public function testCreateColumnSchemaBuilder(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\\n+ $this->assertInstanceOf('yii\\\\db\\\\mssql\\\\ColumnSchemaBuilder', $builder);\\n+ }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s19\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Use isolated PK values and guaranteed cleanup in composite PK insert test.**\\n\\nFixed PK values (`id=100`, `department_id=1`) can collide with pre-existing/leaked data, causing non-deterministic failures.\\n\\n \\n<details>\\n<summary>Proposed fix</summary>\\n\\n```diff\\n public function testInsertWithCompositePrimaryKey(): void\\n {\\n $db = $this->getConnection(true, true);\\n- $result = $db->getSchema()->insert('employee', [\\n- 'id' => 100,\\n- 'department_id' => 1,\\n- 'first_name' => 'Test',\\n- 'last_name' => 'User',\\n- ]);\\n- $this->assertSame('100', $result['id']);\\n- $this->assertSame('1', $result['department_id']);\\n-\\n- $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\\n+ $id = 100000 + random_int(1, 100000);\\n+ $departmentId = 1;\\n+ try {\\n+ $result = $db->getSchema()->insert('employee', [\\n+ 'id' => $id,\\n+ 'department_id' => $departmentId,\\n+ 'first_name' => 'Test',\\n+ 'last_name' => 'User',\\n+ ]);\\n+ $this->assertSame((string)$id, $result['id']);\\n+ $this->assertSame((string)$departmentId, $result['department_id']);\\n+ } finally {\\n+ $db->createCommand(\\\"DELETE FROM [employee] WHERE [id] = {$id} AND [department_id] = {$departmentId}\\\")->execute();\\n+ }\\n }\\n```\\n</details>\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[warning] 346-346: Avoid variables with short names like $db. Configured minimum length is 3. (undefined)\\n\\n(ShortVariable)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/db/mssql/SchemaTest.php` around lines 344 - 357, The\\ntestInsertWithCompositePrimaryKey uses fixed PKs (id=100, department_id=1) which\\ncan collide with existing data; update testInsertWithCompositePrimaryKey to\\ngenerate unique PK values (e.g., use uniqid(), random_int() or a timestamp-based\\nvalue) for 'id' and/or 'department_id', perform the insert via\\n$db->getSchema()->insert, assert the returned PKs match the generated values,\\nand ensure deterministic cleanup by deleting the row inside a try/finally (or\\nwrapping insert/assert in try and calling $db->createCommand('DELETE FROM\\n[employee] ...')->execute() in finally) so the test always removes the inserted\\ncomposite key even on failure.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex b847556b70b..71f1b10c545 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -10,8 +10,10 @@\\n \\n use yii\\\\base\\\\NotSupportedException;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\db\\\\Constraint;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n+use yii\\\\db\\\\mssql\\\\TableSchema;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n use yiiunit\\\\base\\\\db\\\\BaseSchema;\\n \\n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\\n \\n $this->assertEquals($selectResult['id'], $insertResult['id']);\\n }\\n+\\n+ public function testQuoteColumnNameWithBrackets(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableName(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableName');\\n+ $result = $method->invoke($schema, $name);\\n+ $this->assertSame($expectedCatalog, $result->catalogName);\\n+ $this->assertSame($expectedSchema, $result->schemaName);\\n+ $this->assertSame($expectedTable, $result->name);\\n+ $this->assertSame($expectedFullName, $result->fullName);\\n+ }\\n+\\n+ public static function resolveTableNameProvider(): array\\n+ {\\n+ return [\\n+ 'single part' => [\\n+ 'customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'two parts' => [\\n+ 'sales.customer',\\n+ null,\\n+ 'sales',\\n+ 'customer',\\n+ 'sales.customer',\\n+ ],\\n+ 'two parts default schema' => [\\n+ 'dbo.customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'three parts' => [\\n+ 'catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ 'four parts' => [\\n+ '[server1].catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function testSavepointOperations(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\\\")->execute();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\\\")->execute();\\n+ $db->getSchema()->rollBackSavepoint('sp1');\\n+ $db->transaction->commit();\\n+\\n+ $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\\\")->queryScalar();\\n+ $this->assertSame(0, $afterCount);\\n+ $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\\\")->queryScalar();\\n+ $this->assertSame(1, $beforeCount);\\n+\\n+ $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] = 'sp_test'\\\")->execute();\\n+ }\\n+\\n+ public function testReleaseSavepointIsNoOp(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->getSchema()->releaseSavepoint('sp1');\\n+ $this->assertTrue($db->transaction->getIsActive());\\n+ $db->transaction->rollBack();\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableNames(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $table = new TableSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableNames');\\n+ $method->invoke($schema, $table, $name);\\n+ $this->assertSame($expectedCatalog, $table->catalogName);\\n+ $this->assertSame($expectedSchema, $table->schemaName);\\n+ $this->assertSame($expectedTable, $table->name);\\n+ $this->assertSame($expectedFullName, $table->fullName);\\n+ }\\n+\\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n+ $this->assertNotEmpty($primaryKeys);\\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n+ }\\n+\\n+ public function testNullDefaultValueColumn(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $table = $schema->getTableSchema('null_values');\\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\\n+ }\\n+\\n+ public function testInsertWithCompositePrimaryKey(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $result = $db->getSchema()->insert('employee', [\\n+ 'id' => 100,\\n+ 'department_id' => 1,\\n+ 'first_name' => 'Test',\\n+ 'last_name' => 'User',\\n+ ]);\\n+ $this->assertSame('100', $result['id']);\\n+ $this->assertSame('1', $result['department_id']);\\n+\\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\\n+ }\\n+\\n+ public function testGetViewNamesWithDefaultSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $viewNames = $schema->getViewNames();\\n+ $this->assertContains('animal_view', $viewNames);\\n+ }\\n+\\n+ public function testFindUniqueIndexes(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\\n+ $this->assertNotEmpty($indexes);\\n+ }\\n+\\n+ public function testCreateColumnSchemaBuilder(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\\n+ $this->assertInstanceOf('yii\\\\db\\\\mssql\\\\ColumnSchemaBuilder', $builder);\\n+ }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s29\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Type mismatch between docblock and method signature.**\\n\\nThe docblock now specifies `false` for `$pagination` and `$sort` parameters, but the method signature on lines 83-84 uses `bool`. This inconsistency can confuse static analysis tools and developers.\\n\\nSince the test logic strictly checks for `false` (lines 116, 123) and the data provider only passes `false` (line 188), the more accurate type is `false` rather than `bool`.\\n\\nConsider updating the method signature to match the docblock:\\n\\n<details>\\n<summary>๐ง Align method signature with docblock</summary>\\n\\n```diff\\n public function testPrepareDataProviderWithPaginationAndSorting(\\n- Pagination|bool|array $pagination,\\n- Sort|bool|array $sort,\\n+ Pagination|array|false $pagination,\\n+ Sort|array|false $sort,\\n int|null $expectedPaginationPageSize = null,\\n```\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/rest/IndexActionTest.php` around lines 75 - 76, The test\\nmethod in IndexActionTest that currently declares parameters as bool $pagination\\nand bool $sort should be updated to match the docblock (Pagination|array|false)\\nand the test data: remove the bool type hints (leave the parameters untyped,\\ne.g. $pagination = false, $sort = false) so the method accepts false values used\\nin the assertions and data provider; locate the method in IndexActionTest (the\\none with parameters $pagination and $sort around the current signature) and\\nchange its signature to drop the bool type declarations.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:puma -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\\nindex 11919269e50..077fd71a147 100644\\n--- a/tests/framework/rest/IndexActionTest.php\\n+++ b/tests/framework/rest/IndexActionTest.php\\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\\n /**\\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\\n *\\n- * @param string $sql\\n- * @param array $params\\n- * @param string $expectedRawSql\\n+ * @param Pagination|array|false $pagination\\n+ * @param Sort|array|false $sort\\n+ * @param int|null $expectedPaginationPageSize\\n+ * @param int|null $expectedPaginationDefaultPageSize\\n+ * @param array $expectedSortOrders\\n+ * @param array|null $expectedSortDefaultOrder\\n */\\n public function testPrepareDataProviderWithPaginationAndSorting(\\n Pagination|bool|array $pagination,\\n\"\n },\n {\n \"subtask_id\": \"s33\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Rename short variable to satisfy PHPMD rule.**\\n\\nLine 116 uses `$ds`, which violates the configured minimum variable-name length and may fail static checks. Rename it to a descriptive name (for example `$dirSeparatorPattern`) and update Line 118 accordingly.\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[warning] 116-116: Avoid variables with short names like $ds. Configured minimum length is 3. (undefined)\\n\\n(ShortVariable)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/web/ErrorActionTest.php` around lines 116 - 118, Rename the\\nshort variable $ds to a longer descriptive name (e.g. $dirSeparatorPattern)\\nwhere it's set via preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\') and update the\\nsubsequent expectExceptionMessageMatches call to use the new variable name;\\nensure the concatenation inside expectExceptionMessageMatches still constructs\\nthe same regex ('views' . $dirSeparatorPattern . 'layouts' .\\n$dirSeparatorPattern . 'non-existing.php') and run PHPMD to verify the naming\\nrule is satisfied.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\\nindex f36761369f2..6a492a18b8f 100644\\n--- a/tests/framework/web/ErrorActionTest.php\\n+++ b/tests/framework/web/ErrorActionTest.php\\n@@ -113,13 +113,12 @@ public function testDefaultView(): void\\n \\n public function testLayout(): void\\n {\\n+ $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\');\\n $this->expectException(\\\\yii\\\\base\\\\ViewNotFoundException::class);\\n+ $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\\n \\n $this->getController([\\n 'layout' => 'non-existing',\\n ])->runAction('error');\\n-\\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\');\\n- $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\\n }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s34\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Fix conflicting return PHPDoc for a `never` method.**\\n\\nLine 11 declares `@return self`, but `build()` is typed as `never` and always throws. This docblock is inconsistent and should be removed or changed to `@return never`.\\n\\n \\n\\n<details>\\n<summary>Suggested patch</summary>\\n\\n```diff\\n- /**\\n- * `@return` self\\n- * `@throws` NotFoundHttpException\\n- */\\n+ /**\\n+ * `@throws` NotFoundHttpException\\n+ */\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n /**\\n * `@throws` NotFoundHttpException\\n */\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/web/stubs/ModelBindingStub.php` around lines 11 - 12, The\\nPHPDoc for build() is inconsistent: it declares \\\"@return self\\\" while the method\\nsignature and behavior are never (always throwing); update the docblock for the\\nbuild() method in ModelBindingStub to reflect that it never returns by either\\nremoving the \\\"@return\\\" line or changing it to \\\"@return never\\\", and ensure the\\n`@throws` NotFoundHttpException (or other thrown exception) remains accurate so\\nthe docblock matches the never-typed build() implementation.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\\nindex 39cd37dbdc0..395999f08fd 100644\\n--- a/tests/framework/web/stubs/ModelBindingStub.php\\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\\n@@ -8,8 +8,8 @@\\n class ModelBindingStub extends ActiveRecord\\n {\\n /**\\n- * @return self;\\n- * @throw NotFoundHttpException\\n+ * @return self\\n+ * @throws NotFoundHttpException\\n */\\n public static function build(): never\\n {\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs\nindex ce85e65af96..881b51a65e3 100644\n--- a/.git-blame-ignore-revs\n+++ b/.git-blame-ignore-revs\n@@ -24,3 +24,5 @@ da20adc82aef3eb5ae0bad3889fe6695e6424f06\n 7a7d2a9c06c099de8064729ca3fc95fb24241b75\n # Fixed error PHPCS latest version in `PHP 8.5`\n f66d5c8864712aef233b8131c2f99721101f61d0\n+# Fixed build broke code style\n+32d0a922b47ba23fc8d17b3947f8c8ff0b014a31\ndiff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex 20d17853c93..d8709cdca6e 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/build/controllers/MimeTypeController.php\n@@ -117,6 +117,7 @@ private function generateMimeTypesFile($outFile, $content)\n \n $content = <<<EOD\n <?php\n+\n /**\n * MIME types.\n *\n@@ -129,6 +130,7 @@ private function generateMimeTypesFile($outFile, $content)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n \\$mimeTypes = $array;\n \n # fix for bundled libmagic bug, see also https://github.com/yiisoft/yii2/issues/19925\n@@ -152,6 +154,7 @@ private function generateMimeAliasesFile($outFile)\n $array = VarDumper::export($this->_aliases);\n $content = <<<EOD\n <?php\n+\n /**\n * MIME aliases.\n *\n@@ -160,6 +163,7 @@ private function generateMimeAliasesFile($outFile)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n return $array;\n \n EOD;\n@@ -211,6 +215,7 @@ private function generateMimeExtensionsFile($outFile, $content)\n \n $content = <<<EOD\n <?php\n+\n /**\n * MIME type extensions.\n *\n@@ -224,6 +229,7 @@ private function generateMimeExtensionsFile($outFile, $content)\n * All extra changes made to this file must be committed to /build/controllers/MimeTypeController.php\n * otherwise they will be lost on next build.\n */\n+\n return $array;\n \n EOD;\ndiff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\nindex 2a603c818cf..bc4f3ea5f09 100644\n--- a/build/controllers/PhpDocController.php\n+++ b/build/controllers/PhpDocController.php\n@@ -345,6 +345,7 @@ protected function fixFileDoc(&$lines)\n }\n $lines = array_merge([\n '<?php',\n+ '',\n '/**',\n ' * @link https://www.yiiframework.com/',\n ' * @copyright Copyright (c) 2008 Yii Software LLC',\n@@ -367,6 +368,7 @@ protected function fixDocBlockIndentation(&$lines)\n $codeBlock = false;\n $listIndent = '';\n $tag = false;\n+ $phpstanType = false;\n $indent = '';\n foreach ($lines as $i => $line) {\n if (preg_match('~^(\\s*)/\\*\\*$~', $line, $matches)) {\n@@ -380,6 +382,7 @@ protected function fixDocBlockIndentation(&$lines)\n $codeBlock = false;\n $listIndent = '';\n $tag = false;\n+ $phpstanType = false;\n } elseif ($docBlock) {\n $line = ltrim($line);\n if (strpos($line, '*') === 0) {\n@@ -389,12 +392,23 @@ protected function fixDocBlockIndentation(&$lines)\n $line = substr($line, 1);\n }\n $docLine = str_replace(\"\\t\", ' ', rtrim($line));\n+ if ($phpstanType && $docLine !== '' && strpos($docLine, '@') !== 0) {\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\n+ continue;\n+ }\n+ $phpstanType = false;\n if (empty($docLine)) {\n $listIndent = '';\n } elseif (strpos($docLine, '@') === 0) {\n $listIndent = '';\n $codeBlock = false;\n $tag = true;\n+ if (preg_match('/^@phpstan-type(?:\\s|$)/', $docLine)) {\n+ $tag = false;\n+ $phpstanType = true;\n+ $lines[$i] = rtrim($indent . ' * ' . $docLine);\n+ continue;\n+ }\n $docLine = preg_replace('/\\s+/', ' ', $docLine);\n $docLine = $this->fixParamTypes($docLine);\n } elseif (preg_match('/^(~~~|```)/', $docLine)) {\n@@ -699,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\n }\n if ($propertyPart) {\n preg_match(\n- '/@property(?:-read|-write)?\\s+([\\\\\\\\\\w\\|\\[\\]]+)\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n+ '/@property(?:-read|-write)?\\s+' . self::TYPE_REG_EXP\n+ . '\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n $line,\n $matches\n );\n \n- if (isset($matches[2])) {\n- $lastPropertyName = $matches[2];\n+ if (isset($matches[1])) {\n+ $lastPropertyName = $matches[1];\n }\n \n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\ndiff --git a/composer.lock b/composer.lock\nindex 24a8ebbc363..f9f75af4753 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -320,16 +320,16 @@\n },\n {\n \"name\": \"composer/class-map-generator\",\n- \"version\": \"1.7.2\",\n+ \"version\": \"1.7.3\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/composer/class-map-generator.git\",\n- \"reference\": \"6a9c2f0970022ab00dc58c07d0685dd712f2231b\"\n+ \"reference\": \"86d8208fc3c649a3a999daf1a63c25201be2990f\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/composer/class-map-generator/zipball/6a9c2f0970022ab00dc58c07d0685dd712f2231b\",\n- \"reference\": \"6a9c2f0970022ab00dc58c07d0685dd712f2231b\",\n+ \"url\": \"https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f\",\n+ \"reference\": \"86d8208fc3c649a3a999daf1a63c25201be2990f\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -373,7 +373,7 @@\n ],\n \"support\": {\n \"issues\": \"https://github.com/composer/class-map-generator/issues\",\n- \"source\": \"https://github.com/composer/class-map-generator/tree/1.7.2\"\n+ \"source\": \"https://github.com/composer/class-map-generator/tree/1.7.3\"\n },\n \"funding\": [\n {\n@@ -385,7 +385,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-03-30T15:36:56+00:00\"\n+ \"time\": \"2026-05-05T09:17:07+00:00\"\n },\n {\n \"name\": \"composer/composer\",\n@@ -869,16 +869,16 @@\n },\n {\n \"name\": \"dealerdirect/phpcodesniffer-composer-installer\",\n- \"version\": \"v1.2.0\",\n+ \"version\": \"v1.2.1\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/PHPCSStandards/composer-installer.git\",\n- \"reference\": \"845eb62303d2ca9b289ef216356568ccc075ffd1\"\n+ \"reference\": \"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/845eb62303d2ca9b289ef216356568ccc075ffd1\",\n- \"reference\": \"845eb62303d2ca9b289ef216356568ccc075ffd1\",\n+ \"url\": \"https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/963f0c67bffde0eac41b56be71ac0e8ba132f0bd\",\n+ \"reference\": \"963f0c67bffde0eac41b56be71ac0e8ba132f0bd\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -961,20 +961,20 @@\n \"type\": \"thanks_dev\"\n }\n ],\n- \"time\": \"2025-11-11T04:32:07+00:00\"\n+ \"time\": \"2026-05-06T08:26:05+00:00\"\n },\n {\n \"name\": \"justinrainbow/json-schema\",\n- \"version\": \"6.8.0\",\n+ \"version\": \"6.8.2\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/jsonrainbow/json-schema.git\",\n- \"reference\": \"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\"\n+ \"reference\": \"2c89ebb95ca9cedc9347f780333f7b25792dcb76\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/jsonrainbow/json-schema/zipball/89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\",\n- \"reference\": \"89ac92bcfe5d0a8a4433c7b89d394553ae7250cc\",\n+ \"url\": \"https://api.github.com/repos/jsonrainbow/json-schema/zipball/2c89ebb95ca9cedc9347f780333f7b25792dcb76\",\n+ \"reference\": \"2c89ebb95ca9cedc9347f780333f7b25792dcb76\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -984,7 +984,7 @@\n },\n \"require-dev\": {\n \"friendsofphp/php-cs-fixer\": \"3.3.0\",\n- \"json-schema/json-schema-test-suite\": \"^23.2\",\n+ \"json-schema/json-schema-test-suite\": \"dev-main\",\n \"marc-mabe/php-enum-phpstan\": \"^2.0\",\n \"phpspec/prophecy\": \"^1.19\",\n \"phpstan/phpstan\": \"^1.12\",\n@@ -1034,9 +1034,9 @@\n ],\n \"support\": {\n \"issues\": \"https://github.com/jsonrainbow/json-schema/issues\",\n- \"source\": \"https://github.com/jsonrainbow/json-schema/tree/6.8.0\"\n+ \"source\": \"https://github.com/jsonrainbow/json-schema/tree/6.8.2\"\n },\n- \"time\": \"2026-04-02T12:43:11+00:00\"\n+ \"time\": \"2026-05-05T05:39:01+00:00\"\n },\n {\n \"name\": \"marc-mabe/php-enum\",\n@@ -1426,11 +1426,11 @@\n },\n {\n \"name\": \"phpstan/phpstan\",\n- \"version\": \"2.1.50\",\n+ \"version\": \"2.1.54\",\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\",\n- \"reference\": \"d452086fb4cf648c6b2d8cf3b639351f79e4f3e2\",\n+ \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd\",\n+ \"reference\": \"8be50c3992107dc837b17da4d140fbbdf9a5c5bd\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -1475,7 +1475,7 @@\n \"type\": \"github\"\n }\n ],\n- \"time\": \"2026-04-17T13:10:32+00:00\"\n+ \"time\": \"2026-04-29T13:31:09+00:00\"\n },\n {\n \"name\": \"phpstan/phpstan-phpunit\",\n@@ -3458,16 +3458,16 @@\n },\n {\n \"name\": \"symfony/console\",\n- \"version\": \"v7.4.8\",\n+ \"version\": \"v7.4.9\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/console.git\",\n- \"reference\": \"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\"\n+ \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\",\n- \"reference\": \"1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707\",\n+ \"url\": \"https://api.github.com/repos/symfony/console/zipball/d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n+ \"reference\": \"d7d2b64a45a89d607865927b176fa51c33ddbb58\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3532,7 +3532,7 @@\n \"terminal\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/console/tree/v7.4.8\"\n+ \"source\": \"https://github.com/symfony/console/tree/v7.4.9\"\n },\n \"funding\": [\n {\n@@ -3552,20 +3552,20 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T13:54:39+00:00\"\n+ \"time\": \"2026-04-22T15:21:55+00:00\"\n },\n {\n \"name\": \"symfony/deprecation-contracts\",\n- \"version\": \"v3.6.0\",\n+ \"version\": \"v3.7.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/deprecation-contracts.git\",\n- \"reference\": \"63afe740e99a13ba87ec199bb07bbdee937a5b62\"\n+ \"reference\": \"50f59d1f3ca46d41ac911f97a78626b6756af35b\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62\",\n- \"reference\": \"63afe740e99a13ba87ec199bb07bbdee937a5b62\",\n+ \"url\": \"https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b\",\n+ \"reference\": \"50f59d1f3ca46d41ac911f97a78626b6756af35b\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3578,7 +3578,7 @@\n \"name\": \"symfony/contracts\"\n },\n \"branch-alias\": {\n- \"dev-main\": \"3.6-dev\"\n+ \"dev-main\": \"3.7-dev\"\n }\n },\n \"autoload\": {\n@@ -3603,7 +3603,7 @@\n \"description\": \"A generic function and convention to trigger deprecation notices\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/deprecation-contracts/tree/v3.6.0\"\n+ \"source\": \"https://github.com/symfony/deprecation-contracts/tree/v3.7.0\"\n },\n \"funding\": [\n {\n@@ -3614,25 +3614,29 @@\n \"url\": \"https://github.com/fabpot\",\n \"type\": \"github\"\n },\n+ {\n+ \"url\": \"https://github.com/nicolas-grekas\",\n+ \"type\": \"github\"\n+ },\n {\n \"url\": \"https://tidelift.com/funding/github/packagist/symfony/symfony\",\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2024-09-25T14:21:43+00:00\"\n+ \"time\": \"2026-04-13T15:52:40+00:00\"\n },\n {\n \"name\": \"symfony/filesystem\",\n- \"version\": \"v8.0.8\",\n+ \"version\": \"v8.0.9\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/filesystem.git\",\n- \"reference\": \"66b769ae743ce2d13e435528fbef4af03d623e5a\"\n+ \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/66b769ae743ce2d13e435528fbef4af03d623e5a\",\n- \"reference\": \"66b769ae743ce2d13e435528fbef4af03d623e5a\",\n+ \"url\": \"https://api.github.com/repos/symfony/filesystem/zipball/d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n+ \"reference\": \"d1ec4543d5c6c2dac78503c2fae5ea0b3608ce40\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3669,7 +3673,7 @@\n \"description\": \"Provides basic utilities for the filesystem\",\n \"homepage\": \"https://symfony.com\",\n \"support\": {\n- \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.8\"\n+ \"source\": \"https://github.com/symfony/filesystem/tree/v8.0.9\"\n },\n \"funding\": [\n {\n@@ -3689,7 +3693,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-03-30T15:14:47+00:00\"\n+ \"time\": \"2026-04-18T13:51:42+00:00\"\n },\n {\n \"name\": \"symfony/finder\",\n@@ -3761,7 +3765,7 @@\n },\n {\n \"name\": \"symfony/polyfill-ctype\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-ctype.git\",\n@@ -3820,7 +3824,7 @@\n \"portable\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-ctype/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-ctype/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -3844,16 +3848,16 @@\n },\n {\n \"name\": \"symfony/polyfill-intl-grapheme\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-intl-grapheme.git\",\n- \"reference\": \"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\"\n+ \"reference\": \"4864388bfbd3001ce88e234fab652acd91fdc57e\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df\",\n- \"reference\": \"ad1b7b9092976d6c948b8a187cec9faaea9ec1df\",\n+ \"url\": \"https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e\",\n+ \"reference\": \"4864388bfbd3001ce88e234fab652acd91fdc57e\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -3902,7 +3906,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -3922,11 +3926,11 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2026-04-10T16:19:22+00:00\"\n+ \"time\": \"2026-04-26T13:13:48+00:00\"\n },\n {\n \"name\": \"symfony/polyfill-intl-normalizer\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-intl-normalizer.git\",\n@@ -3987,7 +3991,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4011,7 +4015,7 @@\n },\n {\n \"name\": \"symfony/polyfill-mbstring\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-mbstring.git\",\n@@ -4072,7 +4076,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-mbstring/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-mbstring/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4096,7 +4100,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php73\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php73.git\",\n@@ -4152,7 +4156,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php73/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php73/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4176,7 +4180,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php80\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php80.git\",\n@@ -4236,7 +4240,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php80/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php80/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4260,7 +4264,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php81\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php81.git\",\n@@ -4316,7 +4320,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php81/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php81/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4340,7 +4344,7 @@\n },\n {\n \"name\": \"symfony/polyfill-php84\",\n- \"version\": \"v1.36.0\",\n+ \"version\": \"v1.37.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/polyfill-php84.git\",\n@@ -4396,7 +4400,7 @@\n \"shim\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/polyfill-php84/tree/v1.36.0\"\n+ \"source\": \"https://github.com/symfony/polyfill-php84/tree/v1.37.0\"\n },\n \"funding\": [\n {\n@@ -4485,16 +4489,16 @@\n },\n {\n \"name\": \"symfony/service-contracts\",\n- \"version\": \"v3.6.1\",\n+ \"version\": \"v3.7.0\",\n \"source\": {\n \"type\": \"git\",\n \"url\": \"https://github.com/symfony/service-contracts.git\",\n- \"reference\": \"45112560a3ba2d715666a509a0bc9521d10b6c43\"\n+ \"reference\": \"d25d82433a80eba6aa0e6c24b61d7370d99e444a\"\n },\n \"dist\": {\n \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43\",\n- \"reference\": \"45112560a3ba2d715666a509a0bc9521d10b6c43\",\n+ \"url\": \"https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a\",\n+ \"reference\": \"d25d82433a80eba6aa0e6c24b61d7370d99e444a\",\n \"shasum\": \"\"\n },\n \"require\": {\n@@ -4512,7 +4516,7 @@\n \"name\": \"symfony/contracts\"\n },\n \"branch-alias\": {\n- \"dev-main\": \"3.6-dev\"\n+ \"dev-main\": \"3.7-dev\"\n }\n },\n \"autoload\": {\n@@ -4548,7 +4552,7 @@\n \"standards\"\n ],\n \"support\": {\n- \"source\": \"https://github.com/symfony/service-contracts/tree/v3.6.1\"\n+ \"source\": \"https://github.com/symfony/service-contracts/tree/v3.7.0\"\n },\n \"funding\": [\n {\n@@ -4568,7 +4572,7 @@\n \"type\": \"tidelift\"\n }\n ],\n- \"time\": \"2025-07-15T11:30:57+00:00\"\n+ \"time\": \"2026-03-28T09:44:51+00:00\"\n },\n {\n \"name\": \"symfony/string\",\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 535d29716f5..d6d48dff3fd 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -72,35 +72,46 @@ Yii Framework 2 Change Log\n - Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)\n - Chg: Drop dead SQL Server `< 2005` branches from MSSQL `Schema::insert()` (terabytesoftw)\n \n-2.0.55 under development\n+2.0.56 under development\n ------------------------\n \n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n+\n+\n+2.0.55 May 09, 2026\n+-------------------\n+\n+- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\n+- Bug #20159: Fix chroot resolve null route (gozoro)\n+- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\n - Bug #20705: Replace `$this` with `self` in generics in Psalm annotations (mspirkov)\n - Bug #20715: Adjust `JSON` helper error message assertions for `PHP 8.6` compatibility in `JsonTest` class (terabytesoftw)\n-- Enh #20714: Allow overriding the `yii\\grid\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\n-- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\n-- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\n-- Enh #20729: Add default types in `@template` annotations (mspirkov)\n-- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\n - Bug #20733: Replace `$this` with `static` and `covariant static` in generics in PHPStan and PHPDoc annotations (mspirkov)\n - Bug #20735: Fix `@param` annotations for `$name` in `Request::get()` and `Request::post()` (mspirkov)\n-- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\n - Bug #20738: Fix `@var` annotations for `Application::$requestedParams`, `AssetBundle::$basePath`, `AssetBundle::$baseUrl`, `MultiFieldSession::$writeCallback` (mspirkov)\n - Bug #20738: Fix `@return` annotations for `User::getAuthManager()` and `User::getAccessChecker()` (mspirkov)\n - Bug #20738: Fix `@param` annotation for `$value` parameter in `AssetManager::setConverter()` (mspirkov)\n - Bug #20739: Fix `@var` annotation for `BaseYii::$app` (mspirkov)\n-- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\n - Bug #20746: Fix `@var` annotations for `DbDependency::$db` and `DbDependency::$sql` (mspirkov)\n - Bug #20750: Fix `@return` annotation for `yii\\console\\Controller::runAction()` (mspirkov)\n - Bug #20750: Add the missing `@property-write` annotation to `yii\\console\\Controller` (mspirkov)\n - Bug #20751: Fix `@param` annotation for `$param` parameter in `Sort::parseSortParam()` (mspirkov)\n-- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\n - Bug #20764: Fix `@return` annotation for `Model::rules()` (mspirkov)\n-- Bug #20697: `loadTableIndexes()` includes LOB indexes with `NULL` column names, causing `strpos()` deprecation on PHP `8.1+` (terabytesoftw)\n-- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\n-- Bug #17254: Fix `MessageController` crash on dynamic input in `Yii::t()` call (CeBe)\n-- Bug #20159: Fix chroot resolve null route (gozoro)\n - Bug #20856: Fix passing generics to `BatchQueryResult` (mspirkov)\n+- Bug: CVE-2026-39850, Isolate internal variables in `View::renderPhpFile()` and `ErrorHandler::renderFile()` to prevent parameter collisions from overriding included file paths (samdark)\n+- Enh #20714: Allow overriding the `yii\\grid\\GridView`'s default `filterSelector`, allow using `Closure`s for `filterSelector` (chriscpty)\n+- Enh #20717: Use PHPStan/Psalm types in PHPDoc annotations (mspirkov)\n+- Enh #20718: When set_time_limit() is not available, throw a warning only for big files (@marc-farre)\n+- Enh #20729: Add default types in `@template` annotations (mspirkov)\n+- Enh #20730: Make the configuration type for `Application` wider (mspirkov)\n+- Enh #20735: Add conditional types in `@return` annotations in `Request::get()` and `Request::post()` (mspirkov)\n+- Enh #20743: Remove dead code for PHP < 5.6 in `UrlValidator` and `EmailValidator` (WarLikeLaux)\n+- Enh #20756: Remove dead code for PHP < 5.6 in `SchemaBuilderTrait::json()` (WarLikeLaux)\n+- Chg #20757: Remove dead code for PHP < 7.4 in `Security` (WarLikeLaux)\n \n \n 2.0.54 January 09, 2026\ndiff --git a/framework/base/Model.php b/framework/base/Model.php\nindex 0186202e2f0..8bae86953ba 100644\n--- a/framework/base/Model.php\n+++ b/framework/base/Model.php\n@@ -38,7 +38,7 @@\n *\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\n *\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\n * array of errors for all attributes, similar to the following:\n *\n * ```\n@@ -581,8 +581,9 @@ public function hasErrors($attribute = null)\n /**\n * Returns the errors for all attributes or a single attribute.\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\n+ * all attributes, the result is a two-dimensional array, like the following:\n *\n * ```\n * [\ndiff --git a/framework/base/View.php b/framework/base/View.php\nindex 98e2cd69eeb..658ffb963af 100644\n--- a/framework/base/View.php\n+++ b/framework/base/View.php\n@@ -333,11 +333,14 @@ public function afterRender($viewFile, $params, &$output)\n public function renderPhpFile($_file_, $_params_ = [])\n {\n $_obInitialLevel_ = ob_get_level();\n+ $_renderer_ = function () {\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\n+ require func_get_arg(0);\n+ };\n ob_start();\n ob_implicit_flush(false);\n- extract($_params_, EXTR_OVERWRITE);\n try {\n- require $_file_;\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\n return ob_get_clean();\n } catch (\\Exception $e) {\n while (ob_get_level() > $_obInitialLevel_) {\ndiff --git a/framework/db/Connection.php b/framework/db/Connection.php\nindex a52e8fbdc6a..929eedf1dd3 100644\n--- a/framework/db/Connection.php\n+++ b/framework/db/Connection.php\n@@ -121,8 +121,7 @@\n * @property-read PDO $masterPdo The PDO instance for the currently active master connection.\n * @property QueryBuilder $queryBuilder The query builder for the current DB connection. Note that the type of\n * this property differs in getter and setter. See [[getQueryBuilder()]] and [[setQueryBuilder()]] for details.\n- * @property-read Schema $schema The schema information for the database opened by this\n- * connection.\n+ * @property-read Schema $schema The schema information for the database opened by this connection.\n * @property-read string $serverVersion Server version as a string.\n * @property-read Connection|null $slave The currently active slave connection. `null` is returned if there is\n * no slave available and `$fallbackToMaster` is false.\ndiff --git a/framework/log/Target.php b/framework/log/Target.php\nindex 428fb150e14..780c9a05f34 100644\n--- a/framework/log/Target.php\n+++ b/framework/log/Target.php\n@@ -28,7 +28,9 @@\n * satisfying both filter conditions will be handled. Additionally, you\n * may specify [[except]] to exclude messages of certain categories.\n *\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\ndiff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\nindex 2068d1cb9f1..4981179d7cc 100644\n--- a/framework/validators/CompareValidator.php\n+++ b/framework/validators/CompareValidator.php\n@@ -93,7 +93,7 @@ class CompareValidator extends Validator\n */\n public $operator = '==';\n /**\n- * @var string the user-defined error message. It may contain the following placeholders which\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\n * will be replaced accordingly by the validator:\n *\n * - `{attribute}`: the label of the attribute being validated\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\nindex f324cd2b91e..1f4aeba6d14 100644\n--- a/framework/validators/Validator.php\n+++ b/framework/validators/Validator.php\n@@ -322,6 +322,8 @@ public function validateAttribute($model, $attribute)\n * @param mixed $value the data value to be validated.\n * @param string|null $error the error message to be returned, if the validation fails.\n * @return bool whether the data is valid.\n+ *\n+ * @param-out string|null $error\n */\n public function validate($value, &$error = null)\n {\ndiff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php\nindex 0df7d920ffc..212bec48e46 100644\n--- a/framework/web/ErrorHandler.php\n+++ b/framework/web/ErrorHandler.php\n@@ -305,10 +305,13 @@ public function renderFile($_file_, $_params_)\n {\n $_params_['handler'] = $this;\n if ($this->exception instanceof ErrorException || !Yii::$app->has('view')) {\n+ $_renderer_ = function () {\n+ extract(func_get_arg(1), EXTR_OVERWRITE);\n+ require Yii::getAlias(func_get_arg(0));\n+ };\n ob_start();\n ob_implicit_flush(false);\n- extract($_params_, EXTR_OVERWRITE);\n- require Yii::getAlias($_file_);\n+ call_user_func_array($_renderer_, [$_file_, $_params_]);\n \n return ob_get_clean();\n }\ndiff --git a/phpstan-baseline.neon b/phpstan-baseline.neon\nindex dbdba693f2a..3f78050b8ad 100644\n--- a/phpstan-baseline.neon\n+++ b/phpstan-baseline.neon\n@@ -1225,79 +1225,379 @@ parameters:\n \t\t\tpath: tests/base/db/BaseSchema.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\log\\\\Target\\:\\:\\$db\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$as f\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/log/BaseDbTarget.php\n+\t\t\tpath: tests/framework/base/ComponentTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to private property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$p2\\.$#'\n+\t\t\tidentifier: property.private\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/base/ComponentTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Parameter &\\$args by\\-ref type of method yiiunit\\\\framework\\\\base\\\\stub\\\\controller\\\\InjectingController\\:\\:bindInjectedFor\\(\\) expects array\\<int, mixed\\>, array given\\.$#'\n+\t\t\tidentifier: parameterByRef.type\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/base/stub/controller/InjectingController.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$a_field\\.$#'\n+\t\t\tmessage: '#^Parameter &\\$requestedParams by\\-ref type of method yiiunit\\\\framework\\\\base\\\\stub\\\\controller\\\\InjectingController\\:\\:bindInjectedFor\\(\\) expects array\\<string, string\\>, array given\\.$#'\n+\t\t\tidentifier: parameterByRef.type\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/base/stub/controller/InjectingController.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/captcha/CaptchaTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Return type \\(void\\) of method yiiunit\\\\framework\\\\console\\\\controllers\\\\FixtureConsoledController\\:\\:stdout\\(\\) should be compatible with return type \\(bool\\|int\\) of method yii\\\\console\\\\Controller\\<yii\\\\console\\\\Application\\>\\:\\:stdout\\(\\)$#'\n+\t\t\tidentifier: method.childReturnType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseExistValidator.php\n+\t\t\tpath: tests/framework/console/controllers/FixtureControllerTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestMainModel\\:\\:\\$id\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&yii\\\\web\\\\User\\:\\:\\$identityCLass\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/filters/AccessRuleTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$id\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n-\t\t\tcount: 2\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/grid/CheckboxColumnTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\ValidatorTestRefModel\\:\\:\\$ref\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/grid/GridViewTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$extension with type array is incompatible with native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/helpers/FileHelperTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @throws with type yii\\\\base\\\\InvalidConfigException\\|yii\\\\base\\\\InvalidParamException\\|yii\\\\db\\\\Exception is not subtype of Throwable$#'\n+\t\t\tidentifier: throws.notThrowable\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/DbMessageSourceTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type bool\\|string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 2\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$email \\(string\\) does not accept array\\<int, string\\>\\.$#'\n-\t\t\tidentifier: assign.propertyType\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expectedException with type mixed is not subtype of native type string\\|null\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$value with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/i18n/FormatterDateTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_length with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Customer\\:\\:\\$name \\(string\\) does not accept array\\<int, string\\>\\.$#'\n-\t\t\tidentifier: assign.propertyType\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_shortLength with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Property yiiunit\\\\data\\\\ar\\\\Order\\:\\:\\$total \\(string\\) does not accept int\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_shortWeight with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_weight with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$arguments with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expected with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$expectedException with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$message with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/i18n/FormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:attach\\(\\) should return \\$this\\(yiiunit\\\\framework\\\\log\\\\TestMessage\\) but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:attachContent\\(\\) should return \\$this\\(yiiunit\\\\framework\\\\log\\\\TestMessage\\) but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:embed\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:embedContent\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getBcc\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getCc\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getCharset\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getFrom\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getReplyTo\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getSubject\\(\\) should return string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Method yiiunit\\\\framework\\\\log\\\\TestMessage\\:\\:getTo\\(\\) should return array\\|string but return statement is missing\\.$#'\n+\t\t\tidentifier: return.missing\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/log/EmailTargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @var with type yii\\\\log\\\\Target is not subtype of native type PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\.$#'\n+\t\t\tidentifier: varTag.nativeType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/log/TargetTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\rbac\\\\BaseManager\\:\\:\\$defaultRoles \\(array\\<string\\>\\) does not accept Closure\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/rbac/ManagerTestCase.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\rbac\\\\BaseManager\\:\\:\\$defaultRoles \\(array\\<string\\>\\) does not accept string\\.$#'\n \t\t\tidentifier: assign.propertyType\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/validators/BaseUniqueValidator.php\n+\t\t\tpath: tests/framework/rbac/ManagerTestCase.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yii\\\\console\\\\Application\\|yii\\\\web\\\\Application\\<yii\\\\web\\\\IdentityInterface\\>\\:\\:\\$sessionDb\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$dataProvider with type yii\\\\data\\\\DataProviderInterface is not subtype of native type yii\\\\data\\\\ArrayDataProvider\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/rest/SerializerTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/BooleanValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/CompareValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel\\:\\:\\$attr_compare\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/base/web/session/BaseDbSession.php\n+\t\t\tpath: tests/framework/validators/CompareValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$as f\\.$#'\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n \t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/EmailValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$_ with type mixed is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/base/ComponentTest.php\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to private property yiiunit\\\\data\\\\base\\\\NewComponent\\:\\:\\$p2\\.$#'\n-\t\t\tidentifier: property.private\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$allowedExtensions with type array\\|string is not subtype of native type string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/validators/FileValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n \t\t\tcount: 3\n-\t\t\tpath: tests/framework/base/ComponentTest.php\n+\t\t\tpath: tests/framework/validators/FilterValidatorTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Return type \\(void\\) of method yiiunit\\\\framework\\\\console\\\\controllers\\\\FixtureConsoledController\\:\\:stdout\\(\\) should be compatible with return type \\(bool\\|int\\) of method yii\\\\console\\\\Controller\\<yii\\\\console\\\\Application\\>\\:\\:stdout\\(\\)$#'\n-\t\t\tidentifier: method.childReturnType\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/IpValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$badIp with type mixed is not subtype of native type array\\|bool\\|int\\|string\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 2\n+\t\t\tpath: tests/framework/validators/IpValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/NumberValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RangeValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RegularExpressionValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/RequiredValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/StringValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/TrimValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\validators\\\\Validator\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/validators/UrlValidatorTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$appendTimestamp with type bool\\|string is not subtype of native type bool\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/console/controllers/FixtureControllerTest.php\n+\t\t\tpath: tests/framework/web/AssetBundleTest.php\n \n \t\t-\n-\t\t\tmessage: '#^Access to an undefined property PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&yii\\\\web\\\\User\\:\\:\\$identityCLass\\.$#'\n+\t\t\tmessage: '#^PHPDoc tag @param for parameter \\$data with type mixed is not subtype of native type array\\.$#'\n+\t\t\tidentifier: parameter.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/web/JsonResponseFormatterTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^PHPDoc tag @var for property yiiunit\\\\framework\\\\widgets\\\\ActiveFieldTest\\:\\:\\$helperModel with type yii\\\\base\\\\DynamicModel is not subtype of native type yiiunit\\\\framework\\\\widgets\\\\ActiveFieldTestModel\\.$#'\n+\t\t\tidentifier: property.phpDocType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/ActiveFieldTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\BaseObject\\:\\:\\$clientScript\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 4\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$categories\\.$#'\n \t\t\tidentifier: property.notFound\n \t\t\tcount: 1\n-\t\t\tpath: tests/framework/filters/AccessRuleTest.php\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$email\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Access to an undefined property yii\\\\base\\\\DynamicModel\\:\\:\\$name\\.$#'\n+\t\t\tidentifier: property.notFound\n+\t\t\tcount: 3\n+\t\t\tpath: tests/framework/widgets/ActiveFormTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\widgets\\\\Breadcrumbs\\:\\:\\$homeLink \\(array\\|null\\) does not accept false\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/BreadcrumbsTest.php\n+\n+\t\t-\n+\t\t\tmessage: '#^Property yii\\\\widgets\\\\Breadcrumbs\\:\\:\\$tag \\(string\\) does not accept false\\.$#'\n+\t\t\tidentifier: assign.propertyType\n+\t\t\tcount: 1\n+\t\t\tpath: tests/framework/widgets/BreadcrumbsTest.php\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..6a59f2fbff4 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -13,25 +13,10 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n- - tests/framework/base/stub\n- - tests/framework/di/stubs\n- - tests/framework/filters/stubs\n+ - tests/framework/*/stubs/*\n+ - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/grid\n- - tests/framework/helpers\n- - tests/framework/i18n\n- - tests/framework/log\n- - tests/framework/mail\n- - tests/framework/models\n- - tests/framework/mutex\n- - tests/framework/rbac\n- - tests/framework/requirements\n- - tests/framework/rest\n- - tests/framework/test\n- - tests/framework/validators\n- - tests/framework/web\n- - tests/framework/widgets\n \n bootstrapFiles:\n - framework/BaseYii.php\n\ndiff --git a/tests/base/log/BaseDbTarget.php b/tests/base/log/BaseDbTarget.php\nindex 7594e83d671..0292973f28f 100644\n--- a/tests/base/log/BaseDbTarget.php\n+++ b/tests/base/log/BaseDbTarget.php\n@@ -9,8 +9,6 @@\n namespace yiiunit\\base\\log;\n \n use yii\\console\\Application;\n-use yii\\console\\Controller;\n-use yii\\base\\InvalidParamException;\n use yii\\db\\Exception;\n use yii\\base\\InvalidConfigException;\n use Yii;\n@@ -18,6 +16,7 @@\n use yii\\console\\ExitCode;\n use yii\\db\\Connection;\n use yii\\db\\Query;\n+use yii\\log\\DbTarget;\n use yii\\log\\Logger;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -171,7 +170,10 @@ public function testTransactionRollBack(): void\n // current db connection should still have a transaction\n $this->assertNotNull($db->transaction);\n // log db connection should not have transaction\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\n+\n+ $dbTarget = Yii::$app->log->targets['db'];\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\n+ $this->assertNull($dbTarget->db->transaction);\n \n $tx->rollBack();\n \ndiff --git a/tests/base/validators/BaseUniqueValidator.php b/tests/base/validators/BaseUniqueValidator.php\nindex 3b5951683d4..0eee34af0ea 100644\n--- a/tests/base/validators/BaseUniqueValidator.php\n+++ b/tests/base/validators/BaseUniqueValidator.php\n@@ -72,6 +72,7 @@ public function testValidateInvalidAttribute(): void\n \n /** @var Customer $customerModel */\n $customerModel = Customer::findOne(1);\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->name = ['test array data'];\n $validator->validateAttribute($customerModel, 'name');\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\n@@ -79,6 +80,7 @@ public function testValidateInvalidAttribute(): void\n $customerModel->clearErrors();\n \n $customerModel->name = 'test data';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\n $validator->targetAttribute = ['email', 'name'];\n $validator->validateAttribute($customerModel, 'name');\n@@ -410,7 +412,7 @@ public function testAmbiguousColumnName(): void\n ]);\n $model = new Order();\n $model->customer_id = 1;\n- $model->total = 800;\n+ $model->total = '800';\n $model->save(false);\n $validator->validateAttribute($model, 'id');\n $this->assertFalse($model->hasErrors());\ndiff --git a/tests/base/web/BaseFormatter.php b/tests/base/web/BaseFormatter.php\nindex b5d7831b9e2..1a188fc342a 100644\n--- a/tests/base/web/BaseFormatter.php\n+++ b/tests/base/web/BaseFormatter.php\n@@ -12,6 +12,9 @@\n use yii\\web\\Response;\n use yii\\web\\ResponseFormatterInterface;\n \n+/**\n+ * @template TFormatter of ResponseFormatterInterface\n+ */\n abstract class BaseFormatter extends TestCase\n {\n /**\n@@ -19,7 +22,7 @@ abstract class BaseFormatter extends TestCase\n */\n public $response;\n /**\n- * @var ResponseFormatterInterface\n+ * @var TFormatter\n */\n public $formatter;\n \n@@ -31,7 +34,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return ResponseFormatterInterface\n+ * @return TFormatter\n */\n abstract protected function getFormatterInstance();\n \ndiff --git a/tests/base/web/session/BaseDbSession.php b/tests/base/web/session/BaseDbSession.php\nindex 43fff89a696..33c6c1be6a4 100644\n--- a/tests/base/web/session/BaseDbSession.php\n+++ b/tests/base/web/session/BaseDbSession.php\n@@ -15,6 +15,7 @@\n use yii\\db\\Connection;\n use yii\\db\\Migration;\n use yii\\db\\Query;\n+use yii\\web\\Application;\n use yii\\web\\DbSession;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\framework\\web\\session\\SessionTestTrait;\n@@ -260,11 +261,14 @@ public function testInstantiate(): void\n 'db' => 'sessionDb',\n ]);\n \n- $this->assertSame(Yii::$app->sessionDb, $session->db);\n+ /** @var Application&object{sessionDb: Connection} */\n+ $app = Yii::$app;\n+\n+ $this->assertSame($app->sessionDb, $session->db);\n $this->assertSame(300, $session->timeout);\n $session->close();\n \n- Yii::$app->set('db', Yii::$app->sessionDb);\n+ Yii::$app->set('db', $app->sessionDb);\n Yii::$app->set('sessionDb', null);\n ini_set('session.gc_maxlifetime', $oldTimeout);\n }\ndiff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\nindex e2592a80be5..a7ac3000ea1 100644\n--- a/tests/data/ar/Cat.php\n+++ b/tests/data/ar/Cat.php\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\n \n /**\n * This is to test if __isset catches the exception.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getException(): never\n@@ -43,7 +43,7 @@ public function getException(): never\n \n /**\n * This is to test if __isset catches the error.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getThrowable()\ndiff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\nindex 33e35049f15..4f2245b1abc 100644\n--- a/tests/data/validators/models/FakedValidationModel.php\n+++ b/tests/data/validators/models/FakedValidationModel.php\n@@ -10,6 +10,33 @@\n \n use yii\\base\\Model;\n \n+/**\n+ * @property mixed $attr\n+ * @property mixed $attr_url\n+ * @property mixed $attr_string\n+ * @property mixed $attr_reg1\n+ * @property mixed $attr_number\n+ * @property mixed $attr_ip\n+ * @property mixed $attr_array\n+ * @property mixed $attr_array_skipped\n+ * @property mixed $attr_files\n+ * @property mixed $attr_one\n+ * @property mixed $attr_two\n+ * @property mixed $attr_empty1\n+ * @property mixed $attr_empty2\n+ * @property mixed $attr_email\n+ * @property mixed $attr_date\n+ * @property mixed $attr_timestamp\n+ * @property mixed $attr_test\n+ * @property mixed $attr_test_val\n+ * @property mixed $attr_test_repeat\n+ * @property mixed $attrA\n+ * @property mixed $attrB\n+ * @property mixed $attrC\n+ * @property mixed $attrD\n+ * @property mixed $attr_image\n+ * @property mixed $attr_images\n+ */\n class FakedValidationModel extends Model\n {\n public $val_attr_a;\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\nindex 73faaf22f39..1752079bc08 100644\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\n@@ -10,6 +10,9 @@\n \n use yiiunit\\data\\ar\\ActiveRecord;\n \n+/**\n+ * @property int $id\n+ */\n class ValidatorTestMainModel extends ActiveRecord\n {\n public $testMainVal = 1;\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\nindex 8642dc317c9..0bdb0c71f83 100644\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\n@@ -11,9 +11,9 @@\n use yiiunit\\data\\ar\\ActiveRecord;\n \n /**\n- * @property int id\n- * @property string a_field\n- * @property int ref\n+ * @property int $id\n+ * @property string $a_field\n+ * @property int $ref\n */\n class ValidatorTestRefModel extends ActiveRecord\n {\ndiff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\nindex 566fa195ef4..586ffbe4fa4 100644\n--- a/tests/framework/base/BaseObjectTest.php\n+++ b/tests/framework/base/BaseObjectTest.php\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->object->Caption;\n }\n \n@@ -82,8 +81,7 @@ public function testSetProperty(): void\n $this->object->Text = $value;\n $this->assertEquals($value, $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->object->NewMember = $value;\n }\n \n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->object->unknownMethod();\n }\n \ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\nindex a64f82606e0..fc7bf8b4c33 100644\n--- a/tests/framework/base/BehaviorTest.php\n+++ b/tests/framework/base/BehaviorTest.php\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\n $bar->attachBehavior('bar', $behavior);\n \n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $bar->nomagicBehaviorMethod();\n }\n }\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex 522cac4389a..bcdfe09547a 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -1069,7 +1069,7 @@ public function testDetachNotAttachedHandler(): void\n */\n public function testEventClosureDetachesItself(): void\n {\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\n \n $obj->trigger('barEventOnce');\n \ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\nindex 04924a21153..26837108962 100644\n--- a/tests/framework/base/DynamicModelTest.php\n+++ b/tests/framework/base/DynamicModelTest.php\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\n $this->assertTrue($model->canSetProperty('email'));\n $this->assertTrue($model->canSetProperty('name'));\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $age = $model->age;\n }\n \ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\nindex 1a9a9fdf38b..68ed7f6c201 100644\n--- a/tests/framework/base/ModelTest.php\n+++ b/tests/framework/base/ModelTest.php\n@@ -1395,7 +1395,7 @@ public function testValidateAttributeNames(): void\n \n public function testFormNameWithAnonymousClass(): void\n {\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\n \n self::expectException(\n InvalidConfigException::class,\ndiff --git a/tests/framework/base/ViewTest.php b/tests/framework/base/ViewTest.php\nindex 2ce36c48917..cdcf260f4a3 100644\n--- a/tests/framework/base/ViewTest.php\n+++ b/tests/framework/base/ViewTest.php\n@@ -108,6 +108,19 @@ public function testRelativePathInView(): void\n $this->assertSame($subViewContent, $view->render('@testviews/base'));\n }\n \n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\n+ {\n+ $view = new View();\n+\n+ $viewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'safe.php';\n+ file_put_contents($viewFile, '<?php echo \"safe view\";');\n+\n+ $secretFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'secret.txt';\n+ file_put_contents($secretFile, 'secret data');\n+\n+ $this->assertSame('safe view', $view->renderFile($viewFile, ['_file_' => $secretFile]));\n+ }\n+\n public function testAfterRender(): void\n {\n $view = new View();\ndiff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousComponentClass.php\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousModelClass.php\nrename to tests/framework/base/stubs/AnonymousModelClass.php\ndiff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\nindex f8d10f95f62..76dc8f149b4 100644\n--- a/tests/framework/console/ControllerTest.php\n+++ b/tests/framework/console/ControllerTest.php\n@@ -25,6 +25,10 @@\n use yii\\console\\Response;\n use yii\\helpers\\Console;\n use yiiunit\\framework\\console\\stubs\\DummyService;\n+use yiiunit\\framework\\console\\stubs\\FakeController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput;\n+use yiiunit\\framework\\console\\stubs\\FakeInjectionController;\n use yiiunit\\TestCase;\n \n /**\n@@ -43,9 +47,9 @@ protected function setUp(): void\n $this->mockApplication();\n \n Yii::$app->controllerMap = [\n- 'fake' => 'yiiunit\\framework\\console\\FakeController',\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\FakeHelpControllerWithoutOutput',\n- 'help' => 'yiiunit\\framework\\console\\FakeHelpController',\n+ 'fake' => 'yiiunit\\framework\\console\\stubs\\FakeController',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'help' => 'yiiunit\\framework\\console\\stubs\\FakeHelpController',\n ];\n }\n \ndiff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\nsimilarity index 98%\nrename from tests/framework/console/FakeController.php\nrename to tests/framework/console/stubs/FakeController.php\nindex ff92196c0c2..7bc4a4541d3 100644\n--- a/tests/framework/console/FakeController.php\n+++ b/tests/framework/console/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\Controller;\n use yii\\console\\Response;\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\nsimilarity index 93%\nrename from tests/framework/console/FakeHelpController.php\nrename to tests/framework/console/stubs/FakeHelpController.php\nindex 2846c94848f..ae23e2e0fd6 100644\n--- a/tests/framework/console/FakeHelpController.php\n+++ b/tests/framework/console/stubs/FakeHelpController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nsimilarity index 90%\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nindex d9586dd9610..22c5bc7696c 100644\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeInjectionController.php b/tests/framework/console/stubs/FakeInjectionController.php\nsimilarity index 89%\nrename from tests/framework/console/FakeInjectionController.php\nrename to tests/framework/console/stubs/FakeInjectionController.php\nindex 0019ef7ce15..ae57310e31b 100644\n--- a/tests/framework/console/FakeInjectionController.php\n+++ b/tests/framework/console/stubs/FakeInjectionController.php\n@@ -6,10 +6,9 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\data\\DataProviderInterface;\n-use yiiunit\\framework\\console\\stubs\\DummyService;\n use yii\\console\\Controller;\n use yii\\console\\Request;\n use yiiunit\\framework\\web\\Post;\ndiff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\nindex 2e8f97e3058..7354abaf595 100644\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\n@@ -1028,4 +1028,98 @@ public static function buildFromDataProvider(): array\n \n return $data;\n }\n+\n+ public function testRenameTable(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameTable('old_table', 'new_table');\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\n+ }\n+\n+ public function testRenameColumn(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\n+ $this->assertSame(\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\", $sql);\n+ }\n+\n+ public function testSelectExists(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\n+ }\n+\n+ public function testCheckIntegrityEnableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityDisableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityFiltersOutViews(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true);\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\n+ $this->assertStringNotContainsString('animal_view', $sql);\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->resetSequence('non_existent_table');\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage(\"There is not sequence associated with table 'order_item'.\");\n+ $qb->resetSequence('order_item');\n+ }\n+\n+ public function testUpdateWithVarbinaryData(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $params = [];\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\n+ $this->assertSame([':qp0' => 1], $params);\n+ }\n+\n+ public function testCompositeInWithSubqueryThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $params = [];\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\n+ $this->expectException('yii\\base\\NotSupportedException');\n+ $qb->buildCondition($condition, $params);\n+ }\n+\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\n+ }\n+\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\n+ }\n }\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex b847556b70b..71f1b10c545 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -10,8 +10,10 @@\n \n use yii\\base\\NotSupportedException;\n use yii\\db\\Connection;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n use yiiunit\\base\\db\\BaseSchema;\n \n@@ -208,4 +210,171 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\ndiff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\nindex e8cc90c548c..63e4653923b 100644\n--- a/tests/framework/grid/GridViewTest.php\n+++ b/tests/framework/grid/GridViewTest.php\n@@ -217,15 +217,18 @@ public function testHeaderLabels(): void\n ],\n ]);\n \n+ $gridDataProvider = $grid->dataProvider;\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\n+\n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n ]);\n $grid->renderTableHeader();\n \n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n 'attributes' => ['attr1', 'attr2'],\ndiff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\nindex de13fb2d2cb..7fb23470d7b 100644\n--- a/tests/framework/helpers/ConsoleTest.php\n+++ b/tests/framework/helpers/ConsoleTest.php\n@@ -444,9 +444,9 @@ public function testSelect(): void\n }\n \n /**\n- * @property string name\n- * @property array types\n- * @property string description\n+ * @property string $name\n+ * @property array $types\n+ * @property string $description\n */\n class TestConsoleModel extends DynamicModel\n {\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\nindex 6a0495651ee..6adb0ef2a63 100644\n--- a/tests/framework/helpers/HtmlTest.php\n+++ b/tests/framework/helpers/HtmlTest.php\n@@ -17,6 +17,8 @@\n use yii\\db\\ArrayExpression;\n use yii\\helpers\\Html;\n use yii\\helpers\\Url;\n+use yiiunit\\framework\\helpers\\stubs\\HtmlTestModel;\n+use yiiunit\\framework\\helpers\\stubs\\MyHtml;\n use yiiunit\\TestCase;\n \n /**\n@@ -1711,7 +1713,7 @@ public function testError(): void\n 'Custom error message generated by callback'\n );\n $this->assertEquals(\n- '<div>Error in yiiunit\\framework\\helpers\\HtmlTestModel - name</div>',\n+ '<div>Error in yiiunit\\framework\\helpers\\stubs\\HtmlTestModel - name</div>',\n Html::error($model, 'name', ['errorSource' => fn($model, $attribute) => 'Error in ' . $model::class . ' - ' . $attribute]),\n 'Custom error message generated by closure'\n );\n@@ -2243,57 +2245,3 @@ public static function getInputIdByNameDataProvider(): array\n ];\n }\n }\n-\n-/**\n- * Class MyHtml\n- * @package yiiunit\\framework\\helpers\n- */\n-class MyHtml extends Html\n-{\n- /**\n- * @param Model $model\n- * @param string $attribute\n- * @param array $options\n- */\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\n- {\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\n- $attribute = static::getAttributeName($attribute);\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n- }\n- }\n-}\n-\n-/**\n- * @property string name\n- * @property string title\n- * @property string alias\n- * @property array types\n- * @property string description\n- */\n-class HtmlTestModel extends DynamicModel\n-{\n- public function init(): void\n- {\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n- $this->defineAttribute($attribute);\n- }\n- }\n-\n- public function rules()\n- {\n- return [\n- ['name', 'required'],\n- ['name', 'string', 'max' => 100],\n- ['title', 'string', 'length' => 10],\n- ['alias', 'string', 'length' => [0, 20]],\n- ['description', 'string', 'max' => 500],\n- [['radio', 'checkbox'], 'boolean'],\n- ];\n- }\n-\n- public function customError()\n- {\n- return 'this is custom error message';\n- }\n-}\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\nindex 1b684b0859b..dd8489d1ac6 100644\n--- a/tests/framework/helpers/JsonTest.php\n+++ b/tests/framework/helpers/JsonTest.php\n@@ -15,8 +15,8 @@\n use DateTimeZone;\n use yii\\helpers\\Json;\n use yii\\web\\JsExpression;\n+use yiiunit\\framework\\helpers\\stubs\\JsonModel;\n use yiiunit\\framework\\web\\Post;\n-use yiiunit\\framework\\models\\JsonModel;\n use yiiunit\\TestCase;\n \n /**\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex 275f7522cec..e67bc13078c 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -64,13 +64,13 @@ protected function tearDown(): void\n */\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\n {\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\n+ Yii::$app->controller = $controller = new Controller(\n+ $controllerId,\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\n+ );\n+\n $controller->actionParams = $params;\n $controller->action = new Action($actionID, $controller);\n-\n- if ($moduleID !== null) {\n- $controller->module = new Module($moduleID);\n- }\n }\n \n protected function removeMockedAction()\ndiff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\nnew file mode 100644\nindex 00000000000..078e10da545\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\n@@ -0,0 +1,47 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\DynamicModel;\n+\n+/**\n+ * @property string $name\n+ * @property string $title\n+ * @property string $alias\n+ * @property mixed $types\n+ * @property string $description\n+ * @property bool $radio\n+ * @property bool $checkbox\n+ */\n+class HtmlTestModel extends DynamicModel\n+{\n+ public function init(): void\n+ {\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n+ $this->defineAttribute($attribute);\n+ }\n+ }\n+\n+ public function rules()\n+ {\n+ return [\n+ ['name', 'required'],\n+ ['name', 'string', 'max' => 100],\n+ ['title', 'string', 'length' => 10],\n+ ['alias', 'string', 'length' => [0, 20]],\n+ ['description', 'string', 'max' => 500],\n+ [['radio', 'checkbox'], 'boolean'],\n+ ];\n+ }\n+\n+ public function customError()\n+ {\n+ return 'this is custom error message';\n+ }\n+}\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\nsimilarity index 90%\nrename from tests/framework/models/JsonModel.php\nrename to tests/framework/helpers/stubs/JsonModel.php\nindex 1c85db7ac1b..c41e6cb6b87 100644\n--- a/tests/framework/models/JsonModel.php\n+++ b/tests/framework/helpers/stubs/JsonModel.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\models;\n+namespace yiiunit\\framework\\helpers\\stubs;\n \n use JsonSerializable;\n use ReturnTypeWillChange;\n@@ -16,11 +16,13 @@\n * JSON serializable model for tests.\n *\n * {@inheritdoc}\n+ *\n+ * @property mixed $name\n */\n class JsonModel extends DynamicModel implements JsonSerializable\n {\n /**\n- * @var array\n+ * @var array|object\n */\n public $data = ['json' => 'serializable'];\n \ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\nnew file mode 100644\nindex 00000000000..673f1a9468b\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/MyHtml.php\n@@ -0,0 +1,32 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\Model;\n+use yii\\helpers\\Html;\n+\n+/**\n+ * Class MyHtml\n+ * @package yiiunit\\framework\\helpers\n+ */\n+class MyHtml extends Html\n+{\n+ /**\n+ * @param Model $model\n+ * @param string $attribute\n+ * @param array $options\n+ */\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\n+ {\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\n+ $attribute = static::getAttributeName($attribute);\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n+ }\n+ }\n+}\ndiff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\nindex 5b9d5e0b4a3..9535075fa88 100644\n--- a/tests/framework/i18n/FormatterDateTest.php\n+++ b/tests/framework/i18n/FormatterDateTest.php\n@@ -22,7 +22,7 @@\n class FormatterDateTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \n@@ -367,18 +367,18 @@ public function testAsRelativeTime(): void\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\n \n // Invert all the DateIntervals\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\n@@ -423,7 +423,7 @@ public function testAsRelativeTime(): void\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\n $interval_0_seconds = new DateInterval('PT0S');\n- $interval_0_seconds->invert = true;\n+ $interval_0_seconds->invert = 1;\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\n \n // empty input\n@@ -495,19 +495,19 @@ public function testAsDuration(): void\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\n \n // Invert all the DateIntervals\n- $interval_0_seconds->invert = true;\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_0_seconds->invert = 1;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\n@@ -742,7 +742,7 @@ public function testDateOnlyValues(): void\n \n public function testIntlTimeOnlyValues()\n {\n- return $this->testTimeOnlyValues();\n+ $this->testTimeOnlyValues();\n }\n \n /**\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\nindex 034aa4501d4..073ac0778e5 100644\n--- a/tests/framework/i18n/FormatterNumberTest.php\n+++ b/tests/framework/i18n/FormatterNumberTest.php\n@@ -19,7 +19,7 @@\n class FormatterNumberTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\nindex 306d9dc1595..62505611cf7 100644\n--- a/tests/framework/i18n/LocaleTest.php\n+++ b/tests/framework/i18n/LocaleTest.php\n@@ -17,7 +17,7 @@\n class LocaleTest extends TestCase\n {\n /**\n- * @var Locale\n+ * @var Locale|null\n */\n protected $locale;\n \ndiff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\nindex 69e7ac695c7..0de25bedd9c 100644\n--- a/tests/framework/log/DispatcherTest.php\n+++ b/tests/framework/log/DispatcherTest.php\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\n \n /**\n * @group log\n+ *\n+ * @method static mixed microtime($get_as_float)\n */\n class DispatcherTest extends TestCase\n {\n@@ -324,7 +326,10 @@ public function testTargetThrow(): void\n $this->assertSame(1, $this->targetThrowFirstCount);\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\n+\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\n+ $this->assertIsArray($targetThrowSecondOutputs);\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\n }\n }\n }\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\nindex 0b5c5d95423..e1e48bda009 100644\n--- a/tests/framework/log/EmailTargetTest.php\n+++ b/tests/framework/log/EmailTargetTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\base\\InvalidConfigException;\n use yii\\log\\EmailTarget;\n use yii\\mail\\BaseMailer;\n@@ -21,7 +22,7 @@\n class EmailTargetTest extends TestCase\n {\n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var BaseMailer&MockObject\n */\n protected $mailer;\n \n@@ -75,7 +76,6 @@ public function testExportWithSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -121,7 +121,6 @@ public function testExportWithoutSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -157,7 +156,6 @@ public function testExportWithSendFailure(): void\n $message->method('send')->willReturn(false);\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\nindex f929e38655f..10e1828a03c 100644\n--- a/tests/framework/log/LoggerTest.php\n+++ b/tests/framework/log/LoggerTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n+use stdClass;\n use yii\\log\\Dispatcher;\n use yii\\log\\Logger;\n use yiiunit\\TestCase;\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\n protected $logger;\n \n /**\n- * @var Dispatcher|\\PHPUnit_Framework_MockObject_MockObject\n+ * @var Dispatcher&MockObject\n */\n protected $dispatcher;\n \n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\n $this->assertEquals('application', $this->logger->messages[0][2]);\n $this->assertEquals([\n 'file' => __FILE__,\n- 'line' => 66,\n+ 'line' => 68,\n 'function' => 'log',\n 'class' => $this->logger::class,\n 'type' => '->',\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\n */\n public function testLogWithFlush(): void\n {\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['flush']);\n \n $logger->flushInterval = 1;\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\n */\n public function testFlushWithoutDispatcher(): void\n {\n- $dispatcher = $this->getMockBuilder('\\stdClass')->getMock();\n+ $dispatcher = $this->createMock(stdClass::class);\n $dispatcher->expects($this->never())->method($this->anything());\n \n $this->logger->messages = ['anything'];\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $this->logger->dispatcher = $dispatcher;\n $this->logger->flush();\n $this->assertEmpty($this->logger->messages);\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\n ['duration' => 30],\n ];\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\n $logger->method('getProfiling')->willReturn($timings);\n $logger->expects($this->once())\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\n $messages = ['anyData'];\n $returnValue = 'return value';\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\n 'duration' => 5,\n ],\n ];\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\nindex 91659ac80cb..12ea5c77feb 100644\n--- a/tests/framework/log/SyslogTargetTest.php\n+++ b/tests/framework/log/SyslogTargetTest.php\n@@ -24,7 +24,7 @@ function closelog()\n }\n \n namespace yiiunit\\framework\\log {\n- use PHPUnit_Framework_MockObject_MockObject;\n+ use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\helpers\\VarDumper;\n use yii\\log\\Logger;\n use yii\\log\\SyslogTarget;\n@@ -34,6 +34,10 @@ function closelog()\n * Class SyslogTargetTest.\n *\n * @group log\n+ *\n+ * @method static mixed openlog($arguments)\n+ * @method static mixed syslog($arguments)\n+ * @method static mixed closelog($arguments)\n */\n class SyslogTargetTest extends TestCase\n {\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\n public static $functions = [];\n \n /**\n- * @var MockObject\n+ * @var SyslogTarget&MockObject\n */\n protected $syslogTarget;\n \n@@ -64,7 +68,7 @@ public function testExport(): void\n {\n $identity = 'identity string';\n $options = LOG_ODELAY | LOG_PID;\n- $facility = 'facility string';\n+ $facility = LOG_USER;\n $messages = [\n ['info message', Logger::LEVEL_INFO],\n ['error message', Logger::LEVEL_ERROR],\n@@ -75,7 +79,7 @@ public function testExport(): void\n ['profile end message', Logger::LEVEL_PROFILE_END],\n ];\n \n- /** @var SyslogTarget $syslogTarget */\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\n ->getMock();\n@@ -180,7 +184,7 @@ function (...$parameters) use ($matcher): void {\n */\n public function testFailedExport(): void\n {\n- /** @var SyslogTarget $syslogTarget */\n+ /** @var SyslogTargetStub&MockObject $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTargetStub::class)\n ->onlyMethods(['openlog', 'syslog', 'closelog', 'formatMessage'])\n ->getMock();\n@@ -189,7 +193,7 @@ public function testFailedExport(): void\n \n $syslogTarget->identity = 'identity string';\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\n- $syslogTarget->facility = 'facility string';\n+ $syslogTarget->facility = LOG_USER;\n $syslogTarget->messages = [\n ['test', Logger::LEVEL_INFO],\n ];\ndiff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\nindex f2e6ef0a928..92713842ad7 100644\n--- a/tests/framework/mail/BaseMailerTest.php\n+++ b/tests/framework/mail/BaseMailerTest.php\n@@ -11,8 +11,8 @@\n use Yii;\n use yii\\base\\View;\n use yii\\helpers\\FileHelper;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n use yiiunit\\TestCase;\n \n /**\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestMailComponent()\n {\n- $component = new Mailer();\n+ $component = new TestMailer();\n $component->viewPath = $this->getTestFilePath();\n \n return $component;\n }\n \n /**\n- * @return Mailer mailer instance\n+ * @return TestMailer mailer instance\n */\n protected function getTestMailComponent()\n {\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\n \n public function testSetupView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $view = new View();\n $mailer->setView($view);\n@@ -95,14 +95,14 @@ public function testSetupView(): void\n */\n public function testGetDefaultView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $view = $mailer->getView();\n $this->assertIsObject($view, 'Unable to get default view!');\n }\n \n public function testCreateMessage(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $message = $mailer->compose();\n $this->assertIsObject($message, 'Unable to create message instance!');\n $this->assertEquals($mailer->messageClass, $message::class, 'Invalid message class!');\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\n */\n public function testDefaultMessageConfig(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $notPropertyConfig = [\n 'charset' => 'utf-16',\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\n $messageConfig = [...$notPropertyConfig, ...$propertyConfig];\n $mailer->messageConfig = $messageConfig;\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n \n foreach ($notPropertyConfig as $name => $value) {\n@@ -204,6 +205,7 @@ public function testCompose(): void\n $textViewFileContent = 'Plain text view file content';\n file_put_contents($textViewFileName, $textViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n 'text' => $textViewName,\n@@ -211,6 +213,7 @@ public function testCompose(): void\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose($htmlViewName);\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\n@@ -265,6 +268,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n ]);\n@@ -274,7 +278,7 @@ public function testComposePlainTextFallback(int $i, string $htmlViewFileContent\n \n public function testUseFileTransport(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $this->assertFalse($mailer->useFileTransport);\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\n \n@@ -294,11 +298,9 @@ public function testUseFileTransport(): void\n \n public function testBeforeSendEvent(): void\n {\n- $message = new Message();\n-\n- /** @var Mailer $mailerMock */\n+ $message = new TestMessage();\n $mailerMock = $this->createPartialMock(\n- Mailer::class,\n+ TestMailer::class,\n [\n 'afterSend',\n 'beforeSend',\n@@ -311,160 +313,3 @@ public function testBeforeSendEvent(): void\n $mailerMock->send($message);\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class Mailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\Message';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n-\n- return true;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class Message extends BaseMessage\n-{\n- public $id;\n- public $encoding;\n- public $_charset;\n- public $_from;\n- public $_replyTo;\n- public $_to;\n- public $_cc;\n- public $_bcc;\n- public $_subject;\n- public $_textBody;\n- public $_htmlBody;\n-\n- public function getCharset()\n- {\n- return $this->_charset;\n- }\n-\n- public function setCharset($charset)\n- {\n- $this->_charset = $charset;\n-\n- return $this;\n- }\n-\n- public function getFrom()\n- {\n- return $this->_from;\n- }\n-\n- public function setFrom($from)\n- {\n- $this->_from = $from;\n-\n- return $this;\n- }\n-\n- public function getTo()\n- {\n- return $this->_to;\n- }\n-\n- public function setTo($to)\n- {\n- $this->_to = $to;\n-\n- return $this;\n- }\n-\n- public function getCc()\n- {\n- return $this->_cc;\n- }\n-\n- public function setCc($cc)\n- {\n- $this->_cc = $cc;\n-\n- return $this;\n- }\n-\n- public function getBcc()\n- {\n- return $this->_bcc;\n- }\n-\n- public function setBcc($bcc)\n- {\n- $this->_bcc = $bcc;\n-\n- return $this;\n- }\n-\n- public function getSubject()\n- {\n- return $this->_subject;\n- }\n-\n- public function setSubject($subject)\n- {\n- $this->_subject = $subject;\n-\n- return $this;\n- }\n-\n- public function getReplyTo()\n- {\n- return $this->_replyTo;\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- $this->_replyTo = $replyTo;\n-\n- return $this;\n- }\n-\n- public function setTextBody($text)\n- {\n- $this->_textBody = $text;\n-\n- return $this;\n- }\n-\n- public function setHtmlBody($html)\n- {\n- $this->_htmlBody = $html;\n-\n- return $this;\n- }\n-\n- public function attachContent($content, array $options = []): void\n- {\n- }\n-\n- public function attach($fileName, array $options = []): void\n- {\n- }\n-\n- public function embed($fileName, array $options = []): void\n- {\n- }\n-\n- public function embedContent($content, array $options = []): void\n- {\n- }\n-\n- public function toString()\n- {\n- $mailer = $this->mailer;\n- $this->mailer = null;\n- $s = var_export($this, true);\n- $this->mailer = $mailer;\n- return $s;\n- }\n-}\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\nindex e0006d72d4e..e0b8d1ce008 100644\n--- a/tests/framework/mail/BaseMessageTest.php\n+++ b/tests/framework/mail/BaseMessageTest.php\n@@ -10,8 +10,9 @@\n \n use Exception;\n use Yii;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMessageWithException;\n use yiiunit\\TestCase;\n \n /**\n@@ -29,7 +30,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestEmailComponent()\n {\n@@ -59,6 +60,7 @@ public function testSend(): void\n public function testToString(): void\n {\n $mailer = $this->getMailer();\n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n $this->assertEquals($message->toString(), '' . $message);\n }\n@@ -73,128 +75,3 @@ public function testExceptionToString(): void\n (string) $message;\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class TestMailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\TestMessage';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class TestMessage extends BaseMessage\n-{\n- public $text;\n- public $html;\n-\n- public function getCharset()\n- {\n- return '';\n- }\n-\n- public function setCharset($charset): void\n- {\n- }\n-\n- public function getFrom()\n- {\n- return '';\n- }\n-\n- public function setFrom($from): void\n- {\n- }\n-\n- public function getReplyTo()\n- {\n- return '';\n- }\n-\n- public function setReplyTo($replyTo): void\n- {\n- }\n-\n- public function getTo()\n- {\n- return '';\n- }\n-\n- public function setTo($to): void\n- {\n- }\n-\n- public function getCc()\n- {\n- return '';\n- }\n-\n- public function setCc($cc): void\n- {\n- }\n-\n- public function getBcc()\n- {\n- return '';\n- }\n-\n- public function setBcc($bcc): void\n- {\n- }\n-\n- public function getSubject()\n- {\n- return '';\n- }\n-\n- public function setSubject($subject): void\n- {\n- }\n-\n- public function setTextBody($text): void\n- {\n- $this->text = $text;\n- }\n-\n- public function setHtmlBody($html): void\n- {\n- $this->html = $html;\n- }\n-\n- public function attachContent($content, array $options = []): void\n- {\n- }\n-\n- public function attach($fileName, array $options = []): void\n- {\n- }\n-\n- public function embed($fileName, array $options = []): void\n- {\n- }\n-\n- public function embedContent($content, array $options = []): void\n- {\n- }\n-\n- public function toString()\n- {\n- return static::class;\n- }\n-}\n-\n-class TestMessageWithException extends TestMessage\n-{\n- public function toString()\n- {\n- throw new Exception('Test exception in toString.');\n- }\n-}\ndiff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\nnew file mode 100644\nindex 00000000000..4e8a1e92403\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMailer.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMailer;\n+\n+/**\n+ * Test Mailer class.\n+ */\n+class TestMailer extends BaseMailer\n+{\n+ public $messageClass = TestMessage::class;\n+ public $sentMessages = [];\n+\n+ protected function sendMessage($message)\n+ {\n+ $this->sentMessages[] = $message;\n+\n+ return true;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\nnew file mode 100644\nindex 00000000000..34e469045ee\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessage.php\n@@ -0,0 +1,152 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMessage;\n+\n+/**\n+ * Test Message class.\n+ */\n+class TestMessage extends BaseMessage\n+{\n+ public $id;\n+ public $encoding;\n+ public $_charset;\n+ public $_from;\n+ public $_replyTo;\n+ public $_to;\n+ public $_cc;\n+ public $_bcc;\n+ public $_subject;\n+ public $_textBody;\n+ public $_htmlBody;\n+\n+ public function getCharset()\n+ {\n+ return $this->_charset;\n+ }\n+\n+ public function setCharset($charset)\n+ {\n+ $this->_charset = $charset;\n+\n+ return $this;\n+ }\n+\n+ public function getFrom()\n+ {\n+ return $this->_from;\n+ }\n+\n+ public function setFrom($from)\n+ {\n+ $this->_from = $from;\n+\n+ return $this;\n+ }\n+\n+ public function getTo()\n+ {\n+ return $this->_to;\n+ }\n+\n+ public function setTo($to)\n+ {\n+ $this->_to = $to;\n+\n+ return $this;\n+ }\n+\n+ public function getCc()\n+ {\n+ return $this->_cc;\n+ }\n+\n+ public function setCc($cc)\n+ {\n+ $this->_cc = $cc;\n+\n+ return $this;\n+ }\n+\n+ public function getBcc()\n+ {\n+ return $this->_bcc;\n+ }\n+\n+ public function setBcc($bcc)\n+ {\n+ $this->_bcc = $bcc;\n+\n+ return $this;\n+ }\n+\n+ public function getSubject()\n+ {\n+ return $this->_subject;\n+ }\n+\n+ public function setSubject($subject)\n+ {\n+ $this->_subject = $subject;\n+\n+ return $this;\n+ }\n+\n+ public function getReplyTo()\n+ {\n+ return $this->_replyTo;\n+ }\n+\n+ public function setReplyTo($replyTo)\n+ {\n+ $this->_replyTo = $replyTo;\n+\n+ return $this;\n+ }\n+\n+ public function setTextBody($text)\n+ {\n+ $this->_textBody = $text;\n+\n+ return $this;\n+ }\n+\n+ public function setHtmlBody($html)\n+ {\n+ $this->_htmlBody = $html;\n+\n+ return $this;\n+ }\n+\n+ public function attachContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function attach($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embed($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embedContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function toString()\n+ {\n+ $mailer = $this->mailer;\n+ $this->mailer = null;\n+ $s = var_export($this, true);\n+ $this->mailer = $mailer;\n+ return $s;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\nnew file mode 100644\nindex 00000000000..60903c687f8\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\n@@ -0,0 +1,19 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use Exception;\n+\n+class TestMessageWithException extends TestMessage\n+{\n+ public function toString()\n+ {\n+ throw new Exception('Test exception in toString.');\n+ }\n+}\ndiff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nnew file mode 100644\nindex 00000000000..324722b7585\n--- /dev/null\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -0,0 +1,73 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use Yii;\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\DbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ * @group db\n+ */\n+class DbMutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ],\n+ ]);\n+ }\n+\n+ public function testDbPropertyDefaultValue(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n+ $this->assertSame(Yii::$app->db, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConnectionObject(): void\n+ {\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\n+ $this->assertSame($connection, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConfigArray(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ]]);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testThrowsExceptionForInvalidDb(): void\n+ {\n+ $this->expectException(InvalidConfigException::class);\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\n+ }\n+}\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\nnew file mode 100644\nindex 00000000000..16d7dd2ef79\n--- /dev/null\n+++ b/tests/framework/mutex/MutexTest.php\n@@ -0,0 +1,79 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yiiunit\\framework\\mutex\\mocks\\DumbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class MutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ DumbMutex::$locked = false;\n+ }\n+\n+ public function testAcquireAndRelease(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertTrue($mutex->isAcquired('test'));\n+ $this->assertTrue($mutex->release('test'));\n+ $this->assertFalse($mutex->isAcquired('test'));\n+ }\n+\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertFalse($mutex->acquire('test'));\n+ $mutex->release('test');\n+ }\n+\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->release('test'));\n+ }\n+\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\n+ }\n+\n+ public function testAutoReleaseIsEnabledByDefault(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->autoRelease);\n+ }\n+\n+ public function testAutoReleaseCanBeDisabled(): void\n+ {\n+ $mutex = new DumbMutex(['autoRelease' => false]);\n+ $this->assertFalse($mutex->autoRelease);\n+ }\n+\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $mutex->acquire('test');\n+\n+ $countBefore = count($mutex->attemptsTime);\n+ $mutex->acquire('test');\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\n+\n+ $mutex->release('test');\n+ }\n+}\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\nnew file mode 100644\nindex 00000000000..01a6ca34cc3\n--- /dev/null\n+++ b/tests/framework/mutex/OracleMutexTest.php\n@@ -0,0 +1,115 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\OracleMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class OracleMutexTest extends TestCase\n+{\n+ public function testInitSucceedsWithOciDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testInitSucceedsWithOdbcDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'odbc'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testDefaultProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\n+ $this->assertFalse($mutex->releaseOnCommit);\n+ }\n+\n+ public function testCustomProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex([\n+ 'db' => $db,\n+ 'lockMode' => OracleMutex::MODE_NL,\n+ 'releaseOnCommit' => true,\n+ ]);\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\n+ $this->assertTrue($mutex->releaseOnCommit);\n+ }\n+\n+ /**\n+ * @dataProvider invalidDriverProvider\n+ */\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', $driverName],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\n+ new OracleMutex(['db' => $db]);\n+ }\n+\n+ public static function invalidDriverProvider(): array\n+ {\n+ return [\n+ 'mysql' => ['mysql'],\n+ 'pgsql' => ['pgsql'],\n+ 'sqlite' => ['sqlite'],\n+ 'sqlsrv' => ['sqlsrv'],\n+ ];\n+ }\n+}\ndiff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\nindex 9014e79c1db..ba66e8a20d8 100644\n--- a/tests/framework/rbac/DbManagerTestCase.php\n+++ b/tests/framework/rbac/DbManagerTestCase.php\n@@ -31,6 +31,8 @@\n \n /**\n * Base class for testing {@see DbManager}.\n+ *\n+ * @extends ManagerTestCase<DbManager>\n */\n abstract class DbManagerTestCase extends ManagerTestCase\n {\n@@ -38,7 +40,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\n protected static $driverName;\n \n /**\n- * @var Connection\n+ * @var Connection|null\n */\n protected $db;\n \ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\nindex dfa7d6b992c..6570a29db04 100644\n--- a/tests/framework/rbac/ManagerTestCase.php\n+++ b/tests/framework/rbac/ManagerTestCase.php\n@@ -32,16 +32,18 @@\n \n /**\n * Base class for testing {@see ManagerInterface}.\n+ *\n+ * @template TManager of BaseManager\n */\n abstract class ManagerTestCase extends TestCase\n {\n /**\n- * @var ManagerInterface|BaseManager\n+ * @var TManager\n */\n protected $auth;\n \n /**\n- * @return ManagerInterface\n+ * @return TManager\n */\n abstract protected function createManager();\n \n@@ -176,6 +178,11 @@ public function testAddRule(): void\n \n $rule = $this->auth->getRule($ruleName);\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Rule must round-trip as the original subclass.',\n+ );\n self::assertSame(\n $ruleName,\n $rule->name,\n@@ -193,6 +200,12 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('isAuthor');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Existing rule must load as the original subclass.',\n+ );\n+\n $rule->name = 'newName';\n $rule->reallyReally = false;\n \n@@ -207,6 +220,11 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('newName');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Renamed rule must remain the original subclass.',\n+ );\n self::assertSame(\n 'newName',\n $rule->name,\n@@ -223,6 +241,11 @@ public function testUpdateRule(): void\n \n $rule = $this->auth->getRule('newName');\n \n+ self::assertInstanceOf(\n+ AuthorRule::class,\n+ $rule,\n+ 'Subsequent reload must keep the subclass.',\n+ );\n self::assertTrue(\n $rule->reallyReally,\n 'Subsequent property update must persist.',\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\nindex 42367bcb4d0..f95baad958b 100644\n--- a/tests/framework/rbac/PhpManagerTest.php\n+++ b/tests/framework/rbac/PhpManagerTest.php\n@@ -18,6 +18,8 @@\n \n /**\n * Unit test for {@see \\yii\\rbac\\PhpManager}.\n+ *\n+ * @extends ManagerTestCase<ExposedPhpManager>\n */\n #[Group('rbac')]\n #[Group('rbac-php')]\ndiff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex 11919269e50..077fd71a147 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n Pagination|bool|array $pagination,\ndiff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\nindex bdb1b0bfc82..f5ea8564de0 100644\n--- a/tests/framework/test/ActiveFixtureTest.php\n+++ b/tests/framework/test/ActiveFixtureTest.php\n@@ -43,7 +43,11 @@ public function testGetData(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(CustomerFixture::class, $fixture !== null ? $fixture::class : self::class);\n+ self::assertInstanceOf(\n+ CustomerFixture::class,\n+ $fixture,\n+ 'Customer fixture must be registered.',\n+ );\n $this->assertCount(2, $fixture);\n $this->assertEquals(1, $fixture['customer1']['id']);\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\n@@ -62,13 +66,28 @@ public function testGetModel(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(Customer::class, $fixture->getModel('customer1')::class);\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\n+ self::assertInstanceOf(\n+ CustomerFixture::class,\n+ $fixture,\n+ 'Customer fixture must be registered.',\n+ );\n+\n+ $customer1 = $fixture->getModel('customer1');\n+\n+ self::assertInstanceOf(\n+ Customer::class,\n+ $customer1,\n+ 'Customer model must be resolved by key.',\n+ );\n+\n+ $this->assertEquals(1, $customer1->id);\n+ $this->assertEquals('customer1@example.com', $customer1->email);\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\n \n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+ $this->assertEquals(2, $customer2->id);\n+ $this->assertEquals('customer2@example.com', $customer2->email);\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\n \n $test->tearDown();\n@@ -80,8 +99,10 @@ public function testDataDirectory(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(Customer::class, $directory);\n $this->assertEquals(1, $directory->id);\n $this->assertEquals('directory@example.com', $directory['email']);\n $test->tearDown();\n@@ -93,8 +114,10 @@ public function testDataPath(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer);\n $this->assertEquals(1, $customer->id);\n $this->assertEquals('customer1@example.com', $customer['email']);\n $test->tearDown();\n@@ -106,6 +129,7 @@ public function testTruncate(): void\n \n $test->setUp();\n $fixture = $test->getFixture('animals');\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\n $this->assertEmpty($fixture->data);\n $test->tearDown();\n }\ndiff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\nindex 2071a7a5387..789a1183405 100644\n--- a/tests/framework/validators/FileValidatorTest.php\n+++ b/tests/framework/validators/FileValidatorTest.php\n@@ -353,7 +353,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\n \n /**\n * @param array $params\n- * @return UploadedFile[]\n+ * @return UploadedFile|UploadedFile[]\n */\n protected function createTestFiles($params = [])\n {\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\nindex 9635b9dc1b7..bec0aca3686 100644\n--- a/tests/framework/validators/FilterValidatorTest.php\n+++ b/tests/framework/validators/FilterValidatorTest.php\n@@ -10,8 +10,8 @@\n \n use yii\\validators\\FilterValidator;\n use yii\\validators\\Validator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -87,7 +87,10 @@ public function testClientValidateAttributeReturnsNullWithoutClientScript(): voi\n {\n $val = new FilterValidator(['filter' => 'trim']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\n+ $this->assertNull(\n+ $val->clientValidateAttribute($m, 'attr_one', new ViewStub()),\n+ 'No `ClientValidatorScriptInterface` binding must yield `null`.',\n+ );\n }\n \n public function testGetClientOptionsDefault(): void\n@@ -106,10 +109,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class FilterViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\nindex aef333849a9..06553221616 100644\n--- a/tests/framework/validators/RequiredValidatorTest.php\n+++ b/tests/framework/validators/RequiredValidatorTest.php\n@@ -10,7 +10,6 @@\n \n namespace yiiunit\\framework\\validators;\n \n-use yii\\base\\Model;\n use yii\\validators\\RequiredValidator;\n use yii\\validators\\Validator;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n@@ -159,20 +158,3 @@ public function testErrorMessageWithoutRequiredValueShowsBlank(): void\n $this->assertStringNotContainsString('{requiredValue}', $errors[0]);\n }\n }\n-\n-class ModelForReqValidator extends Model\n-{\n- public $attr;\n-\n- public function rules()\n- {\n- return [\n- [['attr'], 'required'],\n- ];\n- }\n-\n- public function attributeLabels()\n- {\n- return ['attr' => '<b>Attr</b>'];\n- }\n-}\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\nindex 079cda410a7..c4eafa9243c 100644\n--- a/tests/framework/validators/SafeValidatorTest.php\n+++ b/tests/framework/validators/SafeValidatorTest.php\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n }\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\n \n $validator->validateAttributes($model, ['name', 'email']);\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n- $this->assertNull($model->email);\n+ $this->assertNull($model['email']);\n $this->assertFalse($model->hasErrors());\n }\n \n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\n \n $validator->validateAttribute($model, 'field');\n \n- $this->assertNull($model->field);\n+ $this->assertNull($model['field']);\n $this->assertFalse($model->hasErrors('field'));\n }\n \n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\n \n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\n \n+ $this->assertTrue(isset($model->username));\n $this->assertSame('admin', $model->username);\n- $this->assertNull($model->role);\n+ $this->assertNull($model['role']);\n }\n \n public function testValidationAlwaysPasses(): void\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\n $validator->validateAttribute($model, 'attr');\n \n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\n- $this->assertSame($value, $model->attr);\n+ $this->assertSame($value, $model['attr']);\n }\n }\n }\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\nindex 83fef90d20c..1739ca5646e 100644\n--- a/tests/framework/validators/TrimValidatorTest.php\n+++ b/tests/framework/validators/TrimValidatorTest.php\n@@ -38,6 +38,7 @@ public function testTrimWhitespace(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -48,6 +49,7 @@ public function testTrimTabs(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -59,6 +61,7 @@ public function testTrimCustomChars(): void\n \n $validator->validateAttribute($model, 'path');\n \n+ $this->assertTrue(isset($model->path));\n $this->assertSame('hello', $model->path);\n }\n \n@@ -69,6 +72,7 @@ public function testTrimEmptyString(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -79,6 +83,7 @@ public function testTrimNullValue(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -89,6 +94,7 @@ public function testTrimIntegerValue(): void\n \n $validator->validateAttribute($model, 'count');\n \n+ $this->assertTrue(isset($model->count));\n $this->assertSame('42', $model->count);\n }\n \n@@ -99,6 +105,7 @@ public function testTrimArray(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame(['foo', 'bar'], $model->tags);\n }\n \n@@ -111,6 +118,7 @@ public function testSkipOnArrayTrue(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame($original, $model->tags);\n }\n \n@@ -122,6 +130,7 @@ public function testSkipOnArrayTrueWithScalar(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -139,6 +148,7 @@ public function testTrimBooleanValue(): void\n \n $validator->validateAttribute($model, 'flag');\n \n+ $this->assertTrue(isset($model->flag));\n $this->assertSame('1', $model->flag);\n }\n \n@@ -149,6 +159,7 @@ public function testTrimWithModelRules(): void\n \n $model->validate();\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n $this->assertFalse($model->hasErrors());\n }\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\nindex 8b466f018f0..2ec03928235 100644\n--- a/tests/framework/validators/ValidatorTest.php\n+++ b/tests/framework/validators/ValidatorTest.php\n@@ -257,6 +257,8 @@ public function testClientValidateAttribute(): void\n \n $model = new FakedValidationModel();\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\n+ $this->assertInstanceOf(InlineValidator::class, $val);\n+\n $val->clientValidate = 'clientInlineVal';\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\n \ndiff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\nnew file mode 100644\nindex 00000000000..3d4654c80ed\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\base\\Model;\n+\n+class ModelForReqValidator extends Model\n+{\n+ public $attr;\n+\n+ public function rules()\n+ {\n+ return [\n+ [['attr'], 'required'],\n+ ];\n+ }\n+\n+ public function attributeLabels()\n+ {\n+ return ['attr' => '<b>Attr</b>'];\n+ }\n+}\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\nnew file mode 100644\nindex 00000000000..a6a957ac910\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ViewStub.php\n@@ -0,0 +1,18 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\web\\View;\n+\n+class ViewStub extends View\n+{\n+ public function registerAssetBundle($name, $position = null)\n+ {\n+ }\n+}\ndiff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\nindex 471b9c7b229..09d06635607 100644\n--- a/tests/framework/web/ControllerTest.php\n+++ b/tests/framework/web/ControllerTest.php\n@@ -12,10 +12,10 @@\n \n use PHPUnit\\Framework\\Attributes\\Group;\n use yii\\web\\Application;\n-use yiiunit\\framework\\web\\FakeController;\n-use yiiunit\\framework\\web\\FakeInjectionController;\n-use yiiunit\\framework\\web\\FakeTypedParamsController;\n use yiiunit\\framework\\web\\FakeUnionTypesController;\n+use yiiunit\\framework\\web\\stubs\\FakeController;\n+use yiiunit\\framework\\web\\stubs\\FakeInjectionController;\n+use yiiunit\\framework\\web\\stubs\\FakeTypedParamsController;\n use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n use yii\\base\\Module;\n use yii\\data\\ArrayDataProvider;\n@@ -23,6 +23,7 @@\n use Yii;\n use yii\\base\\InlineAction;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\Controller;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\Response;\n use yii\\web\\ServerErrorHttpException;\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\nindex f36761369f2..6a492a18b8f 100644\n--- a/tests/framework/web/ErrorActionTest.php\n+++ b/tests/framework/web/ErrorActionTest.php\n@@ -113,13 +113,12 @@ public function testDefaultView(): void\n \n public function testLayout(): void\n {\n+ $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n $this->expectException(\\yii\\base\\ViewNotFoundException::class);\n+ $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n \n $this->getController([\n 'layout' => 'non-existing',\n ])->runAction('error');\n-\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n- $this->expectExceptionMessageMatches('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n }\n }\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex 41d067957b8..aed6802c83b 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -58,7 +58,7 @@ public function testCorrectResponseCodeInErrorView(): void\n \n public function testFormatRaw(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_RAW;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_RAW;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -78,7 +78,7 @@ public function testFormatRaw(): void\n \n public function testFormatXml(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_XML;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_XML;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -104,7 +104,9 @@ public function testFormatXml(): void\n \n public function testClearAssetFilesInErrorView(): void\n {\n- Yii::$app->getView()->registerJsFile('somefile.js');\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJsFile('somefile.js');\n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n ob_start(); // suppress response output\n@@ -117,7 +119,10 @@ public function testClearAssetFilesInErrorView(): void\n public function testClearAssetFilesInErrorActionView(): void\n {\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\n- Yii::$app->getView()->registerJs(\"alert('hide me')\", View::POS_END);\n+\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJs(\"alert('hide me')\", View::POS_END);\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -280,6 +285,28 @@ public function testHtmlEncodeWithUnicodeSequence(): void\n \n $this->assertSame($expected, $handler->htmlEncode($text));\n }\n+\n+ public function testRenderFileDoesNotAllowInternalFileOverride(): void\n+ {\n+ $viewFile = tempnam(sys_get_temp_dir(), 'yii2-error-view-');\n+ $secretFile = tempnam(sys_get_temp_dir(), 'yii2-error-secret-');\n+\n+ file_put_contents($viewFile, '<?php echo \"safe error view\";');\n+ file_put_contents($secretFile, 'secret data');\n+\n+ try {\n+ /** @var ErrorHandler $handler */\n+ $handler = Yii::$app->getErrorHandler();\n+\n+ $this->assertSame(\n+ 'safe error view',\n+ $handler->renderFileForException($viewFile, ['_file_' => $secretFile], new ErrorException('test'))\n+ );\n+ } finally {\n+ @unlink($viewFile);\n+ @unlink($secretFile);\n+ }\n+ }\n }\n \n class ErrorHandler extends \\yii\\web\\ErrorHandler\n@@ -291,4 +318,11 @@ protected function shouldRenderSimpleHtml()\n {\n return false;\n }\n+\n+ public function renderFileForException($file, array $params, \\Throwable $exception): string\n+ {\n+ $this->exception = $exception;\n+\n+ return $this->renderFile($file, $params);\n+ }\n }\ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\nindex f97d639f04e..fee4ea9653a 100644\n--- a/tests/framework/web/GroupUrlRuleTest.php\n+++ b/tests/framework/web/GroupUrlRuleTest.php\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertNull($rules->rules[0]->verb);\n \n $config = [\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(2, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertContains('GET', $rules->rules[0]->verb);\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\nindex 6f3022195f3..ef015dc1f4a 100644\n--- a/tests/framework/web/JsonResponseFormatterTest.php\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\n@@ -19,12 +19,11 @@\n * @since 2.0.3\n *\n * @group web\n+ *\n+ * @extends BaseFormatter<JsonResponseFormatter>\n */\n class JsonResponseFormatterTest extends BaseFormatter\n {\n- /**\n- * @return JsonResponseFormatter\n- */\n protected function getFormatterInstance($configuration = [])\n {\n return new JsonResponseFormatter($configuration);\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\nindex 1aa7d33a0ce..68d0f6ce620 100644\n--- a/tests/framework/web/MultipartFormDataParserTest.php\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\n@@ -192,6 +192,7 @@ public function testForce(): void\n $_POST = [\n 'existingName' => 'value',\n ];\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [\n 'existingFile' => [\n 'name' => 'file.txt',\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\nindex f37f070a7a9..f2588b88ee5 100644\n--- a/tests/framework/web/UploadedFileTest.php\n+++ b/tests/framework/web/UploadedFileTest.php\n@@ -101,6 +101,7 @@ public function testSaveAs(): void\n \n public function testSaveFileFromMultipartFormDataParser(): void\n {\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [];\n UploadedFile::reset();\n $model = new ModelStub();\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\nindex a5c23e48b1f..5cae21fd03f 100644\n--- a/tests/framework/web/UserIdentity.php\n+++ b/tests/framework/web/UserIdentity.php\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\n \n public static function findIdentity($id)\n {\n- if (in_array($id, static::$ids)) {\n+ if (in_array($id, self::$ids)) {\n $identitiy = new static();\n $identitiy->_id = $id;\n return $identitiy;\n }\n+\n+ return null;\n }\n \n public static function findIdentityByAccessToken($token, $type = null): never\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\nindex de77673bb56..382f6f56e42 100644\n--- a/tests/framework/web/UserTest.php\n+++ b/tests/framework/web/UserTest.php\n@@ -14,7 +14,7 @@\n */\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n \n namespace yiiunit\\framework\\web;\n@@ -34,7 +34,7 @@ function time()\n class UserTest extends TestCase\n {\n /**\n- * @var int virtual time to be returned by mocked time() function.\n+ * @var int|null virtual time to be returned by mocked time() function.\n * Null means normal time() behavior.\n */\n public static $time;\n@@ -593,9 +593,9 @@ public function getCookies()\n \n class AccessChecker extends BaseObject implements CheckAccessInterface\n {\n- public function checkAccess($userId, $permissionName, $params = []): void\n+ public function checkAccess($userId, $permissionName, $params = []): bool\n {\n- // Implement checkAccess() method.\n+ return false;\n }\n }\n \ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\nindex 77e2cc4d657..5957d0237a9 100644\n--- a/tests/framework/web/XmlResponseFormatterTest.php\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\n@@ -18,12 +18,13 @@\n * @since 2.0\n *\n * @group web\n+ *\n+ * @extends BaseFormatter<XmlResponseFormatter>\n */\n class XmlResponseFormatterTest extends BaseFormatter\n {\n /**\n * @param array $options\n- * @return XmlResponseFormatter\n */\n protected function getFormatterInstance($options = [])\n {\ndiff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\nsimilarity index 91%\nrename from tests/framework/web/FakeController.php\nrename to tests/framework/web/stubs/FakeController.php\nindex e4b95a9e4c3..b72c2651de6 100644\n--- a/tests/framework/web/FakeController.php\n+++ b/tests/framework/web/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakeInjectionController.php b/tests/framework/web/stubs/FakeInjectionController.php\nsimilarity index 87%\nrename from tests/framework/web/FakeInjectionController.php\nrename to tests/framework/web/stubs/FakeInjectionController.php\nindex 8f21ea652b9..c6b36ea9a6f 100644\n--- a/tests/framework/web/FakeInjectionController.php\n+++ b/tests/framework/web/stubs/FakeInjectionController.php\n@@ -6,13 +6,12 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\data\\DataProviderInterface;\n use yii\\web\\Controller;\n use yii\\web\\Request;\n-use yiiunit\\framework\\web\\stubs\\VendorImage;\n-use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n+use yiiunit\\framework\\web\\Post;\n \n /**\n * @author Sam Mousa<sam@mousa.nl>\ndiff --git a/tests/framework/web/FakeTypedParamsController.php b/tests/framework/web/stubs/FakeTypedParamsController.php\nsimilarity index 95%\nrename from tests/framework/web/FakeTypedParamsController.php\nrename to tests/framework/web/stubs/FakeTypedParamsController.php\nindex 815319c5073..1142b654b0a 100644\n--- a/tests/framework/web/FakeTypedParamsController.php\n+++ b/tests/framework/web/stubs/FakeTypedParamsController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 39cd37dbdc0..395999f08fd 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build(): never\n {\ndiff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\nindex 0bc1ffe0441..a5db934eab3 100644\n--- a/tests/framework/widgets/ActiveFieldTest.php\n+++ b/tests/framework/widgets/ActiveFieldTest.php\n@@ -1512,6 +1512,8 @@ public function attributeHints()\n \n /**\n * Helper Classes.\n+ *\n+ * @property ActiveFieldTestModel $model\n */\n class ActiveFieldExtend extends ActiveField\n {\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\nindex 8e77db7332b..07c4da70fcc 100644\n--- a/tests/framework/widgets/ActiveFormTest.php\n+++ b/tests/framework/widgets/ActiveFormTest.php\n@@ -114,6 +114,7 @@ public function testIssue5356(): void\n \n $model->categories = 1;\n \n+\n ob_start();\n $form = ActiveForm::begin(\n [\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\nindex 6a6a2adf11e..a928e466910 100644\n--- a/tests/framework/widgets/DetailViewTest.php\n+++ b/tests/framework/widgets/DetailViewTest.php\n@@ -19,9 +19,6 @@\n */\n class DetailViewTest extends TestCase\n {\n- /** @var DetailView */\n- public $detailView;\n-\n protected function setUp(): void\n {\n parent::setUp();\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -58,11 +55,11 @@ public function testAttributeValue(): void\n ],\n ]);\n \n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\n }\n \n@@ -75,7 +72,7 @@ public function testUnicodeAttributeNames(): void\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -86,11 +83,11 @@ public function testUnicodeAttributeNames(): void\n \n $this->assertEquals(\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\n );\n $this->assertEquals(\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\n );\n }\n \n@@ -99,7 +96,7 @@ public function testAttributeVisible(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -161,7 +158,7 @@ public function testAttributeVisible(): void\n 'value' => 'Displayed id',\n 'visible' => true,\n ],\n- ], $this->detailView->attributes);\n+ ], $detailView->attributes);\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\n }\n \n@@ -172,7 +169,7 @@ public function testRelationAttribute(): void\n $model->related = new ModelMock();\n $model->related->id = 'related';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -181,13 +178,13 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\n \n // test null relation\n $model->related = null;\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -196,8 +193,8 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\n }\n \n public function testArrayableModel(): void\n@@ -221,11 +218,11 @@ public function testArrayableModel(): void\n $model->id = 1;\n $model->text = 'I`m arrayable';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testObjectModel(): void\n@@ -249,11 +246,11 @@ public function testObjectModel(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testArrayModel(): void\n@@ -278,18 +275,18 @@ public function testArrayModel(): void\n 'text' => 'I`m an array',\n ];\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testOptionsTags(): void\n {\n $expectedValue = '<tr><th tooltip=\"Tooltip\">Text</th><td class=\"bg-red\">I`m an array</td></tr>';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => [\n 'text' => 'I`m an array',\n ],\n@@ -303,9 +300,9 @@ public function testOptionsTags(): void\n ],\n ]);\n \n- foreach ($this->detailView->attributes as $index => $attribute) {\n- $a = $this->detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ foreach ($detailView->attributes as $index => $attribute) {\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $renderingResult);\n }\n }\n \n@@ -319,7 +316,7 @@ public function testShouldTriggerInitEvent(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n 'on init' => function () use (&$initTriggered): void {\n $initTriggered = true;\n@@ -344,6 +341,8 @@ class ArrayableMock implements Arrayable\n \n /**\n * Helper Class.\n+ *\n+ * @property mixed $related\n */\n class ModelMock extends Model\n {\n"},"num_subtasks":{"kind":"number","value":35,"string":"35"},"num_changed_files":{"kind":"number","value":90,"string":"90"}}},{"rowIdx":34265,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20875"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20875,"string":"20,875"},"base_sha":{"kind":"string","value":"0f5774ae62b22c9724a12e520cea8adb7ac83785"},"head_sha":{"kind":"string","value":"280fd066b1c55490d88bf3e3a72a8ee143dfa4f9"},"task":{"kind":"string","value":"Analyze the `yiiunit\\framework\\validators` namespace using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `build/controllers/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["build/controllers/PhpDocController.php"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s4","goal":"Implement the changes under `framework/base/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["framework/base/Model.php"]},{"subtask_id":"s5","goal":"Implement the changes under `framework/validators/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["framework/validators/CompareValidator.php","framework/validators/Validator.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/data/validators/models/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["tests/data/validators/models/FakedValidationModel.php","tests/data/validators/models/ValidatorTestMainModel.php","tests/data/validators/models/ValidatorTestRefModel.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/base/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["tests/framework/base/BaseObjectTest.php","tests/framework/base/BehaviorTest.php","tests/framework/base/ComponentTest.php","tests/framework/base/DynamicModelTest.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/validators/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["tests/framework/validators/BooleanValidatorTest.php","tests/framework/validators/CompareValidatorTest.php","tests/framework/validators/FileValidatorTest.php","tests/framework/validators/FilterValidatorTest.php","tests/framework/validators/RegularExpressionValidatorTest.php","tests/framework/validators/RequiredValidatorTest.php","tests/framework/validators/SafeValidatorTest.php","tests/framework/validators/TrimValidatorTest.php","tests/framework/validators/UniqueValidatorTest.php","tests/framework/validators/ValidatorTest.php"]},{"subtask_id":"s9","goal":"Implement the changes under `tests/framework/validators/stubs/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan","scope_files":["tests/framework/validators/stubs/ModelForReqValidator.php","tests/framework/validators/stubs/ViewStub.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `build/controllers/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"build/controllers/PhpDocController.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `framework/base/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/base/Model.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `framework/validators/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/validators/CompareValidator.php\",\n \"framework/validators/Validator.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/data/validators/models/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/data/validators/models/FakedValidationModel.php\",\n \"tests/data/validators/models/ValidatorTestMainModel.php\",\n \"tests/data/validators/models/ValidatorTestRefModel.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/base/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/base/BaseObjectTest.php\",\n \"tests/framework/base/BehaviorTest.php\",\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/DynamicModelTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/validators/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/validators/BooleanValidatorTest.php\",\n \"tests/framework/validators/CompareValidatorTest.php\",\n \"tests/framework/validators/FileValidatorTest.php\",\n \"tests/framework/validators/FilterValidatorTest.php\",\n \"tests/framework/validators/RegularExpressionValidatorTest.php\",\n \"tests/framework/validators/RequiredValidatorTest.php\",\n \"tests/framework/validators/SafeValidatorTest.php\",\n \"tests/framework/validators/TrimValidatorTest.php\",\n \"tests/framework/validators/UniqueValidatorTest.php\",\n \"tests/framework/validators/ValidatorTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s9\",\n \"goal\": \"Implement the changes under `tests/framework/validators/stubs/` needed for: Analyze the `yiiunit\\\\framework\\\\validators` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/validators/stubs/ModelForReqValidator.php\",\n \"tests/framework/validators/stubs/ViewStub.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex c369f29ed19..608efda39af 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -5,6 +5,8 @@ includes:\n parameters:\n level: 3\n \n+ reportIgnoresWithoutComments: true\n+\n paths:\n - build\n - framework\n@@ -17,7 +19,6 @@ parameters:\n - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/validators\n \n bootstrapFiles:\n - framework/BaseYii.php\n\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["build/controllers/PhpDocController.php"],"solution_diff":"diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\nindex b0da27b75ad..bc4f3ea5f09 100644\n--- a/build/controllers/PhpDocController.php\n+++ b/build/controllers/PhpDocController.php\n@@ -713,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\n }\n if ($propertyPart) {\n preg_match(\n- '/@property(?:-read|-write)?\\s+([\\\\\\\\\\w\\|\\[\\]]+)\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n+ '/@property(?:-read|-write)?\\s+' . self::TYPE_REG_EXP\n+ . '\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n $line,\n $matches\n );\n \n- if (isset($matches[2])) {\n- $lastPropertyName = $matches[2];\n+ if (isset($matches[1])) {\n+ $lastPropertyName = $matches[1];\n }\n \n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\n","summary":"Edited 1 file(s) in build/controllers/"},{"subtask_id":"s3","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 2296dfc0938..0d83c0d7557 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,7 +4,11 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s4","scope_files":["framework/base/Model.php"],"solution_diff":"diff --git a/framework/base/Model.php b/framework/base/Model.php\nindex ec725426328..fb4b0b9de73 100644\n--- a/framework/base/Model.php\n+++ b/framework/base/Model.php\n@@ -38,7 +38,7 @@\n *\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\n *\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\n * array of errors for all attributes, similar to the following:\n *\n * ```\n@@ -579,8 +579,9 @@ public function hasErrors($attribute = null)\n /**\n * Returns the errors for all attributes or a single attribute.\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\n+ * all attributes, the result is a two-dimensional array, like the following:\n *\n * ```\n * [\n","summary":"Edited 1 file(s) in framework/base/"},{"subtask_id":"s5","scope_files":["framework/validators/CompareValidator.php","framework/validators/Validator.php"],"solution_diff":"diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\nindex 27783fc26d7..a72410dc483 100644\n--- a/framework/validators/CompareValidator.php\n+++ b/framework/validators/CompareValidator.php\n@@ -94,7 +94,7 @@ class CompareValidator extends Validator\n */\n public $operator = '==';\n /**\n- * @var string the user-defined error message. It may contain the following placeholders which\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\n * will be replaced accordingly by the validator:\n *\n * - `{attribute}`: the label of the attribute being validated\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\nindex 977d68e2895..70a54a9ce84 100644\n--- a/framework/validators/Validator.php\n+++ b/framework/validators/Validator.php\n@@ -316,6 +316,8 @@ public function validateAttribute($model, $attribute)\n * @param mixed $value the data value to be validated.\n * @param string|null $error the error message to be returned, if the validation fails.\n * @return bool whether the data is valid.\n+ *\n+ * @param-out string|null $error\n */\n public function validate($value, &$error = null)\n {\n","summary":"Edited 2 file(s) in framework/validators/"},{"subtask_id":"s6","scope_files":["tests/data/validators/models/FakedValidationModel.php","tests/data/validators/models/ValidatorTestMainModel.php","tests/data/validators/models/ValidatorTestRefModel.php"],"solution_diff":"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\nindex 0f2cf644cb3..e6f5a8a597b 100644\n--- a/tests/data/validators/models/FakedValidationModel.php\n+++ b/tests/data/validators/models/FakedValidationModel.php\n@@ -10,6 +10,33 @@\n \n use yii\\base\\Model;\n \n+/**\n+ * @property mixed $attr\n+ * @property mixed $attr_url\n+ * @property mixed $attr_string\n+ * @property mixed $attr_reg1\n+ * @property mixed $attr_number\n+ * @property mixed $attr_ip\n+ * @property mixed $attr_array\n+ * @property mixed $attr_array_skipped\n+ * @property mixed $attr_files\n+ * @property mixed $attr_one\n+ * @property mixed $attr_two\n+ * @property mixed $attr_empty1\n+ * @property mixed $attr_empty2\n+ * @property mixed $attr_email\n+ * @property mixed $attr_date\n+ * @property mixed $attr_timestamp\n+ * @property mixed $attr_test\n+ * @property mixed $attr_test_val\n+ * @property mixed $attr_test_repeat\n+ * @property mixed $attrA\n+ * @property mixed $attrB\n+ * @property mixed $attrC\n+ * @property mixed $attrD\n+ * @property mixed $attr_image\n+ * @property mixed $attr_images\n+ */\n class FakedValidationModel extends Model\n {\n public $val_attr_a;\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\nindex 73faaf22f39..1752079bc08 100644\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\n@@ -10,6 +10,9 @@\n \n use yiiunit\\data\\ar\\ActiveRecord;\n \n+/**\n+ * @property int $id\n+ */\n class ValidatorTestMainModel extends ActiveRecord\n {\n public $testMainVal = 1;\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\nindex 8642dc317c9..0bdb0c71f83 100644\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\n@@ -11,9 +11,9 @@\n use yiiunit\\data\\ar\\ActiveRecord;\n \n /**\n- * @property int id\n- * @property string a_field\n- * @property int ref\n+ * @property int $id\n+ * @property string $a_field\n+ * @property int $ref\n */\n class ValidatorTestRefModel extends ActiveRecord\n {\n","summary":"Edited 3 file(s) in tests/data/validators/models/"},{"subtask_id":"s7","scope_files":["tests/framework/base/BaseObjectTest.php","tests/framework/base/BehaviorTest.php","tests/framework/base/ComponentTest.php","tests/framework/base/DynamicModelTest.php"],"solution_diff":"diff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\nindex e19c7f534a9..94ec65e2175 100644\n--- a/tests/framework/base/BaseObjectTest.php\n+++ b/tests/framework/base/BaseObjectTest.php\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->object->Caption;\n }\n \n@@ -82,8 +81,7 @@ public function testSetProperty(): void\n $this->object->Text = $value;\n $this->assertEquals($value, $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->object->NewMember = $value;\n }\n \n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->object->unknownMethod();\n }\n \ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\nindex cbaa2ce6db5..c3dd2773818 100644\n--- a/tests/framework/base/BehaviorTest.php\n+++ b/tests/framework/base/BehaviorTest.php\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\n $bar->attachBehavior('bar', $behavior);\n \n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $bar->nomagicBehaviorMethod();\n }\n }\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex 5b2f5750b03..19746c6bd7d 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -114,8 +114,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->component->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->component->Caption;\n }\n \n@@ -125,8 +124,7 @@ public function testSetProperty(): void\n $this->component->Text = $value;\n $this->assertEquals($value, $this->component->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->component->NewMember = $value;\n }\n \n@@ -153,8 +151,7 @@ public function testIsset(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->component->unknownMethod();\n }\n \n@@ -187,8 +184,7 @@ public function testOn(): void\n \n $this->assertFalse($this->component->hasEventHandlers('click2'));\n $p = 'on click2';\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $this->component->$p = 'foo2';\n $this->assertTrue($this->component->hasEventHandlers('click2'));\n }\n@@ -354,21 +350,18 @@ public function testAttachBehavior(): void\n }\n \n $component = new NewComponent();\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as b'} = ['class' => NewBehavior::class];\n $this->assertInstanceOf(NewBehavior::class, $component->getBehavior('b'));\n $this->assertTrue($component->hasProperty('p'));\n $component->test();\n $this->assertTrue($component->behaviorCalled);\n \n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as c'} = ['__class' => NewBehavior::class];\n $this->assertNotNull($component->getBehavior('c'));\n \n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as d'} = [\n '__class' => NewBehavior2::class,\n 'class' => NewBehavior::class,\n@@ -377,8 +370,7 @@ public function testAttachBehavior(): void\n \n // CVE-2024-4990\n try {\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as e'} = [\n '__class' => 'NotExistsBehavior',\n 'class' => NewBehavior::class,\n@@ -469,8 +461,7 @@ public function testSettingBehaviorWithSetter(): void\n $behaviorName = 'foo';\n $this->assertNull($this->component->getBehavior($behaviorName));\n $p = 'as ' . $behaviorName;\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $this->component->$p = __NAMESPACE__ . '\\NewBehavior';\n $this->assertSame(__NAMESPACE__ . '\\NewBehavior', get_class($this->component->getBehavior($behaviorName)));\n }\n@@ -568,8 +559,7 @@ public function testSetBehaviorInstanceViaProperty(): void\n $component = new NewComponent();\n $behavior = new NewBehavior();\n $p = 'as myBehavior';\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (/ Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->$p = $behavior;\n $this->assertSame($behavior, $component->getBehavior('myBehavior'));\n }\ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\nindex 31b218f5187..24ef4cb86c8 100644\n--- a/tests/framework/base/DynamicModelTest.php\n+++ b/tests/framework/base/DynamicModelTest.php\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\n $this->assertTrue($model->canSetProperty('email'));\n $this->assertTrue($model->canSetProperty('name'));\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $age = $model->age;\n }\n \n","summary":"Edited 4 file(s) in tests/framework/base/"},{"subtask_id":"s8","scope_files":["tests/framework/validators/BooleanValidatorTest.php","tests/framework/validators/CompareValidatorTest.php","tests/framework/validators/FileValidatorTest.php","tests/framework/validators/FilterValidatorTest.php","tests/framework/validators/RegularExpressionValidatorTest.php","tests/framework/validators/RequiredValidatorTest.php","tests/framework/validators/SafeValidatorTest.php","tests/framework/validators/TrimValidatorTest.php","tests/framework/validators/UniqueValidatorTest.php","tests/framework/validators/ValidatorTest.php"],"solution_diff":"diff --git a/tests/framework/validators/BooleanValidatorTest.php b/tests/framework/validators/BooleanValidatorTest.php\nindex f66e44b0263..dd70e5c016b 100644\n--- a/tests/framework/validators/BooleanValidatorTest.php\n+++ b/tests/framework/validators/BooleanValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\BooleanValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -91,10 +91,3 @@ public function testErrorMessage(): void\n );\n }\n }\n-\n-class ViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/CompareValidatorTest.php b/tests/framework/validators/CompareValidatorTest.php\nindex 74c6c4bc7d1..52c213a02ea 100644\n--- a/tests/framework/validators/CompareValidatorTest.php\n+++ b/tests/framework/validators/CompareValidatorTest.php\n@@ -12,6 +12,7 @@\n use yii\\base\\InvalidConfigException;\n use yii\\validators\\CompareValidator;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -375,7 +376,7 @@ public function testClientValidateAttribute(): void\n $model = new FakedValidationModel();\n $model->attr_test = 'test';\n $val = new CompareValidator(['compareValue' => 'expected']);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringStartsWith('yii.validation.compare(', $js);\n $this->assertStringContainsString('$form', $js);\n@@ -411,7 +412,7 @@ public function testClientValidateAttributeWithClosure(): void\n $val = new CompareValidator(['compareValue' => function () {\n return 'resolved';\n }]);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringContainsString('resolved', $js);\n }\n@@ -421,7 +422,7 @@ public function testClientValidateAttributeContainsEncodedOptions(): void\n $model = new FakedValidationModel();\n $model->attr_test = 'test';\n $val = new CompareValidator(['compareValue' => 'check']);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringContainsString('\"operator\":\"==\"', $js);\n $this->assertStringContainsString('\"compareValue\":\"check\"', $js);\n@@ -497,10 +498,3 @@ public function testDefaultOperatorFallsThrough(): void\n $this->assertFalse($val->validate(999));\n }\n }\n-\n-class CompareViewStub extends \\yii\\web\\View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\nindex d5c647d7491..e89d493e806 100644\n--- a/tests/framework/validators/FileValidatorTest.php\n+++ b/tests/framework/validators/FileValidatorTest.php\n@@ -335,7 +335,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\n \n /**\n * @param array $params\n- * @return UploadedFile[]\n+ * @return UploadedFile|UploadedFile[]\n */\n protected function createTestFiles($params = [])\n {\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\nindex 477b4f8ee95..228b3c8af01 100644\n--- a/tests/framework/validators/FilterValidatorTest.php\n+++ b/tests/framework/validators/FilterValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\FilterValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -75,7 +75,7 @@ public function testClientValidateAttributeWithTrimFilter(): void\n {\n $val = new FilterValidator(['filter' => 'trim']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $js = $val->clientValidateAttribute($m, 'attr_one', new FilterViewStub());\n+ $js = $val->clientValidateAttribute($m, 'attr_one', new ViewStub());\n $this->assertStringContainsString('yii.validation.trim', $js);\n }\n \n@@ -83,7 +83,7 @@ public function testClientValidateAttributeWithNonTrimFilter(): void\n {\n $val = new FilterValidator(['filter' => 'strtolower']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\n+ $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new ViewStub()));\n }\n \n public function testGetClientOptionsDefault(): void\n@@ -102,10 +102,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class FilterViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RegularExpressionValidatorTest.php b/tests/framework/validators/RegularExpressionValidatorTest.php\nindex 1881a4bcbbf..1872c56d248 100644\n--- a/tests/framework/validators/RegularExpressionValidatorTest.php\n+++ b/tests/framework/validators/RegularExpressionValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\RegularExpressionValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -81,7 +81,7 @@ public function testClientValidateAttribute(): void\n {\n $val = new RegularExpressionValidator(['pattern' => '/^[a-z]+$/i']);\n $m = FakedValidationModel::createWithAttributes(['attr_reg1' => 'abc']);\n- $js = $val->clientValidateAttribute($m, 'attr_reg1', new RegexViewStub());\n+ $js = $val->clientValidateAttribute($m, 'attr_reg1', new ViewStub());\n $this->assertStringContainsString('yii.validation.regularExpression', $js);\n }\n \n@@ -113,10 +113,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class RegexViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\nindex 0e2a21e1c29..2b2d4382fc6 100644\n--- a/tests/framework/validators/RequiredValidatorTest.php\n+++ b/tests/framework/validators/RequiredValidatorTest.php\n@@ -8,10 +8,10 @@\n \n namespace yiiunit\\framework\\validators;\n \n-use yii\\base\\Model;\n use yii\\validators\\RequiredValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ModelForReqValidator;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -78,7 +78,7 @@ public function testErrorClientMessage(): void\n \n $this->assertEquals(\n 'yii.validation.required(value, messages, {\"message\":\"\\u003Cstrong\\u003Eerror\\u003C\\/strong\\u003E for \\u003Cb\\u003EAttr\\u003C\\/b\\u003E\"});',\n- $validator->clientValidateAttribute($obj, 'attr', new RequiredViewStub())\n+ $validator->clientValidateAttribute($obj, 'attr', new ViewStub())\n );\n }\n \n@@ -196,27 +196,3 @@ public function testGetClientOptionsMessageContainsRequiredValue(): void\n $this->assertStringContainsString('confirm', $options['message']);\n }\n }\n-\n-class ModelForReqValidator extends Model\n-{\n- public $attr;\n-\n- public function rules()\n- {\n- return [\n- [['attr'], 'required'],\n- ];\n- }\n-\n- public function attributeLabels()\n- {\n- return ['attr' => '<b>Attr</b>'];\n- }\n-}\n-\n-class RequiredViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\nindex 079cda410a7..c4eafa9243c 100644\n--- a/tests/framework/validators/SafeValidatorTest.php\n+++ b/tests/framework/validators/SafeValidatorTest.php\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n }\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\n \n $validator->validateAttributes($model, ['name', 'email']);\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n- $this->assertNull($model->email);\n+ $this->assertNull($model['email']);\n $this->assertFalse($model->hasErrors());\n }\n \n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\n \n $validator->validateAttribute($model, 'field');\n \n- $this->assertNull($model->field);\n+ $this->assertNull($model['field']);\n $this->assertFalse($model->hasErrors('field'));\n }\n \n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\n \n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\n \n+ $this->assertTrue(isset($model->username));\n $this->assertSame('admin', $model->username);\n- $this->assertNull($model->role);\n+ $this->assertNull($model['role']);\n }\n \n public function testValidationAlwaysPasses(): void\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\n $validator->validateAttribute($model, 'attr');\n \n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\n- $this->assertSame($value, $model->attr);\n+ $this->assertSame($value, $model['attr']);\n }\n }\n }\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\nindex ed054276bdf..5523679200d 100644\n--- a/tests/framework/validators/TrimValidatorTest.php\n+++ b/tests/framework/validators/TrimValidatorTest.php\n@@ -32,6 +32,7 @@ public function testTrimWhitespace(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -42,6 +43,7 @@ public function testTrimTabs(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -53,6 +55,7 @@ public function testTrimCustomChars(): void\n \n $validator->validateAttribute($model, 'path');\n \n+ $this->assertTrue(isset($model->path));\n $this->assertSame('hello', $model->path);\n }\n \n@@ -63,6 +66,7 @@ public function testTrimEmptyString(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -73,6 +77,7 @@ public function testTrimNullValue(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -83,6 +88,7 @@ public function testTrimIntegerValue(): void\n \n $validator->validateAttribute($model, 'count');\n \n+ $this->assertTrue(isset($model->count));\n $this->assertSame('42', $model->count);\n }\n \n@@ -93,6 +99,7 @@ public function testTrimArray(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame(['foo', 'bar'], $model->tags);\n }\n \n@@ -105,6 +112,7 @@ public function testSkipOnArrayTrue(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame($original, $model->tags);\n }\n \n@@ -116,6 +124,7 @@ public function testSkipOnArrayTrueWithScalar(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -198,6 +207,7 @@ public function testTrimBooleanValue(): void\n \n $validator->validateAttribute($model, 'flag');\n \n+ $this->assertTrue(isset($model->flag));\n $this->assertSame('1', $model->flag);\n }\n \n@@ -208,6 +218,7 @@ public function testTrimWithModelRules(): void\n \n $model->validate();\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n $this->assertFalse($model->hasErrors());\n }\ndiff --git a/tests/framework/validators/UniqueValidatorTest.php b/tests/framework/validators/UniqueValidatorTest.php\nindex 275ff69c900..453adb00745 100644\n--- a/tests/framework/validators/UniqueValidatorTest.php\n+++ b/tests/framework/validators/UniqueValidatorTest.php\n@@ -82,6 +82,7 @@ public function testValidateInvalidAttribute(): void\n \n /** @var Customer $customerModel */\n $customerModel = Customer::findOne(1);\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->name = ['test array data'];\n $validator->validateAttribute($customerModel, 'name');\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\n@@ -89,6 +90,7 @@ public function testValidateInvalidAttribute(): void\n $customerModel->clearErrors();\n \n $customerModel->name = 'test data';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\n $validator->targetAttribute = ['email', 'name'];\n $validator->validateAttribute($customerModel, 'name');\n@@ -420,7 +422,7 @@ public function testAmbiguousColumnName(): void\n ]);\n $model = new Order();\n $model->customer_id = 1;\n- $model->total = 800;\n+ $model->total = '800';\n $model->save(false);\n $validator->validateAttribute($model, 'id');\n $this->assertFalse($model->hasErrors());\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\nindex b0a0165e7fb..9c97c4b33fb 100644\n--- a/tests/framework/validators/ValidatorTest.php\n+++ b/tests/framework/validators/ValidatorTest.php\n@@ -249,6 +249,8 @@ public function testClientValidateAttribute(): void\n \n $model = new FakedValidationModel();\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\n+ $this->assertInstanceOf(InlineValidator::class, $val);\n+\n $val->clientValidate = 'clientInlineVal';\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\n \n","summary":"Edited 10 file(s) in tests/framework/validators/"},{"subtask_id":"s9","scope_files":["tests/framework/validators/stubs/ModelForReqValidator.php","tests/framework/validators/stubs/ViewStub.php"],"solution_diff":"diff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\nnew file mode 100644\nindex 00000000000..3d4654c80ed\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\base\\Model;\n+\n+class ModelForReqValidator extends Model\n+{\n+ public $attr;\n+\n+ public function rules()\n+ {\n+ return [\n+ [['attr'], 'required'],\n+ ];\n+ }\n+\n+ public function attributeLabels()\n+ {\n+ return ['attr' => '<b>Attr</b>'];\n+ }\n+}\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\nnew file mode 100644\nindex 00000000000..a6a957ac910\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ViewStub.php\n@@ -0,0 +1,18 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\web\\View;\n+\n+class ViewStub extends View\n+{\n+ public function registerAssetBundle($name, $position = null)\n+ {\n+ }\n+}\n","summary":"Edited 2 file(s) in tests/framework/validators/stubs/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex c369f29ed19..608efda39af 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -5,6 +5,8 @@ includes:\\n parameters:\\n level: 3\\n \\n+ reportIgnoresWithoutComments: true\\n+\\n paths:\\n - build\\n - framework\\n@@ -17,7 +19,6 @@ parameters:\\n - tests/framework/*/mocks/*\\n # TODO: Analyze these directories\\n - tests/framework/db\\n- - tests/framework/validators\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"build/controllers/PhpDocController.php\"\n ],\n \"solution_diff\": \"diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\\nindex b0da27b75ad..bc4f3ea5f09 100644\\n--- a/build/controllers/PhpDocController.php\\n+++ b/build/controllers/PhpDocController.php\\n@@ -713,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\\n }\\n if ($propertyPart) {\\n preg_match(\\n- '/@property(?:-read|-write)?\\\\s+([\\\\\\\\\\\\\\\\\\\\w\\\\|\\\\[\\\\]]+)\\\\s+\\\\$([a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z0-9_\\\\x7f-\\\\xff]*)/',\\n+ '/@property(?:-read|-write)?\\\\s+' . self::TYPE_REG_EXP\\n+ . '\\\\s+\\\\$([a-zA-Z_\\\\x7f-\\\\xff][a-zA-Z0-9_\\\\x7f-\\\\xff]*)/',\\n $line,\\n $matches\\n );\\n \\n- if (isset($matches[2])) {\\n- $lastPropertyName = $matches[2];\\n+ if (isset($matches[1])) {\\n+ $lastPropertyName = $matches[1];\\n }\\n \\n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\\n\",\n \"summary\": \"Edited 1 file(s) in build/controllers/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 2296dfc0938..0d83c0d7557 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -4,7 +4,11 @@ Yii Framework 2 Change Log\\n 2.0.56 under development\\n ------------------------\\n \\n-- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` (mspirkov)\\n+- Enh #20785: Clarify the type of the `yii\\\\base\\\\Model::$errors` (mspirkov)\\n+- Bug #20785: Fix `@return` annotation for `yii\\\\base\\\\Model::getErrors()` (mspirkov)\\n+- Bug #20785: Fix `@var` annotation for `yii\\\\validators\\\\CompareValidator::$message` (mspirkov)\\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\\\validators\\\\Validator::validate()` (mspirkov)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"framework/base/Model.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/base/Model.php b/framework/base/Model.php\\nindex ec725426328..fb4b0b9de73 100644\\n--- a/framework/base/Model.php\\n+++ b/framework/base/Model.php\\n@@ -38,7 +38,7 @@\\n *\\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\\n *\\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\\n * array of errors for all attributes, similar to the following:\\n *\\n * ```\\n@@ -579,8 +579,9 @@ public function hasErrors($attribute = null)\\n /**\\n * Returns the errors for all attributes or a single attribute.\\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\\n+ * all attributes, the result is a two-dimensional array, like the following:\\n *\\n * ```\\n * [\\n\",\n \"summary\": \"Edited 1 file(s) in framework/base/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"framework/validators/CompareValidator.php\",\n \"framework/validators/Validator.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\\nindex 27783fc26d7..a72410dc483 100644\\n--- a/framework/validators/CompareValidator.php\\n+++ b/framework/validators/CompareValidator.php\\n@@ -94,7 +94,7 @@ class CompareValidator extends Validator\\n */\\n public $operator = '==';\\n /**\\n- * @var string the user-defined error message. It may contain the following placeholders which\\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\\n * will be replaced accordingly by the validator:\\n *\\n * - `{attribute}`: the label of the attribute being validated\\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\\nindex 977d68e2895..70a54a9ce84 100644\\n--- a/framework/validators/Validator.php\\n+++ b/framework/validators/Validator.php\\n@@ -316,6 +316,8 @@ public function validateAttribute($model, $attribute)\\n * @param mixed $value the data value to be validated.\\n * @param string|null $error the error message to be returned, if the validation fails.\\n * @return bool whether the data is valid.\\n+ *\\n+ * @param-out string|null $error\\n */\\n public function validate($value, &$error = null)\\n {\\n\",\n \"summary\": \"Edited 2 file(s) in framework/validators/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/data/validators/models/FakedValidationModel.php\",\n \"tests/data/validators/models/ValidatorTestMainModel.php\",\n \"tests/data/validators/models/ValidatorTestRefModel.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\\nindex 0f2cf644cb3..e6f5a8a597b 100644\\n--- a/tests/data/validators/models/FakedValidationModel.php\\n+++ b/tests/data/validators/models/FakedValidationModel.php\\n@@ -10,6 +10,33 @@\\n \\n use yii\\\\base\\\\Model;\\n \\n+/**\\n+ * @property mixed $attr\\n+ * @property mixed $attr_url\\n+ * @property mixed $attr_string\\n+ * @property mixed $attr_reg1\\n+ * @property mixed $attr_number\\n+ * @property mixed $attr_ip\\n+ * @property mixed $attr_array\\n+ * @property mixed $attr_array_skipped\\n+ * @property mixed $attr_files\\n+ * @property mixed $attr_one\\n+ * @property mixed $attr_two\\n+ * @property mixed $attr_empty1\\n+ * @property mixed $attr_empty2\\n+ * @property mixed $attr_email\\n+ * @property mixed $attr_date\\n+ * @property mixed $attr_timestamp\\n+ * @property mixed $attr_test\\n+ * @property mixed $attr_test_val\\n+ * @property mixed $attr_test_repeat\\n+ * @property mixed $attrA\\n+ * @property mixed $attrB\\n+ * @property mixed $attrC\\n+ * @property mixed $attrD\\n+ * @property mixed $attr_image\\n+ * @property mixed $attr_images\\n+ */\\n class FakedValidationModel extends Model\\n {\\n public $val_attr_a;\\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\\nindex 73faaf22f39..1752079bc08 100644\\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\\n@@ -10,6 +10,9 @@\\n \\n use yiiunit\\\\data\\\\ar\\\\ActiveRecord;\\n \\n+/**\\n+ * @property int $id\\n+ */\\n class ValidatorTestMainModel extends ActiveRecord\\n {\\n public $testMainVal = 1;\\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\\nindex 8642dc317c9..0bdb0c71f83 100644\\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\\n@@ -11,9 +11,9 @@\\n use yiiunit\\\\data\\\\ar\\\\ActiveRecord;\\n \\n /**\\n- * @property int id\\n- * @property string a_field\\n- * @property int ref\\n+ * @property int $id\\n+ * @property string $a_field\\n+ * @property int $ref\\n */\\n class ValidatorTestRefModel extends ActiveRecord\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/data/validators/models/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/base/BaseObjectTest.php\",\n \"tests/framework/base/BehaviorTest.php\",\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/DynamicModelTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\\nindex e19c7f534a9..94ec65e2175 100644\\n--- a/tests/framework/base/BaseObjectTest.php\\n+++ b/tests/framework/base/BaseObjectTest.php\\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\\n {\\n $this->assertSame('default', $this->object->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $value2 = $this->object->Caption;\\n }\\n \\n@@ -82,8 +81,7 @@ public function testSetProperty(): void\\n $this->object->Text = $value;\\n $this->assertEquals($value, $this->object->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $this->object->NewMember = $value;\\n }\\n \\n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\\n public function testCallUnknownMethod(): void\\n {\\n $this->expectException('yii\\\\base\\\\UnknownMethodException');\\n- // We intentionally call a non-existent method to test that an exception is thrown\\n- // @phpstan-ignore method.notFound\\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\\n $this->object->unknownMethod();\\n }\\n \\ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\\nindex cbaa2ce6db5..c3dd2773818 100644\\n--- a/tests/framework/base/BehaviorTest.php\\n+++ b/tests/framework/base/BehaviorTest.php\\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\\n $bar->attachBehavior('bar', $behavior);\\n \\n $this->expectException('yii\\\\base\\\\UnknownMethodException');\\n- // We intentionally call a non-existent method to test that an exception is thrown\\n- // @phpstan-ignore method.notFound\\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\\n $bar->nomagicBehaviorMethod();\\n }\\n }\\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\\nindex 5b2f5750b03..19746c6bd7d 100644\\n--- a/tests/framework/base/ComponentTest.php\\n+++ b/tests/framework/base/ComponentTest.php\\n@@ -114,8 +114,7 @@ public function testGetProperty(): void\\n {\\n $this->assertSame('default', $this->component->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $value2 = $this->component->Caption;\\n }\\n \\n@@ -125,8 +124,7 @@ public function testSetProperty(): void\\n $this->component->Text = $value;\\n $this->assertEquals($value, $this->component->Text);\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $this->component->NewMember = $value;\\n }\\n \\n@@ -153,8 +151,7 @@ public function testIsset(): void\\n public function testCallUnknownMethod(): void\\n {\\n $this->expectException('yii\\\\base\\\\UnknownMethodException');\\n- // We intentionally call a non-existent method to test that an exception is thrown\\n- // @phpstan-ignore method.notFound\\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\\n $this->component->unknownMethod();\\n }\\n \\n@@ -187,8 +184,7 @@ public function testOn(): void\\n \\n $this->assertFalse($this->component->hasEventHandlers('click2'));\\n $p = 'on click2';\\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $this->component->$p = 'foo2';\\n $this->assertTrue($this->component->hasEventHandlers('click2'));\\n }\\n@@ -354,21 +350,18 @@ public function testAttachBehavior(): void\\n }\\n \\n $component = new NewComponent();\\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $component->{'as b'} = ['class' => NewBehavior::class];\\n $this->assertInstanceOf(NewBehavior::class, $component->getBehavior('b'));\\n $this->assertTrue($component->hasProperty('p'));\\n $component->test();\\n $this->assertTrue($component->behaviorCalled);\\n \\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $component->{'as c'} = ['__class' => NewBehavior::class];\\n $this->assertNotNull($component->getBehavior('c'));\\n \\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $component->{'as d'} = [\\n '__class' => NewBehavior2::class,\\n 'class' => NewBehavior::class,\\n@@ -377,8 +370,7 @@ public function testAttachBehavior(): void\\n \\n // CVE-2024-4990\\n try {\\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $component->{'as e'} = [\\n '__class' => 'NotExistsBehavior',\\n 'class' => NewBehavior::class,\\n@@ -469,8 +461,7 @@ public function testSettingBehaviorWithSetter(): void\\n $behaviorName = 'foo';\\n $this->assertNull($this->component->getBehavior($behaviorName));\\n $p = 'as ' . $behaviorName;\\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $this->component->$p = __NAMESPACE__ . '\\\\NewBehavior';\\n $this->assertSame(__NAMESPACE__ . '\\\\NewBehavior', get_class($this->component->getBehavior($behaviorName)));\\n }\\n@@ -568,8 +559,7 @@ public function testSetBehaviorInstanceViaProperty(): void\\n $component = new NewComponent();\\n $behavior = new NewBehavior();\\n $p = 'as myBehavior';\\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (/ Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\\n $component->$p = $behavior;\\n $this->assertSame($behavior, $component->getBehavior('myBehavior'));\\n }\\ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\\nindex 31b218f5187..24ef4cb86c8 100644\\n--- a/tests/framework/base/DynamicModelTest.php\\n+++ b/tests/framework/base/DynamicModelTest.php\\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\\n $this->assertTrue($model->canSetProperty('email'));\\n $this->assertTrue($model->canSetProperty('name'));\\n $this->expectException('yii\\\\base\\\\UnknownPropertyException');\\n- // We intentionally access a non-existent property to test that an exception is thrown\\n- // @phpstan-ignore property.notFound\\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\\n $age = $model->age;\\n }\\n \\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/base/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/validators/BooleanValidatorTest.php\",\n \"tests/framework/validators/CompareValidatorTest.php\",\n \"tests/framework/validators/FileValidatorTest.php\",\n \"tests/framework/validators/FilterValidatorTest.php\",\n \"tests/framework/validators/RegularExpressionValidatorTest.php\",\n \"tests/framework/validators/RequiredValidatorTest.php\",\n \"tests/framework/validators/SafeValidatorTest.php\",\n \"tests/framework/validators/TrimValidatorTest.php\",\n \"tests/framework/validators/UniqueValidatorTest.php\",\n \"tests/framework/validators/ValidatorTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/validators/BooleanValidatorTest.php b/tests/framework/validators/BooleanValidatorTest.php\\nindex f66e44b0263..dd70e5c016b 100644\\n--- a/tests/framework/validators/BooleanValidatorTest.php\\n+++ b/tests/framework/validators/BooleanValidatorTest.php\\n@@ -9,8 +9,8 @@\\n namespace yiiunit\\\\framework\\\\validators;\\n \\n use yii\\\\validators\\\\BooleanValidator;\\n-use yii\\\\web\\\\View;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -91,10 +91,3 @@ public function testErrorMessage(): void\\n );\\n }\\n }\\n-\\n-class ViewStub extends View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/CompareValidatorTest.php b/tests/framework/validators/CompareValidatorTest.php\\nindex 74c6c4bc7d1..52c213a02ea 100644\\n--- a/tests/framework/validators/CompareValidatorTest.php\\n+++ b/tests/framework/validators/CompareValidatorTest.php\\n@@ -12,6 +12,7 @@\\n use yii\\\\base\\\\InvalidConfigException;\\n use yii\\\\validators\\\\CompareValidator;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -375,7 +376,7 @@ public function testClientValidateAttribute(): void\\n $model = new FakedValidationModel();\\n $model->attr_test = 'test';\\n $val = new CompareValidator(['compareValue' => 'expected']);\\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\\n \\n $this->assertStringStartsWith('yii.validation.compare(', $js);\\n $this->assertStringContainsString('$form', $js);\\n@@ -411,7 +412,7 @@ public function testClientValidateAttributeWithClosure(): void\\n $val = new CompareValidator(['compareValue' => function () {\\n return 'resolved';\\n }]);\\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\\n \\n $this->assertStringContainsString('resolved', $js);\\n }\\n@@ -421,7 +422,7 @@ public function testClientValidateAttributeContainsEncodedOptions(): void\\n $model = new FakedValidationModel();\\n $model->attr_test = 'test';\\n $val = new CompareValidator(['compareValue' => 'check']);\\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\\n \\n $this->assertStringContainsString('\\\"operator\\\":\\\"==\\\"', $js);\\n $this->assertStringContainsString('\\\"compareValue\\\":\\\"check\\\"', $js);\\n@@ -497,10 +498,3 @@ public function testDefaultOperatorFallsThrough(): void\\n $this->assertFalse($val->validate(999));\\n }\\n }\\n-\\n-class CompareViewStub extends \\\\yii\\\\web\\\\View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\\nindex d5c647d7491..e89d493e806 100644\\n--- a/tests/framework/validators/FileValidatorTest.php\\n+++ b/tests/framework/validators/FileValidatorTest.php\\n@@ -335,7 +335,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\\n \\n /**\\n * @param array $params\\n- * @return UploadedFile[]\\n+ * @return UploadedFile|UploadedFile[]\\n */\\n protected function createTestFiles($params = [])\\n {\\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\\nindex 477b4f8ee95..228b3c8af01 100644\\n--- a/tests/framework/validators/FilterValidatorTest.php\\n+++ b/tests/framework/validators/FilterValidatorTest.php\\n@@ -9,8 +9,8 @@\\n namespace yiiunit\\\\framework\\\\validators;\\n \\n use yii\\\\validators\\\\FilterValidator;\\n-use yii\\\\web\\\\View;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -75,7 +75,7 @@ public function testClientValidateAttributeWithTrimFilter(): void\\n {\\n $val = new FilterValidator(['filter' => 'trim']);\\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\\n- $js = $val->clientValidateAttribute($m, 'attr_one', new FilterViewStub());\\n+ $js = $val->clientValidateAttribute($m, 'attr_one', new ViewStub());\\n $this->assertStringContainsString('yii.validation.trim', $js);\\n }\\n \\n@@ -83,7 +83,7 @@ public function testClientValidateAttributeWithNonTrimFilter(): void\\n {\\n $val = new FilterValidator(['filter' => 'strtolower']);\\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\\n+ $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new ViewStub()));\\n }\\n \\n public function testGetClientOptionsDefault(): void\\n@@ -102,10 +102,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\\n $this->assertSame(1, $options['skipOnEmpty']);\\n }\\n }\\n-\\n-class FilterViewStub extends View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/RegularExpressionValidatorTest.php b/tests/framework/validators/RegularExpressionValidatorTest.php\\nindex 1881a4bcbbf..1872c56d248 100644\\n--- a/tests/framework/validators/RegularExpressionValidatorTest.php\\n+++ b/tests/framework/validators/RegularExpressionValidatorTest.php\\n@@ -9,8 +9,8 @@\\n namespace yiiunit\\\\framework\\\\validators;\\n \\n use yii\\\\validators\\\\RegularExpressionValidator;\\n-use yii\\\\web\\\\View;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -81,7 +81,7 @@ public function testClientValidateAttribute(): void\\n {\\n $val = new RegularExpressionValidator(['pattern' => '/^[a-z]+$/i']);\\n $m = FakedValidationModel::createWithAttributes(['attr_reg1' => 'abc']);\\n- $js = $val->clientValidateAttribute($m, 'attr_reg1', new RegexViewStub());\\n+ $js = $val->clientValidateAttribute($m, 'attr_reg1', new ViewStub());\\n $this->assertStringContainsString('yii.validation.regularExpression', $js);\\n }\\n \\n@@ -113,10 +113,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\\n $this->assertSame(1, $options['skipOnEmpty']);\\n }\\n }\\n-\\n-class RegexViewStub extends View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\\nindex 0e2a21e1c29..2b2d4382fc6 100644\\n--- a/tests/framework/validators/RequiredValidatorTest.php\\n+++ b/tests/framework/validators/RequiredValidatorTest.php\\n@@ -8,10 +8,10 @@\\n \\n namespace yiiunit\\\\framework\\\\validators;\\n \\n-use yii\\\\base\\\\Model;\\n use yii\\\\validators\\\\RequiredValidator;\\n-use yii\\\\web\\\\View;\\n use yiiunit\\\\data\\\\validators\\\\models\\\\FakedValidationModel;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ModelForReqValidator;\\n+use yiiunit\\\\framework\\\\validators\\\\stubs\\\\ViewStub;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -78,7 +78,7 @@ public function testErrorClientMessage(): void\\n \\n $this->assertEquals(\\n 'yii.validation.required(value, messages, {\\\"message\\\":\\\"\\\\u003Cstrong\\\\u003Eerror\\\\u003C\\\\/strong\\\\u003E for \\\\u003Cb\\\\u003EAttr\\\\u003C\\\\/b\\\\u003E\\\"});',\\n- $validator->clientValidateAttribute($obj, 'attr', new RequiredViewStub())\\n+ $validator->clientValidateAttribute($obj, 'attr', new ViewStub())\\n );\\n }\\n \\n@@ -196,27 +196,3 @@ public function testGetClientOptionsMessageContainsRequiredValue(): void\\n $this->assertStringContainsString('confirm', $options['message']);\\n }\\n }\\n-\\n-class ModelForReqValidator extends Model\\n-{\\n- public $attr;\\n-\\n- public function rules()\\n- {\\n- return [\\n- [['attr'], 'required'],\\n- ];\\n- }\\n-\\n- public function attributeLabels()\\n- {\\n- return ['attr' => '<b>Attr</b>'];\\n- }\\n-}\\n-\\n-class RequiredViewStub extends View\\n-{\\n- public function registerAssetBundle($name, $position = null)\\n- {\\n- }\\n-}\\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\\nindex 079cda410a7..c4eafa9243c 100644\\n--- a/tests/framework/validators/SafeValidatorTest.php\\n+++ b/tests/framework/validators/SafeValidatorTest.php\\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n $this->assertFalse($model->hasErrors('name'));\\n }\\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\\n \\n $validator->validateAttributes($model, ['name', 'email']);\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n- $this->assertNull($model->email);\\n+ $this->assertNull($model['email']);\\n $this->assertFalse($model->hasErrors());\\n }\\n \\n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\\n \\n $validator->validateAttribute($model, 'field');\\n \\n- $this->assertNull($model->field);\\n+ $this->assertNull($model['field']);\\n $this->assertFalse($model->hasErrors('field'));\\n }\\n \\n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\\n \\n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\\n \\n+ $this->assertTrue(isset($model->username));\\n $this->assertSame('admin', $model->username);\\n- $this->assertNull($model->role);\\n+ $this->assertNull($model['role']);\\n }\\n \\n public function testValidationAlwaysPasses(): void\\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\\n $validator->validateAttribute($model, 'attr');\\n \\n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\\n- $this->assertSame($value, $model->attr);\\n+ $this->assertSame($value, $model['attr']);\\n }\\n }\\n }\\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\\nindex ed054276bdf..5523679200d 100644\\n--- a/tests/framework/validators/TrimValidatorTest.php\\n+++ b/tests/framework/validators/TrimValidatorTest.php\\n@@ -32,6 +32,7 @@ public function testTrimWhitespace(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -42,6 +43,7 @@ public function testTrimTabs(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -53,6 +55,7 @@ public function testTrimCustomChars(): void\\n \\n $validator->validateAttribute($model, 'path');\\n \\n+ $this->assertTrue(isset($model->path));\\n $this->assertSame('hello', $model->path);\\n }\\n \\n@@ -63,6 +66,7 @@ public function testTrimEmptyString(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -73,6 +77,7 @@ public function testTrimNullValue(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -83,6 +88,7 @@ public function testTrimIntegerValue(): void\\n \\n $validator->validateAttribute($model, 'count');\\n \\n+ $this->assertTrue(isset($model->count));\\n $this->assertSame('42', $model->count);\\n }\\n \\n@@ -93,6 +99,7 @@ public function testTrimArray(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame(['foo', 'bar'], $model->tags);\\n }\\n \\n@@ -105,6 +112,7 @@ public function testSkipOnArrayTrue(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame($original, $model->tags);\\n }\\n \\n@@ -116,6 +124,7 @@ public function testSkipOnArrayTrueWithScalar(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -198,6 +207,7 @@ public function testTrimBooleanValue(): void\\n \\n $validator->validateAttribute($model, 'flag');\\n \\n+ $this->assertTrue(isset($model->flag));\\n $this->assertSame('1', $model->flag);\\n }\\n \\n@@ -208,6 +218,7 @@ public function testTrimWithModelRules(): void\\n \\n $model->validate();\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n $this->assertFalse($model->hasErrors());\\n }\\ndiff --git a/tests/framework/validators/UniqueValidatorTest.php b/tests/framework/validators/UniqueValidatorTest.php\\nindex 275ff69c900..453adb00745 100644\\n--- a/tests/framework/validators/UniqueValidatorTest.php\\n+++ b/tests/framework/validators/UniqueValidatorTest.php\\n@@ -82,6 +82,7 @@ public function testValidateInvalidAttribute(): void\\n \\n /** @var Customer $customerModel */\\n $customerModel = Customer::findOne(1);\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $customerModel->name = ['test array data'];\\n $validator->validateAttribute($customerModel, 'name');\\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\\n@@ -89,6 +90,7 @@ public function testValidateInvalidAttribute(): void\\n $customerModel->clearErrors();\\n \\n $customerModel->name = 'test data';\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\\n $validator->targetAttribute = ['email', 'name'];\\n $validator->validateAttribute($customerModel, 'name');\\n@@ -420,7 +422,7 @@ public function testAmbiguousColumnName(): void\\n ]);\\n $model = new Order();\\n $model->customer_id = 1;\\n- $model->total = 800;\\n+ $model->total = '800';\\n $model->save(false);\\n $validator->validateAttribute($model, 'id');\\n $this->assertFalse($model->hasErrors());\\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\\nindex b0a0165e7fb..9c97c4b33fb 100644\\n--- a/tests/framework/validators/ValidatorTest.php\\n+++ b/tests/framework/validators/ValidatorTest.php\\n@@ -249,6 +249,8 @@ public function testClientValidateAttribute(): void\\n \\n $model = new FakedValidationModel();\\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\\n+ $this->assertInstanceOf(InlineValidator::class, $val);\\n+\\n $val->clientValidate = 'clientInlineVal';\\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\\n \\n\",\n \"summary\": \"Edited 10 file(s) in tests/framework/validators/\"\n },\n {\n \"subtask_id\": \"s9\",\n \"scope_files\": [\n \"tests/framework/validators/stubs/ModelForReqValidator.php\",\n \"tests/framework/validators/stubs/ViewStub.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\\nnew file mode 100644\\nindex 00000000000..3d4654c80ed\\n--- /dev/null\\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\\n@@ -0,0 +1,28 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\validators\\\\stubs;\\n+\\n+use yii\\\\base\\\\Model;\\n+\\n+class ModelForReqValidator extends Model\\n+{\\n+ public $attr;\\n+\\n+ public function rules()\\n+ {\\n+ return [\\n+ [['attr'], 'required'],\\n+ ];\\n+ }\\n+\\n+ public function attributeLabels()\\n+ {\\n+ return ['attr' => '<b>Attr</b>'];\\n+ }\\n+}\\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\\nnew file mode 100644\\nindex 00000000000..a6a957ac910\\n--- /dev/null\\n+++ b/tests/framework/validators/stubs/ViewStub.php\\n@@ -0,0 +1,18 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\validators\\\\stubs;\\n+\\n+use yii\\\\web\\\\View;\\n+\\n+class ViewStub extends View\\n+{\\n+ public function registerAssetBundle($name, $position = null)\\n+ {\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/validators/stubs/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s6","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Document `attr_image` and `attr_images` too for PHPStan completeness.**\n\nThe docblock omits two dynamic `attr*` fields that are actively used in `rules()` (`attr_image`, `attr_images`). Adding them keeps the dynamic-property map consistent and avoids residual static-analysis noise.\n\n \n\n<details>\n<summary>Suggested docblock patch</summary>\n\n```diff\n /**\n * `@property` mixed $attr\n+ * `@property` mixed $attr_image\n+ * `@property` mixed $attr_images\n * `@property` mixed $attr_url\n * `@property` mixed $attr_string\n * `@property` mixed $attr_reg1\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n/**\n * `@property` mixed $attr\n * `@property` mixed $attr_image\n * `@property` mixed $attr_images\n * `@property` mixed $attr_url\n * `@property` mixed $attr_string\n * `@property` mixed $attr_reg1\n * `@property` mixed $attr_number\n * `@property` mixed $attr_ip\n * `@property` mixed $attr_array\n * `@property` mixed $attr_array_skipped\n * `@property` mixed $attr_files\n * `@property` mixed $attr_one\n * `@property` mixed $attr_two\n * `@property` mixed $attr_empty1\n * `@property` mixed $attr_empty2\n * `@property` mixed $attr_email\n * `@property` mixed $attr_date\n * `@property` mixed $attr_timestamp\n * `@property` mixed $attr_test\n * `@property` mixed $attr_test_val\n * `@property` mixed $attr_test_repeat\n * `@property` mixed $attrA\n * `@property` mixed $attrB\n * `@property` mixed $attrC\n * `@property` mixed $attrD\n */\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/data/validators/models/FakedValidationModel.php` around lines 13 - 37,\nThe class docblock is missing dynamic properties used by rules(); add `@property`\nmixed $attr_image and `@property` mixed $attr_images to the existing docblock\n(near the other `@property` entries such as $attr, $attr_files) so PHPStan/static\nanalysis recognizes these dynamic attributes and eliminates the warnings.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commits ddfb94d to 958c209","revised_diff":"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\nindex 0f2cf644cb3..e6f5a8a597b 100644\n--- a/tests/data/validators/models/FakedValidationModel.php\n+++ b/tests/data/validators/models/FakedValidationModel.php\n@@ -10,6 +10,33 @@\n \n use yii\\base\\Model;\n \n+/**\n+ * @property mixed $attr\n+ * @property mixed $attr_url\n+ * @property mixed $attr_string\n+ * @property mixed $attr_reg1\n+ * @property mixed $attr_number\n+ * @property mixed $attr_ip\n+ * @property mixed $attr_array\n+ * @property mixed $attr_array_skipped\n+ * @property mixed $attr_files\n+ * @property mixed $attr_one\n+ * @property mixed $attr_two\n+ * @property mixed $attr_empty1\n+ * @property mixed $attr_empty2\n+ * @property mixed $attr_email\n+ * @property mixed $attr_date\n+ * @property mixed $attr_timestamp\n+ * @property mixed $attr_test\n+ * @property mixed $attr_test_val\n+ * @property mixed $attr_test_repeat\n+ * @property mixed $attrA\n+ * @property mixed $attrB\n+ * @property mixed $attrC\n+ * @property mixed $attrD\n+ * @property mixed $attr_image\n+ * @property mixed $attr_images\n+ */\n class FakedValidationModel extends Model\n {\n public $val_attr_a;\n"},{"subtask_id":"s8","comment":"_โ ๏ธ Potential issue_ | _๐ด Critical_ | _โก Quick win_\n\n**Critical: `assertObjectHasProperty` is incompatible with `DynamicModel`.**\n\nAll the added `assertObjectHasProperty` assertions are failing because `DynamicModel` stores attributes in an internal array and exposes them via magic methods (`__get`, `__set`), not as actual PHP object properties. The PHPUnit `assertObjectHasProperty` method uses reflection to check for declared properties, which will never find dynamically stored attributes.\n\nThese assertions should be removed. The subsequent value assertions (e.g., `assertSame('original', $model->name)`) already confirm the attribute exists and is accessible, since they would fail if the attribute were missing.\n\n\n\n\n<details>\n<summary>๐ง Proposed fix: Remove the incompatible assertions</summary>\n\n```diff\n $validator->validateAttribute($model, 'name');\n\n- $this->assertObjectHasProperty('name', $model);\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n```\n\nApply this pattern to all five test methods where `assertObjectHasProperty` was added.\n</details>\n\n\nAlso applies to: 45-47, 59-59, 71-73, 97-97\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช GitHub Actions: build / 1_PHP 7.4.txt</summary>\n\n[error] 33-33: PHPUnit failure: SafeValidatorTest::testValidateAttributeDoesNothing. Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 3_PHP 8.2.txt</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 4_PHP 8.5.txt</summary>\n\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 5_PHP 8.txt</summary>\n\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 6_PHP 8.4.txt</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 7_PHP 8.6.txt</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 7.4</summary>\n\n[error] 33-33: PHPUnit failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8</summary>\n\n[error] 33-33: PHPUnit failure: yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing failed. Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.1</summary>\n\n[error] 33-33: yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.2</summary>\n\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.3</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that DynamicModel has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.4</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.5</summary>\n\n[error] 33-33: PHPUnit failure (SafeValidatorTest::testValidateAttributeDoesNothing): Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.6</summary>\n\n[error] 33-33: PHPUnit failure in yiiunit\\framework\\validators\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/validators/SafeValidatorTest.php` at line 33, The test uses\nPHPUnit's assertObjectHasProperty which is incompatible with DynamicModel\n(attributes are stored via magic methods), so remove the\nassertObjectHasProperty(...) calls in SafeValidatorTest (the ones like\n$this->assertObjectHasProperty('name', $model)) across all affected test methods\nand keep the existing value assertions (e.g., assertSame('original',\n$model->name)) which already verify attribute presence and accessibility; update\nall five occurrences accordingly.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commits ddfb94d to 958c209","revised_diff":"diff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\nindex 079cda410a7..c4eafa9243c 100644\n--- a/tests/framework/validators/SafeValidatorTest.php\n+++ b/tests/framework/validators/SafeValidatorTest.php\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n }\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\n \n $validator->validateAttributes($model, ['name', 'email']);\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n- $this->assertNull($model->email);\n+ $this->assertNull($model['email']);\n $this->assertFalse($model->hasErrors());\n }\n \n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\n \n $validator->validateAttribute($model, 'field');\n \n- $this->assertNull($model->field);\n+ $this->assertNull($model['field']);\n $this->assertFalse($model->hasErrors('field'));\n }\n \n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\n \n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\n \n+ $this->assertTrue(isset($model->username));\n $this->assertSame('admin', $model->username);\n- $this->assertNull($model->role);\n+ $this->assertNull($model['role']);\n }\n \n public function testValidationAlwaysPasses(): void\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\n $validator->validateAttribute($model, 'attr');\n \n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\n- $this->assertSame($value, $model->attr);\n+ $this->assertSame($value, $model['attr']);\n }\n }\n }\n"},{"subtask_id":"s8","comment":"_โ ๏ธ Potential issue_ | _๐ด Critical_ | _โก Quick win_\n\n**Critical: `assertObjectHasProperty` is incompatible with `DynamicModel`.**\n\nAll the added `assertObjectHasProperty` assertions are failing because `DynamicModel` stores attributes in an internal array and exposes them via magic methods (`__get`, `__set`), not as actual PHP object properties. The PHPUnit `assertObjectHasProperty` method uses reflection to check for declared properties, which will never find dynamically stored attributes.\n\nThese assertions should be removed. The subsequent value assertions (e.g., `assertSame('hello', $model->name)`) already confirm the attribute exists and is accessible, since they would fail if the attribute were missing.\n\n\n\n\n<details>\n<summary>๐ง Proposed fix: Remove the incompatible assertions</summary>\n\n```diff\n $validator->validateAttribute($model, 'name');\n\n- $this->assertObjectHasProperty('name', $model);\n $this->assertSame('hello', $model->name);\n```\n\nApply this pattern to all eleven test methods where `assertObjectHasProperty` was added.\n</details>\n\n\nAlso applies to: 46-46, 58-58, 69-69, 80-80, 91-91, 102-102, 115-115, 127-127, 210-210, 221-221\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช GitHub Actions: build / 1_PHP 7.4.txt</summary>\n\n[error] 35-35: PHPUnit failure: TrimValidatorTest::testTrimWhitespace. Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 3_PHP 8.2.txt</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 4_PHP 8.5.txt</summary>\n\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 5_PHP 8.txt</summary>\n\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 6_PHP 8.4.txt</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / 7_PHP 8.6.txt</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 7.4</summary>\n\n[error] 35-35: PHPUnit failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8</summary>\n\n[error] 35-35: PHPUnit failure: yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace failed. Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.1</summary>\n\n[error] 35-35: yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.2</summary>\n\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.3</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that DynamicModel has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.4</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.5</summary>\n\n[error] 35-35: PHPUnit failure (TrimValidatorTest::testTrimWhitespace): Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n<details>\n<summary>๐ช GitHub Actions: build / PHP 8.6</summary>\n\n[error] 35-35: PHPUnit failure in yiiunit\\framework\\validators\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \"yii\\base\\DynamicModel\" has property \"name\".\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/validators/TrimValidatorTest.php` at line 35, The tests in\nTrimValidatorTest.php are using PHPUnit::assertObjectHasProperty('name', $model)\nwhich is incompatible with DynamicModel (attributes are stored in an internal\narray and exposed via __get/__set), so remove each assertObjectHasProperty call\n(e.g., the assertion on $model in the test methods around the 'name' checks) and\nrely on the existing value assertions like assertSame('hello', $model->name)\nwhich already verify the attribute exists and is accessible; apply this removal\nto all occurrences mentioned (lines near the various test methods where\nassertObjectHasProperty was added).\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commits ddfb94d to 958c209","revised_diff":"diff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\nindex ed054276bdf..5523679200d 100644\n--- a/tests/framework/validators/TrimValidatorTest.php\n+++ b/tests/framework/validators/TrimValidatorTest.php\n@@ -32,6 +32,7 @@ public function testTrimWhitespace(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -42,6 +43,7 @@ public function testTrimTabs(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -53,6 +55,7 @@ public function testTrimCustomChars(): void\n \n $validator->validateAttribute($model, 'path');\n \n+ $this->assertTrue(isset($model->path));\n $this->assertSame('hello', $model->path);\n }\n \n@@ -63,6 +66,7 @@ public function testTrimEmptyString(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -73,6 +77,7 @@ public function testTrimNullValue(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -83,6 +88,7 @@ public function testTrimIntegerValue(): void\n \n $validator->validateAttribute($model, 'count');\n \n+ $this->assertTrue(isset($model->count));\n $this->assertSame('42', $model->count);\n }\n \n@@ -93,6 +99,7 @@ public function testTrimArray(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame(['foo', 'bar'], $model->tags);\n }\n \n@@ -105,6 +112,7 @@ public function testSkipOnArrayTrue(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame($original, $model->tags);\n }\n \n@@ -116,6 +124,7 @@ public function testSkipOnArrayTrueWithScalar(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -198,6 +207,7 @@ public function testTrimBooleanValue(): void\n \n $validator->validateAttribute($model, 'flag');\n \n+ $this->assertTrue(isset($model->flag));\n $this->assertSame('1', $model->flag);\n }\n \n@@ -208,6 +218,7 @@ public function testTrimWithModelRules(): void\n \n $model->validate();\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n $this->assertFalse($model->hasErrors());\n }\n"}],"string":"[\n {\n \"subtask_id\": \"s6\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Document `attr_image` and `attr_images` too for PHPStan completeness.**\\n\\nThe docblock omits two dynamic `attr*` fields that are actively used in `rules()` (`attr_image`, `attr_images`). Adding them keeps the dynamic-property map consistent and avoids residual static-analysis noise.\\n\\n \\n\\n<details>\\n<summary>Suggested docblock patch</summary>\\n\\n```diff\\n /**\\n * `@property` mixed $attr\\n+ * `@property` mixed $attr_image\\n+ * `@property` mixed $attr_images\\n * `@property` mixed $attr_url\\n * `@property` mixed $attr_string\\n * `@property` mixed $attr_reg1\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n/**\\n * `@property` mixed $attr\\n * `@property` mixed $attr_image\\n * `@property` mixed $attr_images\\n * `@property` mixed $attr_url\\n * `@property` mixed $attr_string\\n * `@property` mixed $attr_reg1\\n * `@property` mixed $attr_number\\n * `@property` mixed $attr_ip\\n * `@property` mixed $attr_array\\n * `@property` mixed $attr_array_skipped\\n * `@property` mixed $attr_files\\n * `@property` mixed $attr_one\\n * `@property` mixed $attr_two\\n * `@property` mixed $attr_empty1\\n * `@property` mixed $attr_empty2\\n * `@property` mixed $attr_email\\n * `@property` mixed $attr_date\\n * `@property` mixed $attr_timestamp\\n * `@property` mixed $attr_test\\n * `@property` mixed $attr_test_val\\n * `@property` mixed $attr_test_repeat\\n * `@property` mixed $attrA\\n * `@property` mixed $attrB\\n * `@property` mixed $attrC\\n * `@property` mixed $attrD\\n */\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/data/validators/models/FakedValidationModel.php` around lines 13 - 37,\\nThe class docblock is missing dynamic properties used by rules(); add `@property`\\nmixed $attr_image and `@property` mixed $attr_images to the existing docblock\\n(near the other `@property` entries such as $attr, $attr_files) so PHPStan/static\\nanalysis recognizes these dynamic attributes and eliminates the warnings.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commits ddfb94d to 958c209\",\n \"revised_diff\": \"diff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\\nindex 0f2cf644cb3..e6f5a8a597b 100644\\n--- a/tests/data/validators/models/FakedValidationModel.php\\n+++ b/tests/data/validators/models/FakedValidationModel.php\\n@@ -10,6 +10,33 @@\\n \\n use yii\\\\base\\\\Model;\\n \\n+/**\\n+ * @property mixed $attr\\n+ * @property mixed $attr_url\\n+ * @property mixed $attr_string\\n+ * @property mixed $attr_reg1\\n+ * @property mixed $attr_number\\n+ * @property mixed $attr_ip\\n+ * @property mixed $attr_array\\n+ * @property mixed $attr_array_skipped\\n+ * @property mixed $attr_files\\n+ * @property mixed $attr_one\\n+ * @property mixed $attr_two\\n+ * @property mixed $attr_empty1\\n+ * @property mixed $attr_empty2\\n+ * @property mixed $attr_email\\n+ * @property mixed $attr_date\\n+ * @property mixed $attr_timestamp\\n+ * @property mixed $attr_test\\n+ * @property mixed $attr_test_val\\n+ * @property mixed $attr_test_repeat\\n+ * @property mixed $attrA\\n+ * @property mixed $attrB\\n+ * @property mixed $attrC\\n+ * @property mixed $attrD\\n+ * @property mixed $attr_image\\n+ * @property mixed $attr_images\\n+ */\\n class FakedValidationModel extends Model\\n {\\n public $val_attr_a;\\n\"\n },\n {\n \"subtask_id\": \"s8\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ด Critical_ | _โก Quick win_\\n\\n**Critical: `assertObjectHasProperty` is incompatible with `DynamicModel`.**\\n\\nAll the added `assertObjectHasProperty` assertions are failing because `DynamicModel` stores attributes in an internal array and exposes them via magic methods (`__get`, `__set`), not as actual PHP object properties. The PHPUnit `assertObjectHasProperty` method uses reflection to check for declared properties, which will never find dynamically stored attributes.\\n\\nThese assertions should be removed. The subsequent value assertions (e.g., `assertSame('original', $model->name)`) already confirm the attribute exists and is accessible, since they would fail if the attribute were missing.\\n\\n\\n\\n\\n<details>\\n<summary>๐ง Proposed fix: Remove the incompatible assertions</summary>\\n\\n```diff\\n $validator->validateAttribute($model, 'name');\\n\\n- $this->assertObjectHasProperty('name', $model);\\n $this->assertSame('original', $model->name);\\n $this->assertFalse($model->hasErrors('name'));\\n```\\n\\nApply this pattern to all five test methods where `assertObjectHasProperty` was added.\\n</details>\\n\\n\\nAlso applies to: 45-47, 59-59, 71-73, 97-97\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช GitHub Actions: build / 1_PHP 7.4.txt</summary>\\n\\n[error] 33-33: PHPUnit failure: SafeValidatorTest::testValidateAttributeDoesNothing. Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 3_PHP 8.2.txt</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 4_PHP 8.5.txt</summary>\\n\\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 5_PHP 8.txt</summary>\\n\\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 6_PHP 8.4.txt</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 7_PHP 8.6.txt</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 7.4</summary>\\n\\n[error] 33-33: PHPUnit failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8</summary>\\n\\n[error] 33-33: PHPUnit failure: yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing failed. Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.1</summary>\\n\\n[error] 33-33: yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.2</summary>\\n\\n[error] 33-33: SafeValidatorTest::testValidateAttributeDoesNothing failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.3</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that DynamicModel has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.4</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.5</summary>\\n\\n[error] 33-33: PHPUnit failure (SafeValidatorTest::testValidateAttributeDoesNothing): Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.6</summary>\\n\\n[error] 33-33: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\SafeValidatorTest::testValidateAttributeDoesNothing: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/validators/SafeValidatorTest.php` at line 33, The test uses\\nPHPUnit's assertObjectHasProperty which is incompatible with DynamicModel\\n(attributes are stored via magic methods), so remove the\\nassertObjectHasProperty(...) calls in SafeValidatorTest (the ones like\\n$this->assertObjectHasProperty('name', $model)) across all affected test methods\\nand keep the existing value assertions (e.g., assertSame('original',\\n$model->name)) which already verify attribute presence and accessibility; update\\nall five occurrences accordingly.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commits ddfb94d to 958c209\",\n \"revised_diff\": \"diff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\\nindex 079cda410a7..c4eafa9243c 100644\\n--- a/tests/framework/validators/SafeValidatorTest.php\\n+++ b/tests/framework/validators/SafeValidatorTest.php\\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n $this->assertFalse($model->hasErrors('name'));\\n }\\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\\n \\n $validator->validateAttributes($model, ['name', 'email']);\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('original', $model->name);\\n- $this->assertNull($model->email);\\n+ $this->assertNull($model['email']);\\n $this->assertFalse($model->hasErrors());\\n }\\n \\n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\\n \\n $validator->validateAttribute($model, 'field');\\n \\n- $this->assertNull($model->field);\\n+ $this->assertNull($model['field']);\\n $this->assertFalse($model->hasErrors('field'));\\n }\\n \\n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\\n \\n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\\n \\n+ $this->assertTrue(isset($model->username));\\n $this->assertSame('admin', $model->username);\\n- $this->assertNull($model->role);\\n+ $this->assertNull($model['role']);\\n }\\n \\n public function testValidationAlwaysPasses(): void\\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\\n $validator->validateAttribute($model, 'attr');\\n \\n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\\n- $this->assertSame($value, $model->attr);\\n+ $this->assertSame($value, $model['attr']);\\n }\\n }\\n }\\n\"\n },\n {\n \"subtask_id\": \"s8\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ด Critical_ | _โก Quick win_\\n\\n**Critical: `assertObjectHasProperty` is incompatible with `DynamicModel`.**\\n\\nAll the added `assertObjectHasProperty` assertions are failing because `DynamicModel` stores attributes in an internal array and exposes them via magic methods (`__get`, `__set`), not as actual PHP object properties. The PHPUnit `assertObjectHasProperty` method uses reflection to check for declared properties, which will never find dynamically stored attributes.\\n\\nThese assertions should be removed. The subsequent value assertions (e.g., `assertSame('hello', $model->name)`) already confirm the attribute exists and is accessible, since they would fail if the attribute were missing.\\n\\n\\n\\n\\n<details>\\n<summary>๐ง Proposed fix: Remove the incompatible assertions</summary>\\n\\n```diff\\n $validator->validateAttribute($model, 'name');\\n\\n- $this->assertObjectHasProperty('name', $model);\\n $this->assertSame('hello', $model->name);\\n```\\n\\nApply this pattern to all eleven test methods where `assertObjectHasProperty` was added.\\n</details>\\n\\n\\nAlso applies to: 46-46, 58-58, 69-69, 80-80, 91-91, 102-102, 115-115, 127-127, 210-210, 221-221\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช GitHub Actions: build / 1_PHP 7.4.txt</summary>\\n\\n[error] 35-35: PHPUnit failure: TrimValidatorTest::testTrimWhitespace. Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 3_PHP 8.2.txt</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 4_PHP 8.5.txt</summary>\\n\\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 5_PHP 8.txt</summary>\\n\\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 6_PHP 8.4.txt</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / 7_PHP 8.6.txt</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 7.4</summary>\\n\\n[error] 35-35: PHPUnit failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8</summary>\\n\\n[error] 35-35: PHPUnit failure: yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace failed. Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.1</summary>\\n\\n[error] 35-35: yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.2</summary>\\n\\n[error] 35-35: TrimValidatorTest::testTrimWhitespace failed: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.3</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that DynamicModel has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.4</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.5</summary>\\n\\n[error] 35-35: PHPUnit failure (TrimValidatorTest::testTrimWhitespace): Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n<details>\\n<summary>๐ช GitHub Actions: build / PHP 8.6</summary>\\n\\n[error] 35-35: PHPUnit failure in yiiunit\\\\framework\\\\validators\\\\TrimValidatorTest::testTrimWhitespace: Failed asserting that object of class \\\"yii\\\\base\\\\DynamicModel\\\" has property \\\"name\\\".\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/validators/TrimValidatorTest.php` at line 35, The tests in\\nTrimValidatorTest.php are using PHPUnit::assertObjectHasProperty('name', $model)\\nwhich is incompatible with DynamicModel (attributes are stored in an internal\\narray and exposed via __get/__set), so remove each assertObjectHasProperty call\\n(e.g., the assertion on $model in the test methods around the 'name' checks) and\\nrely on the existing value assertions like assertSame('hello', $model->name)\\nwhich already verify the attribute exists and is accessible; apply this removal\\nto all occurrences mentioned (lines near the various test methods where\\nassertObjectHasProperty was added).\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commits ddfb94d to 958c209\",\n \"revised_diff\": \"diff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\\nindex ed054276bdf..5523679200d 100644\\n--- a/tests/framework/validators/TrimValidatorTest.php\\n+++ b/tests/framework/validators/TrimValidatorTest.php\\n@@ -32,6 +32,7 @@ public function testTrimWhitespace(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -42,6 +43,7 @@ public function testTrimTabs(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -53,6 +55,7 @@ public function testTrimCustomChars(): void\\n \\n $validator->validateAttribute($model, 'path');\\n \\n+ $this->assertTrue(isset($model->path));\\n $this->assertSame('hello', $model->path);\\n }\\n \\n@@ -63,6 +66,7 @@ public function testTrimEmptyString(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -73,6 +77,7 @@ public function testTrimNullValue(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('', $model->name);\\n }\\n \\n@@ -83,6 +88,7 @@ public function testTrimIntegerValue(): void\\n \\n $validator->validateAttribute($model, 'count');\\n \\n+ $this->assertTrue(isset($model->count));\\n $this->assertSame('42', $model->count);\\n }\\n \\n@@ -93,6 +99,7 @@ public function testTrimArray(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame(['foo', 'bar'], $model->tags);\\n }\\n \\n@@ -105,6 +112,7 @@ public function testSkipOnArrayTrue(): void\\n \\n $validator->validateAttribute($model, 'tags');\\n \\n+ $this->assertTrue(isset($model->tags));\\n $this->assertSame($original, $model->tags);\\n }\\n \\n@@ -116,6 +124,7 @@ public function testSkipOnArrayTrueWithScalar(): void\\n \\n $validator->validateAttribute($model, 'name');\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n }\\n \\n@@ -198,6 +207,7 @@ public function testTrimBooleanValue(): void\\n \\n $validator->validateAttribute($model, 'flag');\\n \\n+ $this->assertTrue(isset($model->flag));\\n $this->assertSame('1', $model->flag);\\n }\\n \\n@@ -208,6 +218,7 @@ public function testTrimWithModelRules(): void\\n \\n $model->validate();\\n \\n+ $this->assertTrue(isset($model->name));\\n $this->assertSame('hello', $model->name);\\n $this->assertFalse($model->hasErrors());\\n }\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php\nindex b0da27b75ad..bc4f3ea5f09 100644\n--- a/build/controllers/PhpDocController.php\n+++ b/build/controllers/PhpDocController.php\n@@ -713,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)\n }\n if ($propertyPart) {\n preg_match(\n- '/@property(?:-read|-write)?\\s+([\\\\\\\\\\w\\|\\[\\]]+)\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n+ '/@property(?:-read|-write)?\\s+' . self::TYPE_REG_EXP\n+ . '\\s+\\$([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)/',\n $line,\n $matches\n );\n \n- if (isset($matches[2])) {\n- $lastPropertyName = $matches[2];\n+ if (isset($matches[1])) {\n+ $lastPropertyName = $matches[1];\n }\n \n if (in_array($lastPropertyName, $manuallyAddedProperties)) {\ndiff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 2296dfc0938..0d83c0d7557 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,7 +4,11 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` (mspirkov)\n+- Enh #20785: Clarify the type of the `yii\\base\\Model::$errors` (mspirkov)\n+- Bug #20785: Fix `@return` annotation for `yii\\base\\Model::getErrors()` (mspirkov)\n+- Bug #20785: Fix `@var` annotation for `yii\\validators\\CompareValidator::$message` (mspirkov)\n+- Enh #20785: Add `@param-out` annotation for `$error` in `yii\\validators\\Validator::validate()` (mspirkov)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/base/Model.php b/framework/base/Model.php\nindex ec725426328..fb4b0b9de73 100644\n--- a/framework/base/Model.php\n+++ b/framework/base/Model.php\n@@ -38,7 +38,7 @@\n *\n * For more details and usage information on Model, see the [guide article on models](guide:structure-models).\n *\n- * @property-read array $errors Errors for all attributes. This is a two-dimensional\n+ * @property-read array<string, string[]> $errors Errors for all attributes. This is a two-dimensional\n * array of errors for all attributes, similar to the following:\n *\n * ```\n@@ -579,8 +579,9 @@ public function hasErrors($attribute = null)\n /**\n * Returns the errors for all attributes or a single attribute.\n * @param string|null $attribute attribute name. Use null to retrieve errors for all attributes.\n- * @return array<string, string[]> errors for all attributes or the specified attribute. Empty array is returned if no error.\n- * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:\n+ * @return ($attribute is null ? array<string, string[]> : string[]) errors for all attributes or\n+ * the specified attribute. Empty array is returned if no error. Note that when returning errors for\n+ * all attributes, the result is a two-dimensional array, like the following:\n *\n * ```\n * [\ndiff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php\nindex 27783fc26d7..a72410dc483 100644\n--- a/framework/validators/CompareValidator.php\n+++ b/framework/validators/CompareValidator.php\n@@ -94,7 +94,7 @@ class CompareValidator extends Validator\n */\n public $operator = '==';\n /**\n- * @var string the user-defined error message. It may contain the following placeholders which\n+ * @var string|null the user-defined error message. It may contain the following placeholders which\n * will be replaced accordingly by the validator:\n *\n * - `{attribute}`: the label of the attribute being validated\ndiff --git a/framework/validators/Validator.php b/framework/validators/Validator.php\nindex 977d68e2895..70a54a9ce84 100644\n--- a/framework/validators/Validator.php\n+++ b/framework/validators/Validator.php\n@@ -316,6 +316,8 @@ public function validateAttribute($model, $attribute)\n * @param mixed $value the data value to be validated.\n * @param string|null $error the error message to be returned, if the validation fails.\n * @return bool whether the data is valid.\n+ *\n+ * @param-out string|null $error\n */\n public function validate($value, &$error = null)\n {\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex c369f29ed19..608efda39af 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -5,6 +5,8 @@ includes:\n parameters:\n level: 3\n \n+ reportIgnoresWithoutComments: true\n+\n paths:\n - build\n - framework\n@@ -17,7 +19,6 @@ parameters:\n - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/validators\n \n bootstrapFiles:\n - framework/BaseYii.php\n\ndiff --git a/tests/data/validators/models/FakedValidationModel.php b/tests/data/validators/models/FakedValidationModel.php\nindex 0f2cf644cb3..e6f5a8a597b 100644\n--- a/tests/data/validators/models/FakedValidationModel.php\n+++ b/tests/data/validators/models/FakedValidationModel.php\n@@ -10,6 +10,33 @@\n \n use yii\\base\\Model;\n \n+/**\n+ * @property mixed $attr\n+ * @property mixed $attr_url\n+ * @property mixed $attr_string\n+ * @property mixed $attr_reg1\n+ * @property mixed $attr_number\n+ * @property mixed $attr_ip\n+ * @property mixed $attr_array\n+ * @property mixed $attr_array_skipped\n+ * @property mixed $attr_files\n+ * @property mixed $attr_one\n+ * @property mixed $attr_two\n+ * @property mixed $attr_empty1\n+ * @property mixed $attr_empty2\n+ * @property mixed $attr_email\n+ * @property mixed $attr_date\n+ * @property mixed $attr_timestamp\n+ * @property mixed $attr_test\n+ * @property mixed $attr_test_val\n+ * @property mixed $attr_test_repeat\n+ * @property mixed $attrA\n+ * @property mixed $attrB\n+ * @property mixed $attrC\n+ * @property mixed $attrD\n+ * @property mixed $attr_image\n+ * @property mixed $attr_images\n+ */\n class FakedValidationModel extends Model\n {\n public $val_attr_a;\ndiff --git a/tests/data/validators/models/ValidatorTestMainModel.php b/tests/data/validators/models/ValidatorTestMainModel.php\nindex 73faaf22f39..1752079bc08 100644\n--- a/tests/data/validators/models/ValidatorTestMainModel.php\n+++ b/tests/data/validators/models/ValidatorTestMainModel.php\n@@ -10,6 +10,9 @@\n \n use yiiunit\\data\\ar\\ActiveRecord;\n \n+/**\n+ * @property int $id\n+ */\n class ValidatorTestMainModel extends ActiveRecord\n {\n public $testMainVal = 1;\ndiff --git a/tests/data/validators/models/ValidatorTestRefModel.php b/tests/data/validators/models/ValidatorTestRefModel.php\nindex 8642dc317c9..0bdb0c71f83 100644\n--- a/tests/data/validators/models/ValidatorTestRefModel.php\n+++ b/tests/data/validators/models/ValidatorTestRefModel.php\n@@ -11,9 +11,9 @@\n use yiiunit\\data\\ar\\ActiveRecord;\n \n /**\n- * @property int id\n- * @property string a_field\n- * @property int ref\n+ * @property int $id\n+ * @property string $a_field\n+ * @property int $ref\n */\n class ValidatorTestRefModel extends ActiveRecord\n {\ndiff --git a/tests/framework/base/BaseObjectTest.php b/tests/framework/base/BaseObjectTest.php\nindex e19c7f534a9..94ec65e2175 100644\n--- a/tests/framework/base/BaseObjectTest.php\n+++ b/tests/framework/base/BaseObjectTest.php\n@@ -71,8 +71,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->object->Caption;\n }\n \n@@ -82,8 +81,7 @@ public function testSetProperty(): void\n $this->object->Text = $value;\n $this->assertEquals($value, $this->object->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->object->NewMember = $value;\n }\n \n@@ -127,8 +125,7 @@ public function testUnsetReadOnlyProperty(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->object->unknownMethod();\n }\n \ndiff --git a/tests/framework/base/BehaviorTest.php b/tests/framework/base/BehaviorTest.php\nindex cbaa2ce6db5..c3dd2773818 100644\n--- a/tests/framework/base/BehaviorTest.php\n+++ b/tests/framework/base/BehaviorTest.php\n@@ -174,8 +174,7 @@ public function testCallUnknownMethod(): void\n $bar->attachBehavior('bar', $behavior);\n \n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $bar->nomagicBehaviorMethod();\n }\n }\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex 5b2f5750b03..19746c6bd7d 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -114,8 +114,7 @@ public function testGetProperty(): void\n {\n $this->assertSame('default', $this->component->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $value2 = $this->component->Caption;\n }\n \n@@ -125,8 +124,7 @@ public function testSetProperty(): void\n $this->component->Text = $value;\n $this->assertEquals($value, $this->component->Text);\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $this->component->NewMember = $value;\n }\n \n@@ -153,8 +151,7 @@ public function testIsset(): void\n public function testCallUnknownMethod(): void\n {\n $this->expectException('yii\\base\\UnknownMethodException');\n- // We intentionally call a non-existent method to test that an exception is thrown\n- // @phpstan-ignore method.notFound\n+ // @phpstan-ignore method.notFound (We intentionally call a non-existent method to test that an exception is thrown)\n $this->component->unknownMethod();\n }\n \n@@ -187,8 +184,7 @@ public function testOn(): void\n \n $this->assertFalse($this->component->hasEventHandlers('click2'));\n $p = 'on click2';\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $this->component->$p = 'foo2';\n $this->assertTrue($this->component->hasEventHandlers('click2'));\n }\n@@ -354,21 +350,18 @@ public function testAttachBehavior(): void\n }\n \n $component = new NewComponent();\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as b'} = ['class' => NewBehavior::class];\n $this->assertInstanceOf(NewBehavior::class, $component->getBehavior('b'));\n $this->assertTrue($component->hasProperty('p'));\n $component->test();\n $this->assertTrue($component->behaviorCalled);\n \n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as c'} = ['__class' => NewBehavior::class];\n $this->assertNotNull($component->getBehavior('c'));\n \n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as d'} = [\n '__class' => NewBehavior2::class,\n 'class' => NewBehavior::class,\n@@ -377,8 +370,7 @@ public function testAttachBehavior(): void\n \n // CVE-2024-4990\n try {\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->{'as e'} = [\n '__class' => 'NotExistsBehavior',\n 'class' => NewBehavior::class,\n@@ -469,8 +461,7 @@ public function testSettingBehaviorWithSetter(): void\n $behaviorName = 'foo';\n $this->assertNull($this->component->getBehavior($behaviorName));\n $p = 'as ' . $behaviorName;\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $this->component->$p = __NAMESPACE__ . '\\NewBehavior';\n $this->assertSame(__NAMESPACE__ . '\\NewBehavior', get_class($this->component->getBehavior($behaviorName)));\n }\n@@ -568,8 +559,7 @@ public function testSetBehaviorInstanceViaProperty(): void\n $component = new NewComponent();\n $behavior = new NewBehavior();\n $p = 'as myBehavior';\n- // Since the property contains a space in its name, the error cannot be resolved using PHPDoc.\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (/ Since the property contains a space in its name, the error cannot be resolved using PHPDoc.)\n $component->$p = $behavior;\n $this->assertSame($behavior, $component->getBehavior('myBehavior'));\n }\ndiff --git a/tests/framework/base/DynamicModelTest.php b/tests/framework/base/DynamicModelTest.php\nindex 31b218f5187..24ef4cb86c8 100644\n--- a/tests/framework/base/DynamicModelTest.php\n+++ b/tests/framework/base/DynamicModelTest.php\n@@ -96,8 +96,7 @@ public function testDynamicProperty(): void\n $this->assertTrue($model->canSetProperty('email'));\n $this->assertTrue($model->canSetProperty('name'));\n $this->expectException('yii\\base\\UnknownPropertyException');\n- // We intentionally access a non-existent property to test that an exception is thrown\n- // @phpstan-ignore property.notFound\n+ // @phpstan-ignore property.notFound (We intentionally access a non-existent property to test that an exception is thrown)\n $age = $model->age;\n }\n \ndiff --git a/tests/framework/validators/BooleanValidatorTest.php b/tests/framework/validators/BooleanValidatorTest.php\nindex f66e44b0263..dd70e5c016b 100644\n--- a/tests/framework/validators/BooleanValidatorTest.php\n+++ b/tests/framework/validators/BooleanValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\BooleanValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -91,10 +91,3 @@ public function testErrorMessage(): void\n );\n }\n }\n-\n-class ViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/CompareValidatorTest.php b/tests/framework/validators/CompareValidatorTest.php\nindex 74c6c4bc7d1..52c213a02ea 100644\n--- a/tests/framework/validators/CompareValidatorTest.php\n+++ b/tests/framework/validators/CompareValidatorTest.php\n@@ -12,6 +12,7 @@\n use yii\\base\\InvalidConfigException;\n use yii\\validators\\CompareValidator;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -375,7 +376,7 @@ public function testClientValidateAttribute(): void\n $model = new FakedValidationModel();\n $model->attr_test = 'test';\n $val = new CompareValidator(['compareValue' => 'expected']);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringStartsWith('yii.validation.compare(', $js);\n $this->assertStringContainsString('$form', $js);\n@@ -411,7 +412,7 @@ public function testClientValidateAttributeWithClosure(): void\n $val = new CompareValidator(['compareValue' => function () {\n return 'resolved';\n }]);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringContainsString('resolved', $js);\n }\n@@ -421,7 +422,7 @@ public function testClientValidateAttributeContainsEncodedOptions(): void\n $model = new FakedValidationModel();\n $model->attr_test = 'test';\n $val = new CompareValidator(['compareValue' => 'check']);\n- $js = $val->clientValidateAttribute($model, 'attr_test', new CompareViewStub());\n+ $js = $val->clientValidateAttribute($model, 'attr_test', new ViewStub());\n \n $this->assertStringContainsString('\"operator\":\"==\"', $js);\n $this->assertStringContainsString('\"compareValue\":\"check\"', $js);\n@@ -497,10 +498,3 @@ public function testDefaultOperatorFallsThrough(): void\n $this->assertFalse($val->validate(999));\n }\n }\n-\n-class CompareViewStub extends \\yii\\web\\View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php\nindex d5c647d7491..e89d493e806 100644\n--- a/tests/framework/validators/FileValidatorTest.php\n+++ b/tests/framework/validators/FileValidatorTest.php\n@@ -335,7 +335,7 @@ public function testValidateArrayAttributeWithMinMaxOneAndOneFile(): void\n \n /**\n * @param array $params\n- * @return UploadedFile[]\n+ * @return UploadedFile|UploadedFile[]\n */\n protected function createTestFiles($params = [])\n {\ndiff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php\nindex 477b4f8ee95..228b3c8af01 100644\n--- a/tests/framework/validators/FilterValidatorTest.php\n+++ b/tests/framework/validators/FilterValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\FilterValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -75,7 +75,7 @@ public function testClientValidateAttributeWithTrimFilter(): void\n {\n $val = new FilterValidator(['filter' => 'trim']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $js = $val->clientValidateAttribute($m, 'attr_one', new FilterViewStub());\n+ $js = $val->clientValidateAttribute($m, 'attr_one', new ViewStub());\n $this->assertStringContainsString('yii.validation.trim', $js);\n }\n \n@@ -83,7 +83,7 @@ public function testClientValidateAttributeWithNonTrimFilter(): void\n {\n $val = new FilterValidator(['filter' => 'strtolower']);\n $m = FakedValidationModel::createWithAttributes(['attr_one' => 'test']);\n- $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new FilterViewStub()));\n+ $this->assertNull($val->clientValidateAttribute($m, 'attr_one', new ViewStub()));\n }\n \n public function testGetClientOptionsDefault(): void\n@@ -102,10 +102,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class FilterViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RegularExpressionValidatorTest.php b/tests/framework/validators/RegularExpressionValidatorTest.php\nindex 1881a4bcbbf..1872c56d248 100644\n--- a/tests/framework/validators/RegularExpressionValidatorTest.php\n+++ b/tests/framework/validators/RegularExpressionValidatorTest.php\n@@ -9,8 +9,8 @@\n namespace yiiunit\\framework\\validators;\n \n use yii\\validators\\RegularExpressionValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -81,7 +81,7 @@ public function testClientValidateAttribute(): void\n {\n $val = new RegularExpressionValidator(['pattern' => '/^[a-z]+$/i']);\n $m = FakedValidationModel::createWithAttributes(['attr_reg1' => 'abc']);\n- $js = $val->clientValidateAttribute($m, 'attr_reg1', new RegexViewStub());\n+ $js = $val->clientValidateAttribute($m, 'attr_reg1', new ViewStub());\n $this->assertStringContainsString('yii.validation.regularExpression', $js);\n }\n \n@@ -113,10 +113,3 @@ public function testGetClientOptionsWithSkipOnEmpty(): void\n $this->assertSame(1, $options['skipOnEmpty']);\n }\n }\n-\n-class RegexViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php\nindex 0e2a21e1c29..2b2d4382fc6 100644\n--- a/tests/framework/validators/RequiredValidatorTest.php\n+++ b/tests/framework/validators/RequiredValidatorTest.php\n@@ -8,10 +8,10 @@\n \n namespace yiiunit\\framework\\validators;\n \n-use yii\\base\\Model;\n use yii\\validators\\RequiredValidator;\n-use yii\\web\\View;\n use yiiunit\\data\\validators\\models\\FakedValidationModel;\n+use yiiunit\\framework\\validators\\stubs\\ModelForReqValidator;\n+use yiiunit\\framework\\validators\\stubs\\ViewStub;\n use yiiunit\\TestCase;\n \n /**\n@@ -78,7 +78,7 @@ public function testErrorClientMessage(): void\n \n $this->assertEquals(\n 'yii.validation.required(value, messages, {\"message\":\"\\u003Cstrong\\u003Eerror\\u003C\\/strong\\u003E for \\u003Cb\\u003EAttr\\u003C\\/b\\u003E\"});',\n- $validator->clientValidateAttribute($obj, 'attr', new RequiredViewStub())\n+ $validator->clientValidateAttribute($obj, 'attr', new ViewStub())\n );\n }\n \n@@ -196,27 +196,3 @@ public function testGetClientOptionsMessageContainsRequiredValue(): void\n $this->assertStringContainsString('confirm', $options['message']);\n }\n }\n-\n-class ModelForReqValidator extends Model\n-{\n- public $attr;\n-\n- public function rules()\n- {\n- return [\n- [['attr'], 'required'],\n- ];\n- }\n-\n- public function attributeLabels()\n- {\n- return ['attr' => '<b>Attr</b>'];\n- }\n-}\n-\n-class RequiredViewStub extends View\n-{\n- public function registerAssetBundle($name, $position = null)\n- {\n- }\n-}\ndiff --git a/tests/framework/validators/SafeValidatorTest.php b/tests/framework/validators/SafeValidatorTest.php\nindex 079cda410a7..c4eafa9243c 100644\n--- a/tests/framework/validators/SafeValidatorTest.php\n+++ b/tests/framework/validators/SafeValidatorTest.php\n@@ -30,6 +30,7 @@ public function testValidateAttributeDoesNothing(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n $this->assertFalse($model->hasErrors('name'));\n }\n@@ -41,8 +42,9 @@ public function testValidateAttributesDoesNothing(): void\n \n $validator->validateAttributes($model, ['name', 'email']);\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('original', $model->name);\n- $this->assertNull($model->email);\n+ $this->assertNull($model['email']);\n $this->assertFalse($model->hasErrors());\n }\n \n@@ -53,7 +55,7 @@ public function testValidateAttributeNullValue(): void\n \n $validator->validateAttribute($model, 'field');\n \n- $this->assertNull($model->field);\n+ $this->assertNull($model['field']);\n $this->assertFalse($model->hasErrors('field'));\n }\n \n@@ -64,8 +66,9 @@ public function testSafeAttributesMarkedForMassAssignment(): void\n \n $model->load(['username' => 'admin', 'role' => 'superuser'], '');\n \n+ $this->assertTrue(isset($model->username));\n $this->assertSame('admin', $model->username);\n- $this->assertNull($model->role);\n+ $this->assertNull($model['role']);\n }\n \n public function testValidationAlwaysPasses(): void\n@@ -88,7 +91,7 @@ public function testValidationPassesWithAnyValue(): void\n $validator->validateAttribute($model, 'attr');\n \n $this->assertFalse($model->hasErrors('attr'), 'Failed for value: ' . var_export($value, true));\n- $this->assertSame($value, $model->attr);\n+ $this->assertSame($value, $model['attr']);\n }\n }\n }\ndiff --git a/tests/framework/validators/TrimValidatorTest.php b/tests/framework/validators/TrimValidatorTest.php\nindex ed054276bdf..5523679200d 100644\n--- a/tests/framework/validators/TrimValidatorTest.php\n+++ b/tests/framework/validators/TrimValidatorTest.php\n@@ -32,6 +32,7 @@ public function testTrimWhitespace(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -42,6 +43,7 @@ public function testTrimTabs(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -53,6 +55,7 @@ public function testTrimCustomChars(): void\n \n $validator->validateAttribute($model, 'path');\n \n+ $this->assertTrue(isset($model->path));\n $this->assertSame('hello', $model->path);\n }\n \n@@ -63,6 +66,7 @@ public function testTrimEmptyString(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -73,6 +77,7 @@ public function testTrimNullValue(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('', $model->name);\n }\n \n@@ -83,6 +88,7 @@ public function testTrimIntegerValue(): void\n \n $validator->validateAttribute($model, 'count');\n \n+ $this->assertTrue(isset($model->count));\n $this->assertSame('42', $model->count);\n }\n \n@@ -93,6 +99,7 @@ public function testTrimArray(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame(['foo', 'bar'], $model->tags);\n }\n \n@@ -105,6 +112,7 @@ public function testSkipOnArrayTrue(): void\n \n $validator->validateAttribute($model, 'tags');\n \n+ $this->assertTrue(isset($model->tags));\n $this->assertSame($original, $model->tags);\n }\n \n@@ -116,6 +124,7 @@ public function testSkipOnArrayTrueWithScalar(): void\n \n $validator->validateAttribute($model, 'name');\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n }\n \n@@ -198,6 +207,7 @@ public function testTrimBooleanValue(): void\n \n $validator->validateAttribute($model, 'flag');\n \n+ $this->assertTrue(isset($model->flag));\n $this->assertSame('1', $model->flag);\n }\n \n@@ -208,6 +218,7 @@ public function testTrimWithModelRules(): void\n \n $model->validate();\n \n+ $this->assertTrue(isset($model->name));\n $this->assertSame('hello', $model->name);\n $this->assertFalse($model->hasErrors());\n }\ndiff --git a/tests/framework/validators/UniqueValidatorTest.php b/tests/framework/validators/UniqueValidatorTest.php\nindex 275ff69c900..453adb00745 100644\n--- a/tests/framework/validators/UniqueValidatorTest.php\n+++ b/tests/framework/validators/UniqueValidatorTest.php\n@@ -82,6 +82,7 @@ public function testValidateInvalidAttribute(): void\n \n /** @var Customer $customerModel */\n $customerModel = Customer::findOne(1);\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->name = ['test array data'];\n $validator->validateAttribute($customerModel, 'name');\n $this->assertEquals($messageError, $customerModel->getFirstError('name'));\n@@ -89,6 +90,7 @@ public function testValidateInvalidAttribute(): void\n $customerModel->clearErrors();\n \n $customerModel->name = 'test data';\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $customerModel->email = ['email@mail.com', 'email2@mail.com'];\n $validator->targetAttribute = ['email', 'name'];\n $validator->validateAttribute($customerModel, 'name');\n@@ -420,7 +422,7 @@ public function testAmbiguousColumnName(): void\n ]);\n $model = new Order();\n $model->customer_id = 1;\n- $model->total = 800;\n+ $model->total = '800';\n $model->save(false);\n $validator->validateAttribute($model, 'id');\n $this->assertFalse($model->hasErrors());\ndiff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php\nindex b0a0165e7fb..9c97c4b33fb 100644\n--- a/tests/framework/validators/ValidatorTest.php\n+++ b/tests/framework/validators/ValidatorTest.php\n@@ -249,6 +249,8 @@ public function testClientValidateAttribute(): void\n \n $model = new FakedValidationModel();\n $val = Validator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);\n+ $this->assertInstanceOf(InlineValidator::class, $val);\n+\n $val->clientValidate = 'clientInlineVal';\n $args = $val->clientValidateAttribute($model, 'val_attr_a', $view);\n \ndiff --git a/tests/framework/validators/stubs/ModelForReqValidator.php b/tests/framework/validators/stubs/ModelForReqValidator.php\nnew file mode 100644\nindex 00000000000..3d4654c80ed\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ModelForReqValidator.php\n@@ -0,0 +1,28 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\base\\Model;\n+\n+class ModelForReqValidator extends Model\n+{\n+ public $attr;\n+\n+ public function rules()\n+ {\n+ return [\n+ [['attr'], 'required'],\n+ ];\n+ }\n+\n+ public function attributeLabels()\n+ {\n+ return ['attr' => '<b>Attr</b>'];\n+ }\n+}\ndiff --git a/tests/framework/validators/stubs/ViewStub.php b/tests/framework/validators/stubs/ViewStub.php\nnew file mode 100644\nindex 00000000000..a6a957ac910\n--- /dev/null\n+++ b/tests/framework/validators/stubs/ViewStub.php\n@@ -0,0 +1,18 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\validators\\stubs;\n+\n+use yii\\web\\View;\n+\n+class ViewStub extends View\n+{\n+ public function registerAssetBundle($name, $position = null)\n+ {\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":9,"string":"9"},"num_changed_files":{"kind":"number","value":25,"string":"25"}}},{"rowIdx":34266,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20874"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20874,"string":"20,874"},"base_sha":{"kind":"string","value":"fad5fd58eb61e4bf937db4646bf2389f7f32f1dd"},"head_sha":{"kind":"string","value":"98c8351236517d49aba592befd3e20c520c87d8f"},"task":{"kind":"string","value":"Analyze more tests using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan","scope_files":["phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `tests/framework/grid/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/grid/GridViewTest.php"]},{"subtask_id":"s3","goal":"Implement the changes under `tests/framework/helpers/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/helpers/ArrayHelperTest.php","tests/framework/helpers/ConsoleTest.php","tests/framework/helpers/HtmlTest.php","tests/framework/helpers/JsonTest.php","tests/framework/helpers/UrlTest.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/helpers/stubs/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/helpers/stubs/HtmlTestModel.php","tests/framework/helpers/stubs/JsonModel.php","tests/framework/helpers/stubs/MyHtml.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/i18n/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/i18n/FormatterDateTest.php","tests/framework/i18n/FormatterNumberTest.php","tests/framework/i18n/LocaleTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `tests/framework/grid/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/grid/GridViewTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/helpers/ArrayHelperTest.php\",\n \"tests/framework/helpers/ConsoleTest.php\",\n \"tests/framework/helpers/HtmlTest.php\",\n \"tests/framework/helpers/JsonTest.php\",\n \"tests/framework/helpers/UrlTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/helpers/stubs/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/helpers/stubs/HtmlTestModel.php\",\n \"tests/framework/helpers/stubs/JsonModel.php\",\n \"tests/framework/helpers/stubs/MyHtml.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/i18n/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/i18n/FormatterDateTest.php\",\n \"tests/framework/i18n/FormatterNumberTest.php\",\n \"tests/framework/i18n/LocaleTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 51e87b57398..c369f29ed19 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -17,9 +17,6 @@ parameters:\n - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/grid\n- - tests/framework/helpers\n- - tests/framework/i18n\n - tests/framework/validators\n \n bootstrapFiles:\n\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["tests/framework/grid/GridViewTest.php"],"solution_diff":"diff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\nindex 3229e7ca57d..aa626cfa2b3 100644\n--- a/tests/framework/grid/GridViewTest.php\n+++ b/tests/framework/grid/GridViewTest.php\n@@ -190,15 +190,18 @@ public function testHeaderLabels(): void\n ],\n ]);\n \n+ $gridDataProvider = $grid->dataProvider;\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\n+\n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n ]);\n $grid->renderTableHeader();\n \n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n 'attributes' => ['attr1', 'attr2'],\n@@ -236,6 +239,8 @@ public function testFilterSelector(): void\n );\n \n $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+\n // use renderAjax so the javascript gets baked into the HTML\n $html = $view->renderAjax(\n '@yiiunit/data/views/widgets/GridView/gridview.php',\n","summary":"Edited 1 file(s) in tests/framework/grid/"},{"subtask_id":"s3","scope_files":["tests/framework/helpers/ArrayHelperTest.php","tests/framework/helpers/ConsoleTest.php","tests/framework/helpers/HtmlTest.php","tests/framework/helpers/JsonTest.php","tests/framework/helpers/UrlTest.php"],"solution_diff":"diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php\nindex 34cbf0b7c1f..05ce5bc3680 100644\n--- a/tests/framework/helpers/ArrayHelperTest.php\n+++ b/tests/framework/helpers/ArrayHelperTest.php\n@@ -153,10 +153,12 @@ public function testRemoveWithFloat(): void\n $this->markTestSkipped('Using floats as array key is deprecated.');\n }\n \n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n $array = ['name' => 'b', 'age' => 3, 1.1 => null];\n \n $name = ArrayHelper::remove($array, 'name');\n $this->assertEquals($name, 'b');\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n $this->assertEquals($array, ['age' => 3, 1.1 => null]);\n \n $floatVal = ArrayHelper::remove($array, 1.1);\n@@ -545,7 +547,9 @@ public function testGetValueWithFloatKeys(): void\n }\n \n $array = [];\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\n $array[1.1] = 'some value';\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\n $array[2.1] = null;\n \n $result = ArrayHelper::getValue($array, 1.2);\n@@ -824,7 +828,9 @@ public function testKeyExistsWithFloat(): void\n \n $array = [\n 1 => 3,\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n 2.2 => 4, // Note: Floats are cast to ints, which means that the fractional part will be truncated.\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n 3.3 => null,\n ];\n \ndiff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\nindex a2f3cbdf956..9cbee44ba76 100644\n--- a/tests/framework/helpers/ConsoleTest.php\n+++ b/tests/framework/helpers/ConsoleTest.php\n@@ -443,9 +443,9 @@ public function testSelect(): void\n }\n \n /**\n- * @property string name\n- * @property array types\n- * @property string description\n+ * @property string $name\n+ * @property array $types\n+ * @property string $description\n */\n class TestConsoleModel extends DynamicModel\n {\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\nindex ba34ac7217a..1484b12d130 100644\n--- a/tests/framework/helpers/HtmlTest.php\n+++ b/tests/framework/helpers/HtmlTest.php\n@@ -17,6 +17,8 @@\n use yii\\db\\ArrayExpression;\n use yii\\helpers\\Html;\n use yii\\helpers\\Url;\n+use yiiunit\\framework\\helpers\\stubs\\HtmlTestModel;\n+use yiiunit\\framework\\helpers\\stubs\\MyHtml;\n use yiiunit\\TestCase;\n \n /**\n@@ -1750,7 +1752,7 @@ public function testError(): void\n 'Custom error message generated by callback'\n );\n $this->assertEquals(\n- '<div>Error in yiiunit\\framework\\helpers\\HtmlTestModel - name</div>',\n+ '<div>Error in yiiunit\\framework\\helpers\\stubs\\HtmlTestModel - name</div>',\n Html::error($model, 'name', ['errorSource' => function ($model, $attribute) {\n return 'Error in ' . get_class($model) . ' - ' . $attribute;\n }]),\n@@ -1879,7 +1881,7 @@ public static function dataProviderActiveRadio(): array\n /**\n * @dataProvider dataProviderActiveRadio\n *\n- * @param string $value\n+ * @param bool $value\n * @param array $options\n * @param string $expectedHtml\n */\n@@ -1923,7 +1925,7 @@ public static function dataProviderActiveCheckbox(): array\n /**\n * @dataProvider dataProviderActiveCheckbox\n *\n- * @param string $value\n+ * @param bool $value\n * @param array $options\n * @param string $expectedHtml\n */\n@@ -2294,57 +2296,3 @@ public static function getInputIdByNameDataProvider(): array\n ];\n }\n }\n-\n-/**\n- * Class MyHtml\n- * @package yiiunit\\framework\\helpers\n- */\n-class MyHtml extends Html\n-{\n- /**\n- * @param Model $model\n- * @param string $attribute\n- * @param array $options\n- */\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\n- {\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\n- $attribute = static::getAttributeName($attribute);\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n- }\n- }\n-}\n-\n-/**\n- * @property string name\n- * @property string title\n- * @property string alias\n- * @property array types\n- * @property string description\n- */\n-class HtmlTestModel extends DynamicModel\n-{\n- public function init(): void\n- {\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n- $this->defineAttribute($attribute);\n- }\n- }\n-\n- public function rules()\n- {\n- return [\n- ['name', 'required'],\n- ['name', 'string', 'max' => 100],\n- ['title', 'string', 'length' => 10],\n- ['alias', 'string', 'length' => [0, 20]],\n- ['description', 'string', 'max' => 500],\n- [['radio', 'checkbox'], 'boolean'],\n- ];\n- }\n-\n- public function customError()\n- {\n- return 'this is custom error message';\n- }\n-}\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\nindex e39847e02e3..dba26d71716 100644\n--- a/tests/framework/helpers/JsonTest.php\n+++ b/tests/framework/helpers/JsonTest.php\n@@ -15,8 +15,8 @@\n use DateTimeZone;\n use yii\\helpers\\Json;\n use yii\\web\\JsExpression;\n+use yiiunit\\framework\\helpers\\stubs\\JsonModel;\n use yiiunit\\framework\\web\\Post;\n-use yiiunit\\framework\\models\\JsonModel;\n use yiiunit\\TestCase;\n \n /**\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex 2d0bd605180..b11ba75c82b 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -64,13 +64,13 @@ protected function tearDown(): void\n */\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\n {\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\n+ Yii::$app->controller = $controller = new Controller(\n+ $controllerId,\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\n+ );\n+\n $controller->actionParams = $params;\n $controller->action = new Action($actionID, $controller);\n-\n- if ($moduleID !== null) {\n- $controller->module = new Module($moduleID);\n- }\n }\n \n protected function removeMockedAction()\n","summary":"Edited 5 file(s) in tests/framework/helpers/"},{"subtask_id":"s4","scope_files":["tests/framework/helpers/stubs/HtmlTestModel.php","tests/framework/helpers/stubs/JsonModel.php","tests/framework/helpers/stubs/MyHtml.php"],"solution_diff":"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\nnew file mode 100644\nindex 00000000000..078e10da545\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\n@@ -0,0 +1,47 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\DynamicModel;\n+\n+/**\n+ * @property string $name\n+ * @property string $title\n+ * @property string $alias\n+ * @property mixed $types\n+ * @property string $description\n+ * @property bool $radio\n+ * @property bool $checkbox\n+ */\n+class HtmlTestModel extends DynamicModel\n+{\n+ public function init(): void\n+ {\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n+ $this->defineAttribute($attribute);\n+ }\n+ }\n+\n+ public function rules()\n+ {\n+ return [\n+ ['name', 'required'],\n+ ['name', 'string', 'max' => 100],\n+ ['title', 'string', 'length' => 10],\n+ ['alias', 'string', 'length' => [0, 20]],\n+ ['description', 'string', 'max' => 500],\n+ [['radio', 'checkbox'], 'boolean'],\n+ ];\n+ }\n+\n+ public function customError()\n+ {\n+ return 'this is custom error message';\n+ }\n+}\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\nsimilarity index 90%\nrename from tests/framework/models/JsonModel.php\nrename to tests/framework/helpers/stubs/JsonModel.php\nindex 1c85db7ac1b..c41e6cb6b87 100644\n--- a/tests/framework/models/JsonModel.php\n+++ b/tests/framework/helpers/stubs/JsonModel.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\models;\n+namespace yiiunit\\framework\\helpers\\stubs;\n \n use JsonSerializable;\n use ReturnTypeWillChange;\n@@ -16,11 +16,13 @@\n * JSON serializable model for tests.\n *\n * {@inheritdoc}\n+ *\n+ * @property mixed $name\n */\n class JsonModel extends DynamicModel implements JsonSerializable\n {\n /**\n- * @var array\n+ * @var array|object\n */\n public $data = ['json' => 'serializable'];\n \ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\nnew file mode 100644\nindex 00000000000..673f1a9468b\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/MyHtml.php\n@@ -0,0 +1,32 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\Model;\n+use yii\\helpers\\Html;\n+\n+/**\n+ * Class MyHtml\n+ * @package yiiunit\\framework\\helpers\n+ */\n+class MyHtml extends Html\n+{\n+ /**\n+ * @param Model $model\n+ * @param string $attribute\n+ * @param array $options\n+ */\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\n+ {\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\n+ $attribute = static::getAttributeName($attribute);\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n+ }\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/helpers/stubs/"},{"subtask_id":"s5","scope_files":["tests/framework/i18n/FormatterDateTest.php","tests/framework/i18n/FormatterNumberTest.php","tests/framework/i18n/LocaleTest.php"],"solution_diff":"diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\nindex 459615d6339..1bec0c84c02 100644\n--- a/tests/framework/i18n/FormatterDateTest.php\n+++ b/tests/framework/i18n/FormatterDateTest.php\n@@ -22,7 +22,7 @@\n class FormatterDateTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \n@@ -379,18 +379,18 @@ public function testAsRelativeTime(): void\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\n \n // Invert all the DateIntervals\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\n@@ -435,7 +435,7 @@ public function testAsRelativeTime(): void\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\n $interval_0_seconds = new DateInterval('PT0S');\n- $interval_0_seconds->invert = true;\n+ $interval_0_seconds->invert = 1;\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\n \n // empty input\n@@ -507,19 +507,19 @@ public function testAsDuration(): void\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\n \n // Invert all the DateIntervals\n- $interval_0_seconds->invert = true;\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_0_seconds->invert = 1;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\n@@ -760,7 +760,7 @@ public function testDateOnlyValues(): void\n \n public function testIntlTimeOnlyValues()\n {\n- return $this->testTimeOnlyValues();\n+ $this->testTimeOnlyValues();\n }\n \n /**\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\nindex 00c65d62f49..86f33427a35 100644\n--- a/tests/framework/i18n/FormatterNumberTest.php\n+++ b/tests/framework/i18n/FormatterNumberTest.php\n@@ -19,7 +19,7 @@\n class FormatterNumberTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\nindex 306d9dc1595..62505611cf7 100644\n--- a/tests/framework/i18n/LocaleTest.php\n+++ b/tests/framework/i18n/LocaleTest.php\n@@ -17,7 +17,7 @@\n class LocaleTest extends TestCase\n {\n /**\n- * @var Locale\n+ * @var Locale|null\n */\n protected $locale;\n \n","summary":"Edited 3 file(s) in tests/framework/i18n/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 51e87b57398..c369f29ed19 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -17,9 +17,6 @@ parameters:\\n - tests/framework/*/mocks/*\\n # TODO: Analyze these directories\\n - tests/framework/db\\n- - tests/framework/grid\\n- - tests/framework/helpers\\n- - tests/framework/i18n\\n - tests/framework/validators\\n \\n bootstrapFiles:\\n\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"tests/framework/grid/GridViewTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\\nindex 3229e7ca57d..aa626cfa2b3 100644\\n--- a/tests/framework/grid/GridViewTest.php\\n+++ b/tests/framework/grid/GridViewTest.php\\n@@ -190,15 +190,18 @@ public function testHeaderLabels(): void\\n ],\\n ]);\\n \\n+ $gridDataProvider = $grid->dataProvider;\\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\\n+\\n // NoAutoLabels::generateAttributeLabel() should not be called.\\n- $grid->dataProvider->setSort([\\n+ $gridDataProvider->setSort([\\n 'route' => '/',\\n 'urlManager' => $urlManager,\\n ]);\\n $grid->renderTableHeader();\\n \\n // NoAutoLabels::generateAttributeLabel() should not be called.\\n- $grid->dataProvider->setSort([\\n+ $gridDataProvider->setSort([\\n 'route' => '/',\\n 'urlManager' => $urlManager,\\n 'attributes' => ['attr1', 'attr2'],\\n@@ -236,6 +239,8 @@ public function testFilterSelector(): void\\n );\\n \\n $view = Yii::$app->getView();\\n+ $this->assertInstanceOf(View::class, $view);\\n+\\n // use renderAjax so the javascript gets baked into the HTML\\n $html = $view->renderAjax(\\n '@yiiunit/data/views/widgets/GridView/gridview.php',\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/grid/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"tests/framework/helpers/ArrayHelperTest.php\",\n \"tests/framework/helpers/ConsoleTest.php\",\n \"tests/framework/helpers/HtmlTest.php\",\n \"tests/framework/helpers/JsonTest.php\",\n \"tests/framework/helpers/UrlTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php\\nindex 34cbf0b7c1f..05ce5bc3680 100644\\n--- a/tests/framework/helpers/ArrayHelperTest.php\\n+++ b/tests/framework/helpers/ArrayHelperTest.php\\n@@ -153,10 +153,12 @@ public function testRemoveWithFloat(): void\\n $this->markTestSkipped('Using floats as array key is deprecated.');\\n }\\n \\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\\n $array = ['name' => 'b', 'age' => 3, 1.1 => null];\\n \\n $name = ArrayHelper::remove($array, 'name');\\n $this->assertEquals($name, 'b');\\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\\n $this->assertEquals($array, ['age' => 3, 1.1 => null]);\\n \\n $floatVal = ArrayHelper::remove($array, 1.1);\\n@@ -545,7 +547,9 @@ public function testGetValueWithFloatKeys(): void\\n }\\n \\n $array = [];\\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\\n $array[1.1] = 'some value';\\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\\n $array[2.1] = null;\\n \\n $result = ArrayHelper::getValue($array, 1.2);\\n@@ -824,7 +828,9 @@ public function testKeyExistsWithFloat(): void\\n \\n $array = [\\n 1 => 3,\\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\\n 2.2 => 4, // Note: Floats are cast to ints, which means that the fractional part will be truncated.\\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\\n 3.3 => null,\\n ];\\n \\ndiff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\\nindex a2f3cbdf956..9cbee44ba76 100644\\n--- a/tests/framework/helpers/ConsoleTest.php\\n+++ b/tests/framework/helpers/ConsoleTest.php\\n@@ -443,9 +443,9 @@ public function testSelect(): void\\n }\\n \\n /**\\n- * @property string name\\n- * @property array types\\n- * @property string description\\n+ * @property string $name\\n+ * @property array $types\\n+ * @property string $description\\n */\\n class TestConsoleModel extends DynamicModel\\n {\\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\\nindex ba34ac7217a..1484b12d130 100644\\n--- a/tests/framework/helpers/HtmlTest.php\\n+++ b/tests/framework/helpers/HtmlTest.php\\n@@ -17,6 +17,8 @@\\n use yii\\\\db\\\\ArrayExpression;\\n use yii\\\\helpers\\\\Html;\\n use yii\\\\helpers\\\\Url;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\HtmlTestModel;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\MyHtml;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -1750,7 +1752,7 @@ public function testError(): void\\n 'Custom error message generated by callback'\\n );\\n $this->assertEquals(\\n- '<div>Error in yiiunit\\\\framework\\\\helpers\\\\HtmlTestModel - name</div>',\\n+ '<div>Error in yiiunit\\\\framework\\\\helpers\\\\stubs\\\\HtmlTestModel - name</div>',\\n Html::error($model, 'name', ['errorSource' => function ($model, $attribute) {\\n return 'Error in ' . get_class($model) . ' - ' . $attribute;\\n }]),\\n@@ -1879,7 +1881,7 @@ public static function dataProviderActiveRadio(): array\\n /**\\n * @dataProvider dataProviderActiveRadio\\n *\\n- * @param string $value\\n+ * @param bool $value\\n * @param array $options\\n * @param string $expectedHtml\\n */\\n@@ -1923,7 +1925,7 @@ public static function dataProviderActiveCheckbox(): array\\n /**\\n * @dataProvider dataProviderActiveCheckbox\\n *\\n- * @param string $value\\n+ * @param bool $value\\n * @param array $options\\n * @param string $expectedHtml\\n */\\n@@ -2294,57 +2296,3 @@ public static function getInputIdByNameDataProvider(): array\\n ];\\n }\\n }\\n-\\n-/**\\n- * Class MyHtml\\n- * @package yiiunit\\\\framework\\\\helpers\\n- */\\n-class MyHtml extends Html\\n-{\\n- /**\\n- * @param Model $model\\n- * @param string $attribute\\n- * @param array $options\\n- */\\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\\n- {\\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\\n- $attribute = static::getAttributeName($attribute);\\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\\n- }\\n- }\\n-}\\n-\\n-/**\\n- * @property string name\\n- * @property string title\\n- * @property string alias\\n- * @property array types\\n- * @property string description\\n- */\\n-class HtmlTestModel extends DynamicModel\\n-{\\n- public function init(): void\\n- {\\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\\n- $this->defineAttribute($attribute);\\n- }\\n- }\\n-\\n- public function rules()\\n- {\\n- return [\\n- ['name', 'required'],\\n- ['name', 'string', 'max' => 100],\\n- ['title', 'string', 'length' => 10],\\n- ['alias', 'string', 'length' => [0, 20]],\\n- ['description', 'string', 'max' => 500],\\n- [['radio', 'checkbox'], 'boolean'],\\n- ];\\n- }\\n-\\n- public function customError()\\n- {\\n- return 'this is custom error message';\\n- }\\n-}\\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\\nindex e39847e02e3..dba26d71716 100644\\n--- a/tests/framework/helpers/JsonTest.php\\n+++ b/tests/framework/helpers/JsonTest.php\\n@@ -15,8 +15,8 @@\\n use DateTimeZone;\\n use yii\\\\helpers\\\\Json;\\n use yii\\\\web\\\\JsExpression;\\n+use yiiunit\\\\framework\\\\helpers\\\\stubs\\\\JsonModel;\\n use yiiunit\\\\framework\\\\web\\\\Post;\\n-use yiiunit\\\\framework\\\\models\\\\JsonModel;\\n use yiiunit\\\\TestCase;\\n \\n /**\\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\\nindex 2d0bd605180..b11ba75c82b 100644\\n--- a/tests/framework/helpers/UrlTest.php\\n+++ b/tests/framework/helpers/UrlTest.php\\n@@ -64,13 +64,13 @@ protected function tearDown(): void\\n */\\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\\n {\\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\\n+ Yii::$app->controller = $controller = new Controller(\\n+ $controllerId,\\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\\n+ );\\n+\\n $controller->actionParams = $params;\\n $controller->action = new Action($actionID, $controller);\\n-\\n- if ($moduleID !== null) {\\n- $controller->module = new Module($moduleID);\\n- }\\n }\\n \\n protected function removeMockedAction()\\n\",\n \"summary\": \"Edited 5 file(s) in tests/framework/helpers/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/helpers/stubs/HtmlTestModel.php\",\n \"tests/framework/helpers/stubs/JsonModel.php\",\n \"tests/framework/helpers/stubs/MyHtml.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\\nnew file mode 100644\\nindex 00000000000..078e10da545\\n--- /dev/null\\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\\n@@ -0,0 +1,47 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n+\\n+use yii\\\\base\\\\DynamicModel;\\n+\\n+/**\\n+ * @property string $name\\n+ * @property string $title\\n+ * @property string $alias\\n+ * @property mixed $types\\n+ * @property string $description\\n+ * @property bool $radio\\n+ * @property bool $checkbox\\n+ */\\n+class HtmlTestModel extends DynamicModel\\n+{\\n+ public function init(): void\\n+ {\\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\\n+ $this->defineAttribute($attribute);\\n+ }\\n+ }\\n+\\n+ public function rules()\\n+ {\\n+ return [\\n+ ['name', 'required'],\\n+ ['name', 'string', 'max' => 100],\\n+ ['title', 'string', 'length' => 10],\\n+ ['alias', 'string', 'length' => [0, 20]],\\n+ ['description', 'string', 'max' => 500],\\n+ [['radio', 'checkbox'], 'boolean'],\\n+ ];\\n+ }\\n+\\n+ public function customError()\\n+ {\\n+ return 'this is custom error message';\\n+ }\\n+}\\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\\nsimilarity index 90%\\nrename from tests/framework/models/JsonModel.php\\nrename to tests/framework/helpers/stubs/JsonModel.php\\nindex 1c85db7ac1b..c41e6cb6b87 100644\\n--- a/tests/framework/models/JsonModel.php\\n+++ b/tests/framework/helpers/stubs/JsonModel.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\models;\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n \\n use JsonSerializable;\\n use ReturnTypeWillChange;\\n@@ -16,11 +16,13 @@\\n * JSON serializable model for tests.\\n *\\n * {@inheritdoc}\\n+ *\\n+ * @property mixed $name\\n */\\n class JsonModel extends DynamicModel implements JsonSerializable\\n {\\n /**\\n- * @var array\\n+ * @var array|object\\n */\\n public $data = ['json' => 'serializable'];\\n \\ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\\nnew file mode 100644\\nindex 00000000000..673f1a9468b\\n--- /dev/null\\n+++ b/tests/framework/helpers/stubs/MyHtml.php\\n@@ -0,0 +1,32 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n+\\n+use yii\\\\base\\\\Model;\\n+use yii\\\\helpers\\\\Html;\\n+\\n+/**\\n+ * Class MyHtml\\n+ * @package yiiunit\\\\framework\\\\helpers\\n+ */\\n+class MyHtml extends Html\\n+{\\n+ /**\\n+ * @param Model $model\\n+ * @param string $attribute\\n+ * @param array $options\\n+ */\\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\\n+ {\\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\\n+ $attribute = static::getAttributeName($attribute);\\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\\n+ }\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/helpers/stubs/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/i18n/FormatterDateTest.php\",\n \"tests/framework/i18n/FormatterNumberTest.php\",\n \"tests/framework/i18n/LocaleTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\\nindex 459615d6339..1bec0c84c02 100644\\n--- a/tests/framework/i18n/FormatterDateTest.php\\n+++ b/tests/framework/i18n/FormatterDateTest.php\\n@@ -22,7 +22,7 @@\\n class FormatterDateTest extends TestCase\\n {\\n /**\\n- * @var Formatter\\n+ * @var Formatter|null\\n */\\n protected $formatter;\\n \\n@@ -379,18 +379,18 @@ public function testAsRelativeTime(): void\\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\\n \\n // Invert all the DateIntervals\\n- $interval_1_second->invert = true;\\n- $interval_244_seconds->invert = true;\\n- $interval_1_minute->invert = true;\\n- $interval_33_minutes->invert = true;\\n- $interval_1_hour->invert = true;\\n- $interval_6_hours->invert = true;\\n- $interval_1_day->invert = true;\\n- $interval_89_days->invert = true;\\n- $interval_1_month->invert = true;\\n- $interval_5_months->invert = true;\\n- $interval_1_year->invert = true;\\n- $interval_12_years->invert = true;\\n+ $interval_1_second->invert = 1;\\n+ $interval_244_seconds->invert = 1;\\n+ $interval_1_minute->invert = 1;\\n+ $interval_33_minutes->invert = 1;\\n+ $interval_1_hour->invert = 1;\\n+ $interval_6_hours->invert = 1;\\n+ $interval_1_day->invert = 1;\\n+ $interval_89_days->invert = 1;\\n+ $interval_1_month->invert = 1;\\n+ $interval_5_months->invert = 1;\\n+ $interval_1_year->invert = 1;\\n+ $interval_12_years->invert = 1;\\n \\n // Pass a inverted DateInterval\\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\\n@@ -435,7 +435,7 @@ public function testAsRelativeTime(): void\\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\\n $interval_0_seconds = new DateInterval('PT0S');\\n- $interval_0_seconds->invert = true;\\n+ $interval_0_seconds->invert = 1;\\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\\n \\n // empty input\\n@@ -507,19 +507,19 @@ public function testAsDuration(): void\\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\\n \\n // Invert all the DateIntervals\\n- $interval_0_seconds->invert = true;\\n- $interval_1_second->invert = true;\\n- $interval_244_seconds->invert = true;\\n- $interval_1_minute->invert = true;\\n- $interval_33_minutes->invert = true;\\n- $interval_1_hour->invert = true;\\n- $interval_6_hours->invert = true;\\n- $interval_1_day->invert = true;\\n- $interval_89_days->invert = true;\\n- $interval_1_month->invert = true;\\n- $interval_5_months->invert = true;\\n- $interval_1_year->invert = true;\\n- $interval_12_years->invert = true;\\n+ $interval_0_seconds->invert = 1;\\n+ $interval_1_second->invert = 1;\\n+ $interval_244_seconds->invert = 1;\\n+ $interval_1_minute->invert = 1;\\n+ $interval_33_minutes->invert = 1;\\n+ $interval_1_hour->invert = 1;\\n+ $interval_6_hours->invert = 1;\\n+ $interval_1_day->invert = 1;\\n+ $interval_89_days->invert = 1;\\n+ $interval_1_month->invert = 1;\\n+ $interval_5_months->invert = 1;\\n+ $interval_1_year->invert = 1;\\n+ $interval_12_years->invert = 1;\\n \\n // Pass a inverted DateInterval\\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\\n@@ -760,7 +760,7 @@ public function testDateOnlyValues(): void\\n \\n public function testIntlTimeOnlyValues()\\n {\\n- return $this->testTimeOnlyValues();\\n+ $this->testTimeOnlyValues();\\n }\\n \\n /**\\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\\nindex 00c65d62f49..86f33427a35 100644\\n--- a/tests/framework/i18n/FormatterNumberTest.php\\n+++ b/tests/framework/i18n/FormatterNumberTest.php\\n@@ -19,7 +19,7 @@\\n class FormatterNumberTest extends TestCase\\n {\\n /**\\n- * @var Formatter\\n+ * @var Formatter|null\\n */\\n protected $formatter;\\n \\ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\\nindex 306d9dc1595..62505611cf7 100644\\n--- a/tests/framework/i18n/LocaleTest.php\\n+++ b/tests/framework/i18n/LocaleTest.php\\n@@ -17,7 +17,7 @@\\n class LocaleTest extends TestCase\\n {\\n /**\\n- * @var Locale\\n+ * @var Locale|null\\n */\\n protected $locale;\\n \\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/i18n/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s4","comment":"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Add explicit return type for PHPStan compliance.**\n\nThe `customError()` method should declare its return type as `:string` to improve static analysis and code clarity, aligning with the PR's goal of PHPStan compliance.\n\n\n\n\n<details>\n<summary>โจ Proposed fix</summary>\n\n```diff\n- public function customError()\n+ public function customError(): string\n {\n return 'this is custom error message';\n }\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n public function customError(): string\n {\n return 'this is custom error message';\n }\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/helpers/stubs/HtmlTestModel.php` around lines 43 - 46, The\ncustomError() method in HtmlTestModel should declare an explicit return type to\nsatisfy PHPStan; update the method signature of public function customError() in\nHtmlTestModel (tests/framework/helpers/stubs/HtmlTestModel.php) to include \":\nstring\" and ensure the method body still returns a string literal ('this is\ncustom error message').\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\nnew file mode 100644\nindex 00000000000..078e10da545\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\n@@ -0,0 +1,47 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\DynamicModel;\n+\n+/**\n+ * @property string $name\n+ * @property string $title\n+ * @property string $alias\n+ * @property mixed $types\n+ * @property string $description\n+ * @property bool $radio\n+ * @property bool $checkbox\n+ */\n+class HtmlTestModel extends DynamicModel\n+{\n+ public function init(): void\n+ {\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n+ $this->defineAttribute($attribute);\n+ }\n+ }\n+\n+ public function rules()\n+ {\n+ return [\n+ ['name', 'required'],\n+ ['name', 'string', 'max' => 100],\n+ ['title', 'string', 'length' => 10],\n+ ['alias', 'string', 'length' => [0, 20]],\n+ ['description', 'string', 'max' => 500],\n+ [['radio', 'checkbox'], 'boolean'],\n+ ];\n+ }\n+\n+ public function customError()\n+ {\n+ return 'this is custom error message';\n+ }\n+}\n"}],"string":"[\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\\n\\n**Add explicit return type for PHPStan compliance.**\\n\\nThe `customError()` method should declare its return type as `:string` to improve static analysis and code clarity, aligning with the PR's goal of PHPStan compliance.\\n\\n\\n\\n\\n<details>\\n<summary>โจ Proposed fix</summary>\\n\\n```diff\\n- public function customError()\\n+ public function customError(): string\\n {\\n return 'this is custom error message';\\n }\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n public function customError(): string\\n {\\n return 'this is custom error message';\\n }\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/helpers/stubs/HtmlTestModel.php` around lines 43 - 46, The\\ncustomError() method in HtmlTestModel should declare an explicit return type to\\nsatisfy PHPStan; update the method signature of public function customError() in\\nHtmlTestModel (tests/framework/helpers/stubs/HtmlTestModel.php) to include \\\":\\nstring\\\" and ensure the method body still returns a string literal ('this is\\ncustom error message').\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\\nnew file mode 100644\\nindex 00000000000..078e10da545\\n--- /dev/null\\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\\n@@ -0,0 +1,47 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\helpers\\\\stubs;\\n+\\n+use yii\\\\base\\\\DynamicModel;\\n+\\n+/**\\n+ * @property string $name\\n+ * @property string $title\\n+ * @property string $alias\\n+ * @property mixed $types\\n+ * @property string $description\\n+ * @property bool $radio\\n+ * @property bool $checkbox\\n+ */\\n+class HtmlTestModel extends DynamicModel\\n+{\\n+ public function init(): void\\n+ {\\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\\n+ $this->defineAttribute($attribute);\\n+ }\\n+ }\\n+\\n+ public function rules()\\n+ {\\n+ return [\\n+ ['name', 'required'],\\n+ ['name', 'string', 'max' => 100],\\n+ ['title', 'string', 'length' => 10],\\n+ ['alias', 'string', 'length' => [0, 20]],\\n+ ['description', 'string', 'max' => 500],\\n+ [['radio', 'checkbox'], 'boolean'],\\n+ ];\\n+ }\\n+\\n+ public function customError()\\n+ {\\n+ return 'this is custom error message';\\n+ }\\n+}\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 51e87b57398..c369f29ed19 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -17,9 +17,6 @@ parameters:\n - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n- - tests/framework/grid\n- - tests/framework/helpers\n- - tests/framework/i18n\n - tests/framework/validators\n \n bootstrapFiles:\n\ndiff --git a/tests/framework/grid/GridViewTest.php b/tests/framework/grid/GridViewTest.php\nindex 3229e7ca57d..aa626cfa2b3 100644\n--- a/tests/framework/grid/GridViewTest.php\n+++ b/tests/framework/grid/GridViewTest.php\n@@ -190,15 +190,18 @@ public function testHeaderLabels(): void\n ],\n ]);\n \n+ $gridDataProvider = $grid->dataProvider;\n+ $this->assertInstanceOf(ActiveDataProvider::class, $gridDataProvider);\n+\n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n ]);\n $grid->renderTableHeader();\n \n // NoAutoLabels::generateAttributeLabel() should not be called.\n- $grid->dataProvider->setSort([\n+ $gridDataProvider->setSort([\n 'route' => '/',\n 'urlManager' => $urlManager,\n 'attributes' => ['attr1', 'attr2'],\n@@ -236,6 +239,8 @@ public function testFilterSelector(): void\n );\n \n $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+\n // use renderAjax so the javascript gets baked into the HTML\n $html = $view->renderAjax(\n '@yiiunit/data/views/widgets/GridView/gridview.php',\ndiff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php\nindex 34cbf0b7c1f..05ce5bc3680 100644\n--- a/tests/framework/helpers/ArrayHelperTest.php\n+++ b/tests/framework/helpers/ArrayHelperTest.php\n@@ -153,10 +153,12 @@ public function testRemoveWithFloat(): void\n $this->markTestSkipped('Using floats as array key is deprecated.');\n }\n \n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n $array = ['name' => 'b', 'age' => 3, 1.1 => null];\n \n $name = ArrayHelper::remove($array, 'name');\n $this->assertEquals($name, 'b');\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n $this->assertEquals($array, ['age' => 3, 1.1 => null]);\n \n $floatVal = ArrayHelper::remove($array, 1.1);\n@@ -545,7 +547,9 @@ public function testGetValueWithFloatKeys(): void\n }\n \n $array = [];\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\n $array[1.1] = 'some value';\n+ // @phpstan-ignore offsetAccess.invalidOffset (we intentionally test this for older versions of PHP)\n $array[2.1] = null;\n \n $result = ArrayHelper::getValue($array, 1.2);\n@@ -824,7 +828,9 @@ public function testKeyExistsWithFloat(): void\n \n $array = [\n 1 => 3,\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n 2.2 => 4, // Note: Floats are cast to ints, which means that the fractional part will be truncated.\n+ // @phpstan-ignore array.invalidKey (we intentionally test this for older versions of PHP)\n 3.3 => null,\n ];\n \ndiff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php\nindex a2f3cbdf956..9cbee44ba76 100644\n--- a/tests/framework/helpers/ConsoleTest.php\n+++ b/tests/framework/helpers/ConsoleTest.php\n@@ -443,9 +443,9 @@ public function testSelect(): void\n }\n \n /**\n- * @property string name\n- * @property array types\n- * @property string description\n+ * @property string $name\n+ * @property array $types\n+ * @property string $description\n */\n class TestConsoleModel extends DynamicModel\n {\ndiff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php\nindex ba34ac7217a..1484b12d130 100644\n--- a/tests/framework/helpers/HtmlTest.php\n+++ b/tests/framework/helpers/HtmlTest.php\n@@ -17,6 +17,8 @@\n use yii\\db\\ArrayExpression;\n use yii\\helpers\\Html;\n use yii\\helpers\\Url;\n+use yiiunit\\framework\\helpers\\stubs\\HtmlTestModel;\n+use yiiunit\\framework\\helpers\\stubs\\MyHtml;\n use yiiunit\\TestCase;\n \n /**\n@@ -1750,7 +1752,7 @@ public function testError(): void\n 'Custom error message generated by callback'\n );\n $this->assertEquals(\n- '<div>Error in yiiunit\\framework\\helpers\\HtmlTestModel - name</div>',\n+ '<div>Error in yiiunit\\framework\\helpers\\stubs\\HtmlTestModel - name</div>',\n Html::error($model, 'name', ['errorSource' => function ($model, $attribute) {\n return 'Error in ' . get_class($model) . ' - ' . $attribute;\n }]),\n@@ -1879,7 +1881,7 @@ public static function dataProviderActiveRadio(): array\n /**\n * @dataProvider dataProviderActiveRadio\n *\n- * @param string $value\n+ * @param bool $value\n * @param array $options\n * @param string $expectedHtml\n */\n@@ -1923,7 +1925,7 @@ public static function dataProviderActiveCheckbox(): array\n /**\n * @dataProvider dataProviderActiveCheckbox\n *\n- * @param string $value\n+ * @param bool $value\n * @param array $options\n * @param string $expectedHtml\n */\n@@ -2294,57 +2296,3 @@ public static function getInputIdByNameDataProvider(): array\n ];\n }\n }\n-\n-/**\n- * Class MyHtml\n- * @package yiiunit\\framework\\helpers\n- */\n-class MyHtml extends Html\n-{\n- /**\n- * @param Model $model\n- * @param string $attribute\n- * @param array $options\n- */\n- protected static function setActivePlaceholder($model, $attribute, &$options = [])\n- {\n- if (isset($options['placeholder']) && $options['placeholder'] === true) {\n- $attribute = static::getAttributeName($attribute);\n- $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n- }\n- }\n-}\n-\n-/**\n- * @property string name\n- * @property string title\n- * @property string alias\n- * @property array types\n- * @property string description\n- */\n-class HtmlTestModel extends DynamicModel\n-{\n- public function init(): void\n- {\n- foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n- $this->defineAttribute($attribute);\n- }\n- }\n-\n- public function rules()\n- {\n- return [\n- ['name', 'required'],\n- ['name', 'string', 'max' => 100],\n- ['title', 'string', 'length' => 10],\n- ['alias', 'string', 'length' => [0, 20]],\n- ['description', 'string', 'max' => 500],\n- [['radio', 'checkbox'], 'boolean'],\n- ];\n- }\n-\n- public function customError()\n- {\n- return 'this is custom error message';\n- }\n-}\ndiff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php\nindex e39847e02e3..dba26d71716 100644\n--- a/tests/framework/helpers/JsonTest.php\n+++ b/tests/framework/helpers/JsonTest.php\n@@ -15,8 +15,8 @@\n use DateTimeZone;\n use yii\\helpers\\Json;\n use yii\\web\\JsExpression;\n+use yiiunit\\framework\\helpers\\stubs\\JsonModel;\n use yiiunit\\framework\\web\\Post;\n-use yiiunit\\framework\\models\\JsonModel;\n use yiiunit\\TestCase;\n \n /**\ndiff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php\nindex 2d0bd605180..b11ba75c82b 100644\n--- a/tests/framework/helpers/UrlTest.php\n+++ b/tests/framework/helpers/UrlTest.php\n@@ -64,13 +64,13 @@ protected function tearDown(): void\n */\n protected function mockAction($controllerId, $actionID, $moduleID = null, $params = [])\n {\n- Yii::$app->controller = $controller = new Controller($controllerId, Yii::$app);\n+ Yii::$app->controller = $controller = new Controller(\n+ $controllerId,\n+ $moduleID !== null ? new Module($moduleID) : Yii::$app\n+ );\n+\n $controller->actionParams = $params;\n $controller->action = new Action($actionID, $controller);\n-\n- if ($moduleID !== null) {\n- $controller->module = new Module($moduleID);\n- }\n }\n \n protected function removeMockedAction()\ndiff --git a/tests/framework/helpers/stubs/HtmlTestModel.php b/tests/framework/helpers/stubs/HtmlTestModel.php\nnew file mode 100644\nindex 00000000000..078e10da545\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/HtmlTestModel.php\n@@ -0,0 +1,47 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\DynamicModel;\n+\n+/**\n+ * @property string $name\n+ * @property string $title\n+ * @property string $alias\n+ * @property mixed $types\n+ * @property string $description\n+ * @property bool $radio\n+ * @property bool $checkbox\n+ */\n+class HtmlTestModel extends DynamicModel\n+{\n+ public function init(): void\n+ {\n+ foreach (['name', 'title', 'alias', 'types', 'description', 'radio', 'checkbox'] as $attribute) {\n+ $this->defineAttribute($attribute);\n+ }\n+ }\n+\n+ public function rules()\n+ {\n+ return [\n+ ['name', 'required'],\n+ ['name', 'string', 'max' => 100],\n+ ['title', 'string', 'length' => 10],\n+ ['alias', 'string', 'length' => [0, 20]],\n+ ['description', 'string', 'max' => 500],\n+ [['radio', 'checkbox'], 'boolean'],\n+ ];\n+ }\n+\n+ public function customError()\n+ {\n+ return 'this is custom error message';\n+ }\n+}\ndiff --git a/tests/framework/models/JsonModel.php b/tests/framework/helpers/stubs/JsonModel.php\nsimilarity index 90%\nrename from tests/framework/models/JsonModel.php\nrename to tests/framework/helpers/stubs/JsonModel.php\nindex 1c85db7ac1b..c41e6cb6b87 100644\n--- a/tests/framework/models/JsonModel.php\n+++ b/tests/framework/helpers/stubs/JsonModel.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\models;\n+namespace yiiunit\\framework\\helpers\\stubs;\n \n use JsonSerializable;\n use ReturnTypeWillChange;\n@@ -16,11 +16,13 @@\n * JSON serializable model for tests.\n *\n * {@inheritdoc}\n+ *\n+ * @property mixed $name\n */\n class JsonModel extends DynamicModel implements JsonSerializable\n {\n /**\n- * @var array\n+ * @var array|object\n */\n public $data = ['json' => 'serializable'];\n \ndiff --git a/tests/framework/helpers/stubs/MyHtml.php b/tests/framework/helpers/stubs/MyHtml.php\nnew file mode 100644\nindex 00000000000..673f1a9468b\n--- /dev/null\n+++ b/tests/framework/helpers/stubs/MyHtml.php\n@@ -0,0 +1,32 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\helpers\\stubs;\n+\n+use yii\\base\\Model;\n+use yii\\helpers\\Html;\n+\n+/**\n+ * Class MyHtml\n+ * @package yiiunit\\framework\\helpers\n+ */\n+class MyHtml extends Html\n+{\n+ /**\n+ * @param Model $model\n+ * @param string $attribute\n+ * @param array $options\n+ */\n+ protected static function setActivePlaceholder($model, $attribute, &$options = [])\n+ {\n+ if (isset($options['placeholder']) && $options['placeholder'] === true) {\n+ $attribute = static::getAttributeName($attribute);\n+ $options['placeholder'] = 'My placeholder: ' . $model->getAttributeLabel($attribute);\n+ }\n+ }\n+}\ndiff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php\nindex 459615d6339..1bec0c84c02 100644\n--- a/tests/framework/i18n/FormatterDateTest.php\n+++ b/tests/framework/i18n/FormatterDateTest.php\n@@ -22,7 +22,7 @@\n class FormatterDateTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \n@@ -379,18 +379,18 @@ public function testAsRelativeTime(): void\n $this->assertSame('a month ago', $this->formatter->asRelativeTime($dateThen, $dateNow));\n \n // Invert all the DateIntervals\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('in a second', $this->formatter->asRelativeTime($interval_1_second));\n@@ -435,7 +435,7 @@ public function testAsRelativeTime(): void\n $this->assertSame('just now', $this->formatter->asRelativeTime($t = time(), $t));\n $this->assertSame('just now', $this->formatter->asRelativeTime(0, 0));\n $interval_0_seconds = new DateInterval('PT0S');\n- $interval_0_seconds->invert = true;\n+ $interval_0_seconds->invert = 1;\n $this->assertSame('just now', $this->formatter->asRelativeTime($interval_0_seconds));\n \n // empty input\n@@ -507,19 +507,19 @@ public function testAsDuration(): void\n $this->assertSame('-94 months', $this->formatter->asDuration('P-94M'));\n \n // Invert all the DateIntervals\n- $interval_0_seconds->invert = true;\n- $interval_1_second->invert = true;\n- $interval_244_seconds->invert = true;\n- $interval_1_minute->invert = true;\n- $interval_33_minutes->invert = true;\n- $interval_1_hour->invert = true;\n- $interval_6_hours->invert = true;\n- $interval_1_day->invert = true;\n- $interval_89_days->invert = true;\n- $interval_1_month->invert = true;\n- $interval_5_months->invert = true;\n- $interval_1_year->invert = true;\n- $interval_12_years->invert = true;\n+ $interval_0_seconds->invert = 1;\n+ $interval_1_second->invert = 1;\n+ $interval_244_seconds->invert = 1;\n+ $interval_1_minute->invert = 1;\n+ $interval_33_minutes->invert = 1;\n+ $interval_1_hour->invert = 1;\n+ $interval_6_hours->invert = 1;\n+ $interval_1_day->invert = 1;\n+ $interval_89_days->invert = 1;\n+ $interval_1_month->invert = 1;\n+ $interval_5_months->invert = 1;\n+ $interval_1_year->invert = 1;\n+ $interval_12_years->invert = 1;\n \n // Pass a inverted DateInterval\n $this->assertSame('0 seconds', $this->formatter->asDuration($interval_0_seconds));\n@@ -760,7 +760,7 @@ public function testDateOnlyValues(): void\n \n public function testIntlTimeOnlyValues()\n {\n- return $this->testTimeOnlyValues();\n+ $this->testTimeOnlyValues();\n }\n \n /**\ndiff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php\nindex 00c65d62f49..86f33427a35 100644\n--- a/tests/framework/i18n/FormatterNumberTest.php\n+++ b/tests/framework/i18n/FormatterNumberTest.php\n@@ -19,7 +19,7 @@\n class FormatterNumberTest extends TestCase\n {\n /**\n- * @var Formatter\n+ * @var Formatter|null\n */\n protected $formatter;\n \ndiff --git a/tests/framework/i18n/LocaleTest.php b/tests/framework/i18n/LocaleTest.php\nindex 306d9dc1595..62505611cf7 100644\n--- a/tests/framework/i18n/LocaleTest.php\n+++ b/tests/framework/i18n/LocaleTest.php\n@@ -17,7 +17,7 @@\n class LocaleTest extends TestCase\n {\n /**\n- * @var Locale\n+ * @var Locale|null\n */\n protected $locale;\n \n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":13,"string":"13"}}},{"rowIdx":34267,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20873"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20873,"string":"20,873"},"base_sha":{"kind":"string","value":"f52efd863a5b91939844280d8e9385d20fe3271f"},"head_sha":{"kind":"string","value":"3810dbf11837fa8405cac8eba30a6fcb1abf8ec3"},"task":{"kind":"string","value":"Analyze the `yiiunit\\framework\\log` namespace using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ๏ธ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan","scope_files":["phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan","scope_files":["framework/CHANGELOG.md"]},{"subtask_id":"s3","goal":"Implement the changes under `framework/log/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan","scope_files":["framework/log/Target.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/log/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan","scope_files":["tests/framework/log/DbTargetTest.php","tests/framework/log/DispatcherTest.php","tests/framework/log/EmailTargetTest.php","tests/framework/log/LoggerTest.php","tests/framework/log/SyslogTargetTest.php","tests/framework/log/TargetTest.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/mutex/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan","scope_files":["tests/framework/mutex/DbMutexTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\\\framework\\\\log` namespace using PHPStan\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `framework/` needed for: Analyze the `yiiunit\\\\framework\\\\log` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `framework/log/` needed for: Analyze the `yiiunit\\\\framework\\\\log` namespace using PHPStan\",\n \"scope_files\": [\n \"framework/log/Target.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/log/` needed for: Analyze the `yiiunit\\\\framework\\\\log` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/log/DbTargetTest.php\",\n \"tests/framework/log/DispatcherTest.php\",\n \"tests/framework/log/EmailTargetTest.php\",\n \"tests/framework/log/LoggerTest.php\",\n \"tests/framework/log/SyslogTargetTest.php\",\n \"tests/framework/log/TargetTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/mutex/` needed for: Analyze the `yiiunit\\\\framework\\\\log` namespace using PHPStan\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 20abc47d15b..51e87b57398 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -20,7 +20,6 @@ parameters:\n - tests/framework/grid\n - tests/framework/helpers\n - tests/framework/i18n\n- - tests/framework/log\n - tests/framework/validators\n \n bootstrapFiles:\n\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["framework/CHANGELOG.md"],"solution_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 27b0954258b..2296dfc0938 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,7 +4,7 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- no changes in this release.\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n \n \n 2.0.55 May 09, 2026\n","summary":"Edited 1 file(s) in framework/"},{"subtask_id":"s3","scope_files":["framework/log/Target.php"],"solution_diff":"diff --git a/framework/log/Target.php b/framework/log/Target.php\nindex 428fb150e14..780c9a05f34 100644\n--- a/framework/log/Target.php\n+++ b/framework/log/Target.php\n@@ -28,7 +28,9 @@\n * satisfying both filter conditions will be handled. Additionally, you\n * may specify [[except]] to exclude messages of certain categories.\n *\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\n","summary":"Edited 1 file(s) in framework/log/"},{"subtask_id":"s4","scope_files":["tests/framework/log/DbTargetTest.php","tests/framework/log/DispatcherTest.php","tests/framework/log/EmailTargetTest.php","tests/framework/log/LoggerTest.php","tests/framework/log/SyslogTargetTest.php","tests/framework/log/TargetTest.php"],"solution_diff":"diff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php\nindex fe7e5fa7d5f..b5026d13e9e 100644\n--- a/tests/framework/log/DbTargetTest.php\n+++ b/tests/framework/log/DbTargetTest.php\n@@ -16,6 +16,7 @@\n use Yii;\n use yii\\db\\Connection;\n use yii\\db\\Query;\n+use yii\\log\\DbTarget;\n use yii\\log\\Logger;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -169,7 +170,10 @@ public function testTransactionRollBack(): void\n // current db connection should still have a transaction\n $this->assertNotNull($db->transaction);\n // log db connection should not have transaction\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\n+\n+ $dbTarget = Yii::$app->log->targets['db'];\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\n+ $this->assertNull($dbTarget->db->transaction);\n \n $tx->rollBack();\n \ndiff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\nindex d50128f2238..b09bd1bf5f7 100644\n--- a/tests/framework/log/DispatcherTest.php\n+++ b/tests/framework/log/DispatcherTest.php\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\n \n /**\n * @group log\n+ *\n+ * @method static mixed microtime($get_as_float)\n */\n class DispatcherTest extends TestCase\n {\n@@ -199,7 +201,7 @@ public function testDispatchWithFakeTarget2ThrowExceptionWhenCollect(): void\n ->expects($matcher)\n ->method('collect')\n ->willReturnCallback(\n- function (...$parameters) use ($matcher): void {\n+ function (...$parameters) use ($target1, $matcher): void {\n if ($matcher->getInvocationCount() === 1) {\n $this->assertEquals('messages', $parameters[0]);\n $this->assertTrue($parameters[1]);\n@@ -327,7 +329,10 @@ public function testTargetThrow(): void\n $this->assertSame(1, $this->targetThrowFirstCount);\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\n+\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\n+ $this->assertIsArray($targetThrowSecondOutputs);\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\n }\n }\n }\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\nindex ba49e5e6b98..507d736c049 100644\n--- a/tests/framework/log/EmailTargetTest.php\n+++ b/tests/framework/log/EmailTargetTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\base\\InvalidConfigException;\n use yii\\log\\EmailTarget;\n use yii\\mail\\BaseMailer;\n@@ -21,7 +22,7 @@\n class EmailTargetTest extends TestCase\n {\n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var BaseMailer&MockObject\n */\n protected $mailer;\n \n@@ -76,7 +77,6 @@ public function testExportWithSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -122,7 +122,6 @@ public function testExportWithoutSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -158,7 +157,6 @@ public function testExportWithSendFailure(): void\n $message->method('send')->willReturn(false);\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\nindex 5475a37fde4..605f3b261c9 100644\n--- a/tests/framework/log/LoggerTest.php\n+++ b/tests/framework/log/LoggerTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n+use stdClass;\n use yii\\log\\Dispatcher;\n use yii\\log\\Logger;\n use yiiunit\\TestCase;\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\n protected $logger;\n \n /**\n- * @var Dispatcher|\\PHPUnit_Framework_MockObject_MockObject\n+ * @var Dispatcher&MockObject\n */\n protected $dispatcher;\n \n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\n $this->assertEquals('application', $this->logger->messages[0][2]);\n $this->assertEquals([\n 'file' => __FILE__,\n- 'line' => 66,\n+ 'line' => 68,\n 'function' => 'log',\n 'class' => get_class($this->logger),\n 'type' => '->',\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\n */\n public function testLogWithFlush(): void\n {\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['flush']);\n \n $logger->flushInterval = 1;\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\n */\n public function testFlushWithoutDispatcher(): void\n {\n- $dispatcher = $this->getMockBuilder('\\stdClass')->getMock();\n+ $dispatcher = $this->createMock(stdClass::class);\n $dispatcher->expects($this->never())->method($this->anything());\n \n $this->logger->messages = ['anything'];\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $this->logger->dispatcher = $dispatcher;\n $this->logger->flush();\n $this->assertEmpty($this->logger->messages);\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\n ['duration' => 30],\n ];\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\n $logger->method('getProfiling')->willReturn($timings);\n $logger->expects($this->once())\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\n $messages = ['anyData'];\n $returnValue = 'return value';\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\n 'duration' => 5,\n ],\n ];\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\nindex b4ad5bc3eb5..62a5e641b7a 100644\n--- a/tests/framework/log/SyslogTargetTest.php\n+++ b/tests/framework/log/SyslogTargetTest.php\n@@ -24,7 +24,7 @@ function closelog()\n }\n \n namespace yiiunit\\framework\\log {\n- use PHPUnit_Framework_MockObject_MockObject;\n+ use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\helpers\\VarDumper;\n use yii\\log\\Logger;\n use yii\\log\\SyslogTarget;\n@@ -34,6 +34,10 @@ function closelog()\n * Class SyslogTargetTest.\n *\n * @group log\n+ *\n+ * @method static mixed openlog($arguments)\n+ * @method static mixed syslog($arguments)\n+ * @method static mixed closelog($arguments)\n */\n class SyslogTargetTest extends TestCase\n {\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\n public static $functions = [];\n \n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var SyslogTarget&MockObject\n */\n protected $syslogTarget;\n \n@@ -54,7 +58,7 @@ class SyslogTargetTest extends TestCase\n */\n protected function setUp(): void\n {\n- $this->syslogTarget = $this->createPartialMock('yii\\\\log\\\\SyslogTarget', ['getMessagePrefix']);\n+ $this->syslogTarget = $this->createPartialMock(SyslogTarget::class, ['getMessagePrefix']);\n }\n \n /**\n@@ -64,7 +68,7 @@ public function testExport(): void\n {\n $identity = 'identity string';\n $options = LOG_ODELAY | LOG_PID;\n- $facility = 'facility string';\n+ $facility = LOG_USER;\n $messages = [\n ['info message', Logger::LEVEL_INFO],\n ['error message', Logger::LEVEL_ERROR],\n@@ -75,7 +79,6 @@ public function testExport(): void\n ['profile end message', Logger::LEVEL_PROFILE_END],\n ];\n \n- /** @var SyslogTarget $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\n ->addMethods(['openlog', 'syslog', 'closelog'])\n ->onlyMethods(['formatMessage'])\n@@ -165,15 +168,18 @@ function (...$parameters) use ($matcher): void {\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(3, $arguments);\n list($identity, $option, $facility) = $arguments;\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\n return $syslogTarget->openlog($identity, $option, $facility);\n };\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(2, $arguments);\n list($priority, $message) = $arguments;\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\n return $syslogTarget->syslog($priority, $message);\n };\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(0, $arguments);\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\n return $syslogTarget->closelog();\n };\n \n@@ -187,7 +193,6 @@ function (...$parameters) use ($matcher): void {\n */\n public function testFailedExport(): void\n {\n- /** @var SyslogTarget $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\n ->addMethods(['openlog', 'syslog', 'closelog'])\n ->onlyMethods(['formatMessage'])\n@@ -197,7 +202,7 @@ public function testFailedExport(): void\n \n $syslogTarget->identity = 'identity string';\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\n- $syslogTarget->facility = 'facility string';\n+ $syslogTarget->facility = LOG_USER;\n $syslogTarget->messages = [\n ['test', Logger::LEVEL_INFO],\n ];\n@@ -205,15 +210,18 @@ public function testFailedExport(): void\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(3, $arguments);\n list($identity, $option, $facility) = $arguments;\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\n return $syslogTarget->openlog($identity, $option, $facility);\n };\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(2, $arguments);\n list($priority, $message) = $arguments;\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\n return $syslogTarget->syslog($priority, $message);\n };\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(0, $arguments);\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\n return $syslogTarget->closelog();\n };\n \ndiff --git a/tests/framework/log/TargetTest.php b/tests/framework/log/TargetTest.php\nindex b53b14acf14..ba3528c3ca5 100644\n--- a/tests/framework/log/TargetTest.php\n+++ b/tests/framework/log/TargetTest.php\n@@ -149,7 +149,7 @@ public function testGetContextMessage(): void\n */\n public function testSetupLevelsThroughArray(): void\n {\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->setLevels(['info', 'error']);\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_ERROR, $target->getLevels());\n@@ -168,7 +168,7 @@ public function testSetupLevelsThroughArray(): void\n */\n public function testSetupLevelsThroughBitmap(): void\n {\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->setLevels(Logger::LEVEL_INFO | Logger::LEVEL_WARNING);\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_WARNING, $target->getLevels());\n@@ -183,8 +183,7 @@ public function testSetupLevelsThroughBitmap(): void\n \n public function testGetEnabled(): void\n {\n- /** @var Target $target */\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->enabled = true;\n $this->assertTrue($target->enabled);\n@@ -200,8 +199,7 @@ public function testGetEnabled(): void\n \n public function testFormatMessage(): void\n {\n- /** @var Target $target */\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n date_default_timezone_set('UTC');\n \n","summary":"Edited 6 file(s) in tests/framework/log/"},{"subtask_id":"s5","scope_files":["tests/framework/mutex/DbMutexTest.php"],"solution_diff":"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nindex 3392c9ac549..324722b7585 100644\n--- a/tests/framework/mutex/DbMutexTest.php\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -13,6 +13,7 @@\n use Yii;\n use yii\\base\\InvalidConfigException;\n use yii\\db\\Connection;\n+use yii\\mutex\\DbMutex;\n use yiiunit\\TestCase;\n \n /**\n@@ -36,26 +37,26 @@ protected function setUp(): void\n \n public function testDbPropertyDefaultValue(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n $this->assertInstanceOf(Connection::class, $mutex->db);\n }\n \n public function testDbPropertyResolvesFromApplicationComponent(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n $this->assertSame(Yii::$app->db, $mutex->db);\n }\n \n public function testDbPropertyAcceptsConnectionObject(): void\n {\n $connection = new Connection(['dsn' => 'sqlite::memory:']);\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => $connection]]);\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\n $this->assertSame($connection, $mutex->db);\n }\n \n public function testDbPropertyAcceptsConfigArray(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [[\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\n 'db' => [\n 'class' => Connection::class,\n 'dsn' => 'sqlite::memory:',\n@@ -67,6 +68,6 @@ public function testDbPropertyAcceptsConfigArray(): void\n public function testThrowsExceptionForInvalidDb(): void\n {\n $this->expectException(InvalidConfigException::class);\n- $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => 'nonExistingComponent']]);\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\n }\n }\n","summary":"Edited 1 file(s) in tests/framework/mutex/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 20abc47d15b..51e87b57398 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -20,7 +20,6 @@ parameters:\\n - tests/framework/grid\\n - tests/framework/helpers\\n - tests/framework/i18n\\n- - tests/framework/log\\n - tests/framework/validators\\n \\n bootstrapFiles:\\n\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"framework/CHANGELOG.md\"\n ],\n \"solution_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 27b0954258b..2296dfc0938 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -4,7 +4,7 @@ Yii Framework 2 Change Log\\n 2.0.56 under development\\n ------------------------\\n \\n-- no changes in this release.\\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n \\n \\n 2.0.55 May 09, 2026\\n\",\n \"summary\": \"Edited 1 file(s) in framework/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"framework/log/Target.php\"\n ],\n \"solution_diff\": \"diff --git a/framework/log/Target.php b/framework/log/Target.php\\nindex 428fb150e14..780c9a05f34 100644\\n--- a/framework/log/Target.php\\n+++ b/framework/log/Target.php\\n@@ -28,7 +28,9 @@\\n * satisfying both filter conditions will be handled. Additionally, you\\n * may specify [[except]] to exclude messages of certain categories.\\n *\\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\\n\",\n \"summary\": \"Edited 1 file(s) in framework/log/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/log/DbTargetTest.php\",\n \"tests/framework/log/DispatcherTest.php\",\n \"tests/framework/log/EmailTargetTest.php\",\n \"tests/framework/log/LoggerTest.php\",\n \"tests/framework/log/SyslogTargetTest.php\",\n \"tests/framework/log/TargetTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php\\nindex fe7e5fa7d5f..b5026d13e9e 100644\\n--- a/tests/framework/log/DbTargetTest.php\\n+++ b/tests/framework/log/DbTargetTest.php\\n@@ -16,6 +16,7 @@\\n use Yii;\\n use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Query;\\n+use yii\\\\log\\\\DbTarget;\\n use yii\\\\log\\\\Logger;\\n use yiiunit\\\\framework\\\\console\\\\controllers\\\\EchoMigrateController;\\n use yiiunit\\\\TestCase;\\n@@ -169,7 +170,10 @@ public function testTransactionRollBack(): void\\n // current db connection should still have a transaction\\n $this->assertNotNull($db->transaction);\\n // log db connection should not have transaction\\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\\n+\\n+ $dbTarget = Yii::$app->log->targets['db'];\\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\\n+ $this->assertNull($dbTarget->db->transaction);\\n \\n $tx->rollBack();\\n \\ndiff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\\nindex d50128f2238..b09bd1bf5f7 100644\\n--- a/tests/framework/log/DispatcherTest.php\\n+++ b/tests/framework/log/DispatcherTest.php\\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\\n \\n /**\\n * @group log\\n+ *\\n+ * @method static mixed microtime($get_as_float)\\n */\\n class DispatcherTest extends TestCase\\n {\\n@@ -199,7 +201,7 @@ public function testDispatchWithFakeTarget2ThrowExceptionWhenCollect(): void\\n ->expects($matcher)\\n ->method('collect')\\n ->willReturnCallback(\\n- function (...$parameters) use ($matcher): void {\\n+ function (...$parameters) use ($target1, $matcher): void {\\n if ($matcher->getInvocationCount() === 1) {\\n $this->assertEquals('messages', $parameters[0]);\\n $this->assertTrue($parameters[1]);\\n@@ -327,7 +329,10 @@ public function testTargetThrow(): void\\n $this->assertSame(1, $this->targetThrowFirstCount);\\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\\n+\\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\\n+ $this->assertIsArray($targetThrowSecondOutputs);\\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\\n }\\n }\\n }\\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\\nindex ba49e5e6b98..507d736c049 100644\\n--- a/tests/framework/log/EmailTargetTest.php\\n+++ b/tests/framework/log/EmailTargetTest.php\\n@@ -8,6 +8,7 @@\\n \\n namespace yiiunit\\\\framework\\\\log;\\n \\n+use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n use yii\\\\base\\\\InvalidConfigException;\\n use yii\\\\log\\\\EmailTarget;\\n use yii\\\\mail\\\\BaseMailer;\\n@@ -21,7 +22,7 @@\\n class EmailTargetTest extends TestCase\\n {\\n /**\\n- * @var PHPUnit_Framework_MockObject_MockObject\\n+ * @var BaseMailer&MockObject\\n */\\n protected $mailer;\\n \\n@@ -76,7 +77,6 @@ public function testExportWithSubject(): void\\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\n@@ -122,7 +122,6 @@ public function testExportWithoutSubject(): void\\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\n@@ -158,7 +157,6 @@ public function testExportWithSendFailure(): void\\n $message->method('send')->willReturn(false);\\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\\n \\n- /** @var EmailTarget $mailTarget */\\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\\n ->onlyMethods(['formatMessage'])\\n ->setConstructorArgs([\\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\\nindex 5475a37fde4..605f3b261c9 100644\\n--- a/tests/framework/log/LoggerTest.php\\n+++ b/tests/framework/log/LoggerTest.php\\n@@ -8,6 +8,8 @@\\n \\n namespace yiiunit\\\\framework\\\\log;\\n \\n+use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n+use stdClass;\\n use yii\\\\log\\\\Dispatcher;\\n use yii\\\\log\\\\Logger;\\n use yiiunit\\\\TestCase;\\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\\n protected $logger;\\n \\n /**\\n- * @var Dispatcher|\\\\PHPUnit_Framework_MockObject_MockObject\\n+ * @var Dispatcher&MockObject\\n */\\n protected $dispatcher;\\n \\n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\\n $this->assertEquals('application', $this->logger->messages[0][2]);\\n $this->assertEquals([\\n 'file' => __FILE__,\\n- 'line' => 66,\\n+ 'line' => 68,\\n 'function' => 'log',\\n 'class' => get_class($this->logger),\\n 'type' => '->',\\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\\n */\\n public function testLogWithFlush(): void\\n {\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['flush']);\\n \\n $logger->flushInterval = 1;\\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\\n */\\n public function testFlushWithoutDispatcher(): void\\n {\\n- $dispatcher = $this->getMockBuilder('\\\\stdClass')->getMock();\\n+ $dispatcher = $this->createMock(stdClass::class);\\n $dispatcher->expects($this->never())->method($this->anything());\\n \\n $this->logger->messages = ['anything'];\\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\\n $this->logger->dispatcher = $dispatcher;\\n $this->logger->flush();\\n $this->assertEmpty($this->logger->messages);\\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\\n ['duration' => 30],\\n ];\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\\n $logger->method('getProfiling')->willReturn($timings);\\n $logger->expects($this->once())\\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\\n $messages = ['anyData'];\\n $returnValue = 'return value';\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\\n 'duration' => 5,\\n ],\\n ];\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\\nindex b4ad5bc3eb5..62a5e641b7a 100644\\n--- a/tests/framework/log/SyslogTargetTest.php\\n+++ b/tests/framework/log/SyslogTargetTest.php\\n@@ -24,7 +24,7 @@ function closelog()\\n }\\n \\n namespace yiiunit\\\\framework\\\\log {\\n- use PHPUnit_Framework_MockObject_MockObject;\\n+ use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n use yii\\\\helpers\\\\VarDumper;\\n use yii\\\\log\\\\Logger;\\n use yii\\\\log\\\\SyslogTarget;\\n@@ -34,6 +34,10 @@ function closelog()\\n * Class SyslogTargetTest.\\n *\\n * @group log\\n+ *\\n+ * @method static mixed openlog($arguments)\\n+ * @method static mixed syslog($arguments)\\n+ * @method static mixed closelog($arguments)\\n */\\n class SyslogTargetTest extends TestCase\\n {\\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\\n public static $functions = [];\\n \\n /**\\n- * @var PHPUnit_Framework_MockObject_MockObject\\n+ * @var SyslogTarget&MockObject\\n */\\n protected $syslogTarget;\\n \\n@@ -54,7 +58,7 @@ class SyslogTargetTest extends TestCase\\n */\\n protected function setUp(): void\\n {\\n- $this->syslogTarget = $this->createPartialMock('yii\\\\\\\\log\\\\\\\\SyslogTarget', ['getMessagePrefix']);\\n+ $this->syslogTarget = $this->createPartialMock(SyslogTarget::class, ['getMessagePrefix']);\\n }\\n \\n /**\\n@@ -64,7 +68,7 @@ public function testExport(): void\\n {\\n $identity = 'identity string';\\n $options = LOG_ODELAY | LOG_PID;\\n- $facility = 'facility string';\\n+ $facility = LOG_USER;\\n $messages = [\\n ['info message', Logger::LEVEL_INFO],\\n ['error message', Logger::LEVEL_ERROR],\\n@@ -75,7 +79,6 @@ public function testExport(): void\\n ['profile end message', Logger::LEVEL_PROFILE_END],\\n ];\\n \\n- /** @var SyslogTarget $syslogTarget */\\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\\n ->addMethods(['openlog', 'syslog', 'closelog'])\\n ->onlyMethods(['formatMessage'])\\n@@ -165,15 +168,18 @@ function (...$parameters) use ($matcher): void {\\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(3, $arguments);\\n list($identity, $option, $facility) = $arguments;\\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\\n return $syslogTarget->openlog($identity, $option, $facility);\\n };\\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(2, $arguments);\\n list($priority, $message) = $arguments;\\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\\n return $syslogTarget->syslog($priority, $message);\\n };\\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(0, $arguments);\\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\\n return $syslogTarget->closelog();\\n };\\n \\n@@ -187,7 +193,6 @@ function (...$parameters) use ($matcher): void {\\n */\\n public function testFailedExport(): void\\n {\\n- /** @var SyslogTarget $syslogTarget */\\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\\n ->addMethods(['openlog', 'syslog', 'closelog'])\\n ->onlyMethods(['formatMessage'])\\n@@ -197,7 +202,7 @@ public function testFailedExport(): void\\n \\n $syslogTarget->identity = 'identity string';\\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\\n- $syslogTarget->facility = 'facility string';\\n+ $syslogTarget->facility = LOG_USER;\\n $syslogTarget->messages = [\\n ['test', Logger::LEVEL_INFO],\\n ];\\n@@ -205,15 +210,18 @@ public function testFailedExport(): void\\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(3, $arguments);\\n list($identity, $option, $facility) = $arguments;\\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\\n return $syslogTarget->openlog($identity, $option, $facility);\\n };\\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(2, $arguments);\\n list($priority, $message) = $arguments;\\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\\n return $syslogTarget->syslog($priority, $message);\\n };\\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\\n $this->assertCount(0, $arguments);\\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\\n return $syslogTarget->closelog();\\n };\\n \\ndiff --git a/tests/framework/log/TargetTest.php b/tests/framework/log/TargetTest.php\\nindex b53b14acf14..ba3528c3ca5 100644\\n--- a/tests/framework/log/TargetTest.php\\n+++ b/tests/framework/log/TargetTest.php\\n@@ -149,7 +149,7 @@ public function testGetContextMessage(): void\\n */\\n public function testSetupLevelsThroughArray(): void\\n {\\n- $target = $this->getMockForAbstractClass('yii\\\\\\\\log\\\\\\\\Target');\\n+ $target = $this->getMockForAbstractClass(Target::class);\\n \\n $target->setLevels(['info', 'error']);\\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_ERROR, $target->getLevels());\\n@@ -168,7 +168,7 @@ public function testSetupLevelsThroughArray(): void\\n */\\n public function testSetupLevelsThroughBitmap(): void\\n {\\n- $target = $this->getMockForAbstractClass('yii\\\\\\\\log\\\\\\\\Target');\\n+ $target = $this->getMockForAbstractClass(Target::class);\\n \\n $target->setLevels(Logger::LEVEL_INFO | Logger::LEVEL_WARNING);\\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_WARNING, $target->getLevels());\\n@@ -183,8 +183,7 @@ public function testSetupLevelsThroughBitmap(): void\\n \\n public function testGetEnabled(): void\\n {\\n- /** @var Target $target */\\n- $target = $this->getMockForAbstractClass('yii\\\\\\\\log\\\\\\\\Target');\\n+ $target = $this->getMockForAbstractClass(Target::class);\\n \\n $target->enabled = true;\\n $this->assertTrue($target->enabled);\\n@@ -200,8 +199,7 @@ public function testGetEnabled(): void\\n \\n public function testFormatMessage(): void\\n {\\n- /** @var Target $target */\\n- $target = $this->getMockForAbstractClass('yii\\\\\\\\log\\\\\\\\Target');\\n+ $target = $this->getMockForAbstractClass(Target::class);\\n \\n date_default_timezone_set('UTC');\\n \\n\",\n \"summary\": \"Edited 6 file(s) in tests/framework/log/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\\nindex 3392c9ac549..324722b7585 100644\\n--- a/tests/framework/mutex/DbMutexTest.php\\n+++ b/tests/framework/mutex/DbMutexTest.php\\n@@ -13,6 +13,7 @@\\n use Yii;\\n use yii\\\\base\\\\InvalidConfigException;\\n use yii\\\\db\\\\Connection;\\n+use yii\\\\mutex\\\\DbMutex;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -36,26 +37,26 @@ protected function setUp(): void\\n \\n public function testDbPropertyDefaultValue(): void\\n {\\n- $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex');\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\\n $this->assertInstanceOf(Connection::class, $mutex->db);\\n }\\n \\n public function testDbPropertyResolvesFromApplicationComponent(): void\\n {\\n- $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex');\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\\n $this->assertSame(Yii::$app->db, $mutex->db);\\n }\\n \\n public function testDbPropertyAcceptsConnectionObject(): void\\n {\\n $connection = new Connection(['dsn' => 'sqlite::memory:']);\\n- $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [['db' => $connection]]);\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\\n $this->assertSame($connection, $mutex->db);\\n }\\n \\n public function testDbPropertyAcceptsConfigArray(): void\\n {\\n- $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [[\\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\\n 'db' => [\\n 'class' => Connection::class,\\n 'dsn' => 'sqlite::memory:',\\n@@ -67,6 +68,6 @@ public function testDbPropertyAcceptsConfigArray(): void\\n public function testThrowsExceptionForInvalidDb(): void\\n {\\n $this->expectException(InvalidConfigException::class);\\n- $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [['db' => 'nonExistingComponent']]);\\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\\n }\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/mutex/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s2","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Add the missing list marker for the new changelog item.**\n\nLine 7 should use the same bullet-list format as other entries (`- ...`) to keep changelog formatting consistent.\n\n \n\n<details>\n<summary>Suggested fix</summary>\n\n```diff\n-Bug `#20783`: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n+- Bug `#20783`: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n- Bug `#20783`: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@framework/CHANGELOG.md` at line 7, The changelog entry \"Bug `#20783`: Fix\nPHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\" is\nmissing the leading list marker; update the line so it matches other entries by\nprepending \"- \" to that line in CHANGELOG.md so the entry becomes a proper\nbullet item.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commits 22b2768 to 3810dbf","revised_diff":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 27b0954258b..2296dfc0938 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,7 +4,7 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- no changes in this release.\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n \n \n 2.0.55 May 09, 2026\n"},{"subtask_id":"s4","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**`testFlushWithoutDispatcher()` now uses a real `Dispatcher` subtype and breaks the testโs intent.**\n\nSwitching to `createMock(Dispatcher::class)` means `Logger::flush()` can legitimately call `dispatch()`, which conflicts with the existing `never()` expectation and no-dispatch scenario.\n\n \n<details>\n<summary>๐ง Proposed fix</summary>\n\n```diff\n- $dispatcher = $this->createMock(Dispatcher::class);\n+ $dispatcher = $this->getMockBuilder(\\stdClass::class)->getMock();\n```\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/log/LoggerTest.php` at line 101, The test\ntestFlushWithoutDispatcher() is using a concrete Dispatcher subtype which allows\nLogger::flush() to call dispatch(), breaking the existing $this->never()\nexpectation; replace the concrete dispatcher with a PHPUnit mock (use\n$this->createMock(Dispatcher::class)) and set the expectation\n$dispatcher->expects($this->never())->method('dispatch') before injecting it\ninto the Logger instance so Logger::flush() cannot call a real dispatch method\nduring this test.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit 22b2768","revised_diff":"diff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\nindex 5475a37fde4..605f3b261c9 100644\n--- a/tests/framework/log/LoggerTest.php\n+++ b/tests/framework/log/LoggerTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n+use stdClass;\n use yii\\log\\Dispatcher;\n use yii\\log\\Logger;\n use yiiunit\\TestCase;\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\n protected $logger;\n \n /**\n- * @var Dispatcher|\\PHPUnit_Framework_MockObject_MockObject\n+ * @var Dispatcher&MockObject\n */\n protected $dispatcher;\n \n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\n $this->assertEquals('application', $this->logger->messages[0][2]);\n $this->assertEquals([\n 'file' => __FILE__,\n- 'line' => 66,\n+ 'line' => 68,\n 'function' => 'log',\n 'class' => get_class($this->logger),\n 'type' => '->',\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\n */\n public function testLogWithFlush(): void\n {\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['flush']);\n \n $logger->flushInterval = 1;\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\n */\n public function testFlushWithoutDispatcher(): void\n {\n- $dispatcher = $this->getMockBuilder('\\stdClass')->getMock();\n+ $dispatcher = $this->createMock(stdClass::class);\n $dispatcher->expects($this->never())->method($this->anything());\n \n $this->logger->messages = ['anything'];\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $this->logger->dispatcher = $dispatcher;\n $this->logger->flush();\n $this->assertEmpty($this->logger->messages);\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\n ['duration' => 30],\n ];\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\n $logger->method('getProfiling')->willReturn($timings);\n $logger->expects($this->once())\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\n $messages = ['anyData'];\n $returnValue = 'return value';\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\n 'duration' => 5,\n ],\n ];\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n"}],"string":"[\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Add the missing list marker for the new changelog item.**\\n\\nLine 7 should use the same bullet-list format as other entries (`- ...`) to keep changelog formatting consistent.\\n\\n \\n\\n<details>\\n<summary>Suggested fix</summary>\\n\\n```diff\\n-Bug `#20783`: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n+- Bug `#20783`: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n- Bug `#20783`: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@framework/CHANGELOG.md` at line 7, The changelog entry \\\"Bug `#20783`: Fix\\nPHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\\" is\\nmissing the leading list marker; update the line so it matches other entries by\\nprepending \\\"- \\\" to that line in CHANGELOG.md so the entry becomes a proper\\nbullet item.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commits 22b2768 to 3810dbf\",\n \"revised_diff\": \"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\\nindex 27b0954258b..2296dfc0938 100644\\n--- a/framework/CHANGELOG.md\\n+++ b/framework/CHANGELOG.md\\n@@ -4,7 +4,7 @@ Yii Framework 2 Change Log\\n 2.0.56 under development\\n ------------------------\\n \\n-- no changes in this release.\\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\\\log\\\\Target::$enabled` property (mspirkov)\\n \\n \\n 2.0.55 May 09, 2026\\n\"\n },\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**`testFlushWithoutDispatcher()` now uses a real `Dispatcher` subtype and breaks the testโs intent.**\\n\\nSwitching to `createMock(Dispatcher::class)` means `Logger::flush()` can legitimately call `dispatch()`, which conflicts with the existing `never()` expectation and no-dispatch scenario.\\n\\n \\n<details>\\n<summary>๐ง Proposed fix</summary>\\n\\n```diff\\n- $dispatcher = $this->createMock(Dispatcher::class);\\n+ $dispatcher = $this->getMockBuilder(\\\\stdClass::class)->getMock();\\n```\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/log/LoggerTest.php` at line 101, The test\\ntestFlushWithoutDispatcher() is using a concrete Dispatcher subtype which allows\\nLogger::flush() to call dispatch(), breaking the existing $this->never()\\nexpectation; replace the concrete dispatcher with a PHPUnit mock (use\\n$this->createMock(Dispatcher::class)) and set the expectation\\n$dispatcher->expects($this->never())->method('dispatch') before injecting it\\ninto the Logger instance so Logger::flush() cannot call a real dispatch method\\nduring this test.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit 22b2768\",\n \"revised_diff\": \"diff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\\nindex 5475a37fde4..605f3b261c9 100644\\n--- a/tests/framework/log/LoggerTest.php\\n+++ b/tests/framework/log/LoggerTest.php\\n@@ -8,6 +8,8 @@\\n \\n namespace yiiunit\\\\framework\\\\log;\\n \\n+use PHPUnit\\\\Framework\\\\MockObject\\\\MockObject;\\n+use stdClass;\\n use yii\\\\log\\\\Dispatcher;\\n use yii\\\\log\\\\Logger;\\n use yiiunit\\\\TestCase;\\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\\n protected $logger;\\n \\n /**\\n- * @var Dispatcher|\\\\PHPUnit_Framework_MockObject_MockObject\\n+ * @var Dispatcher&MockObject\\n */\\n protected $dispatcher;\\n \\n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\\n $this->assertEquals('application', $this->logger->messages[0][2]);\\n $this->assertEquals([\\n 'file' => __FILE__,\\n- 'line' => 66,\\n+ 'line' => 68,\\n 'function' => 'log',\\n 'class' => get_class($this->logger),\\n 'type' => '->',\\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\\n */\\n public function testLogWithFlush(): void\\n {\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['flush']);\\n \\n $logger->flushInterval = 1;\\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\\n */\\n public function testFlushWithoutDispatcher(): void\\n {\\n- $dispatcher = $this->getMockBuilder('\\\\stdClass')->getMock();\\n+ $dispatcher = $this->createMock(stdClass::class);\\n $dispatcher->expects($this->never())->method($this->anything());\\n \\n $this->logger->messages = ['anything'];\\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\\n $this->logger->dispatcher = $dispatcher;\\n $this->logger->flush();\\n $this->assertEmpty($this->logger->messages);\\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\\n ['duration' => 30],\\n ];\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\\n $logger->method('getProfiling')->willReturn($timings);\\n $logger->expects($this->once())\\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\\n $messages = ['anyData'];\\n $returnValue = 'return value';\\n \\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\\n 'duration' => 5,\\n ],\\n ];\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\\n /*\\n * Matched by prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category name\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\\n /*\\n * Exclude by category prefix\\n */\\n- /** @var Logger|\\\\PHPUnit_Framework_MockObject_MockObject $logger */\\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\\n \\n $logger->messages = $messages;\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 27b0954258b..2296dfc0938 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -4,7 +4,7 @@ Yii Framework 2 Change Log\n 2.0.56 under development\n ------------------------\n \n-- no changes in this release.\n+- Bug #20783: Fix PHPDoc annotations for the `yii\\log\\Target::$enabled` property (mspirkov)\n \n \n 2.0.55 May 09, 2026\ndiff --git a/framework/log/Target.php b/framework/log/Target.php\nindex 428fb150e14..780c9a05f34 100644\n--- a/framework/log/Target.php\n+++ b/framework/log/Target.php\n@@ -28,7 +28,9 @@\n * satisfying both filter conditions will be handled. Additionally, you\n * may specify [[except]] to exclude messages of certain categories.\n *\n- * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * @property-read bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type\n+ * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n+ * @property-write bool|callable $enabled A boolean value or a callable to obtain the value from. Note that the type\n * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.\n * @property int $levels The message levels that this target is interested in. This is a bitmap of level\n * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and\ndiff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 20abc47d15b..51e87b57398 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -20,7 +20,6 @@ parameters:\n - tests/framework/grid\n - tests/framework/helpers\n - tests/framework/i18n\n- - tests/framework/log\n - tests/framework/validators\n \n bootstrapFiles:\n\ndiff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php\nindex fe7e5fa7d5f..b5026d13e9e 100644\n--- a/tests/framework/log/DbTargetTest.php\n+++ b/tests/framework/log/DbTargetTest.php\n@@ -16,6 +16,7 @@\n use Yii;\n use yii\\db\\Connection;\n use yii\\db\\Query;\n+use yii\\log\\DbTarget;\n use yii\\log\\Logger;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -169,7 +170,10 @@ public function testTransactionRollBack(): void\n // current db connection should still have a transaction\n $this->assertNotNull($db->transaction);\n // log db connection should not have transaction\n- $this->assertNull(Yii::$app->log->targets['db']->db->transaction);\n+\n+ $dbTarget = Yii::$app->log->targets['db'];\n+ $this->assertInstanceOf(DbTarget::class, $dbTarget);\n+ $this->assertNull($dbTarget->db->transaction);\n \n $tx->rollBack();\n \ndiff --git a/tests/framework/log/DispatcherTest.php b/tests/framework/log/DispatcherTest.php\nindex d50128f2238..b09bd1bf5f7 100644\n--- a/tests/framework/log/DispatcherTest.php\n+++ b/tests/framework/log/DispatcherTest.php\n@@ -28,6 +28,8 @@ function microtime($get_as_float)\n \n /**\n * @group log\n+ *\n+ * @method static mixed microtime($get_as_float)\n */\n class DispatcherTest extends TestCase\n {\n@@ -199,7 +201,7 @@ public function testDispatchWithFakeTarget2ThrowExceptionWhenCollect(): void\n ->expects($matcher)\n ->method('collect')\n ->willReturnCallback(\n- function (...$parameters) use ($matcher): void {\n+ function (...$parameters) use ($target1, $matcher): void {\n if ($matcher->getInvocationCount() === 1) {\n $this->assertEquals('messages', $parameters[0]);\n $this->assertTrue($parameters[1]);\n@@ -327,7 +329,10 @@ public function testTargetThrow(): void\n $this->assertSame(1, $this->targetThrowFirstCount);\n $this->assertSame(2, count($this->targetThrowSecondOutputs));\n $this->assertSame($message, array_shift($this->targetThrowSecondOutputs));\n- $this->assertStringStartsWith('Unable to send log via', array_shift($this->targetThrowSecondOutputs)[0]);\n+\n+ $targetThrowSecondOutputs = array_shift($this->targetThrowSecondOutputs);\n+ $this->assertIsArray($targetThrowSecondOutputs);\n+ $this->assertStringStartsWith('Unable to send log via', $targetThrowSecondOutputs[0]);\n }\n }\n }\ndiff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php\nindex ba49e5e6b98..507d736c049 100644\n--- a/tests/framework/log/EmailTargetTest.php\n+++ b/tests/framework/log/EmailTargetTest.php\n@@ -8,6 +8,7 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\base\\InvalidConfigException;\n use yii\\log\\EmailTarget;\n use yii\\mail\\BaseMailer;\n@@ -21,7 +22,7 @@\n class EmailTargetTest extends TestCase\n {\n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var BaseMailer&MockObject\n */\n protected $mailer;\n \n@@ -76,7 +77,6 @@ public function testExportWithSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Hello world'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -122,7 +122,6 @@ public function testExportWithoutSubject(): void\n $message->expects($this->once())->method('send')->with($this->equalTo($this->mailer));\n $message->expects($this->once())->method('setSubject')->with($this->equalTo('Application Log'));\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\n@@ -158,7 +157,6 @@ public function testExportWithSendFailure(): void\n $message->method('send')->willReturn(false);\n $this->mailer->expects($this->once())->method('compose')->willReturn($message);\n \n- /** @var EmailTarget $mailTarget */\n $mailTarget = $this->getMockBuilder(EmailTarget::class)\n ->onlyMethods(['formatMessage'])\n ->setConstructorArgs([\ndiff --git a/tests/framework/log/LoggerTest.php b/tests/framework/log/LoggerTest.php\nindex 5475a37fde4..605f3b261c9 100644\n--- a/tests/framework/log/LoggerTest.php\n+++ b/tests/framework/log/LoggerTest.php\n@@ -8,6 +8,8 @@\n \n namespace yiiunit\\framework\\log;\n \n+use PHPUnit\\Framework\\MockObject\\MockObject;\n+use stdClass;\n use yii\\log\\Dispatcher;\n use yii\\log\\Logger;\n use yiiunit\\TestCase;\n@@ -23,7 +25,7 @@ class LoggerTest extends TestCase\n protected $logger;\n \n /**\n- * @var Dispatcher|\\PHPUnit_Framework_MockObject_MockObject\n+ * @var Dispatcher&MockObject\n */\n protected $dispatcher;\n \n@@ -70,7 +72,7 @@ public function testLogWithTraceLevel(): void\n $this->assertEquals('application', $this->logger->messages[0][2]);\n $this->assertEquals([\n 'file' => __FILE__,\n- 'line' => 66,\n+ 'line' => 68,\n 'function' => 'log',\n 'class' => get_class($this->logger),\n 'type' => '->',\n@@ -84,7 +86,6 @@ public function testLogWithTraceLevel(): void\n */\n public function testLogWithFlush(): void\n {\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['flush']);\n \n $logger->flushInterval = 1;\n@@ -98,10 +99,11 @@ public function testLogWithFlush(): void\n */\n public function testFlushWithoutDispatcher(): void\n {\n- $dispatcher = $this->getMockBuilder('\\stdClass')->getMock();\n+ $dispatcher = $this->createMock(stdClass::class);\n $dispatcher->expects($this->never())->method($this->anything());\n \n $this->logger->messages = ['anything'];\n+ // @phpstan-ignore assign.propertyType (We intentionally use an invalid value here to test its processing)\n $this->logger->dispatcher = $dispatcher;\n $this->logger->flush();\n $this->assertEmpty($this->logger->messages);\n@@ -148,7 +150,6 @@ public function testGetDbProfiling(): void\n ['duration' => 30],\n ];\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['getProfiling']);\n $logger->method('getProfiling')->willReturn($timings);\n $logger->expects($this->once())\n@@ -346,7 +347,6 @@ public function testGetProfilingWithEmptyCategoriesAndExcludeCategories(): void\n $messages = ['anyData'];\n $returnValue = 'return value';\n \n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -372,7 +372,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndNotMatched(): void\n 'duration' => 5,\n ],\n ];\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -411,7 +410,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -423,7 +421,6 @@ public function testGetProfilingWithNotEmptyCategoriesAndMatched(): void\n /*\n * Matched by prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -471,7 +468,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category name\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\n@@ -483,7 +479,6 @@ public function testGetProfilingWithNotEmptyCategoriesMatchedAndExcludeCategorie\n /*\n * Exclude by category prefix\n */\n- /** @var Logger|\\PHPUnit_Framework_MockObject_MockObject $logger */\n $logger = $this->createPartialMock(Logger::class, ['calculateTimings']);\n \n $logger->messages = $messages;\ndiff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php\nindex b4ad5bc3eb5..62a5e641b7a 100644\n--- a/tests/framework/log/SyslogTargetTest.php\n+++ b/tests/framework/log/SyslogTargetTest.php\n@@ -24,7 +24,7 @@ function closelog()\n }\n \n namespace yiiunit\\framework\\log {\n- use PHPUnit_Framework_MockObject_MockObject;\n+ use PHPUnit\\Framework\\MockObject\\MockObject;\n use yii\\helpers\\VarDumper;\n use yii\\log\\Logger;\n use yii\\log\\SyslogTarget;\n@@ -34,6 +34,10 @@ function closelog()\n * Class SyslogTargetTest.\n *\n * @group log\n+ *\n+ * @method static mixed openlog($arguments)\n+ * @method static mixed syslog($arguments)\n+ * @method static mixed closelog($arguments)\n */\n class SyslogTargetTest extends TestCase\n {\n@@ -45,7 +49,7 @@ class SyslogTargetTest extends TestCase\n public static $functions = [];\n \n /**\n- * @var PHPUnit_Framework_MockObject_MockObject\n+ * @var SyslogTarget&MockObject\n */\n protected $syslogTarget;\n \n@@ -54,7 +58,7 @@ class SyslogTargetTest extends TestCase\n */\n protected function setUp(): void\n {\n- $this->syslogTarget = $this->createPartialMock('yii\\\\log\\\\SyslogTarget', ['getMessagePrefix']);\n+ $this->syslogTarget = $this->createPartialMock(SyslogTarget::class, ['getMessagePrefix']);\n }\n \n /**\n@@ -64,7 +68,7 @@ public function testExport(): void\n {\n $identity = 'identity string';\n $options = LOG_ODELAY | LOG_PID;\n- $facility = 'facility string';\n+ $facility = LOG_USER;\n $messages = [\n ['info message', Logger::LEVEL_INFO],\n ['error message', Logger::LEVEL_ERROR],\n@@ -75,7 +79,6 @@ public function testExport(): void\n ['profile end message', Logger::LEVEL_PROFILE_END],\n ];\n \n- /** @var SyslogTarget $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\n ->addMethods(['openlog', 'syslog', 'closelog'])\n ->onlyMethods(['formatMessage'])\n@@ -165,15 +168,18 @@ function (...$parameters) use ($matcher): void {\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(3, $arguments);\n list($identity, $option, $facility) = $arguments;\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\n return $syslogTarget->openlog($identity, $option, $facility);\n };\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(2, $arguments);\n list($priority, $message) = $arguments;\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\n return $syslogTarget->syslog($priority, $message);\n };\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(0, $arguments);\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\n return $syslogTarget->closelog();\n };\n \n@@ -187,7 +193,6 @@ function (...$parameters) use ($matcher): void {\n */\n public function testFailedExport(): void\n {\n- /** @var SyslogTarget $syslogTarget */\n $syslogTarget = $this->getMockBuilder(SyslogTarget::class)\n ->addMethods(['openlog', 'syslog', 'closelog'])\n ->onlyMethods(['formatMessage'])\n@@ -197,7 +202,7 @@ public function testFailedExport(): void\n \n $syslogTarget->identity = 'identity string';\n $syslogTarget->options = LOG_ODELAY | LOG_PID;\n- $syslogTarget->facility = 'facility string';\n+ $syslogTarget->facility = LOG_USER;\n $syslogTarget->messages = [\n ['test', Logger::LEVEL_INFO],\n ];\n@@ -205,15 +210,18 @@ public function testFailedExport(): void\n static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(3, $arguments);\n list($identity, $option, $facility) = $arguments;\n+ // @phpstan-ignore method.notFound (The openlog method is added to the mock using the MockBuilder)\n return $syslogTarget->openlog($identity, $option, $facility);\n };\n static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(2, $arguments);\n list($priority, $message) = $arguments;\n+ // @phpstan-ignore method.notFound (The syslog method is added to the mock using the MockBuilder)\n return $syslogTarget->syslog($priority, $message);\n };\n static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {\n $this->assertCount(0, $arguments);\n+ // @phpstan-ignore method.notFound (The closelog method is added to the mock using the MockBuilder)\n return $syslogTarget->closelog();\n };\n \ndiff --git a/tests/framework/log/TargetTest.php b/tests/framework/log/TargetTest.php\nindex b53b14acf14..ba3528c3ca5 100644\n--- a/tests/framework/log/TargetTest.php\n+++ b/tests/framework/log/TargetTest.php\n@@ -149,7 +149,7 @@ public function testGetContextMessage(): void\n */\n public function testSetupLevelsThroughArray(): void\n {\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->setLevels(['info', 'error']);\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_ERROR, $target->getLevels());\n@@ -168,7 +168,7 @@ public function testSetupLevelsThroughArray(): void\n */\n public function testSetupLevelsThroughBitmap(): void\n {\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->setLevels(Logger::LEVEL_INFO | Logger::LEVEL_WARNING);\n $this->assertEquals(Logger::LEVEL_INFO | Logger::LEVEL_WARNING, $target->getLevels());\n@@ -183,8 +183,7 @@ public function testSetupLevelsThroughBitmap(): void\n \n public function testGetEnabled(): void\n {\n- /** @var Target $target */\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n $target->enabled = true;\n $this->assertTrue($target->enabled);\n@@ -200,8 +199,7 @@ public function testGetEnabled(): void\n \n public function testFormatMessage(): void\n {\n- /** @var Target $target */\n- $target = $this->getMockForAbstractClass('yii\\\\log\\\\Target');\n+ $target = $this->getMockForAbstractClass(Target::class);\n \n date_default_timezone_set('UTC');\n \ndiff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nindex 3392c9ac549..324722b7585 100644\n--- a/tests/framework/mutex/DbMutexTest.php\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -13,6 +13,7 @@\n use Yii;\n use yii\\base\\InvalidConfigException;\n use yii\\db\\Connection;\n+use yii\\mutex\\DbMutex;\n use yiiunit\\TestCase;\n \n /**\n@@ -36,26 +37,26 @@ protected function setUp(): void\n \n public function testDbPropertyDefaultValue(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n $this->assertInstanceOf(Connection::class, $mutex->db);\n }\n \n public function testDbPropertyResolvesFromApplicationComponent(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class);\n $this->assertSame(Yii::$app->db, $mutex->db);\n }\n \n public function testDbPropertyAcceptsConnectionObject(): void\n {\n $connection = new Connection(['dsn' => 'sqlite::memory:']);\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => $connection]]);\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [['db' => $connection]]);\n $this->assertSame($connection, $mutex->db);\n }\n \n public function testDbPropertyAcceptsConfigArray(): void\n {\n- $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [[\n+ $mutex = $this->getMockForAbstractClass(DbMutex::class, [[\n 'db' => [\n 'class' => Connection::class,\n 'dsn' => 'sqlite::memory:',\n@@ -67,6 +68,6 @@ public function testDbPropertyAcceptsConfigArray(): void\n public function testThrowsExceptionForInvalidDb(): void\n {\n $this->expectException(InvalidConfigException::class);\n- $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => 'nonExistingComponent']]);\n+ $this->getMockForAbstractClass(DbMutex::class, [['db' => 'nonExistingComponent']]);\n }\n }\n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":10,"string":"10"}}},{"rowIdx":34268,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20786"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20786,"string":"20,786"},"base_sha":{"kind":"string","value":"cef4122784b39a2e4aae6b65a8e2b5c508f1afa2"},"head_sha":{"kind":"string","value":"e7f28131f4cf0688070ccfda579a1d6046897a45"},"task":{"kind":"string","value":"Add unit tests for mutex classes\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Tests added? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues |\r\n\r\n## What does this PR do?\r\n\r\nAdds unit tests for `Mutex`, `DbMutex`, and `OracleMutex`.\r\n\r\n### Coverage\r\n\r\n| File | Tests | Lines | MSI |\r\n|---|---|---|---|\r\n| `framework/mutex/Mutex.php` | 7 | 15/17 (88%) | 86% (20/23) |\r\n| `framework/mutex/DbMutex.php` | 5 | 2/2 (100%) | 0% (0/1) |\r\n| `framework/mutex/OracleMutex.php` | 8 | 3/28 (11%) | 61% (8/13) |\r\n\r\nChangelog not required, because no source files changed.\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `tests/framework/mutex/` needed for: Add unit tests for mutex classes","scope_files":["tests/framework/mutex/DbMutexTest.php","tests/framework/mutex/MutexTest.php","tests/framework/mutex/OracleMutexTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `tests/framework/mutex/` needed for: Add unit tests for mutex classes\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\",\n \"tests/framework/mutex/MutexTest.php\",\n \"tests/framework/mutex/OracleMutexTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["tests/framework/mutex/DbMutexTest.php","tests/framework/mutex/MutexTest.php","tests/framework/mutex/OracleMutexTest.php"],"solution_diff":"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nnew file mode 100644\nindex 00000000000..3392c9ac549\n--- /dev/null\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -0,0 +1,72 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use Yii;\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ * @group db\n+ */\n+class DbMutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ],\n+ ]);\n+ }\n+\n+ public function testDbPropertyDefaultValue(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $this->assertSame(Yii::$app->db, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConnectionObject(): void\n+ {\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => $connection]]);\n+ $this->assertSame($connection, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConfigArray(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [[\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ]]);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testThrowsExceptionForInvalidDb(): void\n+ {\n+ $this->expectException(InvalidConfigException::class);\n+ $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => 'nonExistingComponent']]);\n+ }\n+}\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\nnew file mode 100644\nindex 00000000000..16d7dd2ef79\n--- /dev/null\n+++ b/tests/framework/mutex/MutexTest.php\n@@ -0,0 +1,79 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yiiunit\\framework\\mutex\\mocks\\DumbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class MutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ DumbMutex::$locked = false;\n+ }\n+\n+ public function testAcquireAndRelease(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertTrue($mutex->isAcquired('test'));\n+ $this->assertTrue($mutex->release('test'));\n+ $this->assertFalse($mutex->isAcquired('test'));\n+ }\n+\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertFalse($mutex->acquire('test'));\n+ $mutex->release('test');\n+ }\n+\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->release('test'));\n+ }\n+\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\n+ }\n+\n+ public function testAutoReleaseIsEnabledByDefault(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->autoRelease);\n+ }\n+\n+ public function testAutoReleaseCanBeDisabled(): void\n+ {\n+ $mutex = new DumbMutex(['autoRelease' => false]);\n+ $this->assertFalse($mutex->autoRelease);\n+ }\n+\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $mutex->acquire('test');\n+\n+ $countBefore = count($mutex->attemptsTime);\n+ $mutex->acquire('test');\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\n+\n+ $mutex->release('test');\n+ }\n+}\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\nnew file mode 100644\nindex 00000000000..01a6ca34cc3\n--- /dev/null\n+++ b/tests/framework/mutex/OracleMutexTest.php\n@@ -0,0 +1,115 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\OracleMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class OracleMutexTest extends TestCase\n+{\n+ public function testInitSucceedsWithOciDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testInitSucceedsWithOdbcDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'odbc'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testDefaultProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\n+ $this->assertFalse($mutex->releaseOnCommit);\n+ }\n+\n+ public function testCustomProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex([\n+ 'db' => $db,\n+ 'lockMode' => OracleMutex::MODE_NL,\n+ 'releaseOnCommit' => true,\n+ ]);\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\n+ $this->assertTrue($mutex->releaseOnCommit);\n+ }\n+\n+ /**\n+ * @dataProvider invalidDriverProvider\n+ */\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', $driverName],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\n+ new OracleMutex(['db' => $db]);\n+ }\n+\n+ public static function invalidDriverProvider(): array\n+ {\n+ return [\n+ 'mysql' => ['mysql'],\n+ 'pgsql' => ['pgsql'],\n+ 'sqlite' => ['sqlite'],\n+ 'sqlsrv' => ['sqlsrv'],\n+ ];\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/mutex/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"tests/framework/mutex/DbMutexTest.php\",\n \"tests/framework/mutex/MutexTest.php\",\n \"tests/framework/mutex/OracleMutexTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\\nnew file mode 100644\\nindex 00000000000..3392c9ac549\\n--- /dev/null\\n+++ b/tests/framework/mutex/DbMutexTest.php\\n@@ -0,0 +1,72 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use Yii;\\n+use yii\\\\base\\\\InvalidConfigException;\\n+use yii\\\\db\\\\Connection;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ * @group db\\n+ */\\n+class DbMutexTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => [\\n+ 'class' => Connection::class,\\n+ 'dsn' => 'sqlite::memory:',\\n+ ],\\n+ ],\\n+ ]);\\n+ }\\n+\\n+ public function testDbPropertyDefaultValue(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex');\\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex');\\n+ $this->assertSame(Yii::$app->db, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyAcceptsConnectionObject(): void\\n+ {\\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\\n+ $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [['db' => $connection]]);\\n+ $this->assertSame($connection, $mutex->db);\\n+ }\\n+\\n+ public function testDbPropertyAcceptsConfigArray(): void\\n+ {\\n+ $mutex = $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [[\\n+ 'db' => [\\n+ 'class' => Connection::class,\\n+ 'dsn' => 'sqlite::memory:',\\n+ ],\\n+ ]]);\\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\\n+ }\\n+\\n+ public function testThrowsExceptionForInvalidDb(): void\\n+ {\\n+ $this->expectException(InvalidConfigException::class);\\n+ $this->getMockForAbstractClass('yii\\\\mutex\\\\DbMutex', [['db' => 'nonExistingComponent']]);\\n+ }\\n+}\\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\\nnew file mode 100644\\nindex 00000000000..16d7dd2ef79\\n--- /dev/null\\n+++ b/tests/framework/mutex/MutexTest.php\\n@@ -0,0 +1,79 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use yiiunit\\\\framework\\\\mutex\\\\mocks\\\\DumbMutex;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ */\\n+class MutexTest extends TestCase\\n+{\\n+ protected function setUp(): void\\n+ {\\n+ parent::setUp();\\n+ DumbMutex::$locked = false;\\n+ }\\n+\\n+ public function testAcquireAndRelease(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->acquire('test'));\\n+ $this->assertTrue($mutex->isAcquired('test'));\\n+ $this->assertTrue($mutex->release('test'));\\n+ $this->assertFalse($mutex->isAcquired('test'));\\n+ }\\n+\\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->acquire('test'));\\n+ $this->assertFalse($mutex->acquire('test'));\\n+ $mutex->release('test');\\n+ }\\n+\\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertFalse($mutex->release('test'));\\n+ }\\n+\\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\\n+ }\\n+\\n+ public function testAutoReleaseIsEnabledByDefault(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $this->assertTrue($mutex->autoRelease);\\n+ }\\n+\\n+ public function testAutoReleaseCanBeDisabled(): void\\n+ {\\n+ $mutex = new DumbMutex(['autoRelease' => false]);\\n+ $this->assertFalse($mutex->autoRelease);\\n+ }\\n+\\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\\n+ {\\n+ $mutex = new DumbMutex();\\n+ $mutex->acquire('test');\\n+\\n+ $countBefore = count($mutex->attemptsTime);\\n+ $mutex->acquire('test');\\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\\n+\\n+ $mutex->release('test');\\n+ }\\n+}\\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\\nnew file mode 100644\\nindex 00000000000..01a6ca34cc3\\n--- /dev/null\\n+++ b/tests/framework/mutex/OracleMutexTest.php\\n@@ -0,0 +1,115 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+declare(strict_types=1);\\n+\\n+namespace yiiunit\\\\framework\\\\mutex;\\n+\\n+use yii\\\\base\\\\InvalidConfigException;\\n+use yii\\\\db\\\\Connection;\\n+use yii\\\\mutex\\\\OracleMutex;\\n+use yiiunit\\\\TestCase;\\n+\\n+/**\\n+ * @group mutex\\n+ */\\n+class OracleMutexTest extends TestCase\\n+{\\n+ public function testInitSucceedsWithOciDriver(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => $db,\\n+ ],\\n+ ]);\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame($db, $mutex->db);\\n+ }\\n+\\n+ public function testInitSucceedsWithOdbcDriver(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'odbc'],\\n+ ]);\\n+\\n+ $this->mockApplication([\\n+ 'components' => [\\n+ 'db' => $db,\\n+ ],\\n+ ]);\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame($db, $mutex->db);\\n+ }\\n+\\n+ public function testDefaultProperties(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $mutex = new OracleMutex(['db' => $db]);\\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\\n+ $this->assertFalse($mutex->releaseOnCommit);\\n+ }\\n+\\n+ public function testCustomProperties(): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', 'oci'],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $mutex = new OracleMutex([\\n+ 'db' => $db,\\n+ 'lockMode' => OracleMutex::MODE_NL,\\n+ 'releaseOnCommit' => true,\\n+ ]);\\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\\n+ $this->assertTrue($mutex->releaseOnCommit);\\n+ }\\n+\\n+ /**\\n+ * @dataProvider invalidDriverProvider\\n+ */\\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\\n+ {\\n+ $db = $this->createMock(Connection::class);\\n+ $db->method('__get')->willReturnMap([\\n+ ['driverName', $driverName],\\n+ ]);\\n+\\n+ $this->mockApplication();\\n+\\n+ $this->expectException(InvalidConfigException::class);\\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\\n+ new OracleMutex(['db' => $db]);\\n+ }\\n+\\n+ public static function invalidDriverProvider(): array\\n+ {\\n+ return [\\n+ 'mysql' => ['mysql'],\\n+ 'pgsql' => ['pgsql'],\\n+ 'sqlite' => ['sqlite'],\\n+ 'sqlsrv' => ['sqlsrv'],\\n+ ];\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/mutex/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"\ndiff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nnew file mode 100644\nindex 00000000000..3392c9ac549\n--- /dev/null\n+++ b/tests/framework/mutex/DbMutexTest.php\n@@ -0,0 +1,72 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use Yii;\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ * @group db\n+ */\n+class DbMutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ],\n+ ]);\n+ }\n+\n+ public function testDbPropertyDefaultValue(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testDbPropertyResolvesFromApplicationComponent(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex');\n+ $this->assertSame(Yii::$app->db, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConnectionObject(): void\n+ {\n+ $connection = new Connection(['dsn' => 'sqlite::memory:']);\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => $connection]]);\n+ $this->assertSame($connection, $mutex->db);\n+ }\n+\n+ public function testDbPropertyAcceptsConfigArray(): void\n+ {\n+ $mutex = $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [[\n+ 'db' => [\n+ 'class' => Connection::class,\n+ 'dsn' => 'sqlite::memory:',\n+ ],\n+ ]]);\n+ $this->assertInstanceOf(Connection::class, $mutex->db);\n+ }\n+\n+ public function testThrowsExceptionForInvalidDb(): void\n+ {\n+ $this->expectException(InvalidConfigException::class);\n+ $this->getMockForAbstractClass('yii\\mutex\\DbMutex', [['db' => 'nonExistingComponent']]);\n+ }\n+}\ndiff --git a/tests/framework/mutex/MutexTest.php b/tests/framework/mutex/MutexTest.php\nnew file mode 100644\nindex 00000000000..16d7dd2ef79\n--- /dev/null\n+++ b/tests/framework/mutex/MutexTest.php\n@@ -0,0 +1,79 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yiiunit\\framework\\mutex\\mocks\\DumbMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class MutexTest extends TestCase\n+{\n+ protected function setUp(): void\n+ {\n+ parent::setUp();\n+ DumbMutex::$locked = false;\n+ }\n+\n+ public function testAcquireAndRelease(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertTrue($mutex->isAcquired('test'));\n+ $this->assertTrue($mutex->release('test'));\n+ $this->assertFalse($mutex->isAcquired('test'));\n+ }\n+\n+ public function testAcquireSameLockTwiceReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->acquire('test'));\n+ $this->assertFalse($mutex->acquire('test'));\n+ $mutex->release('test');\n+ }\n+\n+ public function testReleaseUnacquiredLockReturnsFalse(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->release('test'));\n+ }\n+\n+ public function testIsAcquiredReturnsFalseForUnknownLock(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertFalse($mutex->isAcquired('nonexistent'));\n+ }\n+\n+ public function testAutoReleaseIsEnabledByDefault(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $this->assertTrue($mutex->autoRelease);\n+ }\n+\n+ public function testAutoReleaseCanBeDisabled(): void\n+ {\n+ $mutex = new DumbMutex(['autoRelease' => false]);\n+ $this->assertFalse($mutex->autoRelease);\n+ }\n+\n+ public function testAcquireSkipsAcquireLockWhenAlreadyHeld(): void\n+ {\n+ $mutex = new DumbMutex();\n+ $mutex->acquire('test');\n+\n+ $countBefore = count($mutex->attemptsTime);\n+ $mutex->acquire('test');\n+ $this->assertCount($countBefore, $mutex->attemptsTime);\n+\n+ $mutex->release('test');\n+ }\n+}\ndiff --git a/tests/framework/mutex/OracleMutexTest.php b/tests/framework/mutex/OracleMutexTest.php\nnew file mode 100644\nindex 00000000000..01a6ca34cc3\n--- /dev/null\n+++ b/tests/framework/mutex/OracleMutexTest.php\n@@ -0,0 +1,115 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+declare(strict_types=1);\n+\n+namespace yiiunit\\framework\\mutex;\n+\n+use yii\\base\\InvalidConfigException;\n+use yii\\db\\Connection;\n+use yii\\mutex\\OracleMutex;\n+use yiiunit\\TestCase;\n+\n+/**\n+ * @group mutex\n+ */\n+class OracleMutexTest extends TestCase\n+{\n+ public function testInitSucceedsWithOciDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testInitSucceedsWithOdbcDriver(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'odbc'],\n+ ]);\n+\n+ $this->mockApplication([\n+ 'components' => [\n+ 'db' => $db,\n+ ],\n+ ]);\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame($db, $mutex->db);\n+ }\n+\n+ public function testDefaultProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex(['db' => $db]);\n+ $this->assertSame(OracleMutex::MODE_X, $mutex->lockMode);\n+ $this->assertFalse($mutex->releaseOnCommit);\n+ }\n+\n+ public function testCustomProperties(): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', 'oci'],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $mutex = new OracleMutex([\n+ 'db' => $db,\n+ 'lockMode' => OracleMutex::MODE_NL,\n+ 'releaseOnCommit' => true,\n+ ]);\n+ $this->assertSame(OracleMutex::MODE_NL, $mutex->lockMode);\n+ $this->assertTrue($mutex->releaseOnCommit);\n+ }\n+\n+ /**\n+ * @dataProvider invalidDriverProvider\n+ */\n+ public function testThrowsExceptionForInvalidDrivers(string $driverName): void\n+ {\n+ $db = $this->createMock(Connection::class);\n+ $db->method('__get')->willReturnMap([\n+ ['driverName', $driverName],\n+ ]);\n+\n+ $this->mockApplication();\n+\n+ $this->expectException(InvalidConfigException::class);\n+ $this->expectExceptionMessage('In order to use OracleMutex connection must be configured to use Oracle database.');\n+ new OracleMutex(['db' => $db]);\n+ }\n+\n+ public static function invalidDriverProvider(): array\n+ {\n+ return [\n+ 'mysql' => ['mysql'],\n+ 'pgsql' => ['pgsql'],\n+ 'sqlite' => ['sqlite'],\n+ 'sqlsrv' => ['sqlsrv'],\n+ ];\n+ }\n+}\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":3,"string":"3"}}},{"rowIdx":34269,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20795"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20795,"string":"20,795"},"base_sha":{"kind":"string","value":"a271aeee800a3e5dcda705180e72f3168973b7aa"},"head_sha":{"kind":"string","value":"583dfe6e06550015f221383fa0f0f8f9d7f4d2be"},"task":{"kind":"string","value":"Strengthen MSSQL `QueryBuilderTest` and `SchemaTest` coverage\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Tests added? | โ๏ธ\r\n| Breaks BC? | โ\r\n| Fixed issues |\r\n\r\n## What does this PR do?\r\n\r\nAdds tests for previously uncovered methods in MSSQL QueryBuilder, Schema and InConditionBuilder.\r\n\r\n### Coverage\r\n\r\n| File | Before | After |\r\n|---|---|---|\r\n| `mssql/QueryBuilder.php` | 80.4% (185/230) | 95.7% (220/230) |\r\n| `mssql/Schema.php` | 80.8% (231/286) | 92.7% (265/286) |\r\n\r\nNew test methods: 13 in QueryBuilderTest, 11 in SchemaTest.\r\n\r\nRemaining uncovered: pre-2012/pre-2017 SQL Server branches, cross-catalog paths, dead code (`getAllColumnNames`, `isOldMssql`).\r\n\r\nChangelog not required, because no source files changed.\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `tests/framework/db/mssql/` needed for: Strengthen MSSQL `QueryBuilderTest` and `SchemaTest` coverage","scope_files":["tests/framework/db/mssql/QueryBuilderTest.php","tests/framework/db/mssql/SchemaTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `tests/framework/db/mssql/` needed for: Strengthen MSSQL `QueryBuilderTest` and `SchemaTest` coverage\",\n \"scope_files\": [\n \"tests/framework/db/mssql/QueryBuilderTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["tests/framework/db/mssql/QueryBuilderTest.php","tests/framework/db/mssql/SchemaTest.php"],"solution_diff":"diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\nindex 3d626dacd58..6624729524b 100644\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\n@@ -855,4 +855,159 @@ public static function buildFromDataProvider(): array\n \n return $data;\n }\n+\n+ public function testRenameTable(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameTable('old_table', 'new_table');\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\n+ }\n+\n+ public function testRenameColumn(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\n+ $this->assertSame(\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\", $sql);\n+ }\n+\n+ public function testSelectExists(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\n+ }\n+\n+ public function testCheckIntegrityEnableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityDisableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityFiltersOutViews(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true);\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\n+ $this->assertStringNotContainsString('animal_view', $sql);\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->resetSequence('non_existent_table');\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage(\"There is not sequence associated with table 'order_item'.\");\n+ $qb->resetSequence('order_item');\n+ }\n+\n+ /**\n+ * @dataProvider oldBuildOrderByAndLimitProvider\n+ */\n+ public function testOldBuildOrderByAndLimit(string $sql, array $orderBy, $limit, $offset, string $expected): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $method = new \\ReflectionMethod($qb, 'oldBuildOrderByAndLimit');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $this->assertSame($expected, $method->invoke($qb, $sql, $orderBy, $limit, $offset));\n+ }\n+\n+ public static function oldBuildOrderByAndLimitProvider(): array\n+ {\n+ return [\n+ 'limit and offset' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'limit only' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ 10,\n+ null,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\n+ ],\n+ 'offset only' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ null,\n+ 5,\n+ 'SELECT * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'with order by' => [\n+ 'SELECT [id] FROM [example]',\n+ ['id' => SORT_ASC],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY [id]), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'expression limit' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ new Expression('5+5'),\n+ null,\n+ 'SELECT TOP (5+5) * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\n+ ],\n+ 'distinct with limit and offset' => [\n+ 'SELECT DISTINCT [id] FROM [example]',\n+ [],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT DISTINCT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ ];\n+ }\n+\n+ public function testUpdateWithVarbinaryData(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $params = [];\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\n+ $this->assertSame([':qp0' => 1], $params);\n+ }\n+\n+ public function testCompositeInWithSubqueryThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $params = [];\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\n+ $this->expectException('yii\\base\\NotSupportedException');\n+ $qb->buildCondition($condition, $params);\n+ }\n+\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\n+ }\n+\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\n+ }\n }\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 8c409f99449..03e58a4fa6d 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -9,8 +9,10 @@\n namespace yiiunit\\framework\\db\\mssql;\n \n use yii\\base\\NotSupportedException;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n \n /**\n@@ -202,4 +204,177 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\n","summary":"Edited 2 file(s) in tests/framework/db/mssql/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"tests/framework/db/mssql/QueryBuilderTest.php\",\n \"tests/framework/db/mssql/SchemaTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\\nindex 3d626dacd58..6624729524b 100644\\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\\n@@ -855,4 +855,159 @@ public static function buildFromDataProvider(): array\\n \\n return $data;\\n }\\n+\\n+ public function testRenameTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->renameTable('old_table', 'new_table');\\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\\n+ }\\n+\\n+ public function testRenameColumn(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\\n+ $this->assertSame(\\\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\\\", $sql);\\n+ }\\n+\\n+ public function testSelectExists(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityEnableForTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityDisableForTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\\n+ }\\n+\\n+ public function testCheckIntegrityFiltersOutViews(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $sql = $qb->checkIntegrity(true);\\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\\n+ $this->assertStringNotContainsString('animal_view', $sql);\\n+ }\\n+\\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->resetSequence('non_existent_table');\\n+ }\\n+\\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage(\\\"There is not sequence associated with table 'order_item'.\\\");\\n+ $qb->resetSequence('order_item');\\n+ }\\n+\\n+ /**\\n+ * @dataProvider oldBuildOrderByAndLimitProvider\\n+ */\\n+ public function testOldBuildOrderByAndLimit(string $sql, array $orderBy, $limit, $offset, string $expected): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $method = new \\\\ReflectionMethod($qb, 'oldBuildOrderByAndLimit');\\n+ if (PHP_VERSION_ID < 80100) {\\n+ $method->setAccessible(true);\\n+ }\\n+ $this->assertSame($expected, $method->invoke($qb, $sql, $orderBy, $limit, $offset));\\n+ }\\n+\\n+ public static function oldBuildOrderByAndLimitProvider(): array\\n+ {\\n+ return [\\n+ 'limit and offset' => [\\n+ 'SELECT [id] FROM [example]',\\n+ [],\\n+ 10,\\n+ 5,\\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\\n+ ],\\n+ 'limit only' => [\\n+ 'SELECT [id] FROM [example]',\\n+ [],\\n+ 10,\\n+ null,\\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\\n+ ],\\n+ 'offset only' => [\\n+ 'SELECT [id] FROM [example]',\\n+ [],\\n+ null,\\n+ 5,\\n+ 'SELECT * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\\n+ ],\\n+ 'with order by' => [\\n+ 'SELECT [id] FROM [example]',\\n+ ['id' => SORT_ASC],\\n+ 10,\\n+ 5,\\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY [id]), [id] FROM [example]) sub WHERE rowNum > 5',\\n+ ],\\n+ 'expression limit' => [\\n+ 'SELECT [id] FROM [example]',\\n+ [],\\n+ new Expression('5+5'),\\n+ null,\\n+ 'SELECT TOP (5+5) * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\\n+ ],\\n+ 'distinct with limit and offset' => [\\n+ 'SELECT DISTINCT [id] FROM [example]',\\n+ [],\\n+ 10,\\n+ 5,\\n+ 'SELECT TOP 10 * FROM (SELECT DISTINCT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function testUpdateWithVarbinaryData(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $params = [];\\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\\n+ $this->assertSame([':qp0' => 1], $params);\\n+ }\\n+\\n+ public function testCompositeInWithSubqueryThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder();\\n+ $params = [];\\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\\n+ $this->expectException('yii\\\\base\\\\NotSupportedException');\\n+ $qb->buildCondition($condition, $params);\\n+ }\\n+\\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\\n+ }\\n+\\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\\n+ {\\n+ $qb = $this->getQueryBuilder(true, true);\\n+ $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\\n+ }\\n }\\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\\nindex 8c409f99449..03e58a4fa6d 100644\\n--- a/tests/framework/db/mssql/SchemaTest.php\\n+++ b/tests/framework/db/mssql/SchemaTest.php\\n@@ -9,8 +9,10 @@\\n namespace yiiunit\\\\framework\\\\db\\\\mssql;\\n \\n use yii\\\\base\\\\NotSupportedException;\\n+use yii\\\\db\\\\Constraint;\\n use yii\\\\db\\\\DefaultValueConstraint;\\n use yii\\\\db\\\\mssql\\\\Schema;\\n+use yii\\\\db\\\\mssql\\\\TableSchema;\\n use yiiunit\\\\framework\\\\db\\\\AnyValue;\\n \\n /**\\n@@ -202,4 +204,177 @@ public function testGetPrimaryKey(): void\\n \\n $this->assertEquals($selectResult['id'], $insertResult['id']);\\n }\\n+\\n+ public function testQuoteColumnNameWithBrackets(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableName(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableName');\\n+ if (PHP_VERSION_ID < 80100) {\\n+ $method->setAccessible(true);\\n+ }\\n+ $result = $method->invoke($schema, $name);\\n+ $this->assertSame($expectedCatalog, $result->catalogName);\\n+ $this->assertSame($expectedSchema, $result->schemaName);\\n+ $this->assertSame($expectedTable, $result->name);\\n+ $this->assertSame($expectedFullName, $result->fullName);\\n+ }\\n+\\n+ public static function resolveTableNameProvider(): array\\n+ {\\n+ return [\\n+ 'single part' => [\\n+ 'customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'two parts' => [\\n+ 'sales.customer',\\n+ null,\\n+ 'sales',\\n+ 'customer',\\n+ 'sales.customer',\\n+ ],\\n+ 'two parts default schema' => [\\n+ 'dbo.customer',\\n+ null,\\n+ 'dbo',\\n+ 'customer',\\n+ 'customer',\\n+ ],\\n+ 'three parts' => [\\n+ 'catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ 'four parts' => [\\n+ '[server1].catalog1.sales.customer',\\n+ 'catalog1',\\n+ 'sales',\\n+ 'customer',\\n+ 'catalog1.sales.customer',\\n+ ],\\n+ ];\\n+ }\\n+\\n+ public function testSavepointOperations(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\\\")->execute();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->createCommand(\\\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\\\")->execute();\\n+ $db->getSchema()->rollBackSavepoint('sp1');\\n+ $db->transaction->commit();\\n+\\n+ $afterCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\\\")->queryScalar();\\n+ $this->assertSame(0, $afterCount);\\n+ $beforeCount = (int)$db->createCommand(\\\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\\\")->queryScalar();\\n+ $this->assertSame(1, $beforeCount);\\n+\\n+ $db->createCommand(\\\"DELETE FROM [profile] WHERE [description] = 'sp_test'\\\")->execute();\\n+ }\\n+\\n+ public function testReleaseSavepointIsNoOp(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $db->beginTransaction();\\n+ $db->getSchema()->createSavepoint('sp1');\\n+ $db->getSchema()->releaseSavepoint('sp1');\\n+ $this->assertTrue($db->transaction->getIsActive());\\n+ $db->transaction->rollBack();\\n+ }\\n+\\n+ /**\\n+ * @dataProvider resolveTableNameProvider\\n+ */\\n+ public function testResolveTableNames(\\n+ string $name,\\n+ ?string $expectedCatalog,\\n+ string $expectedSchema,\\n+ string $expectedTable,\\n+ string $expectedFullName\\n+ ): void {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $table = new TableSchema();\\n+ $method = new \\\\ReflectionMethod($schema, 'resolveTableNames');\\n+ if (PHP_VERSION_ID < 80100) {\\n+ $method->setAccessible(true);\\n+ }\\n+ $method->invoke($schema, $table, $name);\\n+ $this->assertSame($expectedCatalog, $table->catalogName);\\n+ $this->assertSame($expectedSchema, $table->schemaName);\\n+ $this->assertSame($expectedTable, $table->name);\\n+ $this->assertSame($expectedFullName, $table->fullName);\\n+ }\\n+\\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\\n+ $this->assertNotEmpty($primaryKeys);\\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\\n+ }\\n+\\n+ public function testNullDefaultValueColumn(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $table = $schema->getTableSchema('null_values');\\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\\n+ }\\n+\\n+ public function testInsertWithCompositePrimaryKey(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $result = $db->getSchema()->insert('employee', [\\n+ 'id' => 100,\\n+ 'department_id' => 1,\\n+ 'first_name' => 'Test',\\n+ 'last_name' => 'User',\\n+ ]);\\n+ $this->assertSame('100', $result['id']);\\n+ $this->assertSame('1', $result['department_id']);\\n+\\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\\n+ }\\n+\\n+ public function testGetViewNamesWithDefaultSchema(): void\\n+ {\\n+ $schema = $this->getConnection(true, true)->getSchema();\\n+ $viewNames = $schema->getViewNames();\\n+ $this->assertContains('animal_view', $viewNames);\\n+ }\\n+\\n+ public function testFindUniqueIndexes(): void\\n+ {\\n+ $db = $this->getConnection(true, true);\\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\\n+ $this->assertNotEmpty($indexes);\\n+ }\\n+\\n+ public function testCreateColumnSchemaBuilder(): void\\n+ {\\n+ $schema = $this->getConnection()->getSchema();\\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\\n+ $this->assertInstanceOf('yii\\\\db\\\\mssql\\\\ColumnSchemaBuilder', $builder);\\n+ }\\n }\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/db/mssql/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"\ndiff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\nindex 3d626dacd58..6624729524b 100644\n--- a/tests/framework/db/mssql/QueryBuilderTest.php\n+++ b/tests/framework/db/mssql/QueryBuilderTest.php\n@@ -855,4 +855,159 @@ public static function buildFromDataProvider(): array\n \n return $data;\n }\n+\n+ public function testRenameTable(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameTable('old_table', 'new_table');\n+ $this->assertSame('sp_rename [old_table], [new_table]', $sql);\n+ }\n+\n+ public function testRenameColumn(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->renameColumn('test_table', 'old_col', 'new_col');\n+ $this->assertSame(\"sp_rename '[test_table].[old_col]', [new_col], 'COLUMN'\", $sql);\n+ }\n+\n+ public function testSelectExists(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $sql = $qb->selectExists('SELECT 1 FROM [customer]');\n+ $this->assertSame('SELECT CASE WHEN EXISTS(SELECT 1 FROM [customer]) THEN 1 ELSE 0 END', $sql);\n+ }\n+\n+ public function testCheckIntegrityEnableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] CHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityDisableForTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(false, '', 'customer');\n+ $this->assertSame('ALTER TABLE [dbo].[customer] NOCHECK CONSTRAINT ALL; ', $sql);\n+ }\n+\n+ public function testCheckIntegrityFiltersOutViews(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $sql = $qb->checkIntegrity(true);\n+ $this->assertStringContainsString('CHECK CONSTRAINT ALL', $sql);\n+ $this->assertStringContainsString('[dbo].[customer]', $sql);\n+ $this->assertStringNotContainsString('animal_view', $sql);\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForNonExistentTable(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->resetSequence('non_existent_table');\n+ }\n+\n+ public function testResetSequenceThrowsExceptionForTableWithoutSequence(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage(\"There is not sequence associated with table 'order_item'.\");\n+ $qb->resetSequence('order_item');\n+ }\n+\n+ /**\n+ * @dataProvider oldBuildOrderByAndLimitProvider\n+ */\n+ public function testOldBuildOrderByAndLimit(string $sql, array $orderBy, $limit, $offset, string $expected): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $method = new \\ReflectionMethod($qb, 'oldBuildOrderByAndLimit');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $this->assertSame($expected, $method->invoke($qb, $sql, $orderBy, $limit, $offset));\n+ }\n+\n+ public static function oldBuildOrderByAndLimitProvider(): array\n+ {\n+ return [\n+ 'limit and offset' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'limit only' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ 10,\n+ null,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\n+ ],\n+ 'offset only' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ null,\n+ 5,\n+ 'SELECT * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'with order by' => [\n+ 'SELECT [id] FROM [example]',\n+ ['id' => SORT_ASC],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY [id]), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ 'expression limit' => [\n+ 'SELECT [id] FROM [example]',\n+ [],\n+ new Expression('5+5'),\n+ null,\n+ 'SELECT TOP (5+5) * FROM (SELECT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub',\n+ ],\n+ 'distinct with limit and offset' => [\n+ 'SELECT DISTINCT [id] FROM [example]',\n+ [],\n+ 10,\n+ 5,\n+ 'SELECT TOP 10 * FROM (SELECT DISTINCT rowNum = ROW_NUMBER() over (ORDER BY (SELECT NULL)), [id] FROM [example]) sub WHERE rowNum > 5',\n+ ],\n+ ];\n+ }\n+\n+ public function testUpdateWithVarbinaryData(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $params = [];\n+ $sql = $qb->update('T_upsert_varbinary', ['blob_col' => 'test data'], ['id' => 1], $params);\n+ $this->assertStringContainsString('CONVERT(VARBINARY(MAX), 0x' . bin2hex('test data') . ')', $sql);\n+ $this->assertSame([':qp0' => 1], $params);\n+ }\n+\n+ public function testCompositeInWithSubqueryThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder();\n+ $params = [];\n+ $condition = ['in', ['id', 'name'], (new Query())->select(['id', 'name'])->from('users')];\n+ $this->expectException('yii\\base\\NotSupportedException');\n+ $qb->buildCondition($condition, $params);\n+ }\n+\n+ public function testAddCommentOnNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->addCommentOnColumn('non_existent_table', 'col', 'comment');\n+ }\n+\n+ public function testDropCommentFromNonExistentTableThrowsException(): void\n+ {\n+ $qb = $this->getQueryBuilder(true, true);\n+ $this->expectException('yii\\base\\InvalidArgumentException');\n+ $this->expectExceptionMessage('Table not found: non_existent_table');\n+ $qb->dropCommentFromColumn('non_existent_table', 'col');\n+ }\n }\ndiff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php\nindex 8c409f99449..03e58a4fa6d 100644\n--- a/tests/framework/db/mssql/SchemaTest.php\n+++ b/tests/framework/db/mssql/SchemaTest.php\n@@ -9,8 +9,10 @@\n namespace yiiunit\\framework\\db\\mssql;\n \n use yii\\base\\NotSupportedException;\n+use yii\\db\\Constraint;\n use yii\\db\\DefaultValueConstraint;\n use yii\\db\\mssql\\Schema;\n+use yii\\db\\mssql\\TableSchema;\n use yiiunit\\framework\\db\\AnyValue;\n \n /**\n@@ -202,4 +204,177 @@ public function testGetPrimaryKey(): void\n \n $this->assertEquals($selectResult['id'], $insertResult['id']);\n }\n+\n+ public function testQuoteColumnNameWithBrackets(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $this->assertSame('[already_quoted]', $schema->quoteColumnName('[already_quoted]'));\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableName(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableName');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $result = $method->invoke($schema, $name);\n+ $this->assertSame($expectedCatalog, $result->catalogName);\n+ $this->assertSame($expectedSchema, $result->schemaName);\n+ $this->assertSame($expectedTable, $result->name);\n+ $this->assertSame($expectedFullName, $result->fullName);\n+ }\n+\n+ public static function resolveTableNameProvider(): array\n+ {\n+ return [\n+ 'single part' => [\n+ 'customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'two parts' => [\n+ 'sales.customer',\n+ null,\n+ 'sales',\n+ 'customer',\n+ 'sales.customer',\n+ ],\n+ 'two parts default schema' => [\n+ 'dbo.customer',\n+ null,\n+ 'dbo',\n+ 'customer',\n+ 'customer',\n+ ],\n+ 'three parts' => [\n+ 'catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ 'four parts' => [\n+ '[server1].catalog1.sales.customer',\n+ 'catalog1',\n+ 'sales',\n+ 'customer',\n+ 'catalog1.sales.customer',\n+ ],\n+ ];\n+ }\n+\n+ public function testSavepointOperations(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test')\")->execute();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->createCommand(\"INSERT INTO [profile] ([description]) VALUES ('sp_test_after')\")->execute();\n+ $db->getSchema()->rollBackSavepoint('sp1');\n+ $db->transaction->commit();\n+\n+ $afterCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test_after'\")->queryScalar();\n+ $this->assertSame(0, $afterCount);\n+ $beforeCount = (int)$db->createCommand(\"SELECT COUNT(*) FROM [profile] WHERE [description] = 'sp_test'\")->queryScalar();\n+ $this->assertSame(1, $beforeCount);\n+\n+ $db->createCommand(\"DELETE FROM [profile] WHERE [description] = 'sp_test'\")->execute();\n+ }\n+\n+ public function testReleaseSavepointIsNoOp(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $db->beginTransaction();\n+ $db->getSchema()->createSavepoint('sp1');\n+ $db->getSchema()->releaseSavepoint('sp1');\n+ $this->assertTrue($db->transaction->getIsActive());\n+ $db->transaction->rollBack();\n+ }\n+\n+ /**\n+ * @dataProvider resolveTableNameProvider\n+ */\n+ public function testResolveTableNames(\n+ string $name,\n+ ?string $expectedCatalog,\n+ string $expectedSchema,\n+ string $expectedTable,\n+ string $expectedFullName\n+ ): void {\n+ $schema = $this->getConnection()->getSchema();\n+ $table = new TableSchema();\n+ $method = new \\ReflectionMethod($schema, 'resolveTableNames');\n+ if (PHP_VERSION_ID < 80100) {\n+ $method->setAccessible(true);\n+ }\n+ $method->invoke($schema, $table, $name);\n+ $this->assertSame($expectedCatalog, $table->catalogName);\n+ $this->assertSame($expectedSchema, $table->schemaName);\n+ $this->assertSame($expectedTable, $table->name);\n+ $this->assertSame($expectedFullName, $table->fullName);\n+ }\n+\n+ public function testGetSchemaPrimaryKeysWithExplicitSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $primaryKeys = $schema->getSchemaPrimaryKeys('dbo');\n+ $this->assertNotEmpty($primaryKeys);\n+ $this->assertContainsOnlyInstancesOf(Constraint::class, $primaryKeys);\n+ }\n+\n+ public function testNullDefaultValueColumn(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $table = $schema->getTableSchema('null_values');\n+ $this->assertNull($table->getColumn('var3')->defaultValue);\n+ $this->assertNull($table->getColumn('stringcol')->defaultValue);\n+ }\n+\n+ public function testInsertWithCompositePrimaryKey(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $result = $db->getSchema()->insert('employee', [\n+ 'id' => 100,\n+ 'department_id' => 1,\n+ 'first_name' => 'Test',\n+ 'last_name' => 'User',\n+ ]);\n+ $this->assertSame('100', $result['id']);\n+ $this->assertSame('1', $result['department_id']);\n+\n+ $db->createCommand('DELETE FROM [employee] WHERE [id] = 100 AND [department_id] = 1')->execute();\n+ }\n+\n+ public function testGetViewNamesWithDefaultSchema(): void\n+ {\n+ $schema = $this->getConnection(true, true)->getSchema();\n+ $viewNames = $schema->getViewNames();\n+ $this->assertContains('animal_view', $viewNames);\n+ }\n+\n+ public function testFindUniqueIndexes(): void\n+ {\n+ $db = $this->getConnection(true, true);\n+ $table = $db->getSchema()->getTableSchema('T_upsert');\n+ $indexes = $db->getSchema()->findUniqueIndexes($table);\n+ $this->assertNotEmpty($indexes);\n+ }\n+\n+ public function testCreateColumnSchemaBuilder(): void\n+ {\n+ $schema = $this->getConnection()->getSchema();\n+ $builder = $schema->createColumnSchemaBuilder('string', 255);\n+ $this->assertInstanceOf('yii\\db\\mssql\\ColumnSchemaBuilder', $builder);\n+ }\n }\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34270,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20872"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20872,"string":"20,872"},"base_sha":{"kind":"string","value":"8d024ec5bed740af370f93782a75c1241d382f5b"},"head_sha":{"kind":"string","value":"3e46c59446d107631c900122ef33ed6a2c6a3030"},"task":{"kind":"string","value":"Analyze more tests using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan","scope_files":["phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `tests/framework/base/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/base/ComponentTest.php","tests/framework/base/ModelTest.php"]},{"subtask_id":"s3","goal":"Implement the changes under `tests/framework/base/stubs/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/base/stubs/AnonymousComponentClass.php","tests/framework/base/stubs/AnonymousModelClass.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/mail/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/mail/BaseMailerTest.php","tests/framework/mail/BaseMessageTest.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/mail/stubs/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/mail/stubs/TestMailer.php","tests/framework/mail/stubs/TestMessage.php","tests/framework/mail/stubs/TestMessageWithException.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/framework/rbac/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/rbac/DbManagerTestCase.php","tests/framework/rbac/ManagerTestCase.php","tests/framework/rbac/PhpManagerTest.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/rest/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/rest/IndexActionTest.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/test/` needed for: Analyze more tests using PHPStan","scope_files":["tests/framework/test/ActiveFixtureTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `tests/framework/base/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/ModelTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `tests/framework/base/stubs/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/base/stubs/AnonymousComponentClass.php\",\n \"tests/framework/base/stubs/AnonymousModelClass.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/mail/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/mail/BaseMailerTest.php\",\n \"tests/framework/mail/BaseMessageTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/mail/stubs/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/mail/stubs/TestMailer.php\",\n \"tests/framework/mail/stubs/TestMessage.php\",\n \"tests/framework/mail/stubs/TestMessageWithException.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/framework/rbac/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/rbac/DbManagerTestCase.php\",\n \"tests/framework/rbac/ManagerTestCase.php\",\n \"tests/framework/rbac/PhpManagerTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/rest/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/rest/IndexActionTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/test/` needed for: Analyze more tests using PHPStan\",\n \"scope_files\": [\n \"tests/framework/test/ActiveFixtureTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4f6666327d7..20abc47d15b 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -13,25 +13,14 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n- - tests/framework/base/stub\n- - tests/framework/console/stubs\n- - tests/framework/di/stubs\n- - tests/framework/filters/stubs\n- - tests/framework/web/mocks\n- - tests/framework/web/stubs\n+ - tests/framework/*/stubs/*\n+ - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n - tests/framework/grid\n - tests/framework/helpers\n - tests/framework/i18n\n - tests/framework/log\n- - tests/framework/mail\n- - tests/framework/models\n- - tests/framework/mutex\n- - tests/framework/rbac\n- - tests/framework/requirements\n- - tests/framework/rest\n- - tests/framework/test\n - tests/framework/validators\n \n bootstrapFiles:\n\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["tests/framework/base/ComponentTest.php","tests/framework/base/ModelTest.php"],"solution_diff":"diff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex a63aa5da36b..5b2f5750b03 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -507,7 +507,7 @@ public function testDetachNotAttachedHandler(): void\n */\n public function testEventClosureDetachesItself(): void\n {\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\n \n $obj->trigger('barEventOnce');\n $this->assertEquals(1, $obj->foo);\ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\nindex ac5e44fb36e..aedc19b32ed 100644\n--- a/tests/framework/base/ModelTest.php\n+++ b/tests/framework/base/ModelTest.php\n@@ -508,7 +508,7 @@ public function testValidateAttributeNames(): void\n \n public function testFormNameWithAnonymousClass(): void\n {\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\n \n $this->expectException('yii\\base\\InvalidConfigException');\n $this->expectExceptionMessage('The \"formName()\" method should be explicitly defined for anonymous models');\n","summary":"Edited 2 file(s) in tests/framework/base/"},{"subtask_id":"s3","scope_files":["tests/framework/base/stubs/AnonymousComponentClass.php","tests/framework/base/stubs/AnonymousModelClass.php"],"solution_diff":"diff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousComponentClass.php\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousModelClass.php\nrename to tests/framework/base/stubs/AnonymousModelClass.php\n","summary":"Edited 2 file(s) in tests/framework/base/stubs/"},{"subtask_id":"s4","scope_files":["tests/framework/mail/BaseMailerTest.php","tests/framework/mail/BaseMessageTest.php"],"solution_diff":"diff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\nindex f45da7e2dbc..10ae1062b6c 100644\n--- a/tests/framework/mail/BaseMailerTest.php\n+++ b/tests/framework/mail/BaseMailerTest.php\n@@ -11,8 +11,8 @@\n use Yii;\n use yii\\base\\View;\n use yii\\helpers\\FileHelper;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n use yiiunit\\TestCase;\n \n /**\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestMailComponent()\n {\n- $component = new Mailer();\n+ $component = new TestMailer();\n $component->viewPath = $this->getTestFilePath();\n \n return $component;\n }\n \n /**\n- * @return Mailer mailer instance\n+ * @return TestMailer mailer instance\n */\n protected function getTestMailComponent()\n {\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\n \n public function testSetupView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $view = new View();\n $mailer->setView($view);\n@@ -95,14 +95,14 @@ public function testSetupView(): void\n */\n public function testGetDefaultView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $view = $mailer->getView();\n $this->assertIsObject($view, 'Unable to get default view!');\n }\n \n public function testCreateMessage(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $message = $mailer->compose();\n $this->assertIsObject($message, 'Unable to create message instance!');\n $this->assertEquals($mailer->messageClass, get_class($message), 'Invalid message class!');\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\n */\n public function testDefaultMessageConfig(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $notPropertyConfig = [\n 'charset' => 'utf-16',\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\n $messageConfig = array_merge($notPropertyConfig, $propertyConfig);\n $mailer->messageConfig = $messageConfig;\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n \n foreach ($notPropertyConfig as $name => $value) {\n@@ -204,6 +205,7 @@ public function testCompose(): void\n $textViewFileContent = 'Plain text view file content';\n file_put_contents($textViewFileName, $textViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n 'text' => $textViewName,\n@@ -211,6 +213,7 @@ public function testCompose(): void\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose($htmlViewName);\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\n@@ -268,6 +271,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n ]);\n@@ -277,7 +281,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\n \n public function testUseFileTransport(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $this->assertFalse($mailer->useFileTransport);\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\n \n@@ -299,11 +303,9 @@ public function testUseFileTransport(): void\n \n public function testBeforeSendEvent(): void\n {\n- $message = new Message();\n-\n- /** @var Mailer $mailerMock */\n+ $message = new TestMessage();\n $mailerMock = $this->createPartialMock(\n- Mailer::class,\n+ TestMailer::class,\n [\n 'afterSend',\n 'beforeSend',\n@@ -316,160 +318,3 @@ public function testBeforeSendEvent(): void\n $mailerMock->send($message);\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class Mailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\Message';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n-\n- return true;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class Message extends BaseMessage\n-{\n- public $id;\n- public $encoding;\n- public $_charset;\n- public $_from;\n- public $_replyTo;\n- public $_to;\n- public $_cc;\n- public $_bcc;\n- public $_subject;\n- public $_textBody;\n- public $_htmlBody;\n-\n- public function getCharset()\n- {\n- return $this->_charset;\n- }\n-\n- public function setCharset($charset)\n- {\n- $this->_charset = $charset;\n-\n- return $this;\n- }\n-\n- public function getFrom()\n- {\n- return $this->_from;\n- }\n-\n- public function setFrom($from)\n- {\n- $this->_from = $from;\n-\n- return $this;\n- }\n-\n- public function getTo()\n- {\n- return $this->_to;\n- }\n-\n- public function setTo($to)\n- {\n- $this->_to = $to;\n-\n- return $this;\n- }\n-\n- public function getCc()\n- {\n- return $this->_cc;\n- }\n-\n- public function setCc($cc)\n- {\n- $this->_cc = $cc;\n-\n- return $this;\n- }\n-\n- public function getBcc()\n- {\n- return $this->_bcc;\n- }\n-\n- public function setBcc($bcc)\n- {\n- $this->_bcc = $bcc;\n-\n- return $this;\n- }\n-\n- public function getSubject()\n- {\n- return $this->_subject;\n- }\n-\n- public function setSubject($subject)\n- {\n- $this->_subject = $subject;\n-\n- return $this;\n- }\n-\n- public function getReplyTo()\n- {\n- return $this->_replyTo;\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- $this->_replyTo = $replyTo;\n-\n- return $this;\n- }\n-\n- public function setTextBody($text)\n- {\n- $this->_textBody = $text;\n-\n- return $this;\n- }\n-\n- public function setHtmlBody($html)\n- {\n- $this->_htmlBody = $html;\n-\n- return $this;\n- }\n-\n- public function attachContent($content, array $options = [])\n- {\n- }\n-\n- public function attach($fileName, array $options = [])\n- {\n- }\n-\n- public function embed($fileName, array $options = [])\n- {\n- }\n-\n- public function embedContent($content, array $options = [])\n- {\n- }\n-\n- public function toString()\n- {\n- $mailer = $this->mailer;\n- $this->mailer = null;\n- $s = var_export($this, true);\n- $this->mailer = $mailer;\n- return $s;\n- }\n-}\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\nindex f6e70787a6e..413e443c528 100644\n--- a/tests/framework/mail/BaseMessageTest.php\n+++ b/tests/framework/mail/BaseMessageTest.php\n@@ -10,8 +10,9 @@\n \n use Exception;\n use Yii;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMessageWithException;\n use yiiunit\\TestCase;\n \n /**\n@@ -29,7 +30,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestEmailComponent()\n {\n@@ -59,6 +60,7 @@ public function testSend(): void\n public function testToString(): void\n {\n $mailer = $this->getMailer();\n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n $this->assertEquals($message->toString(), '' . $message);\n }\n@@ -111,128 +113,3 @@ function ($severity, $message, $file, $line) use (&$errorTriggered, &$errorMessa\n $this->assertSame('', $result, 'Result should be an empty string');\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class TestMailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\TestMessage';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class TestMessage extends BaseMessage\n-{\n- public $text;\n- public $html;\n-\n- public function getCharset()\n- {\n- return '';\n- }\n-\n- public function setCharset($charset)\n- {\n- }\n-\n- public function getFrom()\n- {\n- return '';\n- }\n-\n- public function setFrom($from)\n- {\n- }\n-\n- public function getReplyTo()\n- {\n- return '';\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- }\n-\n- public function getTo()\n- {\n- return '';\n- }\n-\n- public function setTo($to)\n- {\n- }\n-\n- public function getCc()\n- {\n- return '';\n- }\n-\n- public function setCc($cc)\n- {\n- }\n-\n- public function getBcc()\n- {\n- return '';\n- }\n-\n- public function setBcc($bcc)\n- {\n- }\n-\n- public function getSubject()\n- {\n- return '';\n- }\n-\n- public function setSubject($subject)\n- {\n- }\n-\n- public function setTextBody($text): void\n- {\n- $this->text = $text;\n- }\n-\n- public function setHtmlBody($html): void\n- {\n- $this->html = $html;\n- }\n-\n- public function attachContent($content, array $options = [])\n- {\n- }\n-\n- public function attach($fileName, array $options = [])\n- {\n- }\n-\n- public function embed($fileName, array $options = [])\n- {\n- }\n-\n- public function embedContent($content, array $options = [])\n- {\n- }\n-\n- public function toString()\n- {\n- return get_class($this);\n- }\n-}\n-\n-class TestMessageWithException extends TestMessage\n-{\n- public function toString()\n- {\n- throw new Exception('Test exception in toString.');\n- }\n-}\n","summary":"Edited 2 file(s) in tests/framework/mail/"},{"subtask_id":"s5","scope_files":["tests/framework/mail/stubs/TestMailer.php","tests/framework/mail/stubs/TestMessage.php","tests/framework/mail/stubs/TestMessageWithException.php"],"solution_diff":"diff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\nnew file mode 100644\nindex 00000000000..4e8a1e92403\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMailer.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMailer;\n+\n+/**\n+ * Test Mailer class.\n+ */\n+class TestMailer extends BaseMailer\n+{\n+ public $messageClass = TestMessage::class;\n+ public $sentMessages = [];\n+\n+ protected function sendMessage($message)\n+ {\n+ $this->sentMessages[] = $message;\n+\n+ return true;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\nnew file mode 100644\nindex 00000000000..34e469045ee\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessage.php\n@@ -0,0 +1,152 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMessage;\n+\n+/**\n+ * Test Message class.\n+ */\n+class TestMessage extends BaseMessage\n+{\n+ public $id;\n+ public $encoding;\n+ public $_charset;\n+ public $_from;\n+ public $_replyTo;\n+ public $_to;\n+ public $_cc;\n+ public $_bcc;\n+ public $_subject;\n+ public $_textBody;\n+ public $_htmlBody;\n+\n+ public function getCharset()\n+ {\n+ return $this->_charset;\n+ }\n+\n+ public function setCharset($charset)\n+ {\n+ $this->_charset = $charset;\n+\n+ return $this;\n+ }\n+\n+ public function getFrom()\n+ {\n+ return $this->_from;\n+ }\n+\n+ public function setFrom($from)\n+ {\n+ $this->_from = $from;\n+\n+ return $this;\n+ }\n+\n+ public function getTo()\n+ {\n+ return $this->_to;\n+ }\n+\n+ public function setTo($to)\n+ {\n+ $this->_to = $to;\n+\n+ return $this;\n+ }\n+\n+ public function getCc()\n+ {\n+ return $this->_cc;\n+ }\n+\n+ public function setCc($cc)\n+ {\n+ $this->_cc = $cc;\n+\n+ return $this;\n+ }\n+\n+ public function getBcc()\n+ {\n+ return $this->_bcc;\n+ }\n+\n+ public function setBcc($bcc)\n+ {\n+ $this->_bcc = $bcc;\n+\n+ return $this;\n+ }\n+\n+ public function getSubject()\n+ {\n+ return $this->_subject;\n+ }\n+\n+ public function setSubject($subject)\n+ {\n+ $this->_subject = $subject;\n+\n+ return $this;\n+ }\n+\n+ public function getReplyTo()\n+ {\n+ return $this->_replyTo;\n+ }\n+\n+ public function setReplyTo($replyTo)\n+ {\n+ $this->_replyTo = $replyTo;\n+\n+ return $this;\n+ }\n+\n+ public function setTextBody($text)\n+ {\n+ $this->_textBody = $text;\n+\n+ return $this;\n+ }\n+\n+ public function setHtmlBody($html)\n+ {\n+ $this->_htmlBody = $html;\n+\n+ return $this;\n+ }\n+\n+ public function attachContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function attach($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embed($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embedContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function toString()\n+ {\n+ $mailer = $this->mailer;\n+ $this->mailer = null;\n+ $s = var_export($this, true);\n+ $this->mailer = $mailer;\n+ return $s;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\nnew file mode 100644\nindex 00000000000..60903c687f8\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\n@@ -0,0 +1,19 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use Exception;\n+\n+class TestMessageWithException extends TestMessage\n+{\n+ public function toString()\n+ {\n+ throw new Exception('Test exception in toString.');\n+ }\n+}\n","summary":"Edited 3 file(s) in tests/framework/mail/stubs/"},{"subtask_id":"s6","scope_files":["tests/framework/rbac/DbManagerTestCase.php","tests/framework/rbac/ManagerTestCase.php","tests/framework/rbac/PhpManagerTest.php"],"solution_diff":"diff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\nindex c43d5f95140..e22a0ab7d54 100644\n--- a/tests/framework/rbac/DbManagerTestCase.php\n+++ b/tests/framework/rbac/DbManagerTestCase.php\n@@ -30,6 +30,7 @@\n * DbManagerTestCase.\n * @group db\n * @group rbac\n+ * @extends ManagerTestCase<DbManager>\n */\n abstract class DbManagerTestCase extends ManagerTestCase\n {\n@@ -37,7 +38,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\n protected static $driverName;\n \n /**\n- * @var Connection\n+ * @var Connection|null\n */\n protected $db;\n \n@@ -50,7 +51,7 @@ public function testGetAssignmentsByRole(): void\n $this->auth = $this->createManager();\n \n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\n- $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\n+ $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'));\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\n }\n@@ -158,9 +159,6 @@ public static function createConnection()\n return $db;\n }\n \n- /**\n- * @return ManagerInterface\n- */\n protected function createManager()\n {\n return new DbManager(['db' => $this->getConnection(), 'defaultRoles' => ['myDefaultRole']]);\ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\nindex ed21fcb8484..35c11fb5e8b 100644\n--- a/tests/framework/rbac/ManagerTestCase.php\n+++ b/tests/framework/rbac/ManagerTestCase.php\n@@ -10,7 +10,6 @@\n \n use Yii;\n use InvalidArgumentException;\n-use yii\\rbac\\ManagerInterface;\n use yii\\rbac\\BaseManager;\n use yii\\rbac\\Item;\n use yii\\rbac\\Permission;\n@@ -19,16 +18,18 @@\n \n /**\n * ManagerTestCase.\n+ *\n+ * @template TManager of BaseManager\n */\n abstract class ManagerTestCase extends TestCase\n {\n /**\n- * @var ManagerInterface|BaseManager\n+ * @var TManager\n */\n protected $auth;\n \n /**\n- * @return ManagerInterface\n+ * @return TManager\n */\n abstract protected function createManager();\n \n@@ -97,6 +98,7 @@ public function testAddRule(): void\n $this->auth->add($rule);\n \n $rule = $this->auth->getRule($ruleName);\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertEquals($ruleName, $rule->name);\n $this->assertTrue($rule->reallyReally);\n }\n@@ -106,6 +108,7 @@ public function testUpdateRule(): void\n $this->prepareData();\n \n $rule = $this->auth->getRule('isAuthor');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $rule->name = 'newName';\n $rule->reallyReally = false;\n $this->auth->update('isAuthor', $rule);\n@@ -114,6 +117,7 @@ public function testUpdateRule(): void\n $this->assertNull($rule);\n \n $rule = $this->auth->getRule('newName');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertEquals('newName', $rule->name);\n $this->assertFalse($rule->reallyReally);\n \n@@ -121,6 +125,7 @@ public function testUpdateRule(): void\n $this->auth->update('newName', $rule);\n \n $rule = $this->auth->getRule('newName');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertTrue($rule->reallyReally);\n \n $item = $this->auth->getPermission('createPost');\n@@ -416,7 +421,7 @@ public function testGetAssignmentsByRole(): void\n $this->auth = $this->createManager();\n \n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\n- $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\n+ $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'));\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\n }\n@@ -632,6 +637,7 @@ public function testDefaultRolesWithClosureReturningNonArrayValue(): void\n {\n $this->expectException('yii\\base\\InvalidValueException');\n $this->expectExceptionMessage('Default roles closure must return an array');\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $this->auth->defaultRoles = function () {\n return 'test';\n };\n@@ -641,6 +647,7 @@ public function testDefaultRolesWithNonArrayValue(): void\n {\n $this->expectException('yii\\base\\InvalidArgumentException');\n $this->expectExceptionMessage('Default roles must be either an array or a callable');\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $this->auth->defaultRoles = 'test';\n }\n }\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\nindex 99274307eab..3e0372095d7 100644\n--- a/tests/framework/rbac/PhpManagerTest.php\n+++ b/tests/framework/rbac/PhpManagerTest.php\n@@ -33,7 +33,7 @@ function time()\n \n /**\n * @group rbac\n- * @property ExposedPhpManager $auth\n+ * @extends ManagerTestCase<ExposedPhpManager>\n */\n class PhpManagerTest extends ManagerTestCase\n {\n","summary":"Edited 3 file(s) in tests/framework/rbac/"},{"subtask_id":"s7","scope_files":["tests/framework/rest/IndexActionTest.php"],"solution_diff":"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex e56f37cf827..555e9c94e3f 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n $pagination,\n","summary":"Edited 1 file(s) in tests/framework/rest/"},{"subtask_id":"s8","scope_files":["tests/framework/test/ActiveFixtureTest.php"],"solution_diff":"diff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\nindex b1b72c88a01..d75d8454eb7 100644\n--- a/tests/framework/test/ActiveFixtureTest.php\n+++ b/tests/framework/test/ActiveFixtureTest.php\n@@ -43,7 +43,7 @@ public function testGetData(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(CustomerFixture::class, get_class($fixture));\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n $this->assertCount(2, $fixture);\n $this->assertEquals(1, $fixture['customer1']['id']);\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\n@@ -62,13 +62,18 @@ public function testGetModel(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(Customer::class, get_class($fixture->getModel('customer1')));\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n+\n+ $customer1 = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer1);\n+ $this->assertEquals(1, $customer1->id);\n+ $this->assertEquals('customer1@example.com', $customer1->email);\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\n \n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+ $this->assertEquals(2, $customer2->id);\n+ $this->assertEquals('customer2@example.com', $customer2->email);\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\n \n $test->tearDown();\n@@ -80,8 +85,10 @@ public function testDataDirectory(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(Customer::class, $directory);\n $this->assertEquals(1, $directory->id);\n $this->assertEquals('directory@example.com', $directory['email']);\n $test->tearDown();\n@@ -93,8 +100,10 @@ public function testDataPath(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer);\n $this->assertEquals(1, $customer->id);\n $this->assertEquals('customer1@example.com', $customer['email']);\n $test->tearDown();\n@@ -106,6 +115,7 @@ public function testTruncate(): void\n \n $test->setUp();\n $fixture = $test->getFixture('animals');\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\n $this->assertEmpty($fixture->data);\n $test->tearDown();\n }\n","summary":"Edited 1 file(s) in tests/framework/test/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 4f6666327d7..20abc47d15b 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -13,25 +13,14 @@ parameters:\\n excludePaths:\\n analyse:\\n - tests/data\\n- - tests/framework/base/stub\\n- - tests/framework/console/stubs\\n- - tests/framework/di/stubs\\n- - tests/framework/filters/stubs\\n- - tests/framework/web/mocks\\n- - tests/framework/web/stubs\\n+ - tests/framework/*/stubs/*\\n+ - tests/framework/*/mocks/*\\n # TODO: Analyze these directories\\n - tests/framework/db\\n - tests/framework/grid\\n - tests/framework/helpers\\n - tests/framework/i18n\\n - tests/framework/log\\n- - tests/framework/mail\\n- - tests/framework/models\\n- - tests/framework/mutex\\n- - tests/framework/rbac\\n- - tests/framework/requirements\\n- - tests/framework/rest\\n- - tests/framework/test\\n - tests/framework/validators\\n \\n bootstrapFiles:\\n\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"tests/framework/base/ComponentTest.php\",\n \"tests/framework/base/ModelTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\\nindex a63aa5da36b..5b2f5750b03 100644\\n--- a/tests/framework/base/ComponentTest.php\\n+++ b/tests/framework/base/ComponentTest.php\\n@@ -507,7 +507,7 @@ public function testDetachNotAttachedHandler(): void\\n */\\n public function testEventClosureDetachesItself(): void\\n {\\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\\n \\n $obj->trigger('barEventOnce');\\n $this->assertEquals(1, $obj->foo);\\ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\\nindex ac5e44fb36e..aedc19b32ed 100644\\n--- a/tests/framework/base/ModelTest.php\\n+++ b/tests/framework/base/ModelTest.php\\n@@ -508,7 +508,7 @@ public function testValidateAttributeNames(): void\\n \\n public function testFormNameWithAnonymousClass(): void\\n {\\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\\n \\n $this->expectException('yii\\\\base\\\\InvalidConfigException');\\n $this->expectExceptionMessage('The \\\"formName()\\\" method should be explicitly defined for anonymous models');\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/base/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"tests/framework/base/stubs/AnonymousComponentClass.php\",\n \"tests/framework/base/stubs/AnonymousModelClass.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\\nsimilarity index 100%\\nrename from tests/framework/base/stub/AnonymousComponentClass.php\\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\\nsimilarity index 100%\\nrename from tests/framework/base/stub/AnonymousModelClass.php\\nrename to tests/framework/base/stubs/AnonymousModelClass.php\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/base/stubs/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/mail/BaseMailerTest.php\",\n \"tests/framework/mail/BaseMessageTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\\nindex f45da7e2dbc..10ae1062b6c 100644\\n--- a/tests/framework/mail/BaseMailerTest.php\\n+++ b/tests/framework/mail/BaseMailerTest.php\\n@@ -11,8 +11,8 @@\\n use Yii;\\n use yii\\\\base\\\\View;\\n use yii\\\\helpers\\\\FileHelper;\\n-use yii\\\\mail\\\\BaseMailer;\\n-use yii\\\\mail\\\\BaseMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMailer;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessage;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\\n }\\n \\n /**\\n- * @return Mailer test email component instance.\\n+ * @return TestMailer test email component instance.\\n */\\n protected function createTestMailComponent()\\n {\\n- $component = new Mailer();\\n+ $component = new TestMailer();\\n $component->viewPath = $this->getTestFilePath();\\n \\n return $component;\\n }\\n \\n /**\\n- * @return Mailer mailer instance\\n+ * @return TestMailer mailer instance\\n */\\n protected function getTestMailComponent()\\n {\\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\\n \\n public function testSetupView(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n \\n $view = new View();\\n $mailer->setView($view);\\n@@ -95,14 +95,14 @@ public function testSetupView(): void\\n */\\n public function testGetDefaultView(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $view = $mailer->getView();\\n $this->assertIsObject($view, 'Unable to get default view!');\\n }\\n \\n public function testCreateMessage(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $message = $mailer->compose();\\n $this->assertIsObject($message, 'Unable to create message instance!');\\n $this->assertEquals($mailer->messageClass, get_class($message), 'Invalid message class!');\\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\\n */\\n public function testDefaultMessageConfig(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n \\n $notPropertyConfig = [\\n 'charset' => 'utf-16',\\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\\n $messageConfig = array_merge($notPropertyConfig, $propertyConfig);\\n $mailer->messageConfig = $messageConfig;\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose();\\n \\n foreach ($notPropertyConfig as $name => $value) {\\n@@ -204,6 +205,7 @@ public function testCompose(): void\\n $textViewFileContent = 'Plain text view file content';\\n file_put_contents($textViewFileName, $textViewFileContent);\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose([\\n 'html' => $htmlViewName,\\n 'text' => $textViewName,\\n@@ -211,6 +213,7 @@ public function testCompose(): void\\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose($htmlViewName);\\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\\n@@ -268,6 +271,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\\n \\n+ /** @var TestMessage $message */\\n $message = $mailer->compose([\\n 'html' => $htmlViewName,\\n ]);\\n@@ -277,7 +281,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\\n \\n public function testUseFileTransport(): void\\n {\\n- $mailer = new Mailer();\\n+ $mailer = new TestMailer();\\n $this->assertFalse($mailer->useFileTransport);\\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\\n \\n@@ -299,11 +303,9 @@ public function testUseFileTransport(): void\\n \\n public function testBeforeSendEvent(): void\\n {\\n- $message = new Message();\\n-\\n- /** @var Mailer $mailerMock */\\n+ $message = new TestMessage();\\n $mailerMock = $this->createPartialMock(\\n- Mailer::class,\\n+ TestMailer::class,\\n [\\n 'afterSend',\\n 'beforeSend',\\n@@ -316,160 +318,3 @@ public function testBeforeSendEvent(): void\\n $mailerMock->send($message);\\n }\\n }\\n-\\n-/**\\n- * Test Mailer class.\\n- */\\n-class Mailer extends BaseMailer\\n-{\\n- public $messageClass = 'yiiunit\\\\framework\\\\mail\\\\Message';\\n- public $sentMessages = [];\\n-\\n- protected function sendMessage($message)\\n- {\\n- $this->sentMessages[] = $message;\\n-\\n- return true;\\n- }\\n-}\\n-\\n-/**\\n- * Test Message class.\\n- */\\n-class Message extends BaseMessage\\n-{\\n- public $id;\\n- public $encoding;\\n- public $_charset;\\n- public $_from;\\n- public $_replyTo;\\n- public $_to;\\n- public $_cc;\\n- public $_bcc;\\n- public $_subject;\\n- public $_textBody;\\n- public $_htmlBody;\\n-\\n- public function getCharset()\\n- {\\n- return $this->_charset;\\n- }\\n-\\n- public function setCharset($charset)\\n- {\\n- $this->_charset = $charset;\\n-\\n- return $this;\\n- }\\n-\\n- public function getFrom()\\n- {\\n- return $this->_from;\\n- }\\n-\\n- public function setFrom($from)\\n- {\\n- $this->_from = $from;\\n-\\n- return $this;\\n- }\\n-\\n- public function getTo()\\n- {\\n- return $this->_to;\\n- }\\n-\\n- public function setTo($to)\\n- {\\n- $this->_to = $to;\\n-\\n- return $this;\\n- }\\n-\\n- public function getCc()\\n- {\\n- return $this->_cc;\\n- }\\n-\\n- public function setCc($cc)\\n- {\\n- $this->_cc = $cc;\\n-\\n- return $this;\\n- }\\n-\\n- public function getBcc()\\n- {\\n- return $this->_bcc;\\n- }\\n-\\n- public function setBcc($bcc)\\n- {\\n- $this->_bcc = $bcc;\\n-\\n- return $this;\\n- }\\n-\\n- public function getSubject()\\n- {\\n- return $this->_subject;\\n- }\\n-\\n- public function setSubject($subject)\\n- {\\n- $this->_subject = $subject;\\n-\\n- return $this;\\n- }\\n-\\n- public function getReplyTo()\\n- {\\n- return $this->_replyTo;\\n- }\\n-\\n- public function setReplyTo($replyTo)\\n- {\\n- $this->_replyTo = $replyTo;\\n-\\n- return $this;\\n- }\\n-\\n- public function setTextBody($text)\\n- {\\n- $this->_textBody = $text;\\n-\\n- return $this;\\n- }\\n-\\n- public function setHtmlBody($html)\\n- {\\n- $this->_htmlBody = $html;\\n-\\n- return $this;\\n- }\\n-\\n- public function attachContent($content, array $options = [])\\n- {\\n- }\\n-\\n- public function attach($fileName, array $options = [])\\n- {\\n- }\\n-\\n- public function embed($fileName, array $options = [])\\n- {\\n- }\\n-\\n- public function embedContent($content, array $options = [])\\n- {\\n- }\\n-\\n- public function toString()\\n- {\\n- $mailer = $this->mailer;\\n- $this->mailer = null;\\n- $s = var_export($this, true);\\n- $this->mailer = $mailer;\\n- return $s;\\n- }\\n-}\\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\\nindex f6e70787a6e..413e443c528 100644\\n--- a/tests/framework/mail/BaseMessageTest.php\\n+++ b/tests/framework/mail/BaseMessageTest.php\\n@@ -10,8 +10,9 @@\\n \\n use Exception;\\n use Yii;\\n-use yii\\\\mail\\\\BaseMailer;\\n-use yii\\\\mail\\\\BaseMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMailer;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessage;\\n+use yiiunit\\\\framework\\\\mail\\\\stubs\\\\TestMessageWithException;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -29,7 +30,7 @@ protected function setUp(): void\\n }\\n \\n /**\\n- * @return Mailer test email component instance.\\n+ * @return TestMailer test email component instance.\\n */\\n protected function createTestEmailComponent()\\n {\\n@@ -59,6 +60,7 @@ public function testSend(): void\\n public function testToString(): void\\n {\\n $mailer = $this->getMailer();\\n+ /** @var TestMessage $message */\\n $message = $mailer->compose();\\n $this->assertEquals($message->toString(), '' . $message);\\n }\\n@@ -111,128 +113,3 @@ function ($severity, $message, $file, $line) use (&$errorTriggered, &$errorMessa\\n $this->assertSame('', $result, 'Result should be an empty string');\\n }\\n }\\n-\\n-/**\\n- * Test Mailer class.\\n- */\\n-class TestMailer extends BaseMailer\\n-{\\n- public $messageClass = 'yiiunit\\\\framework\\\\mail\\\\TestMessage';\\n- public $sentMessages = [];\\n-\\n- protected function sendMessage($message)\\n- {\\n- $this->sentMessages[] = $message;\\n- }\\n-}\\n-\\n-/**\\n- * Test Message class.\\n- */\\n-class TestMessage extends BaseMessage\\n-{\\n- public $text;\\n- public $html;\\n-\\n- public function getCharset()\\n- {\\n- return '';\\n- }\\n-\\n- public function setCharset($charset)\\n- {\\n- }\\n-\\n- public function getFrom()\\n- {\\n- return '';\\n- }\\n-\\n- public function setFrom($from)\\n- {\\n- }\\n-\\n- public function getReplyTo()\\n- {\\n- return '';\\n- }\\n-\\n- public function setReplyTo($replyTo)\\n- {\\n- }\\n-\\n- public function getTo()\\n- {\\n- return '';\\n- }\\n-\\n- public function setTo($to)\\n- {\\n- }\\n-\\n- public function getCc()\\n- {\\n- return '';\\n- }\\n-\\n- public function setCc($cc)\\n- {\\n- }\\n-\\n- public function getBcc()\\n- {\\n- return '';\\n- }\\n-\\n- public function setBcc($bcc)\\n- {\\n- }\\n-\\n- public function getSubject()\\n- {\\n- return '';\\n- }\\n-\\n- public function setSubject($subject)\\n- {\\n- }\\n-\\n- public function setTextBody($text): void\\n- {\\n- $this->text = $text;\\n- }\\n-\\n- public function setHtmlBody($html): void\\n- {\\n- $this->html = $html;\\n- }\\n-\\n- public function attachContent($content, array $options = [])\\n- {\\n- }\\n-\\n- public function attach($fileName, array $options = [])\\n- {\\n- }\\n-\\n- public function embed($fileName, array $options = [])\\n- {\\n- }\\n-\\n- public function embedContent($content, array $options = [])\\n- {\\n- }\\n-\\n- public function toString()\\n- {\\n- return get_class($this);\\n- }\\n-}\\n-\\n-class TestMessageWithException extends TestMessage\\n-{\\n- public function toString()\\n- {\\n- throw new Exception('Test exception in toString.');\\n- }\\n-}\\n\",\n \"summary\": \"Edited 2 file(s) in tests/framework/mail/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/mail/stubs/TestMailer.php\",\n \"tests/framework/mail/stubs/TestMessage.php\",\n \"tests/framework/mail/stubs/TestMessageWithException.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\\nnew file mode 100644\\nindex 00000000000..4e8a1e92403\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMailer.php\\n@@ -0,0 +1,27 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use yii\\\\mail\\\\BaseMailer;\\n+\\n+/**\\n+ * Test Mailer class.\\n+ */\\n+class TestMailer extends BaseMailer\\n+{\\n+ public $messageClass = TestMessage::class;\\n+ public $sentMessages = [];\\n+\\n+ protected function sendMessage($message)\\n+ {\\n+ $this->sentMessages[] = $message;\\n+\\n+ return true;\\n+ }\\n+}\\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\\nnew file mode 100644\\nindex 00000000000..34e469045ee\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMessage.php\\n@@ -0,0 +1,152 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use yii\\\\mail\\\\BaseMessage;\\n+\\n+/**\\n+ * Test Message class.\\n+ */\\n+class TestMessage extends BaseMessage\\n+{\\n+ public $id;\\n+ public $encoding;\\n+ public $_charset;\\n+ public $_from;\\n+ public $_replyTo;\\n+ public $_to;\\n+ public $_cc;\\n+ public $_bcc;\\n+ public $_subject;\\n+ public $_textBody;\\n+ public $_htmlBody;\\n+\\n+ public function getCharset()\\n+ {\\n+ return $this->_charset;\\n+ }\\n+\\n+ public function setCharset($charset)\\n+ {\\n+ $this->_charset = $charset;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getFrom()\\n+ {\\n+ return $this->_from;\\n+ }\\n+\\n+ public function setFrom($from)\\n+ {\\n+ $this->_from = $from;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getTo()\\n+ {\\n+ return $this->_to;\\n+ }\\n+\\n+ public function setTo($to)\\n+ {\\n+ $this->_to = $to;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getCc()\\n+ {\\n+ return $this->_cc;\\n+ }\\n+\\n+ public function setCc($cc)\\n+ {\\n+ $this->_cc = $cc;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getBcc()\\n+ {\\n+ return $this->_bcc;\\n+ }\\n+\\n+ public function setBcc($bcc)\\n+ {\\n+ $this->_bcc = $bcc;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getSubject()\\n+ {\\n+ return $this->_subject;\\n+ }\\n+\\n+ public function setSubject($subject)\\n+ {\\n+ $this->_subject = $subject;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function getReplyTo()\\n+ {\\n+ return $this->_replyTo;\\n+ }\\n+\\n+ public function setReplyTo($replyTo)\\n+ {\\n+ $this->_replyTo = $replyTo;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function setTextBody($text)\\n+ {\\n+ $this->_textBody = $text;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function setHtmlBody($html)\\n+ {\\n+ $this->_htmlBody = $html;\\n+\\n+ return $this;\\n+ }\\n+\\n+ public function attachContent($content, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function attach($fileName, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function embed($fileName, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function embedContent($content, array $options = [])\\n+ {\\n+ }\\n+\\n+ public function toString()\\n+ {\\n+ $mailer = $this->mailer;\\n+ $this->mailer = null;\\n+ $s = var_export($this, true);\\n+ $this->mailer = $mailer;\\n+ return $s;\\n+ }\\n+}\\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\\nnew file mode 100644\\nindex 00000000000..60903c687f8\\n--- /dev/null\\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\\n@@ -0,0 +1,19 @@\\n+<?php\\n+\\n+/**\\n+ * @link https://www.yiiframework.com/\\n+ * @copyright Copyright (c) 2008 Yii Software LLC\\n+ * @license https://www.yiiframework.com/license/\\n+ */\\n+\\n+namespace yiiunit\\\\framework\\\\mail\\\\stubs;\\n+\\n+use Exception;\\n+\\n+class TestMessageWithException extends TestMessage\\n+{\\n+ public function toString()\\n+ {\\n+ throw new Exception('Test exception in toString.');\\n+ }\\n+}\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/mail/stubs/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/framework/rbac/DbManagerTestCase.php\",\n \"tests/framework/rbac/ManagerTestCase.php\",\n \"tests/framework/rbac/PhpManagerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\\nindex c43d5f95140..e22a0ab7d54 100644\\n--- a/tests/framework/rbac/DbManagerTestCase.php\\n+++ b/tests/framework/rbac/DbManagerTestCase.php\\n@@ -30,6 +30,7 @@\\n * DbManagerTestCase.\\n * @group db\\n * @group rbac\\n+ * @extends ManagerTestCase<DbManager>\\n */\\n abstract class DbManagerTestCase extends ManagerTestCase\\n {\\n@@ -37,7 +38,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\\n protected static $driverName;\\n \\n /**\\n- * @var Connection\\n+ * @var Connection|null\\n */\\n protected $db;\\n \\n@@ -50,7 +51,7 @@ public function testGetAssignmentsByRole(): void\\n $this->auth = $this->createManager();\\n \\n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\\n- $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\\n+ $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'));\\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\\n }\\n@@ -158,9 +159,6 @@ public static function createConnection()\\n return $db;\\n }\\n \\n- /**\\n- * @return ManagerInterface\\n- */\\n protected function createManager()\\n {\\n return new DbManager(['db' => $this->getConnection(), 'defaultRoles' => ['myDefaultRole']]);\\ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\\nindex ed21fcb8484..35c11fb5e8b 100644\\n--- a/tests/framework/rbac/ManagerTestCase.php\\n+++ b/tests/framework/rbac/ManagerTestCase.php\\n@@ -10,7 +10,6 @@\\n \\n use Yii;\\n use InvalidArgumentException;\\n-use yii\\\\rbac\\\\ManagerInterface;\\n use yii\\\\rbac\\\\BaseManager;\\n use yii\\\\rbac\\\\Item;\\n use yii\\\\rbac\\\\Permission;\\n@@ -19,16 +18,18 @@\\n \\n /**\\n * ManagerTestCase.\\n+ *\\n+ * @template TManager of BaseManager\\n */\\n abstract class ManagerTestCase extends TestCase\\n {\\n /**\\n- * @var ManagerInterface|BaseManager\\n+ * @var TManager\\n */\\n protected $auth;\\n \\n /**\\n- * @return ManagerInterface\\n+ * @return TManager\\n */\\n abstract protected function createManager();\\n \\n@@ -97,6 +98,7 @@ public function testAddRule(): void\\n $this->auth->add($rule);\\n \\n $rule = $this->auth->getRule($ruleName);\\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\\n $this->assertEquals($ruleName, $rule->name);\\n $this->assertTrue($rule->reallyReally);\\n }\\n@@ -106,6 +108,7 @@ public function testUpdateRule(): void\\n $this->prepareData();\\n \\n $rule = $this->auth->getRule('isAuthor');\\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\\n $rule->name = 'newName';\\n $rule->reallyReally = false;\\n $this->auth->update('isAuthor', $rule);\\n@@ -114,6 +117,7 @@ public function testUpdateRule(): void\\n $this->assertNull($rule);\\n \\n $rule = $this->auth->getRule('newName');\\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\\n $this->assertEquals('newName', $rule->name);\\n $this->assertFalse($rule->reallyReally);\\n \\n@@ -121,6 +125,7 @@ public function testUpdateRule(): void\\n $this->auth->update('newName', $rule);\\n \\n $rule = $this->auth->getRule('newName');\\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\\n $this->assertTrue($rule->reallyReally);\\n \\n $item = $this->auth->getPermission('createPost');\\n@@ -416,7 +421,7 @@ public function testGetAssignmentsByRole(): void\\n $this->auth = $this->createManager();\\n \\n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\\n- $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\\n+ $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'));\\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\\n }\\n@@ -632,6 +637,7 @@ public function testDefaultRolesWithClosureReturningNonArrayValue(): void\\n {\\n $this->expectException('yii\\\\base\\\\InvalidValueException');\\n $this->expectExceptionMessage('Default roles closure must return an array');\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $this->auth->defaultRoles = function () {\\n return 'test';\\n };\\n@@ -641,6 +647,7 @@ public function testDefaultRolesWithNonArrayValue(): void\\n {\\n $this->expectException('yii\\\\base\\\\InvalidArgumentException');\\n $this->expectExceptionMessage('Default roles must be either an array or a callable');\\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\\n $this->auth->defaultRoles = 'test';\\n }\\n }\\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\\nindex 99274307eab..3e0372095d7 100644\\n--- a/tests/framework/rbac/PhpManagerTest.php\\n+++ b/tests/framework/rbac/PhpManagerTest.php\\n@@ -33,7 +33,7 @@ function time()\\n \\n /**\\n * @group rbac\\n- * @property ExposedPhpManager $auth\\n+ * @extends ManagerTestCase<ExposedPhpManager>\\n */\\n class PhpManagerTest extends ManagerTestCase\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/rbac/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/rest/IndexActionTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\\nindex e56f37cf827..555e9c94e3f 100644\\n--- a/tests/framework/rest/IndexActionTest.php\\n+++ b/tests/framework/rest/IndexActionTest.php\\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\\n /**\\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\\n *\\n- * @param string $sql\\n- * @param array $params\\n- * @param string $expectedRawSql\\n+ * @param Pagination|array|false $pagination\\n+ * @param Sort|array|false $sort\\n+ * @param int|null $expectedPaginationPageSize\\n+ * @param int|null $expectedPaginationDefaultPageSize\\n+ * @param array $expectedSortOrders\\n+ * @param array|null $expectedSortDefaultOrder\\n */\\n public function testPrepareDataProviderWithPaginationAndSorting(\\n $pagination,\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/rest/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/test/ActiveFixtureTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\\nindex b1b72c88a01..d75d8454eb7 100644\\n--- a/tests/framework/test/ActiveFixtureTest.php\\n+++ b/tests/framework/test/ActiveFixtureTest.php\\n@@ -43,7 +43,7 @@ public function testGetData(): void\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n \\n- $this->assertEquals(CustomerFixture::class, get_class($fixture));\\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\\n $this->assertCount(2, $fixture);\\n $this->assertEquals(1, $fixture['customer1']['id']);\\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\\n@@ -62,13 +62,18 @@ public function testGetModel(): void\\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n \\n- $this->assertEquals(Customer::class, get_class($fixture->getModel('customer1')));\\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\\n+\\n+ $customer1 = $fixture->getModel('customer1');\\n+ $this->assertInstanceOf(Customer::class, $customer1);\\n+ $this->assertEquals(1, $customer1->id);\\n+ $this->assertEquals('customer1@example.com', $customer1->email);\\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\\n \\n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\\n+ $customer2 = $fixture->getModel('customer2');\\n+ $this->assertInstanceOf(Customer::class, $customer2);\\n+ $this->assertEquals(2, $customer2->id);\\n+ $this->assertEquals('customer2@example.com', $customer2->email);\\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\\n \\n $test->tearDown();\\n@@ -80,8 +85,10 @@ public function testDataDirectory(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n- $directory = $fixture->getModel('directory');\\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\\n \\n+ $directory = $fixture->getModel('directory');\\n+ $this->assertInstanceOf(Customer::class, $directory);\\n $this->assertEquals(1, $directory->id);\\n $this->assertEquals('directory@example.com', $directory['email']);\\n $test->tearDown();\\n@@ -93,8 +100,10 @@ public function testDataPath(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('customers');\\n- $customer = $fixture->getModel('customer1');\\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\\n \\n+ $customer = $fixture->getModel('customer1');\\n+ $this->assertInstanceOf(Customer::class, $customer);\\n $this->assertEquals(1, $customer->id);\\n $this->assertEquals('customer1@example.com', $customer['email']);\\n $test->tearDown();\\n@@ -106,6 +115,7 @@ public function testTruncate(): void\\n \\n $test->setUp();\\n $fixture = $test->getFixture('animals');\\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\\n $this->assertEmpty($fixture->data);\\n $test->tearDown();\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/test/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s7","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Docblock types for `$pagination`/`$sort` are incorrect for actual data-provider inputs.**\n\nOn Line 75 and Line 76, both params are documented as `array`, but this test also passes `Pagination|false` and `Sort|false`. This mismatch will reduce PHPStan accuracy in the exact area this PR is enabling.\n\n \n\n<details>\n<summary>โ
Suggested docblock fix</summary>\n\n```diff\n- * `@param` array $pagination\n- * `@param` array $sort\n+ * `@param` array|Pagination|false $pagination\n+ * `@param` array|Sort|false $sort\n * `@param` int|null $expectedPaginationPageSize\n * `@param` int|null $expectedPaginationDefaultPageSize\n * `@param` array $expectedSortOrders\n * `@param` array|null $expectedSortDefaultOrder\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@param` array|Pagination|false $pagination\n * `@param` array|Sort|false $sort\n * `@param` int|null $expectedPaginationPageSize\n * `@param` int|null $expectedPaginationDefaultPageSize\n * `@param` array $expectedSortOrders\n * `@param` array|null $expectedSortDefaultOrder\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/rest/IndexActionTest.php` around lines 75 - 80, Update the\ndocblock for the test method to reflect the actual data-provider inputs: change\nthe `@param` annotations for $pagination and $sort from just \"array\" to include\nthe possible object or false values (e.g. \"array|Pagination|false\" for\n$pagination and \"array|Sort|false\" for $sort), so PHPStan sees the real types\nused by the data provider referenced in IndexActionTest and related test\nhelpers.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:triton:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit f00cff8","revised_diff":"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex e56f37cf827..555e9c94e3f 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n $pagination,\n"}],"string":"[\n {\n \"subtask_id\": \"s7\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\\n\\n**Docblock types for `$pagination`/`$sort` are incorrect for actual data-provider inputs.**\\n\\nOn Line 75 and Line 76, both params are documented as `array`, but this test also passes `Pagination|false` and `Sort|false`. This mismatch will reduce PHPStan accuracy in the exact area this PR is enabling.\\n\\n \\n\\n<details>\\n<summary>โ
Suggested docblock fix</summary>\\n\\n```diff\\n- * `@param` array $pagination\\n- * `@param` array $sort\\n+ * `@param` array|Pagination|false $pagination\\n+ * `@param` array|Sort|false $sort\\n * `@param` int|null $expectedPaginationPageSize\\n * `@param` int|null $expectedPaginationDefaultPageSize\\n * `@param` array $expectedSortOrders\\n * `@param` array|null $expectedSortDefaultOrder\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@param` array|Pagination|false $pagination\\n * `@param` array|Sort|false $sort\\n * `@param` int|null $expectedPaginationPageSize\\n * `@param` int|null $expectedPaginationDefaultPageSize\\n * `@param` array $expectedSortOrders\\n * `@param` array|null $expectedSortDefaultOrder\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/rest/IndexActionTest.php` around lines 75 - 80, Update the\\ndocblock for the test method to reflect the actual data-provider inputs: change\\nthe `@param` annotations for $pagination and $sort from just \\\"array\\\" to include\\nthe possible object or false values (e.g. \\\"array|Pagination|false\\\" for\\n$pagination and \\\"array|Sort|false\\\" for $sort), so PHPStan sees the real types\\nused by the data provider referenced in IndexActionTest and related test\\nhelpers.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:triton:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit f00cff8\",\n \"revised_diff\": \"diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\\nindex e56f37cf827..555e9c94e3f 100644\\n--- a/tests/framework/rest/IndexActionTest.php\\n+++ b/tests/framework/rest/IndexActionTest.php\\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\\n /**\\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\\n *\\n- * @param string $sql\\n- * @param array $params\\n- * @param string $expectedRawSql\\n+ * @param Pagination|array|false $pagination\\n+ * @param Sort|array|false $sort\\n+ * @param int|null $expectedPaginationPageSize\\n+ * @param int|null $expectedPaginationDefaultPageSize\\n+ * @param array $expectedSortOrders\\n+ * @param array|null $expectedSortDefaultOrder\\n */\\n public function testPrepareDataProviderWithPaginationAndSorting(\\n $pagination,\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4f6666327d7..20abc47d15b 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -13,25 +13,14 @@ parameters:\n excludePaths:\n analyse:\n - tests/data\n- - tests/framework/base/stub\n- - tests/framework/console/stubs\n- - tests/framework/di/stubs\n- - tests/framework/filters/stubs\n- - tests/framework/web/mocks\n- - tests/framework/web/stubs\n+ - tests/framework/*/stubs/*\n+ - tests/framework/*/mocks/*\n # TODO: Analyze these directories\n - tests/framework/db\n - tests/framework/grid\n - tests/framework/helpers\n - tests/framework/i18n\n - tests/framework/log\n- - tests/framework/mail\n- - tests/framework/models\n- - tests/framework/mutex\n- - tests/framework/rbac\n- - tests/framework/requirements\n- - tests/framework/rest\n- - tests/framework/test\n - tests/framework/validators\n \n bootstrapFiles:\n\ndiff --git a/tests/framework/base/ComponentTest.php b/tests/framework/base/ComponentTest.php\nindex a63aa5da36b..5b2f5750b03 100644\n--- a/tests/framework/base/ComponentTest.php\n+++ b/tests/framework/base/ComponentTest.php\n@@ -507,7 +507,7 @@ public function testDetachNotAttachedHandler(): void\n */\n public function testEventClosureDetachesItself(): void\n {\n- $obj = require __DIR__ . '/stub/AnonymousComponentClass.php';\n+ $obj = require __DIR__ . '/stubs/AnonymousComponentClass.php';\n \n $obj->trigger('barEventOnce');\n $this->assertEquals(1, $obj->foo);\ndiff --git a/tests/framework/base/ModelTest.php b/tests/framework/base/ModelTest.php\nindex ac5e44fb36e..aedc19b32ed 100644\n--- a/tests/framework/base/ModelTest.php\n+++ b/tests/framework/base/ModelTest.php\n@@ -508,7 +508,7 @@ public function testValidateAttributeNames(): void\n \n public function testFormNameWithAnonymousClass(): void\n {\n- $model = require __DIR__ . '/stub/AnonymousModelClass.php';\n+ $model = require __DIR__ . '/stubs/AnonymousModelClass.php';\n \n $this->expectException('yii\\base\\InvalidConfigException');\n $this->expectExceptionMessage('The \"formName()\" method should be explicitly defined for anonymous models');\ndiff --git a/tests/framework/base/stub/AnonymousComponentClass.php b/tests/framework/base/stubs/AnonymousComponentClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousComponentClass.php\nrename to tests/framework/base/stubs/AnonymousComponentClass.php\ndiff --git a/tests/framework/base/stub/AnonymousModelClass.php b/tests/framework/base/stubs/AnonymousModelClass.php\nsimilarity index 100%\nrename from tests/framework/base/stub/AnonymousModelClass.php\nrename to tests/framework/base/stubs/AnonymousModelClass.php\ndiff --git a/tests/framework/mail/BaseMailerTest.php b/tests/framework/mail/BaseMailerTest.php\nindex f45da7e2dbc..10ae1062b6c 100644\n--- a/tests/framework/mail/BaseMailerTest.php\n+++ b/tests/framework/mail/BaseMailerTest.php\n@@ -11,8 +11,8 @@\n use Yii;\n use yii\\base\\View;\n use yii\\helpers\\FileHelper;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n use yiiunit\\TestCase;\n \n /**\n@@ -50,18 +50,18 @@ protected function getTestFilePath()\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestMailComponent()\n {\n- $component = new Mailer();\n+ $component = new TestMailer();\n $component->viewPath = $this->getTestFilePath();\n \n return $component;\n }\n \n /**\n- * @return Mailer mailer instance\n+ * @return TestMailer mailer instance\n */\n protected function getTestMailComponent()\n {\n@@ -72,7 +72,7 @@ protected function getTestMailComponent()\n \n public function testSetupView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $view = new View();\n $mailer->setView($view);\n@@ -95,14 +95,14 @@ public function testSetupView(): void\n */\n public function testGetDefaultView(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $view = $mailer->getView();\n $this->assertIsObject($view, 'Unable to get default view!');\n }\n \n public function testCreateMessage(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $message = $mailer->compose();\n $this->assertIsObject($message, 'Unable to create message instance!');\n $this->assertEquals($mailer->messageClass, get_class($message), 'Invalid message class!');\n@@ -113,7 +113,7 @@ public function testCreateMessage(): void\n */\n public function testDefaultMessageConfig(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n \n $notPropertyConfig = [\n 'charset' => 'utf-16',\n@@ -132,6 +132,7 @@ public function testDefaultMessageConfig(): void\n $messageConfig = array_merge($notPropertyConfig, $propertyConfig);\n $mailer->messageConfig = $messageConfig;\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n \n foreach ($notPropertyConfig as $name => $value) {\n@@ -204,6 +205,7 @@ public function testCompose(): void\n $textViewFileContent = 'Plain text view file content';\n file_put_contents($textViewFileName, $textViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n 'text' => $textViewName,\n@@ -211,6 +213,7 @@ public function testCompose(): void\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html!');\n $this->assertEquals($textViewFileContent, $message->_textBody, 'Unable to render text!');\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose($htmlViewName);\n $this->assertEquals($htmlViewFileContent, $message->_htmlBody, 'Unable to render html by direct view!');\n $this->assertEquals(strip_tags($htmlViewFileContent), $message->_textBody, 'Unable to render text by direct view!');\n@@ -268,6 +271,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\n $htmlViewFileName = $this->getTestFilePath() . DIRECTORY_SEPARATOR . $htmlViewName . '.php';\n file_put_contents($htmlViewFileName, $htmlViewFileContent);\n \n+ /** @var TestMessage $message */\n $message = $mailer->compose([\n 'html' => $htmlViewName,\n ]);\n@@ -277,7 +281,7 @@ public function testComposePlainTextFallback($i, $htmlViewFileContent, $expected\n \n public function testUseFileTransport(): void\n {\n- $mailer = new Mailer();\n+ $mailer = new TestMailer();\n $this->assertFalse($mailer->useFileTransport);\n $this->assertEquals('@runtime/mail', $mailer->fileTransportPath);\n \n@@ -299,11 +303,9 @@ public function testUseFileTransport(): void\n \n public function testBeforeSendEvent(): void\n {\n- $message = new Message();\n-\n- /** @var Mailer $mailerMock */\n+ $message = new TestMessage();\n $mailerMock = $this->createPartialMock(\n- Mailer::class,\n+ TestMailer::class,\n [\n 'afterSend',\n 'beforeSend',\n@@ -316,160 +318,3 @@ public function testBeforeSendEvent(): void\n $mailerMock->send($message);\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class Mailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\Message';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n-\n- return true;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class Message extends BaseMessage\n-{\n- public $id;\n- public $encoding;\n- public $_charset;\n- public $_from;\n- public $_replyTo;\n- public $_to;\n- public $_cc;\n- public $_bcc;\n- public $_subject;\n- public $_textBody;\n- public $_htmlBody;\n-\n- public function getCharset()\n- {\n- return $this->_charset;\n- }\n-\n- public function setCharset($charset)\n- {\n- $this->_charset = $charset;\n-\n- return $this;\n- }\n-\n- public function getFrom()\n- {\n- return $this->_from;\n- }\n-\n- public function setFrom($from)\n- {\n- $this->_from = $from;\n-\n- return $this;\n- }\n-\n- public function getTo()\n- {\n- return $this->_to;\n- }\n-\n- public function setTo($to)\n- {\n- $this->_to = $to;\n-\n- return $this;\n- }\n-\n- public function getCc()\n- {\n- return $this->_cc;\n- }\n-\n- public function setCc($cc)\n- {\n- $this->_cc = $cc;\n-\n- return $this;\n- }\n-\n- public function getBcc()\n- {\n- return $this->_bcc;\n- }\n-\n- public function setBcc($bcc)\n- {\n- $this->_bcc = $bcc;\n-\n- return $this;\n- }\n-\n- public function getSubject()\n- {\n- return $this->_subject;\n- }\n-\n- public function setSubject($subject)\n- {\n- $this->_subject = $subject;\n-\n- return $this;\n- }\n-\n- public function getReplyTo()\n- {\n- return $this->_replyTo;\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- $this->_replyTo = $replyTo;\n-\n- return $this;\n- }\n-\n- public function setTextBody($text)\n- {\n- $this->_textBody = $text;\n-\n- return $this;\n- }\n-\n- public function setHtmlBody($html)\n- {\n- $this->_htmlBody = $html;\n-\n- return $this;\n- }\n-\n- public function attachContent($content, array $options = [])\n- {\n- }\n-\n- public function attach($fileName, array $options = [])\n- {\n- }\n-\n- public function embed($fileName, array $options = [])\n- {\n- }\n-\n- public function embedContent($content, array $options = [])\n- {\n- }\n-\n- public function toString()\n- {\n- $mailer = $this->mailer;\n- $this->mailer = null;\n- $s = var_export($this, true);\n- $this->mailer = $mailer;\n- return $s;\n- }\n-}\ndiff --git a/tests/framework/mail/BaseMessageTest.php b/tests/framework/mail/BaseMessageTest.php\nindex f6e70787a6e..413e443c528 100644\n--- a/tests/framework/mail/BaseMessageTest.php\n+++ b/tests/framework/mail/BaseMessageTest.php\n@@ -10,8 +10,9 @@\n \n use Exception;\n use Yii;\n-use yii\\mail\\BaseMailer;\n-use yii\\mail\\BaseMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMailer;\n+use yiiunit\\framework\\mail\\stubs\\TestMessage;\n+use yiiunit\\framework\\mail\\stubs\\TestMessageWithException;\n use yiiunit\\TestCase;\n \n /**\n@@ -29,7 +30,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return Mailer test email component instance.\n+ * @return TestMailer test email component instance.\n */\n protected function createTestEmailComponent()\n {\n@@ -59,6 +60,7 @@ public function testSend(): void\n public function testToString(): void\n {\n $mailer = $this->getMailer();\n+ /** @var TestMessage $message */\n $message = $mailer->compose();\n $this->assertEquals($message->toString(), '' . $message);\n }\n@@ -111,128 +113,3 @@ function ($severity, $message, $file, $line) use (&$errorTriggered, &$errorMessa\n $this->assertSame('', $result, 'Result should be an empty string');\n }\n }\n-\n-/**\n- * Test Mailer class.\n- */\n-class TestMailer extends BaseMailer\n-{\n- public $messageClass = 'yiiunit\\framework\\mail\\TestMessage';\n- public $sentMessages = [];\n-\n- protected function sendMessage($message)\n- {\n- $this->sentMessages[] = $message;\n- }\n-}\n-\n-/**\n- * Test Message class.\n- */\n-class TestMessage extends BaseMessage\n-{\n- public $text;\n- public $html;\n-\n- public function getCharset()\n- {\n- return '';\n- }\n-\n- public function setCharset($charset)\n- {\n- }\n-\n- public function getFrom()\n- {\n- return '';\n- }\n-\n- public function setFrom($from)\n- {\n- }\n-\n- public function getReplyTo()\n- {\n- return '';\n- }\n-\n- public function setReplyTo($replyTo)\n- {\n- }\n-\n- public function getTo()\n- {\n- return '';\n- }\n-\n- public function setTo($to)\n- {\n- }\n-\n- public function getCc()\n- {\n- return '';\n- }\n-\n- public function setCc($cc)\n- {\n- }\n-\n- public function getBcc()\n- {\n- return '';\n- }\n-\n- public function setBcc($bcc)\n- {\n- }\n-\n- public function getSubject()\n- {\n- return '';\n- }\n-\n- public function setSubject($subject)\n- {\n- }\n-\n- public function setTextBody($text): void\n- {\n- $this->text = $text;\n- }\n-\n- public function setHtmlBody($html): void\n- {\n- $this->html = $html;\n- }\n-\n- public function attachContent($content, array $options = [])\n- {\n- }\n-\n- public function attach($fileName, array $options = [])\n- {\n- }\n-\n- public function embed($fileName, array $options = [])\n- {\n- }\n-\n- public function embedContent($content, array $options = [])\n- {\n- }\n-\n- public function toString()\n- {\n- return get_class($this);\n- }\n-}\n-\n-class TestMessageWithException extends TestMessage\n-{\n- public function toString()\n- {\n- throw new Exception('Test exception in toString.');\n- }\n-}\ndiff --git a/tests/framework/mail/stubs/TestMailer.php b/tests/framework/mail/stubs/TestMailer.php\nnew file mode 100644\nindex 00000000000..4e8a1e92403\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMailer.php\n@@ -0,0 +1,27 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMailer;\n+\n+/**\n+ * Test Mailer class.\n+ */\n+class TestMailer extends BaseMailer\n+{\n+ public $messageClass = TestMessage::class;\n+ public $sentMessages = [];\n+\n+ protected function sendMessage($message)\n+ {\n+ $this->sentMessages[] = $message;\n+\n+ return true;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessage.php b/tests/framework/mail/stubs/TestMessage.php\nnew file mode 100644\nindex 00000000000..34e469045ee\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessage.php\n@@ -0,0 +1,152 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use yii\\mail\\BaseMessage;\n+\n+/**\n+ * Test Message class.\n+ */\n+class TestMessage extends BaseMessage\n+{\n+ public $id;\n+ public $encoding;\n+ public $_charset;\n+ public $_from;\n+ public $_replyTo;\n+ public $_to;\n+ public $_cc;\n+ public $_bcc;\n+ public $_subject;\n+ public $_textBody;\n+ public $_htmlBody;\n+\n+ public function getCharset()\n+ {\n+ return $this->_charset;\n+ }\n+\n+ public function setCharset($charset)\n+ {\n+ $this->_charset = $charset;\n+\n+ return $this;\n+ }\n+\n+ public function getFrom()\n+ {\n+ return $this->_from;\n+ }\n+\n+ public function setFrom($from)\n+ {\n+ $this->_from = $from;\n+\n+ return $this;\n+ }\n+\n+ public function getTo()\n+ {\n+ return $this->_to;\n+ }\n+\n+ public function setTo($to)\n+ {\n+ $this->_to = $to;\n+\n+ return $this;\n+ }\n+\n+ public function getCc()\n+ {\n+ return $this->_cc;\n+ }\n+\n+ public function setCc($cc)\n+ {\n+ $this->_cc = $cc;\n+\n+ return $this;\n+ }\n+\n+ public function getBcc()\n+ {\n+ return $this->_bcc;\n+ }\n+\n+ public function setBcc($bcc)\n+ {\n+ $this->_bcc = $bcc;\n+\n+ return $this;\n+ }\n+\n+ public function getSubject()\n+ {\n+ return $this->_subject;\n+ }\n+\n+ public function setSubject($subject)\n+ {\n+ $this->_subject = $subject;\n+\n+ return $this;\n+ }\n+\n+ public function getReplyTo()\n+ {\n+ return $this->_replyTo;\n+ }\n+\n+ public function setReplyTo($replyTo)\n+ {\n+ $this->_replyTo = $replyTo;\n+\n+ return $this;\n+ }\n+\n+ public function setTextBody($text)\n+ {\n+ $this->_textBody = $text;\n+\n+ return $this;\n+ }\n+\n+ public function setHtmlBody($html)\n+ {\n+ $this->_htmlBody = $html;\n+\n+ return $this;\n+ }\n+\n+ public function attachContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function attach($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embed($fileName, array $options = [])\n+ {\n+ }\n+\n+ public function embedContent($content, array $options = [])\n+ {\n+ }\n+\n+ public function toString()\n+ {\n+ $mailer = $this->mailer;\n+ $this->mailer = null;\n+ $s = var_export($this, true);\n+ $this->mailer = $mailer;\n+ return $s;\n+ }\n+}\ndiff --git a/tests/framework/mail/stubs/TestMessageWithException.php b/tests/framework/mail/stubs/TestMessageWithException.php\nnew file mode 100644\nindex 00000000000..60903c687f8\n--- /dev/null\n+++ b/tests/framework/mail/stubs/TestMessageWithException.php\n@@ -0,0 +1,19 @@\n+<?php\n+\n+/**\n+ * @link https://www.yiiframework.com/\n+ * @copyright Copyright (c) 2008 Yii Software LLC\n+ * @license https://www.yiiframework.com/license/\n+ */\n+\n+namespace yiiunit\\framework\\mail\\stubs;\n+\n+use Exception;\n+\n+class TestMessageWithException extends TestMessage\n+{\n+ public function toString()\n+ {\n+ throw new Exception('Test exception in toString.');\n+ }\n+}\ndiff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php\nindex c43d5f95140..e22a0ab7d54 100644\n--- a/tests/framework/rbac/DbManagerTestCase.php\n+++ b/tests/framework/rbac/DbManagerTestCase.php\n@@ -30,6 +30,7 @@\n * DbManagerTestCase.\n * @group db\n * @group rbac\n+ * @extends ManagerTestCase<DbManager>\n */\n abstract class DbManagerTestCase extends ManagerTestCase\n {\n@@ -37,7 +38,7 @@ abstract class DbManagerTestCase extends ManagerTestCase\n protected static $driverName;\n \n /**\n- * @var Connection\n+ * @var Connection|null\n */\n protected $db;\n \n@@ -50,7 +51,7 @@ public function testGetAssignmentsByRole(): void\n $this->auth = $this->createManager();\n \n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\n- $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\n+ $this->assertEquals(['123', 'reader A'], $this->auth->getUserIdsByRole('reader'));\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\n }\n@@ -158,9 +159,6 @@ public static function createConnection()\n return $db;\n }\n \n- /**\n- * @return ManagerInterface\n- */\n protected function createManager()\n {\n return new DbManager(['db' => $this->getConnection(), 'defaultRoles' => ['myDefaultRole']]);\ndiff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php\nindex ed21fcb8484..35c11fb5e8b 100644\n--- a/tests/framework/rbac/ManagerTestCase.php\n+++ b/tests/framework/rbac/ManagerTestCase.php\n@@ -10,7 +10,6 @@\n \n use Yii;\n use InvalidArgumentException;\n-use yii\\rbac\\ManagerInterface;\n use yii\\rbac\\BaseManager;\n use yii\\rbac\\Item;\n use yii\\rbac\\Permission;\n@@ -19,16 +18,18 @@\n \n /**\n * ManagerTestCase.\n+ *\n+ * @template TManager of BaseManager\n */\n abstract class ManagerTestCase extends TestCase\n {\n /**\n- * @var ManagerInterface|BaseManager\n+ * @var TManager\n */\n protected $auth;\n \n /**\n- * @return ManagerInterface\n+ * @return TManager\n */\n abstract protected function createManager();\n \n@@ -97,6 +98,7 @@ public function testAddRule(): void\n $this->auth->add($rule);\n \n $rule = $this->auth->getRule($ruleName);\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertEquals($ruleName, $rule->name);\n $this->assertTrue($rule->reallyReally);\n }\n@@ -106,6 +108,7 @@ public function testUpdateRule(): void\n $this->prepareData();\n \n $rule = $this->auth->getRule('isAuthor');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $rule->name = 'newName';\n $rule->reallyReally = false;\n $this->auth->update('isAuthor', $rule);\n@@ -114,6 +117,7 @@ public function testUpdateRule(): void\n $this->assertNull($rule);\n \n $rule = $this->auth->getRule('newName');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertEquals('newName', $rule->name);\n $this->assertFalse($rule->reallyReally);\n \n@@ -121,6 +125,7 @@ public function testUpdateRule(): void\n $this->auth->update('newName', $rule);\n \n $rule = $this->auth->getRule('newName');\n+ $this->assertInstanceOf(AuthorRule::class, $rule);\n $this->assertTrue($rule->reallyReally);\n \n $item = $this->auth->getPermission('createPost');\n@@ -416,7 +421,7 @@ public function testGetAssignmentsByRole(): void\n $this->auth = $this->createManager();\n \n $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));\n- $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);\n+ $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'));\n $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));\n $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));\n }\n@@ -632,6 +637,7 @@ public function testDefaultRolesWithClosureReturningNonArrayValue(): void\n {\n $this->expectException('yii\\base\\InvalidValueException');\n $this->expectExceptionMessage('Default roles closure must return an array');\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $this->auth->defaultRoles = function () {\n return 'test';\n };\n@@ -641,6 +647,7 @@ public function testDefaultRolesWithNonArrayValue(): void\n {\n $this->expectException('yii\\base\\InvalidArgumentException');\n $this->expectExceptionMessage('Default roles must be either an array or a callable');\n+ // @phpstan-ignore assign.propertyType (We intentionally use incorrect data here to test its processing)\n $this->auth->defaultRoles = 'test';\n }\n }\ndiff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php\nindex 99274307eab..3e0372095d7 100644\n--- a/tests/framework/rbac/PhpManagerTest.php\n+++ b/tests/framework/rbac/PhpManagerTest.php\n@@ -33,7 +33,7 @@ function time()\n \n /**\n * @group rbac\n- * @property ExposedPhpManager $auth\n+ * @extends ManagerTestCase<ExposedPhpManager>\n */\n class PhpManagerTest extends ManagerTestCase\n {\ndiff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php\nindex e56f37cf827..555e9c94e3f 100644\n--- a/tests/framework/rest/IndexActionTest.php\n+++ b/tests/framework/rest/IndexActionTest.php\n@@ -72,9 +72,12 @@ public function testPrepareSearchQueryAttribute(): void\n /**\n * @dataProvider dataProviderTestPrepareDataProviderWithPaginationAndSorting\n *\n- * @param string $sql\n- * @param array $params\n- * @param string $expectedRawSql\n+ * @param Pagination|array|false $pagination\n+ * @param Sort|array|false $sort\n+ * @param int|null $expectedPaginationPageSize\n+ * @param int|null $expectedPaginationDefaultPageSize\n+ * @param array $expectedSortOrders\n+ * @param array|null $expectedSortDefaultOrder\n */\n public function testPrepareDataProviderWithPaginationAndSorting(\n $pagination,\ndiff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php\nindex b1b72c88a01..d75d8454eb7 100644\n--- a/tests/framework/test/ActiveFixtureTest.php\n+++ b/tests/framework/test/ActiveFixtureTest.php\n@@ -43,7 +43,7 @@ public function testGetData(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(CustomerFixture::class, get_class($fixture));\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n $this->assertCount(2, $fixture);\n $this->assertEquals(1, $fixture['customer1']['id']);\n $this->assertEquals('customer1@example.com', $fixture['customer1']['email']);\n@@ -62,13 +62,18 @@ public function testGetModel(): void\n $test->setUp();\n $fixture = $test->getFixture('customers');\n \n- $this->assertEquals(Customer::class, get_class($fixture->getModel('customer1')));\n- $this->assertEquals(1, $fixture->getModel('customer1')->id);\n- $this->assertEquals('customer1@example.com', $fixture->getModel('customer1')->email);\n+ $this->assertInstanceOf(CustomerFixture::class, $fixture);\n+\n+ $customer1 = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer1);\n+ $this->assertEquals(1, $customer1->id);\n+ $this->assertEquals('customer1@example.com', $customer1->email);\n $this->assertEquals(1, $fixture['customer1']['profile_id']);\n \n- $this->assertEquals(2, $fixture->getModel('customer2')->id);\n- $this->assertEquals('customer2@example.com', $fixture->getModel('customer2')->email);\n+ $customer2 = $fixture->getModel('customer2');\n+ $this->assertInstanceOf(Customer::class, $customer2);\n+ $this->assertEquals(2, $customer2->id);\n+ $this->assertEquals('customer2@example.com', $customer2->email);\n $this->assertEquals(2, $fixture['customer2']['profile_id']);\n \n $test->tearDown();\n@@ -80,8 +85,10 @@ public function testDataDirectory(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $directory = $fixture->getModel('directory');\n+ $this->assertInstanceOf(Customer::class, $directory);\n $this->assertEquals(1, $directory->id);\n $this->assertEquals('directory@example.com', $directory['email']);\n $test->tearDown();\n@@ -93,8 +100,10 @@ public function testDataPath(): void\n \n $test->setUp();\n $fixture = $test->getFixture('customers');\n- $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(CustomDirectoryFixture::class, $fixture);\n \n+ $customer = $fixture->getModel('customer1');\n+ $this->assertInstanceOf(Customer::class, $customer);\n $this->assertEquals(1, $customer->id);\n $this->assertEquals('customer1@example.com', $customer['email']);\n $test->tearDown();\n@@ -106,6 +115,7 @@ public function testTruncate(): void\n \n $test->setUp();\n $fixture = $test->getFixture('animals');\n+ $this->assertInstanceOf(AnimalFixture::class, $fixture);\n $this->assertEmpty($fixture->data);\n $test->tearDown();\n }\n"},"num_subtasks":{"kind":"number","value":8,"string":"8"},"num_changed_files":{"kind":"number","value":15,"string":"15"}}},{"rowIdx":34271,"cells":{"task_id":{"kind":"string","value":"yiisoft/yii2#20871"},"repo":{"kind":"string","value":"yiisoft/yii2"},"pr_number":{"kind":"number","value":20871,"string":"20,871"},"base_sha":{"kind":"string","value":"d0a0f0f93e8a382549775ae5970e193bda1bc5b8"},"head_sha":{"kind":"string","value":"9c520a46189032b5b5a9c5dd6c1e54fcdaa99c90"},"task":{"kind":"string","value":"Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan\n\n| Q | A\r\n| ------------- | ---\r\n| Is bugfix? | โ\r\n| New feature? | โ\r\n| Breaks BC? | โ\r\n| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["phpstan.dist.neon"]},{"subtask_id":"s2","goal":"Implement the changes under `tests/data/ar/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/data/ar/Cat.php"]},{"subtask_id":"s3","goal":"Implement the changes under `tests/framework/console/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/console/ControllerTest.php"]},{"subtask_id":"s4","goal":"Implement the changes under `tests/framework/console/stubs/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/console/stubs/FakeController.php","tests/framework/console/stubs/FakeHelpController.php","tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php","tests/framework/console/stubs/FakePhp71Controller.php"]},{"subtask_id":"s5","goal":"Implement the changes under `tests/framework/web/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/web/ControllerTest.php","tests/framework/web/ErrorActionTest.php","tests/framework/web/ErrorHandlerTest.php","tests/framework/web/FormatterTest.php","tests/framework/web/GroupUrlRuleTest.php","tests/framework/web/JsonResponseFormatterTest.php","tests/framework/web/MultipartFormDataParserTest.php","tests/framework/web/UploadedFileTest.php","tests/framework/web/UserIdentity.php","tests/framework/web/UserTest.php","tests/framework/web/XmlResponseFormatterTest.php"]},{"subtask_id":"s6","goal":"Implement the changes under `tests/framework/web/session/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/web/session/AbstractDbSessionTest.php"]},{"subtask_id":"s7","goal":"Implement the changes under `tests/framework/web/stubs/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/web/stubs/FakeController.php","tests/framework/web/stubs/FakePhp71Controller.php","tests/framework/web/stubs/FakePhp7Controller.php","tests/framework/web/stubs/FakePhp80Controller.php","tests/framework/web/stubs/ModelBindingStub.php"]},{"subtask_id":"s8","goal":"Implement the changes under `tests/framework/widgets/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan","scope_files":["tests/framework/widgets/ActiveFieldTest.php","tests/framework/widgets/ActiveFormTest.php","tests/framework/widgets/DetailViewTest.php"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `tests/data/ar/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/data/ar/Cat.php\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `tests/framework/console/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/console/ControllerTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `tests/framework/console/stubs/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/console/stubs/FakeController.php\",\n \"tests/framework/console/stubs/FakeHelpController.php\",\n \"tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\",\n \"tests/framework/console/stubs/FakePhp71Controller.php\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `tests/framework/web/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/web/ControllerTest.php\",\n \"tests/framework/web/ErrorActionTest.php\",\n \"tests/framework/web/ErrorHandlerTest.php\",\n \"tests/framework/web/FormatterTest.php\",\n \"tests/framework/web/GroupUrlRuleTest.php\",\n \"tests/framework/web/JsonResponseFormatterTest.php\",\n \"tests/framework/web/MultipartFormDataParserTest.php\",\n \"tests/framework/web/UploadedFileTest.php\",\n \"tests/framework/web/UserIdentity.php\",\n \"tests/framework/web/UserTest.php\",\n \"tests/framework/web/XmlResponseFormatterTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s6\",\n \"goal\": \"Implement the changes under `tests/framework/web/session/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/web/session/AbstractDbSessionTest.php\"\n ]\n },\n {\n \"subtask_id\": \"s7\",\n \"goal\": \"Implement the changes under `tests/framework/web/stubs/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/web/stubs/FakeController.php\",\n \"tests/framework/web/stubs/FakePhp71Controller.php\",\n \"tests/framework/web/stubs/FakePhp7Controller.php\",\n \"tests/framework/web/stubs/FakePhp80Controller.php\",\n \"tests/framework/web/stubs/ModelBindingStub.php\"\n ]\n },\n {\n \"subtask_id\": \"s8\",\n \"goal\": \"Implement the changes under `tests/framework/widgets/` needed for: Analyze the `yiiunit\\\\framework\\\\web` and `yiiunit\\\\framework\\\\widgets` namespaces using PHPStan\",\n \"scope_files\": [\n \"tests/framework/widgets/ActiveFieldTest.php\",\n \"tests/framework/widgets/ActiveFormTest.php\",\n \"tests/framework/widgets/DetailViewTest.php\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["phpstan.dist.neon"],"solution_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..4f6666327d7 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -14,8 +14,11 @@ parameters:\n analyse:\n - tests/data\n - tests/framework/base/stub\n+ - tests/framework/console/stubs\n - tests/framework/di/stubs\n - tests/framework/filters/stubs\n+ - tests/framework/web/mocks\n+ - tests/framework/web/stubs\n # TODO: Analyze these directories\n - tests/framework/db\n - tests/framework/grid\n@@ -30,8 +33,6 @@ parameters:\n - tests/framework/rest\n - tests/framework/test\n - tests/framework/validators\n- - tests/framework/web\n- - tests/framework/widgets\n \n bootstrapFiles:\n - framework/BaseYii.php\n\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["tests/data/ar/Cat.php"],"solution_diff":"diff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\nindex 494294edeaa..e4856b05a3f 100644\n--- a/tests/data/ar/Cat.php\n+++ b/tests/data/ar/Cat.php\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\n \n /**\n * This is to test if __isset catches the exception.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getException()\n@@ -43,7 +43,7 @@ public function getException()\n \n /**\n * This is to test if __isset catches the error.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getThrowable()\n","summary":"Edited 1 file(s) in tests/data/ar/"},{"subtask_id":"s3","scope_files":["tests/framework/console/ControllerTest.php"],"solution_diff":"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\nindex e9932ceca9f..610be16a74e 100644\n--- a/tests/framework/console/ControllerTest.php\n+++ b/tests/framework/console/ControllerTest.php\n@@ -18,6 +18,10 @@\n use yii\\console\\Application;\n use yii\\console\\Request;\n use yii\\helpers\\Console;\n+use yiiunit\\framework\\console\\stubs\\FakeController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput;\n+use yiiunit\\framework\\console\\stubs\\FakePhp71Controller;\n use yiiunit\\TestCase;\n \n /**\n@@ -33,9 +37,9 @@ protected function setUp(): void\n parent::setUp();\n $this->mockApplication();\n Yii::$app->controllerMap = [\n- 'fake' => 'yiiunit\\framework\\console\\FakeController',\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\FakeHelpControllerWithoutOutput',\n- 'help' => 'yiiunit\\framework\\console\\FakeHelpController',\n+ 'fake' => 'yiiunit\\framework\\console\\stubs\\FakeController',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'help' => 'yiiunit\\framework\\console\\stubs\\FakeHelpController',\n ];\n }\n \n","summary":"Edited 1 file(s) in tests/framework/console/"},{"subtask_id":"s4","scope_files":["tests/framework/console/stubs/FakeController.php","tests/framework/console/stubs/FakeHelpController.php","tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php","tests/framework/console/stubs/FakePhp71Controller.php"],"solution_diff":"diff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\nsimilarity index 98%\nrename from tests/framework/console/FakeController.php\nrename to tests/framework/console/stubs/FakeController.php\nindex 540cd1a0b57..dd8bfd54b55 100644\n--- a/tests/framework/console/FakeController.php\n+++ b/tests/framework/console/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\Controller;\n use yii\\console\\Response;\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\nsimilarity index 93%\nrename from tests/framework/console/FakeHelpController.php\nrename to tests/framework/console/stubs/FakeHelpController.php\nindex 34a9491a3d7..2be7d3aabe7 100644\n--- a/tests/framework/console/FakeHelpController.php\n+++ b/tests/framework/console/stubs/FakeHelpController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nsimilarity index 90%\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nindex d9586dd9610..22c5bc7696c 100644\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakePhp71Controller.php b/tests/framework/console/stubs/FakePhp71Controller.php\nsimilarity index 88%\nrename from tests/framework/console/FakePhp71Controller.php\nrename to tests/framework/console/stubs/FakePhp71Controller.php\nindex 9a4faca2e5c..fcc96b0372f 100644\n--- a/tests/framework/console/FakePhp71Controller.php\n+++ b/tests/framework/console/stubs/FakePhp71Controller.php\n@@ -6,10 +6,9 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\data\\DataProviderInterface;\n-use yiiunit\\framework\\console\\stubs\\DummyService;\n use yii\\console\\Controller;\n use yii\\console\\Request;\n use yiiunit\\framework\\base\\Post;\n","summary":"Edited 4 file(s) in tests/framework/console/stubs/"},{"subtask_id":"s5","scope_files":["tests/framework/web/ControllerTest.php","tests/framework/web/ErrorActionTest.php","tests/framework/web/ErrorHandlerTest.php","tests/framework/web/FormatterTest.php","tests/framework/web/GroupUrlRuleTest.php","tests/framework/web/JsonResponseFormatterTest.php","tests/framework/web/MultipartFormDataParserTest.php","tests/framework/web/UploadedFileTest.php","tests/framework/web/UserIdentity.php","tests/framework/web/UserTest.php","tests/framework/web/XmlResponseFormatterTest.php"],"solution_diff":"diff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\nindex eea41c8d3a1..722baff5628 100644\n--- a/tests/framework/web/ControllerTest.php\n+++ b/tests/framework/web/ControllerTest.php\n@@ -16,9 +16,14 @@\n use Yii;\n use yii\\base\\InlineAction;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\Controller;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\Response;\n use yii\\web\\ServerErrorHttpException;\n+use yiiunit\\framework\\web\\stubs\\FakeController;\n+use yiiunit\\framework\\web\\stubs\\FakePhp7Controller;\n+use yiiunit\\framework\\web\\stubs\\FakePhp71Controller;\n+use yiiunit\\framework\\web\\stubs\\FakePhp80Controller;\n use yiiunit\\framework\\web\\stubs\\VendorImage;\n use yiiunit\\TestCase;\n \n@@ -27,7 +32,7 @@\n */\n class ControllerTest extends TestCase\n {\n- /** @var FakeController */\n+ /** @var Controller */\n private $controller;\n \n protected function setUp(): void\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\nindex c5b55388757..63486693cf5 100644\n--- a/tests/framework/web/ErrorActionTest.php\n+++ b/tests/framework/web/ErrorActionTest.php\n@@ -118,8 +118,5 @@ public function testLayout(): void\n $this->getController([\n 'layout' => 'non-existing',\n ])->runAction('error');\n-\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n- $this->expectExceptionMessageRegExp('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n }\n }\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex a7bbf5b3668..06022646645 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -49,7 +49,7 @@ public function testCorrectResponseCodeInErrorView(): void\n \n public function testFormatRaw(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_RAW;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_RAW;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -69,7 +69,7 @@ public function testFormatRaw(): void\n \n public function testFormatXml(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_XML;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_XML;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -95,7 +95,9 @@ public function testFormatXml(): void\n \n public function testClearAssetFilesInErrorView(): void\n {\n- Yii::$app->getView()->registerJsFile('somefile.js');\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJsFile('somefile.js');\n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n ob_start(); // suppress response output\n@@ -108,7 +110,10 @@ public function testClearAssetFilesInErrorView(): void\n public function testClearAssetFilesInErrorActionView(): void\n {\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\n- Yii::$app->getView()->registerJs(\"alert('hide me')\", View::POS_END);\n+\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJs(\"alert('hide me')\", View::POS_END);\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\ndiff --git a/tests/framework/web/FormatterTest.php b/tests/framework/web/FormatterTest.php\nindex 811de609b5c..7e4f1233c3f 100644\n--- a/tests/framework/web/FormatterTest.php\n+++ b/tests/framework/web/FormatterTest.php\n@@ -12,6 +12,9 @@\n use yii\\web\\Response;\n use yii\\web\\ResponseFormatterInterface;\n \n+/**\n+ * @template TFormatter of ResponseFormatterInterface\n+ */\n abstract class FormatterTest extends TestCase\n {\n /**\n@@ -19,7 +22,7 @@ abstract class FormatterTest extends TestCase\n */\n public $response;\n /**\n- * @var ResponseFormatterInterface\n+ * @var TFormatter\n */\n public $formatter;\n \n@@ -31,7 +34,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return ResponseFormatterInterface\n+ * @return TFormatter\n */\n abstract protected function getFormatterInstance();\n \ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\nindex a870a3bce12..0c7c9d74ea6 100644\n--- a/tests/framework/web/GroupUrlRuleTest.php\n+++ b/tests/framework/web/GroupUrlRuleTest.php\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertNull($rules->rules[0]->verb);\n \n $config = [\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(2, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertContains('GET', $rules->rules[0]->verb);\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\nindex 4e4fd418562..5bf144bf047 100644\n--- a/tests/framework/web/JsonResponseFormatterTest.php\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\n@@ -18,12 +18,11 @@\n * @since 2.0.3\n *\n * @group web\n+ *\n+ * @extends FormatterTest<JsonResponseFormatter>\n */\n class JsonResponseFormatterTest extends FormatterTest\n {\n- /**\n- * @return JsonResponseFormatter\n- */\n protected function getFormatterInstance($configuration = [])\n {\n return new JsonResponseFormatter($configuration);\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\nindex fb7914a934c..b7e79f2ea3b 100644\n--- a/tests/framework/web/MultipartFormDataParserTest.php\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\n@@ -200,6 +200,7 @@ public function testForce(): void\n $_POST = [\n 'existingName' => 'value',\n ];\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [\n 'existingFile' => [\n 'name' => 'file.txt',\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\nindex 58ebb6d9410..2f870ef82a1 100644\n--- a/tests/framework/web/UploadedFileTest.php\n+++ b/tests/framework/web/UploadedFileTest.php\n@@ -100,6 +100,7 @@ public function testSaveAs(): void\n \n public function testSaveFileFromMultipartFormDataParser(): void\n {\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [];\n UploadedFile::reset();\n $model = new ModelStub();\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\nindex 4fab6073741..6c9c18c50d5 100644\n--- a/tests/framework/web/UserIdentity.php\n+++ b/tests/framework/web/UserIdentity.php\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\n \n public static function findIdentity($id)\n {\n- if (in_array($id, static::$ids)) {\n+ if (in_array($id, self::$ids)) {\n $identitiy = new static();\n $identitiy->_id = $id;\n return $identitiy;\n }\n+\n+ return null;\n }\n \n public static function findIdentityByAccessToken($token, $type = null)\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\nindex 4eac43307d7..90ededa3eed 100644\n--- a/tests/framework/web/UserTest.php\n+++ b/tests/framework/web/UserTest.php\n@@ -14,7 +14,7 @@\n */\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n \n namespace yiiunit\\framework\\web;\n@@ -34,7 +34,7 @@ function time()\n class UserTest extends TestCase\n {\n /**\n- * @var int virtual time to be returned by mocked time() function.\n+ * @var int|null virtual time to be returned by mocked time() function.\n * Null means normal time() behavior.\n */\n public static $time;\n@@ -593,9 +593,9 @@ public function getCookies()\n \n class AccessChecker extends BaseObject implements CheckAccessInterface\n {\n- public function checkAccess($userId, $permissionName, $params = []): void\n+ public function checkAccess($userId, $permissionName, $params = []): bool\n {\n- // Implement checkAccess() method.\n+ return false;\n }\n }\n \ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\nindex 3ff9b154230..32c292aa72e 100644\n--- a/tests/framework/web/XmlResponseFormatterTest.php\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\n@@ -17,12 +17,13 @@\n * @since 2.0\n *\n * @group web\n+ *\n+ * @extends FormatterTest<XmlResponseFormatter>\n */\n class XmlResponseFormatterTest extends FormatterTest\n {\n /**\n * @param array $options\n- * @return XmlResponseFormatter\n */\n protected function getFormatterInstance($options = [])\n {\n","summary":"Edited 11 file(s) in tests/framework/web/"},{"subtask_id":"s6","scope_files":["tests/framework/web/session/AbstractDbSessionTest.php"],"solution_diff":"diff --git a/tests/framework/web/session/AbstractDbSessionTest.php b/tests/framework/web/session/AbstractDbSessionTest.php\nindex 92816c8f06f..979aa698c3c 100644\n--- a/tests/framework/web/session/AbstractDbSessionTest.php\n+++ b/tests/framework/web/session/AbstractDbSessionTest.php\n@@ -15,6 +15,7 @@\n use yii\\db\\Connection;\n use yii\\db\\Migration;\n use yii\\db\\Query;\n+use yii\\web\\Application;\n use yii\\web\\DbSession;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -265,11 +266,14 @@ public function testInstantiate(): void\n 'db' => 'sessionDb',\n ]);\n \n- $this->assertSame(Yii::$app->sessionDb, $session->db);\n+ /** @var Application&object{sessionDb: Connection} */\n+ $app = Yii::$app;\n+\n+ $this->assertSame($app->sessionDb, $session->db);\n $this->assertSame(300, $session->timeout);\n $session->close();\n \n- Yii::$app->set('db', Yii::$app->sessionDb);\n+ Yii::$app->set('db', $app->sessionDb);\n Yii::$app->set('sessionDb', null);\n ini_set('session.gc_maxlifetime', $oldTimeout);\n }\n","summary":"Edited 1 file(s) in tests/framework/web/session/"},{"subtask_id":"s7","scope_files":["tests/framework/web/stubs/FakeController.php","tests/framework/web/stubs/FakePhp71Controller.php","tests/framework/web/stubs/FakePhp7Controller.php","tests/framework/web/stubs/FakePhp80Controller.php","tests/framework/web/stubs/ModelBindingStub.php"],"solution_diff":"diff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\nsimilarity index 91%\nrename from tests/framework/web/FakeController.php\nrename to tests/framework/web/stubs/FakeController.php\nindex 0db3b91011b..53e303237e9 100644\n--- a/tests/framework/web/FakeController.php\n+++ b/tests/framework/web/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakePhp71Controller.php b/tests/framework/web/stubs/FakePhp71Controller.php\nsimilarity index 86%\nrename from tests/framework/web/FakePhp71Controller.php\nrename to tests/framework/web/stubs/FakePhp71Controller.php\nindex c9cf61a721c..d416f6c4b30 100644\n--- a/tests/framework/web/FakePhp71Controller.php\n+++ b/tests/framework/web/stubs/FakePhp71Controller.php\n@@ -6,13 +6,12 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\data\\DataProviderInterface;\n use yii\\web\\Controller;\n use yii\\web\\Request;\n-use yiiunit\\framework\\web\\stubs\\VendorImage;\n-use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n+use yiiunit\\framework\\web\\Post;\n \n /**\n * @author Sam Mousa<sam@mousa.nl>\ndiff --git a/tests/framework/web/FakePhp7Controller.php b/tests/framework/web/stubs/FakePhp7Controller.php\nsimilarity index 93%\nrename from tests/framework/web/FakePhp7Controller.php\nrename to tests/framework/web/stubs/FakePhp7Controller.php\nindex 9712964e958..008448d8ea3 100644\n--- a/tests/framework/web/FakePhp7Controller.php\n+++ b/tests/framework/web/stubs/FakePhp7Controller.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakePhp80Controller.php b/tests/framework/web/stubs/FakePhp80Controller.php\nsimilarity index 91%\nrename from tests/framework/web/FakePhp80Controller.php\nrename to tests/framework/web/stubs/FakePhp80Controller.php\nindex c6fd1b50346..276e42c98eb 100644\n--- a/tests/framework/web/FakePhp80Controller.php\n+++ b/tests/framework/web/stubs/FakePhp80Controller.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 165bf461745..db822995b34 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build()\n {\n","summary":"Edited 5 file(s) in tests/framework/web/stubs/"},{"subtask_id":"s8","scope_files":["tests/framework/widgets/ActiveFieldTest.php","tests/framework/widgets/ActiveFormTest.php","tests/framework/widgets/DetailViewTest.php"],"solution_diff":"diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\nindex cb48d3df87c..0b0acbedff3 100644\n--- a/tests/framework/widgets/ActiveFieldTest.php\n+++ b/tests/framework/widgets/ActiveFieldTest.php\n@@ -779,6 +779,8 @@ public function attributeHints()\n \n /**\n * Helper Classes.\n+ *\n+ * @property ActiveFieldTestModel $model\n */\n class ActiveFieldExtend extends ActiveField\n {\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\nindex 44564fea3e8..e42e3efae42 100644\n--- a/tests/framework/widgets/ActiveFormTest.php\n+++ b/tests/framework/widgets/ActiveFormTest.php\n@@ -68,8 +68,7 @@ public function testIssue5356(): void\n {\n $o = ['template' => '{input}'];\n \n- $model = new DynamicModel(['categories']);\n- $model->categories = 1;\n+ $model = new DynamicModel(['categories' => 1]);\n ob_start();\n $form = ActiveForm::begin(['action' => '/something', 'enableClientScript' => false]);\n ActiveForm::end();\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\nindex 1ecc72376c7..992b32b63ed 100644\n--- a/tests/framework/widgets/DetailViewTest.php\n+++ b/tests/framework/widgets/DetailViewTest.php\n@@ -19,9 +19,6 @@\n */\n class DetailViewTest extends TestCase\n {\n- /** @var DetailView */\n- public $detailView;\n-\n protected function setUp(): void\n {\n parent::setUp();\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -60,11 +57,11 @@ public function testAttributeValue(): void\n ],\n ]);\n \n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\n }\n \n@@ -77,7 +74,7 @@ public function testUnicodeAttributeNames(): void\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -88,11 +85,11 @@ public function testUnicodeAttributeNames(): void\n \n $this->assertEquals(\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\n );\n $this->assertEquals(\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\n );\n }\n \n@@ -101,7 +98,7 @@ public function testAttributeVisible(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -169,7 +166,7 @@ public function testAttributeVisible(): void\n 'value' => 'Displayed id',\n 'visible' => true,\n ],\n- ], $this->detailView->attributes);\n+ ], $detailView->attributes);\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\n }\n \n@@ -180,7 +177,7 @@ public function testRelationAttribute(): void\n $model->related = new ModelMock();\n $model->related->id = 'related';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -189,13 +186,13 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\n \n // test null relation\n $model->related = null;\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -204,8 +201,8 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\n }\n \n public function testArrayableModel(): void\n@@ -229,11 +226,11 @@ public function testArrayableModel(): void\n $model->id = 1;\n $model->text = 'I`m arrayable';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testObjectModel(): void\n@@ -257,11 +254,11 @@ public function testObjectModel(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testArrayModel(): void\n@@ -286,18 +283,18 @@ public function testArrayModel(): void\n 'text' => 'I`m an array',\n ];\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testOptionsTags(): void\n {\n $expectedValue = '<tr><th tooltip=\"Tooltip\">Text</th><td class=\"bg-red\">I`m an array</td></tr>';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => [\n 'text' => 'I`m an array',\n ],\n@@ -311,9 +308,9 @@ public function testOptionsTags(): void\n ],\n ]);\n \n- foreach ($this->detailView->attributes as $index => $attribute) {\n- $a = $this->detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ foreach ($detailView->attributes as $index => $attribute) {\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $renderingResult);\n }\n }\n \n@@ -327,7 +324,7 @@ public function testShouldTriggerInitEvent(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n 'on init' => function () use (&$initTriggered) {\n $initTriggered = true;\n@@ -352,6 +349,8 @@ class ArrayableMock implements Arrayable\n \n /**\n * Helper Class.\n+ *\n+ * @property mixed $related\n */\n class ModelMock extends Model\n {\n","summary":"Edited 3 file(s) in tests/framework/widgets/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"phpstan.dist.neon\"\n ],\n \"solution_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 4728321b2fe..4f6666327d7 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -14,8 +14,11 @@ parameters:\\n analyse:\\n - tests/data\\n - tests/framework/base/stub\\n+ - tests/framework/console/stubs\\n - tests/framework/di/stubs\\n - tests/framework/filters/stubs\\n+ - tests/framework/web/mocks\\n+ - tests/framework/web/stubs\\n # TODO: Analyze these directories\\n - tests/framework/db\\n - tests/framework/grid\\n@@ -30,8 +33,6 @@ parameters:\\n - tests/framework/rest\\n - tests/framework/test\\n - tests/framework/validators\\n- - tests/framework/web\\n- - tests/framework/widgets\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"tests/data/ar/Cat.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\\nindex 494294edeaa..e4856b05a3f 100644\\n--- a/tests/data/ar/Cat.php\\n+++ b/tests/data/ar/Cat.php\\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\\n \\n /**\\n * This is to test if __isset catches the exception.\\n- * @throw DivisionByZeroError\\n+ * @throws DivisionByZeroError\\n * @return float|int\\n */\\n public function getException()\\n@@ -43,7 +43,7 @@ public function getException()\\n \\n /**\\n * This is to test if __isset catches the error.\\n- * @throw DivisionByZeroError\\n+ * @throws DivisionByZeroError\\n * @return float|int\\n */\\n public function getThrowable()\\n\",\n \"summary\": \"Edited 1 file(s) in tests/data/ar/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"tests/framework/console/ControllerTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\\nindex e9932ceca9f..610be16a74e 100644\\n--- a/tests/framework/console/ControllerTest.php\\n+++ b/tests/framework/console/ControllerTest.php\\n@@ -18,6 +18,10 @@\\n use yii\\\\console\\\\Application;\\n use yii\\\\console\\\\Request;\\n use yii\\\\helpers\\\\Console;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakePhp71Controller;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -33,9 +37,9 @@ protected function setUp(): void\\n parent::setUp();\\n $this->mockApplication();\\n Yii::$app->controllerMap = [\\n- 'fake' => 'yiiunit\\\\framework\\\\console\\\\FakeController',\\n- 'fake_witout_output' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpControllerWithoutOutput',\\n- 'help' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpController',\\n+ 'fake' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController',\\n+ 'fake_without_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n+ 'help' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController',\\n ];\\n }\\n \\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/console/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"tests/framework/console/stubs/FakeController.php\",\n \"tests/framework/console/stubs/FakeHelpController.php\",\n \"tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\",\n \"tests/framework/console/stubs/FakePhp71Controller.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\\nsimilarity index 98%\\nrename from tests/framework/console/FakeController.php\\nrename to tests/framework/console/stubs/FakeController.php\\nindex 540cd1a0b57..dd8bfd54b55 100644\\n--- a/tests/framework/console/FakeController.php\\n+++ b/tests/framework/console/stubs/FakeController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\Controller;\\n use yii\\\\console\\\\Response;\\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\\nsimilarity index 93%\\nrename from tests/framework/console/FakeHelpController.php\\nrename to tests/framework/console/stubs/FakeHelpController.php\\nindex 34a9491a3d7..2be7d3aabe7 100644\\n--- a/tests/framework/console/FakeHelpController.php\\n+++ b/tests/framework/console/stubs/FakeHelpController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\controllers\\\\HelpController;\\n \\ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\nsimilarity index 90%\\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\nindex d9586dd9610..22c5bc7696c 100644\\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\console\\\\controllers\\\\HelpController;\\n \\ndiff --git a/tests/framework/console/FakePhp71Controller.php b/tests/framework/console/stubs/FakePhp71Controller.php\\nsimilarity index 88%\\nrename from tests/framework/console/FakePhp71Controller.php\\nrename to tests/framework/console/stubs/FakePhp71Controller.php\\nindex 9a4faca2e5c..fcc96b0372f 100644\\n--- a/tests/framework/console/FakePhp71Controller.php\\n+++ b/tests/framework/console/stubs/FakePhp71Controller.php\\n@@ -6,10 +6,9 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\console;\\n+namespace yiiunit\\\\framework\\\\console\\\\stubs;\\n \\n use yii\\\\data\\\\DataProviderInterface;\\n-use yiiunit\\\\framework\\\\console\\\\stubs\\\\DummyService;\\n use yii\\\\console\\\\Controller;\\n use yii\\\\console\\\\Request;\\n use yiiunit\\\\framework\\\\base\\\\Post;\\n\",\n \"summary\": \"Edited 4 file(s) in tests/framework/console/stubs/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"tests/framework/web/ControllerTest.php\",\n \"tests/framework/web/ErrorActionTest.php\",\n \"tests/framework/web/ErrorHandlerTest.php\",\n \"tests/framework/web/FormatterTest.php\",\n \"tests/framework/web/GroupUrlRuleTest.php\",\n \"tests/framework/web/JsonResponseFormatterTest.php\",\n \"tests/framework/web/MultipartFormDataParserTest.php\",\n \"tests/framework/web/UploadedFileTest.php\",\n \"tests/framework/web/UserIdentity.php\",\n \"tests/framework/web/UserTest.php\",\n \"tests/framework/web/XmlResponseFormatterTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\\nindex eea41c8d3a1..722baff5628 100644\\n--- a/tests/framework/web/ControllerTest.php\\n+++ b/tests/framework/web/ControllerTest.php\\n@@ -16,9 +16,14 @@\\n use Yii;\\n use yii\\\\base\\\\InlineAction;\\n use yii\\\\web\\\\BadRequestHttpException;\\n+use yii\\\\web\\\\Controller;\\n use yii\\\\web\\\\NotFoundHttpException;\\n use yii\\\\web\\\\Response;\\n use yii\\\\web\\\\ServerErrorHttpException;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakeController;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakePhp7Controller;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakePhp71Controller;\\n+use yiiunit\\\\framework\\\\web\\\\stubs\\\\FakePhp80Controller;\\n use yiiunit\\\\framework\\\\web\\\\stubs\\\\VendorImage;\\n use yiiunit\\\\TestCase;\\n \\n@@ -27,7 +32,7 @@\\n */\\n class ControllerTest extends TestCase\\n {\\n- /** @var FakeController */\\n+ /** @var Controller */\\n private $controller;\\n \\n protected function setUp(): void\\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\\nindex c5b55388757..63486693cf5 100644\\n--- a/tests/framework/web/ErrorActionTest.php\\n+++ b/tests/framework/web/ErrorActionTest.php\\n@@ -118,8 +118,5 @@ public function testLayout(): void\\n $this->getController([\\n 'layout' => 'non-existing',\\n ])->runAction('error');\\n-\\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\\\\\');\\n- $this->expectExceptionMessageRegExp('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\\n }\\n }\\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\\nindex a7bbf5b3668..06022646645 100644\\n--- a/tests/framework/web/ErrorHandlerTest.php\\n+++ b/tests/framework/web/ErrorHandlerTest.php\\n@@ -49,7 +49,7 @@ public function testCorrectResponseCodeInErrorView(): void\\n \\n public function testFormatRaw(): void\\n {\\n- Yii::$app->response->format = yii\\\\web\\\\Response::FORMAT_RAW;\\n+ Yii::$app->response->format = \\\\yii\\\\web\\\\Response::FORMAT_RAW;\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n@@ -69,7 +69,7 @@ public function testFormatRaw(): void\\n \\n public function testFormatXml(): void\\n {\\n- Yii::$app->response->format = yii\\\\web\\\\Response::FORMAT_XML;\\n+ Yii::$app->response->format = \\\\yii\\\\web\\\\Response::FORMAT_XML;\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n@@ -95,7 +95,9 @@ public function testFormatXml(): void\\n \\n public function testClearAssetFilesInErrorView(): void\\n {\\n- Yii::$app->getView()->registerJsFile('somefile.js');\\n+ $view = Yii::$app->getView();\\n+ $this->assertInstanceOf(View::class, $view);\\n+ $view->registerJsFile('somefile.js');\\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\n ob_start(); // suppress response output\\n@@ -108,7 +110,10 @@ public function testClearAssetFilesInErrorView(): void\\n public function testClearAssetFilesInErrorActionView(): void\\n {\\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\\n- Yii::$app->getView()->registerJs(\\\"alert('hide me')\\\", View::POS_END);\\n+\\n+ $view = Yii::$app->getView();\\n+ $this->assertInstanceOf(View::class, $view);\\n+ $view->registerJs(\\\"alert('hide me')\\\", View::POS_END);\\n \\n /** @var ErrorHandler $handler */\\n $handler = Yii::$app->getErrorHandler();\\ndiff --git a/tests/framework/web/FormatterTest.php b/tests/framework/web/FormatterTest.php\\nindex 811de609b5c..7e4f1233c3f 100644\\n--- a/tests/framework/web/FormatterTest.php\\n+++ b/tests/framework/web/FormatterTest.php\\n@@ -12,6 +12,9 @@\\n use yii\\\\web\\\\Response;\\n use yii\\\\web\\\\ResponseFormatterInterface;\\n \\n+/**\\n+ * @template TFormatter of ResponseFormatterInterface\\n+ */\\n abstract class FormatterTest extends TestCase\\n {\\n /**\\n@@ -19,7 +22,7 @@ abstract class FormatterTest extends TestCase\\n */\\n public $response;\\n /**\\n- * @var ResponseFormatterInterface\\n+ * @var TFormatter\\n */\\n public $formatter;\\n \\n@@ -31,7 +34,7 @@ protected function setUp(): void\\n }\\n \\n /**\\n- * @return ResponseFormatterInterface\\n+ * @return TFormatter\\n */\\n abstract protected function getFormatterInstance();\\n \\ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\\nindex a870a3bce12..0c7c9d74ea6 100644\\n--- a/tests/framework/web/GroupUrlRuleTest.php\\n+++ b/tests/framework/web/GroupUrlRuleTest.php\\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertNull($rules->rules[0]->verb);\\n \\n $config = [\\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(1, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(1, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\\n ],\\n ];\\n $rules = new GroupUrlRule($config);\\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\\n $this->assertCount(2, $rules->rules[0]->verb);\\n $this->assertContains('POST', $rules->rules[0]->verb);\\n $this->assertContains('GET', $rules->rules[0]->verb);\\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\\nindex 4e4fd418562..5bf144bf047 100644\\n--- a/tests/framework/web/JsonResponseFormatterTest.php\\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\\n@@ -18,12 +18,11 @@\\n * @since 2.0.3\\n *\\n * @group web\\n+ *\\n+ * @extends FormatterTest<JsonResponseFormatter>\\n */\\n class JsonResponseFormatterTest extends FormatterTest\\n {\\n- /**\\n- * @return JsonResponseFormatter\\n- */\\n protected function getFormatterInstance($configuration = [])\\n {\\n return new JsonResponseFormatter($configuration);\\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\\nindex fb7914a934c..b7e79f2ea3b 100644\\n--- a/tests/framework/web/MultipartFormDataParserTest.php\\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\\n@@ -200,6 +200,7 @@ public function testForce(): void\\n $_POST = [\\n 'existingName' => 'value',\\n ];\\n+ /** @var array<string, mixed> $_FILES */\\n $_FILES = [\\n 'existingFile' => [\\n 'name' => 'file.txt',\\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\\nindex 58ebb6d9410..2f870ef82a1 100644\\n--- a/tests/framework/web/UploadedFileTest.php\\n+++ b/tests/framework/web/UploadedFileTest.php\\n@@ -100,6 +100,7 @@ public function testSaveAs(): void\\n \\n public function testSaveFileFromMultipartFormDataParser(): void\\n {\\n+ /** @var array<string, mixed> $_FILES */\\n $_FILES = [];\\n UploadedFile::reset();\\n $model = new ModelStub();\\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\\nindex 4fab6073741..6c9c18c50d5 100644\\n--- a/tests/framework/web/UserIdentity.php\\n+++ b/tests/framework/web/UserIdentity.php\\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\\n \\n public static function findIdentity($id)\\n {\\n- if (in_array($id, static::$ids)) {\\n+ if (in_array($id, self::$ids)) {\\n $identitiy = new static();\\n $identitiy->_id = $id;\\n return $identitiy;\\n }\\n+\\n+ return null;\\n }\\n \\n public static function findIdentityByAccessToken($token, $type = null)\\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\\nindex 4eac43307d7..90ededa3eed 100644\\n--- a/tests/framework/web/UserTest.php\\n+++ b/tests/framework/web/UserTest.php\\n@@ -14,7 +14,7 @@\\n */\\n function time()\\n {\\n- return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?: \\\\time();\\n+ return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?? \\\\time();\\n }\\n \\n namespace yiiunit\\\\framework\\\\web;\\n@@ -34,7 +34,7 @@ function time()\\n class UserTest extends TestCase\\n {\\n /**\\n- * @var int virtual time to be returned by mocked time() function.\\n+ * @var int|null virtual time to be returned by mocked time() function.\\n * Null means normal time() behavior.\\n */\\n public static $time;\\n@@ -593,9 +593,9 @@ public function getCookies()\\n \\n class AccessChecker extends BaseObject implements CheckAccessInterface\\n {\\n- public function checkAccess($userId, $permissionName, $params = []): void\\n+ public function checkAccess($userId, $permissionName, $params = []): bool\\n {\\n- // Implement checkAccess() method.\\n+ return false;\\n }\\n }\\n \\ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\\nindex 3ff9b154230..32c292aa72e 100644\\n--- a/tests/framework/web/XmlResponseFormatterTest.php\\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\\n@@ -17,12 +17,13 @@\\n * @since 2.0\\n *\\n * @group web\\n+ *\\n+ * @extends FormatterTest<XmlResponseFormatter>\\n */\\n class XmlResponseFormatterTest extends FormatterTest\\n {\\n /**\\n * @param array $options\\n- * @return XmlResponseFormatter\\n */\\n protected function getFormatterInstance($options = [])\\n {\\n\",\n \"summary\": \"Edited 11 file(s) in tests/framework/web/\"\n },\n {\n \"subtask_id\": \"s6\",\n \"scope_files\": [\n \"tests/framework/web/session/AbstractDbSessionTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/session/AbstractDbSessionTest.php b/tests/framework/web/session/AbstractDbSessionTest.php\\nindex 92816c8f06f..979aa698c3c 100644\\n--- a/tests/framework/web/session/AbstractDbSessionTest.php\\n+++ b/tests/framework/web/session/AbstractDbSessionTest.php\\n@@ -15,6 +15,7 @@\\n use yii\\\\db\\\\Connection;\\n use yii\\\\db\\\\Migration;\\n use yii\\\\db\\\\Query;\\n+use yii\\\\web\\\\Application;\\n use yii\\\\web\\\\DbSession;\\n use yiiunit\\\\framework\\\\console\\\\controllers\\\\EchoMigrateController;\\n use yiiunit\\\\TestCase;\\n@@ -265,11 +266,14 @@ public function testInstantiate(): void\\n 'db' => 'sessionDb',\\n ]);\\n \\n- $this->assertSame(Yii::$app->sessionDb, $session->db);\\n+ /** @var Application&object{sessionDb: Connection} */\\n+ $app = Yii::$app;\\n+\\n+ $this->assertSame($app->sessionDb, $session->db);\\n $this->assertSame(300, $session->timeout);\\n $session->close();\\n \\n- Yii::$app->set('db', Yii::$app->sessionDb);\\n+ Yii::$app->set('db', $app->sessionDb);\\n Yii::$app->set('sessionDb', null);\\n ini_set('session.gc_maxlifetime', $oldTimeout);\\n }\\n\",\n \"summary\": \"Edited 1 file(s) in tests/framework/web/session/\"\n },\n {\n \"subtask_id\": \"s7\",\n \"scope_files\": [\n \"tests/framework/web/stubs/FakeController.php\",\n \"tests/framework/web/stubs/FakePhp71Controller.php\",\n \"tests/framework/web/stubs/FakePhp7Controller.php\",\n \"tests/framework/web/stubs/FakePhp80Controller.php\",\n \"tests/framework/web/stubs/ModelBindingStub.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\\nsimilarity index 91%\\nrename from tests/framework/web/FakeController.php\\nrename to tests/framework/web/stubs/FakeController.php\\nindex 0db3b91011b..53e303237e9 100644\\n--- a/tests/framework/web/FakeController.php\\n+++ b/tests/framework/web/stubs/FakeController.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\web\\\\Controller;\\n \\ndiff --git a/tests/framework/web/FakePhp71Controller.php b/tests/framework/web/stubs/FakePhp71Controller.php\\nsimilarity index 86%\\nrename from tests/framework/web/FakePhp71Controller.php\\nrename to tests/framework/web/stubs/FakePhp71Controller.php\\nindex c9cf61a721c..d416f6c4b30 100644\\n--- a/tests/framework/web/FakePhp71Controller.php\\n+++ b/tests/framework/web/stubs/FakePhp71Controller.php\\n@@ -6,13 +6,12 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\data\\\\DataProviderInterface;\\n use yii\\\\web\\\\Controller;\\n use yii\\\\web\\\\Request;\\n-use yiiunit\\\\framework\\\\web\\\\stubs\\\\VendorImage;\\n-use yiiunit\\\\framework\\\\web\\\\stubs\\\\ModelBindingStub;\\n+use yiiunit\\\\framework\\\\web\\\\Post;\\n \\n /**\\n * @author Sam Mousa<sam@mousa.nl>\\ndiff --git a/tests/framework/web/FakePhp7Controller.php b/tests/framework/web/stubs/FakePhp7Controller.php\\nsimilarity index 93%\\nrename from tests/framework/web/FakePhp7Controller.php\\nrename to tests/framework/web/stubs/FakePhp7Controller.php\\nindex 9712964e958..008448d8ea3 100644\\n--- a/tests/framework/web/FakePhp7Controller.php\\n+++ b/tests/framework/web/stubs/FakePhp7Controller.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\web\\\\Controller;\\n \\ndiff --git a/tests/framework/web/FakePhp80Controller.php b/tests/framework/web/stubs/FakePhp80Controller.php\\nsimilarity index 91%\\nrename from tests/framework/web/FakePhp80Controller.php\\nrename to tests/framework/web/stubs/FakePhp80Controller.php\\nindex c6fd1b50346..276e42c98eb 100644\\n--- a/tests/framework/web/FakePhp80Controller.php\\n+++ b/tests/framework/web/stubs/FakePhp80Controller.php\\n@@ -6,7 +6,7 @@\\n * @license https://www.yiiframework.com/license/\\n */\\n \\n-namespace yiiunit\\\\framework\\\\web;\\n+namespace yiiunit\\\\framework\\\\web\\\\stubs;\\n \\n use yii\\\\web\\\\Controller;\\n \\ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\\nindex 165bf461745..db822995b34 100644\\n--- a/tests/framework/web/stubs/ModelBindingStub.php\\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\\n@@ -8,8 +8,8 @@\\n class ModelBindingStub extends ActiveRecord\\n {\\n /**\\n- * @return self;\\n- * @throw NotFoundHttpException\\n+ * @return self\\n+ * @throws NotFoundHttpException\\n */\\n public static function build()\\n {\\n\",\n \"summary\": \"Edited 5 file(s) in tests/framework/web/stubs/\"\n },\n {\n \"subtask_id\": \"s8\",\n \"scope_files\": [\n \"tests/framework/widgets/ActiveFieldTest.php\",\n \"tests/framework/widgets/ActiveFormTest.php\",\n \"tests/framework/widgets/DetailViewTest.php\"\n ],\n \"solution_diff\": \"diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\\nindex cb48d3df87c..0b0acbedff3 100644\\n--- a/tests/framework/widgets/ActiveFieldTest.php\\n+++ b/tests/framework/widgets/ActiveFieldTest.php\\n@@ -779,6 +779,8 @@ public function attributeHints()\\n \\n /**\\n * Helper Classes.\\n+ *\\n+ * @property ActiveFieldTestModel $model\\n */\\n class ActiveFieldExtend extends ActiveField\\n {\\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\\nindex 44564fea3e8..e42e3efae42 100644\\n--- a/tests/framework/widgets/ActiveFormTest.php\\n+++ b/tests/framework/widgets/ActiveFormTest.php\\n@@ -68,8 +68,7 @@ public function testIssue5356(): void\\n {\\n $o = ['template' => '{input}'];\\n \\n- $model = new DynamicModel(['categories']);\\n- $model->categories = 1;\\n+ $model = new DynamicModel(['categories' => 1]);\\n ob_start();\\n $form = ActiveForm::begin(['action' => '/something', 'enableClientScript' => false]);\\n ActiveForm::end();\\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\\nindex 1ecc72376c7..992b32b63ed 100644\\n--- a/tests/framework/widgets/DetailViewTest.php\\n+++ b/tests/framework/widgets/DetailViewTest.php\\n@@ -19,9 +19,6 @@\\n */\\n class DetailViewTest extends TestCase\\n {\\n- /** @var DetailView */\\n- public $detailView;\\n-\\n protected function setUp(): void\\n {\\n parent::setUp();\\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -60,11 +57,11 @@ public function testAttributeValue(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -77,7 +74,7 @@ public function testUnicodeAttributeNames(): void\\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -88,11 +85,11 @@ public function testUnicodeAttributeNames(): void\\n \\n $this->assertEquals(\\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\\n );\\n $this->assertEquals(\\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\\n );\\n }\\n \\n@@ -101,7 +98,7 @@ public function testAttributeVisible(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -169,7 +166,7 @@ public function testAttributeVisible(): void\\n 'value' => 'Displayed id',\\n 'visible' => true,\\n ],\\n- ], $this->detailView->attributes);\\n+ ], $detailView->attributes);\\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -180,7 +177,7 @@ public function testRelationAttribute(): void\\n $model->related = new ModelMock();\\n $model->related->id = 'related';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -189,13 +186,13 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\\n \\n // test null relation\\n $model->related = null;\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -204,8 +201,8 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\\n }\\n \\n public function testArrayableModel(): void\\n@@ -229,11 +226,11 @@ public function testArrayableModel(): void\\n $model->id = 1;\\n $model->text = 'I`m arrayable';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testObjectModel(): void\\n@@ -257,11 +254,11 @@ public function testObjectModel(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testArrayModel(): void\\n@@ -286,18 +283,18 @@ public function testArrayModel(): void\\n 'text' => 'I`m an array',\\n ];\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testOptionsTags(): void\\n {\\n $expectedValue = '<tr><th tooltip=\\\"Tooltip\\\">Text</th><td class=\\\"bg-red\\\">I`m an array</td></tr>';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => [\\n 'text' => 'I`m an array',\\n ],\\n@@ -311,9 +308,9 @@ public function testOptionsTags(): void\\n ],\\n ]);\\n \\n- foreach ($this->detailView->attributes as $index => $attribute) {\\n- $a = $this->detailView->renderAttribute($attribute, $index);\\n- $this->assertEquals($expectedValue, $a);\\n+ foreach ($detailView->attributes as $index => $attribute) {\\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\\n+ $this->assertEquals($expectedValue, $renderingResult);\\n }\\n }\\n \\n@@ -327,7 +324,7 @@ public function testShouldTriggerInitEvent(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n 'on init' => function () use (&$initTriggered) {\\n $initTriggered = true;\\n@@ -352,6 +349,8 @@ class ArrayableMock implements Arrayable\\n \\n /**\\n * Helper Class.\\n+ *\\n+ * @property mixed $related\\n */\\n class ModelMock extends Model\\n {\\n\",\n \"summary\": \"Edited 3 file(s) in tests/framework/widgets/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"_โ ๏ธ Potential issue_ | _๐ Major_ | _๐๏ธ Heavy lift_\n\n**New exclusions contradict the PRโs analysis scope.**\n\nAdding `tests/framework/web/mocks` and `tests/framework/web/stubs` to `excludePaths.analyse` narrows analysis for the exact `web` area this PR is meant to cover. Please keep these paths analyzed and address the underlying PHPStan violations instead.\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@phpstan.dist.neon` around lines 19 - 20, Remove the two new exclusions from\nthe PHPStan analysis configuration so the web tests remain analyzed: edit the\nphpstan.dist.neon and delete the entries 'tests/framework/web/mocks' and\n'tests/framework/web/stubs' from the excludePaths.analyse array, then run\nPHPStan to surface violations and fix the reported issues in the web area\n(tests/framework/web/*) rather than suppressing them; ensure\nexcludePaths.analyse no longer contains those two paths.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..4f6666327d7 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -14,8 +14,11 @@ parameters:\n analyse:\n - tests/data\n - tests/framework/base/stub\n+ - tests/framework/console/stubs\n - tests/framework/di/stubs\n - tests/framework/filters/stubs\n+ - tests/framework/web/mocks\n+ - tests/framework/web/stubs\n # TODO: Analyze these directories\n - tests/framework/db\n - tests/framework/grid\n@@ -30,8 +33,6 @@ parameters:\n - tests/framework/rest\n - tests/framework/test\n - tests/framework/validators\n- - tests/framework/web\n- - tests/framework/widgets\n \n bootstrapFiles:\n - framework/BaseYii.php\n"},{"subtask_id":"s7","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Use standard exception PHPDoc tag (`@throws`).**\n\n`@throw` is not a standard PHPDoc tag; tools typically expect `@throws`. Please update it to keep static-analysis metadata effective.\n\n \n\n<details>\n<summary>Suggested fix</summary>\n\n```diff\n- * `@throw` NotFoundHttpException\n+ * `@throws` NotFoundHttpException\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n * `@return` self\n * `@throws` NotFoundHttpException\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/web/stubs/ModelBindingStub.php` around lines 11 - 12, The\nPHPDoc block in ModelBindingStub's method that currently uses \"@throw\nNotFoundHttpException\" should be changed to the standard \"@throws\nNotFoundHttpException\" tag; locate the PHPDoc above the method that returns self\nin the ModelBindingStub class and replace \"@throw\" with \"@throws\" so static\nanalysis tools recognize the exception annotation.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 165bf461745..db822995b34 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build()\n {\n"},{"subtask_id":"s5","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Verify the mocked time fallback operator used with nullable time.\nrg -n 'UserTest::\\$time\\s*\\?:\\s*\\\\time\\(\\)|UserTest::\\$time\\s*\\?\\?\\s*\\\\time\\(\\)' tests/framework/web/UserTest.php\n```\n\nRepository: yiisoft/yii2\n\nLength of output: 121\n\n---\n\n\n\n</details>\n\n**Use null-coalescing operator for the mocked time fallback.**\n\nThe `$time` property is typed as `int|null`, but line 17 uses the Elvis operator (`?:`), which treats `0` as falsy and incorrectly falls back to real time. The null-coalescing operator (`??`) respects the contract by falling back only when the value is `null`.\n\n<details>\n<summary>Suggested fix</summary>\n\n```diff\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n```\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/web/UserTest.php` around lines 37 - 40, The mock time\nfallback uses the Elvis operator which treats 0 as falsy; update the code that\nreturns the mocked time (references to the static property UserTest::$time\ninside the mocked time() implementation) to use the null-coalescing operator\n(??) instead of ?: so the real time is only used when $time is actually null,\npreserving correct behavior for 0 timestamps.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:hawk -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\nindex 4eac43307d7..90ededa3eed 100644\n--- a/tests/framework/web/UserTest.php\n+++ b/tests/framework/web/UserTest.php\n@@ -14,7 +14,7 @@\n */\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n \n namespace yiiunit\\framework\\web;\n@@ -34,7 +34,7 @@ function time()\n class UserTest extends TestCase\n {\n /**\n- * @var int virtual time to be returned by mocked time() function.\n+ * @var int|null virtual time to be returned by mocked time() function.\n * Null means normal time() behavior.\n */\n public static $time;\n@@ -593,9 +593,9 @@ public function getCookies()\n \n class AccessChecker extends BaseObject implements CheckAccessInterface\n {\n- public function checkAccess($userId, $permissionName, $params = []): void\n+ public function checkAccess($userId, $permissionName, $params = []): bool\n {\n- // Implement checkAccess() method.\n+ return false;\n }\n }\n \n"},{"subtask_id":"s8","comment":"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Rename variable to be more descriptive.**\n\nThe variable `$a` is too short and doesn't convey its purpose. Consider a more descriptive name like `$rendered` or `$renderedAttribute`.\n\n\n\n\n<details>\n<summary>โป๏ธ Proposed refactor</summary>\n\n```diff\n- $a = $detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ $rendered = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $rendered);\n```\n</details>\n\n<details>\n<summary>๐งฐ Tools</summary>\n\n<details>\n<summary>๐ช PHPMD (2.15.0)</summary>\n\n[warning] 312-312: Avoid variables with short names like $a. Configured minimum length is 3. (undefined)\n\n(ShortVariable)\n\n</details>\n\n</details>\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/widgets/DetailViewTest.php` at line 312, The variable $a in\nDetailViewTest (where $a = $detailView->renderAttribute($attribute, $index);) is\nnon-descriptiveโrename it to a clear name such as $rendered or\n$renderedAttribute and update all subsequent references within the same test\nmethod to use the new name; ensure you adjust any assertions or uses that read\n$a, and keep the call to $detailView->renderAttribute($attribute, $index)\nunchanged.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- d98c2f50 -->\n\n<!-- This is an auto-generated reply by CodeRabbit -->","revised_diff":"diff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\nindex 1ecc72376c7..992b32b63ed 100644\n--- a/tests/framework/widgets/DetailViewTest.php\n+++ b/tests/framework/widgets/DetailViewTest.php\n@@ -19,9 +19,6 @@\n */\n class DetailViewTest extends TestCase\n {\n- /** @var DetailView */\n- public $detailView;\n-\n protected function setUp(): void\n {\n parent::setUp();\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -60,11 +57,11 @@ public function testAttributeValue(): void\n ],\n ]);\n \n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\n }\n \n@@ -77,7 +74,7 @@ public function testUnicodeAttributeNames(): void\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -88,11 +85,11 @@ public function testUnicodeAttributeNames(): void\n \n $this->assertEquals(\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\n );\n $this->assertEquals(\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\n );\n }\n \n@@ -101,7 +98,7 @@ public function testAttributeVisible(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -169,7 +166,7 @@ public function testAttributeVisible(): void\n 'value' => 'Displayed id',\n 'visible' => true,\n ],\n- ], $this->detailView->attributes);\n+ ], $detailView->attributes);\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\n }\n \n@@ -180,7 +177,7 @@ public function testRelationAttribute(): void\n $model->related = new ModelMock();\n $model->related->id = 'related';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -189,13 +186,13 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\n \n // test null relation\n $model->related = null;\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -204,8 +201,8 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\n }\n \n public function testArrayableModel(): void\n@@ -229,11 +226,11 @@ public function testArrayableModel(): void\n $model->id = 1;\n $model->text = 'I`m arrayable';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testObjectModel(): void\n@@ -257,11 +254,11 @@ public function testObjectModel(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testArrayModel(): void\n@@ -286,18 +283,18 @@ public function testArrayModel(): void\n 'text' => 'I`m an array',\n ];\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testOptionsTags(): void\n {\n $expectedValue = '<tr><th tooltip=\"Tooltip\">Text</th><td class=\"bg-red\">I`m an array</td></tr>';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => [\n 'text' => 'I`m an array',\n ],\n@@ -311,9 +308,9 @@ public function testOptionsTags(): void\n ],\n ]);\n \n- foreach ($this->detailView->attributes as $index => $attribute) {\n- $a = $this->detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ foreach ($detailView->attributes as $index => $attribute) {\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $renderingResult);\n }\n }\n \n@@ -327,7 +324,7 @@ public function testShouldTriggerInitEvent(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n 'on init' => function () use (&$initTriggered) {\n $initTriggered = true;\n@@ -352,6 +349,8 @@ class ArrayableMock implements Arrayable\n \n /**\n * Helper Class.\n+ *\n+ * @property mixed $related\n */\n class ModelMock extends Model\n {\n"},{"subtask_id":"s3","comment":"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Fix typo in controller map key.**\n\nThe key `'fake_witout_output'` has a typoโit's missing the 'h' in \"without\". Since this line is being changed for the namespace update, this is a good opportunity to correct it.\n\n\n\n<details>\n<summary>๐ Proposed fix</summary>\n\n```diff\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n```\n</details>\n\n<!-- suggestion_start -->\n\n<details>\n<summary>๐ Committable suggestion</summary>\n\n> โผ๏ธ **IMPORTANT**\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\n\n```suggestion\n 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n```\n\n</details>\n\n<!-- suggestion_end -->\n\n<details>\n<summary>๐ค Prompt for AI Agents</summary>\n\n```\nVerify each finding against current code. Fix only still-valid issues, skip the\nrest with a brief reason, keep changes minimal, and validate.\n\nIn `@tests/framework/console/ControllerTest.php` at line 41, The controller map\ncontains a misspelled key 'fake_witout_output'โrename this map key to\n'fake_without_output' wherever it appears (e.g., in the controller map\ndefinition inside ControllerTest), ensuring any test lookups or references use\nthe corrected key; update related assertions or usages to the new\n'fake_without_output' identifier so names remain consistent with the controller\nclass 'FakeHelpControllerWithoutOutput'.\n```\n\n</details>\n\n<!-- fingerprinting:phantom:poseidon:puma -->\n\n<!-- 4e71b3a2 -->\n\n<!-- This is an auto-generated comment by CodeRabbit -->\n\nโ
Addressed in commit a1ececf","revised_diff":"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\nindex e9932ceca9f..610be16a74e 100644\n--- a/tests/framework/console/ControllerTest.php\n+++ b/tests/framework/console/ControllerTest.php\n@@ -18,6 +18,10 @@\n use yii\\console\\Application;\n use yii\\console\\Request;\n use yii\\helpers\\Console;\n+use yiiunit\\framework\\console\\stubs\\FakeController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput;\n+use yiiunit\\framework\\console\\stubs\\FakePhp71Controller;\n use yiiunit\\TestCase;\n \n /**\n@@ -33,9 +37,9 @@ protected function setUp(): void\n parent::setUp();\n $this->mockApplication();\n Yii::$app->controllerMap = [\n- 'fake' => 'yiiunit\\framework\\console\\FakeController',\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\FakeHelpControllerWithoutOutput',\n- 'help' => 'yiiunit\\framework\\console\\FakeHelpController',\n+ 'fake' => 'yiiunit\\framework\\console\\stubs\\FakeController',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'help' => 'yiiunit\\framework\\console\\stubs\\FakeHelpController',\n ];\n }\n \n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ Major_ | _๐๏ธ Heavy lift_\\n\\n**New exclusions contradict the PRโs analysis scope.**\\n\\nAdding `tests/framework/web/mocks` and `tests/framework/web/stubs` to `excludePaths.analyse` narrows analysis for the exact `web` area this PR is meant to cover. Please keep these paths analyzed and address the underlying PHPStan violations instead.\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@phpstan.dist.neon` around lines 19 - 20, Remove the two new exclusions from\\nthe PHPStan analysis configuration so the web tests remain analyzed: edit the\\nphpstan.dist.neon and delete the entries 'tests/framework/web/mocks' and\\n'tests/framework/web/stubs' from the excludePaths.analyse array, then run\\nPHPStan to surface violations and fix the reported issues in the web area\\n(tests/framework/web/*) rather than suppressing them; ensure\\nexcludePaths.analyse no longer contains those two paths.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\\nindex 4728321b2fe..4f6666327d7 100644\\n--- a/phpstan.dist.neon\\n+++ b/phpstan.dist.neon\\n@@ -14,8 +14,11 @@ parameters:\\n analyse:\\n - tests/data\\n - tests/framework/base/stub\\n+ - tests/framework/console/stubs\\n - tests/framework/di/stubs\\n - tests/framework/filters/stubs\\n+ - tests/framework/web/mocks\\n+ - tests/framework/web/stubs\\n # TODO: Analyze these directories\\n - tests/framework/db\\n - tests/framework/grid\\n@@ -30,8 +33,6 @@ parameters:\\n - tests/framework/rest\\n - tests/framework/test\\n - tests/framework/validators\\n- - tests/framework/web\\n- - tests/framework/widgets\\n \\n bootstrapFiles:\\n - framework/BaseYii.php\\n\"\n },\n {\n \"subtask_id\": \"s7\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Use standard exception PHPDoc tag (`@throws`).**\\n\\n`@throw` is not a standard PHPDoc tag; tools typically expect `@throws`. Please update it to keep static-analysis metadata effective.\\n\\n \\n\\n<details>\\n<summary>Suggested fix</summary>\\n\\n```diff\\n- * `@throw` NotFoundHttpException\\n+ * `@throws` NotFoundHttpException\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n * `@return` self\\n * `@throws` NotFoundHttpException\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/web/stubs/ModelBindingStub.php` around lines 11 - 12, The\\nPHPDoc block in ModelBindingStub's method that currently uses \\\"@throw\\nNotFoundHttpException\\\" should be changed to the standard \\\"@throws\\nNotFoundHttpException\\\" tag; locate the PHPDoc above the method that returns self\\nin the ModelBindingStub class and replace \\\"@throw\\\" with \\\"@throws\\\" so static\\nanalysis tools recognize the exception annotation.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\\nindex 165bf461745..db822995b34 100644\\n--- a/tests/framework/web/stubs/ModelBindingStub.php\\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\\n@@ -8,8 +8,8 @@\\n class ModelBindingStub extends ActiveRecord\\n {\\n /**\\n- * @return self;\\n- * @throw NotFoundHttpException\\n+ * @return self\\n+ * @throws NotFoundHttpException\\n */\\n public static function build()\\n {\\n\"\n },\n {\n \"subtask_id\": \"s5\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n<details>\\n<summary>๐งฉ Analysis chain</summary>\\n\\n๐ Script executed:\\n\\n```shell\\n#!/bin/bash\\n# Verify the mocked time fallback operator used with nullable time.\\nrg -n 'UserTest::\\\\$time\\\\s*\\\\?:\\\\s*\\\\\\\\time\\\\(\\\\)|UserTest::\\\\$time\\\\s*\\\\?\\\\?\\\\s*\\\\\\\\time\\\\(\\\\)' tests/framework/web/UserTest.php\\n```\\n\\nRepository: yiisoft/yii2\\n\\nLength of output: 121\\n\\n---\\n\\n\\n\\n</details>\\n\\n**Use null-coalescing operator for the mocked time fallback.**\\n\\nThe `$time` property is typed as `int|null`, but line 17 uses the Elvis operator (`?:`), which treats `0` as falsy and incorrectly falls back to real time. The null-coalescing operator (`??`) respects the contract by falling back only when the value is `null`.\\n\\n<details>\\n<summary>Suggested fix</summary>\\n\\n```diff\\n function time()\\n {\\n- return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?: \\\\time();\\n+ return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?? \\\\time();\\n }\\n```\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/web/UserTest.php` around lines 37 - 40, The mock time\\nfallback uses the Elvis operator which treats 0 as falsy; update the code that\\nreturns the mocked time (references to the static property UserTest::$time\\ninside the mocked time() implementation) to use the null-coalescing operator\\n(??) instead of ?: so the real time is only used when $time is actually null,\\npreserving correct behavior for 0 timestamps.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:hawk -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\\nindex 4eac43307d7..90ededa3eed 100644\\n--- a/tests/framework/web/UserTest.php\\n+++ b/tests/framework/web/UserTest.php\\n@@ -14,7 +14,7 @@\\n */\\n function time()\\n {\\n- return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?: \\\\time();\\n+ return \\\\yiiunit\\\\framework\\\\web\\\\UserTest::$time ?? \\\\time();\\n }\\n \\n namespace yiiunit\\\\framework\\\\web;\\n@@ -34,7 +34,7 @@ function time()\\n class UserTest extends TestCase\\n {\\n /**\\n- * @var int virtual time to be returned by mocked time() function.\\n+ * @var int|null virtual time to be returned by mocked time() function.\\n * Null means normal time() behavior.\\n */\\n public static $time;\\n@@ -593,9 +593,9 @@ public function getCookies()\\n \\n class AccessChecker extends BaseObject implements CheckAccessInterface\\n {\\n- public function checkAccess($userId, $permissionName, $params = []): void\\n+ public function checkAccess($userId, $permissionName, $params = []): bool\\n {\\n- // Implement checkAccess() method.\\n+ return false;\\n }\\n }\\n \\n\"\n },\n {\n \"subtask_id\": \"s8\",\n \"comment\": \"_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\\n\\n**Rename variable to be more descriptive.**\\n\\nThe variable `$a` is too short and doesn't convey its purpose. Consider a more descriptive name like `$rendered` or `$renderedAttribute`.\\n\\n\\n\\n\\n<details>\\n<summary>โป๏ธ Proposed refactor</summary>\\n\\n```diff\\n- $a = $detailView->renderAttribute($attribute, $index);\\n- $this->assertEquals($expectedValue, $a);\\n+ $rendered = $detailView->renderAttribute($attribute, $index);\\n+ $this->assertEquals($expectedValue, $rendered);\\n```\\n</details>\\n\\n<details>\\n<summary>๐งฐ Tools</summary>\\n\\n<details>\\n<summary>๐ช PHPMD (2.15.0)</summary>\\n\\n[warning] 312-312: Avoid variables with short names like $a. Configured minimum length is 3. (undefined)\\n\\n(ShortVariable)\\n\\n</details>\\n\\n</details>\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/widgets/DetailViewTest.php` at line 312, The variable $a in\\nDetailViewTest (where $a = $detailView->renderAttribute($attribute, $index);) is\\nnon-descriptiveโrename it to a clear name such as $rendered or\\n$renderedAttribute and update all subsequent references within the same test\\nmethod to use the new name; ensure you adjust any assertions or uses that read\\n$a, and keep the call to $detailView->renderAttribute($attribute, $index)\\nunchanged.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- d98c2f50 -->\\n\\n<!-- This is an auto-generated reply by CodeRabbit -->\",\n \"revised_diff\": \"diff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\\nindex 1ecc72376c7..992b32b63ed 100644\\n--- a/tests/framework/widgets/DetailViewTest.php\\n+++ b/tests/framework/widgets/DetailViewTest.php\\n@@ -19,9 +19,6 @@\\n */\\n class DetailViewTest extends TestCase\\n {\\n- /** @var DetailView */\\n- public $detailView;\\n-\\n protected function setUp(): void\\n {\\n parent::setUp();\\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -60,11 +57,11 @@ public function testAttributeValue(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -77,7 +74,7 @@ public function testUnicodeAttributeNames(): void\\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -88,11 +85,11 @@ public function testUnicodeAttributeNames(): void\\n \\n $this->assertEquals(\\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\\n );\\n $this->assertEquals(\\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\\n );\\n }\\n \\n@@ -101,7 +98,7 @@ public function testAttributeVisible(): void\\n $model = new ModelMock();\\n $model->id = 'id';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -169,7 +166,7 @@ public function testAttributeVisible(): void\\n 'value' => 'Displayed id',\\n 'visible' => true,\\n ],\\n- ], $this->detailView->attributes);\\n+ ], $detailView->attributes);\\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\\n }\\n \\n@@ -180,7 +177,7 @@ public function testRelationAttribute(): void\\n $model->related = new ModelMock();\\n $model->related->id = 'related';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -189,13 +186,13 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\\n \\n // test null relation\\n $model->related = null;\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => $model,\\n 'template' => '{label}:{value}',\\n 'attributes' => [\\n@@ -204,8 +201,8 @@ public function testRelationAttribute(): void\\n ],\\n ]);\\n \\n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\\n- $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\\n+ $this->assertEquals('Related Id:<span class=\\\"not-set\\\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\\n }\\n \\n public function testArrayableModel(): void\\n@@ -229,11 +226,11 @@ public function testArrayableModel(): void\\n $model->id = 1;\\n $model->text = 'I`m arrayable';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testObjectModel(): void\\n@@ -257,11 +254,11 @@ public function testObjectModel(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testArrayModel(): void\\n@@ -286,18 +283,18 @@ public function testArrayModel(): void\\n 'text' => 'I`m an array',\\n ];\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n ]);\\n \\n- $this->assertEquals($expectedValue, $this->detailView->attributes);\\n+ $this->assertEquals($expectedValue, $detailView->attributes);\\n }\\n \\n public function testOptionsTags(): void\\n {\\n $expectedValue = '<tr><th tooltip=\\\"Tooltip\\\">Text</th><td class=\\\"bg-red\\\">I`m an array</td></tr>';\\n \\n- $this->detailView = new PublicDetailView([\\n+ $detailView = new PublicDetailView([\\n 'model' => [\\n 'text' => 'I`m an array',\\n ],\\n@@ -311,9 +308,9 @@ public function testOptionsTags(): void\\n ],\\n ]);\\n \\n- foreach ($this->detailView->attributes as $index => $attribute) {\\n- $a = $this->detailView->renderAttribute($attribute, $index);\\n- $this->assertEquals($expectedValue, $a);\\n+ foreach ($detailView->attributes as $index => $attribute) {\\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\\n+ $this->assertEquals($expectedValue, $renderingResult);\\n }\\n }\\n \\n@@ -327,7 +324,7 @@ public function testShouldTriggerInitEvent(): void\\n $model->id = 1;\\n $model->text = 'I`m an object';\\n \\n- $this->detailView = new DetailView([\\n+ $detailView = new DetailView([\\n 'model' => $model,\\n 'on init' => function () use (&$initTriggered) {\\n $initTriggered = true;\\n@@ -352,6 +349,8 @@ class ArrayableMock implements Arrayable\\n \\n /**\\n * Helper Class.\\n+ *\\n+ * @property mixed $related\\n */\\n class ModelMock extends Model\\n {\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\\n\\n**Fix typo in controller map key.**\\n\\nThe key `'fake_witout_output'` has a typoโit's missing the 'h' in \\\"without\\\". Since this line is being changed for the namespace update, this is a good opportunity to correct it.\\n\\n\\n\\n<details>\\n<summary>๐ Proposed fix</summary>\\n\\n```diff\\n- 'fake_witout_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n+ 'fake_without_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n```\\n</details>\\n\\n<!-- suggestion_start -->\\n\\n<details>\\n<summary>๐ Committable suggestion</summary>\\n\\n> โผ๏ธ **IMPORTANT**\\n> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.\\n\\n```suggestion\\n 'fake_without_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n```\\n\\n</details>\\n\\n<!-- suggestion_end -->\\n\\n<details>\\n<summary>๐ค Prompt for AI Agents</summary>\\n\\n```\\nVerify each finding against current code. Fix only still-valid issues, skip the\\nrest with a brief reason, keep changes minimal, and validate.\\n\\nIn `@tests/framework/console/ControllerTest.php` at line 41, The controller map\\ncontains a misspelled key 'fake_witout_output'โrename this map key to\\n'fake_without_output' wherever it appears (e.g., in the controller map\\ndefinition inside ControllerTest), ensuring any test lookups or references use\\nthe corrected key; update related assertions or usages to the new\\n'fake_without_output' identifier so names remain consistent with the controller\\nclass 'FakeHelpControllerWithoutOutput'.\\n```\\n\\n</details>\\n\\n<!-- fingerprinting:phantom:poseidon:puma -->\\n\\n<!-- 4e71b3a2 -->\\n\\n<!-- This is an auto-generated comment by CodeRabbit -->\\n\\nโ
Addressed in commit a1ececf\",\n \"revised_diff\": \"diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\\nindex e9932ceca9f..610be16a74e 100644\\n--- a/tests/framework/console/ControllerTest.php\\n+++ b/tests/framework/console/ControllerTest.php\\n@@ -18,6 +18,10 @@\\n use yii\\\\console\\\\Application;\\n use yii\\\\console\\\\Request;\\n use yii\\\\helpers\\\\Console;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput;\\n+use yiiunit\\\\framework\\\\console\\\\stubs\\\\FakePhp71Controller;\\n use yiiunit\\\\TestCase;\\n \\n /**\\n@@ -33,9 +37,9 @@ protected function setUp(): void\\n parent::setUp();\\n $this->mockApplication();\\n Yii::$app->controllerMap = [\\n- 'fake' => 'yiiunit\\\\framework\\\\console\\\\FakeController',\\n- 'fake_witout_output' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpControllerWithoutOutput',\\n- 'help' => 'yiiunit\\\\framework\\\\console\\\\FakeHelpController',\\n+ 'fake' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeController',\\n+ 'fake_without_output' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpControllerWithoutOutput',\\n+ 'help' => 'yiiunit\\\\framework\\\\console\\\\stubs\\\\FakeHelpController',\\n ];\\n }\\n \\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..4f6666327d7 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -14,8 +14,11 @@ parameters:\n analyse:\n - tests/data\n - tests/framework/base/stub\n+ - tests/framework/console/stubs\n - tests/framework/di/stubs\n - tests/framework/filters/stubs\n+ - tests/framework/web/mocks\n+ - tests/framework/web/stubs\n # TODO: Analyze these directories\n - tests/framework/db\n - tests/framework/grid\n@@ -30,8 +33,6 @@ parameters:\n - tests/framework/rest\n - tests/framework/test\n - tests/framework/validators\n- - tests/framework/web\n- - tests/framework/widgets\n \n bootstrapFiles:\n - framework/BaseYii.php\n\ndiff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php\nindex 494294edeaa..e4856b05a3f 100644\n--- a/tests/data/ar/Cat.php\n+++ b/tests/data/ar/Cat.php\n@@ -33,7 +33,7 @@ public static function populateRecord($record, $row): void\n \n /**\n * This is to test if __isset catches the exception.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getException()\n@@ -43,7 +43,7 @@ public function getException()\n \n /**\n * This is to test if __isset catches the error.\n- * @throw DivisionByZeroError\n+ * @throws DivisionByZeroError\n * @return float|int\n */\n public function getThrowable()\ndiff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php\nindex e9932ceca9f..610be16a74e 100644\n--- a/tests/framework/console/ControllerTest.php\n+++ b/tests/framework/console/ControllerTest.php\n@@ -18,6 +18,10 @@\n use yii\\console\\Application;\n use yii\\console\\Request;\n use yii\\helpers\\Console;\n+use yiiunit\\framework\\console\\stubs\\FakeController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpController;\n+use yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput;\n+use yiiunit\\framework\\console\\stubs\\FakePhp71Controller;\n use yiiunit\\TestCase;\n \n /**\n@@ -33,9 +37,9 @@ protected function setUp(): void\n parent::setUp();\n $this->mockApplication();\n Yii::$app->controllerMap = [\n- 'fake' => 'yiiunit\\framework\\console\\FakeController',\n- 'fake_witout_output' => 'yiiunit\\framework\\console\\FakeHelpControllerWithoutOutput',\n- 'help' => 'yiiunit\\framework\\console\\FakeHelpController',\n+ 'fake' => 'yiiunit\\framework\\console\\stubs\\FakeController',\n+ 'fake_without_output' => 'yiiunit\\framework\\console\\stubs\\FakeHelpControllerWithoutOutput',\n+ 'help' => 'yiiunit\\framework\\console\\stubs\\FakeHelpController',\n ];\n }\n \ndiff --git a/tests/framework/console/FakeController.php b/tests/framework/console/stubs/FakeController.php\nsimilarity index 98%\nrename from tests/framework/console/FakeController.php\nrename to tests/framework/console/stubs/FakeController.php\nindex 540cd1a0b57..dd8bfd54b55 100644\n--- a/tests/framework/console/FakeController.php\n+++ b/tests/framework/console/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\Controller;\n use yii\\console\\Response;\ndiff --git a/tests/framework/console/FakeHelpController.php b/tests/framework/console/stubs/FakeHelpController.php\nsimilarity index 93%\nrename from tests/framework/console/FakeHelpController.php\nrename to tests/framework/console/stubs/FakeHelpController.php\nindex 34a9491a3d7..2be7d3aabe7 100644\n--- a/tests/framework/console/FakeHelpController.php\n+++ b/tests/framework/console/stubs/FakeHelpController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakeHelpControllerWithoutOutput.php b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nsimilarity index 90%\nrename from tests/framework/console/FakeHelpControllerWithoutOutput.php\nrename to tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\nindex d9586dd9610..22c5bc7696c 100644\n--- a/tests/framework/console/FakeHelpControllerWithoutOutput.php\n+++ b/tests/framework/console/stubs/FakeHelpControllerWithoutOutput.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\console\\controllers\\HelpController;\n \ndiff --git a/tests/framework/console/FakePhp71Controller.php b/tests/framework/console/stubs/FakePhp71Controller.php\nsimilarity index 88%\nrename from tests/framework/console/FakePhp71Controller.php\nrename to tests/framework/console/stubs/FakePhp71Controller.php\nindex 9a4faca2e5c..fcc96b0372f 100644\n--- a/tests/framework/console/FakePhp71Controller.php\n+++ b/tests/framework/console/stubs/FakePhp71Controller.php\n@@ -6,10 +6,9 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\console;\n+namespace yiiunit\\framework\\console\\stubs;\n \n use yii\\data\\DataProviderInterface;\n-use yiiunit\\framework\\console\\stubs\\DummyService;\n use yii\\console\\Controller;\n use yii\\console\\Request;\n use yiiunit\\framework\\base\\Post;\ndiff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php\nindex eea41c8d3a1..722baff5628 100644\n--- a/tests/framework/web/ControllerTest.php\n+++ b/tests/framework/web/ControllerTest.php\n@@ -16,9 +16,14 @@\n use Yii;\n use yii\\base\\InlineAction;\n use yii\\web\\BadRequestHttpException;\n+use yii\\web\\Controller;\n use yii\\web\\NotFoundHttpException;\n use yii\\web\\Response;\n use yii\\web\\ServerErrorHttpException;\n+use yiiunit\\framework\\web\\stubs\\FakeController;\n+use yiiunit\\framework\\web\\stubs\\FakePhp7Controller;\n+use yiiunit\\framework\\web\\stubs\\FakePhp71Controller;\n+use yiiunit\\framework\\web\\stubs\\FakePhp80Controller;\n use yiiunit\\framework\\web\\stubs\\VendorImage;\n use yiiunit\\TestCase;\n \n@@ -27,7 +32,7 @@\n */\n class ControllerTest extends TestCase\n {\n- /** @var FakeController */\n+ /** @var Controller */\n private $controller;\n \n protected function setUp(): void\ndiff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php\nindex c5b55388757..63486693cf5 100644\n--- a/tests/framework/web/ErrorActionTest.php\n+++ b/tests/framework/web/ErrorActionTest.php\n@@ -118,8 +118,5 @@ public function testLayout(): void\n $this->getController([\n 'layout' => 'non-existing',\n ])->runAction('error');\n-\n- $ds = preg_quote(DIRECTORY_SEPARATOR, '\\\\');\n- $this->expectExceptionMessageRegExp('#The view file does not exist: .*?views' . $ds . 'layouts' . $ds . 'non-existing.php#');\n }\n }\ndiff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php\nindex a7bbf5b3668..06022646645 100644\n--- a/tests/framework/web/ErrorHandlerTest.php\n+++ b/tests/framework/web/ErrorHandlerTest.php\n@@ -49,7 +49,7 @@ public function testCorrectResponseCodeInErrorView(): void\n \n public function testFormatRaw(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_RAW;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_RAW;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -69,7 +69,7 @@ public function testFormatRaw(): void\n \n public function testFormatXml(): void\n {\n- Yii::$app->response->format = yii\\web\\Response::FORMAT_XML;\n+ Yii::$app->response->format = \\yii\\web\\Response::FORMAT_XML;\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n@@ -95,7 +95,9 @@ public function testFormatXml(): void\n \n public function testClearAssetFilesInErrorView(): void\n {\n- Yii::$app->getView()->registerJsFile('somefile.js');\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJsFile('somefile.js');\n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\n ob_start(); // suppress response output\n@@ -108,7 +110,10 @@ public function testClearAssetFilesInErrorView(): void\n public function testClearAssetFilesInErrorActionView(): void\n {\n Yii::$app->getErrorHandler()->errorAction = 'test/error';\n- Yii::$app->getView()->registerJs(\"alert('hide me')\", View::POS_END);\n+\n+ $view = Yii::$app->getView();\n+ $this->assertInstanceOf(View::class, $view);\n+ $view->registerJs(\"alert('hide me')\", View::POS_END);\n \n /** @var ErrorHandler $handler */\n $handler = Yii::$app->getErrorHandler();\ndiff --git a/tests/framework/web/FormatterTest.php b/tests/framework/web/FormatterTest.php\nindex 811de609b5c..7e4f1233c3f 100644\n--- a/tests/framework/web/FormatterTest.php\n+++ b/tests/framework/web/FormatterTest.php\n@@ -12,6 +12,9 @@\n use yii\\web\\Response;\n use yii\\web\\ResponseFormatterInterface;\n \n+/**\n+ * @template TFormatter of ResponseFormatterInterface\n+ */\n abstract class FormatterTest extends TestCase\n {\n /**\n@@ -19,7 +22,7 @@ abstract class FormatterTest extends TestCase\n */\n public $response;\n /**\n- * @var ResponseFormatterInterface\n+ * @var TFormatter\n */\n public $formatter;\n \n@@ -31,7 +34,7 @@ protected function setUp(): void\n }\n \n /**\n- * @return ResponseFormatterInterface\n+ * @return TFormatter\n */\n abstract protected function getFormatterInstance();\n \ndiff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php\nindex a870a3bce12..0c7c9d74ea6 100644\n--- a/tests/framework/web/GroupUrlRuleTest.php\n+++ b/tests/framework/web/GroupUrlRuleTest.php\n@@ -72,6 +72,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertNull($rules->rules[0]->verb);\n \n $config = [\n@@ -81,6 +82,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -92,6 +94,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(1, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertEquals('admin/user/login', $rules->rules[0]->route);\n@@ -103,6 +106,7 @@ public function testParseVerb(): void\n ],\n ];\n $rules = new GroupUrlRule($config);\n+ $this->assertInstanceOf(UrlRule::class, $rules->rules[0]);\n $this->assertCount(2, $rules->rules[0]->verb);\n $this->assertContains('POST', $rules->rules[0]->verb);\n $this->assertContains('GET', $rules->rules[0]->verb);\ndiff --git a/tests/framework/web/JsonResponseFormatterTest.php b/tests/framework/web/JsonResponseFormatterTest.php\nindex 4e4fd418562..5bf144bf047 100644\n--- a/tests/framework/web/JsonResponseFormatterTest.php\n+++ b/tests/framework/web/JsonResponseFormatterTest.php\n@@ -18,12 +18,11 @@\n * @since 2.0.3\n *\n * @group web\n+ *\n+ * @extends FormatterTest<JsonResponseFormatter>\n */\n class JsonResponseFormatterTest extends FormatterTest\n {\n- /**\n- * @return JsonResponseFormatter\n- */\n protected function getFormatterInstance($configuration = [])\n {\n return new JsonResponseFormatter($configuration);\ndiff --git a/tests/framework/web/MultipartFormDataParserTest.php b/tests/framework/web/MultipartFormDataParserTest.php\nindex fb7914a934c..b7e79f2ea3b 100644\n--- a/tests/framework/web/MultipartFormDataParserTest.php\n+++ b/tests/framework/web/MultipartFormDataParserTest.php\n@@ -200,6 +200,7 @@ public function testForce(): void\n $_POST = [\n 'existingName' => 'value',\n ];\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [\n 'existingFile' => [\n 'name' => 'file.txt',\ndiff --git a/tests/framework/web/UploadedFileTest.php b/tests/framework/web/UploadedFileTest.php\nindex 58ebb6d9410..2f870ef82a1 100644\n--- a/tests/framework/web/UploadedFileTest.php\n+++ b/tests/framework/web/UploadedFileTest.php\n@@ -100,6 +100,7 @@ public function testSaveAs(): void\n \n public function testSaveFileFromMultipartFormDataParser(): void\n {\n+ /** @var array<string, mixed> $_FILES */\n $_FILES = [];\n UploadedFile::reset();\n $model = new ModelStub();\ndiff --git a/tests/framework/web/UserIdentity.php b/tests/framework/web/UserIdentity.php\nindex 4fab6073741..6c9c18c50d5 100644\n--- a/tests/framework/web/UserIdentity.php\n+++ b/tests/framework/web/UserIdentity.php\n@@ -18,11 +18,13 @@ class UserIdentity extends Component implements IdentityInterface\n \n public static function findIdentity($id)\n {\n- if (in_array($id, static::$ids)) {\n+ if (in_array($id, self::$ids)) {\n $identitiy = new static();\n $identitiy->_id = $id;\n return $identitiy;\n }\n+\n+ return null;\n }\n \n public static function findIdentityByAccessToken($token, $type = null)\ndiff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php\nindex 4eac43307d7..90ededa3eed 100644\n--- a/tests/framework/web/UserTest.php\n+++ b/tests/framework/web/UserTest.php\n@@ -14,7 +14,7 @@\n */\n function time()\n {\n- return \\yiiunit\\framework\\web\\UserTest::$time ?: \\time();\n+ return \\yiiunit\\framework\\web\\UserTest::$time ?? \\time();\n }\n \n namespace yiiunit\\framework\\web;\n@@ -34,7 +34,7 @@ function time()\n class UserTest extends TestCase\n {\n /**\n- * @var int virtual time to be returned by mocked time() function.\n+ * @var int|null virtual time to be returned by mocked time() function.\n * Null means normal time() behavior.\n */\n public static $time;\n@@ -593,9 +593,9 @@ public function getCookies()\n \n class AccessChecker extends BaseObject implements CheckAccessInterface\n {\n- public function checkAccess($userId, $permissionName, $params = []): void\n+ public function checkAccess($userId, $permissionName, $params = []): bool\n {\n- // Implement checkAccess() method.\n+ return false;\n }\n }\n \ndiff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php\nindex 3ff9b154230..32c292aa72e 100644\n--- a/tests/framework/web/XmlResponseFormatterTest.php\n+++ b/tests/framework/web/XmlResponseFormatterTest.php\n@@ -17,12 +17,13 @@\n * @since 2.0\n *\n * @group web\n+ *\n+ * @extends FormatterTest<XmlResponseFormatter>\n */\n class XmlResponseFormatterTest extends FormatterTest\n {\n /**\n * @param array $options\n- * @return XmlResponseFormatter\n */\n protected function getFormatterInstance($options = [])\n {\ndiff --git a/tests/framework/web/session/AbstractDbSessionTest.php b/tests/framework/web/session/AbstractDbSessionTest.php\nindex 92816c8f06f..979aa698c3c 100644\n--- a/tests/framework/web/session/AbstractDbSessionTest.php\n+++ b/tests/framework/web/session/AbstractDbSessionTest.php\n@@ -15,6 +15,7 @@\n use yii\\db\\Connection;\n use yii\\db\\Migration;\n use yii\\db\\Query;\n+use yii\\web\\Application;\n use yii\\web\\DbSession;\n use yiiunit\\framework\\console\\controllers\\EchoMigrateController;\n use yiiunit\\TestCase;\n@@ -265,11 +266,14 @@ public function testInstantiate(): void\n 'db' => 'sessionDb',\n ]);\n \n- $this->assertSame(Yii::$app->sessionDb, $session->db);\n+ /** @var Application&object{sessionDb: Connection} */\n+ $app = Yii::$app;\n+\n+ $this->assertSame($app->sessionDb, $session->db);\n $this->assertSame(300, $session->timeout);\n $session->close();\n \n- Yii::$app->set('db', Yii::$app->sessionDb);\n+ Yii::$app->set('db', $app->sessionDb);\n Yii::$app->set('sessionDb', null);\n ini_set('session.gc_maxlifetime', $oldTimeout);\n }\ndiff --git a/tests/framework/web/FakeController.php b/tests/framework/web/stubs/FakeController.php\nsimilarity index 91%\nrename from tests/framework/web/FakeController.php\nrename to tests/framework/web/stubs/FakeController.php\nindex 0db3b91011b..53e303237e9 100644\n--- a/tests/framework/web/FakeController.php\n+++ b/tests/framework/web/stubs/FakeController.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakePhp71Controller.php b/tests/framework/web/stubs/FakePhp71Controller.php\nsimilarity index 86%\nrename from tests/framework/web/FakePhp71Controller.php\nrename to tests/framework/web/stubs/FakePhp71Controller.php\nindex c9cf61a721c..d416f6c4b30 100644\n--- a/tests/framework/web/FakePhp71Controller.php\n+++ b/tests/framework/web/stubs/FakePhp71Controller.php\n@@ -6,13 +6,12 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\data\\DataProviderInterface;\n use yii\\web\\Controller;\n use yii\\web\\Request;\n-use yiiunit\\framework\\web\\stubs\\VendorImage;\n-use yiiunit\\framework\\web\\stubs\\ModelBindingStub;\n+use yiiunit\\framework\\web\\Post;\n \n /**\n * @author Sam Mousa<sam@mousa.nl>\ndiff --git a/tests/framework/web/FakePhp7Controller.php b/tests/framework/web/stubs/FakePhp7Controller.php\nsimilarity index 93%\nrename from tests/framework/web/FakePhp7Controller.php\nrename to tests/framework/web/stubs/FakePhp7Controller.php\nindex 9712964e958..008448d8ea3 100644\n--- a/tests/framework/web/FakePhp7Controller.php\n+++ b/tests/framework/web/stubs/FakePhp7Controller.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/FakePhp80Controller.php b/tests/framework/web/stubs/FakePhp80Controller.php\nsimilarity index 91%\nrename from tests/framework/web/FakePhp80Controller.php\nrename to tests/framework/web/stubs/FakePhp80Controller.php\nindex c6fd1b50346..276e42c98eb 100644\n--- a/tests/framework/web/FakePhp80Controller.php\n+++ b/tests/framework/web/stubs/FakePhp80Controller.php\n@@ -6,7 +6,7 @@\n * @license https://www.yiiframework.com/license/\n */\n \n-namespace yiiunit\\framework\\web;\n+namespace yiiunit\\framework\\web\\stubs;\n \n use yii\\web\\Controller;\n \ndiff --git a/tests/framework/web/stubs/ModelBindingStub.php b/tests/framework/web/stubs/ModelBindingStub.php\nindex 165bf461745..db822995b34 100644\n--- a/tests/framework/web/stubs/ModelBindingStub.php\n+++ b/tests/framework/web/stubs/ModelBindingStub.php\n@@ -8,8 +8,8 @@\n class ModelBindingStub extends ActiveRecord\n {\n /**\n- * @return self;\n- * @throw NotFoundHttpException\n+ * @return self\n+ * @throws NotFoundHttpException\n */\n public static function build()\n {\ndiff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php\nindex cb48d3df87c..0b0acbedff3 100644\n--- a/tests/framework/widgets/ActiveFieldTest.php\n+++ b/tests/framework/widgets/ActiveFieldTest.php\n@@ -779,6 +779,8 @@ public function attributeHints()\n \n /**\n * Helper Classes.\n+ *\n+ * @property ActiveFieldTestModel $model\n */\n class ActiveFieldExtend extends ActiveField\n {\ndiff --git a/tests/framework/widgets/ActiveFormTest.php b/tests/framework/widgets/ActiveFormTest.php\nindex 44564fea3e8..e42e3efae42 100644\n--- a/tests/framework/widgets/ActiveFormTest.php\n+++ b/tests/framework/widgets/ActiveFormTest.php\n@@ -68,8 +68,7 @@ public function testIssue5356(): void\n {\n $o = ['template' => '{input}'];\n \n- $model = new DynamicModel(['categories']);\n- $model->categories = 1;\n+ $model = new DynamicModel(['categories' => 1]);\n ob_start();\n $form = ActiveForm::begin(['action' => '/something', 'enableClientScript' => false]);\n ActiveForm::end();\ndiff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php\nindex 1ecc72376c7..992b32b63ed 100644\n--- a/tests/framework/widgets/DetailViewTest.php\n+++ b/tests/framework/widgets/DetailViewTest.php\n@@ -19,9 +19,6 @@\n */\n class DetailViewTest extends TestCase\n {\n- /** @var DetailView */\n- public $detailView;\n-\n protected function setUp(): void\n {\n parent::setUp();\n@@ -34,7 +31,7 @@ public function testAttributeValue(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -60,11 +57,11 @@ public function testAttributeValue(): void\n ],\n ]);\n \n- $this->assertEquals('Id:id', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n- $this->assertEquals('Id:1', $this->detailView->renderAttribute($this->detailView->attributes[2], 2));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[3], 3));\n- $this->assertEquals('Id:Displayed id', $this->detailView->renderAttribute($this->detailView->attributes[4], 4));\n+ $this->assertEquals('Id:id', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[1], 1));\n+ $this->assertEquals('Id:1', $detailView->renderAttribute($detailView->attributes[2], 2));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[3], 3));\n+ $this->assertEquals('Id:Displayed id', $detailView->renderAttribute($detailView->attributes[4], 4));\n $this->assertEquals(2, $model->getDisplayedIdCallCount());\n }\n \n@@ -77,7 +74,7 @@ public function testUnicodeAttributeNames(): void\n $model->ะะดะตะฝัะธัะธะบะฐัะพัะขะพะฒะฐัะฐ = 'A00001';\n $model->ฯฮฟ_ฮฑฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ_ฯฮฟฯ
= 'A00002';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -88,11 +85,11 @@ public function testUnicodeAttributeNames(): void\n \n $this->assertEquals(\n 'ะะดะตะฝัะธัะธะบะฐัะพั ะขะพะฒะฐัะฐ:A00001',\n- $this->detailView->renderAttribute($this->detailView->attributes[0], 0)\n+ $detailView->renderAttribute($detailView->attributes[0], 0)\n );\n $this->assertEquals(\n 'ฮคฮฟ ฮฮฝฮฑฮณฮฝฯฯฮนฯฯฮนฮบฯ ฮคฮฟฯ
:A00002',\n- $this->detailView->renderAttribute($this->detailView->attributes[1], 1)\n+ $detailView->renderAttribute($detailView->attributes[1], 1)\n );\n }\n \n@@ -101,7 +98,7 @@ public function testAttributeVisible(): void\n $model = new ModelMock();\n $model->id = 'id';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -169,7 +166,7 @@ public function testAttributeVisible(): void\n 'value' => 'Displayed id',\n 'visible' => true,\n ],\n- ], $this->detailView->attributes);\n+ ], $detailView->attributes);\n $this->assertEquals(5, $model->getDisplayedIdCallCount());\n }\n \n@@ -180,7 +177,7 @@ public function testRelationAttribute(): void\n $model->related = new ModelMock();\n $model->related->id = 'related';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -189,13 +186,13 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:related', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:related', $detailView->renderAttribute($detailView->attributes[1], 1));\n \n // test null relation\n $model->related = null;\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => $model,\n 'template' => '{label}:{value}',\n 'attributes' => [\n@@ -204,8 +201,8 @@ public function testRelationAttribute(): void\n ],\n ]);\n \n- $this->assertEquals('Id:model', $this->detailView->renderAttribute($this->detailView->attributes[0], 0));\n- $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $this->detailView->renderAttribute($this->detailView->attributes[1], 1));\n+ $this->assertEquals('Id:model', $detailView->renderAttribute($detailView->attributes[0], 0));\n+ $this->assertEquals('Related Id:<span class=\"not-set\">(not set)</span>', $detailView->renderAttribute($detailView->attributes[1], 1));\n }\n \n public function testArrayableModel(): void\n@@ -229,11 +226,11 @@ public function testArrayableModel(): void\n $model->id = 1;\n $model->text = 'I`m arrayable';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testObjectModel(): void\n@@ -257,11 +254,11 @@ public function testObjectModel(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testArrayModel(): void\n@@ -286,18 +283,18 @@ public function testArrayModel(): void\n 'text' => 'I`m an array',\n ];\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n ]);\n \n- $this->assertEquals($expectedValue, $this->detailView->attributes);\n+ $this->assertEquals($expectedValue, $detailView->attributes);\n }\n \n public function testOptionsTags(): void\n {\n $expectedValue = '<tr><th tooltip=\"Tooltip\">Text</th><td class=\"bg-red\">I`m an array</td></tr>';\n \n- $this->detailView = new PublicDetailView([\n+ $detailView = new PublicDetailView([\n 'model' => [\n 'text' => 'I`m an array',\n ],\n@@ -311,9 +308,9 @@ public function testOptionsTags(): void\n ],\n ]);\n \n- foreach ($this->detailView->attributes as $index => $attribute) {\n- $a = $this->detailView->renderAttribute($attribute, $index);\n- $this->assertEquals($expectedValue, $a);\n+ foreach ($detailView->attributes as $index => $attribute) {\n+ $renderingResult = $detailView->renderAttribute($attribute, $index);\n+ $this->assertEquals($expectedValue, $renderingResult);\n }\n }\n \n@@ -327,7 +324,7 @@ public function testShouldTriggerInitEvent(): void\n $model->id = 1;\n $model->text = 'I`m an object';\n \n- $this->detailView = new DetailView([\n+ $detailView = new DetailView([\n 'model' => $model,\n 'on init' => function () use (&$initTriggered) {\n $initTriggered = true;\n@@ -352,6 +349,8 @@ class ArrayableMock implements Arrayable\n \n /**\n * Helper Class.\n+ *\n+ * @property mixed $related\n */\n class ModelMock extends Model\n {\n"},"num_subtasks":{"kind":"number","value":8,"string":"8"},"num_changed_files":{"kind":"number","value":27,"string":"27"}}},{"rowIdx":34272,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16948"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16948,"string":"16,948"},"base_sha":{"kind":"string","value":"9055188250348c3e6e29eee53e5fb3dc2c951977"},"head_sha":{"kind":"string","value":"6e6bbb28ac54af9c9ba05de637160d9824ebae42"},"task":{"kind":"string","value":"[youtube] yt-dlp occasionally only fetches the first 100 vids of a playlist\n\n### Checklist\n\n- [x] I'm reporting that yt-dlp is broken on a **supported** site\n- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))\n- [x] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [x] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [x] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates\n- [x] I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\n_No response_\n\n### Provide a description that is worded well enough to be understood\n\nwhen passing a playlist to yt-dlp, it may only fetch the first100 vids instead of the whole playlist (dependent on cookies). \n\n### Provide verbose output that clearly demonstrates the problem\n\n- [x] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [x] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', '--extractor-args', 'youtube:player-client=default,mweb', '--extractor-args', 'youtube:po_token=web.gvs+MlNOOnJn8-RkIE4GDmkBL1uYCU_XaYsPBzV9F7fWQEzdEZEegsU1zLnU8A1-NK6TX1OuJXkb-6IGaxyT2TuZqVfg9oa9ZZJGLPCKh56kOiaUpBntgg', '-N', '8', '--sleep-requests', '4', '--min-sleep-interval', '10', '--max-sleep-interval', '30', '--cookies', '/sharedfolders/ZFSLive/yt-dlp/www.youtube.com_cookies.txt', '--no-wait-for-video', '--download-archive', '/sharedfolders/ZFSLive/yt-dlp/dl.txt', '-o', '/sharedfolders/Snapraid/VT/%(uploader)s/[%(upload_date)s]%(title)s[%(id)s].%(ext)s', '-a', '41.txt', '-I', '::-1', '-N', '8']\n[debug] User config \"/home/nas/yt-dlp.conf\": ['--remote-components', 'ejs:github', '-f', 'bestvideo*[width>=720][width<=?1920]+bestaudio', '--write-description', '--write-thumbnail', '--downloader', 'aria2c', '--downloader-args', 'aria2c:-j 8 -x 8 -s 8', '-o', '/sharedfolders/ZFSLive/VT/%(uploader)s/[%(upload_date)s]%(title)s[%(id)s].%(ext)s', '--download-archive', '/sharedfolders/ZFSLive/yt-dlp/dl.txt', '--live-from-start', '--wait-for-video', '5', '--cookies', '~/www.youtube.com_cookies.txt']\n[debug] Batch file urls: ['https://www.youtube.com/playlist?list=UUE3-vQDHVnTvk1Pay7HyCJg', 'https://www.youtube.com/playlist?list=UUBJ6nejlzes6mm9UruaxQsA']\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8 (No ANSI), error utf-8, screen utf-8 (No ANSI)\n[debug] yt-dlp version nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds (linux_exe)\n[debug] Python 3.13.13 (CPython x86_64 64bit) - Linux-6.1.15-1-pve-x86_64-with-glibc2.36 (OpenSSL 3.5.6 7 Apr 2026, glibc 2.36)\n[debug] exe versions: ffmpeg 5.1.8-0 (setts), ffprobe 5.1.8-0\n[debug] Optional libraries: Cryptodome-3.23.0, brotli-1.2.0, certifi-2026.04.22, curl_cffi-0.15.0, mutagen-1.47.0, requests-2.33.1, secretstorage-3.5.0, sqlite3-3.53.0, urllib3-2.6.3, websockets-16.0, yt_dlp_ejs-0.8.0\n[debug] JS runtimes: deno-2.6.3\n[debug] Proxy map: {}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Plugin directories: none\n[debug] Loaded 1864 extractors\n[debug] Loading archive file '/sharedfolders/ZFSLive/yt-dlp/dl.txt'\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest\nLatest version: nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds\nyt-dlp is up to date (nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds)\n[debug] [youtube:tab] Found YouTube account cookies\n[youtube:tab] Extracting URL: https://www.youtube.com/playlist?list=UUE3-vQDHVnTvk1Pay7HyCJg\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg: Downloading webpage\n[youtube:tab] Sleeping 4.0 seconds ...\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg: Redownloading playlist API JSON with unavailable videos\n[download] Downloading playlist: Uploads from Hoshikage Tetra\n[info] Writing playlist description to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].description\nDeleting existing file /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].jpg\n[info] Downloading playlist thumbnail 3 ...\n[info] Writing playlist thumbnail 3 to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].jpg\n[youtube:tab] Playlist Uploads from Hoshikage Tetra: Downloading 100 items of 384\n[download] Downloading item 1 of 100\n[debug] [youtube] Found YouTube account cookies\n[debug] [youtube] [pot] PO Token Providers: none\n[debug] [youtube] [pot] PO Token Cache Providers: memory\n[debug] [youtube] [pot] PO Token Cache Spec Providers: webpo\n[debug] [youtube] [jsc] JS Challenge Providers: bun (unavailable), deno, node (unavailable), quickjs (unavailable)\n[youtube] Extracting URL: https://www.youtube.com/watch?v=635ZnN_RtdI\n[youtube] Sleeping 4.0 seconds ...\n\nfrom successful cookie:\n bash 41.sh\n[debug] Command-line config: ['-vU', '--extractor-args', 'youtube:player-client=default,mweb', '--extractor-args', 'youtube:po_token=web.gvs+MlNOOnJn8-RkIE4GDmkBL1uYCU_XaYsPBzV9F7fWQEzdEZEegsU1zLnU8A1-NK6TX1OuJXkb-6IGaxyT2TuZqVfg9oa9ZZJGLPCKh56kOiaUpBntgg', '-N', '8', '--sleep-requests', '4', '--min-sleep-interval', '10', '--max-sleep-interval', '30', '--cookies', '/sharedfolders/ZFSLive/yt-dlp/www.youtube.com_cookies.txt', '--no-wait-for-video', '--download-archive', '/sharedfolders/ZFSLive/yt-dlp/dl.txt', '-o', '/sharedfolders/Snapraid/VT/%(uploader)s/[%(upload_date)s]%(title)s[%(id)s].%(ext)s', '-a', '41.txt', '-I', '::-1', '-N', '8']\n[debug] User config \"/home/nas/yt-dlp.conf\": ['--remote-components', 'ejs:github', '-f', 'bestvideo*[width>=720][width<=?1920]+bestaudio', '--write-description', '--write-thumbnail', '--downloader', 'aria2c', '--downloader-args', 'aria2c:-j 8 -x 8 -s 8', '-o', '/sharedfolders/ZFSLive/VT/%(uploader)s/[%(upload_date)s]%(title)s[%(id)s].%(ext)s', '--download-archive', '/sharedfolders/ZFSLive/yt-dlp/dl.txt', '--live-from-start', '--wait-for-video', '5', '--cookies', '~/www.youtube.com_cookies.txt']\n[debug] Batch file urls: ['https://www.youtube.com/playlist?list=UUE3-vQDHVnTvk1Pay7HyCJg', 'https://www.youtube.com/playlist?list=UUBJ6nejlzes6mm9UruaxQsA']\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8 (No ANSI), error utf-8, screen utf-8 (No ANSI)\n[debug] yt-dlp version nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds (linux_exe)\n[debug] Python 3.13.13 (CPython x86_64 64bit) - Linux-6.1.15-1-pve-x86_64-with-glibc2.36 (OpenSSL 3.5.6 7 Apr 2026, glibc 2.36)\n[debug] exe versions: ffmpeg 5.1.8-0 (setts), ffprobe 5.1.8-0\n[debug] Optional libraries: Cryptodome-3.23.0, brotli-1.2.0, certifi-2026.04.22, curl_cffi-0.15.0, mutagen-1.47.0, requests-2.33.1, secretstorage-3.5.0, sqlite3-3.53.0, urllib3-2.6.3, websockets-16.0, yt_dlp_ejs-0.8.0\n[debug] JS runtimes: deno-2.6.3\n[debug] Proxy map: {}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Plugin directories: none\n[debug] Loaded 1864 extractors\n[debug] Loading archive file '/sharedfolders/ZFSLive/yt-dlp/dl.txt'\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest\nLatest version: nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds\nyt-dlp is up to date (nightly@2026.05.05.233942 from yt-dlp/yt-dlp-nightly-builds)\n[debug] [youtube:tab] Found YouTube account cookies\n[youtube:tab] Extracting URL: https://www.youtube.com/playlist?list=UUE3-vQDHVnTvk1Pay7HyCJg\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg: Downloading webpage\n[youtube:tab] Sleeping 4.0 seconds ...\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg: Redownloading playlist API JSON with unavailable videos\n[download] Downloading playlist: Uploads from Hoshikage Tetra\n[youtube:tab] Sleeping 4.0 seconds ...\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg page 1: Downloading API JSON\n[youtube:tab] Sleeping 4.0 seconds ...\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg page 2: Downloading API JSON\n[youtube:tab] Sleeping 4.0 seconds ...\n[youtube:tab] UUE3-vQDHVnTvk1Pay7HyCJg page 3: Downloading API JSON\n[info] Writing playlist description to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].description\nDeleting existing file /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].jpg\n[info] Downloading playlist thumbnail 3 ...\n[info] Writing playlist thumbnail 3 to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[NA]Uploads from Hoshikage Tetra[UUE3-vQDHVnTvk1Pay7HyCJg].jpg\n[youtube:tab] Playlist Uploads from Hoshikage Tetra: Downloading 384 items of 384\n[download] Downloading item 1 of 384\n[debug] [youtube] Found YouTube account cookies\n[debug] [youtube] [pot] PO Token Providers: none\n[debug] [youtube] [pot] PO Token Cache Providers: memory\n[debug] [youtube] [pot] PO Token Cache Spec Providers: webpo\n[debug] [youtube] [jsc] JS Challenge Providers: bun (unavailable), deno, node (unavailable), quickjs (unavailable)\n[youtube] Extracting URL: https://www.youtube.com/watch?v=LKkASv-uZ7M\n[youtube] Sleeping 4.0 seconds ...\n[youtube] LKkASv-uZ7M: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 8fb635c2\n original url = /s/player/8fb635c2/player_es6.vflset/en_US/base.js\n[youtube] Sleeping 4.0 seconds ...\n[youtube] LKkASv-uZ7M: Downloading tv downgraded player API JSON\n[youtube] Sleeping 4.0 seconds ...\n[youtube] LKkASv-uZ7M: Downloading player 8fb635c2-main\n[youtube] [jsc:deno] Solving JS challenges using deno\n[debug] [youtube] [jsc:deno] Using challenge solver lib script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Using challenge solver core script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Running deno: deno run --ext=js --no-code-cache --no-prompt --no-remote --no-lock --node-modules-dir=none --no-config --no-npm --cached-only -\n[debug] [youtube] LKkASv-uZ7M: Detected experiment to bind GVS PO Token to video ID for web_safari client\n[youtube] Sleeping 4.0 seconds ...\n[youtube] LKkASv-uZ7M: Downloading m3u8 information\n[debug] Sort order given by extractor: quality, res, fps, hdr:12, source, vcodec, channels, acodec, lang, proto\n[debug] Formats sorted by: hasvid, ie_pref, quality, res, fps, hdr:12(7), source, vcodec, channels, acodec, lang, proto, size, br, asr, vext, aext, hasaud, id\n[info] LKkASv-uZ7M: Downloading 1 format(s): 399+251\n[info] Writing video description to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[20241004]ใ Debut Teaser ใๆๅฝฑใใใฉโงธ Hoshikage Tetraใ #ใใกใใญ โงธ #ๆฐไบบVTuber ใ[LKkASv-uZ7M].description\n[info] Downloading video thumbnail 41 ...\n[info] Writing video thumbnail 41 to: /sharedfolders/Snapraid/VT/Hoshikage Tetra/[20241004]ใ Debut Teaser ใๆๅฝฑใใใฉโงธ Hoshikage Tetraใ #ใใกใใญ โงธ #ๆฐไบบVTuber ใ[LKkASv-uZ7M].webp\n[debug] Invoking http downloader on \"https://rr1---sn-uxa0n-t8gee.googlevideo.com/videoplayback?expire=1778542268&ei=WxICaqq1NpqesfIPk5LjwQk&ip=75.157.29.126&id=o-AJJjfvAXYgJ9HXUxgLMH1PzsIW3tgLccTPJWdINnuI2E&itag=399&aitags=133%2C134%2C135%2C136%2C137%2C160%2C242%2C243%2C244%2C247%2C248%2C278%2C395%2C396%2C397%2C398%2C399%2C779%2C780%2C788&source=youtube&requiressl=yes&xpc=EgVo2aDSNQ%3D%3D&met=1778520667%2C&mh=dD&mm=31%2C26&mn=sn-uxa0n-t8gee%2Csn-vgqsrn6z&ms=au%2Conr&mv=m&mvi=1&pl=24&rms=au%2Cau&initcwndbps=3133750&siu=1&bui=AbKmrwoixuN_Sne-ALE_vXp1FWNUHz9ojzFg28ASO1QwWgMNCnUkh3texv4C8N1BBrtahKzhPQ&vprv=1&svpuc=1&mime=video%2Fmp4&ns=Warq4z5mmVvkkbZ1q6WFICwV&rqh=1&gir=yes&clen=8806682&dur=45.366&lmt=1742680422163085&mt=1778520062&fvip=3&keepalive=yes&lmw=1&fexp=51565116%2C51565681&c=TVHTML5&sefc=1&txp=453C534&n=Potdi4GqxCBAXw&sparams=expire%2Cei%2Cip%2Cid%2Caitags%2Csource%2Crequiressl%2Cxpc%2Csiu%2Cbui%2Cvprv%2Csvpuc%2Cmime%2Cns%2Crqh%2Cgir%2Cclen%2Cdur%2Clmt&sig=AHEqNM4wRAIgFJylt_SSpDFmyOqIfHa4QYx33ZM-RRtp9mhiDAvRJpMCIHR3bru-fqwnzKx3ucR2Ms80FaEMPJMDvXXk3UePpkW8&lsparams=met%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Crms%2Cinitcwndbps&lsig=APaTxxMwRQIgUU0vt9a7TSvEKxv0eXE0LQe8OJH35GFpPTA-5nNKc-ECIQDQOyxenAti1CnCX1ZbTH0-FEP5g_rlnajTTrUGbSXtaA%3D%3D\"\n```\n\n[youtube:tab] Playlist extraction only yields 100-120 results instead of all entries\n\n### Checklist\n\n- [x] I'm reporting that yt-dlp is broken on a **supported** site\n- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))\n- [x] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [x] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [x] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates\n- [x] I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nSouth Korea\n\n### Provide a description that is worded well enough to be understood\n\nA public YouTube playlist reports `932` total items, but yt-dlp only extracts the first `120` entries with `--flat-playlist` on the latest nightly build.\n\nExample URL:\n`https://www.youtube.com/playlist?list=PLGbqLBrAx7XNlaBVQEvcJkN-VzkcoMlu6`\n\nObserved behavior:\n\n- `yt-dlp -vU --js-runtimes node --flat-playlist --skip-download --print \"%(playlist_index)03d %(id)s %(title)s\" <url>` prints 120 entries.\n- The verbose output says: `Playlist ์ถ์ฒ๊ณก: Downloading 120 items of 932`.\n- The last extracted item is playlist index 120: `120 vXDCfqGNCj0 Greatness`.\n- Requesting item 121 directly with `--playlist-items 121` prints no entries and says `Downloading 0 items of 932`.\n- `--extractor-args \"youtubetab:skip=webpage\"` changes the result to 230 entries, not 932. The last extracted item with that workaround is: `230 UBePkmU5E8I ARIA`.\n\nI searched for similar issues and found older/nearby reports such as #11130 and #10154, but they do not appear to be the same exact case: this is a normal YouTube playlist, not a Shorts-only playlist or a channel playlists tab.\n\nExpected behavior:\n\nyt-dlp should extract all available playlist entries, or at least continue beyond the first 120 entries when `playlist_count` reports 932.\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [x] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [x] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', '--js-runtimes', 'node', '--flat-playlist', '--skip-download', '--print', '%(playlist_index)03d %(id)s %(title)s', 'https://www.youtube.com/playlist?list=PLGbqLBrAx7XNlaBVQEvcJkN-VzkcoMlu6']\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8 (No ANSI), error utf-8 (No ANSI), screen utf-8 (No ANSI)\n[debug] yt-dlp version nightly@2026.06.11.235628 from yt-dlp/yt-dlp-nightly-builds (linux_aarch64_exe)\n[debug] Python 3.14.5 (CPython aarch64 64bit) - Linux-5.10.110-rockchip-rk3588-aarch64-with-glibc2.35 (OpenSSL 3.5.6 7 Apr 2026, glibc 2.35)\n[debug] exe versions: ffmpeg 7.1.1 (fdk,setts), ffprobe 7.1.1\n[debug] Optional libraries: Cryptodome-3.23.0, brotli-1.2.0, certifi-2026.05.20, curl_cffi-0.15.0, mutagen-1.47.0, requests-2.34.2, secretstorage-3.5.0, sqlite3-3.53.2, urllib3-2.7.0, websockets-16.0, yt_dlp_ejs-0.8.0\n[debug] JS runtimes: node-24.15.0\n[debug] Proxy map: {}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Plugin directories: none\n[debug] Loaded 1739 extractors\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest\nLatest version: nightly@2026.06.11.235628 from yt-dlp/yt-dlp-nightly-builds\nyt-dlp is up to date (nightly@2026.06.11.235628 from yt-dlp/yt-dlp-nightly-builds)\n[youtube:tab] Extracting URL: https://www.youtube.com/playlist?list=PLGbqLBrAx7XNlaBVQEvcJkN-VzkcoMlu6\n[youtube:tab] PLGbqLBrAx7XNlaBVQEvcJkN-VzkcoMlu6: Downloading webpage\n[youtube:tab] PLGbqLBrAx7XNlaBVQEvcJkN-VzkcoMlu6: Redownloading playlist API JSON with unavailable videos\n[download] Downloading playlist: ์ถ์ฒ๊ณก\n[youtube:tab] Playlist ์ถ์ฒ๊ณก: Downloading 120 items of 932\n[debug] The information of all playlist entries will be held in memory\n[download] Downloading item 1 of 120\n001 Q3_vX-I16I0 You & Me (Flume Remix)\n[download] Downloading item 2 of 120\n002 hWJrkEpKMx0 Slow Brew Weekend\n[download] Downloading item 3 of 120\n003 OagEP3NcWao ๊ฒฉ๋ณ\n[download] Downloading item 4 of 120\n004 X_JO7f_phkg Haraboji & Aboji (feat. Moment Joon)\n[download] Downloading item 5 of 120\n005 yvOrDrovcho The Gunner's Dream\n[download] Downloading item 6 of 120\n006 pODTN2JxOEo GAMABUNTA\n[download] Downloading item 7 of 120\n007 vpzwxv0hkkU OLD LOVE, OLD DOG LEFT AT HOME\n[download] Downloading item 8 of 120\n008 jWFb5z3kUSQ Fever Ray 'Keep The Streets Empty For Me'\n[download] Downloading item 9 of 120\n009 Izk-40vclJs Familiar\n[download] Downloading item 10 of 120\n010 ReUR6f01imM Irgendwie, irgendwo, irgendwann (Special 12\" Dance Mix)\n[download] Downloading item 11 of 120\n011 ZfWSOs5YbQ8 Me and the Devil\n[download] Downloading item 12 of 120\n012 200FnysZo7U Bungaetan\n[download] Downloading item 13 of 120\n013 eJfrhIXyZ9A Lithonia\n[download] Downloading item 14 of 120\n014 dRXm6Z7nU5Y Soup\n[download] Downloading item 15 of 120\n015 rayalP38rzM Imagined Light\n[download] Downloading item 16 of 120\n016 j1Tm5HylCxw Ghost in the Machine\n[download] Downloading item 17 of 120\n017 K7EAcucLIAU (They Long To Be) Close To You (Music From The Motion Picture)\n[download] Downloading item 18 of 120\n018 H1PZGDh_2Pk Organ Variation\n[download] Downloading item 19 of 120\n019 Fa-kKVRdJ3g Alpha\n[download] Downloading item 20 of 120\n020 ymTXZHe0KqM Clowns\n[download] Downloading item 21 of 120\n021 KOqREuepRNU Parachute\n[download] Downloading item 22 of 120\n022 mGHx7deltYw Youth, for a while\n[download] Downloading item 23 of 120\n023 CJriM7T0M0Y Big picture\n[download] Downloading item 24 of 120\n024 DbNAjTt-zzI Ruthless\n[download] Downloading item 25 of 120\n025 vnW2fpOOC4k Johnny P's Caddy\n[download] Downloading item 26 of 120\n026 WwRUatTePkw ๋จผ์ง๊ฐ๋์์ฌ๋ฒ๋ฆฐ๋์ํ\n[download] Downloading item 27 of 120\n027 lMUra7sGhgs Apology\n[download] Downloading item 28 of 120\n028 hnowbHaAuX8 Blame\n[download] Downloading item 29 of 120\n029 T8BVGQH3KhI Somozu Fever\n[download] Downloading item 30 of 120\n030 WTmTF1IGgiQ Represent\n[download] Downloading item 31 of 120\n031 nsXm5x0Cvvg One Eleven Chelsea\n[download] Downloading item 32 of 120\n032 ZoTrNe4ZrCw My Red Little Fox\n[download] Downloading item 33 of 120\n033 WghT1anTRwo Quaranta\n[download] Downloading item 34 of 120\n034 jYVAetbAajI Ninja Man\n[download] Downloading item 35 of 120\n035 Qm12rpHFESA Tyler, Forever\n[download] Downloading item 36 of 120\n036 fmsGqGLkm5c On Fire (feat. CokeJazz) (๋ถํ (feat. ์ฝ์ฌ์ฆ))\n[download] Downloading item 37 of 120\n037 s4DlADgREec ๋ํคํธํ
(Feat. ํ์ฑ)\n[download] Downloading item 38 of 120\n038 2vvQHuSj49I New Year's Eve (feat. Soulman) (์ฌ๋๋ค์ด ์๋ ๊ฒ (feat. Soulman))\n[download] Downloading item 39 of 120\n039 62MUrVO91BY ํ
ํฌ๋์ปฌ๋ฌ\n[download] Downloading item 40 of 120\n040 _UJ3amzaemQ ๊ฑฐ๋ฆฌ (Feat. Rohann, Mckdaddy, Mac Kidd, KHAN, ํค์ธ ์์ง, Chaboom)\n[download] Downloading item 41 of 120\n041 yM0k7yrBAao ๋ฉํํน\n[download] Downloading item 42 of 120\n042 tbr9dWSuUww ์ ๊ณจ (Feat. ํค์ธ ์์ง)\n[download] Downloading item 43 of 120\n043 FJjoeSnNyNs ๊ณ ์ (Feat. The o2) (Prod. The o2)\n[download] Downloading item 44 of 120\n044 t1HJTTHtxG8 ์ง๋ฆฌ ๊ฐ์๊ฑด ์์์ง๋ (Prod. The o2)\n[download] Downloading item 45 of 120\n045 b7-q5voMAr0 ๋๋๊ฐ ๋ํ๋ฌ๋ค\n[download] Downloading item 46 of 120\n046 -UjhZpdCBYg ์์\n[download] Downloading item 47 of 120\n047 _pOGPci4weQ ์กฐ์ฉํ ๋ฐค์ด๋ฉด\n[download] Downloading item 48 of 120\n048 uF7PxFsohh8 Drought (feat. Beenzino) (๊ฐ๋ญ (feat. ๋น์ง๋
ธ))\n[download] Downloading item 49 of 120\n049 8zaNlz_uBB0 Work\n[download] Downloading item 50 of 120\n050 yHZcliSCG1g ๋ธ๋ผ๋\n[download] Downloading item 51 of 120\n051 ZtQu1SzPmIk ํฉ๊ธ๋ง์ฐจ\n[download] Downloading item 52 of 120\n052 HkZwkWhigRQ ๊ณ ์์ด๊ณผ ๋จ์\n[download] Downloading item 53 of 120\n053 nPKxbMdlWxY ์๋ถ์ง\n[download] Downloading item 54 of 120\n054 KOKI30YeKeA ๊ณค๋ํ ๋
ธ๋\n[download] Downloading item 55 of 120\n055 r5c86TKHCys ์\n[download] Downloading item 56 of 120\n056 28a9gWhde7s ์์ํธ\n[download] Downloading item 57 of 120\n057 8EWA2NC24JQ ์ฝ๋ฅดํฌ ์ ๋ฆฌ๋ณ\n[download] Downloading item 58 of 120\n058 k_jVqTR5Dhk I KNOW ME BEST\n[download] Downloading item 59 of 120\n059 ruCfjDz9xoc Hang Me\n[download] Downloading item 60 of 120\n060 O2JGwVmjeGw ํ์ด๋ง์\n[download] Downloading item 61 of 120\n061 d8BBmUv54gw Place\n[download] Downloading item 62 of 120\n062 dLiOjaUL_hs Gjallarhorn (feat. illtal, Deliman, BLACK NINE, IGNITO)\n[download] Downloading item 63 of 120\n063 y3PihYbzFHE Love Again (Akinyele Back) (feat. Gangsta Boo)\n[download] Downloading item 64 of 120\n064 pnZDhej_LtM Sinner (feat. YDG) (์ฃ์ธ (feat. ์๋๊ทผ))\n[download] Downloading item 65 of 120\n065 y6aDqdsXnmo ์๋ฆ๋ค์ (Feat. Soulman)\n[download] Downloading item 66 of 120\n066 T2rvU_G8TKo The Amazing Digital Circus\n[download] Downloading item 67 of 120\n067 sMD7TPpRGVw Many Men (Wish Death)\n[download] Downloading item 68 of 120\n068 17_Cwl9fJC8 goat\n[download] Downloading item 69 of 120\n069 YCMkEDQH_Dc Fucked Up (feat. E SENS)\n[download] Downloading item 70 of 120\n070 02bGFBvE1Io ๆช้ญใฎๅญ\n[download] Downloading item 71 of 120\n071 Xs9mmB1FbEQ GOSLOW (GOSLOW)\n[download] Downloading item 72 of 120\n072 3cKtSlsYVEU September\n[download] Downloading item 73 of 120\n073 0cb-yc7BO9A Mindful Solutionism\n[download] Downloading item 74 of 120\n074 F0TR54Wk7kY Hollywood\n[download] Downloading item 75 of 120\n075 Xp4IidJnxMw Bugatti\n[download] Downloading item 76 of 120\n076 PAW1nZhbPic [Tentacles]\n[download] Downloading item 77 of 120\n077 UwYUqO2J7S8 nylon\n[download] Downloading item 78 of 120\n078 ANtuQCpAnZo X (feat. Ambid Jack)\n[download] Downloading item 79 of 120\n079 FTE3uB0g0yU Drink Water\n[download] Downloading item 80 of 120\n080 NiVHwzevCK8 Beloved! Paradise! Jazz!?\n[download] Downloading item 81 of 120\n081 mUkKxjncoxs Satellite\n[download] Downloading item 82 of 120\n082 ndmN_kITK-c Past Lives (slowed + reverb)\n[download] Downloading item 83 of 120\n083 1SONWCDMNCk London\n[download] Downloading item 84 of 120\n084 9N8MpjTm534 Time To Say Goodbye\n[download] Downloading item 85 of 120\n085 i7G_KN-yhBI Misunderstood\n[download] Downloading item 86 of 120\n086 LUSxzV-n1Mw [Motif]\n[download] Downloading item 87 of 120\n087 XX2gPs44fxg Sacred Play Secret Place\n[download] Downloading item 88 of 120\n088 J65PdkMgfI0 DROP (Prod. EDDY)\n[download] Downloading item 89 of 120\n089 iq8SK3_tjaw Dry Eyes\n[download] Downloading item 90 of 120\n090 suVhbO6KZd0 Half-duplex (feat. Optical Eyez XL & Minos)\n[download] Downloading item 91 of 120\n091 OA5h3EOD2DU Let's Go\n[download] Downloading item 92 of 120\n092 Zxnnuj4Vp_g Cleanin' Out My Closet\n[download] Downloading item 93 of 120\n093 uXg31LfpwX8 F, A and F again (Feat. E Hyeji)\n[download] Downloading item 94 of 120\n094 Kw0wLLVEMaA Waltz of the Flowers\n[download] Downloading item 95 of 120\n095 wVc-y2X-3IM I Wonder\n[download] Downloading item 96 of 120\n096 HBorXQKzKII Fooley\n[download] Downloading item 97 of 120\n097 T8QBpjDkm2c Get Ready (Feat. Polodared)\n[download] Downloading item 98 of 120\n098 K4ZfNEEqPdk Heart on Fire\n[download] Downloading item 99 of 120\n099 r7fz9tQzrzI ์ผํ๋\n[download] Downloading item 100 of 120\n100 XHz2726p_pA Where Can I Start\n[download] Downloading item 101 of 120\n101 cWt-ByH8DWY The Foot\n[download] Downloading item 102 of 120\n102 JeW-60timGY DDU-DDU (Feat. EXN) (Prod. sec paul)\n[download] Downloading item 103 of 120\n103 OIXvW0ClPKY K-pop drip (Feat. Chillin Homie)\n[download] Downloading item 104 of 120\n104 gLA57OsPGs8 2012 (feat. Day Wave)\n[download] Downloading item 105 of 120\n105 81q01_PWELA ๋ฏธ์ (Feat. KWAII)\n[download] Downloading item 106 of 120\n106 DZyo0DOuDCM Meditate\n[download] Downloading item 107 of 120\n107 1KgrnYyVL2A Valentina\n[download] Downloading item 108 of 120\n108 lWL_zwtVUWY God's Work\n[download] Downloading item 109 of 120\n109 r56PShm_idY ๋ฏธ์ธ๋จผ์ง (Fine dust)\n[download] Downloading item 110 of 120\n110 SimqPhxLsoM ๊ฒ์์ด (Coward)\n[download] Downloading item 111 of 120\n111 eZnrpDbR_go SNS (Feat. jivicxi) (Prod. Yammo)\n[download] Downloading item 112 of 120\n112 _a0I5aLAkk0 pRETTy\n[download] Downloading item 113 of 120\n113 PYYrrJ3I9RM OceanแณRave\n[download] Downloading item 114 of 120\n114 p3ciQ6e_T6c Peter-Pan\n[download] Downloading item 115 of 120\n115 AQ56rD2M9LI Deserve Me\n[download] Downloading item 116 of 120\n116 93TM38-gRmE Blondie\n[download] Downloading item 117 of 120\n117 J5fGmOo_Pco Memoir\n[download] Downloading item 118 of 120\n118 xoNP4hjDEa4 Swimming pool - sky\n[download] Downloading item 119 of 120\n119 p3NFyfUZgWQ hwit\n[download] Downloading item 120 of 120\n120 vXDCfqGNCj0 Greatness\n[download] Finished downloading playlist: ์ถ์ฒ๊ณก\n```\n\n[ie/youtube:tab] Fix pagination\n\nCloses #16692\r\nCloses #16943\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `yt_dlp/extractor/youtube/` needed for: [youtube] yt-dlp occasionally only fetches the first 100 vids of a playlist","scope_files":["yt_dlp/extractor/youtube/_base.py","yt_dlp/extractor/youtube/_tab.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/youtube/` needed for: [youtube] yt-dlp occasionally only fetches the first 100 vids of a playlist\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/_base.py\",\n \"yt_dlp/extractor/youtube/_tab.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["yt_dlp/extractor/youtube/_base.py","yt_dlp/extractor/youtube/_tab.py"],"solution_diff":"diff --git a/yt_dlp/extractor/youtube/_base.py b/yt_dlp/extractor/youtube/_base.py\nindex d3e4ab11767e..59a470ff6d81 100644\n--- a/yt_dlp/extractor/youtube/_base.py\n+++ b/yt_dlp/extractor/youtube/_base.py\n@@ -1037,8 +1037,10 @@ def _extract_continuation(cls, renderer):\n return next_continuation\n \n return traverse_obj(renderer, (\n- ('contents', 'items', 'rows', 'subThreads'), ..., 'continuationItemRenderer',\n- ('continuationEndpoint', ('button', 'buttonRenderer', 'command')),\n+ ('contents', 'items', 'rows', 'subThreads'), ..., (\n+ ('continuationItemRenderer', ('continuationEndpoint', ('button', 'buttonRenderer', 'command'))),\n+ ('continuationItemViewModel', 'continuationCommand', 'innertubeCommand'),\n+ ),\n ), get_all=False, expected_type=cls._extract_continuation_ep_data)\n \n @classmethod\ndiff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\nindex 78d5e5b6088a..197231daff91 100644\n--- a/yt_dlp/extractor/youtube/_tab.py\n+++ b/yt_dlp/extractor/youtube/_tab.py\n@@ -1032,14 +1032,14 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n+ 'uploader': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1049,14 +1049,13 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1139,90 +1138,89 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 0,\n }, {\n 'note': 'Home tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/featured',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Home',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Home',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 2,\n+ 'playlist_mincount': 6,\n }, {\n 'note': 'Videos tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 975,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Videos tab, sorted by popular',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos?view=0&sort=p&flow=grid',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 199,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Playlists tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/playlists',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Playlists',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Playlists',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 17,\n+ 'playlist_mincount': 20,\n }, {\n 'note': 'Posts tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',\n+ 'url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg/posts',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Posts',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'title': 'Office Hours Live with Tim Heidecker - Posts',\n+ 'description': 'md5:01ec1460ea6c6e2aa47d3be9c756559c',\n+ 'uploader': 'Office Hours Live with Tim Heidecker',\n+ 'uploader_id': '@OfficeHoursLive',\n+ 'uploader_url': 'https://www.youtube.com/@OfficeHoursLive',\n+ 'channel': 'Office Hours Live with Tim Heidecker',\n+ 'channel_id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'channel_url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg',\n 'channel_follower_count': int,\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'uploader_id': '@lexwill718',\n- 'uploader': 'lex will',\n+ 'tags': 'count:17',\n },\n- 'playlist_mincount': 18,\n- 'skip': 'This Community isn\\'t available',\n+ 'playlist_mincount': 145,\n }, {\n # TODO: fix channel_is_verified extraction\n 'note': 'Search tab',\n@@ -1272,6 +1270,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n },\n 'playlist_count': 96,\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Large playlist',\n 'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',\n 'info_dict': {\n@@ -1296,6 +1295,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'url': 'http://www.youtube.com/user/NASAgovVideo/videos',\n 'only_matching': True,\n }, {\n+ # TODO: fix availability extraction\n+ # The 'note' below is outdated: there is no longer a \"Load more\" button\n 'note': 'Buggy playlist: the webpage has a \"Load more\" button but it doesn\\'t have more videos',\n 'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',\n 'info_dict': {\n@@ -1313,7 +1314,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'uploader': 'Interstellar Movie',\n 'uploader_url': 'https://www.youtube.com/@InterstellarMovie',\n },\n- 'playlist_mincount': 21,\n+ 'playlist_mincount': 10,\n }, {\n # TODO: fix availability extraction\n 'note': 'Playlist with \"show unavailable videos\" button',\n@@ -1336,6 +1337,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 150,\n 'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Playlist with unavailable videos in page 7',\n 'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',\n 'info_dict': {\n@@ -1407,7 +1409,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n }, {\n 'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',\n 'info_dict': {\n- 'id': 'VFGoUmo74wE', # This will keep changing\n+ 'id': 'ubIX-TwVqZI', # This will keep changing\n 'ext': 'mp4',\n 'title': str,\n 'upload_date': r're:\\d{8}',\n@@ -1586,6 +1588,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 50,\n 'expected_warnings': ['YouTube Music is not directly supported'],\n }, {\n+ # TODO: investigate test failing on differing channel*/uploader*/view_count\n 'note': 'unlisted single video playlist',\n 'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',\n 'info_dict': {\n@@ -1809,7 +1812,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'title': 'Not Just Bikes - Shorts',\n 'tags': 'count:10',\n 'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',\n- 'description': 'md5:295758591d0d43d8594277be54584da7',\n+ 'description': 'md5:2cb3ccdafa58608fa016f1de4930ec54',\n 'channel_follower_count': int,\n 'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',\n 'channel': 'Not Just Bikes',\n@@ -1831,8 +1834,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': 'ไธญๆๆ ไธ',\n 'channel_follower_count': int,\n 'description': 'md5:76b312b48a26c3b0e4d90e2dfc1b417d',\n- 'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',\n- 'uploader_id': '@Yuichi-Nakamura',\n+ 'uploader_url': 'https://www.youtube.com/@ไธญๆๆ ไธใฎใใใณใฐ',\n+ 'uploader_id': '@ไธญๆๆ ไธใฎใใใณใฐ',\n 'uploader': 'ไธญๆๆ ไธ',\n },\n 'playlist_mincount': 60,\n@@ -2010,7 +2013,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': '99% Invisible',\n 'uploader_id': '@99percentinvisiblepodcast',\n },\n- 'playlist_count': 5,\n+ 'playlist_mincount': 5,\n }, {\n # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)\n # TODO: fix channel_is_verified extraction\n@@ -2034,6 +2037,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n # Playlist with only shorts, shown as reel renderers\n # FIXME: future: YouTube currently doesn't give continuation for this,\n # may do in future.\n+ # TODO: fix availability extraction\n 'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',\n 'info_dict': {\n 'id': 'UUxqPAgubo4coVn9Lx1FuKcg',\n","summary":"Edited 2 file(s) in yt_dlp/extractor/youtube/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/_base.py\",\n \"yt_dlp/extractor/youtube/_tab.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/youtube/_base.py b/yt_dlp/extractor/youtube/_base.py\\nindex d3e4ab11767e..59a470ff6d81 100644\\n--- a/yt_dlp/extractor/youtube/_base.py\\n+++ b/yt_dlp/extractor/youtube/_base.py\\n@@ -1037,8 +1037,10 @@ def _extract_continuation(cls, renderer):\\n return next_continuation\\n \\n return traverse_obj(renderer, (\\n- ('contents', 'items', 'rows', 'subThreads'), ..., 'continuationItemRenderer',\\n- ('continuationEndpoint', ('button', 'buttonRenderer', 'command')),\\n+ ('contents', 'items', 'rows', 'subThreads'), ..., (\\n+ ('continuationItemRenderer', ('continuationEndpoint', ('button', 'buttonRenderer', 'command'))),\\n+ ('continuationItemViewModel', 'continuationCommand', 'innertubeCommand'),\\n+ ),\\n ), get_all=False, expected_type=cls._extract_continuation_ep_data)\\n \\n @classmethod\\ndiff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\\nindex 78d5e5b6088a..197231daff91 100644\\n--- a/yt_dlp/extractor/youtube/_tab.py\\n+++ b/yt_dlp/extractor/youtube/_tab.py\\n@@ -1032,14 +1032,14 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 94,\\n 'info_dict': {\\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'title': 'Igor Kleiner - Playlists',\\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\\n- 'uploader': 'Igor Kleiner ',\\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\\\n$',\\n+ 'uploader': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'uploader_id': '@IgorDataScience',\\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\\n- 'channel': 'Igor Kleiner ',\\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'tags': 'count:23',\\n+ 'tags': 'count:19',\\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\\n 'channel_follower_count': int,\\n },\\n@@ -1049,14 +1049,13 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 94,\\n 'info_dict': {\\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'title': 'Igor Kleiner - Playlists',\\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\\n- 'uploader': 'Igor Kleiner ',\\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\\\n$',\\n 'uploader_id': '@IgorDataScience',\\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\\n- 'tags': 'count:23',\\n+ 'tags': 'count:19',\\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'channel': 'Igor Kleiner ',\\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\\n 'channel_follower_count': int,\\n },\\n@@ -1139,90 +1138,89 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_count': 0,\\n }, {\\n 'note': 'Home tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/featured',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Home',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'channel': 'lex will',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Home',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 2,\\n+ 'playlist_mincount': 6,\\n }, {\\n 'note': 'Videos tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Videos',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Videos',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 975,\\n+ 'playlist_mincount': 239,\\n }, {\\n 'note': 'Videos tab, sorted by popular',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos?view=0&sort=p&flow=grid',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Videos',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Videos',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 199,\\n+ 'playlist_mincount': 239,\\n }, {\\n 'note': 'Playlists tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/playlists',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Playlists',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Playlists',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 17,\\n+ 'playlist_mincount': 20,\\n }, {\\n 'note': 'Posts tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',\\n+ 'url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg/posts',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Posts',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'channel': 'lex will',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n+ 'id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\\n+ 'title': 'Office Hours Live with Tim Heidecker - Posts',\\n+ 'description': 'md5:01ec1460ea6c6e2aa47d3be9c756559c',\\n+ 'uploader': 'Office Hours Live with Tim Heidecker',\\n+ 'uploader_id': '@OfficeHoursLive',\\n+ 'uploader_url': 'https://www.youtube.com/@OfficeHoursLive',\\n+ 'channel': 'Office Hours Live with Tim Heidecker',\\n+ 'channel_id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg',\\n 'channel_follower_count': int,\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'uploader_id': '@lexwill718',\\n- 'uploader': 'lex will',\\n+ 'tags': 'count:17',\\n },\\n- 'playlist_mincount': 18,\\n- 'skip': 'This Community isn\\\\'t available',\\n+ 'playlist_mincount': 145,\\n }, {\\n # TODO: fix channel_is_verified extraction\\n 'note': 'Search tab',\\n@@ -1272,6 +1270,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n },\\n 'playlist_count': 96,\\n }, {\\n+ # TODO: fix availability extraction\\n 'note': 'Large playlist',\\n 'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',\\n 'info_dict': {\\n@@ -1296,6 +1295,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'url': 'http://www.youtube.com/user/NASAgovVideo/videos',\\n 'only_matching': True,\\n }, {\\n+ # TODO: fix availability extraction\\n+ # The 'note' below is outdated: there is no longer a \\\"Load more\\\" button\\n 'note': 'Buggy playlist: the webpage has a \\\"Load more\\\" button but it doesn\\\\'t have more videos',\\n 'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',\\n 'info_dict': {\\n@@ -1313,7 +1314,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'uploader': 'Interstellar Movie',\\n 'uploader_url': 'https://www.youtube.com/@InterstellarMovie',\\n },\\n- 'playlist_mincount': 21,\\n+ 'playlist_mincount': 10,\\n }, {\\n # TODO: fix availability extraction\\n 'note': 'Playlist with \\\"show unavailable videos\\\" button',\\n@@ -1336,6 +1337,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 150,\\n 'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],\\n }, {\\n+ # TODO: fix availability extraction\\n 'note': 'Playlist with unavailable videos in page 7',\\n 'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',\\n 'info_dict': {\\n@@ -1407,7 +1409,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n }, {\\n 'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',\\n 'info_dict': {\\n- 'id': 'VFGoUmo74wE', # This will keep changing\\n+ 'id': 'ubIX-TwVqZI', # This will keep changing\\n 'ext': 'mp4',\\n 'title': str,\\n 'upload_date': r're:\\\\d{8}',\\n@@ -1586,6 +1588,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_count': 50,\\n 'expected_warnings': ['YouTube Music is not directly supported'],\\n }, {\\n+ # TODO: investigate test failing on differing channel*/uploader*/view_count\\n 'note': 'unlisted single video playlist',\\n 'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',\\n 'info_dict': {\\n@@ -1809,7 +1812,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'title': 'Not Just Bikes - Shorts',\\n 'tags': 'count:10',\\n 'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',\\n- 'description': 'md5:295758591d0d43d8594277be54584da7',\\n+ 'description': 'md5:2cb3ccdafa58608fa016f1de4930ec54',\\n 'channel_follower_count': int,\\n 'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',\\n 'channel': 'Not Just Bikes',\\n@@ -1831,8 +1834,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'channel': 'ไธญๆๆ ไธ',\\n 'channel_follower_count': int,\\n 'description': 'md5:76b312b48a26c3b0e4d90e2dfc1b417d',\\n- 'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',\\n- 'uploader_id': '@Yuichi-Nakamura',\\n+ 'uploader_url': 'https://www.youtube.com/@ไธญๆๆ ไธใฎใใใณใฐ',\\n+ 'uploader_id': '@ไธญๆๆ ไธใฎใใใณใฐ',\\n 'uploader': 'ไธญๆๆ ไธ',\\n },\\n 'playlist_mincount': 60,\\n@@ -2010,7 +2013,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'channel': '99% Invisible',\\n 'uploader_id': '@99percentinvisiblepodcast',\\n },\\n- 'playlist_count': 5,\\n+ 'playlist_mincount': 5,\\n }, {\\n # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)\\n # TODO: fix channel_is_verified extraction\\n@@ -2034,6 +2037,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n # Playlist with only shorts, shown as reel renderers\\n # FIXME: future: YouTube currently doesn't give continuation for this,\\n # may do in future.\\n+ # TODO: fix availability extraction\\n 'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',\\n 'info_dict': {\\n 'id': 'UUxqPAgubo4coVn9Lx1FuKcg',\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/extractor/youtube/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"fyi: creepy bible banger channel got taken down","revised_diff":"diff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\nindex 78d5e5b6088a..197231daff91 100644\n--- a/yt_dlp/extractor/youtube/_tab.py\n+++ b/yt_dlp/extractor/youtube/_tab.py\n@@ -1032,14 +1032,14 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n+ 'uploader': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1049,14 +1049,13 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1139,90 +1138,89 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 0,\n }, {\n 'note': 'Home tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/featured',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Home',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Home',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 2,\n+ 'playlist_mincount': 6,\n }, {\n 'note': 'Videos tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 975,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Videos tab, sorted by popular',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos?view=0&sort=p&flow=grid',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 199,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Playlists tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/playlists',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Playlists',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Playlists',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 17,\n+ 'playlist_mincount': 20,\n }, {\n 'note': 'Posts tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',\n+ 'url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg/posts',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Posts',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'title': 'Office Hours Live with Tim Heidecker - Posts',\n+ 'description': 'md5:01ec1460ea6c6e2aa47d3be9c756559c',\n+ 'uploader': 'Office Hours Live with Tim Heidecker',\n+ 'uploader_id': '@OfficeHoursLive',\n+ 'uploader_url': 'https://www.youtube.com/@OfficeHoursLive',\n+ 'channel': 'Office Hours Live with Tim Heidecker',\n+ 'channel_id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'channel_url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg',\n 'channel_follower_count': int,\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'uploader_id': '@lexwill718',\n- 'uploader': 'lex will',\n+ 'tags': 'count:17',\n },\n- 'playlist_mincount': 18,\n- 'skip': 'This Community isn\\'t available',\n+ 'playlist_mincount': 145,\n }, {\n # TODO: fix channel_is_verified extraction\n 'note': 'Search tab',\n@@ -1272,6 +1270,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n },\n 'playlist_count': 96,\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Large playlist',\n 'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',\n 'info_dict': {\n@@ -1296,6 +1295,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'url': 'http://www.youtube.com/user/NASAgovVideo/videos',\n 'only_matching': True,\n }, {\n+ # TODO: fix availability extraction\n+ # The 'note' below is outdated: there is no longer a \"Load more\" button\n 'note': 'Buggy playlist: the webpage has a \"Load more\" button but it doesn\\'t have more videos',\n 'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',\n 'info_dict': {\n@@ -1313,7 +1314,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'uploader': 'Interstellar Movie',\n 'uploader_url': 'https://www.youtube.com/@InterstellarMovie',\n },\n- 'playlist_mincount': 21,\n+ 'playlist_mincount': 10,\n }, {\n # TODO: fix availability extraction\n 'note': 'Playlist with \"show unavailable videos\" button',\n@@ -1336,6 +1337,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 150,\n 'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Playlist with unavailable videos in page 7',\n 'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',\n 'info_dict': {\n@@ -1407,7 +1409,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n }, {\n 'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',\n 'info_dict': {\n- 'id': 'VFGoUmo74wE', # This will keep changing\n+ 'id': 'ubIX-TwVqZI', # This will keep changing\n 'ext': 'mp4',\n 'title': str,\n 'upload_date': r're:\\d{8}',\n@@ -1586,6 +1588,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 50,\n 'expected_warnings': ['YouTube Music is not directly supported'],\n }, {\n+ # TODO: investigate test failing on differing channel*/uploader*/view_count\n 'note': 'unlisted single video playlist',\n 'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',\n 'info_dict': {\n@@ -1809,7 +1812,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'title': 'Not Just Bikes - Shorts',\n 'tags': 'count:10',\n 'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',\n- 'description': 'md5:295758591d0d43d8594277be54584da7',\n+ 'description': 'md5:2cb3ccdafa58608fa016f1de4930ec54',\n 'channel_follower_count': int,\n 'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',\n 'channel': 'Not Just Bikes',\n@@ -1831,8 +1834,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': 'ไธญๆๆ ไธ',\n 'channel_follower_count': int,\n 'description': 'md5:76b312b48a26c3b0e4d90e2dfc1b417d',\n- 'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',\n- 'uploader_id': '@Yuichi-Nakamura',\n+ 'uploader_url': 'https://www.youtube.com/@ไธญๆๆ ไธใฎใใใณใฐ',\n+ 'uploader_id': '@ไธญๆๆ ไธใฎใใใณใฐ',\n 'uploader': 'ไธญๆๆ ไธ',\n },\n 'playlist_mincount': 60,\n@@ -2010,7 +2013,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': '99% Invisible',\n 'uploader_id': '@99percentinvisiblepodcast',\n },\n- 'playlist_count': 5,\n+ 'playlist_mincount': 5,\n }, {\n # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)\n # TODO: fix channel_is_verified extraction\n@@ -2034,6 +2037,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n # Playlist with only shorts, shown as reel renderers\n # FIXME: future: YouTube currently doesn't give continuation for this,\n # may do in future.\n+ # TODO: fix availability extraction\n 'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',\n 'info_dict': {\n 'id': 'UUxqPAgubo4coVn9Lx1FuKcg',\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"fyi: creepy bible banger channel got taken down\",\n \"revised_diff\": \"diff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\\nindex 78d5e5b6088a..197231daff91 100644\\n--- a/yt_dlp/extractor/youtube/_tab.py\\n+++ b/yt_dlp/extractor/youtube/_tab.py\\n@@ -1032,14 +1032,14 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 94,\\n 'info_dict': {\\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'title': 'Igor Kleiner - Playlists',\\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\\n- 'uploader': 'Igor Kleiner ',\\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\\\n$',\\n+ 'uploader': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'uploader_id': '@IgorDataScience',\\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\\n- 'channel': 'Igor Kleiner ',\\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'tags': 'count:23',\\n+ 'tags': 'count:19',\\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\\n 'channel_follower_count': int,\\n },\\n@@ -1049,14 +1049,13 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 94,\\n 'info_dict': {\\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'title': 'Igor Kleiner - Playlists',\\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\\n- 'uploader': 'Igor Kleiner ',\\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\\\n$',\\n 'uploader_id': '@IgorDataScience',\\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\\n- 'tags': 'count:23',\\n+ 'tags': 'count:19',\\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\\n- 'channel': 'Igor Kleiner ',\\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\\n 'channel_follower_count': int,\\n },\\n@@ -1139,90 +1138,89 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_count': 0,\\n }, {\\n 'note': 'Home tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/featured',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Home',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'channel': 'lex will',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Home',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 2,\\n+ 'playlist_mincount': 6,\\n }, {\\n 'note': 'Videos tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Videos',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Videos',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 975,\\n+ 'playlist_mincount': 239,\\n }, {\\n 'note': 'Videos tab, sorted by popular',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos?view=0&sort=p&flow=grid',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Videos',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Videos',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 199,\\n+ 'playlist_mincount': 239,\\n }, {\\n 'note': 'Playlists tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',\\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/playlists',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Playlists',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'uploader': 'lex will',\\n- 'uploader_id': '@lexwill718',\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'channel': 'lex will',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'title': 'Creative Commons - Playlists',\\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\\n+ 'uploader': 'Creative Commons',\\n+ 'uploader_id': '@creativecommons',\\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\\n+ 'channel': 'Creative Commons',\\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\\n 'channel_follower_count': int,\\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\\n },\\n- 'playlist_mincount': 17,\\n+ 'playlist_mincount': 20,\\n }, {\\n 'note': 'Posts tab',\\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',\\n+ 'url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg/posts',\\n 'info_dict': {\\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'title': 'lex will - Posts',\\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\\n- 'channel': 'lex will',\\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\\n- 'tags': ['bible', 'history', 'prophesy'],\\n+ 'id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\\n+ 'title': 'Office Hours Live with Tim Heidecker - Posts',\\n+ 'description': 'md5:01ec1460ea6c6e2aa47d3be9c756559c',\\n+ 'uploader': 'Office Hours Live with Tim Heidecker',\\n+ 'uploader_id': '@OfficeHoursLive',\\n+ 'uploader_url': 'https://www.youtube.com/@OfficeHoursLive',\\n+ 'channel': 'Office Hours Live with Tim Heidecker',\\n+ 'channel_id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\\n+ 'channel_url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg',\\n 'channel_follower_count': int,\\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\\n- 'uploader_id': '@lexwill718',\\n- 'uploader': 'lex will',\\n+ 'tags': 'count:17',\\n },\\n- 'playlist_mincount': 18,\\n- 'skip': 'This Community isn\\\\'t available',\\n+ 'playlist_mincount': 145,\\n }, {\\n # TODO: fix channel_is_verified extraction\\n 'note': 'Search tab',\\n@@ -1272,6 +1270,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n },\\n 'playlist_count': 96,\\n }, {\\n+ # TODO: fix availability extraction\\n 'note': 'Large playlist',\\n 'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',\\n 'info_dict': {\\n@@ -1296,6 +1295,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'url': 'http://www.youtube.com/user/NASAgovVideo/videos',\\n 'only_matching': True,\\n }, {\\n+ # TODO: fix availability extraction\\n+ # The 'note' below is outdated: there is no longer a \\\"Load more\\\" button\\n 'note': 'Buggy playlist: the webpage has a \\\"Load more\\\" button but it doesn\\\\'t have more videos',\\n 'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',\\n 'info_dict': {\\n@@ -1313,7 +1314,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'uploader': 'Interstellar Movie',\\n 'uploader_url': 'https://www.youtube.com/@InterstellarMovie',\\n },\\n- 'playlist_mincount': 21,\\n+ 'playlist_mincount': 10,\\n }, {\\n # TODO: fix availability extraction\\n 'note': 'Playlist with \\\"show unavailable videos\\\" button',\\n@@ -1336,6 +1337,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_mincount': 150,\\n 'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],\\n }, {\\n+ # TODO: fix availability extraction\\n 'note': 'Playlist with unavailable videos in page 7',\\n 'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',\\n 'info_dict': {\\n@@ -1407,7 +1409,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n }, {\\n 'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',\\n 'info_dict': {\\n- 'id': 'VFGoUmo74wE', # This will keep changing\\n+ 'id': 'ubIX-TwVqZI', # This will keep changing\\n 'ext': 'mp4',\\n 'title': str,\\n 'upload_date': r're:\\\\d{8}',\\n@@ -1586,6 +1588,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'playlist_count': 50,\\n 'expected_warnings': ['YouTube Music is not directly supported'],\\n }, {\\n+ # TODO: investigate test failing on differing channel*/uploader*/view_count\\n 'note': 'unlisted single video playlist',\\n 'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',\\n 'info_dict': {\\n@@ -1809,7 +1812,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'title': 'Not Just Bikes - Shorts',\\n 'tags': 'count:10',\\n 'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',\\n- 'description': 'md5:295758591d0d43d8594277be54584da7',\\n+ 'description': 'md5:2cb3ccdafa58608fa016f1de4930ec54',\\n 'channel_follower_count': int,\\n 'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',\\n 'channel': 'Not Just Bikes',\\n@@ -1831,8 +1834,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'channel': 'ไธญๆๆ ไธ',\\n 'channel_follower_count': int,\\n 'description': 'md5:76b312b48a26c3b0e4d90e2dfc1b417d',\\n- 'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',\\n- 'uploader_id': '@Yuichi-Nakamura',\\n+ 'uploader_url': 'https://www.youtube.com/@ไธญๆๆ ไธใฎใใใณใฐ',\\n+ 'uploader_id': '@ไธญๆๆ ไธใฎใใใณใฐ',\\n 'uploader': 'ไธญๆๆ ไธ',\\n },\\n 'playlist_mincount': 60,\\n@@ -2010,7 +2013,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n 'channel': '99% Invisible',\\n 'uploader_id': '@99percentinvisiblepodcast',\\n },\\n- 'playlist_count': 5,\\n+ 'playlist_mincount': 5,\\n }, {\\n # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)\\n # TODO: fix channel_is_verified extraction\\n@@ -2034,6 +2037,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\\n # Playlist with only shorts, shown as reel renderers\\n # FIXME: future: YouTube currently doesn't give continuation for this,\\n # may do in future.\\n+ # TODO: fix availability extraction\\n 'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',\\n 'info_dict': {\\n 'id': 'UUxqPAgubo4coVn9Lx1FuKcg',\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/extractor/youtube/_base.py b/yt_dlp/extractor/youtube/_base.py\nindex d3e4ab11767e..59a470ff6d81 100644\n--- a/yt_dlp/extractor/youtube/_base.py\n+++ b/yt_dlp/extractor/youtube/_base.py\n@@ -1037,8 +1037,10 @@ def _extract_continuation(cls, renderer):\n return next_continuation\n \n return traverse_obj(renderer, (\n- ('contents', 'items', 'rows', 'subThreads'), ..., 'continuationItemRenderer',\n- ('continuationEndpoint', ('button', 'buttonRenderer', 'command')),\n+ ('contents', 'items', 'rows', 'subThreads'), ..., (\n+ ('continuationItemRenderer', ('continuationEndpoint', ('button', 'buttonRenderer', 'command'))),\n+ ('continuationItemViewModel', 'continuationCommand', 'innertubeCommand'),\n+ ),\n ), get_all=False, expected_type=cls._extract_continuation_ep_data)\n \n @classmethod\ndiff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\nindex 78d5e5b6088a..197231daff91 100644\n--- a/yt_dlp/extractor/youtube/_tab.py\n+++ b/yt_dlp/extractor/youtube/_tab.py\n@@ -1032,14 +1032,14 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n+ 'uploader': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1049,14 +1049,13 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 94,\n 'info_dict': {\n 'id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'title': 'Igor Kleiner - Playlists',\n- 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั ะฝะฐ ะผะพะน ะบะฐะฝะฐะป! ะะดะตัั ะฒั ะฝะฐะนะดะตัะต ะฒะธะดะตะพ .{504}/a1/50b/10a$',\n- 'uploader': 'Igor Kleiner ',\n+ 'title': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ - Playlists',\n+ 'description': r're:(?s)ะะพะฑัะพ ะฟะพะถะฐะปะพะฒะฐัั! ะะดะตัั ัะปะพะถะฝัะต ัะตั
ะฝะพะปะพะณะธะธ ะฒัััะตัะฐัััั.+\\n$',\n 'uploader_id': '@IgorDataScience',\n 'uploader_url': 'https://www.youtube.com/@IgorDataScience',\n- 'tags': 'count:23',\n+ 'tags': 'count:19',\n 'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',\n- 'channel': 'Igor Kleiner ',\n+ 'channel': 'Igor DS: ะะ, ะะฐัะบะฐ ะธ ะขะฒะพััะตััะฒะพ ',\n 'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',\n 'channel_follower_count': int,\n },\n@@ -1139,90 +1138,89 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 0,\n }, {\n 'note': 'Home tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/featured',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Home',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Home',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 2,\n+ 'playlist_mincount': 6,\n }, {\n 'note': 'Videos tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 975,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Videos tab, sorted by popular',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/videos?view=0&sort=p&flow=grid',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Videos',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'tags': ['bible', 'history', 'prophesy'],\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Videos',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 199,\n+ 'playlist_mincount': 239,\n }, {\n 'note': 'Playlists tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',\n+ 'url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q/playlists',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Playlists',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'uploader': 'lex will',\n- 'uploader_id': '@lexwill718',\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'title': 'Creative Commons - Playlists',\n+ 'description': 'md5:7cfc22824277588d26a66054f22d93c8',\n+ 'uploader': 'Creative Commons',\n+ 'uploader_id': '@creativecommons',\n+ 'uploader_url': 'https://www.youtube.com/@creativecommons',\n+ 'channel': 'Creative Commons',\n+ 'channel_id': 'UCTwECeGqMZee77BjdoYtI2Q',\n+ 'channel_url': 'https://www.youtube.com/channel/UCTwECeGqMZee77BjdoYtI2Q',\n 'channel_follower_count': int,\n+ 'tags': ['creative commons', 'remix', 'culture', 'nonprofit'],\n },\n- 'playlist_mincount': 17,\n+ 'playlist_mincount': 20,\n }, {\n 'note': 'Posts tab',\n- 'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',\n+ 'url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg/posts',\n 'info_dict': {\n- 'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'title': 'lex will - Posts',\n- 'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',\n- 'channel': 'lex will',\n- 'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',\n- 'tags': ['bible', 'history', 'prophesy'],\n+ 'id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'title': 'Office Hours Live with Tim Heidecker - Posts',\n+ 'description': 'md5:01ec1460ea6c6e2aa47d3be9c756559c',\n+ 'uploader': 'Office Hours Live with Tim Heidecker',\n+ 'uploader_id': '@OfficeHoursLive',\n+ 'uploader_url': 'https://www.youtube.com/@OfficeHoursLive',\n+ 'channel': 'Office Hours Live with Tim Heidecker',\n+ 'channel_id': 'UCtS3BcCw-tITPFYSvkbP0Bg',\n+ 'channel_url': 'https://www.youtube.com/channel/UCtS3BcCw-tITPFYSvkbP0Bg',\n 'channel_follower_count': int,\n- 'uploader_url': 'https://www.youtube.com/@lexwill718',\n- 'uploader_id': '@lexwill718',\n- 'uploader': 'lex will',\n+ 'tags': 'count:17',\n },\n- 'playlist_mincount': 18,\n- 'skip': 'This Community isn\\'t available',\n+ 'playlist_mincount': 145,\n }, {\n # TODO: fix channel_is_verified extraction\n 'note': 'Search tab',\n@@ -1272,6 +1270,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n },\n 'playlist_count': 96,\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Large playlist',\n 'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',\n 'info_dict': {\n@@ -1296,6 +1295,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'url': 'http://www.youtube.com/user/NASAgovVideo/videos',\n 'only_matching': True,\n }, {\n+ # TODO: fix availability extraction\n+ # The 'note' below is outdated: there is no longer a \"Load more\" button\n 'note': 'Buggy playlist: the webpage has a \"Load more\" button but it doesn\\'t have more videos',\n 'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',\n 'info_dict': {\n@@ -1313,7 +1314,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'uploader': 'Interstellar Movie',\n 'uploader_url': 'https://www.youtube.com/@InterstellarMovie',\n },\n- 'playlist_mincount': 21,\n+ 'playlist_mincount': 10,\n }, {\n # TODO: fix availability extraction\n 'note': 'Playlist with \"show unavailable videos\" button',\n@@ -1336,6 +1337,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_mincount': 150,\n 'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],\n }, {\n+ # TODO: fix availability extraction\n 'note': 'Playlist with unavailable videos in page 7',\n 'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',\n 'info_dict': {\n@@ -1407,7 +1409,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n }, {\n 'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',\n 'info_dict': {\n- 'id': 'VFGoUmo74wE', # This will keep changing\n+ 'id': 'ubIX-TwVqZI', # This will keep changing\n 'ext': 'mp4',\n 'title': str,\n 'upload_date': r're:\\d{8}',\n@@ -1586,6 +1588,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'playlist_count': 50,\n 'expected_warnings': ['YouTube Music is not directly supported'],\n }, {\n+ # TODO: investigate test failing on differing channel*/uploader*/view_count\n 'note': 'unlisted single video playlist',\n 'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',\n 'info_dict': {\n@@ -1809,7 +1812,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'title': 'Not Just Bikes - Shorts',\n 'tags': 'count:10',\n 'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',\n- 'description': 'md5:295758591d0d43d8594277be54584da7',\n+ 'description': 'md5:2cb3ccdafa58608fa016f1de4930ec54',\n 'channel_follower_count': int,\n 'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',\n 'channel': 'Not Just Bikes',\n@@ -1831,8 +1834,8 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': 'ไธญๆๆ ไธ',\n 'channel_follower_count': int,\n 'description': 'md5:76b312b48a26c3b0e4d90e2dfc1b417d',\n- 'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',\n- 'uploader_id': '@Yuichi-Nakamura',\n+ 'uploader_url': 'https://www.youtube.com/@ไธญๆๆ ไธใฎใใใณใฐ',\n+ 'uploader_id': '@ไธญๆๆ ไธใฎใใใณใฐ',\n 'uploader': 'ไธญๆๆ ไธ',\n },\n 'playlist_mincount': 60,\n@@ -2010,7 +2013,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n 'channel': '99% Invisible',\n 'uploader_id': '@99percentinvisiblepodcast',\n },\n- 'playlist_count': 5,\n+ 'playlist_mincount': 5,\n }, {\n # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)\n # TODO: fix channel_is_verified extraction\n@@ -2034,6 +2037,7 @@ class YoutubeTabIE(YoutubeTabBaseInfoExtractor):\n # Playlist with only shorts, shown as reel renderers\n # FIXME: future: YouTube currently doesn't give continuation for this,\n # may do in future.\n+ # TODO: fix availability extraction\n 'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',\n 'info_dict': {\n 'id': 'UUxqPAgubo4coVn9Lx1FuKcg',\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34273,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16931"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16931,"string":"16,931"},"base_sha":{"kind":"string","value":"707537a03946fbc5707e22be429545c670cd8ec2"},"head_sha":{"kind":"string","value":"7ce44d0916125e6c71d910288cf0c5223806661d"},"task":{"kind":"string","value":"[utils] Deprecate `make_dir` in favor of `make_parent_dirs`\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\n### Description of your *pull request* and other information\r\n\r\nFix directory creation error handling\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`","scope_files":["pyproject.toml"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`","scope_files":["yt_dlp/YoutubeDL.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/postprocessor/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`","scope_files":["yt_dlp/postprocessor/movefilesafterdownload.py"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/utils/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`","scope_files":["yt_dlp/utils/_deprecated.py","yt_dlp/utils/_utils.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`\",\n \"scope_files\": [\n \"pyproject.toml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/postprocessor/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`\",\n \"scope_files\": [\n \"yt_dlp/postprocessor/movefilesafterdownload.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`\",\n \"scope_files\": [\n \"yt_dlp/utils/_deprecated.py\",\n \"yt_dlp/utils/_utils.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["pyproject.toml"],"solution_diff":"diff --git a/pyproject.toml b/pyproject.toml\nindex 8128fb31a85a..ccbfa74404e5 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -395,6 +395,7 @@ banned-from = [\n \"yt_dlp.utils.bytes_to_intlist\".msg = \"Use `list` instead.\"\n \"yt_dlp.utils.intlist_to_bytes\".msg = \"Use `bytes` instead.\"\n \"yt_dlp.utils.jwt_encode_hs256\".msg = \"Use `yt_dlp.utils.jwt_encode` instead.\"\n+\"yt_dlp.utils.make_dir\".msg = \"Use `yt_dlp.utils.make_parent_dirs` instead.\"\n \"yt_dlp.utils.decodeArgument\".msg = \"Do not use\"\n \"yt_dlp.utils.decodeFilename\".msg = \"Do not use\"\n \"yt_dlp.utils.encodeFilename\".msg = \"Do not use\"\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["yt_dlp/YoutubeDL.py"],"solution_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 6e7ae2a9ee27..08c3404d643d 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -139,7 +139,7 @@\n join_nonempty,\n locked_file,\n make_archive_id,\n- make_dir,\n+ make_parent_dirs,\n number_of_digits,\n orderedSet,\n orderedSet_from_options,\n@@ -2036,7 +2036,12 @@ def _fixup(r):\n raise Exception(f'Invalid result type: {result_type}')\n \n def _ensure_dir_exists(self, path):\n- return make_dir(path, self.report_error)\n+ try:\n+ make_parent_dirs(path)\n+ return True\n+ except OSError as e:\n+ self.report_error(f'Unable to create directory: {e}')\n+ return False\n \n @staticmethod\n def _playlist_infodict(ie_result, strict=False, **kwargs):\n","summary":"Edited 1 file(s) in yt_dlp/"},{"subtask_id":"s3","scope_files":["yt_dlp/postprocessor/movefilesafterdownload.py"],"solution_diff":"diff --git a/yt_dlp/postprocessor/movefilesafterdownload.py b/yt_dlp/postprocessor/movefilesafterdownload.py\nindex 964ca1f9212b..8a1549197992 100644\n--- a/yt_dlp/postprocessor/movefilesafterdownload.py\n+++ b/yt_dlp/postprocessor/movefilesafterdownload.py\n@@ -4,7 +4,7 @@\n from ..compat import shutil\n from ..utils import (\n PostProcessingError,\n- make_dir,\n+ make_parent_dirs,\n )\n \n \n@@ -42,7 +42,10 @@ def run(self, info):\n self.report_warning(\n f'Cannot move file \"{oldfile}\" out of temporary directory since \"{newfile}\" already exists. ')\n continue\n- make_dir(newfile, PostProcessingError)\n+ try:\n+ make_parent_dirs(newfile)\n+ except OSError as e:\n+ raise PostProcessingError(f'Unable to create directory: {e}') from e\n self.to_screen(f'Moving file \"{oldfile}\" to \"{newfile}\"')\n shutil.move(oldfile, newfile) # os.rename cannot move between volumes\n \n","summary":"Edited 1 file(s) in yt_dlp/postprocessor/"},{"subtask_id":"s4","scope_files":["yt_dlp/utils/_deprecated.py","yt_dlp/utils/_utils.py"],"solution_diff":"diff --git a/yt_dlp/utils/_deprecated.py b/yt_dlp/utils/_deprecated.py\nindex 4797cfef5363..9fada27fd888 100644\n--- a/yt_dlp/utils/_deprecated.py\n+++ b/yt_dlp/utils/_deprecated.py\n@@ -46,4 +46,16 @@ def jwt_encode_hs256(payload_data, key, headers={}):\n return header_b64 + b'.' + payload_b64 + b'.' + signature_b64\n \n \n+def make_dir(path, to_screen=None):\n+ from . import make_parent_dirs\n+\n+ try:\n+ make_parent_dirs(path)\n+ return True\n+ except OSError as e:\n+ if to_screen is not None:\n+ to_screen(f'Unable to create directory: {e}')\n+ return False\n+\n+\n compiled_regex_type = type(re.compile(''))\ndiff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 43ee53729ebb..4cc7a76d17f5 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -4713,16 +4713,9 @@ def random_uuidv4():\n return re.sub(r'[xy]', lambda x: _HEX_TABLE[random.randint(0, 15)], 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')\n \n \n-def make_dir(path, to_screen=None):\n- try:\n- dn = os.path.dirname(path)\n- if dn:\n- os.makedirs(dn, exist_ok=True)\n- return True\n- except OSError as err:\n- if callable(to_screen) is not None:\n- to_screen(f'unable to create directory {err}')\n- return False\n+def make_parent_dirs(path):\n+ if dir_name := os.path.dirname(path):\n+ os.makedirs(dir_name, exist_ok=True)\n \n \n def get_executable_path():\n","summary":"Edited 2 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"pyproject.toml\"\n ],\n \"solution_diff\": \"diff --git a/pyproject.toml b/pyproject.toml\\nindex 8128fb31a85a..ccbfa74404e5 100644\\n--- a/pyproject.toml\\n+++ b/pyproject.toml\\n@@ -395,6 +395,7 @@ banned-from = [\\n \\\"yt_dlp.utils.bytes_to_intlist\\\".msg = \\\"Use `list` instead.\\\"\\n \\\"yt_dlp.utils.intlist_to_bytes\\\".msg = \\\"Use `bytes` instead.\\\"\\n \\\"yt_dlp.utils.jwt_encode_hs256\\\".msg = \\\"Use `yt_dlp.utils.jwt_encode` instead.\\\"\\n+\\\"yt_dlp.utils.make_dir\\\".msg = \\\"Use `yt_dlp.utils.make_parent_dirs` instead.\\\"\\n \\\"yt_dlp.utils.decodeArgument\\\".msg = \\\"Do not use\\\"\\n \\\"yt_dlp.utils.decodeFilename\\\".msg = \\\"Do not use\\\"\\n \\\"yt_dlp.utils.encodeFilename\\\".msg = \\\"Do not use\\\"\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 6e7ae2a9ee27..08c3404d643d 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -139,7 +139,7 @@\\n join_nonempty,\\n locked_file,\\n make_archive_id,\\n- make_dir,\\n+ make_parent_dirs,\\n number_of_digits,\\n orderedSet,\\n orderedSet_from_options,\\n@@ -2036,7 +2036,12 @@ def _fixup(r):\\n raise Exception(f'Invalid result type: {result_type}')\\n \\n def _ensure_dir_exists(self, path):\\n- return make_dir(path, self.report_error)\\n+ try:\\n+ make_parent_dirs(path)\\n+ return True\\n+ except OSError as e:\\n+ self.report_error(f'Unable to create directory: {e}')\\n+ return False\\n \\n @staticmethod\\n def _playlist_infodict(ie_result, strict=False, **kwargs):\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/postprocessor/movefilesafterdownload.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/postprocessor/movefilesafterdownload.py b/yt_dlp/postprocessor/movefilesafterdownload.py\\nindex 964ca1f9212b..8a1549197992 100644\\n--- a/yt_dlp/postprocessor/movefilesafterdownload.py\\n+++ b/yt_dlp/postprocessor/movefilesafterdownload.py\\n@@ -4,7 +4,7 @@\\n from ..compat import shutil\\n from ..utils import (\\n PostProcessingError,\\n- make_dir,\\n+ make_parent_dirs,\\n )\\n \\n \\n@@ -42,7 +42,10 @@ def run(self, info):\\n self.report_warning(\\n f'Cannot move file \\\"{oldfile}\\\" out of temporary directory since \\\"{newfile}\\\" already exists. ')\\n continue\\n- make_dir(newfile, PostProcessingError)\\n+ try:\\n+ make_parent_dirs(newfile)\\n+ except OSError as e:\\n+ raise PostProcessingError(f'Unable to create directory: {e}') from e\\n self.to_screen(f'Moving file \\\"{oldfile}\\\" to \\\"{newfile}\\\"')\\n shutil.move(oldfile, newfile) # os.rename cannot move between volumes\\n \\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/postprocessor/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/utils/_deprecated.py\",\n \"yt_dlp/utils/_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_deprecated.py b/yt_dlp/utils/_deprecated.py\\nindex 4797cfef5363..9fada27fd888 100644\\n--- a/yt_dlp/utils/_deprecated.py\\n+++ b/yt_dlp/utils/_deprecated.py\\n@@ -46,4 +46,16 @@ def jwt_encode_hs256(payload_data, key, headers={}):\\n return header_b64 + b'.' + payload_b64 + b'.' + signature_b64\\n \\n \\n+def make_dir(path, to_screen=None):\\n+ from . import make_parent_dirs\\n+\\n+ try:\\n+ make_parent_dirs(path)\\n+ return True\\n+ except OSError as e:\\n+ if to_screen is not None:\\n+ to_screen(f'Unable to create directory: {e}')\\n+ return False\\n+\\n+\\n compiled_regex_type = type(re.compile(''))\\ndiff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\\nindex 43ee53729ebb..4cc7a76d17f5 100644\\n--- a/yt_dlp/utils/_utils.py\\n+++ b/yt_dlp/utils/_utils.py\\n@@ -4713,16 +4713,9 @@ def random_uuidv4():\\n return re.sub(r'[xy]', lambda x: _HEX_TABLE[random.randint(0, 15)], 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')\\n \\n \\n-def make_dir(path, to_screen=None):\\n- try:\\n- dn = os.path.dirname(path)\\n- if dn:\\n- os.makedirs(dn, exist_ok=True)\\n- return True\\n- except OSError as err:\\n- if callable(to_screen) is not None:\\n- to_screen(f'unable to create directory {err}')\\n- return False\\n+def make_parent_dirs(path):\\n+ if dir_name := os.path.dirname(path):\\n+ os.makedirs(dir_name, exist_ok=True)\\n \\n \\n def get_executable_path():\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s4","comment":"can move this to `yt_dlp.utils._deprecated`, have it import `make_parent_dirs` locally, and add it to `tool.ruff.flake8-tidy-import.banned-api` in pyproject.toml","revised_diff":"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 43ee53729ebb..4cc7a76d17f5 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -4713,16 +4713,9 @@ def random_uuidv4():\n return re.sub(r'[xy]', lambda x: _HEX_TABLE[random.randint(0, 15)], 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')\n \n \n-def make_dir(path, to_screen=None):\n- try:\n- dn = os.path.dirname(path)\n- if dn:\n- os.makedirs(dn, exist_ok=True)\n- return True\n- except OSError as err:\n- if callable(to_screen) is not None:\n- to_screen(f'unable to create directory {err}')\n- return False\n+def make_parent_dirs(path):\n+ if dir_name := os.path.dirname(path):\n+ os.makedirs(dir_name, exist_ok=True)\n \n \n def get_executable_path():\n"},{"subtask_id":"s4","comment":"I think this should work\r\n```suggestion\r\n from . import make_parent_dirs\r\n```","revised_diff":"diff --git a/yt_dlp/utils/_deprecated.py b/yt_dlp/utils/_deprecated.py\nindex 4797cfef5363..9fada27fd888 100644\n--- a/yt_dlp/utils/_deprecated.py\n+++ b/yt_dlp/utils/_deprecated.py\n@@ -46,4 +46,16 @@ def jwt_encode_hs256(payload_data, key, headers={}):\n return header_b64 + b'.' + payload_b64 + b'.' + signature_b64\n \n \n+def make_dir(path, to_screen=None):\n+ from . import make_parent_dirs\n+\n+ try:\n+ make_parent_dirs(path)\n+ return True\n+ except OSError as e:\n+ if to_screen is not None:\n+ to_screen(f'Unable to create directory: {e}')\n+ return False\n+\n+\n compiled_regex_type = type(re.compile(''))\n"}],"string":"[\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"can move this to `yt_dlp.utils._deprecated`, have it import `make_parent_dirs` locally, and add it to `tool.ruff.flake8-tidy-import.banned-api` in pyproject.toml\",\n \"revised_diff\": \"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\\nindex 43ee53729ebb..4cc7a76d17f5 100644\\n--- a/yt_dlp/utils/_utils.py\\n+++ b/yt_dlp/utils/_utils.py\\n@@ -4713,16 +4713,9 @@ def random_uuidv4():\\n return re.sub(r'[xy]', lambda x: _HEX_TABLE[random.randint(0, 15)], 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')\\n \\n \\n-def make_dir(path, to_screen=None):\\n- try:\\n- dn = os.path.dirname(path)\\n- if dn:\\n- os.makedirs(dn, exist_ok=True)\\n- return True\\n- except OSError as err:\\n- if callable(to_screen) is not None:\\n- to_screen(f'unable to create directory {err}')\\n- return False\\n+def make_parent_dirs(path):\\n+ if dir_name := os.path.dirname(path):\\n+ os.makedirs(dir_name, exist_ok=True)\\n \\n \\n def get_executable_path():\\n\"\n },\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"I think this should work\\r\\n```suggestion\\r\\n from . import make_parent_dirs\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/utils/_deprecated.py b/yt_dlp/utils/_deprecated.py\\nindex 4797cfef5363..9fada27fd888 100644\\n--- a/yt_dlp/utils/_deprecated.py\\n+++ b/yt_dlp/utils/_deprecated.py\\n@@ -46,4 +46,16 @@ def jwt_encode_hs256(payload_data, key, headers={}):\\n return header_b64 + b'.' + payload_b64 + b'.' + signature_b64\\n \\n \\n+def make_dir(path, to_screen=None):\\n+ from . import make_parent_dirs\\n+\\n+ try:\\n+ make_parent_dirs(path)\\n+ return True\\n+ except OSError as e:\\n+ if to_screen is not None:\\n+ to_screen(f'Unable to create directory: {e}')\\n+ return False\\n+\\n+\\n compiled_regex_type = type(re.compile(''))\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/pyproject.toml b/pyproject.toml\nindex 8128fb31a85a..ccbfa74404e5 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -395,6 +395,7 @@ banned-from = [\n \"yt_dlp.utils.bytes_to_intlist\".msg = \"Use `list` instead.\"\n \"yt_dlp.utils.intlist_to_bytes\".msg = \"Use `bytes` instead.\"\n \"yt_dlp.utils.jwt_encode_hs256\".msg = \"Use `yt_dlp.utils.jwt_encode` instead.\"\n+\"yt_dlp.utils.make_dir\".msg = \"Use `yt_dlp.utils.make_parent_dirs` instead.\"\n \"yt_dlp.utils.decodeArgument\".msg = \"Do not use\"\n \"yt_dlp.utils.decodeFilename\".msg = \"Do not use\"\n \"yt_dlp.utils.encodeFilename\".msg = \"Do not use\"\ndiff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 6e7ae2a9ee27..08c3404d643d 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -139,7 +139,7 @@\n join_nonempty,\n locked_file,\n make_archive_id,\n- make_dir,\n+ make_parent_dirs,\n number_of_digits,\n orderedSet,\n orderedSet_from_options,\n@@ -2036,7 +2036,12 @@ def _fixup(r):\n raise Exception(f'Invalid result type: {result_type}')\n \n def _ensure_dir_exists(self, path):\n- return make_dir(path, self.report_error)\n+ try:\n+ make_parent_dirs(path)\n+ return True\n+ except OSError as e:\n+ self.report_error(f'Unable to create directory: {e}')\n+ return False\n \n @staticmethod\n def _playlist_infodict(ie_result, strict=False, **kwargs):\ndiff --git a/yt_dlp/postprocessor/movefilesafterdownload.py b/yt_dlp/postprocessor/movefilesafterdownload.py\nindex 964ca1f9212b..8a1549197992 100644\n--- a/yt_dlp/postprocessor/movefilesafterdownload.py\n+++ b/yt_dlp/postprocessor/movefilesafterdownload.py\n@@ -4,7 +4,7 @@\n from ..compat import shutil\n from ..utils import (\n PostProcessingError,\n- make_dir,\n+ make_parent_dirs,\n )\n \n \n@@ -42,7 +42,10 @@ def run(self, info):\n self.report_warning(\n f'Cannot move file \"{oldfile}\" out of temporary directory since \"{newfile}\" already exists. ')\n continue\n- make_dir(newfile, PostProcessingError)\n+ try:\n+ make_parent_dirs(newfile)\n+ except OSError as e:\n+ raise PostProcessingError(f'Unable to create directory: {e}') from e\n self.to_screen(f'Moving file \"{oldfile}\" to \"{newfile}\"')\n shutil.move(oldfile, newfile) # os.rename cannot move between volumes\n \ndiff --git a/yt_dlp/utils/_deprecated.py b/yt_dlp/utils/_deprecated.py\nindex 4797cfef5363..9fada27fd888 100644\n--- a/yt_dlp/utils/_deprecated.py\n+++ b/yt_dlp/utils/_deprecated.py\n@@ -46,4 +46,16 @@ def jwt_encode_hs256(payload_data, key, headers={}):\n return header_b64 + b'.' + payload_b64 + b'.' + signature_b64\n \n \n+def make_dir(path, to_screen=None):\n+ from . import make_parent_dirs\n+\n+ try:\n+ make_parent_dirs(path)\n+ return True\n+ except OSError as e:\n+ if to_screen is not None:\n+ to_screen(f'Unable to create directory: {e}')\n+ return False\n+\n+\n compiled_regex_type = type(re.compile(''))\ndiff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 43ee53729ebb..4cc7a76d17f5 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -4713,16 +4713,9 @@ def random_uuidv4():\n return re.sub(r'[xy]', lambda x: _HEX_TABLE[random.randint(0, 15)], 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')\n \n \n-def make_dir(path, to_screen=None):\n- try:\n- dn = os.path.dirname(path)\n- if dn:\n- os.makedirs(dn, exist_ok=True)\n- return True\n- except OSError as err:\n- if callable(to_screen) is not None:\n- to_screen(f'unable to create directory {err}')\n- return False\n+def make_parent_dirs(path):\n+ if dir_name := os.path.dirname(path):\n+ os.makedirs(dir_name, exist_ok=True)\n \n \n def get_executable_path():\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":5,"string":"5"}}},{"rowIdx":34274,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#3435"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":3435,"string":"3,435"},"base_sha":{"kind":"string","value":"afac4caa7db30804bebac33e53c3cb0237958224"},"head_sha":{"kind":"string","value":"c8d5c5ee3bd7d1a86d73c1537f6ca090ab5a06e6"},"task":{"kind":"string","value":"add '--client-certificate some.pem' to authenticate a site user to the remote machine\n\n### Checklist\n\n- [X] I'm reporting a feature request\n- [X] I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)\n- [X] I've verified that I'm running yt-dlp version **2022.03.08.1** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n\n### Description\n\nSome sites offer the feature of higher format downloads to selected users with a certificate.pem\n\n### Verbose log\n\n_No response_\n\nAdd support for client certificate authentication\n\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [X] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [X] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [X] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [X] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [X] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\n### What is the purpose of your *pull request*?\r\n- [ ] Bug fix\r\n- [ ] Improvement\r\n- [ ] New extractor\r\n- [X] New feature\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\nExplanation of your *pull request* in arbitrary form goes here. Please make sure the description explains the purpose and effect of your *pull request* and is worded well enough to be understood. Provide as much context and examples as possible.\r\n\r\nCloses #3333 \r\nAdapted from: https://github.com/ytdl-org/youtube-dl/pull/29590\r\n\r\nThis adds the following options:\r\n```\r\n --certificate CERTFILE Path to client certificate file in PEM format. May include the private key.\r\n --certificate-key KEYFILE Path to private key file for client certificate\r\n --certificate-key-pass PASSWORD Password for certificate private key, if encrypted. If not provided and the key file is encrypted, yt-dlp will ask interactively\r\n```"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine","scope_files":["README.md"]},{"subtask_id":"s2","goal":"Implement the changes under `test/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine","scope_files":["test/test_http.py"]},{"subtask_id":"s3","goal":"Implement the changes under `test/testdata/certificate/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine","scope_files":["test/testdata/certificate/ca.crt","test/testdata/certificate/ca.key","test/testdata/certificate/ca.srl","test/testdata/certificate/client.crt","test/testdata/certificate/client.csr","test/testdata/certificate/client.key","test/testdata/certificate/clientencrypted.key","test/testdata/certificate/clientwithencryptedkey.crt","test/testdata/certificate/clientwithkey.crt","test/testdata/certificate/instructions.md"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine","scope_files":["yt_dlp/YoutubeDL.py","yt_dlp/__init__.py","yt_dlp/options.py","yt_dlp/utils.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine\",\n \"scope_files\": [\n \"README.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine\",\n \"scope_files\": [\n \"test/test_http.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `test/testdata/certificate/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine\",\n \"scope_files\": [\n \"test/testdata/certificate/ca.crt\",\n \"test/testdata/certificate/ca.key\",\n \"test/testdata/certificate/ca.srl\",\n \"test/testdata/certificate/client.crt\",\n \"test/testdata/certificate/client.csr\",\n \"test/testdata/certificate/client.key\",\n \"test/testdata/certificate/clientencrypted.key\",\n \"test/testdata/certificate/clientwithencryptedkey.crt\",\n \"test/testdata/certificate/clientwithkey.crt\",\n \"test/testdata/certificate/instructions.md\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\",\n \"yt_dlp/__init__.py\",\n \"yt_dlp/options.py\",\n \"yt_dlp/utils.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["README.md"],"solution_diff":"diff --git a/README.md b/README.md\nindex 448b5c884f19..f8813cbb6dcd 100644\n--- a/README.md\n+++ b/README.md\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\n interactively\n --ap-list-mso List all supported multiple-system\n operators\n+ --client-certificate CERTFILE Path to client certificate file in PEM\n+ format. May include the private key\n+ --client-certificate-key KEYFILE Path to private key file for client\n+ certificate\n+ --client-certificate-password PASSWORD\n+ Password for client certificate private\n+ key, if encrypted. If not provided and the\n+ key is encrypted, yt-dlp will ask\n+ interactively\n \n ## Post-Processing Options:\n -x, --extract-audio Convert video files to audio-only files\n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["test/test_http.py"],"solution_diff":"diff --git a/test/test_http.py b/test/test_http.py\nindex d99be8be4e04..fb8c9f4e9da6 100644\n--- a/test/test_http.py\n+++ b/test/test_http.py\n@@ -85,6 +85,50 @@ def test_nocheckcertificate(self):\n self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n \n \n+class TestClientCert(unittest.TestCase):\n+ def setUp(self):\n+ certfn = os.path.join(TEST_DIR, 'testcert.pem')\n+ self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')\n+ cacertfn = os.path.join(self.certdir, 'ca.crt')\n+ self.httpd = compat_http_server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)\n+ sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\n+ sslctx.verify_mode = ssl.CERT_REQUIRED\n+ sslctx.load_verify_locations(cafile=cacertfn)\n+ sslctx.load_cert_chain(certfn, None)\n+ self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)\n+ self.port = http_server_port(self.httpd)\n+ self.server_thread = threading.Thread(target=self.httpd.serve_forever)\n+ self.server_thread.daemon = True\n+ self.server_thread.start()\n+\n+ def _run_test(self, **params):\n+ ydl = YoutubeDL({\n+ 'logger': FakeLogger(),\n+ # Disable client-side validation of unacceptable self-signed testcert.pem\n+ # The test is of a check on the server side, so unaffected\n+ 'nocheckcertificate': True,\n+ **params,\n+ })\n+ r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)\n+ self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n+\n+ def test_certificate_combined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))\n+\n+ def test_certificate_nocombined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'client.key'))\n+\n+ def test_certificate_combined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),\n+ client_certificate_password='foobar')\n+\n+ def test_certificate_nocombined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),\n+ client_certificate_password='foobar')\n+\n+\n def _build_proxy_handler(name):\n class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):\n proxy_name = name\n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s3","scope_files":["test/testdata/certificate/ca.crt","test/testdata/certificate/ca.key","test/testdata/certificate/ca.srl","test/testdata/certificate/client.crt","test/testdata/certificate/client.csr","test/testdata/certificate/client.key","test/testdata/certificate/clientencrypted.key","test/testdata/certificate/clientwithencryptedkey.crt","test/testdata/certificate/clientwithkey.crt","test/testdata/certificate/instructions.md"],"solution_diff":"diff --git a/test/testdata/certificate/ca.crt b/test/testdata/certificate/ca.crt\nnew file mode 100644\nindex 000000000000..ddf7be7ad397\n--- /dev/null\n+++ b/test/testdata/certificate/ca.crt\n@@ -0,0 +1,10 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBfDCCASOgAwIBAgIUUgngoxFpuWft8gjj3uEFoqJyoJowCgYIKoZIzj0EAwIw\n+FDESMBAGA1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEwMVoXDTM4MTAxNTAz\n+MDEwMVowFDESMBAGA1UEAwwJeXRkbHB0ZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0D\n+AQcDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCHYxFU\n+KpcCfVt9aueRyUFi1TNkkkEZ9D6fbqNTMFEwHQYDVR0OBBYEFBdY2rVNLFGM6r1F\n+iuamNDaiq0QoMB8GA1UdIwQYMBaAFBdY2rVNLFGM6r1FiuamNDaiq0QoMA8GA1Ud\n+EwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgXJg2jio1kow2g/iP54Qq+iI2\n+m4EAvZiY0Im/Ni3PHawCIC6KCl6QcHANbeq8ckOXNGusjl6OWhvEM3uPBPhqskq1\n+-----END CERTIFICATE-----\ndiff --git a/test/testdata/certificate/ca.key b/test/testdata/certificate/ca.key\nnew file mode 100644\nindex 000000000000..38920d57179d\n--- /dev/null\n+++ b/test/testdata/certificate/ca.key\n@@ -0,0 +1,5 @@\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIG2L1bHdl3PnaLiJ7Zm8aAGCj4GiVbSbXQcrJAdL+yqOoAoGCCqGSM49\n+AwEHoUQDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCH\n+YxFUKpcCfVt9aueRyUFi1TNkkkEZ9D6fbg==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/ca.srl b/test/testdata/certificate/ca.srl\nnew file mode 100644\nindex 000000000000..de2d1eab3571\n--- /dev/null\n+++ b/test/testdata/certificate/ca.srl\n@@ -0,0 +1,1 @@\n+4A260C33C4D34612646E6321E1E767DF1A95EF0B\ndiff --git a/test/testdata/certificate/client.crt b/test/testdata/certificate/client.crt\nnew file mode 100644\nindex 000000000000..874622faeaae\n--- /dev/null\n+++ b/test/testdata/certificate/client.crt\n@@ -0,0 +1,9 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\ndiff --git a/test/testdata/certificate/client.csr b/test/testdata/certificate/client.csr\nnew file mode 100644\nindex 000000000000..2d5d7a5c1d5e\n--- /dev/null\n+++ b/test/testdata/certificate/client.csr\n@@ -0,0 +1,7 @@\n+-----BEGIN CERTIFICATE REQUEST-----\n+MIHQMHcCAQAwFTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqG\n+SM49AwEHA0IABKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq\n+3ZuZ7rubyuMSXNuH+2Cl9msSpJB2LhJs5kegADAKBggqhkjOPQQDAgNJADBGAiEA\n+1LZ72mtPmVxhGtdMvpZ0fyA68H2RC5IMHpLq18T55UcCIQDKpkXXVTvAzS0JioCq\n+6kiYq8Oxx6ZMoI+11k75/Kip1g==\n+-----END CERTIFICATE REQUEST-----\ndiff --git a/test/testdata/certificate/client.key b/test/testdata/certificate/client.key\nnew file mode 100644\nindex 000000000000..e47389b51206\n--- /dev/null\n+++ b/test/testdata/certificate/client.key\n@@ -0,0 +1,5 @@\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientencrypted.key b/test/testdata/certificate/clientencrypted.key\nnew file mode 100644\nindex 000000000000..0baee37e9e19\n--- /dev/null\n+++ b/test/testdata/certificate/clientencrypted.key\n@@ -0,0 +1,8 @@\n+-----BEGIN EC PRIVATE KEY-----\n+Proc-Type: 4,ENCRYPTED\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\n+\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientwithencryptedkey.crt b/test/testdata/certificate/clientwithencryptedkey.crt\nnew file mode 100644\nindex 000000000000..f357e4c95065\n--- /dev/null\n+++ b/test/testdata/certificate/clientwithencryptedkey.crt\n@@ -0,0 +1,17 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\n+-----BEGIN EC PRIVATE KEY-----\n+Proc-Type: 4,ENCRYPTED\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\n+\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientwithkey.crt b/test/testdata/certificate/clientwithkey.crt\nnew file mode 100644\nindex 000000000000..942f6e2a4e17\n--- /dev/null\n+++ b/test/testdata/certificate/clientwithkey.crt\n@@ -0,0 +1,14 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/instructions.md b/test/testdata/certificate/instructions.md\nnew file mode 100644\nindex 000000000000..b0e3fbd4800c\n--- /dev/null\n+++ b/test/testdata/certificate/instructions.md\n@@ -0,0 +1,19 @@\n+# Generate certificates for client cert tests\n+\n+## CA\n+```sh\n+openssl ecparam -name prime256v1 -genkey -noout -out ca.key\n+openssl req -new -x509 -sha256 -days 6027 -key ca.key -out ca.crt -subj \"/CN=ytdlptest\"\n+```\n+\n+## Client\n+```sh\n+openssl ecparam -name prime256v1 -genkey -noout -out client.key\n+openssl ec -in client.key -out clientencrypted.key -passout pass:foobar -aes256\n+openssl req -new -sha256 -key client.key -out client.csr -subj \"/CN=ytdlptest2\"\n+openssl x509 -req -in client.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out client.crt -days 6027 -sha256\n+cp client.crt clientwithkey.crt\n+cp client.crt clientwithencryptedkey.crt\n+cat client.key >> clientwithkey.crt\n+cat clientencrypted.key >> clientwithencryptedkey.crt\n+```\n\\ No newline at end of file\n","summary":"Edited 10 file(s) in test/testdata/certificate/"},{"subtask_id":"s4","scope_files":["yt_dlp/YoutubeDL.py","yt_dlp/__init__.py","yt_dlp/options.py","yt_dlp/utils.py"],"solution_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 50342c2ca753..1766ff37996c 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -319,6 +319,10 @@ class YoutubeDL:\n legacyserverconnect: Explicitly allow HTTPS connection to servers that do not\n support RFC 5746 secure renegotiation\n nocheckcertificate: Do not verify SSL certificates\n+ client_certificate: Path to client certificate file in PEM format. May include the private key\n+ client_certificate_key: Path to private key file for client certificate\n+ client_certificate_password: Password for client certificate private key, if encrypted.\n+ If not provided and the key is encrypted, yt-dlp will ask interactively\n prefer_insecure: Use HTTP instead of HTTPS to retrieve information.\n At the moment, this is only supported by YouTube.\n http_headers: A dictionary of custom headers to be used for all requests\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex dc2f905c7229..2e9da4c98be0 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -641,6 +641,9 @@ def parse_options(argv=None):\n 'ap_mso': opts.ap_mso,\n 'ap_username': opts.ap_username,\n 'ap_password': opts.ap_password,\n+ 'client_certificate': opts.client_certificate,\n+ 'client_certificate_key': opts.client_certificate_key,\n+ 'client_certificate_password': opts.client_certificate_password,\n 'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),\n 'no_warnings': opts.no_warnings,\n 'forceurl': opts.geturl,\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex 944147871d89..60f86657059e 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -571,6 +571,19 @@ def _dict_from_options_callback(\n '--ap-list-mso',\n action='store_true', dest='ap_list_mso', default=False,\n help='List all supported multiple-system operators')\n+ authentication.add_option(\n+ '--client-certificate',\n+ dest='client_certificate', metavar='CERTFILE',\n+ help='Path to client certificate file in PEM format. May include the private key')\n+ authentication.add_option(\n+ '--client-certificate-key',\n+ dest='client_certificate_key', metavar='KEYFILE',\n+ help='Path to private key file for client certificate')\n+ authentication.add_option(\n+ '--client-certificate-password',\n+ dest='client_certificate_password', metavar='PASSWORD',\n+ help='Password for client certificate private key, if encrypted. '\n+ 'If not provided and the key is encrypted, yt-dlp will ask interactively')\n \n video_format = optparse.OptionGroup(parser, 'Video Format Options')\n video_format.add_option(\ndiff --git a/yt_dlp/utils.py b/yt_dlp/utils.py\nindex 5c83b92b4841..3f22eaf75f37 100644\n--- a/yt_dlp/utils.py\n+++ b/yt_dlp/utils.py\n@@ -936,6 +936,14 @@ def make_HTTPS_handler(params, **kwargs):\n for storename in ('CA', 'ROOT'):\n _ssl_load_windows_store_certs(context, storename)\n context.set_default_verify_paths()\n+ client_certfile = params.get('client_certificate')\n+ if client_certfile:\n+ try:\n+ context.load_cert_chain(\n+ client_certfile, keyfile=params.get('client_certificate_key'),\n+ password=params.get('client_certificate_password'))\n+ except ssl.SSLError:\n+ raise YoutubeDLError('Unable to load client certificate')\n return YoutubeDLHTTPSHandler(params, context=context, **kwargs)\n \n \n\n","summary":"Edited 4 file(s) in yt_dlp/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"README.md\"\n ],\n \"solution_diff\": \"diff --git a/README.md b/README.md\\nindex 448b5c884f19..f8813cbb6dcd 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\\n interactively\\n --ap-list-mso List all supported multiple-system\\n operators\\n+ --client-certificate CERTFILE Path to client certificate file in PEM\\n+ format. May include the private key\\n+ --client-certificate-key KEYFILE Path to private key file for client\\n+ certificate\\n+ --client-certificate-password PASSWORD\\n+ Password for client certificate private\\n+ key, if encrypted. If not provided and the\\n+ key is encrypted, yt-dlp will ask\\n+ interactively\\n \\n ## Post-Processing Options:\\n -x, --extract-audio Convert video files to audio-only files\\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/test_http.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_http.py b/test/test_http.py\\nindex d99be8be4e04..fb8c9f4e9da6 100644\\n--- a/test/test_http.py\\n+++ b/test/test_http.py\\n@@ -85,6 +85,50 @@ def test_nocheckcertificate(self):\\n self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\\n \\n \\n+class TestClientCert(unittest.TestCase):\\n+ def setUp(self):\\n+ certfn = os.path.join(TEST_DIR, 'testcert.pem')\\n+ self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')\\n+ cacertfn = os.path.join(self.certdir, 'ca.crt')\\n+ self.httpd = compat_http_server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)\\n+ sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\\n+ sslctx.verify_mode = ssl.CERT_REQUIRED\\n+ sslctx.load_verify_locations(cafile=cacertfn)\\n+ sslctx.load_cert_chain(certfn, None)\\n+ self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)\\n+ self.port = http_server_port(self.httpd)\\n+ self.server_thread = threading.Thread(target=self.httpd.serve_forever)\\n+ self.server_thread.daemon = True\\n+ self.server_thread.start()\\n+\\n+ def _run_test(self, **params):\\n+ ydl = YoutubeDL({\\n+ 'logger': FakeLogger(),\\n+ # Disable client-side validation of unacceptable self-signed testcert.pem\\n+ # The test is of a check on the server side, so unaffected\\n+ 'nocheckcertificate': True,\\n+ **params,\\n+ })\\n+ r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)\\n+ self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\\n+\\n+ def test_certificate_combined_nopass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))\\n+\\n+ def test_certificate_nocombined_nopass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\\n+ client_certificate_key=os.path.join(self.certdir, 'client.key'))\\n+\\n+ def test_certificate_combined_pass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),\\n+ client_certificate_password='foobar')\\n+\\n+ def test_certificate_nocombined_pass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\\n+ client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),\\n+ client_certificate_password='foobar')\\n+\\n+\\n def _build_proxy_handler(name):\\n class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):\\n proxy_name = name\\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"test/testdata/certificate/ca.crt\",\n \"test/testdata/certificate/ca.key\",\n \"test/testdata/certificate/ca.srl\",\n \"test/testdata/certificate/client.crt\",\n \"test/testdata/certificate/client.csr\",\n \"test/testdata/certificate/client.key\",\n \"test/testdata/certificate/clientencrypted.key\",\n \"test/testdata/certificate/clientwithencryptedkey.crt\",\n \"test/testdata/certificate/clientwithkey.crt\",\n \"test/testdata/certificate/instructions.md\"\n ],\n \"solution_diff\": \"diff --git a/test/testdata/certificate/ca.crt b/test/testdata/certificate/ca.crt\\nnew file mode 100644\\nindex 000000000000..ddf7be7ad397\\n--- /dev/null\\n+++ b/test/testdata/certificate/ca.crt\\n@@ -0,0 +1,10 @@\\n+-----BEGIN CERTIFICATE-----\\n+MIIBfDCCASOgAwIBAgIUUgngoxFpuWft8gjj3uEFoqJyoJowCgYIKoZIzj0EAwIw\\n+FDESMBAGA1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEwMVoXDTM4MTAxNTAz\\n+MDEwMVowFDESMBAGA1UEAwwJeXRkbHB0ZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0D\\n+AQcDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCHYxFU\\n+KpcCfVt9aueRyUFi1TNkkkEZ9D6fbqNTMFEwHQYDVR0OBBYEFBdY2rVNLFGM6r1F\\n+iuamNDaiq0QoMB8GA1UdIwQYMBaAFBdY2rVNLFGM6r1FiuamNDaiq0QoMA8GA1Ud\\n+EwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgXJg2jio1kow2g/iP54Qq+iI2\\n+m4EAvZiY0Im/Ni3PHawCIC6KCl6QcHANbeq8ckOXNGusjl6OWhvEM3uPBPhqskq1\\n+-----END CERTIFICATE-----\\ndiff --git a/test/testdata/certificate/ca.key b/test/testdata/certificate/ca.key\\nnew file mode 100644\\nindex 000000000000..38920d57179d\\n--- /dev/null\\n+++ b/test/testdata/certificate/ca.key\\n@@ -0,0 +1,5 @@\\n+-----BEGIN EC PRIVATE KEY-----\\n+MHcCAQEEIG2L1bHdl3PnaLiJ7Zm8aAGCj4GiVbSbXQcrJAdL+yqOoAoGCCqGSM49\\n+AwEHoUQDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCH\\n+YxFUKpcCfVt9aueRyUFi1TNkkkEZ9D6fbg==\\n+-----END EC PRIVATE KEY-----\\ndiff --git a/test/testdata/certificate/ca.srl b/test/testdata/certificate/ca.srl\\nnew file mode 100644\\nindex 000000000000..de2d1eab3571\\n--- /dev/null\\n+++ b/test/testdata/certificate/ca.srl\\n@@ -0,0 +1,1 @@\\n+4A260C33C4D34612646E6321E1E767DF1A95EF0B\\ndiff --git a/test/testdata/certificate/client.crt b/test/testdata/certificate/client.crt\\nnew file mode 100644\\nindex 000000000000..874622faeaae\\n--- /dev/null\\n+++ b/test/testdata/certificate/client.crt\\n@@ -0,0 +1,9 @@\\n+-----BEGIN CERTIFICATE-----\\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\\n+D0dB8M1kJw==\\n+-----END CERTIFICATE-----\\ndiff --git a/test/testdata/certificate/client.csr b/test/testdata/certificate/client.csr\\nnew file mode 100644\\nindex 000000000000..2d5d7a5c1d5e\\n--- /dev/null\\n+++ b/test/testdata/certificate/client.csr\\n@@ -0,0 +1,7 @@\\n+-----BEGIN CERTIFICATE REQUEST-----\\n+MIHQMHcCAQAwFTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqG\\n+SM49AwEHA0IABKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq\\n+3ZuZ7rubyuMSXNuH+2Cl9msSpJB2LhJs5kegADAKBggqhkjOPQQDAgNJADBGAiEA\\n+1LZ72mtPmVxhGtdMvpZ0fyA68H2RC5IMHpLq18T55UcCIQDKpkXXVTvAzS0JioCq\\n+6kiYq8Oxx6ZMoI+11k75/Kip1g==\\n+-----END CERTIFICATE REQUEST-----\\ndiff --git a/test/testdata/certificate/client.key b/test/testdata/certificate/client.key\\nnew file mode 100644\\nindex 000000000000..e47389b51206\\n--- /dev/null\\n+++ b/test/testdata/certificate/client.key\\n@@ -0,0 +1,5 @@\\n+-----BEGIN EC PRIVATE KEY-----\\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\\n+-----END EC PRIVATE KEY-----\\ndiff --git a/test/testdata/certificate/clientencrypted.key b/test/testdata/certificate/clientencrypted.key\\nnew file mode 100644\\nindex 000000000000..0baee37e9e19\\n--- /dev/null\\n+++ b/test/testdata/certificate/clientencrypted.key\\n@@ -0,0 +1,8 @@\\n+-----BEGIN EC PRIVATE KEY-----\\n+Proc-Type: 4,ENCRYPTED\\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\\n+\\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\\n+-----END EC PRIVATE KEY-----\\ndiff --git a/test/testdata/certificate/clientwithencryptedkey.crt b/test/testdata/certificate/clientwithencryptedkey.crt\\nnew file mode 100644\\nindex 000000000000..f357e4c95065\\n--- /dev/null\\n+++ b/test/testdata/certificate/clientwithencryptedkey.crt\\n@@ -0,0 +1,17 @@\\n+-----BEGIN CERTIFICATE-----\\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\\n+D0dB8M1kJw==\\n+-----END CERTIFICATE-----\\n+-----BEGIN EC PRIVATE KEY-----\\n+Proc-Type: 4,ENCRYPTED\\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\\n+\\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\\n+-----END EC PRIVATE KEY-----\\ndiff --git a/test/testdata/certificate/clientwithkey.crt b/test/testdata/certificate/clientwithkey.crt\\nnew file mode 100644\\nindex 000000000000..942f6e2a4e17\\n--- /dev/null\\n+++ b/test/testdata/certificate/clientwithkey.crt\\n@@ -0,0 +1,14 @@\\n+-----BEGIN CERTIFICATE-----\\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\\n+D0dB8M1kJw==\\n+-----END CERTIFICATE-----\\n+-----BEGIN EC PRIVATE KEY-----\\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\\n+-----END EC PRIVATE KEY-----\\ndiff --git a/test/testdata/certificate/instructions.md b/test/testdata/certificate/instructions.md\\nnew file mode 100644\\nindex 000000000000..b0e3fbd4800c\\n--- /dev/null\\n+++ b/test/testdata/certificate/instructions.md\\n@@ -0,0 +1,19 @@\\n+# Generate certificates for client cert tests\\n+\\n+## CA\\n+```sh\\n+openssl ecparam -name prime256v1 -genkey -noout -out ca.key\\n+openssl req -new -x509 -sha256 -days 6027 -key ca.key -out ca.crt -subj \\\"/CN=ytdlptest\\\"\\n+```\\n+\\n+## Client\\n+```sh\\n+openssl ecparam -name prime256v1 -genkey -noout -out client.key\\n+openssl ec -in client.key -out clientencrypted.key -passout pass:foobar -aes256\\n+openssl req -new -sha256 -key client.key -out client.csr -subj \\\"/CN=ytdlptest2\\\"\\n+openssl x509 -req -in client.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out client.crt -days 6027 -sha256\\n+cp client.crt clientwithkey.crt\\n+cp client.crt clientwithencryptedkey.crt\\n+cat client.key >> clientwithkey.crt\\n+cat clientencrypted.key >> clientwithencryptedkey.crt\\n+```\\n\\\\ No newline at end of file\\n\",\n \"summary\": \"Edited 10 file(s) in test/testdata/certificate/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\",\n \"yt_dlp/__init__.py\",\n \"yt_dlp/options.py\",\n \"yt_dlp/utils.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 50342c2ca753..1766ff37996c 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -319,6 +319,10 @@ class YoutubeDL:\\n legacyserverconnect: Explicitly allow HTTPS connection to servers that do not\\n support RFC 5746 secure renegotiation\\n nocheckcertificate: Do not verify SSL certificates\\n+ client_certificate: Path to client certificate file in PEM format. May include the private key\\n+ client_certificate_key: Path to private key file for client certificate\\n+ client_certificate_password: Password for client certificate private key, if encrypted.\\n+ If not provided and the key is encrypted, yt-dlp will ask interactively\\n prefer_insecure: Use HTTP instead of HTTPS to retrieve information.\\n At the moment, this is only supported by YouTube.\\n http_headers: A dictionary of custom headers to be used for all requests\\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\\nindex dc2f905c7229..2e9da4c98be0 100644\\n--- a/yt_dlp/__init__.py\\n+++ b/yt_dlp/__init__.py\\n@@ -641,6 +641,9 @@ def parse_options(argv=None):\\n 'ap_mso': opts.ap_mso,\\n 'ap_username': opts.ap_username,\\n 'ap_password': opts.ap_password,\\n+ 'client_certificate': opts.client_certificate,\\n+ 'client_certificate_key': opts.client_certificate_key,\\n+ 'client_certificate_password': opts.client_certificate_password,\\n 'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),\\n 'no_warnings': opts.no_warnings,\\n 'forceurl': opts.geturl,\\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\\nindex 944147871d89..60f86657059e 100644\\n--- a/yt_dlp/options.py\\n+++ b/yt_dlp/options.py\\n@@ -571,6 +571,19 @@ def _dict_from_options_callback(\\n '--ap-list-mso',\\n action='store_true', dest='ap_list_mso', default=False,\\n help='List all supported multiple-system operators')\\n+ authentication.add_option(\\n+ '--client-certificate',\\n+ dest='client_certificate', metavar='CERTFILE',\\n+ help='Path to client certificate file in PEM format. May include the private key')\\n+ authentication.add_option(\\n+ '--client-certificate-key',\\n+ dest='client_certificate_key', metavar='KEYFILE',\\n+ help='Path to private key file for client certificate')\\n+ authentication.add_option(\\n+ '--client-certificate-password',\\n+ dest='client_certificate_password', metavar='PASSWORD',\\n+ help='Password for client certificate private key, if encrypted. '\\n+ 'If not provided and the key is encrypted, yt-dlp will ask interactively')\\n \\n video_format = optparse.OptionGroup(parser, 'Video Format Options')\\n video_format.add_option(\\ndiff --git a/yt_dlp/utils.py b/yt_dlp/utils.py\\nindex 5c83b92b4841..3f22eaf75f37 100644\\n--- a/yt_dlp/utils.py\\n+++ b/yt_dlp/utils.py\\n@@ -936,6 +936,14 @@ def make_HTTPS_handler(params, **kwargs):\\n for storename in ('CA', 'ROOT'):\\n _ssl_load_windows_store_certs(context, storename)\\n context.set_default_verify_paths()\\n+ client_certfile = params.get('client_certificate')\\n+ if client_certfile:\\n+ try:\\n+ context.load_cert_chain(\\n+ client_certfile, keyfile=params.get('client_certificate_key'),\\n+ password=params.get('client_certificate_password'))\\n+ except ssl.SSLError:\\n+ raise YoutubeDLError('Unable to load client certificate')\\n return YoutubeDLHTTPSHandler(params, context=context, **kwargs)\\n \\n \\n\\n\",\n \"summary\": \"Edited 4 file(s) in yt_dlp/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"imo, it should be `--client-certificate`, `--client-certificate-key`, `--client-certificate-password`.\r\n\r\nAlso, it would be great if password (if not given) can be obtained from netrc","revised_diff":"diff --git a/README.md b/README.md\nindex 448b5c884f19..f8813cbb6dcd 100644\n--- a/README.md\n+++ b/README.md\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\n interactively\n --ap-list-mso List all supported multiple-system\n operators\n+ --client-certificate CERTFILE Path to client certificate file in PEM\n+ format. May include the private key\n+ --client-certificate-key KEYFILE Path to private key file for client\n+ certificate\n+ --client-certificate-password PASSWORD\n+ Password for client certificate private\n+ key, if encrypted. If not provided and the\n+ key is encrypted, yt-dlp will ask\n+ interactively\n \n ## Post-Processing Options:\n -x, --extract-audio Convert video files to audio-only files\n"},{"subtask_id":"s2","comment":"```suggestion\r\n ydl = YoutubeDL({\r\n 'logger': FakeLogger(),\r\n # Disable client-side validation of unacceptable self-signed testcert.pem\r\n # The test is of a check on the server side, so unaffected\r\n 'nocheckcertificate': True,\r\n **params,\r\n })\r\n```","revised_diff":"diff --git a/test/test_http.py b/test/test_http.py\nindex d99be8be4e04..fb8c9f4e9da6 100644\n--- a/test/test_http.py\n+++ b/test/test_http.py\n@@ -85,6 +85,50 @@ def test_nocheckcertificate(self):\n self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n \n \n+class TestClientCert(unittest.TestCase):\n+ def setUp(self):\n+ certfn = os.path.join(TEST_DIR, 'testcert.pem')\n+ self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')\n+ cacertfn = os.path.join(self.certdir, 'ca.crt')\n+ self.httpd = compat_http_server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)\n+ sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\n+ sslctx.verify_mode = ssl.CERT_REQUIRED\n+ sslctx.load_verify_locations(cafile=cacertfn)\n+ sslctx.load_cert_chain(certfn, None)\n+ self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)\n+ self.port = http_server_port(self.httpd)\n+ self.server_thread = threading.Thread(target=self.httpd.serve_forever)\n+ self.server_thread.daemon = True\n+ self.server_thread.start()\n+\n+ def _run_test(self, **params):\n+ ydl = YoutubeDL({\n+ 'logger': FakeLogger(),\n+ # Disable client-side validation of unacceptable self-signed testcert.pem\n+ # The test is of a check on the server side, so unaffected\n+ 'nocheckcertificate': True,\n+ **params,\n+ })\n+ r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)\n+ self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n+\n+ def test_certificate_combined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))\n+\n+ def test_certificate_nocombined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'client.key'))\n+\n+ def test_certificate_combined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),\n+ client_certificate_password='foobar')\n+\n+ def test_certificate_nocombined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),\n+ client_certificate_password='foobar')\n+\n+\n def _build_proxy_handler(name):\n class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):\n proxy_name = name\n"},{"subtask_id":"s4","comment":"similar to above\r\n```suggestion\r\n client_certificate: Path to client certificate file in PEM format. May include the private key.\r\n client_certificate_key: Path to private key file for client certificate\r\n client_certificate_pass: Password for certificate private key, if encrypted.\r\n If not provided and the key is encrypted, yt-dlp will ask interactively\r\n```","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 50342c2ca753..1766ff37996c 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -319,6 +319,10 @@ class YoutubeDL:\n legacyserverconnect: Explicitly allow HTTPS connection to servers that do not\n support RFC 5746 secure renegotiation\n nocheckcertificate: Do not verify SSL certificates\n+ client_certificate: Path to client certificate file in PEM format. May include the private key\n+ client_certificate_key: Path to private key file for client certificate\n+ client_certificate_password: Password for client certificate private key, if encrypted.\n+ If not provided and the key is encrypted, yt-dlp will ask interactively\n prefer_insecure: Use HTTP instead of HTTPS to retrieve information.\n At the moment, this is only supported by YouTube.\n http_headers: A dictionary of custom headers to be used for all requests\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"imo, it should be `--client-certificate`, `--client-certificate-key`, `--client-certificate-password`.\\r\\n\\r\\nAlso, it would be great if password (if not given) can be obtained from netrc\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex 448b5c884f19..f8813cbb6dcd 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\\n interactively\\n --ap-list-mso List all supported multiple-system\\n operators\\n+ --client-certificate CERTFILE Path to client certificate file in PEM\\n+ format. May include the private key\\n+ --client-certificate-key KEYFILE Path to private key file for client\\n+ certificate\\n+ --client-certificate-password PASSWORD\\n+ Password for client certificate private\\n+ key, if encrypted. If not provided and the\\n+ key is encrypted, yt-dlp will ask\\n+ interactively\\n \\n ## Post-Processing Options:\\n -x, --extract-audio Convert video files to audio-only files\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"```suggestion\\r\\n ydl = YoutubeDL({\\r\\n 'logger': FakeLogger(),\\r\\n # Disable client-side validation of unacceptable self-signed testcert.pem\\r\\n # The test is of a check on the server side, so unaffected\\r\\n 'nocheckcertificate': True,\\r\\n **params,\\r\\n })\\r\\n```\",\n \"revised_diff\": \"diff --git a/test/test_http.py b/test/test_http.py\\nindex d99be8be4e04..fb8c9f4e9da6 100644\\n--- a/test/test_http.py\\n+++ b/test/test_http.py\\n@@ -85,6 +85,50 @@ def test_nocheckcertificate(self):\\n self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\\n \\n \\n+class TestClientCert(unittest.TestCase):\\n+ def setUp(self):\\n+ certfn = os.path.join(TEST_DIR, 'testcert.pem')\\n+ self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')\\n+ cacertfn = os.path.join(self.certdir, 'ca.crt')\\n+ self.httpd = compat_http_server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)\\n+ sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\\n+ sslctx.verify_mode = ssl.CERT_REQUIRED\\n+ sslctx.load_verify_locations(cafile=cacertfn)\\n+ sslctx.load_cert_chain(certfn, None)\\n+ self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)\\n+ self.port = http_server_port(self.httpd)\\n+ self.server_thread = threading.Thread(target=self.httpd.serve_forever)\\n+ self.server_thread.daemon = True\\n+ self.server_thread.start()\\n+\\n+ def _run_test(self, **params):\\n+ ydl = YoutubeDL({\\n+ 'logger': FakeLogger(),\\n+ # Disable client-side validation of unacceptable self-signed testcert.pem\\n+ # The test is of a check on the server side, so unaffected\\n+ 'nocheckcertificate': True,\\n+ **params,\\n+ })\\n+ r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)\\n+ self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\\n+\\n+ def test_certificate_combined_nopass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))\\n+\\n+ def test_certificate_nocombined_nopass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\\n+ client_certificate_key=os.path.join(self.certdir, 'client.key'))\\n+\\n+ def test_certificate_combined_pass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),\\n+ client_certificate_password='foobar')\\n+\\n+ def test_certificate_nocombined_pass(self):\\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\\n+ client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),\\n+ client_certificate_password='foobar')\\n+\\n+\\n def _build_proxy_handler(name):\\n class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):\\n proxy_name = name\\n\"\n },\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"similar to above\\r\\n```suggestion\\r\\n client_certificate: Path to client certificate file in PEM format. May include the private key.\\r\\n client_certificate_key: Path to private key file for client certificate\\r\\n client_certificate_pass: Password for certificate private key, if encrypted.\\r\\n If not provided and the key is encrypted, yt-dlp will ask interactively\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 50342c2ca753..1766ff37996c 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -319,6 +319,10 @@ class YoutubeDL:\\n legacyserverconnect: Explicitly allow HTTPS connection to servers that do not\\n support RFC 5746 secure renegotiation\\n nocheckcertificate: Do not verify SSL certificates\\n+ client_certificate: Path to client certificate file in PEM format. May include the private key\\n+ client_certificate_key: Path to private key file for client certificate\\n+ client_certificate_password: Password for client certificate private key, if encrypted.\\n+ If not provided and the key is encrypted, yt-dlp will ask interactively\\n prefer_insecure: Use HTTP instead of HTTPS to retrieve information.\\n At the moment, this is only supported by YouTube.\\n http_headers: A dictionary of custom headers to be used for all requests\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 448b5c884f19..f8813cbb6dcd 100644\n--- a/README.md\n+++ b/README.md\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\n interactively\n --ap-list-mso List all supported multiple-system\n operators\n+ --client-certificate CERTFILE Path to client certificate file in PEM\n+ format. May include the private key\n+ --client-certificate-key KEYFILE Path to private key file for client\n+ certificate\n+ --client-certificate-password PASSWORD\n+ Password for client certificate private\n+ key, if encrypted. If not provided and the\n+ key is encrypted, yt-dlp will ask\n+ interactively\n \n ## Post-Processing Options:\n -x, --extract-audio Convert video files to audio-only files\ndiff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 50342c2ca753..1766ff37996c 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -319,6 +319,10 @@ class YoutubeDL:\n legacyserverconnect: Explicitly allow HTTPS connection to servers that do not\n support RFC 5746 secure renegotiation\n nocheckcertificate: Do not verify SSL certificates\n+ client_certificate: Path to client certificate file in PEM format. May include the private key\n+ client_certificate_key: Path to private key file for client certificate\n+ client_certificate_password: Password for client certificate private key, if encrypted.\n+ If not provided and the key is encrypted, yt-dlp will ask interactively\n prefer_insecure: Use HTTP instead of HTTPS to retrieve information.\n At the moment, this is only supported by YouTube.\n http_headers: A dictionary of custom headers to be used for all requests\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex dc2f905c7229..2e9da4c98be0 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -641,6 +641,9 @@ def parse_options(argv=None):\n 'ap_mso': opts.ap_mso,\n 'ap_username': opts.ap_username,\n 'ap_password': opts.ap_password,\n+ 'client_certificate': opts.client_certificate,\n+ 'client_certificate_key': opts.client_certificate_key,\n+ 'client_certificate_password': opts.client_certificate_password,\n 'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),\n 'no_warnings': opts.no_warnings,\n 'forceurl': opts.geturl,\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex 944147871d89..60f86657059e 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -571,6 +571,19 @@ def _dict_from_options_callback(\n '--ap-list-mso',\n action='store_true', dest='ap_list_mso', default=False,\n help='List all supported multiple-system operators')\n+ authentication.add_option(\n+ '--client-certificate',\n+ dest='client_certificate', metavar='CERTFILE',\n+ help='Path to client certificate file in PEM format. May include the private key')\n+ authentication.add_option(\n+ '--client-certificate-key',\n+ dest='client_certificate_key', metavar='KEYFILE',\n+ help='Path to private key file for client certificate')\n+ authentication.add_option(\n+ '--client-certificate-password',\n+ dest='client_certificate_password', metavar='PASSWORD',\n+ help='Password for client certificate private key, if encrypted. '\n+ 'If not provided and the key is encrypted, yt-dlp will ask interactively')\n \n video_format = optparse.OptionGroup(parser, 'Video Format Options')\n video_format.add_option(\ndiff --git a/yt_dlp/utils.py b/yt_dlp/utils.py\nindex 5c83b92b4841..3f22eaf75f37 100644\n--- a/yt_dlp/utils.py\n+++ b/yt_dlp/utils.py\n@@ -936,6 +936,14 @@ def make_HTTPS_handler(params, **kwargs):\n for storename in ('CA', 'ROOT'):\n _ssl_load_windows_store_certs(context, storename)\n context.set_default_verify_paths()\n+ client_certfile = params.get('client_certificate')\n+ if client_certfile:\n+ try:\n+ context.load_cert_chain(\n+ client_certfile, keyfile=params.get('client_certificate_key'),\n+ password=params.get('client_certificate_password'))\n+ except ssl.SSLError:\n+ raise YoutubeDLError('Unable to load client certificate')\n return YoutubeDLHTTPSHandler(params, context=context, **kwargs)\n \n \n\ndiff --git a/test/test_http.py b/test/test_http.py\nindex d99be8be4e04..fb8c9f4e9da6 100644\n--- a/test/test_http.py\n+++ b/test/test_http.py\n@@ -85,6 +85,50 @@ def test_nocheckcertificate(self):\n self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n \n \n+class TestClientCert(unittest.TestCase):\n+ def setUp(self):\n+ certfn = os.path.join(TEST_DIR, 'testcert.pem')\n+ self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')\n+ cacertfn = os.path.join(self.certdir, 'ca.crt')\n+ self.httpd = compat_http_server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)\n+ sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)\n+ sslctx.verify_mode = ssl.CERT_REQUIRED\n+ sslctx.load_verify_locations(cafile=cacertfn)\n+ sslctx.load_cert_chain(certfn, None)\n+ self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)\n+ self.port = http_server_port(self.httpd)\n+ self.server_thread = threading.Thread(target=self.httpd.serve_forever)\n+ self.server_thread.daemon = True\n+ self.server_thread.start()\n+\n+ def _run_test(self, **params):\n+ ydl = YoutubeDL({\n+ 'logger': FakeLogger(),\n+ # Disable client-side validation of unacceptable self-signed testcert.pem\n+ # The test is of a check on the server side, so unaffected\n+ 'nocheckcertificate': True,\n+ **params,\n+ })\n+ r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)\n+ self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)\n+\n+ def test_certificate_combined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))\n+\n+ def test_certificate_nocombined_nopass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'client.key'))\n+\n+ def test_certificate_combined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),\n+ client_certificate_password='foobar')\n+\n+ def test_certificate_nocombined_pass(self):\n+ self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),\n+ client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),\n+ client_certificate_password='foobar')\n+\n+\n def _build_proxy_handler(name):\n class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):\n proxy_name = name\ndiff --git a/test/testdata/certificate/ca.crt b/test/testdata/certificate/ca.crt\nnew file mode 100644\nindex 000000000000..ddf7be7ad397\n--- /dev/null\n+++ b/test/testdata/certificate/ca.crt\n@@ -0,0 +1,10 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBfDCCASOgAwIBAgIUUgngoxFpuWft8gjj3uEFoqJyoJowCgYIKoZIzj0EAwIw\n+FDESMBAGA1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEwMVoXDTM4MTAxNTAz\n+MDEwMVowFDESMBAGA1UEAwwJeXRkbHB0ZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0D\n+AQcDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCHYxFU\n+KpcCfVt9aueRyUFi1TNkkkEZ9D6fbqNTMFEwHQYDVR0OBBYEFBdY2rVNLFGM6r1F\n+iuamNDaiq0QoMB8GA1UdIwQYMBaAFBdY2rVNLFGM6r1FiuamNDaiq0QoMA8GA1Ud\n+EwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgXJg2jio1kow2g/iP54Qq+iI2\n+m4EAvZiY0Im/Ni3PHawCIC6KCl6QcHANbeq8ckOXNGusjl6OWhvEM3uPBPhqskq1\n+-----END CERTIFICATE-----\ndiff --git a/test/testdata/certificate/ca.key b/test/testdata/certificate/ca.key\nnew file mode 100644\nindex 000000000000..38920d57179d\n--- /dev/null\n+++ b/test/testdata/certificate/ca.key\n@@ -0,0 +1,5 @@\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIG2L1bHdl3PnaLiJ7Zm8aAGCj4GiVbSbXQcrJAdL+yqOoAoGCCqGSM49\n+AwEHoUQDQgAEcTaKMtIn2/1kgid1zXFpLm87FMT5PP3/bltKVVH3DLO//0kUslCH\n+YxFUKpcCfVt9aueRyUFi1TNkkkEZ9D6fbg==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/ca.srl b/test/testdata/certificate/ca.srl\nnew file mode 100644\nindex 000000000000..de2d1eab3571\n--- /dev/null\n+++ b/test/testdata/certificate/ca.srl\n@@ -0,0 +1,1 @@\n+4A260C33C4D34612646E6321E1E767DF1A95EF0B\ndiff --git a/test/testdata/certificate/client.crt b/test/testdata/certificate/client.crt\nnew file mode 100644\nindex 000000000000..874622faeaae\n--- /dev/null\n+++ b/test/testdata/certificate/client.crt\n@@ -0,0 +1,9 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\ndiff --git a/test/testdata/certificate/client.csr b/test/testdata/certificate/client.csr\nnew file mode 100644\nindex 000000000000..2d5d7a5c1d5e\n--- /dev/null\n+++ b/test/testdata/certificate/client.csr\n@@ -0,0 +1,7 @@\n+-----BEGIN CERTIFICATE REQUEST-----\n+MIHQMHcCAQAwFTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqG\n+SM49AwEHA0IABKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq\n+3ZuZ7rubyuMSXNuH+2Cl9msSpJB2LhJs5kegADAKBggqhkjOPQQDAgNJADBGAiEA\n+1LZ72mtPmVxhGtdMvpZ0fyA68H2RC5IMHpLq18T55UcCIQDKpkXXVTvAzS0JioCq\n+6kiYq8Oxx6ZMoI+11k75/Kip1g==\n+-----END CERTIFICATE REQUEST-----\ndiff --git a/test/testdata/certificate/client.key b/test/testdata/certificate/client.key\nnew file mode 100644\nindex 000000000000..e47389b51206\n--- /dev/null\n+++ b/test/testdata/certificate/client.key\n@@ -0,0 +1,5 @@\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientencrypted.key b/test/testdata/certificate/clientencrypted.key\nnew file mode 100644\nindex 000000000000..0baee37e9e19\n--- /dev/null\n+++ b/test/testdata/certificate/clientencrypted.key\n@@ -0,0 +1,8 @@\n+-----BEGIN EC PRIVATE KEY-----\n+Proc-Type: 4,ENCRYPTED\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\n+\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientwithencryptedkey.crt b/test/testdata/certificate/clientwithencryptedkey.crt\nnew file mode 100644\nindex 000000000000..f357e4c95065\n--- /dev/null\n+++ b/test/testdata/certificate/clientwithencryptedkey.crt\n@@ -0,0 +1,17 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\n+-----BEGIN EC PRIVATE KEY-----\n+Proc-Type: 4,ENCRYPTED\n+DEK-Info: AES-256-CBC,4B39160146F15544922E553E08299A35\n+\n+96A7/iBkIfTVb8r2812ued2pS49FfVY4Ppz/45OGF0uFayMtMl8/GuEBCamuhFXS\n+rnOOpco96TTeeKZHqR45wnf4tgHM8IjoQ6H0EX3lVF19OHnArAgrGYtohWUGSyGn\n+IgLJFdUewIjdI7XApTJprQFE5E2tETXFA95mCz88u1c=\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/clientwithkey.crt b/test/testdata/certificate/clientwithkey.crt\nnew file mode 100644\nindex 000000000000..942f6e2a4e17\n--- /dev/null\n+++ b/test/testdata/certificate/clientwithkey.crt\n@@ -0,0 +1,14 @@\n+-----BEGIN CERTIFICATE-----\n+MIIBIzCBygIUSiYMM8TTRhJkbmMh4edn3xqV7wswCgYIKoZIzj0EAwIwFDESMBAG\n+A1UEAwwJeXRkbHB0ZXN0MB4XDTIyMDQxNTAzMDEyN1oXDTM4MTAxNTAzMDEyN1ow\n+FTETMBEGA1UEAwwKeXRkbHB0ZXN0MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA\n+BKREKVDWfLKZknzYg+BUkmTn43f2pl/LNSyKPtXo/UV7hhp6JXIq3ZuZ7rubyuMS\n+XNuH+2Cl9msSpJB2LhJs5kcwCgYIKoZIzj0EAwIDSAAwRQIhAMRr46vO25/5nUhD\n+aHp4L67AeSvrjvSFHfubyD3Kr5dwAiA8EfOgVxc8Qh6ozTcbXO/WnBfS48ZFRSQY\n+D0dB8M1kJw==\n+-----END CERTIFICATE-----\n+-----BEGIN EC PRIVATE KEY-----\n+MHcCAQEEIAW6h9hwT0Aha+JBukgmHnrKRPoqPNWYA86ic0UaKHs8oAoGCCqGSM49\n+AwEHoUQDQgAEpEQpUNZ8spmSfNiD4FSSZOfjd/amX8s1LIo+1ej9RXuGGnolcird\n+m5nuu5vK4xJc24f7YKX2axKkkHYuEmzmRw==\n+-----END EC PRIVATE KEY-----\ndiff --git a/test/testdata/certificate/instructions.md b/test/testdata/certificate/instructions.md\nnew file mode 100644\nindex 000000000000..b0e3fbd4800c\n--- /dev/null\n+++ b/test/testdata/certificate/instructions.md\n@@ -0,0 +1,19 @@\n+# Generate certificates for client cert tests\n+\n+## CA\n+```sh\n+openssl ecparam -name prime256v1 -genkey -noout -out ca.key\n+openssl req -new -x509 -sha256 -days 6027 -key ca.key -out ca.crt -subj \"/CN=ytdlptest\"\n+```\n+\n+## Client\n+```sh\n+openssl ecparam -name prime256v1 -genkey -noout -out client.key\n+openssl ec -in client.key -out clientencrypted.key -passout pass:foobar -aes256\n+openssl req -new -sha256 -key client.key -out client.csr -subj \"/CN=ytdlptest2\"\n+openssl x509 -req -in client.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out client.crt -days 6027 -sha256\n+cp client.crt clientwithkey.crt\n+cp client.crt clientwithencryptedkey.crt\n+cat client.key >> clientwithkey.crt\n+cat clientencrypted.key >> clientwithencryptedkey.crt\n+```\n\\ No newline at end of file\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":16,"string":"16"}}},{"rowIdx":34275,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16930"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16930,"string":"16,930"},"base_sha":{"kind":"string","value":"e47691215f75fe7e9684080d17fadf340c9a8450"},"head_sha":{"kind":"string","value":"519ccdf6a558cf8caf981ce1df1747a2fcccb09c"},"task":{"kind":"string","value":"[utils] Fix `HTTPHeaderDict.__ior__`\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\n### Description of your *pull request* and other information\r\n\r\nFix `__ior__` returning `None`\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `test/` needed for: [utils] Fix `HTTPHeaderDict.__ior__`","scope_files":["test/test_utils.py"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/utils/` needed for: [utils] Fix `HTTPHeaderDict.__ior__`","scope_files":["yt_dlp/utils/networking.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `test/` needed for: [utils] Fix `HTTPHeaderDict.__ior__`\",\n \"scope_files\": [\n \"test/test_utils.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [utils] Fix `HTTPHeaderDict.__ior__`\",\n \"scope_files\": [\n \"yt_dlp/utils/networking.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["test/test_utils.py"],"solution_diff":"diff --git a/test/test_utils.py b/test/test_utils.py\nindex cd0fb0f2e970..8f86d151b28c 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -2172,6 +2172,10 @@ def test_http_header_dict(self):\n headers6 = HTTPHeaderDict(a=1, b=2)\n self.assertEqual(pickle.loads(pickle.dumps(headers6)), headers6)\n \n+ headers7 = HTTPHeaderDict()\n+ headers7 |= {'X-dlp': 'data'}\n+ self.assertEqual(headers7.sensitive(), {'X-dlp': 'data'})\n+\n def test_extract_basic_auth(self):\n assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)\n assert extract_basic_auth('http://foo.bar') == ('http://foo.bar', None)\n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s2","scope_files":["yt_dlp/utils/networking.py"],"solution_diff":"diff --git a/yt_dlp/utils/networking.py b/yt_dlp/utils/networking.py\nindex 32c7acdb1483..33cca412dc38 100644\n--- a/yt_dlp/utils/networking.py\n+++ b/yt_dlp/utils/networking.py\n@@ -64,7 +64,7 @@ def __ior__(self, other, /):\n other = other.sensitive()\n if isinstance(other, dict):\n self.update(other)\n- return\n+ return self\n return NotImplemented\n \n def __or__(self, other, /) -> typing.Self:\n\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"test/test_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_utils.py b/test/test_utils.py\\nindex cd0fb0f2e970..8f86d151b28c 100644\\n--- a/test/test_utils.py\\n+++ b/test/test_utils.py\\n@@ -2172,6 +2172,10 @@ def test_http_header_dict(self):\\n headers6 = HTTPHeaderDict(a=1, b=2)\\n self.assertEqual(pickle.loads(pickle.dumps(headers6)), headers6)\\n \\n+ headers7 = HTTPHeaderDict()\\n+ headers7 |= {'X-dlp': 'data'}\\n+ self.assertEqual(headers7.sensitive(), {'X-dlp': 'data'})\\n+\\n def test_extract_basic_auth(self):\\n assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)\\n assert extract_basic_auth('http://foo.bar') == ('http://foo.bar', None)\\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/utils/networking.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/networking.py b/yt_dlp/utils/networking.py\\nindex 32c7acdb1483..33cca412dc38 100644\\n--- a/yt_dlp/utils/networking.py\\n+++ b/yt_dlp/utils/networking.py\\n@@ -64,7 +64,7 @@ def __ior__(self, other, /):\\n other = other.sensitive()\\n if isinstance(other, dict):\\n self.update(other)\\n- return\\n+ return self\\n return NotImplemented\\n \\n def __or__(self, other, /) -> typing.Self:\\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/utils/networking.py b/yt_dlp/utils/networking.py\nindex 32c7acdb1483..33cca412dc38 100644\n--- a/yt_dlp/utils/networking.py\n+++ b/yt_dlp/utils/networking.py\n@@ -64,7 +64,7 @@ def __ior__(self, other, /):\n other = other.sensitive()\n if isinstance(other, dict):\n self.update(other)\n- return\n+ return self\n return NotImplemented\n \n def __or__(self, other, /) -> typing.Self:\n\ndiff --git a/test/test_utils.py b/test/test_utils.py\nindex cd0fb0f2e970..8f86d151b28c 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -2172,6 +2172,10 @@ def test_http_header_dict(self):\n headers6 = HTTPHeaderDict(a=1, b=2)\n self.assertEqual(pickle.loads(pickle.dumps(headers6)), headers6)\n \n+ headers7 = HTTPHeaderDict()\n+ headers7 |= {'X-dlp': 'data'}\n+ self.assertEqual(headers7.sensitive(), {'X-dlp': 'data'})\n+\n def test_extract_basic_auth(self):\n assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)\n assert extract_basic_auth('http://foo.bar') == ('http://foo.bar', None)\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34276,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16920"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16920,"string":"16,920"},"base_sha":{"kind":"string","value":"7f7bdc974dc61d941d1a0d51c4e21a0fdb7b2d06"},"head_sha":{"kind":"string","value":"d3bd1b8cc344064ceb6b69b3ee11c308c01e57ed"},"task":{"kind":"string","value":"compat-options allow-unsafe-ext errors yt-dlp\n\n### Checklist\n\n- [x] I'm reporting a bug unrelated to a specific site\n- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))\n- [x] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates\n- [x] I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\n\n### Provide a description that is worded well enough to be understood\n\nAdditional yt-dlp nightly log\n`yt-dlp_night -v -f 244+251 https://www.youtube.com/watch?v=m9xqO9kKqyk\n[debug] Command-line config: ['-v', '-f', '244+251', 'https://www.youtube.com/watch?v=m9xqO9kKqyk']\n[debug] User config \"/home/user/.config/yt-dlp/config\": ['--hls-split-discontinuity', '--socket-timeout', '10', '-r', '15M', '-R', '100', '-P', 'temp:./tmp', '--fixup', 'never', '--concat-playlist', 'never', '--cookies-from-browser', 'chromium', '--compat-options', 'allow-unsafe-ext', '--xattrs']\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\n[debug] yt-dlp version nightly@2026.06.09.230517 from yt-dlp/yt-dlp-nightly-builds [821bef0f0] (zip)\n[debug] Compatibility options: allow-unsafe-ext\n[debug] Python 3.14.5 (CPython x86_64 64bit) - Linux-7.0.12-lqx1-1-lqx-x86_64-with-glibc2.43 (OpenSSL 3.6.3 9 Jun 2026, glibc 2.43)\n[debug] exe versions: ffmpeg 8.1.1 (setts), ffprobe 8.1.1, rtmpdump 2.6\n[debug] Optional libraries: Cryptodome-3.23.0, brotlicffi-1.2.0.1, certifi-2026.05.20, curl_cffi-0.15.0, requests-2.34.2, secretstorage-3.5.0, sqlite3-3.53.2, urllib3-2.7.0, websockets-16.0, yt_dlp_ejs-0.8.0\n[debug] JS runtimes: deno-2.8.2\n[debug] Proxy map: {}\nExtracting cookies from chromium\n[debug] Extracting cookies from: \"/home/user/.config/chromium/Default/Cookies\"\nExtracted 2377 cookies from chromium\n[debug] cookie version breakdown: {'v10': 2435, 'v11': 0, 'other': 0, 'unencrypted': 0}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Extractor Plugins: uncensored (KnownPiracyIE)\n[debug] Plugin directories: /home/user/.config/yt-dlp/plugins/my/yt_dlp_plugins\nWARNING: Using allow-unsafe-ext opens you up to potential attacks. Use with great care!\n[debug] Loaded 1739 extractors\n[debug] [youtube] Found YouTube account cookies\n[debug] [youtube] [pot] PO Token Providers: none\n[debug] [youtube] [pot] PO Token Cache Providers: memory\n[debug] [youtube] [pot] PO Token Cache Spec Providers: webpo\n[debug] [youtube] [jsc] JS Challenge Providers: bun (unavailable), deno, node (unavailable), quickjs (unavailable)\n[youtube] Extracting URL: https://www.youtube.com/watch?v=m9xqO9kKqyk\n[youtube] m9xqO9kKqyk: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 69e2a55d\n original url = /s/player/69e2a55d/player_es6.vflset/en_US/base.js\n[youtube] m9xqO9kKqyk: Downloading tv downgraded player API JSON\n[debug] [youtube] m9xqO9kKqyk: Detected a 15s ad for web_safari\n[debug] Loading youtube-sigfuncs.69e2a55d-main-107 from cache\n[debug] Loading youtube-sigfuncs.69e2a55d-main-103 from cache\n[youtube] m9xqO9kKqyk: Downloading player 69e2a55d-main\n[youtube] [jsc:deno] Solving JS challenges using deno\n[debug] [youtube] [jsc:deno] Using challenge solver lib script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Using challenge solver core script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Running deno: /usr/bin/deno run --ext=js --no-code-cache --no-prompt --no-remote --no-lock --node-modules-dir=none --no-config --no-npm --cached-only -\n[debug] [youtube] m9xqO9kKqyk: Detected experiment to bind GVS PO Token to video ID for web_safari client\n[youtube] m9xqO9kKqyk: Downloading m3u8 information\n[debug] Sort order given by extractor: quality, res, fps, hdr:12, source, vcodec, channels, acodec, lang, proto\n[debug] Formats sorted by: hasvid, ie_pref, quality, res, fps, hdr:12(7), source, vcodec, channels, acodec, lang, proto, size, br, asr, vext, aext, hasaud, id\n[info] m9xqO9kKqyk: Downloading 1 format(s): 244+251\nERROR: validate_options.<locals>.<lambda>() got an unexpected keyword argument '_allowed_exts'\nTraceback (most recent call last):\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 1726, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 1882, in __extract_info\n return self.process_ie_result(ie_result, download, extra_info)\n ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 1941, in process_ie_result\n ie_result = self.process_video_result(ie_result, download=download)\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 3124, in process_video_result\n self.process_info(new_info)\n ~~~~~~~~~~~~~~~~~^^^^^^^^^^\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 190, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 3378, in process_info\n self.prepare_filename(info_dict, 'description')) is None:\n ~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 1556, in prepare_filename\n filename = self._prepare_filename(info_dict, tmpl_type=dir_type, outtmpl=outtmpl)\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 190, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/user/bin/yt-dlp_night/yt_dlp/YoutubeDL.py\", line 1538, in _prepare_filename\n filename = replace_extension(filename, force_ext, info_dict.get('ext'))\n File \"/home/user/bin/yt-dlp_night/yt_dlp/utils/_utils.py\", line 2153, in _change_extension\n return f'{filename}.{_UnsafeExtensionError.sanitize_extension(ext, _allowed_exts=_allowed_exts)}'\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: validate_options.<locals>.<lambda>() got an unexpected keyword argument '_allowed_exts'`\n\nAlso the README.md section about compat-options doesn't reflect what's really in the current version, i.e., --compat-options youtube-dl and --compat-options youtube-dlc do not include allow-unsafe-ext as the readme says.\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [x] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [x] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', '-f', '244+251', 'https://www.youtube.com/watch?v=m9xqO9kKqyk']\n[debug] User config \"/home/user/.config/yt-dlp/config\": ['--hls-split-discontinuity', '--socket-timeout', '10', '-r', '15M', '-R', '100', '-P', 'temp:./tmp', '--fixup', 'never', '--concat-playlist', 'never', '--cookies-from-browser', 'chromium', '--compat-options', 'allow-unsafe-ext', '--xattrs']\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\n[debug] yt-dlp version stable@2026.06.09 from yt-dlp/yt-dlp [821bef0f0]\n[debug] Compatibility options: allow-unsafe-ext\n[debug] Python 3.14.5 (CPython x86_64 64bit) - Linux-7.0.12-lqx1-1-lqx-x86_64-with-glibc2.43 (OpenSSL 3.6.3 9 Jun 2026, glibc 2.43)\n[debug] exe versions: ffmpeg 8.1.1 (setts), ffprobe 8.1.1, rtmpdump 2.6\n[debug] Optional libraries: Cryptodome-3.23.0, brotlicffi-1.2.0.1, certifi-2026.05.20, curl_cffi-0.15.0, requests-2.34.2, secretstorage-3.5.0, sqlite3-3.53.2, urllib3-2.7.0, websockets-16.0, yt_dlp_ejs-0.8.0\n[debug] JS runtimes: deno-2.8.2\n[debug] Proxy map: {}\nExtracting cookies from chromium\n[debug] Extracting cookies from: \"/home/user/.config/chromium/Default/Cookies\"\nExtracted 2377 cookies from chromium\n[debug] cookie version breakdown: {'v10': 2435, 'v11': 0, 'other': 0, 'unencrypted': 0}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Extractor Plugins: uncensored (KnownPiracyIE)\n[debug] Plugin directories: /home/user/.config/yt-dlp/plugins/my/yt_dlp_plugins\nWARNING: Using allow-unsafe-ext opens you up to potential attacks. Use with great care!\n[debug] Loaded 1739 extractors\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\nLatest version: stable@2026.06.09 from yt-dlp/yt-dlp\nyt-dlp is up to date (stable@2026.06.09 from yt-dlp/yt-dlp)\n[debug] [youtube] Found YouTube account cookies\n[debug] [youtube] [pot] PO Token Providers: none\n[debug] [youtube] [pot] PO Token Cache Providers: memory\n[debug] [youtube] [pot] PO Token Cache Spec Providers: webpo\n[debug] [youtube] [jsc] JS Challenge Providers: bun (unavailable), deno, node (unavailable), quickjs (unavailable)\n[youtube] Extracting URL: https://www.youtube.com/watch?v=m9xqO9kKqyk\n[youtube] m9xqO9kKqyk: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 69e2a55d\n original url = /s/player/69e2a55d/player_es6.vflset/en_US/base.js\n[youtube] m9xqO9kKqyk: Downloading tv downgraded player API JSON\n[debug] [youtube] m9xqO9kKqyk: Detected a 15s ad for web_safari\n[debug] Loading youtube-sigfuncs.69e2a55d-main-107 from cache\n[debug] Loading youtube-sigfuncs.69e2a55d-main-103 from cache\n[youtube] m9xqO9kKqyk: Downloading player 69e2a55d-main\n[youtube] [jsc:deno] Solving JS challenges using deno\n[debug] [youtube] [jsc:deno] Using challenge solver lib script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Using challenge solver core script v0.8.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Running deno: /usr/bin/deno run --ext=js --no-code-cache --no-prompt --no-remote --no-lock --node-modules-dir=none --no-config --no-npm --cached-only -\n[debug] [youtube] m9xqO9kKqyk: Detected experiment to bind GVS PO Token to video ID for web_safari client\n[youtube] m9xqO9kKqyk: Downloading m3u8 information\n[debug] Sort order given by extractor: quality, res, fps, hdr:12, source, vcodec, channels, acodec, lang, proto\n[debug] Formats sorted by: hasvid, ie_pref, quality, res, fps, hdr:12(7), source, vcodec, channels, acodec, lang, proto, size, br, asr, vext, aext, hasaud, id\n[info] m9xqO9kKqyk: Downloading 1 format(s): 244+251\nERROR: validate_options.<locals>.<lambda>() got an unexpected keyword argument '_allowed_exts'\nTraceback (most recent call last):\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 1726, in wrapper\n return func(self, *args, **kwargs)\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 1882, in __extract_info\n return self.process_ie_result(ie_result, download, extra_info)\n ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 1941, in process_ie_result\n ie_result = self.process_video_result(ie_result, download=download)\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 3124, in process_video_result\n self.process_info(new_info)\n ~~~~~~~~~~~~~~~~~^^^^^^^^^^\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 190, in wrapper\n return func(self, *args, **kwargs)\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 3378, in process_info\n self.prepare_filename(info_dict, 'description')) is None:\n ~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 1556, in prepare_filename\n filename = self._prepare_filename(info_dict, tmpl_type=dir_type, outtmpl=outtmpl)\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 190, in wrapper\n return func(self, *args, **kwargs)\n File \"/usr/lib/python3.14/site-packages/yt_dlp/YoutubeDL.py\", line 1538, in _prepare_filename\n filename = replace_extension(filename, force_ext, info_dict.get('ext'))\n File \"/usr/lib/python3.14/site-packages/yt_dlp/utils/_utils.py\", line 2153, in _change_extension\n return f'{filename}.{_UnsafeExtensionError.sanitize_extension(ext, _allowed_exts=_allowed_exts)}'\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: validate_options.<locals>.<lambda>() got an unexpected keyword argument '_allowed_exts'\n```\n\nFix `allow-unsafe-ext` compat option\n\nFix regression introduced in e578e265f7c6ca94a74b30e0d8d6196a4d19fb6a\r\n\r\nCloses #16919\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `test/` needed for: compat-options allow-unsafe-ext errors yt-dlp","scope_files":["test/test_utils.py"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/` needed for: compat-options allow-unsafe-ext errors yt-dlp","scope_files":["yt_dlp/__init__.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/utils/` needed for: compat-options allow-unsafe-ext errors yt-dlp","scope_files":["yt_dlp/utils/_utils.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `test/` needed for: compat-options allow-unsafe-ext errors yt-dlp\",\n \"scope_files\": [\n \"test/test_utils.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/` needed for: compat-options allow-unsafe-ext errors yt-dlp\",\n \"scope_files\": [\n \"yt_dlp/__init__.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: compat-options allow-unsafe-ext errors yt-dlp\",\n \"scope_files\": [\n \"yt_dlp/utils/_utils.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["test/test_utils.py"],"solution_diff":"diff --git a/test/test_utils.py b/test/test_utils.py\nindex 180ede624077..cd0fb0f2e970 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -327,6 +327,12 @@ def test_prepend_extension(self):\n with self.assertRaises(_UnsafeExtensionError):\n prepend_extension('abc.unexpected_ext', ext, 'ext')\n \n+ # Test allow-unsafe-ext compat option\n+ _UnsafeExtensionError._enabled = False\n+ self.assertEqual(prepend_extension('abc.ext', 'un/safe'), 'abc.un/safe.ext')\n+ # Re-enable sanitization for other tests\n+ _UnsafeExtensionError._enabled = True\n+\n def test_replace_extension(self):\n self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')\n self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')\n@@ -345,6 +351,12 @@ def test_replace_extension(self):\n with self.assertRaises(_UnsafeExtensionError):\n replace_extension('abc.unexpected_ext', ext, 'ext')\n \n+ # Test allow-unsafe-ext compat option\n+ _UnsafeExtensionError._enabled = False\n+ self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.bin')\n+ # Re-enable sanitization for other tests\n+ _UnsafeExtensionError._enabled = True\n+\n def test_subtitles_filename(self):\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')\n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s2","scope_files":["yt_dlp/__init__.py"],"solution_diff":"diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex 18cf4c8d2c3f..ec3d52755dc6 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -619,7 +619,7 @@ def report_conflict(arg1, opt1, arg2='--allow-unplayable-formats', opt2='allow_u\n warnings.append(\n 'Using allow-unsafe-ext opens you up to potential attacks. '\n 'Use with great care!')\n- _UnsafeExtensionError.sanitize_extension = lambda x, prepend=False: x\n+ _UnsafeExtensionError._enabled = False\n \n return warnings, deprecation_warnings\n \n","summary":"Edited 1 file(s) in yt_dlp/"},{"subtask_id":"s3","scope_files":["yt_dlp/utils/_utils.py"],"solution_diff":"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 56847961ef68..43ee53729ebb 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -5218,12 +5218,17 @@ class _UnsafeExtensionError(Exception):\n 'sbv',\n ])\n \n+ _enabled = True\n+\n def __init__(self, extension, /):\n super().__init__(f'unsafe file extension: {extension!r}')\n self.extension = extension\n \n @classmethod\n def sanitize_extension(cls, extension, /, *, prepend=False, _allowed_exts=()):\n+ if not cls._enabled:\n+ return extension\n+\n if extension is None:\n return None\n \n\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"test/test_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_utils.py b/test/test_utils.py\\nindex 180ede624077..cd0fb0f2e970 100644\\n--- a/test/test_utils.py\\n+++ b/test/test_utils.py\\n@@ -327,6 +327,12 @@ def test_prepend_extension(self):\\n with self.assertRaises(_UnsafeExtensionError):\\n prepend_extension('abc.unexpected_ext', ext, 'ext')\\n \\n+ # Test allow-unsafe-ext compat option\\n+ _UnsafeExtensionError._enabled = False\\n+ self.assertEqual(prepend_extension('abc.ext', 'un/safe'), 'abc.un/safe.ext')\\n+ # Re-enable sanitization for other tests\\n+ _UnsafeExtensionError._enabled = True\\n+\\n def test_replace_extension(self):\\n self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')\\n self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')\\n@@ -345,6 +351,12 @@ def test_replace_extension(self):\\n with self.assertRaises(_UnsafeExtensionError):\\n replace_extension('abc.unexpected_ext', ext, 'ext')\\n \\n+ # Test allow-unsafe-ext compat option\\n+ _UnsafeExtensionError._enabled = False\\n+ self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.bin')\\n+ # Re-enable sanitization for other tests\\n+ _UnsafeExtensionError._enabled = True\\n+\\n def test_subtitles_filename(self):\\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')\\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')\\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/__init__.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\\nindex 18cf4c8d2c3f..ec3d52755dc6 100644\\n--- a/yt_dlp/__init__.py\\n+++ b/yt_dlp/__init__.py\\n@@ -619,7 +619,7 @@ def report_conflict(arg1, opt1, arg2='--allow-unplayable-formats', opt2='allow_u\\n warnings.append(\\n 'Using allow-unsafe-ext opens you up to potential attacks. '\\n 'Use with great care!')\\n- _UnsafeExtensionError.sanitize_extension = lambda x, prepend=False: x\\n+ _UnsafeExtensionError._enabled = False\\n \\n return warnings, deprecation_warnings\\n \\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/utils/_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\\nindex 56847961ef68..43ee53729ebb 100644\\n--- a/yt_dlp/utils/_utils.py\\n+++ b/yt_dlp/utils/_utils.py\\n@@ -5218,12 +5218,17 @@ class _UnsafeExtensionError(Exception):\\n 'sbv',\\n ])\\n \\n+ _enabled = True\\n+\\n def __init__(self, extension, /):\\n super().__init__(f'unsafe file extension: {extension!r}')\\n self.extension = extension\\n \\n @classmethod\\n def sanitize_extension(cls, extension, /, *, prepend=False, _allowed_exts=()):\\n+ if not cls._enabled:\\n+ return extension\\n+\\n if extension is None:\\n return None\\n \\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex 18cf4c8d2c3f..ec3d52755dc6 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -619,7 +619,7 @@ def report_conflict(arg1, opt1, arg2='--allow-unplayable-formats', opt2='allow_u\n warnings.append(\n 'Using allow-unsafe-ext opens you up to potential attacks. '\n 'Use with great care!')\n- _UnsafeExtensionError.sanitize_extension = lambda x, prepend=False: x\n+ _UnsafeExtensionError._enabled = False\n \n return warnings, deprecation_warnings\n \ndiff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 56847961ef68..43ee53729ebb 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -5218,12 +5218,17 @@ class _UnsafeExtensionError(Exception):\n 'sbv',\n ])\n \n+ _enabled = True\n+\n def __init__(self, extension, /):\n super().__init__(f'unsafe file extension: {extension!r}')\n self.extension = extension\n \n @classmethod\n def sanitize_extension(cls, extension, /, *, prepend=False, _allowed_exts=()):\n+ if not cls._enabled:\n+ return extension\n+\n if extension is None:\n return None\n \n\ndiff --git a/test/test_utils.py b/test/test_utils.py\nindex 180ede624077..cd0fb0f2e970 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -327,6 +327,12 @@ def test_prepend_extension(self):\n with self.assertRaises(_UnsafeExtensionError):\n prepend_extension('abc.unexpected_ext', ext, 'ext')\n \n+ # Test allow-unsafe-ext compat option\n+ _UnsafeExtensionError._enabled = False\n+ self.assertEqual(prepend_extension('abc.ext', 'un/safe'), 'abc.un/safe.ext')\n+ # Re-enable sanitization for other tests\n+ _UnsafeExtensionError._enabled = True\n+\n def test_replace_extension(self):\n self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')\n self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')\n@@ -345,6 +351,12 @@ def test_replace_extension(self):\n with self.assertRaises(_UnsafeExtensionError):\n replace_extension('abc.unexpected_ext', ext, 'ext')\n \n+ # Test allow-unsafe-ext compat option\n+ _UnsafeExtensionError._enabled = False\n+ self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.bin')\n+ # Re-enable sanitization for other tests\n+ _UnsafeExtensionError._enabled = True\n+\n def test_subtitles_filename(self):\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')\n self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')\n"},"num_subtasks":{"kind":"number","value":3,"string":"3"},"num_changed_files":{"kind":"number","value":3,"string":"3"}}},{"rowIdx":34277,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16697"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16697,"string":"16,697"},"base_sha":{"kind":"string","value":"25056f0d2d47adbd235a8d422fa62d68d0be2bc2"},"head_sha":{"kind":"string","value":"1aeef222c575ee7a036520f138c1f7089e44713d"},"task":{"kind":"string","value":"[cleanup] Misc\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\n### Description of your *pull request* and other information\r\n\r\nSolves build failure in https://tests.reproducible-builds.org/debian/rb-pkg/unstable/arm64/yt-dlp.html\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n - Authored by: bashonly\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Cleanup\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `devscripts/` needed for: [cleanup] Misc","scope_files":["devscripts/changelog_override.json","devscripts/update_requirements.py"]},{"subtask_id":"s2","goal":"Implement the changes under `test/` needed for: [cleanup] Misc","scope_files":["test/test_YoutubeDL.py","test/test_downloader_external.py","test/test_execution.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/` needed for: [cleanup] Misc","scope_files":["yt_dlp/YoutubeDL.py"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/downloader/` needed for: [cleanup] Misc","scope_files":["yt_dlp/downloader/external.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `devscripts/` needed for: [cleanup] Misc\",\n \"scope_files\": [\n \"devscripts/changelog_override.json\",\n \"devscripts/update_requirements.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/` needed for: [cleanup] Misc\",\n \"scope_files\": [\n \"test/test_YoutubeDL.py\",\n \"test/test_downloader_external.py\",\n \"test/test_execution.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/` needed for: [cleanup] Misc\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/downloader/` needed for: [cleanup] Misc\",\n \"scope_files\": [\n \"yt_dlp/downloader/external.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["devscripts/changelog_override.json","devscripts/update_requirements.py"],"solution_diff":"diff --git a/devscripts/changelog_override.json b/devscripts/changelog_override.json\nindex 937a8880bc8f..7ff3a6caa0fc 100644\n--- a/devscripts/changelog_override.json\n+++ b/devscripts/changelog_override.json\n@@ -342,5 +342,30 @@\n \"action\": \"add\",\n \"when\": \"1fbbe29b99dc61375bf6d786f824d9fcf6ea9c1a\",\n \"short\": \"[priority] Security: [[CVE-2026-26331](https://nvd.nist.gov/vuln/detail/CVE-2026-26331)] [Arbitrary command injection with the `--netrc-cmd` option](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-g3gw-q23r-pgqm)\\n - The argument passed to the command in `--netrc-cmd` is now limited to a safe subset of characters\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"98e42eb04486e00bf86479b24dbfe19321f652ee\",\n+ \"short\": \"[priority] **The minimum supported versions of Deno, Node, and Bun have been raised.**\\n The minimum required version of [Deno](https://github.com/yt-dlp/yt-dlp/issues/16767) is now `v2.3.0`; supported [Node](https://github.com/yt-dlp/yt-dlp/issues/16765) versions are `v22` and up; [Bun support has been deprecated](https://github.com/yt-dlp/yt-dlp/issues/16766) and limited to versions `1.2.11` through `1.3.14`.\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"5faffa999fd33b373d47773e8ee639d072accec2\",\n+ \"short\": \"[priority] Security: Usage of vulnerable conversions (e.g. `%()s`) with the `--exec` option is an all-too-common pitfall. To remedy this, `--exec` now only allows safe conversions in its command templates.\\n - Most users can simply replace `%(...)s` with `%(...)q` in their `--exec` argument(s). Numeric conversions are unaffected by this change. Using unsafe conversions with `--exec` poses a significant security risk. [Read more](<https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg>)\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"e578e265f7c6ca94a74b30e0d8d6196a4d19fb6a\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50023](https://nvd.nist.gov/vuln/detail/CVE-2026-50023)] [Dangerous file type creation via insufficient filename sanitization](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-c6mh-fpjc-4pr3)\\n - Writing files with the extensions `.desktop`, `.url`, or `.webloc` is now only allowed in the context of `--write-link` functionality\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"2726572520238356bcf64aba2040228648b44c82\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50019](https://nvd.nist.gov/vuln/detail/CVE-2026-50019)] [File Downloader cookie leak with curl](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-f7j3-774f-rfhj)\\n - Impact is limited to users of `--downloader curl`; cookies are now properly passed to curl so that it respects their scope\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"25056f0d2d47adbd235a8d422fa62d68d0be2bc2\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50574](https://nvd.nist.gov/vuln/detail/CVE-2026-50574)] [Arbitrary code execution via manifest downloads with aria2c](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-vx4q-3cr2-7cg2)\\n - Impact is limited to users of `--downloader aria2c`\\n - Support for downloading HLS and DASH formats with aria2c has been removed. Users affected by this change should migrate to use `-N` for concurrent fragment downloads via the native downloader\"\n }\n ]\ndiff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\nindex 7231e8bdafaa..23676c94503d 100755\n--- a/devscripts/update_requirements.py\n+++ b/devscripts/update_requirements.py\n@@ -650,8 +650,8 @@ def update_requirements(\n modify_and_write_pyproject(pyproject_text, table_name=EXTRAS_TABLE, table=extras)\n \n # Generate/upgrade final lockfile that includes pinned extras\n- print(f'Running: uv lock {upgrade_arg}', file=sys.stderr)\n- run_process('uv', 'lock', upgrade_arg, env=env)\n+ print('Running: uv lock', file=sys.stderr)\n+ run_process('uv', 'lock', env=env)\n \n # Export bundle requirements; any updates to these are already recorded w/ uv.lock package diff\n for target_suffix, target in BUNDLE_TARGETS.items():\n","summary":"Edited 2 file(s) in devscripts/"},{"subtask_id":"s2","scope_files":["test/test_YoutubeDL.py","test/test_downloader_external.py","test/test_execution.py"],"solution_diff":"diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py\nindex 2705accb760c..0f84d7e1694b 100644\n--- a/test/test_YoutubeDL.py\n+++ b/test/test_YoutubeDL.py\n@@ -6,11 +6,11 @@\n import unittest\n from unittest.mock import patch\n \n-from yt_dlp.globals import all_plugins_loaded\n-\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\n \n \n+from yt_dlp.globals import all_plugins_loaded\n+\n import contextlib\n import copy\n import json\ndiff --git a/test/test_downloader_external.py b/test/test_downloader_external.py\nindex 9db485af9b98..0b51c961737e 100644\n--- a/test/test_downloader_external.py\n+++ b/test/test_downloader_external.py\n@@ -102,6 +102,7 @@ def do_GET(self, /):\n self.end_headers()\n self.wfile.write(json.dumps(list(self.headers.items())).encode())\n \n+\n class HTTPTestServer(http.server.HTTPServer):\n @property\n def address(self, /):\ndiff --git a/test/test_execution.py b/test/test_execution.py\nindex c6ee9cf9d0cc..cd587fe33485 100644\n--- a/test/test_execution.py\n+++ b/test/test_execution.py\n@@ -20,7 +20,12 @@\n class TestExecution(unittest.TestCase):\n def run_yt_dlp(self, exe=(sys.executable, 'yt_dlp/__main__.py'), opts=('--version', )):\n stdout, stderr, returncode = Popen.run(\n- [*exe, '--ignore-config', *opts], cwd=rootDir, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n+ [*exe, '--no-update', '--ignore-config', *opts],\n+ cwd=rootDir,\n+ text=True,\n+ stdout=subprocess.PIPE,\n+ stderr=subprocess.PIPE,\n+ )\n print(stderr, file=sys.stderr)\n self.assertEqual(returncode, 0)\n return stdout.strip(), stderr.strip()\n","summary":"Edited 3 file(s) in test/"},{"subtask_id":"s3","scope_files":["yt_dlp/YoutubeDL.py"],"solution_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 47ed811c64de..6e7ae2a9ee27 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -1313,6 +1313,7 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n )$''')\n SAFE_EXEC_CONVERSIONS = 'difq'\n UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n+ EXEC_ADVISORY_MSG = 'See https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg for details'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1440,12 +1441,21 @@ def create_key(outer_mobj):\n # Validate safety of exec commands\n if _exec:\n if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n- raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe conversion(s) in exec command: {outtmpl!r}\\n'\n+ f'Conversions such as %()s are too dangerous to be used in '\n+ f'--exec command templates; use %()q instead. {EXEC_ADVISORY_MSG}')\n elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n if default == na:\n- raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe placeholder for exec command: {na!r}\\n'\n+ f'The --output-na-placeholder argument also applies to '\n+ f'--exec command templates. {EXEC_ADVISORY_MSG}')\n else:\n- raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe default(s) in exec command: {outtmpl!r}\\n'\n+ f'Conversions are not applied to --exec command template defaults, '\n+ f'e.g. %(...|DEFAULT;)q. {EXEC_ADVISORY_MSG}')\n \n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n","summary":"Edited 1 file(s) in yt_dlp/"},{"subtask_id":"s4","scope_files":["yt_dlp/downloader/external.py"],"solution_diff":"diff --git a/yt_dlp/downloader/external.py b/yt_dlp/downloader/external.py\nindex 37a42af91a6e..2f127c0f8746 100644\n--- a/yt_dlp/downloader/external.py\n+++ b/yt_dlp/downloader/external.py\n@@ -11,6 +11,7 @@\n from .fragment import FragmentFD\n from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor\n from ..utils import (\n+ DownloadError,\n Popen,\n RetryManager,\n _configuration_args,\n@@ -136,8 +137,6 @@ def _write_cookies(self):\n self.to_screen(f'[download] Writing temporary cookies file to \"{self._cookies_tempfile}\"')\n # real_download resets _cookies_tempfile; if it's None then save() will write to cookiejar.filename\n self.ydl.cookiejar.save(self._cookies_tempfile, True, True)\n- with open(self.ydl.cookiejar.filename or self._cookies_tempfile, \"r\") as file:\n- print(\"cookies\", repr(file.read()))\n return self.ydl.cookiejar.filename or self._cookies_tempfile\n \n def _call_downloader(self, tmpfilename, info_dict):\n@@ -224,8 +223,7 @@ def _make_cmd(self, tmpfilename, info_dict):\n else:\n cookies_file = self._write_cookies()\n if '=' in cookies_file:\n- # XXX: what to raise here?\n- raise RuntimeError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\n+ raise DownloadError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\n assert cookies_file != '-'\n cmd += ['--cookie', cookies_file]\n \n\n","summary":"Edited 1 file(s) in yt_dlp/downloader/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"devscripts/changelog_override.json\",\n \"devscripts/update_requirements.py\"\n ],\n \"solution_diff\": \"diff --git a/devscripts/changelog_override.json b/devscripts/changelog_override.json\\nindex 937a8880bc8f..7ff3a6caa0fc 100644\\n--- a/devscripts/changelog_override.json\\n+++ b/devscripts/changelog_override.json\\n@@ -342,5 +342,30 @@\\n \\\"action\\\": \\\"add\\\",\\n \\\"when\\\": \\\"1fbbe29b99dc61375bf6d786f824d9fcf6ea9c1a\\\",\\n \\\"short\\\": \\\"[priority] Security: [[CVE-2026-26331](https://nvd.nist.gov/vuln/detail/CVE-2026-26331)] [Arbitrary command injection with the `--netrc-cmd` option](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-g3gw-q23r-pgqm)\\\\n - The argument passed to the command in `--netrc-cmd` is now limited to a safe subset of characters\\\"\\n+ },\\n+ {\\n+ \\\"action\\\": \\\"add\\\",\\n+ \\\"when\\\": \\\"98e42eb04486e00bf86479b24dbfe19321f652ee\\\",\\n+ \\\"short\\\": \\\"[priority] **The minimum supported versions of Deno, Node, and Bun have been raised.**\\\\n The minimum required version of [Deno](https://github.com/yt-dlp/yt-dlp/issues/16767) is now `v2.3.0`; supported [Node](https://github.com/yt-dlp/yt-dlp/issues/16765) versions are `v22` and up; [Bun support has been deprecated](https://github.com/yt-dlp/yt-dlp/issues/16766) and limited to versions `1.2.11` through `1.3.14`.\\\"\\n+ },\\n+ {\\n+ \\\"action\\\": \\\"add\\\",\\n+ \\\"when\\\": \\\"5faffa999fd33b373d47773e8ee639d072accec2\\\",\\n+ \\\"short\\\": \\\"[priority] Security: Usage of vulnerable conversions (e.g. `%()s`) with the `--exec` option is an all-too-common pitfall. To remedy this, `--exec` now only allows safe conversions in its command templates.\\\\n - Most users can simply replace `%(...)s` with `%(...)q` in their `--exec` argument(s). Numeric conversions are unaffected by this change. Using unsafe conversions with `--exec` poses a significant security risk. [Read more](<https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg>)\\\"\\n+ },\\n+ {\\n+ \\\"action\\\": \\\"add\\\",\\n+ \\\"when\\\": \\\"e578e265f7c6ca94a74b30e0d8d6196a4d19fb6a\\\",\\n+ \\\"short\\\": \\\"[priority] Security: [[CVE-2026-50023](https://nvd.nist.gov/vuln/detail/CVE-2026-50023)] [Dangerous file type creation via insufficient filename sanitization](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-c6mh-fpjc-4pr3)\\\\n - Writing files with the extensions `.desktop`, `.url`, or `.webloc` is now only allowed in the context of `--write-link` functionality\\\"\\n+ },\\n+ {\\n+ \\\"action\\\": \\\"add\\\",\\n+ \\\"when\\\": \\\"2726572520238356bcf64aba2040228648b44c82\\\",\\n+ \\\"short\\\": \\\"[priority] Security: [[CVE-2026-50019](https://nvd.nist.gov/vuln/detail/CVE-2026-50019)] [File Downloader cookie leak with curl](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-f7j3-774f-rfhj)\\\\n - Impact is limited to users of `--downloader curl`; cookies are now properly passed to curl so that it respects their scope\\\"\\n+ },\\n+ {\\n+ \\\"action\\\": \\\"add\\\",\\n+ \\\"when\\\": \\\"25056f0d2d47adbd235a8d422fa62d68d0be2bc2\\\",\\n+ \\\"short\\\": \\\"[priority] Security: [[CVE-2026-50574](https://nvd.nist.gov/vuln/detail/CVE-2026-50574)] [Arbitrary code execution via manifest downloads with aria2c](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-vx4q-3cr2-7cg2)\\\\n - Impact is limited to users of `--downloader aria2c`\\\\n - Support for downloading HLS and DASH formats with aria2c has been removed. Users affected by this change should migrate to use `-N` for concurrent fragment downloads via the native downloader\\\"\\n }\\n ]\\ndiff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\\nindex 7231e8bdafaa..23676c94503d 100755\\n--- a/devscripts/update_requirements.py\\n+++ b/devscripts/update_requirements.py\\n@@ -650,8 +650,8 @@ def update_requirements(\\n modify_and_write_pyproject(pyproject_text, table_name=EXTRAS_TABLE, table=extras)\\n \\n # Generate/upgrade final lockfile that includes pinned extras\\n- print(f'Running: uv lock {upgrade_arg}', file=sys.stderr)\\n- run_process('uv', 'lock', upgrade_arg, env=env)\\n+ print('Running: uv lock', file=sys.stderr)\\n+ run_process('uv', 'lock', env=env)\\n \\n # Export bundle requirements; any updates to these are already recorded w/ uv.lock package diff\\n for target_suffix, target in BUNDLE_TARGETS.items():\\n\",\n \"summary\": \"Edited 2 file(s) in devscripts/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/test_YoutubeDL.py\",\n \"test/test_downloader_external.py\",\n \"test/test_execution.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py\\nindex 2705accb760c..0f84d7e1694b 100644\\n--- a/test/test_YoutubeDL.py\\n+++ b/test/test_YoutubeDL.py\\n@@ -6,11 +6,11 @@\\n import unittest\\n from unittest.mock import patch\\n \\n-from yt_dlp.globals import all_plugins_loaded\\n-\\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\\n \\n \\n+from yt_dlp.globals import all_plugins_loaded\\n+\\n import contextlib\\n import copy\\n import json\\ndiff --git a/test/test_downloader_external.py b/test/test_downloader_external.py\\nindex 9db485af9b98..0b51c961737e 100644\\n--- a/test/test_downloader_external.py\\n+++ b/test/test_downloader_external.py\\n@@ -102,6 +102,7 @@ def do_GET(self, /):\\n self.end_headers()\\n self.wfile.write(json.dumps(list(self.headers.items())).encode())\\n \\n+\\n class HTTPTestServer(http.server.HTTPServer):\\n @property\\n def address(self, /):\\ndiff --git a/test/test_execution.py b/test/test_execution.py\\nindex c6ee9cf9d0cc..cd587fe33485 100644\\n--- a/test/test_execution.py\\n+++ b/test/test_execution.py\\n@@ -20,7 +20,12 @@\\n class TestExecution(unittest.TestCase):\\n def run_yt_dlp(self, exe=(sys.executable, 'yt_dlp/__main__.py'), opts=('--version', )):\\n stdout, stderr, returncode = Popen.run(\\n- [*exe, '--ignore-config', *opts], cwd=rootDir, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\\n+ [*exe, '--no-update', '--ignore-config', *opts],\\n+ cwd=rootDir,\\n+ text=True,\\n+ stdout=subprocess.PIPE,\\n+ stderr=subprocess.PIPE,\\n+ )\\n print(stderr, file=sys.stderr)\\n self.assertEqual(returncode, 0)\\n return stdout.strip(), stderr.strip()\\n\",\n \"summary\": \"Edited 3 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 47ed811c64de..6e7ae2a9ee27 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -1313,6 +1313,7 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n )$''')\\n SAFE_EXEC_CONVERSIONS = 'difq'\\n UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n+ EXEC_ADVISORY_MSG = 'See https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg for details'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1440,12 +1441,21 @@ def create_key(outer_mobj):\\n # Validate safety of exec commands\\n if _exec:\\n if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n- raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ raise UnsafeExecExpansionError(\\n+ f'Unsafe conversion(s) in exec command: {outtmpl!r}\\\\n'\\n+ f'Conversions such as %()s are too dangerous to be used in '\\n+ f'--exec command templates; use %()q instead. {EXEC_ADVISORY_MSG}')\\n elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n if default == na:\\n- raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ raise UnsafeExecExpansionError(\\n+ f'Unsafe placeholder for exec command: {na!r}\\\\n'\\n+ f'The --output-na-placeholder argument also applies to '\\n+ f'--exec command templates. {EXEC_ADVISORY_MSG}')\\n else:\\n- raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+ raise UnsafeExecExpansionError(\\n+ f'Unsafe default(s) in exec command: {outtmpl!r}\\\\n'\\n+ f'Conversions are not applied to --exec command template defaults, '\\n+ f'e.g. %(...|DEFAULT;)q. {EXEC_ADVISORY_MSG}')\\n \\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/downloader/external.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/downloader/external.py b/yt_dlp/downloader/external.py\\nindex 37a42af91a6e..2f127c0f8746 100644\\n--- a/yt_dlp/downloader/external.py\\n+++ b/yt_dlp/downloader/external.py\\n@@ -11,6 +11,7 @@\\n from .fragment import FragmentFD\\n from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor\\n from ..utils import (\\n+ DownloadError,\\n Popen,\\n RetryManager,\\n _configuration_args,\\n@@ -136,8 +137,6 @@ def _write_cookies(self):\\n self.to_screen(f'[download] Writing temporary cookies file to \\\"{self._cookies_tempfile}\\\"')\\n # real_download resets _cookies_tempfile; if it's None then save() will write to cookiejar.filename\\n self.ydl.cookiejar.save(self._cookies_tempfile, True, True)\\n- with open(self.ydl.cookiejar.filename or self._cookies_tempfile, \\\"r\\\") as file:\\n- print(\\\"cookies\\\", repr(file.read()))\\n return self.ydl.cookiejar.filename or self._cookies_tempfile\\n \\n def _call_downloader(self, tmpfilename, info_dict):\\n@@ -224,8 +223,7 @@ def _make_cmd(self, tmpfilename, info_dict):\\n else:\\n cookies_file = self._write_cookies()\\n if '=' in cookies_file:\\n- # XXX: what to raise here?\\n- raise RuntimeError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\\n+ raise DownloadError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\\n assert cookies_file != '-'\\n cmd += ['--cookie', cookies_file]\\n \\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/downloader/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/devscripts/changelog_override.json b/devscripts/changelog_override.json\nindex 937a8880bc8f..7ff3a6caa0fc 100644\n--- a/devscripts/changelog_override.json\n+++ b/devscripts/changelog_override.json\n@@ -342,5 +342,30 @@\n \"action\": \"add\",\n \"when\": \"1fbbe29b99dc61375bf6d786f824d9fcf6ea9c1a\",\n \"short\": \"[priority] Security: [[CVE-2026-26331](https://nvd.nist.gov/vuln/detail/CVE-2026-26331)] [Arbitrary command injection with the `--netrc-cmd` option](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-g3gw-q23r-pgqm)\\n - The argument passed to the command in `--netrc-cmd` is now limited to a safe subset of characters\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"98e42eb04486e00bf86479b24dbfe19321f652ee\",\n+ \"short\": \"[priority] **The minimum supported versions of Deno, Node, and Bun have been raised.**\\n The minimum required version of [Deno](https://github.com/yt-dlp/yt-dlp/issues/16767) is now `v2.3.0`; supported [Node](https://github.com/yt-dlp/yt-dlp/issues/16765) versions are `v22` and up; [Bun support has been deprecated](https://github.com/yt-dlp/yt-dlp/issues/16766) and limited to versions `1.2.11` through `1.3.14`.\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"5faffa999fd33b373d47773e8ee639d072accec2\",\n+ \"short\": \"[priority] Security: Usage of vulnerable conversions (e.g. `%()s`) with the `--exec` option is an all-too-common pitfall. To remedy this, `--exec` now only allows safe conversions in its command templates.\\n - Most users can simply replace `%(...)s` with `%(...)q` in their `--exec` argument(s). Numeric conversions are unaffected by this change. Using unsafe conversions with `--exec` poses a significant security risk. [Read more](<https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg>)\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"e578e265f7c6ca94a74b30e0d8d6196a4d19fb6a\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50023](https://nvd.nist.gov/vuln/detail/CVE-2026-50023)] [Dangerous file type creation via insufficient filename sanitization](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-c6mh-fpjc-4pr3)\\n - Writing files with the extensions `.desktop`, `.url`, or `.webloc` is now only allowed in the context of `--write-link` functionality\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"2726572520238356bcf64aba2040228648b44c82\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50019](https://nvd.nist.gov/vuln/detail/CVE-2026-50019)] [File Downloader cookie leak with curl](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-f7j3-774f-rfhj)\\n - Impact is limited to users of `--downloader curl`; cookies are now properly passed to curl so that it respects their scope\"\n+ },\n+ {\n+ \"action\": \"add\",\n+ \"when\": \"25056f0d2d47adbd235a8d422fa62d68d0be2bc2\",\n+ \"short\": \"[priority] Security: [[CVE-2026-50574](https://nvd.nist.gov/vuln/detail/CVE-2026-50574)] [Arbitrary code execution via manifest downloads with aria2c](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-vx4q-3cr2-7cg2)\\n - Impact is limited to users of `--downloader aria2c`\\n - Support for downloading HLS and DASH formats with aria2c has been removed. Users affected by this change should migrate to use `-N` for concurrent fragment downloads via the native downloader\"\n }\n ]\ndiff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\nindex 7231e8bdafaa..23676c94503d 100755\n--- a/devscripts/update_requirements.py\n+++ b/devscripts/update_requirements.py\n@@ -650,8 +650,8 @@ def update_requirements(\n modify_and_write_pyproject(pyproject_text, table_name=EXTRAS_TABLE, table=extras)\n \n # Generate/upgrade final lockfile that includes pinned extras\n- print(f'Running: uv lock {upgrade_arg}', file=sys.stderr)\n- run_process('uv', 'lock', upgrade_arg, env=env)\n+ print('Running: uv lock', file=sys.stderr)\n+ run_process('uv', 'lock', env=env)\n \n # Export bundle requirements; any updates to these are already recorded w/ uv.lock package diff\n for target_suffix, target in BUNDLE_TARGETS.items():\ndiff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 47ed811c64de..6e7ae2a9ee27 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -1313,6 +1313,7 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n )$''')\n SAFE_EXEC_CONVERSIONS = 'difq'\n UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n+ EXEC_ADVISORY_MSG = 'See https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-69qj-pvh9-c5wg for details'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1440,12 +1441,21 @@ def create_key(outer_mobj):\n # Validate safety of exec commands\n if _exec:\n if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n- raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe conversion(s) in exec command: {outtmpl!r}\\n'\n+ f'Conversions such as %()s are too dangerous to be used in '\n+ f'--exec command templates; use %()q instead. {EXEC_ADVISORY_MSG}')\n elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n if default == na:\n- raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe placeholder for exec command: {na!r}\\n'\n+ f'The --output-na-placeholder argument also applies to '\n+ f'--exec command templates. {EXEC_ADVISORY_MSG}')\n else:\n- raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+ raise UnsafeExecExpansionError(\n+ f'Unsafe default(s) in exec command: {outtmpl!r}\\n'\n+ f'Conversions are not applied to --exec command template defaults, '\n+ f'e.g. %(...|DEFAULT;)q. {EXEC_ADVISORY_MSG}')\n \n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\ndiff --git a/yt_dlp/downloader/external.py b/yt_dlp/downloader/external.py\nindex 37a42af91a6e..2f127c0f8746 100644\n--- a/yt_dlp/downloader/external.py\n+++ b/yt_dlp/downloader/external.py\n@@ -11,6 +11,7 @@\n from .fragment import FragmentFD\n from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor\n from ..utils import (\n+ DownloadError,\n Popen,\n RetryManager,\n _configuration_args,\n@@ -136,8 +137,6 @@ def _write_cookies(self):\n self.to_screen(f'[download] Writing temporary cookies file to \"{self._cookies_tempfile}\"')\n # real_download resets _cookies_tempfile; if it's None then save() will write to cookiejar.filename\n self.ydl.cookiejar.save(self._cookies_tempfile, True, True)\n- with open(self.ydl.cookiejar.filename or self._cookies_tempfile, \"r\") as file:\n- print(\"cookies\", repr(file.read()))\n return self.ydl.cookiejar.filename or self._cookies_tempfile\n \n def _call_downloader(self, tmpfilename, info_dict):\n@@ -224,8 +223,7 @@ def _make_cmd(self, tmpfilename, info_dict):\n else:\n cookies_file = self._write_cookies()\n if '=' in cookies_file:\n- # XXX: what to raise here?\n- raise RuntimeError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\n+ raise DownloadError('curl version too old or temp directory contains `=`; please use another downloader or update curl')\n assert cookies_file != '-'\n cmd += ['--cookie', cookies_file]\n \n\ndiff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py\nindex 2705accb760c..0f84d7e1694b 100644\n--- a/test/test_YoutubeDL.py\n+++ b/test/test_YoutubeDL.py\n@@ -6,11 +6,11 @@\n import unittest\n from unittest.mock import patch\n \n-from yt_dlp.globals import all_plugins_loaded\n-\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\n \n \n+from yt_dlp.globals import all_plugins_loaded\n+\n import contextlib\n import copy\n import json\ndiff --git a/test/test_downloader_external.py b/test/test_downloader_external.py\nindex 9db485af9b98..0b51c961737e 100644\n--- a/test/test_downloader_external.py\n+++ b/test/test_downloader_external.py\n@@ -102,6 +102,7 @@ def do_GET(self, /):\n self.end_headers()\n self.wfile.write(json.dumps(list(self.headers.items())).encode())\n \n+\n class HTTPTestServer(http.server.HTTPServer):\n @property\n def address(self, /):\ndiff --git a/test/test_execution.py b/test/test_execution.py\nindex c6ee9cf9d0cc..cd587fe33485 100644\n--- a/test/test_execution.py\n+++ b/test/test_execution.py\n@@ -20,7 +20,12 @@\n class TestExecution(unittest.TestCase):\n def run_yt_dlp(self, exe=(sys.executable, 'yt_dlp/__main__.py'), opts=('--version', )):\n stdout, stderr, returncode = Popen.run(\n- [*exe, '--ignore-config', *opts], cwd=rootDir, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n+ [*exe, '--no-update', '--ignore-config', *opts],\n+ cwd=rootDir,\n+ text=True,\n+ stdout=subprocess.PIPE,\n+ stderr=subprocess.PIPE,\n+ )\n print(stderr, file=sys.stderr)\n self.assertEqual(returncode, 0)\n return stdout.strip(), stderr.strip()\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":7,"string":"7"}}},{"rowIdx":34278,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16137"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16137,"string":"16,137"},"base_sha":{"kind":"string","value":"e85da3b98532761573d8b48ccd4d8d28dee94b15"},"head_sha":{"kind":"string","value":"e8dddb9176c3a15a7d692b0ab71462b22a01140c"},"task":{"kind":"string","value":"hketv: unable to extract file ID\n\n### Checklist\r\n\r\n- [X] I'm reporting a broken site\r\n- [X] I've verified that I'm running yt-dlp version **2022.02.03**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))\r\n- [X] I've checked that all provided URLs are alive and playable in a browser\r\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\r\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates\r\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\r\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\r\n\r\n### Region\r\n\r\nHong Kong\r\n\r\n### Description\r\n\r\nCannot download videos. `unable to extract OpenGraph title` warning and `Unable to extract file ID` error. Workround with `--force-generic-extractor`.\r\n\r\nExample (to reproduce):\r\n```\r\nyt-dlp https://www.hkedcity.net/etv/resource/2932360618\r\n```\r\n\r\nAdditionally, the URL of the site changed such that the URLs accepted by the extractor are redirects now. The new URL of the above example is https://emm.edcity.hk/media/0_ke4346e6\r\n\r\nBest regards,\r\nNick Chan\r\n\r\n\r\n### Verbose log\r\n\r\n```shell\r\n[debug] Command-line config: ['-vvv', 'https://www.hkedcity.net/etv/resource/2932360618']\r\n[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, err utf-8, pref UTF-8\r\n[debug] yt-dlp version 2022.02.03 [28469edd7]\r\n[debug] Python version 3.10.2 (CPython 64bit) - Linux-3.18.71-14176914-aarch64-with-libc\r\n[debug] exe versions: ffmpeg 5.0 (setts), ffprobe 5.0\r\n[debug] Optional libraries: Cryptodome, mutagen, sqlite, websockets\r\n[debug] Proxy map: {}\r\n[debug] [hketv] Extracting URL: https://www.hkedcity.net/etv/resource/2932360618\r\n[hketv] 2932360618: Downloading webpage\r\nWARNING: [hketv] unable to extract OpenGraph title; please report this issue on https://github.com/yt-dlp/yt-dlp , filling out the \"Broken site\" issue template properly. Confirm you are on the latest version using -U\r\nERROR: [hketv] 2932360618: Unable to extract file ID; please report this issue on https://github.com/yt-dlp/yt-dlp , filling out the \"Broken site\" issue template properly. Confirm you are on the latest version using -U; please report this issue on https://github.com/yt-dlp/yt-dlp , filling out the \"Broken site\" issue template properly. Confirm you are on the latest version using -U\r\n File \"/data/data/com.termux/files/usr/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 612, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/data/data/com.termux/files/usr/lib/python3.10/site-packages/yt_dlp/extractor/hketv.py\", line 89, in _real_extract\r\n file_id = self._search_regex(\r\n File \"/data/data/com.termux/files/usr/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 1186, in _search_regex\r\n raise RegexNotFoundError('Unable to extract %s' % _name)\r\n```\n\n[prosiebenmaxx.de] Error 404 and malfunction in drm-protection-check\n\n### Checklist\n\n- [X] I'm reporting a broken site\n- [X] I've verified that I'm running yt-dlp version **2022.02.04**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))\n- [X] I've checked that all provided URLs are alive and playable in a browser\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nGermany\n\n### Description\n\nI founded two bugs / errors on prosiebenmaxx.de: There is a Error 404 and a mafunction in the drm-protection-check. I posted both logs above. Maybe you need the geo-bypass-function to confirm these bugs.\r\nLast month the extractor worked fine.\r\nThere are some clips, where I get the 404 Error (e.g. the link in the verbose log). I tryed to download it serveral times, but yt-dlp answered the same 404 Error. Maybe in the extractor there are some lines, that are not working anymore?\r\nFuthermore the drm-protection check is not working. For example yt-dlp answered, that the clip is drm protected. In the header of the side, one can read, that there is no drm protection:\r\nmeta data-react-helmet=\"true\" property=\"video:drm\" content=\"0\"\r\nI downloded the clip manually and vlc can play that clip.\r\nI am sorry, that I can't do more than to report the bug. I hope, we can fix it :D\r\n\n\n### Verbose log\n\n```shell\n404 Error verbose log:\r\nc:\\Download>yt-dlp.exe -U\r\nLatest version: 2022.02.04, Current version: 2022.02.04\r\nyt-dlp is up to date (2022.02.04)\r\nc:\\Download>yt-dlp.exe \"https://www.prosiebenmaxx.de/anime/shakugan-no-shana/video/11-alles-endete-etwas-neues-begann-ganze-folge\" -F -v\r\n[debug] Command-line config: ['https://www.prosiebenmaxx.de/anime/shakugan-no-shana/video/11-alles-endete-etwas-neues-begann-ganze-folge', '-F', '-v']\r\n[debug] Encodings: locale cp1252, fs utf-8, out utf-8, err utf-8, pref cp1252\r\n[debug] yt-dlp version 2022.02.04 [c1653e9] (win_exe)\r\n[debug] Python version 3.8.10 (CPython 64bit) - Windows-10-10.0.19042-SP0\r\n[debug] exe versions: ffmpeg 4.2.2, ffprobe 4.2.2\r\n[debug] Optional libraries: Cryptodome, mutagen, sqlite, websockets\r\n[debug] Proxy map: {}\r\n[debug] [prosiebensat1] Extracting URL: https://www.prosiebenmaxx.de/anime/shakugan-no-shana/video/11-alles-endete-etwas-neues-begann-ganze-folge\r\n[prosiebensat1] anime/shakugan-no-shana/video/11-alles-endete-etwas-neues-begann-ganze-folge: Downloading webpage\r\n[prosiebensat1] 6595537: Downloading videos JSON\r\n[prosiebensat1] 6595537: Downloading protocols JSON\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not Found\r\n[prosiebensat1] 6595537: Downloading sources JSON\r\n[prosiebensat1] 6595537: Downloading urls JSON\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not found\r\n[prosiebensat1] 6595537: Downloading urls JSON\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not found\r\n[prosiebensat1] 6595537: Downloading urls JSON\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not found\r\nERROR: [prosiebensat1] 6595537: No video formats found!; please report this issue on https://github.com/yt-dlp/yt-dlp , filling out the \"Broken site\" issue template properly. Confirm you are on the latest version using -U\r\nTraceback (most recent call last):\r\n File \"yt_dlp\\YoutubeDL.py\", line 1381, in wrapper\r\n File \"yt_dlp\\YoutubeDL.py\", line 1465, in __extract_info\r\n File \"yt_dlp\\YoutubeDL.py\", line 1517, in process_ie_result\r\n File \"yt_dlp\\YoutubeDL.py\", line 2431, in process_video_result\r\n File \"yt_dlp\\YoutubeDL.py\", line 961, in raise_no_formats\r\nyt_dlp.utils.ExtractorError: [prosiebensat1] 6595537: No video formats found!; please report this issue on https://github.com/yt-dlp/yt-dlp , filling out the \"Broken site\" issue template properly. Confirm you are on the latest version using -U\r\n\r\nbug in drm-protection-check log:\r\nc:\\Download>yt-dlp.exe \"https://www.prosiebenmaxx.de/anime/attack-on-titan/video/38-die-aussenmauer-von-bezirk-orvud-ganze-folge\" -F -v\r\n[debug] Command-line config: ['https://www.prosiebenmaxx.de/anime/attack-on-titan/video/38-die-aussenmauer-von-bezirk-orvud-ganze-folge', '-F', '-v']\r\n[debug] Encodings: locale cp1252, fs utf-8, out utf-8, err utf-8, pref cp1252\r\n[debug] yt-dlp version 2022.02.04 [c1653e9] (win_exe)\r\n[debug] Python version 3.8.10 (CPython 64bit) - Windows-10-10.0.19042-SP0\r\n[debug] exe versions: ffmpeg 4.2.2, ffprobe 4.2.2\r\n[debug] Optional libraries: Cryptodome, mutagen, sqlite, websockets\r\n[debug] Proxy map: {}\r\n[debug] [prosiebensat1] Extracting URL: https://www.prosiebenmaxx.de/anime/attack-on-titan/video/38-die-aussenmauer-von-bezirk-orvud-ganze-folge\r\n[prosiebensat1] anime/attack-on-titan/video/38-die-aussenmauer-von-bezirk-orvud-ganze-folge: Downloading webpage\r\n[prosiebensat1] 5584131: Downloading videos JSON\r\nERROR: [prosiebensat1] 5584131: 5584131: This video is DRM protected\r\n File \"yt_dlp\\extractor\\common.py\", line 612, in extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 495, in _real_extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 440, in _extract_clip\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 38, in _extract_video_info\r\n File \"yt_dlp\\extractor\\common.py\", line 1076, in report_drm\r\n File \"yt_dlp\\extractor\\common.py\", line 1120, in raise_no_formats\n```\n\nGabTV channel_name error download\n\n### Checklist\n\n- [X] I'm reporting a broken site\n- [X] I've verified that I'm running yt-dlp version **2022.04.08** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are alive and playable in a browser\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nBrazil\n\n### Description\n\nWhen I try to use yt-dlp on GabTV an error is given: unable to extract channel_name \n\n### Verbose log\n\n```shell\nyt-dlp -vU https://tv.gab.com/channel/davecullen/view/three-experiments-that-explain-conformity-and-6254454f4c1b91f9610e8aa1\r\n[debug] Command-line config: ['-vU', 'https://tv.gab.com/channel/davecullen/view/three-experiments-that-explain-conformity-and-6254454f4c1b91f9610e8aa1'][debug] Encodings: locale UTF-8, fs utf-8, out UTF-8, err UTF-8, pref UTF-8\r\n[debug] yt-dlp version 2022.04.08 [7884ade65] (zip)[debug] Python version 3.6.9 (CPython 64bit) - Linux-4.15.0-151-generic-x86_64-with-Ubuntu-18.04-bionic\r\n[debug] Checking exe version: ffmpeg -bsfs\r\n[debug] Checking exe version: ffprobe -bsfs\r\n[debug] exe versions: ffmpeg 3.4.8, ffprobe 3.4.8, phantomjs ., rtmpdump 2.4\r\n[debug] Optional libraries: brotli, certifi, Crypto, secretstorage, sqlite, websockets\r\n[debug] Proxy map: {}\r\nLatest version: 2022.04.08, Current version: 2022.04.08\r\nyt-dlp is up to date (2022.04.08)\r\n[debug] [GabTV] Extracting URL: https://tv.gab.com/channel/davecullen/view/three-experiments-that-explain-conformity-and-6254454f4c1b91f9610e8aa1\r\n[GabTV] 6254454f4c1b91f9610e8aa1: Downloading webpage\r\nERROR: [GabTV] three-experiments-that-explain-conformity-and-6254454f4c1b91f9610e8aa1: Unable to extract channel_name; please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\r\n File \"./yt-dlp/yt_dlp/extractor/common.py\", line 641, in extract\r\n ie_result = self._real_extract(url)\r\n File \"./yt-dlp/yt_dlp/extractor/gab.py\", line 36, in _real_extract\r\n channel_name = self._search_regex(r'data-channel-name=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'channel_name')\r\n File \"./yt-dlp/yt_dlp/extractor/common.py\", line 1229, in _search_regex\r\n raise RegexNotFoundError('Unable to extract %s' % _name\n```\n\n[prosiebensat1] SAT.1 Nachrichten broken\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm reporting a broken site\n- [X] I've verified that I'm running yt-dlp version **2022.09.01** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nGermany\n\n### Provide a description that is worded well enough to be understood\n\nThe website and URL for Sat 1 news videos changed.\r\nOn the overview site https://www.sat1.de/serien/nachrichten there's the current video, but the clip id now can't be extracted.\r\nFor a specific video, the subdomain changed such that the [prosiebensat1] extractor is not used anymore.\r\n\r\nNew URL is https://video.sat1.de/serien/sat1-nachrichten/videos/abendnachrichten-02092022\r\nOld URL would have been https://www.sat1.de/news/video/abendnachrichten-02-09-2022-clip\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', 'https://www.sat1.de/serien/nachrichten']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version 2022.09.01 [5d7c7d6] (pip)\r\n[debug] Python 3.9.13 (CPython 64bit) - macOS-12.5.1-arm64-arm-64bit\r\n[debug] Checking exe version: ffmpeg -bsfs\r\n[debug] Checking exe version: ffprobe -bsfs\r\n[debug] exe versions: ffmpeg 5.1.1 (setts), ffprobe 5.1.1\r\n[debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1670 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nLatest version: 2022.09.01, Current version: 2022.09.01\r\nyt-dlp is up to date (2022.09.01)\r\n[debug] [prosiebensat1] Extracting URL: https://www.sat1.de/serien/nachrichten\r\n[prosiebensat1] serien/nachrichten: Downloading webpage\r\nERROR: [prosiebensat1] serien/nachrichten: Unable to extract clip id; please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/common.py\", line 670, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/prosiebensat1.py\", line 492, in _real_extract\r\n return self._extract_clip(url, webpage)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/prosiebensat1.py\", line 432, in _extract_clip\r\n clip_id = self._html_search_regex(\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/common.py\", line 1258, in _html_search_regex\r\n res = self._search_regex(pattern, string, name, default, fatal, flags, group)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/common.py\", line 1222, in _search_regex\r\n raise RegexNotFoundError('Unable to extract %s' % _name)\r\n\r\n---\r\n\r\n[debug] Command-line config: ['-vU', 'https://video.sat1.de/serien/sat1-nachrichten/videos/abendnachrichten-02092022']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version 2022.09.01 [5d7c7d6] (pip)\r\n[debug] Python 3.9.13 (CPython 64bit) - macOS-12.5.1-arm64-arm-64bit\r\n[debug] Checking exe version: ffmpeg -bsfs\r\n[debug] Checking exe version: ffprobe -bsfs\r\n[debug] exe versions: ffmpeg 5.1.1 (setts), ffprobe 5.1.1\r\n[debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1670 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nLatest version: 2022.09.01, Current version: 2022.09.01\r\nyt-dlp is up to date (2022.09.01)\r\n[debug] [generic] Extracting URL: https://video.sat1.de/serien/sat1-nachrichten/videos/abendnachrichten-02092022\r\n[generic] abendnachrichten-02092022: Downloading webpage\r\nWARNING: [generic] Falling back on generic information extractor\r\n[generic] abendnachrichten-02092022: Extracting information\r\n[debug] Looking for Brightcove embeds\r\n[debug] Looking for embeds\r\nERROR: Unsupported URL: https://video.sat1.de/serien/sat1-nachrichten/videos/abendnachrichten-02092022\r\nTraceback (most recent call last):\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/YoutubeDL.py\", line 1459, in wrapper\r\n return func(self, *args, **kwargs)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/YoutubeDL.py\", line 1535, in __extract_info\r\n ie_result = ie.extract(url)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/common.py\", line 670, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/opt/homebrew/Cellar/yt-dlp/2022.9.1/libexec/lib/python3.9/site-packages/yt_dlp/extractor/generic.py\", line 3078, in _real_extract\r\n raise UnsupportedError(url)\r\nyt_dlp.utils.UnsupportedError: Unsupported URL: https://video.sat1.de/serien/sat1-nachrichten/videos/abendnachrichten-02092022\n```\n\nPuls4 extractor broken -- URL stub changed\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm reporting a broken site\n- [X] I've verified that I'm running yt-dlp version **2022.09.01** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nAustria\n\n### Provide a description that is worded well enough to be understood\n\nThe extractor for Puls4, an Austrian news station, no longer works. I believe this is because the URLs changed from www.puls4.com/name-of-show to www.puls4.com/tv/name-of-show\r\n\r\nThe extractor apparently expects an episode of Pro and Contra to look like this: http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident-Analyse-des-Interviews-mit-Norbert-Hofer-416598\r\n\r\nBut the episodes now look like this: https://www.puls4.com/tv/pro-und-contra/pro-contra-puls-4-news-talk-2022/episode-31/pro-und-contra-ungerechtes-oesterreich-sollen-reiche-die-krise-zahlen\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', 'https://www.puls4.com/tv/pro-und-contra/pro-contra-puls-4-news-talk-2022/episode-31/pro-und-contra-ungerechtes-oesterreich-sollen-reiche-die-krise-zahlen']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8 (No ANSI), error utf-8, screen utf-8 (No ANSI)\r\n[debug] yt-dlp version 2022.09.01 [5d7c7d6]\r\n[debug] Python 3.10.7 (CPython 64bit) - macOS-12.6-arm64-arm-64bit\r\n[debug] Checking exe version: ffmpeg -bsfs\r\n[debug] Checking exe version: ffprobe -bsfs\r\n[debug] exe versions: ffmpeg 4.4.2 (setts), ffprobe 4.4.2\r\n[debug] Optional libraries: Crypto-3.15.0, sqlite3-2.6.0\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1670 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\n[debug] [Puls4] Extracting URL: https://www.puls4.com/tv/pro-und-contra/pro-contra-puls-4-news-talk-2022/episode-31/pro-und-contra-ungerechtes-oesterreich-sollen-reiche-die-krise-zahlen\r\nERROR: [Puls4] tv/pro-und-contra/pro-contra-puls-4-news-talk-2022/episode-31/pro-und-contra-ungerechtes-oesterreich-sollen-reiche-die-krise-zahlen: Unable to download JSON metadata: HTTP Error 404: Not Found (caused by <HTTPError 404: 'Not Found'>); please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 670, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/puls4.py\", line 32, in _real_extract\r\n content_path = self._download_json(\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 1030, in download_content\r\n res = getattr(self, download_handle.__name__)(url_or_request, video_id, **kwargs)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 994, in download_handle\r\n res = self._download_webpage_handle(\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 864, in _download_webpage_handle\r\n urlh = self._request_webpage(url_or_request, video_id, note, errnote, fatal, data=data, headers=headers, query=query, expected_status=expected_status)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 821, in _request_webpage\r\n raise ExtractorError(errmsg, cause=err)\r\n\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 803, in _request_webpage\r\n return self._downloader.urlopen(self._create_request(url_or_request, data, headers, query))\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/yt_dlp/YoutubeDL.py\", line 3656, in urlopen\r\n return self._opener.open(req, timeout=self._socket_timeout)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 525, in open\r\n response = meth(req, response)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 634, in http_response\r\n response = self.parent.error(\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 557, in error\r\n result = self._call_chain(*args)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 496, in _call_chain\r\n result = func(*args)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 749, in http_error_302\r\n return self.parent.open(new, timeout=req.timeout)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 525, in open\r\n response = meth(req, response)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 634, in http_response\r\n response = self.parent.error(\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 563, in error\r\n return self._call_chain(*args)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 496, in _call_chain\r\n result = func(*args)\r\n File \"/opt/local/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/urllib/request.py\", line 643, in http_error_default\r\n raise HTTPError(req.full_url, code, msg, hdrs, fp)\r\nurllib.error.HTTPError: HTTP Error 404: Not Found\n```\n\n[prosiebensat1] HTTP Error 404 & This video is unavailable\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm reporting a broken site\n- [X] I've verified that I'm running yt-dlp version **2022.10.04** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nGermany\n\n### Provide a description that is worded well enough to be understood\n\nI am recently trying to download a few videos, which worked months/years ago.\r\nIn detail I am speaking about ProSibenSat1 Videos and they seems not working anymore.\r\n\r\nI am getting the same error again and again. doesn't matter if i am using Credentials, Cookies, or Nothing, like before.\r\nEven with or without Geoblock option\r\n\r\nThis video is unavailable\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not Found\r\n\r\nI've also tried to check if video is DRM free, like it was earlier. Since its playing in disabled DRM Edge, it should be. ;)\r\n\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['https://www.prosieben.de/tv/joko-klaas-gegen-prosieben/video/56-grosse-scherben-musikalische-meisterwerke-ganze-folge', '--cookies-from-browser', 'chrome', '--geo-bypass-country', 'DE', '-vU']\r\n[debug] Encodings: locale cp1252, fs utf-8, pref cp1252, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version 2022.10.04 [4e0511f] (win32_exe)\r\n[debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22621-SP0\r\n[debug] Checking exe version: ffmpeg -bsfs\r\n[debug] Checking exe version: ffprobe -bsfs\r\n[debug] exe versions: ffmpeg git-2020-08-31-4a11a6f\r\n[debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.09.24, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3\r\n[Cookies] Extracting cookies from chrome\r\n[debug] Extracting cookies from: \"C:\\Users\\l4v4l\\AppData\\Local\\Google\\Chrome\\User Data\\Default\\Network\\Cookies\"\r\n[debug] Found local state file at \"C:\\Users\\l4v4l\\AppData\\Local\\Google\\Chrome\\User Data\\Local State\"\r\n[Cookies] Extracted 253 cookies from chrome\r\n[debug] cookie version breakdown: {'v10': 253, 'other': 0, 'unencrypted': 0}\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1690 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nLatest version: 2022.10.04, Current version: 2022.10.04\r\nyt-dlp is up to date (2022.10.04)\r\n[debug] Using fake IP 53.181.45.63 (DE) as X-Forwarded-For\r\n[debug] [prosiebensat1] Extracting URL: https://www.prosieben.de/tv/joko-klaas-gegen-prosieben/video/56-grosse-scherben-musikalische-meisterwerke-ganze-folge\r\n[prosiebensat1] tv/joko-klaas-gegen-prosieben/video/56-grosse-scherben-musikalische-meisterwerke-ganze-folge: Downloading webpage\r\n[prosiebensat1] 6029555: Downloading videos JSON\r\n[prosiebensat1] 6029555: Downloading protocols JSON\r\nWARNING: [prosiebensat1] Unable to download JSON metadata: HTTP Error 404: Not Found\r\n[prosiebensat1] 6029555: Downloading sources JSON\r\n[prosiebensat1] 6029555: Downloading urls JSON\r\nERROR: [prosiebensat1] tv/joko-klaas-gegen-prosieben/video/56-grosse-scherben-musikalische-meisterwerke-ganze-folge: This video is unavailable\r\n File \"yt_dlp\\extractor\\common.py\", line 672, in extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 492, in _real_extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 437, in _extract_clip\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 113, in _extract_video_info\n```\n\n[FujiTV FOD] mixed/unexpected behavior on rental titles\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm asking a question and **not** reporting a bug or requesting a feature\n- [X] I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)\n- [X] I've verified that I'm running yt-dlp version **2023.03.04** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n\n### Please make sure the question is worded well enough to be understood\n\nMy understanding is that yt-dlp is not capable of ripping rental titles of FOD. My question is how come it _can_ for some reason, rip some rental titles but it _can't_ rip some non-rental titles. For instance:\r\nThis is a rental title which yt-dlp is unable to rip and throws `403 forbidden`: `https://fod.fujitv.co.jp/title/11as/11as110001/`\r\nThis is a rental title which yt-dlp can rip it + other episodes : `https://fod.fujitv.co.jp/title/709f/709f110001/`\r\nThis is a non-rental which yt-dlp can't rip and throws `403 forbidden`: `https://fod.fujitv.co.jp/title/4v55/4v55110001/`\r\nAnd this is a non-rental which yt-dlp can rip all the episodes: `https://fod.fujitv.co.jp/title/4l23/4l23120001/`\r\n\r\n\r\nI've put the output of getting formats and downloading for the first three titles below:\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n>yt-dlp -FUv \"https://fod.fujitv.co.jp/title/11as/11as110001/\"\r\n\r\n[debug] Command-line config: ['-FUv', 'https://fod.fujitv.co.jp/title/11as/11as110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/11as/11as110001/\r\n[FujiTVFODPlus7] 11as110001: Downloading webpage\r\n[FujiTVFODPlus7] 11as110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 11as110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] Available formats for 11as110001:\r\nID EXT RESOLUTION โ PROTO โ VCODEC ACODEC\r\nโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ\r\n0-0 ts unknown โ m3u8 โ unknown unknown\r\n0-1 ts unknown โ m3u8 โ unknown unknown\r\n0-2 ts unknown โ m3u8 โ unknown unknown\r\n1-0 ts unknown โ m3u8 โ unknown unknown\r\n1-1 ts unknown โ m3u8 โ unknown unknown\r\n1-2 ts unknown โ m3u8 โ unknown unknown\r\n10-0 ts unknown โ m3u8 โ unknown unknown\r\n10-1 ts unknown โ m3u8 โ unknown unknown\r\n10-2 ts unknown โ m3u8 โ unknown unknown\r\n100 ts unknown โ m3u8 โ unknown unknown\r\n101 ts unknown โ m3u8 โ unknown unknown\r\n102 ts unknown โ m3u8 โ unknown unknown\r\n103 ts unknown โ m3u8 โ unknown unknown\r\n104 ts unknown โ m3u8 โ unknown unknown\r\n105 ts unknown โ m3u8 โ unknown unknown\r\n106 ts unknown โ m3u8 โ unknown unknown\r\n107 ts unknown โ m3u8 โ unknown unknown\r\n108 ts unknown โ m3u8 โ unknown unknown\r\n109 ts unknown โ m3u8 โ unknown unknown\r\n11-0 ts unknown โ m3u8 โ unknown unknown\r\n11-1 ts unknown โ m3u8 โ unknown unknown\r\n11-2 ts unknown โ m3u8 โ unknown unknown\r\n110 ts unknown โ m3u8 โ unknown unknown\r\n111 ts unknown โ m3u8 โ unknown unknown\r\n112 ts unknown โ m3u8 โ unknown unknown\r\n12-0 ts unknown โ m3u8 โ unknown unknown\r\n12-1 ts unknown โ m3u8 โ unknown unknown\r\n12-2 ts unknown โ m3u8 โ unknown unknown\r\n13-0 ts unknown โ m3u8 โ unknown unknown\r\n13-1 ts unknown โ m3u8 โ unknown unknown\r\n13-2 ts unknown โ m3u8 โ unknown unknown\r\n14-0 ts unknown โ m3u8 โ unknown unknown\r\n14-1 ts unknown โ m3u8 โ unknown unknown\r\n14-2 ts unknown โ m3u8 โ unknown unknown\r\n15-0 ts unknown โ m3u8 โ unknown unknown\r\n15-1 ts unknown โ m3u8 โ unknown unknown\r\n15-2 ts unknown โ m3u8 โ unknown unknown\r\n16-0 ts unknown โ m3u8 โ unknown unknown\r\n16-1 ts unknown โ m3u8 โ unknown unknown\r\n16-2 ts unknown โ m3u8 โ unknown unknown\r\n17-0 ts unknown โ m3u8 โ unknown unknown\r\n17-1 ts unknown โ m3u8 โ unknown unknown\r\n17-2 ts unknown โ m3u8 โ unknown unknown\r\n18-0 ts unknown โ m3u8 โ unknown unknown\r\n18-1 ts unknown โ m3u8 โ unknown unknown\r\n18-2 ts unknown โ m3u8 โ unknown unknown\r\n19-0 ts unknown โ m3u8 โ unknown unknown\r\n19-1 ts unknown โ m3u8 โ unknown unknown\r\n19-2 ts unknown โ m3u8 โ unknown unknown\r\n2-0 ts unknown โ m3u8 โ unknown unknown\r\n2-1 ts unknown โ m3u8 โ unknown unknown\r\n2-2 ts unknown โ m3u8 โ unknown unknown\r\n20-0 ts unknown โ m3u8 โ unknown unknown\r\n20-1 ts unknown โ m3u8 โ unknown unknown\r\n20-2 ts unknown โ m3u8 โ unknown unknown\r\n21-0 ts unknown โ m3u8 โ unknown unknown\r\n21-1 ts unknown โ m3u8 โ unknown unknown\r\n21-2 ts unknown โ m3u8 โ unknown unknown\r\n22-0 ts unknown โ m3u8 โ unknown unknown\r\n22-1 ts unknown โ m3u8 โ unknown unknown\r\n22-2 ts unknown โ m3u8 โ unknown unknown\r\n23-0 ts unknown โ m3u8 โ unknown unknown\r\n23-1 ts unknown โ m3u8 โ unknown unknown\r\n23-2 ts unknown โ m3u8 โ unknown unknown\r\n24-0 ts unknown โ m3u8 โ unknown unknown\r\n24-1 ts unknown โ m3u8 โ unknown unknown\r\n24-2 ts unknown โ m3u8 โ unknown unknown\r\n25-0 ts unknown โ m3u8 โ unknown unknown\r\n25-1 ts unknown โ m3u8 โ unknown unknown\r\n25-2 ts unknown โ m3u8 โ unknown unknown\r\n26-0 ts unknown โ m3u8 โ unknown unknown\r\n26-1 ts unknown โ m3u8 โ unknown unknown\r\n26-2 ts unknown โ m3u8 โ unknown unknown\r\n27-0 ts unknown โ m3u8 โ unknown unknown\r\n27-1 ts unknown โ m3u8 โ unknown unknown\r\n27-2 ts unknown โ m3u8 โ unknown unknown\r\n28-0 ts unknown โ m3u8 โ unknown unknown\r\n28-1 ts unknown โ m3u8 โ unknown unknown\r\n28-2 ts unknown โ m3u8 โ unknown unknown\r\n29-0 ts unknown โ m3u8 โ unknown unknown\r\n29-1 ts unknown โ m3u8 โ unknown unknown\r\n29-2 ts unknown โ m3u8 โ unknown unknown\r\n3-0 ts unknown โ m3u8 โ unknown unknown\r\n3-1 ts unknown โ m3u8 โ unknown unknown\r\n3-2 ts unknown โ m3u8 โ unknown unknown\r\n30-0 ts unknown โ m3u8 โ unknown unknown\r\n30-1 ts unknown โ m3u8 โ unknown unknown\r\n30-2 ts unknown โ m3u8 โ unknown unknown\r\n31-0 ts unknown โ m3u8 โ unknown unknown\r\n31-1 ts unknown โ m3u8 โ unknown unknown\r\n31-2 ts unknown โ m3u8 โ unknown unknown\r\n32-0 ts unknown โ m3u8 โ unknown unknown\r\n32-1 ts unknown โ m3u8 โ unknown unknown\r\n32-2 ts unknown โ m3u8 โ unknown unknown\r\n33-0 ts unknown โ m3u8 โ unknown unknown\r\n33-1 ts unknown โ m3u8 โ unknown unknown\r\n33-2 ts unknown โ m3u8 โ unknown unknown\r\n34-0 ts unknown โ m3u8 โ unknown unknown\r\n34-1 ts unknown โ m3u8 โ unknown unknown\r\n34-2 ts unknown โ m3u8 โ unknown unknown\r\n35-0 ts unknown โ m3u8 โ unknown unknown\r\n35-1 ts unknown โ m3u8 โ unknown unknown\r\n35-2 ts unknown โ m3u8 โ unknown unknown\r\n36-0 ts unknown โ m3u8 โ unknown unknown\r\n36-1 ts unknown โ m3u8 โ unknown unknown\r\n36-2 ts unknown โ m3u8 โ unknown unknown\r\n37-0 ts unknown โ m3u8 โ unknown unknown\r\n37-1 ts unknown โ m3u8 โ unknown unknown\r\n37-2 ts unknown โ m3u8 โ unknown unknown\r\n38-0 ts unknown โ m3u8 โ unknown unknown\r\n38-1 ts unknown โ m3u8 โ unknown unknown\r\n38-2 ts unknown โ m3u8 โ unknown unknown\r\n39-0 ts unknown โ m3u8 โ unknown unknown\r\n39-1 ts unknown โ m3u8 โ unknown unknown\r\n39-2 ts unknown โ m3u8 โ unknown unknown\r\n4-0 ts unknown โ m3u8 โ unknown unknown\r\n4-1 ts unknown โ m3u8 โ unknown unknown\r\n4-2 ts unknown โ m3u8 โ unknown unknown\r\n40-0 ts unknown โ m3u8 โ unknown unknown\r\n40-1 ts unknown โ m3u8 โ unknown unknown\r\n40-2 ts unknown โ m3u8 โ unknown unknown\r\n41-0 ts unknown โ m3u8 โ unknown unknown\r\n41-1 ts unknown โ m3u8 โ unknown unknown\r\n41-2 ts unknown โ m3u8 โ unknown unknown\r\n42-0 ts unknown โ m3u8 โ unknown unknown\r\n42-1 ts unknown โ m3u8 โ unknown unknown\r\n42-2 ts unknown โ m3u8 โ unknown unknown\r\n43-0 ts unknown โ m3u8 โ unknown unknown\r\n43-1 ts unknown โ m3u8 โ unknown unknown\r\n43-2 ts unknown โ m3u8 โ unknown unknown\r\n44-0 ts unknown โ m3u8 โ unknown unknown\r\n44-1 ts unknown โ m3u8 โ unknown unknown\r\n44-2 ts unknown โ m3u8 โ unknown unknown\r\n45-0 ts unknown โ m3u8 โ unknown unknown\r\n45-1 ts unknown โ m3u8 โ unknown unknown\r\n45-2 ts unknown โ m3u8 โ unknown unknown\r\n46-0 ts unknown โ m3u8 โ unknown unknown\r\n46-1 ts unknown โ m3u8 โ unknown unknown\r\n46-2 ts unknown โ m3u8 โ unknown unknown\r\n47-0 ts unknown โ m3u8 โ unknown unknown\r\n47-1 ts unknown โ m3u8 โ unknown unknown\r\n47-2 ts unknown โ m3u8 โ unknown unknown\r\n48 ts unknown โ m3u8 โ unknown unknown\r\n49 ts unknown โ m3u8 โ unknown unknown\r\n5-0 ts unknown โ m3u8 โ unknown unknown\r\n5-1 ts unknown โ m3u8 โ unknown unknown\r\n5-2 ts unknown โ m3u8 โ unknown unknown\r\n50 ts unknown โ m3u8 โ unknown unknown\r\n51 ts unknown โ m3u8 โ unknown unknown\r\n52 ts unknown โ m3u8 โ unknown unknown\r\n53 ts unknown โ m3u8 โ unknown unknown\r\n54 ts unknown โ m3u8 โ unknown unknown\r\n55 ts unknown โ m3u8 โ unknown unknown\r\n56 ts unknown โ m3u8 โ unknown unknown\r\n57 ts unknown โ m3u8 โ unknown unknown\r\n58 ts unknown โ m3u8 โ unknown unknown\r\n59 ts unknown โ m3u8 โ unknown unknown\r\n6-0 ts unknown โ m3u8 โ unknown unknown\r\n6-1 ts unknown โ m3u8 โ unknown unknown\r\n6-2 ts unknown โ m3u8 โ unknown unknown\r\n60 ts unknown โ m3u8 โ unknown unknown\r\n61 ts unknown โ m3u8 โ unknown unknown\r\n62 ts unknown โ m3u8 โ unknown unknown\r\n63 ts unknown โ m3u8 โ unknown unknown\r\n64 ts unknown โ m3u8 โ unknown unknown\r\n65 ts unknown โ m3u8 โ unknown unknown\r\n66 ts unknown โ m3u8 โ unknown unknown\r\n67 ts unknown โ m3u8 โ unknown unknown\r\n68 ts unknown โ m3u8 โ unknown unknown\r\n69 ts unknown โ m3u8 โ unknown unknown\r\n7-0 ts unknown โ m3u8 โ unknown unknown\r\n7-1 ts unknown โ m3u8 โ unknown unknown\r\n7-2 ts unknown โ m3u8 โ unknown unknown\r\n70 ts unknown โ m3u8 โ unknown unknown\r\n71 ts unknown โ m3u8 โ unknown unknown\r\n72 ts unknown โ m3u8 โ unknown unknown\r\n73 ts unknown โ m3u8 โ unknown unknown\r\n74 ts unknown โ m3u8 โ unknown unknown\r\n75 ts unknown โ m3u8 โ unknown unknown\r\n76 ts unknown โ m3u8 โ unknown unknown\r\n77 ts unknown โ m3u8 โ unknown unknown\r\n78 ts unknown โ m3u8 โ unknown unknown\r\n79 ts unknown โ m3u8 โ unknown unknown\r\n8-0 ts unknown โ m3u8 โ unknown unknown\r\n8-1 ts unknown โ m3u8 โ unknown unknown\r\n8-2 ts unknown โ m3u8 โ unknown unknown\r\n80 ts unknown โ m3u8 โ unknown unknown\r\n81 ts unknown โ m3u8 โ unknown unknown\r\n82 ts unknown โ m3u8 โ unknown unknown\r\n83 ts unknown โ m3u8 โ unknown unknown\r\n84 ts unknown โ m3u8 โ unknown unknown\r\n85 ts unknown โ m3u8 โ unknown unknown\r\n86 ts unknown โ m3u8 โ unknown unknown\r\n87 ts unknown โ m3u8 โ unknown unknown\r\n88 ts unknown โ m3u8 โ unknown unknown\r\n89 ts unknown โ m3u8 โ unknown unknown\r\n9-0 ts unknown โ m3u8 โ unknown unknown\r\n9-1 ts unknown โ m3u8 โ unknown unknown\r\n9-2 ts unknown โ m3u8 โ unknown unknown\r\n90 ts unknown โ m3u8 โ unknown unknown\r\n91 ts unknown โ m3u8 โ unknown unknown\r\n92 ts unknown โ m3u8 โ unknown unknown\r\n93 ts unknown โ m3u8 โ unknown unknown\r\n94 ts unknown โ m3u8 โ unknown unknown\r\n95 ts unknown โ m3u8 โ unknown unknown\r\n96 ts unknown โ m3u8 โ unknown unknown\r\n97 ts unknown โ m3u8 โ unknown unknown\r\n98 ts unknown โ m3u8 โ unknown unknown\r\n99 ts unknown โ m3u8 โ unknown unknown\r\n\r\n>yt-dlp --downloader ./aria2c -Uv -f \"b\" \"https://fod.fujitv.co.jp/title/11as/11as110001/\"\r\n\r\n[debug] Command-line config: ['--downloader', './aria2c', '-Uv', '-f', 'b', 'https://fod.fujitv.co.jp/title/11as/11as110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/11as/11as110001/\r\n[FujiTVFODPlus7] 11as110001: Downloading webpage\r\n[FujiTVFODPlus7] 11as110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 11as110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 11as110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] 11as110001: Downloading 1 format(s): 99\r\n[debug] Invoking hlsnative downloader on \"https://dn698ob20pir2.cloudfront.net/11as/11as110001_27a533e44f319142cb0318b9c547ee85c8/<SegmentBase indexRange=\"1397-22200\">\"\r\n[hlsnative] Downloading m3u8 manifest\r\nERROR: unable to download video data: HTTP Error 403: Forbidden\r\nTraceback (most recent call last):\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 3247, in process_info\r\n success, real_download = self.dl(temp_filename, info_dict)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 2970, in dl\r\n return fd.download(name, new_info, subtitle)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/downloader/common.py\", line 444, in download\r\n ret = self.real_download(filename, info_dict)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/downloader/hls.py\", line 66, in real_download\r\n urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 3742, in urlopen\r\n return self._opener.open(req, timeout=self._socket_timeout)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 525, in open\r\n response = meth(req, response)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 634, in http_response\r\n response = self.parent.error(\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 563, in error\r\n return self._call_chain(*args)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 496, in _call_chain\r\n result = func(*args)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 643, in http_error_default\r\n raise HTTPError(req.full_url, code, msg, hdrs, fp)\r\nurllib.error.HTTPError: HTTP Error 403: Forbidden\r\n\r\n\r\n>yt-dlp -FUv \"https://fod.fujitv.co.jp/title/709f/709f110001/\"\r\n\r\n[debug] Command-line config: ['-FUv', 'https://fod.fujitv.co.jp/title/709f/709f110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/709f/709f110001/\r\n[FujiTVFODPlus7] 709f110001: Downloading webpage\r\n[FujiTVFODPlus7] 709f110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 709f110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] Available formats for 709f110001:\r\nID EXT RESOLUTION โ TBR PROTO โ VCODEC VBR ACODEC ABR\r\nโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ\r\n300 ts 180x320 โ 300k m3u8 โ unknown 300k unknown 0k\r\n800 ts 360x640 โ 800k m3u8 โ unknown 800k unknown 0k\r\n1200 ts 720x1280 โ 1200k m3u8 โ unknown 1200k unknown 0k\r\n1800-0 ts 1280x720 โ 1800k m3u8 โ unknown 1800k unknown 0k\r\n1800-1 ts 1280x720 โ 1800k m3u8 โ unknown 1800k unknown 0k\r\n5000 ts 1920x1080 โ 5000k m3u8 โ unknown 5000k unknown 0k\r\n7000-0 ts 1920x1080 โ 7000k m3u8 โ unknown 7000k unknown 0k\r\n7000-1 ts 1920x1080 โ 7000k m3u8 โ unknown 7000k unknown 0k\r\n\r\n>yt-dlp --downloader ./aria2c -Uv -f \"b\" \"https://fod.fujitv.co.jp/title/709f/709f110001/\"\r\n\r\n[debug] Command-line config: ['--downloader', './aria2c', '-Uv', '-f', 'b', 'https://fod.fujitv.co.jp/title/709f/709f110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/709f/709f110001/\r\n[FujiTVFODPlus7] 709f110001: Downloading webpage\r\n[FujiTVFODPlus7] 709f110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 709f110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 709f110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] 709f110001: Downloading 1 format(s): 7000-1\r\n[debug] Invoking hlsnative downloader on \"https://hls-vod-auth.stream.co.jp/hls-vod-auth/fod-wse-abr/ts.m3u8?tk=6e05c54049c945de0bc70c057bbf8039a3580c50b637a48fc845d9e8a96e1f88&an=fod-wse-abr&ct=video/56789/7/709f110001me117.mp4&ln=1&pn=1&jt=d178975c93e5116ee36389e8919824ef\"\r\n[hlsnative] Downloading m3u8 manifest\r\n[hlsnative] Total fragments: 2075\r\n[download] Destination: ใฌใชใฌใชใๆฒ้ปใฎใใฌใผใ [709f110001].ts\r\n[download] 0.6% of ~ 2.72GiB at 56.21KiB/s ETA 55:05 (frag 11/2075)\r\n\r\n\r\n>yt-dlp -FUv https://fod.fujitv.co.jp/title/4v55/4v55110001/\r\n\r\n[debug] Command-line config: ['-FUv', 'https://fod.fujitv.co.jp/title/4v55/4v55110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/4v55/4v55110001/\r\n[FujiTVFODPlus7] 4v55110001: Downloading webpage\r\n[FujiTVFODPlus7] 4v55110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 4v55110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] Available formats for 4v55110001:\r\nID EXT RESOLUTION โ PROTO โ VCODEC ACODEC\r\nโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ\r\n0-0 ts unknown โ m3u8 โ unknown unknown\r\n0-1 ts unknown โ m3u8 โ unknown unknown\r\n0-2 ts unknown โ m3u8 โ unknown unknown\r\n1-0 ts unknown โ m3u8 โ unknown unknown\r\n1-1 ts unknown โ m3u8 โ unknown unknown\r\n1-2 ts unknown โ m3u8 โ unknown unknown\r\n10-0 ts unknown โ m3u8 โ unknown unknown\r\n10-1 ts unknown โ m3u8 โ unknown unknown\r\n10-2 ts unknown โ m3u8 โ unknown unknown\r\n11-0 ts unknown โ m3u8 โ unknown unknown\r\n11-1 ts unknown โ m3u8 โ unknown unknown\r\n11-2 ts unknown โ m3u8 โ unknown unknown\r\n12-0 ts unknown โ m3u8 โ unknown unknown\r\n12-1 ts unknown โ m3u8 โ unknown unknown\r\n12-2 ts unknown โ m3u8 โ unknown unknown\r\n13-0 ts unknown โ m3u8 โ unknown unknown\r\n13-1 ts unknown โ m3u8 โ unknown unknown\r\n13-2 ts unknown โ m3u8 โ unknown unknown\r\n14-0 ts unknown โ m3u8 โ unknown unknown\r\n14-1 ts unknown โ m3u8 โ unknown unknown\r\n14-2 ts unknown โ m3u8 โ unknown unknown\r\n15-0 ts unknown โ m3u8 โ unknown unknown\r\n15-1 ts unknown โ m3u8 โ unknown unknown\r\n15-2 ts unknown โ m3u8 โ unknown unknown\r\n16-0 ts unknown โ m3u8 โ unknown unknown\r\n16-1 ts unknown โ m3u8 โ unknown unknown\r\n16-2 ts unknown โ m3u8 โ unknown unknown\r\n17-0 ts unknown โ m3u8 โ unknown unknown\r\n17-1 ts unknown โ m3u8 โ unknown unknown\r\n17-2 ts unknown โ m3u8 โ unknown unknown\r\n18-0 ts unknown โ m3u8 โ unknown unknown\r\n18-1 ts unknown โ m3u8 โ unknown unknown\r\n18-2 ts unknown โ m3u8 โ unknown unknown\r\n19-0 ts unknown โ m3u8 โ unknown unknown\r\n19-1 ts unknown โ m3u8 โ unknown unknown\r\n19-2 ts unknown โ m3u8 โ unknown unknown\r\n2-0 ts unknown โ m3u8 โ unknown unknown\r\n2-1 ts unknown โ m3u8 โ unknown unknown\r\n2-2 ts unknown โ m3u8 โ unknown unknown\r\n20-0 ts unknown โ m3u8 โ unknown unknown\r\n20-1 ts unknown โ m3u8 โ unknown unknown\r\n20-2 ts unknown โ m3u8 โ unknown unknown\r\n21-0 ts unknown โ m3u8 โ unknown unknown\r\n21-1 ts unknown โ m3u8 โ unknown unknown\r\n21-2 ts unknown โ m3u8 โ unknown unknown\r\n22-0 ts unknown โ m3u8 โ unknown unknown\r\n22-1 ts unknown โ m3u8 โ unknown unknown\r\n22-2 ts unknown โ m3u8 โ unknown unknown\r\n23-0 ts unknown โ m3u8 โ unknown unknown\r\n23-1 ts unknown โ m3u8 โ unknown unknown\r\n23-2 ts unknown โ m3u8 โ unknown unknown\r\n24-0 ts unknown โ m3u8 โ unknown unknown\r\n24-1 ts unknown โ m3u8 โ unknown unknown\r\n24-2 ts unknown โ m3u8 โ unknown unknown\r\n25-0 ts unknown โ m3u8 โ unknown unknown\r\n25-1 ts unknown โ m3u8 โ unknown unknown\r\n25-2 ts unknown โ m3u8 โ unknown unknown\r\n26-0 ts unknown โ m3u8 โ unknown unknown\r\n26-1 ts unknown โ m3u8 โ unknown unknown\r\n26-2 ts unknown โ m3u8 โ unknown unknown\r\n27-0 ts unknown โ m3u8 โ unknown unknown\r\n27-1 ts unknown โ m3u8 โ unknown unknown\r\n27-2 ts unknown โ m3u8 โ unknown unknown\r\n28-0 ts unknown โ m3u8 โ unknown unknown\r\n28-1 ts unknown โ m3u8 โ unknown unknown\r\n28-2 ts unknown โ m3u8 โ unknown unknown\r\n29-0 ts unknown โ m3u8 โ unknown unknown\r\n29-1 ts unknown โ m3u8 โ unknown unknown\r\n29-2 ts unknown โ m3u8 โ unknown unknown\r\n3-0 ts unknown โ m3u8 โ unknown unknown\r\n3-1 ts unknown โ m3u8 โ unknown unknown\r\n3-2 ts unknown โ m3u8 โ unknown unknown\r\n30-0 ts unknown โ m3u8 โ unknown unknown\r\n30-1 ts unknown โ m3u8 โ unknown unknown\r\n30-2 ts unknown โ m3u8 โ unknown unknown\r\n31-0 ts unknown โ m3u8 โ unknown unknown\r\n31-1 ts unknown โ m3u8 โ unknown unknown\r\n31-2 ts unknown โ m3u8 โ unknown unknown\r\n32-0 ts unknown โ m3u8 โ unknown unknown\r\n32-1 ts unknown โ m3u8 โ unknown unknown\r\n32-2 ts unknown โ m3u8 โ unknown unknown\r\n33-0 ts unknown โ m3u8 โ unknown unknown\r\n33-1 ts unknown โ m3u8 โ unknown unknown\r\n33-2 ts unknown โ m3u8 โ unknown unknown\r\n34-0 ts unknown โ m3u8 โ unknown unknown\r\n34-1 ts unknown โ m3u8 โ unknown unknown\r\n34-2 ts unknown โ m3u8 โ unknown unknown\r\n35-0 ts unknown โ m3u8 โ unknown unknown\r\n35-1 ts unknown โ m3u8 โ unknown unknown\r\n35-2 ts unknown โ m3u8 โ unknown unknown\r\n36-0 ts unknown โ m3u8 โ unknown unknown\r\n36-1 ts unknown โ m3u8 โ unknown unknown\r\n36-2 ts unknown โ m3u8 โ unknown unknown\r\n37 ts unknown โ m3u8 โ unknown unknown\r\n38 ts unknown โ m3u8 โ unknown unknown\r\n39 ts unknown โ m3u8 โ unknown unknown\r\n4-0 ts unknown โ m3u8 โ unknown unknown\r\n4-1 ts unknown โ m3u8 โ unknown unknown\r\n4-2 ts unknown โ m3u8 โ unknown unknown\r\n40 ts unknown โ m3u8 โ unknown unknown\r\n41 ts unknown โ m3u8 โ unknown unknown\r\n42 ts unknown โ m3u8 โ unknown unknown\r\n43 ts unknown โ m3u8 โ unknown unknown\r\n44 ts unknown โ m3u8 โ unknown unknown\r\n45 ts unknown โ m3u8 โ unknown unknown\r\n46 ts unknown โ m3u8 โ unknown unknown\r\n47 ts unknown โ m3u8 โ unknown unknown\r\n48 ts unknown โ m3u8 โ unknown unknown\r\n49 ts unknown โ m3u8 โ unknown unknown\r\n5-0 ts unknown โ m3u8 โ unknown unknown\r\n5-1 ts unknown โ m3u8 โ unknown unknown\r\n5-2 ts unknown โ m3u8 โ unknown unknown\r\n50 ts unknown โ m3u8 โ unknown unknown\r\n51 ts unknown โ m3u8 โ unknown unknown\r\n52 ts unknown โ m3u8 โ unknown unknown\r\n53 ts unknown โ m3u8 โ unknown unknown\r\n54 ts unknown โ m3u8 โ unknown unknown\r\n55 ts unknown โ m3u8 โ unknown unknown\r\n56 ts unknown โ m3u8 โ unknown unknown\r\n57 ts unknown โ m3u8 โ unknown unknown\r\n58 ts unknown โ m3u8 โ unknown unknown\r\n59 ts unknown โ m3u8 โ unknown unknown\r\n6-0 ts unknown โ m3u8 โ unknown unknown\r\n6-1 ts unknown โ m3u8 โ unknown unknown\r\n6-2 ts unknown โ m3u8 โ unknown unknown\r\n60 ts unknown โ m3u8 โ unknown unknown\r\n61 ts unknown โ m3u8 โ unknown unknown\r\n62 ts unknown โ m3u8 โ unknown unknown\r\n63 ts unknown โ m3u8 โ unknown unknown\r\n64 ts unknown โ m3u8 โ unknown unknown\r\n65 ts unknown โ m3u8 โ unknown unknown\r\n66 ts unknown โ m3u8 โ unknown unknown\r\n67 ts unknown โ m3u8 โ unknown unknown\r\n68 ts unknown โ m3u8 โ unknown unknown\r\n69 ts unknown โ m3u8 โ unknown unknown\r\n7-0 ts unknown โ m3u8 โ unknown unknown\r\n7-1 ts unknown โ m3u8 โ unknown unknown\r\n7-2 ts unknown โ m3u8 โ unknown unknown\r\n70 ts unknown โ m3u8 โ unknown unknown\r\n71 ts unknown โ m3u8 โ unknown unknown\r\n72 ts unknown โ m3u8 โ unknown unknown\r\n73 ts unknown โ m3u8 โ unknown unknown\r\n74 ts unknown โ m3u8 โ unknown unknown\r\n75 ts unknown โ m3u8 โ unknown unknown\r\n76 ts unknown โ m3u8 โ unknown unknown\r\n77 ts unknown โ m3u8 โ unknown unknown\r\n78 ts unknown โ m3u8 โ unknown unknown\r\n79 ts unknown โ m3u8 โ unknown unknown\r\n8-0 ts unknown โ m3u8 โ unknown unknown\r\n8-1 ts unknown โ m3u8 โ unknown unknown\r\n8-2 ts unknown โ m3u8 โ unknown unknown\r\n80 ts unknown โ m3u8 โ unknown unknown\r\n81 ts unknown โ m3u8 โ unknown unknown\r\n82 ts unknown โ m3u8 โ unknown unknown\r\n83 ts unknown โ m3u8 โ unknown unknown\r\n84 ts unknown โ m3u8 โ unknown unknown\r\n85 ts unknown โ m3u8 โ unknown unknown\r\n86 ts unknown โ m3u8 โ unknown unknown\r\n87 ts unknown โ m3u8 โ unknown unknown\r\n88 ts unknown โ m3u8 โ unknown unknown\r\n89 ts unknown โ m3u8 โ unknown unknown\r\n9-0 ts unknown โ m3u8 โ unknown unknown\r\n9-1 ts unknown โ m3u8 โ unknown unknown\r\n9-2 ts unknown โ m3u8 โ unknown unknown\r\n90 ts unknown โ m3u8 โ unknown unknown\r\n91 ts unknown โ m3u8 โ unknown unknown\r\n92 ts unknown โ m3u8 โ unknown unknown\r\n93 ts unknown โ m3u8 โ unknown unknown\r\n94 ts unknown โ m3u8 โ unknown unknown\r\n95 ts unknown โ m3u8 โ unknown unknown\r\n96 ts unknown โ m3u8 โ unknown unknown\r\n97 ts unknown โ m3u8 โ unknown unknown\r\n98 ts unknown โ m3u8 โ unknown unknown\r\n99 ts unknown โ m3u8 โ unknown unknown\r\n\r\n>yt-dlp --downloader ./aria2c -Uv -f \"b\" \"https://fod.fujitv.co.jp/title/4v55/4v55110001/\"\r\n\r\n[debug] Command-line config: ['--downloader', './aria2c', '-Uv', '-f', 'b', 'https://fod.fujitv.co.jp/title/4v55/4v55110001/']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.03.04 [392389b7d] (pip)\r\n[debug] Python 3.10.11 (CPython x86_64 64bit) - Linux-5.15.107+-x86_64-with-glibc2.31 (OpenSSL 1.1.1f 31 Mar 2020, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.2.7, ffprobe 4.2.7\r\n[debug] Optional libraries: Cryptodome-3.17, brotli-1.0.9, certifi-2022.12.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {'colab_language_server': '/usr/colab/bin/language_service'}\r\n[debug] Loaded 1786 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.03.04, Current version: stable@2023.03.04\r\nyt-dlp is up to date (stable@2023.03.04)\r\n[FujiTVFODPlus7] Extracting URL: https://fod.fujitv.co.jp/title/4v55/4v55110001/\r\n[FujiTVFODPlus7] 4v55110001: Downloading webpage\r\n[FujiTVFODPlus7] 4v55110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 4v55110001: Downloading JSON metadata\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[FujiTVFODPlus7] 4v55110001: Downloading m3u8 information\r\n[debug] Sort order given by extractor: tbr\r\n[debug] Formats sorted by: hasvid, ie_pref, tbr, lang, quality, res, fps, hdr:12(7), vcodec:vp9.2(10), channels, acodec, filesize, fs_approx, vbr, abr, asr, proto, vext, aext, hasaud, source, id\r\n[info] 4v55110001: Downloading 1 format(s): 99\r\n[debug] Invoking hlsnative downloader on \"https://dn698ob20pir2.cloudfront.net/4v55/4v55110001_b399cb0c1ba6964c2cff056b321e81cf8a/</MPD>\"\r\n[hlsnative] Downloading m3u8 manifest\r\nERROR: unable to download video data: HTTP Error 403: Forbidden\r\nTraceback (most recent call last):\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 3247, in process_info\r\n success, real_download = self.dl(temp_filename, info_dict)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 2970, in dl\r\n return fd.download(name, new_info, subtitle)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/downloader/common.py\", line 444, in download\r\n ret = self.real_download(filename, info_dict)\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/downloader/hls.py\", line 66, in real_download\r\n urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))\r\n File \"/usr/local/lib/python3.10/dist-packages/yt_dlp/YoutubeDL.py\", line 3742, in urlopen\r\n return self._opener.open(req, timeout=self._socket_timeout)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 525, in open\r\n response = meth(req, response)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 634, in http_response\r\n response = self.parent.error(\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 563, in error\r\n return self._call_chain(*args)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 496, in _call_chain\r\n result = func(*args)\r\n File \"/usr/lib/python3.10/urllib/request.py\", line 643, in http_error_default\r\n raise HTTPError(req.full_url, code, msg, hdrs, fp)\r\nurllib.error.HTTPError: HTTP Error 403: Forbidden\n```\n\n[prosiebensat1] Unable to extract clip id\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\r\n\r\n- [X] I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field\r\n\r\n### Checklist\r\n\r\n- [X] I'm reporting that yt-dlp is broken on a **supported** site\r\n- [X] I've verified that I'm running yt-dlp version **2023.03.04** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\r\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\r\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\r\n- [X] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\r\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\r\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\r\n\r\n### Region\r\n\r\nAccessible in Germany/Austria/Switzerland. Possibly worldwide.\r\n\r\n### Provide a description that is worded well enough to be understood\r\n\r\n### steps to reproduce this issue\r\n\r\n1. disable Widevine as [instructed](https://github.com/yt-dlp/yt-dlp/issues/4062#issuecomment-1153474056) to confirm video is not DRM-protected\r\n2. open [URL](https://www.sat1.at/tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge) in Firefox\r\n3. click on video\r\n4. site redirects to an [authentication page](https://signin.7pass.de)\r\n5. login _(signup is free and fast as only email/firstname/bday are required, but can share login credentials if needed)_\r\n6. site redirects back to URL from step 2\r\n7. video is now playable in Firefox\r\n8. run `yt-dlp --no-config -f- -v --cookies-from-browser firefox \"URL\"`\r\n\r\n### expected result\r\nyt-dlp download should start\r\n\r\n### actual result\r\n`ERROR: [prosiebensat1] tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge: Unable to extract clip id; please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template.\r\n`\r\n\r\n### possibly related issues\r\n* https://github.com/yt-dlp/yt-dlp/issues/2010#issuecomment-1207371636\r\n* #4828\r\n* #5421\r\n\r\n\r\n\r\n\r\n### Provide verbose output that clearly demonstrates the problem\r\n\r\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\r\n- [X] If using API, add `'verbose': True` to `YoutubeDL` params instead\r\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\r\n\r\n### Complete Verbose Output\r\n\r\n```shell\r\nyt-dlp --no-config -f- -v --cookies-from-browser firefox \"https://www.sat1.at/tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge\"\r\n[debug] Command-line config: ['--no-config', '-f-', '-v', '--cookies-from-browser', 'firefox', 'https://www.sat1.at/tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge']\r\n[debug] Encodings: locale cp1252, fs utf-8, pref cp1252, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version nightly@2023.06.05.155301 [59d9fe083] (win_exe)\r\n[debug] Python 3.8.10 (CPython AMD64 64bit) - Windows-10-10.0.19045-SP0 (OpenSSL 1.1.1k 25 Mar 2021)\r\n[debug] exe versions: none\r\n[debug] Optional libraries: Cryptodome-3.18.0, brotli-1.0.9, certifi-2023.05.07, mutagen-1.46.0, sqlite3-2.6.0, websockets-11.0.3\r\n[Cookies] Extracting cookies from firefox\r\n[debug] Extracting cookies from: \"C:\\Users\\User\\AppData\\Roaming\\Mozilla\\Firefox\\Profiles\\4ad8do09.monika\\cookies.sqlite\"\r\n[Cookies] Extracted 719 cookies from firefox\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1840 extractors\r\n[prosiebensat1] Extracting URL: https://www.sat1.at/tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge\r\n[prosiebensat1] tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge: Downloading webpage\r\nERROR: [prosiebensat1] tv/videos/der-sat-1-bio-check-aldi-rewe-denns-co-ganze-folge: Unable to extract clip id; please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\r\n File \"yt_dlp\\extractor\\common.py\", line 703, in extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 491, in _real_extract\r\n File \"yt_dlp\\extractor\\prosiebensat1.py\", line 431, in _extract_clip\r\n File \"yt_dlp\\extractor\\common.py\", line 1287, in _html_search_regex\r\n File \"yt_dlp\\extractor\\common.py\", line 1251, in _search_regex\r\n```\n\nATV throws KeyError start error for older videos (?)\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm reporting that yt-dlp is broken on a **supported** site\n- [X] I've verified that I'm running yt-dlp version **2023.07.06** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [X] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nAustria\n\n### Provide a description that is worded well enough to be understood\n\nWhen I try downloading older videos from the ATV site, I get a \"An extractor error has occurred. (caused by KeyError('start')); please report this issue...\" for some videos (others just work). So that's what I'm doing :-)\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\nyt-dlp -vU \" https://atv.at/tv/amore-unter-palmen/staffel-02/episode-02/folge-2-stress-in-tunesien\"\r\n[debug] Command-line config: ['-vU', ' https://atv.at/tv/amore-unter-palmen/staffel-02/episode-02/folge-2-stress-in-tunesien']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version stable@2023.07.06 [b532a3481] (pip)\r\n[debug] Python 3.9.2 (CPython armv7l 32bit) - Linux-5.15.36-v7l+-armv7l-with-glibc2.31 (OpenSSL 1.1.1n 15 Mar 2022, glibc 2.31)\r\n[debug] exe versions: ffmpeg 4.3.4-0, ffprobe 4.3.4-0, phantomjs broken\r\n[debug] Optional libraries: Cryptodome-3.9.7, brotli-1.0.9, certifi-2020.06.20, mutagen-1.45.1, secretstorage-3.3.1, sqlite3-2.6.0, websockets-10.3\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1855 extractors\r\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\r\nAvailable version: stable@2023.07.06, Current version: stable@2023.07.06\r\nyt-dlp is up to date (stable@2023.07.06)\r\n[ATVAt] Extracting URL: https://atv.at/tv/amore-unter-palmen/staffel-02/episode-02/folge-2-stress-in-tunesien\r\n[ATVAt] folge-2-stress-in-tunesien: Downloading webpage\r\nERROR: folge-2-stress-in-tunesien: An extractor error has occurred. (caused by KeyError('start')); please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\r\n File \"/home/servant/.local/lib/python3.9/site-packages/yt_dlp/extractor/common.py\", line 710, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/home/servant/.local/lib/python3.9/site-packages/yt_dlp/extractor/atvat.py\", line 71, in _real_extract\r\n content_ids = [{'id': id, 'subclip_start': content['start'], 'subclip_end': content['end']}\r\n File \"/home/servant/.local/lib/python3.9/site-packages/yt_dlp/extractor/atvat.py\", line 71, in <listcomp>\r\n content_ids = [{'id': id, 'subclip_start': content['start'], 'subclip_end': content['end']}\r\nKeyError: 'start'\n```\n\nLivestream.com downloading 0 items\n\n### DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE\n\n- [X] I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field\n\n### Checklist\n\n- [X] I'm reporting that yt-dlp is broken on a **supported** site\n- [X] I've verified that I'm running yt-dlp version **2023.07.06** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)\n- [X] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [X] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [X] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nAustralia/worldwide\n\n### Provide a description that is worded well enough to be understood\n\nLivestream.com is downloading 0 items, but not returning an error. I believe this was first posted by @kanwal2322, but Github's auto-mod apparently didn't like their issue report, and we can't access deleted issues either :(\r\n\r\nAnyway, the issue is demonstrated in the verbose log below. I should note that it's a livestream site, so you might need to grab a new video URL from https://livestream.com/watch once this one stops being live\n\n### Provide verbose output that clearly demonstrates the problem\n\n- [X] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [X] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['https://livestream.com/accounts/27927814/events/9218480', '--verbose']\r\n[debug] Encodings: locale UTF-8, fs utf-8, pref UTF-8, out utf-8, error utf-8, screen utf-8\r\n[debug] yt-dlp version nightly@2023.09.09.151504 [a006ce2b2] (linux_exe)\r\n[debug] Python 3.10.12 (CPython x86_64 64bit) - Linux-6.4.12-surface-x86_64-with-glibc2.37 (OpenSSL 3.1.2 1 Aug 2023, glibc 2.37)\r\n[debug] exe versions: ffmpeg 5.1.2 (setts), ffprobe 5.1.2, rtmpdump 2.4\r\n[debug] Optional libraries: Cryptodome-3.18.0, brotli-1.1.0, certifi-2023.07.22, mutagen-1.47.0, sqlite3-2.6.0, websockets-11.0.3\r\n[debug] Proxy map: {}\r\n[debug] Loaded 1865 extractors\r\n[livestream] Extracting URL: https://livestream.com/accounts/27927814/events/9218480\r\n[livestream] Downloading JSON metadata\r\n[download] Downloading playlist: September 10, 2023 | BWCAR 8 AM Sunday Morning Worship Service with Pastor Darrell Jackson | Sermon - Somewhere You Have Never Been Before\r\n[livestream] 237527485: Downloading SMIL file\r\n[livestream] 237527485: Downloading m3u8 information\r\n[livestream] Playlist September 10, 2023 | BWCAR 8 AM Sunday Morning Worship Service with Pastor Darrell Jackson | Sermon - Somewhere You Have Never Been Before: Downloading 0 items\r\n[download] Finished downloading playlist: September 10, 2023 | BWCAR 8 AM Sunday Morning Worship Service with Pastor Darrell Jackson | Sermon - Somewhere You Have Never Been Before\n```\n\n[cleanup] Remove dead extractors\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\n### Description of your *pull request* and other information\r\n\r\n**Migrated** (Requires a separate IE)\r\n- appletrailers ([Apple TV](https://tv.apple.com/))\r\n- atvat ([Joyn](https://www.joyn.at/))\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/7654\r\n- awaan ([Dubai+](https://www.dubaiplus.net/))\r\n- contv ([Midnight Pulp](https://www.midnightpulp.com/))\r\nhttps://en.wikipedia.org/wiki/CONtv\r\n- eitb ([ETB ON](https://etbon.eus/))\r\nhttps://television.com.ar/noticias/industria/eitb-lanza-etb-on-la-nueva-plataforma-digital-de-tv-desarrollada-por-overon-grup-mediapro/\r\n- franceinter ([Radio France](https://www.radiofrance.fr/))\r\n- googlepodcasts ([YouTube Music](https://music.youtube.com/))\r\nhttps://en.wikipedia.org/wiki/Google_Podcasts\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/9313\r\n- goshgay ([GoshCAMS](https://goshcams.com/))\r\n- gputechconf ([NVIDIA On-Demand](https://www.nvidia.com/en-us/on-demand/))\r\n- hketv ([EDB EMM](https://emm.edcity.hk/))\r\nhttps://emm.edcity.hk/about_emm\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/2623\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/16063\r\n- moview ([Kompas](https://www.kompas.tv/))\r\nhttps://www.moview.id/\r\n- nationalgeographic (NationalGeographicVideoIE) ([Disney+](https://www.disneyplus.com/))\r\n- naver (NaverNowIE) ([NAVER TV](https://tv.naver.com/))\r\n- playplustv ([RecordPlus](https://descubra.recordplus.com/))\r\n- prosiebensat1 ([Joyn](https://www.joyn.de/))\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/2679\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/4828\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/5421\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/7264\r\n- puls4 ([Joyn](https://www.joyn.at/))\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/4939\r\n- radiocomercial ([rayo](https://rayo.pt/))\r\nhttps://radiocomercial.pt/noticia/rayo-radio-musica-e-podcasts-numa-so-app\r\n- rmcdecouverte ([RMC BFM Play](https://www.rmcbfmplay.com/))\r\n- sendtonews ([STN Video](https://www.stnvideo.com/))\r\n- stitcher ([Pandora](https://www.pandora.com/))\r\nhttps://techcrunch.com/2020/10/19/stitchers-podcasts-arrive-on-pandora-with-acquisitions-completion/\r\n- swearnet ([Trailer Park Boys](https://signup.trailerparkboysplus.com/))\r\n- uktvplay ([U](https://u.co.uk/))\r\nhttps://en.wikipedia.org/wiki/U_(streaming_service)\r\n- vodpl ([Player.pl](https://player.pl/))\r\n\r\n**Acquired**\r\n- alsace20tv\r\nhttps://www.rue89strasbourg.com/rachetee-altice-medias-alsace-20-bfm-alsace-223721\r\n- anchorfm\r\nhttps://www.theguardian.com/technology/2019/feb/06/spotify-buys-podcast-firms-gimlet-and-anchor-streaming-profits-music\r\n- internetvideoarchive\r\nhttps://theiabm.org/news/fabric-acquires-internet-video-archive-iva-to-create-next-generation-media-and-entertainment-data-ecosystem/\r\n- livestream\r\nhttps://vimeo.com/blog/post/livestream-com-discontinued\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/8075\r\n- lynda\r\nhttps://en.wikipedia.org/wiki/LinkedIn_Learning\r\n- playwire\r\nhttps://freakout.net/newsroom/pressreleases/201812playwire/\r\n- snotr\r\nhttps://www.snotr.com/\r\n- xstream\r\nhttps://www.vodprofessional.com/news/seachange-acquires-xstream/\r\n\r\n**Shutdown**\r\n- beatbump\r\nhttps://github.com/snuffyDev/Beatbump\r\n- caffeinetv\r\nhttps://en.wikipedia.org/wiki/Caffeine_(service)\r\n- eighttracks\r\nhttps://en.wikipedia.org/wiki/8tracks.com\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/10252\r\n- idolplus\r\nhttps://en.namu.wiki/w/%EC%95%84%EC%9D%B4%EB%8F%8C%ED%94%8C%EB%9F%AC%EC%8A%A4\r\n- izlesene\r\nhttps://tr.wikipedia.org/wiki/%C4%B0zlesene.com\r\n- kinja\r\nhttps://en.wikipedia.org/wiki/Kinja_(website)\r\n- koo\r\nhttps://en.wikipedia.org/wiki/Koo_(social_network)\r\n- microsoftstream\r\nhttps://techcommunity.microsoft.com/blog/microsoft-clipchamp-blog/update-on-stream-classic-retirement-last-day-of-service-set-for-feb-15-2024/3712075\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/9617\r\n- minoto\r\nhttps://minoto-video.com/\r\n- netverse\r\nhttps://id.wikipedia.org/wiki/Netverse\r\n- nuum\r\nhttps://www.forbes.ru/tekhnologii/533129-mts-resila-zakryt-svoj-videohosting-nuum\r\n- ora\r\nhttps://en.wikipedia.org/wiki/Ora_TV\r\n- rheinmaintv\r\nhttps://de.wikipedia.org/wiki/Rhein-Main_TV\r\n- syvdk\r\nhttps://da.wikipedia.org/wiki/24syv\r\n- triller\r\nhttps://triller.co/\r\n- tvplayer\r\nhttps://en.wikipedia.org/wiki/TVPlayer\r\n- ufctv (UFCArabiaIE)\r\nhttps://www.reddit.com/r/ufc/comments/1bt0vz8/ufc_arabia_abruptly_shutting_down_no_subscription/\r\n- utreon\r\nhttps://www.reddit.com/r/InRangeTV/comments/1n5oqko/utreonplayeur_is_dead/\r\n- videodetective\r\nhttps://www.videodetective.com/\r\n- videomore\r\nhttps://ru.wikipedia.org/wiki/More.tv\r\nhttps://telepedia.fandom.com/ru/wiki/More.TV\r\n- vvvvid\r\nhttps://en.wikipedia.org/wiki/VVVVID\r\n\r\n**No Self-Hosting** (Inferior to GenericIE)\r\n- axs (https://axs.tv/)\r\n- bigflix (https://www.bigflix.com/)\r\n\r\n**Inactive**\r\n- airtv (https://www.air.tv/) \r\nCloses https://github.com/yt-dlp/yt-dlp/issues/8798\r\n- bokecc (https://union.bokecc.com/)\r\n- callin (https://www.callin.com/)\r\n- clippit (https://www.clippituser.tv/)\r\n- drooble (https://drooble.com/)\r\n- eyedotv (https://www.eyedo.tv/)\r\n- gab (GabTVIE) (https://tv.gab.com/)\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/3416\r\n- leeco (LetvCloudIE) (https://yuntv.letv.com/)\r\n- mojvideo (https://www.mojvideo.com/)\r\n- moviezine (https://www.moviezine.se/video/)\r\n- nerdcubed (https://www.nerdcubed.co.uk/)\r\n- onionstudios (https://www.onionstudios.com/)\r\n- plvideo (https://plvideo.ru)\r\n- piramidetv (https://piramide.tv/)\r\n- planetmarathi (https://www.planetmarathi.com/)\r\n- redge (https://r.dcs.redcdn.pl/)\r\nRelated https://github.com/yt-dlp/yt-dlp/issues/9669\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/13391\r\n- sharevideos (https://embed.share-videos.se/)\r\n- springboardplatform (https://cms.springboardplatform.com/)\r\n- stanfordoc (https://openclassroom.stanford.edu/)\r\n- stretchinternet (https://portal.stretchinternet.com/)\r\n- tempo (https://video.tempo.co/)\r\n- theholetv (https://the-hole.tv/)\r\n- traileraddict (http://www.traileraddict.com/)\r\n- videofyme (https://www.videofy.me/)\r\n- videoken (VideoKenIE, VideoKenPlaylistIE, VideoKenCategoryIE, VideoKenTopicIE)\r\n(https://videos.cncf.io/) (https://videos.icts.res.in/) (https://videos.neurips.cc/)\r\n- vimm (https://www.vimm.tv/)\r\n- vuclip (http://m.vuclip.com/)\r\n- wdr (WDRMobileIE) (https://mobile-ondemand.wdr.de/)\r\n- weyyak (https://weyyak.com/)\r\n\r\n**DRM**\r\n- fujitv (https://fod.fujitv.co.jp/)\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/14558\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/7064\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/10264\r\n\r\n**Piracy**\r\n- camdemy (domain taken over) (currently redirects to an online casino)\r\nRelated https://github.com/ytdl-org/youtube-dl/pull/4938\r\n- duboku\r\n[High Court of Delhi](https://images.assettype.com/barandbench/2023-04/c608de4f-26e8-4776-91c5-eecaf465ef9d/Universal_City_Studios_LLC___Ors_v_Fzmovies_Net___Ors.pdf)\r\n[Federal Court of Australia](https://torrentfreak.com/images/P_NSD509_2023_2130863.pdf)\r\nhttps://www.channelnews.com.au/australian-federal-court-blocks-22-more-pirated-movie-sites/\r\nRelated https://github.com/yt-dlp/yt-dlp/commit/df38b4a1a9641238610114d9c3b60a3b88afd8a0\r\nRelated https://github.com/yt-dlp/yt-dlp/issues/9159\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/3891\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/9161\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/11791\r\nCloses https://github.com/yt-dlp/yt-dlp/issues/10162\r\n- musicdex\r\nRelated https://github.com/yt-dlp/yt-dlp/issues/2204\r\nRelated https://github.com/yt-dlp/yt-dlp/pull/2421\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Cleanup\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `test/` needed for: hketv: unable to extract file ID","scope_files":["test/test_subtitles.py"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/extractor/` needed for: hketv: unable to extract file ID","scope_files":["yt_dlp/extractor/_extractors.py","yt_dlp/extractor/airtv.py","yt_dlp/extractor/alsace20tv.py","yt_dlp/extractor/anchorfm.py","yt_dlp/extractor/appletrailers.py","yt_dlp/extractor/atvat.py","yt_dlp/extractor/awaan.py","yt_dlp/extractor/axs.py","yt_dlp/extractor/beatbump.py","yt_dlp/extractor/bigflix.py","yt_dlp/extractor/bokecc.py","yt_dlp/extractor/caffeinetv.py","yt_dlp/extractor/callin.py","yt_dlp/extractor/camdemy.py","yt_dlp/extractor/clippit.py","yt_dlp/extractor/contv.py","yt_dlp/extractor/drooble.py","yt_dlp/extractor/duboku.py","yt_dlp/extractor/eighttracks.py","yt_dlp/extractor/eitb.py","yt_dlp/extractor/eyedotv.py","yt_dlp/extractor/footyroom.py","yt_dlp/extractor/franceinter.py","yt_dlp/extractor/fujitv.py","yt_dlp/extractor/gab.py","yt_dlp/extractor/googlepodcasts.py","yt_dlp/extractor/goshgay.py","yt_dlp/extractor/gputechconf.py","yt_dlp/extractor/hketv.py","yt_dlp/extractor/idolplus.py","yt_dlp/extractor/infoq.py","yt_dlp/extractor/internetvideoarchive.py","yt_dlp/extractor/izlesene.py","yt_dlp/extractor/kinja.py","yt_dlp/extractor/koo.py","yt_dlp/extractor/leeco.py","yt_dlp/extractor/livestream.py","yt_dlp/extractor/lynda.py","yt_dlp/extractor/microsoftstream.py","yt_dlp/extractor/minoto.py","yt_dlp/extractor/mojvideo.py","yt_dlp/extractor/motherless.py","yt_dlp/extractor/moview.py","yt_dlp/extractor/moviezine.py","yt_dlp/extractor/musicdex.py","yt_dlp/extractor/nationalgeographic.py","yt_dlp/extractor/naver.py","yt_dlp/extractor/nerdcubed.py","yt_dlp/extractor/netverse.py","yt_dlp/extractor/nuum.py","yt_dlp/extractor/onionstudios.py","yt_dlp/extractor/ora.py","yt_dlp/extractor/piramidetv.py","yt_dlp/extractor/planetmarathi.py","yt_dlp/extractor/playplustv.py","yt_dlp/extractor/playwire.py","yt_dlp/extractor/plvideo.py","yt_dlp/extractor/prosiebensat1.py","yt_dlp/extractor/puls4.py","yt_dlp/extractor/radiocomercial.py","yt_dlp/extractor/redge.py","yt_dlp/extractor/rheinmaintv.py","yt_dlp/extractor/rmcdecouverte.py","yt_dlp/extractor/sejmpl.py","yt_dlp/extractor/sendtonews.py","yt_dlp/extractor/sharevideos.py","yt_dlp/extractor/snotr.py","yt_dlp/extractor/springboardplatform.py","yt_dlp/extractor/stanfordoc.py","yt_dlp/extractor/stitcher.py","yt_dlp/extractor/stretchinternet.py","yt_dlp/extractor/swearnet.py","yt_dlp/extractor/syvdk.py","yt_dlp/extractor/tempo.py","yt_dlp/extractor/theholetv.py","yt_dlp/extractor/traileraddict.py","yt_dlp/extractor/triller.py","yt_dlp/extractor/tvplayer.py","yt_dlp/extractor/ufctv.py","yt_dlp/extractor/uktvplay.py","yt_dlp/extractor/unsupported.py","yt_dlp/extractor/utreon.py","yt_dlp/extractor/vgtv.py","yt_dlp/extractor/videodetective.py","yt_dlp/extractor/videofyme.py","yt_dlp/extractor/videoken.py","yt_dlp/extractor/videomore.py","yt_dlp/extractor/vimm.py","yt_dlp/extractor/vodpl.py","yt_dlp/extractor/vuclip.py","yt_dlp/extractor/vvvvid.py","yt_dlp/extractor/wdr.py","yt_dlp/extractor/weyyak.py","yt_dlp/extractor/xstream.py","yt_dlp/extractor/zee5.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `test/` needed for: hketv: unable to extract file ID\",\n \"scope_files\": [\n \"test/test_subtitles.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/` needed for: hketv: unable to extract file ID\",\n \"scope_files\": [\n \"yt_dlp/extractor/_extractors.py\",\n \"yt_dlp/extractor/airtv.py\",\n \"yt_dlp/extractor/alsace20tv.py\",\n \"yt_dlp/extractor/anchorfm.py\",\n \"yt_dlp/extractor/appletrailers.py\",\n \"yt_dlp/extractor/atvat.py\",\n \"yt_dlp/extractor/awaan.py\",\n \"yt_dlp/extractor/axs.py\",\n \"yt_dlp/extractor/beatbump.py\",\n \"yt_dlp/extractor/bigflix.py\",\n \"yt_dlp/extractor/bokecc.py\",\n \"yt_dlp/extractor/caffeinetv.py\",\n \"yt_dlp/extractor/callin.py\",\n \"yt_dlp/extractor/camdemy.py\",\n \"yt_dlp/extractor/clippit.py\",\n \"yt_dlp/extractor/contv.py\",\n \"yt_dlp/extractor/drooble.py\",\n \"yt_dlp/extractor/duboku.py\",\n \"yt_dlp/extractor/eighttracks.py\",\n \"yt_dlp/extractor/eitb.py\",\n \"yt_dlp/extractor/eyedotv.py\",\n \"yt_dlp/extractor/footyroom.py\",\n \"yt_dlp/extractor/franceinter.py\",\n \"yt_dlp/extractor/fujitv.py\",\n \"yt_dlp/extractor/gab.py\",\n \"yt_dlp/extractor/googlepodcasts.py\",\n \"yt_dlp/extractor/goshgay.py\",\n \"yt_dlp/extractor/gputechconf.py\",\n \"yt_dlp/extractor/hketv.py\",\n \"yt_dlp/extractor/idolplus.py\",\n \"yt_dlp/extractor/infoq.py\",\n \"yt_dlp/extractor/internetvideoarchive.py\",\n \"yt_dlp/extractor/izlesene.py\",\n \"yt_dlp/extractor/kinja.py\",\n \"yt_dlp/extractor/koo.py\",\n \"yt_dlp/extractor/leeco.py\",\n \"yt_dlp/extractor/livestream.py\",\n \"yt_dlp/extractor/lynda.py\",\n \"yt_dlp/extractor/microsoftstream.py\",\n \"yt_dlp/extractor/minoto.py\",\n \"yt_dlp/extractor/mojvideo.py\",\n \"yt_dlp/extractor/motherless.py\",\n \"yt_dlp/extractor/moview.py\",\n \"yt_dlp/extractor/moviezine.py\",\n \"yt_dlp/extractor/musicdex.py\",\n \"yt_dlp/extractor/nationalgeographic.py\",\n \"yt_dlp/extractor/naver.py\",\n \"yt_dlp/extractor/nerdcubed.py\",\n \"yt_dlp/extractor/netverse.py\",\n \"yt_dlp/extractor/nuum.py\",\n \"yt_dlp/extractor/onionstudios.py\",\n \"yt_dlp/extractor/ora.py\",\n \"yt_dlp/extractor/piramidetv.py\",\n \"yt_dlp/extractor/planetmarathi.py\",\n \"yt_dlp/extractor/playplustv.py\",\n \"yt_dlp/extractor/playwire.py\",\n \"yt_dlp/extractor/plvideo.py\",\n \"yt_dlp/extractor/prosiebensat1.py\",\n \"yt_dlp/extractor/puls4.py\",\n \"yt_dlp/extractor/radiocomercial.py\",\n \"yt_dlp/extractor/redge.py\",\n \"yt_dlp/extractor/rheinmaintv.py\",\n \"yt_dlp/extractor/rmcdecouverte.py\",\n \"yt_dlp/extractor/sejmpl.py\",\n \"yt_dlp/extractor/sendtonews.py\",\n \"yt_dlp/extractor/sharevideos.py\",\n \"yt_dlp/extractor/snotr.py\",\n \"yt_dlp/extractor/springboardplatform.py\",\n \"yt_dlp/extractor/stanfordoc.py\",\n \"yt_dlp/extractor/stitcher.py\",\n \"yt_dlp/extractor/stretchinternet.py\",\n \"yt_dlp/extractor/swearnet.py\",\n \"yt_dlp/extractor/syvdk.py\",\n \"yt_dlp/extractor/tempo.py\",\n \"yt_dlp/extractor/theholetv.py\",\n \"yt_dlp/extractor/traileraddict.py\",\n \"yt_dlp/extractor/triller.py\",\n \"yt_dlp/extractor/tvplayer.py\",\n \"yt_dlp/extractor/ufctv.py\",\n \"yt_dlp/extractor/uktvplay.py\",\n \"yt_dlp/extractor/unsupported.py\",\n \"yt_dlp/extractor/utreon.py\",\n \"yt_dlp/extractor/vgtv.py\",\n \"yt_dlp/extractor/videodetective.py\",\n \"yt_dlp/extractor/videofyme.py\",\n \"yt_dlp/extractor/videoken.py\",\n \"yt_dlp/extractor/videomore.py\",\n \"yt_dlp/extractor/vimm.py\",\n \"yt_dlp/extractor/vodpl.py\",\n \"yt_dlp/extractor/vuclip.py\",\n \"yt_dlp/extractor/vvvvid.py\",\n \"yt_dlp/extractor/wdr.py\",\n \"yt_dlp/extractor/weyyak.py\",\n \"yt_dlp/extractor/xstream.py\",\n \"yt_dlp/extractor/zee5.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["test/test_subtitles.py"],"solution_diff":"diff --git a/test/test_subtitles.py b/test/test_subtitles.py\nindex 53e0b4eaf8dc..32e80df952c0 100644\n--- a/test/test_subtitles.py\n+++ b/test/test_subtitles.py\n@@ -16,7 +16,6 @@\n CeskaTelevizeIE,\n DailymotionIE,\n DemocracynowIE,\n- LyndaIE,\n RaiPlayIE,\n RTVEALaCartaIE,\n TedTalkIE,\n@@ -250,20 +249,6 @@ def test_nosubtitles(self):\n self.assertFalse(subtitles)\n \n \n-@is_download_test\n-@unittest.skip('IE broken')\n-class TestLyndaSubtitles(BaseTestSubtitles):\n- url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'\n- IE = LyndaIE\n-\n- def test_allsubtitles(self):\n- self.DL.params['writesubtitles'] = True\n- self.DL.params['allsubtitles'] = True\n- subtitles = self.getSubtitles()\n- self.assertEqual(set(subtitles.keys()), {'en'})\n- self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')\n-\n-\n @is_download_test\n @unittest.skip('IE broken')\n class TestNPOSubtitles(BaseTestSubtitles):\n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s2","scope_files":["yt_dlp/extractor/_extractors.py","yt_dlp/extractor/airtv.py","yt_dlp/extractor/alsace20tv.py","yt_dlp/extractor/anchorfm.py","yt_dlp/extractor/appletrailers.py","yt_dlp/extractor/atvat.py","yt_dlp/extractor/awaan.py","yt_dlp/extractor/axs.py","yt_dlp/extractor/beatbump.py","yt_dlp/extractor/bigflix.py","yt_dlp/extractor/bokecc.py","yt_dlp/extractor/caffeinetv.py","yt_dlp/extractor/callin.py","yt_dlp/extractor/camdemy.py","yt_dlp/extractor/clippit.py","yt_dlp/extractor/contv.py","yt_dlp/extractor/drooble.py","yt_dlp/extractor/duboku.py","yt_dlp/extractor/eighttracks.py","yt_dlp/extractor/eitb.py","yt_dlp/extractor/eyedotv.py","yt_dlp/extractor/footyroom.py","yt_dlp/extractor/franceinter.py","yt_dlp/extractor/fujitv.py","yt_dlp/extractor/gab.py","yt_dlp/extractor/googlepodcasts.py","yt_dlp/extractor/goshgay.py","yt_dlp/extractor/gputechconf.py","yt_dlp/extractor/hketv.py","yt_dlp/extractor/idolplus.py","yt_dlp/extractor/infoq.py","yt_dlp/extractor/internetvideoarchive.py","yt_dlp/extractor/izlesene.py","yt_dlp/extractor/kinja.py","yt_dlp/extractor/koo.py","yt_dlp/extractor/leeco.py","yt_dlp/extractor/livestream.py","yt_dlp/extractor/lynda.py","yt_dlp/extractor/microsoftstream.py","yt_dlp/extractor/minoto.py","yt_dlp/extractor/mojvideo.py","yt_dlp/extractor/motherless.py","yt_dlp/extractor/moview.py","yt_dlp/extractor/moviezine.py","yt_dlp/extractor/musicdex.py","yt_dlp/extractor/nationalgeographic.py","yt_dlp/extractor/naver.py","yt_dlp/extractor/nerdcubed.py","yt_dlp/extractor/netverse.py","yt_dlp/extractor/nuum.py","yt_dlp/extractor/onionstudios.py","yt_dlp/extractor/ora.py","yt_dlp/extractor/piramidetv.py","yt_dlp/extractor/planetmarathi.py","yt_dlp/extractor/playplustv.py","yt_dlp/extractor/playwire.py","yt_dlp/extractor/plvideo.py","yt_dlp/extractor/prosiebensat1.py","yt_dlp/extractor/puls4.py","yt_dlp/extractor/radiocomercial.py","yt_dlp/extractor/redge.py","yt_dlp/extractor/rheinmaintv.py","yt_dlp/extractor/rmcdecouverte.py","yt_dlp/extractor/sejmpl.py","yt_dlp/extractor/sendtonews.py","yt_dlp/extractor/sharevideos.py","yt_dlp/extractor/snotr.py","yt_dlp/extractor/springboardplatform.py","yt_dlp/extractor/stanfordoc.py","yt_dlp/extractor/stitcher.py","yt_dlp/extractor/stretchinternet.py","yt_dlp/extractor/swearnet.py","yt_dlp/extractor/syvdk.py","yt_dlp/extractor/tempo.py","yt_dlp/extractor/theholetv.py","yt_dlp/extractor/traileraddict.py","yt_dlp/extractor/triller.py","yt_dlp/extractor/tvplayer.py","yt_dlp/extractor/ufctv.py","yt_dlp/extractor/uktvplay.py","yt_dlp/extractor/unsupported.py","yt_dlp/extractor/utreon.py","yt_dlp/extractor/vgtv.py","yt_dlp/extractor/videodetective.py","yt_dlp/extractor/videofyme.py","yt_dlp/extractor/videoken.py","yt_dlp/extractor/videomore.py","yt_dlp/extractor/vimm.py","yt_dlp/extractor/vodpl.py","yt_dlp/extractor/vuclip.py","yt_dlp/extractor/vvvvid.py","yt_dlp/extractor/wdr.py","yt_dlp/extractor/weyyak.py","yt_dlp/extractor/xstream.py","yt_dlp/extractor/zee5.py"],"solution_diff":"diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py\nindex 1a29a93edaf8..f47a36099a12 100644\n--- a/yt_dlp/extractor/_extractors.py\n+++ b/yt_dlp/extractor/_extractors.py\n@@ -54,7 +54,6 @@\n WyborczaPodcastIE,\n WyborczaVideoIE,\n )\n-from .airtv import AirTVIE\n from .aitube import AitubeKZVideoIE\n from .alibaba import AlibabaIE\n from .aliexpress import AliExpressLiveIE\n@@ -65,10 +64,6 @@\n AllstarProfileIE,\n )\n from .alphaporno import AlphaPornoIE\n-from .alsace20tv import (\n- Alsace20TVEmbedIE,\n- Alsace20TVIE,\n-)\n from .altcensored import (\n AltCensoredChannelIE,\n AltCensoredIE,\n@@ -93,7 +88,6 @@\n AmericasTestKitchenIE,\n AmericasTestKitchenSeasonIE,\n )\n-from .anchorfm import AnchorFMEpisodeIE\n from .angel import AngelIE\n from .antenna import (\n Ant1NewsGrArticleIE,\n@@ -106,10 +100,6 @@\n from .aparat import AparatIE\n from .appleconnect import AppleConnectIE\n from .applepodcasts import ApplePodcastsIE\n-from .appletrailers import (\n- AppleTrailersIE,\n- AppleTrailersSectionIE,\n-)\n from .archiveorg import (\n ArchiveOrgIE,\n YoutubeWebArchiveIE,\n@@ -140,7 +130,6 @@\n from .asobistage import AsobiStageIE\n from .atresplayer import AtresPlayerIE\n from .atscaleconf import AtScaleConfEventIE\n-from .atvat import ATVAtIE\n from .audimedia import AudiMediaIE\n from .audioboom import AudioBoomIE\n from .audiodraft import (\n@@ -157,13 +146,6 @@\n AudiusProfileIE,\n AudiusTrackIE,\n )\n-from .awaan import (\n- AWAANIE,\n- AWAANLiveIE,\n- AWAANSeasonIE,\n- AWAANVideoIE,\n-)\n-from .axs import AxsIE\n from .azmedien import AZMedienIE\n from .baidu import BaiduVideoIE\n from .banbye import (\n@@ -190,10 +172,6 @@\n BBCCoUkPlaylistIE,\n )\n from .beacon import BeaconTvIE\n-from .beatbump import (\n- BeatBumpPlaylistIE,\n- BeatBumpVideoIE,\n-)\n from .beatport import BeatportIE\n from .beeg import BeegIE\n from .behindkink import BehindKinkIE\n@@ -210,7 +188,6 @@\n BibelTVSeriesIE,\n BibelTVVideoIE,\n )\n-from .bigflix import BigflixIE\n from .bigo import BigoIE\n from .bild import BildIE\n from .bilibili import (\n@@ -255,7 +232,6 @@\n from .blogger import BloggerIE\n from .bloomberg import BloombergIE\n from .bluesky import BlueskyIE\n-from .bokecc import BokeCCIE\n from .bongacams import BongaCamsIE\n from .boosty import BoostyIE\n from .bostonglobe import BostonGlobeIE\n@@ -288,14 +264,8 @@\n from .buzzfeed import BuzzFeedIE\n from .byutv import BYUtvIE\n from .c56 import C56IE\n-from .caffeinetv import CaffeineTVIE\n-from .callin import CallinIE\n from .caltrans import CaltransIE\n from .cam4 import CAM4IE\n-from .camdemy import (\n- CamdemyFolderIE,\n- CamdemyIE,\n-)\n from .camfm import (\n CamFMEpisodeIE,\n CamFMShowIE,\n@@ -371,7 +341,6 @@\n from .ciscowebex import CiscoWebexIE\n from .cjsw import CJSWIE\n from .clipchamp import ClipchampIE\n-from .clippit import ClippitIE\n from .cliprs import ClipRsIE\n from .closertotruth import CloserToTruthIE\n from .cloudflarestream import CloudflareStreamIE\n@@ -395,7 +364,6 @@\n ViewSourceIE,\n )\n from .condenast import CondeNastIE\n-from .contv import CONtvIE\n from .corus import CorusIE\n from .coub import CoubIE\n from .cozytv import CozyTVIE\n@@ -510,7 +478,6 @@\n )\n from .drbonanza import DRBonanzaIE\n from .dreisat import DreiSatIE\n-from .drooble import DroobleIE\n from .dropbox import DropboxIE\n from .dropout import (\n DropoutIE,\n@@ -525,10 +492,6 @@\n DRTVSeriesIE,\n )\n from .dtube import DTubeIE\n-from .duboku import (\n- DubokuIE,\n- DubokuPlaylistIE,\n-)\n from .dumpert import DumpertIE\n from .duoplay import DuoplayIE\n from .dvtv import DVTVIE\n@@ -546,8 +509,6 @@\n EggsArtistIE,\n EggsIE,\n )\n-from .eighttracks import EightTracksIE\n-from .eitb import EitbIE\n from .elementorembed import ElementorEmbedIE\n from .elonet import ElonetIE\n from .elpais import ElPaisIE\n@@ -591,7 +552,6 @@\n from .eurosport import EurosportIE\n from .euscreen import EUScreenIE\n from .expressen import ExpressenIE\n-from .eyedotv import EyedoTVIE\n from .facebook import (\n FacebookAdsIE,\n FacebookIE,\n@@ -655,7 +615,6 @@\n from .foxsports import FoxSportsIE\n from .fptplay import FptplayIE\n from .francaisfacile import FrancaisFacileIE\n-from .franceinter import FranceInterIE\n from .francetv import (\n FranceTVIE,\n FranceTVInfoIE,\n@@ -672,14 +631,10 @@\n FrontendMastersIE,\n FrontendMastersLessonIE,\n )\n-from .fujitv import FujiTVFODPlus7IE\n from .funk import FunkIE\n from .funker530 import Funker530IE\n from .fuyintv import FuyinTVIE\n-from .gab import (\n- GabIE,\n- GabTVIE,\n-)\n+from .gab import GabIE\n from .gaia import GaiaIE\n from .gamedevtv import GameDevTVDashboardIE\n from .gamejolt import (\n@@ -743,16 +698,10 @@\n GoogleDriveFolderIE,\n GoogleDriveIE,\n )\n-from .googlepodcasts import (\n- GooglePodcastsFeedIE,\n- GooglePodcastsIE,\n-)\n from .googlesearch import GoogleSearchIE\n from .goplay import GoPlayIE\n from .gopro import GoProIE\n-from .goshgay import GoshgayIE\n from .gotostage import GoToStageIE\n-from .gputechconf import GPUTechConfIE\n from .graspop import GraspopIE\n from .gronkh import (\n GronkhFeedIE,\n@@ -769,7 +718,6 @@\n from .hidive import HiDiveIE\n from .historicfilms import HistoricFilmsIE\n from .hitrecord import HitRecordIE\n-from .hketv import HKETVIE\n from .hollywoodreporter import (\n HollywoodReporterIE,\n HollywoodReporterPlaylistIE,\n@@ -818,7 +766,6 @@\n IdagioRecordingIE,\n IdagioTrackIE,\n )\n-from .idolplus import IdolPlusIE\n from .ign import (\n IGNIE,\n IGNArticleIE,\n@@ -851,7 +798,6 @@\n InstagramUserIE,\n )\n from .internazionale import InternazionaleIE\n-from .internetvideoarchive import InternetVideoArchiveIE\n from .iprima import (\n IPrimaCNNIE,\n IPrimaIE,\n@@ -886,7 +832,6 @@\n IwaraUserIE,\n )\n from .ixigua import IxiguaIE\n-from .izlesene import IzleseneIE\n from .jamendo import (\n JamendoAlbumIE,\n JamendoIE,\n@@ -939,11 +884,9 @@\n KikaIE,\n KikaPlaylistIE,\n )\n-from .kinja import KinjaEmbedIE\n from .kinopoisk import KinoPoiskIE\n from .kommunetv import KommunetvIE\n from .kompas import KompasVideoIE\n-from .koo import KooIE\n from .krasview import KrasViewIE\n from .kth import KTHIE\n from .ku6 import Ku6IE\n@@ -991,7 +934,6 @@\n from .leeco import (\n LeIE,\n LePlaylistIE,\n- LetvCloudIE,\n )\n from .lefigaro import (\n LeFigaroVideoEmbedIE,\n@@ -1020,11 +962,6 @@\n from .listennotes import ListenNotesIE\n from .litv import LiTVIE\n from .livejournal import LiveJournalIE\n-from .livestream import (\n- LivestreamIE,\n- LivestreamOriginalIE,\n- LivestreamShortenerIE,\n-)\n from .livestreamfails import LivestreamfailsIE\n from .lnk import LnkIE\n from .locipo import (\n@@ -1048,10 +985,6 @@\n LSMReplayIE,\n )\n from .lumni import LumniIE\n-from .lynda import (\n- LyndaCourseIE,\n- LyndaIE,\n-)\n from .maariv import MaarivIE\n from .magellantv import MagellanTVIE\n from .magentamusik import MagentaMusikIE\n@@ -1117,13 +1050,11 @@\n MicrosoftLearnSessionIE,\n MicrosoftMediusIE,\n )\n-from .microsoftstream import MicrosoftStreamIE\n from .minds import (\n MindsChannelIE,\n MindsGroupIE,\n MindsIE,\n )\n-from .minoto import MinotoIE\n from .mir24tv import Mir24TvIE\n from .mirrativ import (\n MirrativIE,\n@@ -1157,18 +1088,9 @@\n from .mlssoccer import MLSSoccerIE\n from .mocha import MochaVideoIE\n from .mojevideo import MojevideoIE\n-from .mojvideo import MojvideoIE\n from .monstercat import MonstercatIE\n-from .motherless import (\n- MotherlessGalleryIE,\n- MotherlessGroupIE,\n- MotherlessIE,\n- MotherlessUploaderIE,\n-)\n from .motorsport import MotorsportIE\n from .moviepilot import MoviepilotIE\n-from .moview import MoviewPlayIE\n-from .moviezine import MoviezineIE\n from .movingimage import MovingImageIE\n from .msn import MSNIE\n from .mtv import MTVIE\n@@ -1179,12 +1101,6 @@\n )\n from .museai import MuseAIIE\n from .musescore import MuseScoreIE\n-from .musicdex import (\n- MusicdexAlbumIE,\n- MusicdexArtistIE,\n- MusicdexPlaylistIE,\n- MusicdexSongIE,\n-)\n from .mux import MuxIE\n from .mx3 import (\n Mx3IE,\n@@ -1212,14 +1128,10 @@\n NateIE,\n NateProgramIE,\n )\n-from .nationalgeographic import (\n- NationalGeographicTVIE,\n- NationalGeographicVideoIE,\n-)\n+from .nationalgeographic import NationalGeographicTVIE\n from .naver import (\n NaverIE,\n NaverLiveIE,\n- NaverNowIE,\n )\n from .nba import (\n NBAIE,\n@@ -1257,7 +1169,6 @@\n NebulaSubscriptionsIE,\n )\n from .nekohacker import NekoHackerIE\n-from .nerdcubed import NerdCubedFeedIE\n from .nest import (\n NestClipIE,\n NestIE,\n@@ -1275,11 +1186,6 @@\n NetEaseMusicProgramIE,\n NetEaseMusicSingerIE,\n )\n-from .netverse import (\n- NetverseIE,\n- NetversePlaylistIE,\n- NetverseSearchIE,\n-)\n from .netzkino import NetzkinoIE\n from .newgrounds import (\n NewgroundsIE,\n@@ -1389,11 +1295,6 @@\n from .ntvde import NTVDeIE\n from .ntvru import NTVRuIE\n from .nubilesporn import NubilesPornIE\n-from .nuum import (\n- NuumLiveIE,\n- NuumMediaIE,\n- NuumTabIE,\n-)\n from .nuvid import NuvidIE\n from .nytimes import (\n NYTimesArticleIE,\n@@ -1426,7 +1327,6 @@\n OnetMVPIE,\n OnetPlIE,\n )\n-from .onionstudios import OnionStudiosIE\n from .onsen import OnsenIE\n from .opencast import (\n OpencastIE,\n@@ -1437,7 +1337,6 @@\n OpenRecIE,\n OpenRecMovieIE,\n )\n-from .ora import OraTVIE\n from .orf import (\n ORFIPTVIE,\n ORFONIE,\n@@ -1511,26 +1410,18 @@\n PinterestCollectionIE,\n PinterestIE,\n )\n-from .piramidetv import (\n- PiramideTVChannelIE,\n- PiramideTVIE,\n-)\n-from .planetmarathi import PlanetMarathiIE\n from .platzi import (\n PlatziCourseIE,\n PlatziIE,\n )\n from .playerfm import PlayerFmIE\n-from .playplustv import PlayPlusTVIE\n from .playsuisse import PlaySuisseIE\n from .playtvak import PlaytvakIE\n-from .playwire import PlaywireIE\n from .pluralsight import (\n PluralsightCourseIE,\n PluralsightIE,\n )\n from .plutotv import PlutoTVIE\n-from .plvideo import PlVideoIE\n from .plyr import PlyrEmbedIE\n from .podbayfm import (\n PodbayFMChannelIE,\n@@ -1574,7 +1465,6 @@\n from .premiershiprugby import PremiershipRugbyIE\n from .presstv import PressTVIE\n from .projectveritas import ProjectVeritasIE\n-from .prosiebensat1 import ProSiebenSat1IE\n from .prx import (\n PRXAccountIE,\n PRXSeriesIE,\n@@ -1586,7 +1476,6 @@\n PuhuTVIE,\n PuhuTVSerieIE,\n )\n-from .puls4 import Puls4IE\n from .pyvideo import PyvideoIE\n from .qdance import QDanceIE\n from .qingting import QingTingIE\n@@ -1610,10 +1499,6 @@\n RadioCanadaAudioVideoIE,\n RadioCanadaIE,\n )\n-from .radiocomercial import (\n- RadioComercialIE,\n- RadioComercialPlaylistIE,\n-)\n from .radiode import RadioDeIE\n from .radiofrance import (\n FranceCultureIE,\n@@ -1678,7 +1563,6 @@\n RedBullTVRrnContentIE,\n )\n from .reddit import RedditIE\n-from .redge import RedCDNLivxIE\n from .redgifs import (\n RedGifsIE,\n RedGifsSearchIE,\n@@ -1692,13 +1576,11 @@\n from .restudy import RestudyIE\n from .reuters import ReutersIE\n from .reverbnation import ReverbNationIE\n-from .rheinmaintv import RheinMainTVIE\n from .ridehome import RideHomeIE\n from .rinsefm import (\n RinseFMArtistPlaylistIE,\n RinseFMIE,\n )\n-from .rmcdecouverte import RMCDecouverteIE\n from .rockstargames import RockstarGamesIE\n from .rokfin import (\n RokfinChannelIE,\n@@ -1815,7 +1697,6 @@\n SenateGovIE,\n SenateISVPIE,\n )\n-from .sendtonews import SendtoNewsIE\n from .servus import ServusIE\n from .sevenplus import SevenPlusIE\n from .sexu import SexuIE\n@@ -1828,7 +1709,6 @@\n ShahidShowIE,\n )\n from .sharepoint import SharePointIE\n-from .sharevideos import ShareVideosEmbedIE\n from .shemaroome import ShemarooMeIE\n from .shiey import ShieyIE\n from .showroomlive import ShowRoomLiveIE\n@@ -1873,7 +1753,6 @@\n SmotrimPlaylistIE,\n )\n from .snapchat import SnapchatSpotlightIE\n-from .snotr import SnotrIE\n from .softwhiteunderbelly import SoftWhiteUnderbellyIE\n from .sohu import (\n SohuIE,\n@@ -1923,7 +1802,6 @@\n SpreakerIE,\n SpreakerShowIE,\n )\n-from .springboardplatform import SpringboardPlatformIE\n from .sproutvideo import (\n SproutVideoIE,\n VidsIoIE,\n@@ -1940,7 +1818,6 @@\n TheaterComplexTownVODIE,\n )\n from .stageplus import StagePlusVODConcertIE\n-from .stanfordoc import StanfordOpenClassroomIE\n from .startrek import StarTrekIE\n from .startv import StarTVIE\n from .steam import (\n@@ -1948,10 +1825,6 @@\n SteamCommunityIE,\n SteamIE,\n )\n-from .stitcher import (\n- StitcherIE,\n- StitcherShowIE,\n-)\n from .storyfire import (\n StoryFireIE,\n StoryFireSeriesIE,\n@@ -1961,7 +1834,6 @@\n from .streamable import StreamableIE\n from .streamcz import StreamCZIE\n from .streetvoice import StreetVoiceIE\n-from .stretchinternet import StretchInternetIE\n from .stripchat import StripchatIE\n from .stv import STVPlayerIE\n from .subsplash import (\n@@ -1979,8 +1851,6 @@\n SVTPlayIE,\n SVTSeriesIE,\n )\n-from .swearnet import SwearnetEpisodeIE\n-from .syvdk import SYVDKIE\n from .sztvhu import SztvHuIE\n from .tagesschau import TagesschauIE\n from .taptap import (\n@@ -2039,10 +1909,6 @@\n )\n from .teletask import TeleTaskIE\n from .telewebion import TelewebionIE\n-from .tempo import (\n- IVXPlayerIE,\n- TempoIE,\n-)\n from .tencent import (\n IflixEpisodeIE,\n IflixSeriesIE,\n@@ -2068,7 +1934,6 @@\n TheGuardianPodcastPlaylistIE,\n )\n from .thehighwire import TheHighWireIE\n-from .theholetv import TheHoleTvIE\n from .theintercept import TheInterceptIE\n from .theplatform import (\n ThePlatformFeedIE,\n@@ -2120,12 +1985,6 @@\n ToypicsIE,\n ToypicsUserIE,\n )\n-from .traileraddict import TrailerAddictIE\n-from .triller import (\n- TrillerIE,\n- TrillerShortIE,\n- TrillerUserIE,\n-)\n from .trovo import (\n TrovoChannelClipIE,\n TrovoChannelVodIE,\n@@ -2208,7 +2067,6 @@\n TVPlayHomeIE,\n TVPlayIE,\n )\n-from .tvplayer import TVPlayerIE\n from .tvw import (\n TvwIE,\n TvwNewsIE,\n@@ -2248,12 +2106,8 @@\n UdemyIE,\n )\n from .udn import UDNEmbedIE\n-from .ufctv import (\n- UFCTVIE,\n- UFCArabiaIE,\n-)\n+from .ufctv import UFCTVIE\n from .ukcolumn import UkColumnIE\n-from .uktvplay import UKTVPlayIE\n from .uliza import (\n UlizaPlayerIE,\n UlizaPortalIE,\n@@ -2283,7 +2137,6 @@\n UstudioEmbedIE,\n UstudioIE,\n )\n-from .utreon import UtreonIE\n from .varzesh3 import Varzesh3IE\n from .vbox7 import Vbox7IE\n from .veo import VeoIE\n@@ -2308,20 +2161,7 @@\n VideocampusSachsenIE,\n ViMPPlaylistIE,\n )\n-from .videodetective import VideoDetectiveIE\n-from .videofyme import VideofyMeIE\n-from .videoken import (\n- VideoKenCategoryIE,\n- VideoKenIE,\n- VideoKenPlayerIE,\n- VideoKenPlaylistIE,\n- VideoKenTopicIE,\n-)\n-from .videomore import (\n- VideomoreIE,\n- VideomoreSeasonIE,\n- VideomoreVideoIE,\n-)\n+from .videoken import VideoKenPlayerIE\n from .videopress import VideoPressIE\n from .vidflex import VidflexIE\n from .vidio import (\n@@ -2351,10 +2191,6 @@\n VimeoUserIE,\n VimeoWatchLaterIE,\n )\n-from .vimm import (\n- VimmIE,\n- VimmRecordingIE,\n-)\n from .viously import ViouslyIE\n from .viqeo import ViqeoIE\n from .visir import VisirIE\n@@ -2372,7 +2208,6 @@\n VKWallPostIE,\n )\n from .vocaroo import VocarooIE\n-from .vodpl import VODPlIE\n from .vodplatform import VODPlatformIE\n from .voicy import (\n VoicyChannelIE,\n@@ -2404,11 +2239,6 @@\n VTVIE,\n VTVGoIE,\n )\n-from .vuclip import VuClipIE\n-from .vvvvid import (\n- VVVVIDIE,\n- VVVVIDShowIE,\n-)\n from .walla import WallaIE\n from .washingtonpost import (\n WashingtonPostArticleIE,\n@@ -2418,7 +2248,6 @@\n from .wdr import (\n WDRIE,\n WDRElefantIE,\n- WDRMobileIE,\n WDRPageIE,\n )\n from .webcamerapl import WebcameraplIE\n@@ -2445,7 +2274,6 @@\n WeverseMomentIE,\n )\n from .wevidi import WeVidiIE\n-from .weyyak import WeyyakIE\n from .whowatch import WhoWatchIE\n from .whyp import WhypIE\n from .wikimedia import WikimediaIE\n@@ -2494,7 +2322,6 @@\n from .xinpianchang import XinpianchangIE\n from .xminus import XMinusIE\n from .xnxx import XNXXIE\n-from .xstream import XstreamIE\n from .xvideos import (\n XVideosIE,\n XVideosQuickiesIE,\n@@ -2618,10 +2445,6 @@\n ZDFIE,\n ZDFChannelIE,\n )\n-from .zee5 import (\n- Zee5IE,\n- Zee5SeriesIE,\n-)\n from .zeenews import ZeeNewsIE\n from .zenporn import ZenPornIE\n from .zetland import ZetlandDKArticleIE\ndiff --git a/yt_dlp/extractor/airtv.py b/yt_dlp/extractor/airtv.py\ndeleted file mode 100644\nindex cee660dfcf41..000000000000\n--- a/yt_dlp/extractor/airtv.py\n+++ /dev/null\n@@ -1,96 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import (\n- determine_ext,\n- int_or_none,\n- mimetype2ext,\n- parse_iso8601,\n- traverse_obj,\n-)\n-\n-\n-class AirTVIE(InfoExtractor):\n- _VALID_URL = r'https?://www\\.air\\.tv/watch\\?v=(?P<id>\\w+)'\n- _TESTS = [{\n- # without youtube_id\n- 'url': 'https://www.air.tv/watch?v=W87jcWleSn2hXZN47zJZsQ',\n- 'info_dict': {\n- 'id': 'W87jcWleSn2hXZN47zJZsQ',\n- 'ext': 'mp4',\n- 'release_date': '20221003',\n- 'release_timestamp': 1664792603,\n- 'channel_id': 'vgfManQlRQKgoFQ8i8peFQ',\n- 'title': 'md5:c12d49ed367c3dadaa67659aff43494c',\n- 'upload_date': '20221003',\n- 'duration': 151,\n- 'view_count': int,\n- 'thumbnail': 'https://cdn-sp-gcs.air.tv/videos/W/8/W87jcWleSn2hXZN47zJZsQ/b13fc56464f47d9d62a36d110b9b5a72-4096x2160_9.jpg',\n- 'timestamp': 1664792603,\n- },\n- }, {\n- # with youtube_id\n- 'url': 'https://www.air.tv/watch?v=sv57EC8tRXG6h8dNXFUU1Q',\n- 'info_dict': {\n- 'id': '2ZTqmpee-bQ',\n- 'ext': 'mp4',\n- 'comment_count': int,\n- 'tags': 'count:11',\n- 'channel_follower_count': int,\n- 'like_count': int,\n- 'uploader': 'Newsflare',\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/2ZTqmpee-bQ/maxresdefault.webp',\n- 'availability': 'public',\n- 'title': 'Geese Chase Alligator Across Golf Course',\n- 'uploader_id': 'NewsflareBreaking',\n- 'channel_url': 'https://www.youtube.com/channel/UCzSSoloGEz10HALUAbYhngQ',\n- 'description': 'md5:99b21d9cea59330149efbd9706e208f5',\n- 'age_limit': 0,\n- 'channel_id': 'UCzSSoloGEz10HALUAbYhngQ',\n- 'uploader_url': 'http://www.youtube.com/user/NewsflareBreaking',\n- 'view_count': int,\n- 'categories': ['News & Politics'],\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'channel': 'Newsflare',\n- 'duration': 37,\n- 'upload_date': '20180511',\n- },\n- }]\n-\n- def _get_formats_and_subtitle(self, json_data, video_id):\n- formats, subtitles = [], {}\n- for source in traverse_obj(json_data, 'sources', 'sources_desktop', ...):\n- ext = determine_ext(source.get('src'), mimetype2ext(source.get('type')))\n- if ext == 'm3u8':\n- fmts, subs = self._extract_m3u8_formats_and_subtitles(source.get('src'), video_id)\n- formats.extend(fmts)\n- self._merge_subtitles(subs, target=subtitles)\n- else:\n- formats.append({'url': source.get('src'), 'ext': ext})\n- return formats, subtitles\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['initialState']['videos'][display_id]\n- if nextjs_json.get('youtube_id'):\n- return self.url_result(\n- f'https://www.youtube.com/watch?v={nextjs_json.get(\"youtube_id\")}', YoutubeIE)\n-\n- formats, subtitles = self._get_formats_and_subtitle(nextjs_json, display_id)\n- return {\n- 'id': display_id,\n- 'title': nextjs_json.get('title') or self._html_search_meta('og:title', webpage),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'description': nextjs_json.get('description') or None,\n- 'duration': int_or_none(nextjs_json.get('duration')),\n- 'thumbnails': [\n- {'url': thumbnail}\n- for thumbnail in traverse_obj(nextjs_json, ('default_thumbnails', ...))],\n- 'channel_id': traverse_obj(nextjs_json, 'channel', 'channel_slug'),\n- 'timestamp': parse_iso8601(nextjs_json.get('created')),\n- 'release_timestamp': parse_iso8601(nextjs_json.get('published')),\n- 'view_count': int_or_none(nextjs_json.get('views')),\n- }\ndiff --git a/yt_dlp/extractor/alsace20tv.py b/yt_dlp/extractor/alsace20tv.py\ndeleted file mode 100644\nindex c315e4f21704..000000000000\n--- a/yt_dlp/extractor/alsace20tv.py\n+++ /dev/null\n@@ -1,83 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- dict_get,\n- get_element_by_class,\n- int_or_none,\n- unified_strdate,\n- url_or_none,\n-)\n-\n-\n-class Alsace20TVBaseIE(InfoExtractor):\n- def _extract_video(self, video_id, url=None):\n- info = self._download_json(\n- f'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key={video_id}&habillage=0&mode=html',\n- video_id) or {}\n- title = info.get('titre')\n-\n- formats = []\n- for res, fmt_url in (info.get('files') or {}).items():\n- formats.extend(\n- self._extract_smil_formats(fmt_url, video_id, fatal=False)\n- if '/smil:_' in fmt_url\n- else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))\n-\n- webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''\n- thumbnail = url_or_none(dict_get(info, ('image', 'preview')) or self._og_search_thumbnail(webpage))\n- upload_date = self._search_regex(r'/(\\d{6})_', thumbnail, 'upload_date', default=None)\n- upload_date = unified_strdate(f'20{upload_date[:2]}-{upload_date[2:4]}-{upload_date[4:]}') if upload_date else None\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'description': clean_html(get_element_by_class('wysiwyg', webpage)),\n- 'upload_date': upload_date,\n- 'thumbnail': thumbnail,\n- 'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),\n- 'view_count': int_or_none(info.get('nb_vues')),\n- }\n-\n-\n-class Alsace20TVIE(Alsace20TVBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?alsace20\\.tv/(?:[\\w-]+/)+[\\w-]+-(?P<id>[\\w]+)'\n- _TESTS = [{\n- 'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',\n- 'info_dict': {\n- 'id': 'lyNHCXpYJh',\n- 'ext': 'mp4',\n- 'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\n- 'upload_date': '20220203',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'duration': 1073,\n- 'view_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self._extract_video(video_id, url)\n-\n-\n-class Alsace20TVEmbedIE(Alsace20TVBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?alsace20\\.tv/emb/(?P<id>[\\w]+)'\n- _TESTS = [{\n- 'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',\n- # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',\n- 'info_dict': {\n- 'id': 'lyNHCXpYJh',\n- 'ext': 'mp4',\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\n- 'upload_date': '20220203',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'view_count': int,\n- },\n- 'params': {\n- 'format': 'bestvideo',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self._extract_video(video_id)\ndiff --git a/yt_dlp/extractor/anchorfm.py b/yt_dlp/extractor/anchorfm.py\ndeleted file mode 100644\nindex 652154a4a821..000000000000\n--- a/yt_dlp/extractor/anchorfm.py\n+++ /dev/null\n@@ -1,98 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- float_or_none,\n- int_or_none,\n- str_or_none,\n- traverse_obj,\n- unified_timestamp,\n-)\n-\n-\n-class AnchorFMEpisodeIE(InfoExtractor):\n- _VALID_URL = r'https?://anchor\\.fm/(?P<channel_name>\\w+)/(?:embed/)?episodes/[\\w-]+-(?P<episode_id>\\w+)'\n- _EMBED_REGEX = [rf'<iframe[^>]+\\bsrc=[\\'\"](?P<url>{_VALID_URL})']\n- _TESTS = [{\n- 'url': 'https://anchor.fm/lovelyti/episodes/Chrisean-Rock-takes-to-twitter-to-announce-shes-pregnant--Blueface-denies-he-is-the-father-e1tpt3d',\n- 'info_dict': {\n- 'id': 'e1tpt3d',\n- 'ext': 'mp3',\n- 'title': ' Chrisean Rock takes to twitter to announce she\\'s pregnant, Blueface denies he is the father!',\n- 'description': 'md5:207d167de3e28ceb4ddc1ebf5a30044c',\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_nologo/1034827/1034827-1658438968460-5f3bfdf3601e8.jpg',\n- 'duration': 624.718,\n- 'uploader': 'Lovelyti ',\n- 'uploader_id': '991541',\n- 'channel': 'lovelyti',\n- 'modified_date': '20230121',\n- 'modified_timestamp': 1674285178,\n- 'release_date': '20230121',\n- 'release_timestamp': 1674285179,\n- 'episode_id': 'e1tpt3d',\n- },\n- }, {\n- # embed url\n- 'url': 'https://anchor.fm/apakatatempo/embed/episodes/S2E75-Perang-Bintang-di-Balik-Kasus-Ferdy-Sambo-dan-Ismail-Bolong-e1shjqd',\n- 'info_dict': {\n- 'id': 'e1shjqd',\n- 'ext': 'mp3',\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\n- 'duration': 1042.008,\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\n- 'release_date': '20221221',\n- 'release_timestamp': 1671595916,\n- 'modified_date': '20221221',\n- 'modified_timestamp': 1671590834,\n- 'channel': 'apakatatempo',\n- 'uploader': 'Podcast Tempo',\n- 'uploader_id': '2585461',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- 'episode_id': 'e1shjqd',\n- },\n- }]\n-\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://podcast.tempo.co/podcast/192/perang-bintang-di-balik-kasus-ferdy-sambo-dan-ismail-bolong',\n- 'info_dict': {\n- 'id': 'e1shjqd',\n- 'ext': 'mp3',\n- 'release_date': '20221221',\n- 'duration': 1042.008,\n- 'season': 'Season 2',\n- 'modified_timestamp': 1671590834,\n- 'uploader_id': '2585461',\n- 'modified_date': '20221221',\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\n- 'season_number': 2,\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\n- 'release_timestamp': 1671595916,\n- 'episode_id': 'e1shjqd',\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\n- 'uploader': 'Podcast Tempo',\n- 'channel': 'apakatatempo',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- channel_name, episode_id = self._match_valid_url(url).group('channel_name', 'episode_id')\n- api_data = self._download_json(f'https://anchor.fm/api/v3/episodes/{episode_id}', episode_id)\n-\n- return {\n- 'id': episode_id,\n- 'title': traverse_obj(api_data, ('episode', 'title')),\n- 'url': traverse_obj(api_data, ('episode', 'episodeEnclosureUrl'), ('episodeAudios', 0, 'url')),\n- 'ext': 'mp3',\n- 'vcodec': 'none',\n- 'thumbnail': traverse_obj(api_data, ('episode', 'episodeImage')),\n- 'description': clean_html(traverse_obj(api_data, ('episode', ('description', 'descriptionPreview')), get_all=False)),\n- 'duration': float_or_none(traverse_obj(api_data, ('episode', 'duration')), 1000),\n- 'modified_timestamp': unified_timestamp(traverse_obj(api_data, ('episode', 'modified'))),\n- 'release_timestamp': int_or_none(traverse_obj(api_data, ('episode', 'publishOnUnixTimestamp'))),\n- 'episode_id': episode_id,\n- 'uploader': traverse_obj(api_data, ('creator', 'name')),\n- 'uploader_id': str_or_none(traverse_obj(api_data, ('creator', 'userId'))),\n- 'season_number': int_or_none(traverse_obj(api_data, ('episode', 'podcastSeasonNumber'))),\n- 'channel': channel_name or traverse_obj(api_data, ('creator', 'vanitySlug')),\n- }\ndiff --git a/yt_dlp/extractor/appletrailers.py b/yt_dlp/extractor/appletrailers.py\ndeleted file mode 100644\nindex 0a600f6df91a..000000000000\n--- a/yt_dlp/extractor/appletrailers.py\n+++ /dev/null\n@@ -1,277 +0,0 @@\n-import json\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_duration,\n- unified_strdate,\n-)\n-\n-\n-class AppleTrailersIE(InfoExtractor):\n- IE_NAME = 'appletrailers'\n- _VALID_URL = r'https?://(?:www\\.|movie)?trailers\\.apple\\.com/(?:trailers|ca)/(?P<company>[^/]+)/(?P<movie>[^/]+)'\n- _TESTS = [{\n- 'url': 'http://trailers.apple.com/trailers/wb/manofsteel/',\n- 'info_dict': {\n- 'id': '5111',\n- 'title': 'Man of Steel',\n- },\n- 'playlist': [\n- {\n- 'md5': 'd97a8e575432dbcb81b7c3acb741f8a8',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer4',\n- 'ext': 'mov',\n- 'duration': 111,\n- 'title': 'Trailer 4',\n- 'upload_date': '20130523',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': 'b8017b7131b721fb4e8d6f49e1df908c',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer3',\n- 'ext': 'mov',\n- 'duration': 182,\n- 'title': 'Trailer 3',\n- 'upload_date': '20130417',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': 'd0f1e1150989b9924679b441f3404d48',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer',\n- 'ext': 'mov',\n- 'duration': 148,\n- 'title': 'Trailer',\n- 'upload_date': '20121212',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': '5fe08795b943eb2e757fa95cb6def1cb',\n- 'info_dict': {\n- 'id': 'manofsteel-teaser',\n- 'ext': 'mov',\n- 'duration': 93,\n- 'title': 'Teaser',\n- 'upload_date': '20120721',\n- 'uploader_id': 'wb',\n- },\n- },\n- ],\n- }, {\n- 'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',\n- 'info_dict': {\n- 'id': '4489',\n- 'title': 'Blackthorn',\n- },\n- 'playlist_mincount': 2,\n- 'expected_warnings': ['Unable to download JSON metadata'],\n- }, {\n- # json data only available from http://trailers.apple.com/trailers/feeds/data/15881.json\n- 'url': 'http://trailers.apple.com/trailers/fox/kungfupanda3/',\n- 'info_dict': {\n- 'id': '15881',\n- 'title': 'Kung Fu Panda 3',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- 'url': 'http://trailers.apple.com/ca/metropole/autrui/',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://movietrailers.apple.com/trailers/focus_features/kuboandthetwostrings/',\n- 'only_matching': True,\n- }]\n-\n- _JSON_RE = r'iTunes.playURL\\((.*?)\\);'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- movie = mobj.group('movie')\n- uploader_id = mobj.group('company')\n-\n- webpage = self._download_webpage(url, movie)\n- film_id = self._search_regex(r\"FilmId\\s*=\\s*'(\\d+)'\", webpage, 'film id')\n- film_data = self._download_json(\n- f'http://trailers.apple.com/trailers/feeds/data/{film_id}.json',\n- film_id, fatal=False)\n-\n- if film_data:\n- entries = []\n- for clip in film_data.get('clips', []):\n- clip_title = clip['title']\n-\n- formats = []\n- for version, version_data in clip.get('versions', {}).items():\n- for size, size_data in version_data.get('sizes', {}).items():\n- src = size_data.get('src')\n- if not src:\n- continue\n- formats.append({\n- 'format_id': f'{version}-{size}',\n- 'url': re.sub(r'_(\\d+p\\.mov)', r'_h\\1', src),\n- 'width': int_or_none(size_data.get('width')),\n- 'height': int_or_none(size_data.get('height')),\n- 'language': version[:2],\n- })\n-\n- entries.append({\n- 'id': movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', clip_title).lower(),\n- 'formats': formats,\n- 'title': clip_title,\n- 'thumbnail': clip.get('screen') or clip.get('thumb'),\n- 'duration': parse_duration(clip.get('runtime') or clip.get('faded')),\n- 'upload_date': unified_strdate(clip.get('posted')),\n- 'uploader_id': uploader_id,\n- })\n-\n- page_data = film_data.get('page', {})\n- return self.playlist_result(entries, film_id, page_data.get('movie_title'))\n-\n- playlist_url = urllib.parse.urljoin(url, 'includes/playlists/itunes.inc')\n-\n- def fix_html(s):\n- s = re.sub(r'(?s)<script[^<]*?>.*?</script>', '', s)\n- s = re.sub(r'<img ([^<]*?)/?>', r'<img \\1/>', s)\n- # The ' in the onClick attributes are not escaped, it couldn't be parsed\n- # like: http://trailers.apple.com/trailers/wb/gravity/\n-\n- def _clean_json(m):\n- return 'iTunes.playURL({});'.format(m.group(1).replace('\\'', '''))\n- s = re.sub(self._JSON_RE, _clean_json, s)\n- return f'<html>{s}</html>'\n- doc = self._download_xml(playlist_url, movie, transform_source=fix_html)\n-\n- playlist = []\n- for li in doc.findall('./div/ul/li'):\n- on_click = li.find('.//a').attrib['onClick']\n- trailer_info_json = self._search_regex(self._JSON_RE,\n- on_click, 'trailer info')\n- trailer_info = json.loads(trailer_info_json)\n- first_url = trailer_info.get('url')\n- if not first_url:\n- continue\n- title = trailer_info['title']\n- video_id = movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', title).lower()\n- thumbnail = li.find('.//img').attrib['src']\n- upload_date = trailer_info['posted'].replace('-', '')\n-\n- runtime = trailer_info['runtime']\n- m = re.search(r'(?P<minutes>[0-9]+):(?P<seconds>[0-9]{1,2})', runtime)\n- duration = None\n- if m:\n- duration = 60 * int(m.group('minutes')) + int(m.group('seconds'))\n-\n- trailer_id = first_url.split('/')[-1].rpartition('_')[0].lower()\n- settings_json_url = urllib.parse.urljoin(url, f'includes/settings/{trailer_id}.json')\n- settings = self._download_json(settings_json_url, trailer_id, 'Downloading settings json')\n-\n- formats = []\n- for fmt in settings['metadata']['sizes']:\n- # The src is a file pointing to the real video file\n- format_url = re.sub(r'_(\\d*p\\.mov)', r'_h\\1', fmt['src'])\n- formats.append({\n- 'url': format_url,\n- 'format': fmt['type'],\n- 'width': int_or_none(fmt['width']),\n- 'height': int_or_none(fmt['height']),\n- })\n-\n- playlist.append({\n- '_type': 'video',\n- 'id': video_id,\n- 'formats': formats,\n- 'title': title,\n- 'duration': duration,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- 'uploader_id': uploader_id,\n- 'http_headers': {\n- 'User-Agent': 'QuickTime compatible (yt-dlp)',\n- },\n- })\n-\n- return {\n- '_type': 'playlist',\n- 'id': movie,\n- 'entries': playlist,\n- }\n-\n-\n-class AppleTrailersSectionIE(InfoExtractor):\n- IE_NAME = 'appletrailers:section'\n- _SECTIONS = {\n- 'justadded': {\n- 'feed_path': 'just_added',\n- 'title': 'Just Added',\n- },\n- 'exclusive': {\n- 'feed_path': 'exclusive',\n- 'title': 'Exclusive',\n- },\n- 'justhd': {\n- 'feed_path': 'just_hd',\n- 'title': 'Just HD',\n- },\n- 'mostpopular': {\n- 'feed_path': 'most_pop',\n- 'title': 'Most Popular',\n- },\n- 'moviestudios': {\n- 'feed_path': 'studios',\n- 'title': 'Movie Studios',\n- },\n- }\n- _VALID_URL = r'https?://(?:www\\.)?trailers\\.apple\\.com/#section=(?P<id>{})'.format('|'.join(_SECTIONS))\n- _TESTS = [{\n- 'url': 'http://trailers.apple.com/#section=justadded',\n- 'info_dict': {\n- 'title': 'Just Added',\n- 'id': 'justadded',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=exclusive',\n- 'info_dict': {\n- 'title': 'Exclusive',\n- 'id': 'exclusive',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=justhd',\n- 'info_dict': {\n- 'title': 'Just HD',\n- 'id': 'justhd',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=mostpopular',\n- 'info_dict': {\n- 'title': 'Most Popular',\n- 'id': 'mostpopular',\n- },\n- 'playlist_mincount': 30,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=moviestudios',\n- 'info_dict': {\n- 'title': 'Movie Studios',\n- 'id': 'moviestudios',\n- },\n- 'playlist_mincount': 80,\n- }]\n-\n- def _real_extract(self, url):\n- section = self._match_id(url)\n- section_data = self._download_json(\n- 'http://trailers.apple.com/trailers/home/feeds/{}.json'.format(self._SECTIONS[section]['feed_path']),\n- section)\n- entries = [\n- self.url_result('http://trailers.apple.com' + e['location'])\n- for e in section_data]\n- return self.playlist_result(entries, section, self._SECTIONS[section]['title'])\ndiff --git a/yt_dlp/extractor/atvat.py b/yt_dlp/extractor/atvat.py\ndeleted file mode 100644\nindex b05eccf182ba..000000000000\n--- a/yt_dlp/extractor/atvat.py\n+++ /dev/null\n@@ -1,107 +0,0 @@\n-import datetime as dt\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- float_or_none,\n- jwt_encode,\n- try_get,\n-)\n-\n-\n-class ATVAtIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?atv\\.at/tv/(?:[^/]+/){2,3}(?P<id>.*)'\n-\n- _TESTS = [{\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/bauer-sucht-frau/bauer-sucht-frau-staffel-18-folge-3-die-hofwochen',\n- 'md5': '3c3b4aaca9f63e32b35e04a9c2515903',\n- 'info_dict': {\n- 'id': 'v-ce9cgn1e70n5-1',\n- 'ext': 'mp4',\n- 'title': 'Bauer sucht Frau - Staffel 18 Folge 3 - Die Hofwochen',\n- },\n- }, {\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/episode-01/bauer-sucht-frau-staffel-18-vorstellungsfolge-1',\n- 'only_matching': True,\n- }]\n-\n- # extracted from bootstrap.js function (search for e.encryption_key and use your browser's debugger)\n- _ACCESS_ID = 'x_atv'\n- _ENCRYPTION_KEY = 'Hohnaekeishoogh2omaeghooquooshia'\n-\n- def _extract_video_info(self, url, content, video):\n- clip_id = content.get('splitId', content['id'])\n- formats = []\n- clip_urls = video['urls']\n- for protocol, variant in clip_urls.items():\n- source_url = try_get(variant, lambda x: x['clear']['url'])\n- if not source_url:\n- continue\n- if protocol == 'dash':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id=protocol, fatal=False))\n- elif protocol == 'hls':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id=protocol, fatal=False))\n- else:\n- formats.append({\n- 'url': source_url,\n- 'format_id': protocol,\n- })\n-\n- return {\n- 'id': clip_id,\n- 'title': content.get('title'),\n- 'duration': float_or_none(content.get('duration')),\n- 'series': content.get('tvShowTitle'),\n- 'formats': formats,\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- json_data = self._parse_json(\n- self._search_regex(r'<script id=\"state\" type=\"text/plain\">(.*)</script>', webpage, 'json_data'),\n- video_id=video_id)\n-\n- video_title = json_data['views']['default']['page']['title']\n- content_resource = json_data['views']['default']['page']['contentResource']\n- content_id = content_resource[0]['id']\n- content_ids = [{'id': id_, 'subclip_start': content['start'], 'subclip_end': content['end']}\n- for id_, content in enumerate(content_resource)]\n-\n- time_of_request = dt.datetime.now()\n- not_before = time_of_request - dt.timedelta(minutes=5)\n- expire = time_of_request + dt.timedelta(minutes=5)\n- payload = {\n- 'content_ids': {\n- content_id: content_ids,\n- },\n- 'secure_delivery': True,\n- 'iat': int(time_of_request.timestamp()),\n- 'nbf': int(not_before.timestamp()),\n- 'exp': int(expire.timestamp()),\n- }\n- videos = self._download_json(\n- 'https://vas-v4.p7s1video.net/4.0/getsources',\n- content_id, 'Downloading videos JSON', query={\n- 'token': jwt_encode(payload, self._ENCRYPTION_KEY, headers={'kid': self._ACCESS_ID}),\n- })\n-\n- video_id, videos_data = next(iter(videos['data'].items()))\n- error_msg = try_get(videos_data, lambda x: x['error']['title'])\n- if error_msg == 'Geo check failed':\n- self.raise_geo_restricted(error_msg)\n- elif error_msg:\n- raise ExtractorError(error_msg)\n- entries = [\n- self._extract_video_info(url, content_resource[video['id']], video)\n- for video in videos_data]\n-\n- return {\n- '_type': 'multi_video',\n- 'id': video_id,\n- 'title': video_title,\n- 'entries': entries,\n- }\ndiff --git a/yt_dlp/extractor/awaan.py b/yt_dlp/extractor/awaan.py\ndeleted file mode 100644\nindex 4066a5a83f2a..000000000000\n--- a/yt_dlp/extractor/awaan.py\n+++ /dev/null\n@@ -1,181 +0,0 @@\n-import base64\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- format_field,\n- int_or_none,\n- parse_iso8601,\n- smuggle_url,\n- unsmuggle_url,\n- urlencode_postdata,\n-)\n-\n-\n-class AWAANIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?show/(?P<show_id>\\d+)/[^/]+(?:/(?P<id>\\d+)/(?P<season_id>\\d+))?'\n-\n- def _real_extract(self, url):\n- show_id, video_id, season_id = self._match_valid_url(url).groups()\n- if video_id and int(video_id) > 0:\n- return self.url_result(\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo')\n- elif season_id and int(season_id) > 0:\n- return self.url_result(smuggle_url(\n- f'http://awaan.ae/program/season/{season_id}',\n- {'show_id': show_id}), 'AWAANSeason')\n- else:\n- return self.url_result(\n- f'http://awaan.ae/program/{show_id}', 'AWAANSeason')\n-\n-\n-class AWAANBaseIE(InfoExtractor):\n- def _parse_video_data(self, video_data, video_id, is_live):\n- title = video_data.get('title_en') or video_data['title_ar']\n- img = video_data.get('img')\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': video_data.get('description_en') or video_data.get('description_ar'),\n- 'thumbnail': format_field(img, None, 'http://admin.mangomolo.com/analytics/%s'),\n- 'duration': int_or_none(video_data.get('duration')),\n- 'timestamp': parse_iso8601(video_data.get('create_time'), ' '),\n- 'is_live': is_live,\n- 'uploader_id': video_data.get('user_id'),\n- }\n-\n-\n-class AWAANVideoIE(AWAANBaseIE):\n- IE_NAME = 'awaan:video'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?(?:video(?:/[^/]+)?|media|catchup/[^/]+/[^/]+)/(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'http://www.dcndigital.ae/#/video/%D8%B1%D8%AD%D9%84%D8%A9-%D8%A7%D9%84%D8%B9%D9%85%D8%B1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/17375',\n- 'md5': '5f61c33bfc7794315c671a62d43116aa',\n- 'info_dict':\n- {\n- 'id': '17375',\n- 'ext': 'mp4',\n- 'title': 'ุฑุญูุฉ ุงูุนู
ุฑ : ุงูุญููุฉ 1',\n- 'description': 'md5:0156e935d870acb8ef0a66d24070c6d6',\n- 'duration': 2041,\n- 'timestamp': 1227504126,\n- 'upload_date': '20081124',\n- 'uploader_id': '71',\n- },\n- }, {\n- 'url': 'http://awaan.ae/video/26723981/%D8%AF%D8%A7%D8%B1-%D8%A7%D9%84%D8%B3%D9%84%D8%A7%D9%85:-%D8%AE%D9%8A%D8%B1-%D8%AF%D9%88%D8%B1-%D8%A7%D9%84%D8%A3%D9%86%D8%B5%D8%A7%D8%B1',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video_data = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/video?id={video_id}',\n- video_id, headers={'Origin': 'http://awaan.ae'})\n- info = self._parse_video_data(video_data, video_id, False)\n-\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' + urllib.parse.urlencode({\n- 'id': video_data['id'],\n- 'user_id': video_data['user_id'],\n- 'signature': video_data['signature'],\n- 'countries': 'Q0M=',\n- 'filter': 'DENY',\n- })\n- info.update({\n- '_type': 'url_transparent',\n- 'url': embed_url,\n- 'ie_key': 'MangomoloVideo',\n- })\n- return info\n-\n-\n-class AWAANLiveIE(AWAANBaseIE):\n- IE_NAME = 'awaan:live'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?live/(?P<id>\\d+)'\n- _TEST = {\n- 'url': 'http://awaan.ae/live/6/dubai-tv',\n- 'info_dict': {\n- 'id': '6',\n- 'ext': 'mp4',\n- 'title': 're:Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- 'upload_date': '20150107',\n- 'timestamp': 1420588800,\n- 'uploader_id': '71',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- channel_id = self._match_id(url)\n-\n- channel_data = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id={channel_id}',\n- channel_id, headers={'Origin': 'http://awaan.ae'})\n- info = self._parse_video_data(channel_data, channel_id, True)\n-\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' + urllib.parse.urlencode({\n- 'id': base64.b64encode(channel_data['user_id'].encode()).decode(),\n- 'channelid': base64.b64encode(channel_data['id'].encode()).decode(),\n- 'signature': channel_data['signature'],\n- 'countries': 'Q0M=',\n- 'filter': 'DENY',\n- })\n- info.update({\n- '_type': 'url_transparent',\n- 'url': embed_url,\n- 'ie_key': 'MangomoloLive',\n- })\n- return info\n-\n-\n-class AWAANSeasonIE(InfoExtractor):\n- IE_NAME = 'awaan:season'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?program/(?:(?P<show_id>\\d+)|season/(?P<season_id>\\d+))'\n- _TEST = {\n- 'url': 'http://dcndigital.ae/#/program/205024/%D9%85%D8%AD%D8%A7%D8%B6%D8%B1%D8%A7%D8%AA-%D8%A7%D9%84%D8%B4%D9%8A%D8%AE-%D8%A7%D9%84%D8%B4%D8%B9%D8%B1%D8%A7%D9%88%D9%8A',\n- 'info_dict':\n- {\n- 'id': '7910',\n- 'title': 'ู
ุญุงุถุฑุงุช ุงูุดูุฎ ุงูุดุนุฑุงูู',\n- },\n- 'playlist_mincount': 27,\n- }\n-\n- def _real_extract(self, url):\n- url, smuggled_data = unsmuggle_url(url, {})\n- show_id, season_id = self._match_valid_url(url).groups()\n-\n- data = {}\n- if season_id:\n- data['season'] = season_id\n- show_id = smuggled_data.get('show_id')\n- if show_id is None:\n- season = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id={season_id}',\n- season_id, headers={'Origin': 'http://awaan.ae'})\n- show_id = season['id']\n- data['show_id'] = show_id\n- show = self._download_json(\n- 'http://admin.mangomolo.com/analytics/index.php/plus/show',\n- show_id, data=urlencode_postdata(data), headers={\n- 'Origin': 'http://awaan.ae',\n- 'Content-Type': 'application/x-www-form-urlencoded',\n- })\n- if not season_id:\n- season_id = show['default_season']\n- for season in show['seasons']:\n- if season['id'] == season_id:\n- title = season.get('title_en') or season['title_ar']\n-\n- entries = []\n- for video in show['videos']:\n- video_id = str(video['id'])\n- entries.append(self.url_result(\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo', video_id))\n-\n- return self.playlist_result(entries, season_id, title)\ndiff --git a/yt_dlp/extractor/axs.py b/yt_dlp/extractor/axs.py\ndeleted file mode 100644\nindex 7e9166771239..000000000000\n--- a/yt_dlp/extractor/axs.py\n+++ /dev/null\n@@ -1,89 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- js_to_json,\n- parse_iso8601,\n- traverse_obj,\n- url_or_none,\n-)\n-\n-\n-class AxsIE(InfoExtractor):\n- IE_NAME = 'axs.tv'\n- _VALID_URL = r'https?://(?:www\\.)?axs\\.tv/(?:channel/(?:[^/?#]+/)+)?video/(?P<id>[^/?#]+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.axs.tv/video/5f4dc776b70e4f1c194f22ef/',\n- 'md5': '8d97736ae8e50c64df528e5e676778cf',\n- 'info_dict': {\n- 'id': '5f4dc776b70e4f1c194f22ef',\n- 'title': 'Small Town',\n- 'ext': 'mp4',\n- 'description': 'md5:e314d28bfaa227a4d7ec965fae19997f',\n- 'upload_date': '20230602',\n- 'timestamp': 1685729564,\n- 'duration': 1284.216,\n- 'series': 'Rock & Roll Road Trip with Sammy Hagar',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- 'episode': '3',\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4e9d330a0c3b295a7e8394',\n- },\n- }, {\n- 'url': 'https://www.axs.tv/channel/rock-star-interview/video/daryl-hall',\n- 'md5': '300ae795cd8f9984652c0949734ffbdc',\n- 'info_dict': {\n- 'id': '5f488148b70e4f392572977c',\n- 'display_id': 'daryl-hall',\n- 'title': 'Daryl Hall',\n- 'ext': 'mp4',\n- 'description': 'md5:e54ecaa0f4b5683fc9259e9e4b196628',\n- 'upload_date': '20230214',\n- 'timestamp': 1676403615,\n- 'duration': 2570.668,\n- 'series': 'The Big Interview with Dan Rather',\n- 'season': 'Season 3',\n- 'season_number': 3,\n- 'episode': '5',\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4d1901f340b50d937cec32',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- webpage_json_data = self._search_json(\n- r'mountObj\\s*=', webpage, 'video ID data', display_id,\n- transform_source=js_to_json)\n- video_id = webpage_json_data['video_id']\n- company_id = webpage_json_data['company_id']\n-\n- meta = self._download_json(\n- f'https://api.myspotlight.tv/dotplayer/video/{company_id}/{video_id}',\n- video_id, query={'device_type': 'desktop_web'})['video']\n-\n- formats = self._extract_m3u8_formats(\n- meta['video_m3u8'], video_id, 'mp4', m3u8_id='hls')\n-\n- subtitles = {}\n- for cc in traverse_obj(meta, ('closeCaption', lambda _, v: url_or_none(v['srtPath']))):\n- subtitles.setdefault(cc.get('srtShortLang') or 'en', []).append(\n- {'ext': cc.get('srtExt'), 'url': cc['srtPath']})\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'formats': formats,\n- **traverse_obj(meta, {\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'series': ('seriestitle', {str}),\n- 'season_number': ('season', {int}),\n- 'episode': ('episode', {str}),\n- 'duration': ('duration', {float_or_none}),\n- 'timestamp': ('updated_at', {parse_iso8601}),\n- 'thumbnail': ('thumb', {url_or_none}),\n- }),\n- 'subtitles': subtitles,\n- }\ndiff --git a/yt_dlp/extractor/beatbump.py b/yt_dlp/extractor/beatbump.py\ndeleted file mode 100644\nindex 777a1b3268df..000000000000\n--- a/yt_dlp/extractor/beatbump.py\n+++ /dev/null\n@@ -1,111 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE, YoutubeTabIE\n-\n-\n-class BeatBumpVideoIE(InfoExtractor):\n- _VALID_URL = r'https?://beatbump\\.(?:ml|io)/listen\\?id=(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://beatbump.ml/listen?id=MgNrAu2pzNs',\n- 'md5': '5ff3fff41d3935b9810a9731e485fe66',\n- 'info_dict': {\n- 'id': 'MgNrAu2pzNs',\n- 'ext': 'mp4',\n- 'artist': 'Stephen',\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',\n- 'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',\n- 'upload_date': '20190312',\n- 'categories': ['Music'],\n- 'playable_in_embed': True,\n- 'duration': 169,\n- 'like_count': int,\n- 'alt_title': 'Voyeur Girl',\n- 'view_count': int,\n- 'track': 'Voyeur Girl',\n- 'uploader': 'Stephen',\n- 'title': 'Voyeur Girl',\n- 'channel_follower_count': int,\n- 'age_limit': 0,\n- 'availability': 'public',\n- 'live_status': 'not_live',\n- 'album': 'it\\'s too much love to know my dear',\n- 'channel': 'Stephen',\n- 'comment_count': int,\n- 'description': 'md5:7ae382a65843d6df2685993e90a8628f',\n- 'tags': 'count:11',\n- 'creator': 'Stephen',\n- 'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',\n- 'channel_is_verified': True,\n- 'heatmap': 'count:100',\n- },\n- }, {\n- 'url': 'https://beatbump.io/listen?id=LDGZAprNGWo',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- id_ = self._match_id(url)\n- return self.url_result(f'https://music.youtube.com/watch?v={id_}', YoutubeIE, id_)\n-\n-\n-class BeatBumpPlaylistIE(InfoExtractor):\n- _VALID_URL = r'https?://beatbump\\.(?:ml|io)/(?:release\\?id=|artist/|playlist/)(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://beatbump.ml/release?id=MPREb_gTAcphH99wE',\n- 'playlist_count': 50,\n- 'info_dict': {\n- 'id': 'OLAK5uy_l1m0thk3g31NmIIz_vMIbWtyv7eZixlH0',\n- 'availability': 'unlisted',\n- 'view_count': int,\n- 'title': 'Album - Royalty Free Music Library V2 (50 Songs)',\n- 'description': '',\n- 'tags': [],\n- 'modified_date': '20231110',\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.ml/artist/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'playlist_mincount': 1,\n- 'params': {'flatplaylist': True},\n- 'info_dict': {\n- 'id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_id': '@NoCopyrightSounds',\n- 'channel_follower_count': int,\n- 'title': 'NoCopyrightSounds',\n- 'uploader': 'NoCopyrightSounds',\n- 'description': 'md5:cd4fd53d81d363d05eee6c1b478b491a',\n- 'channel': 'NoCopyrightSounds',\n- 'tags': 'count:65',\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'channel_is_verified': True,\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.ml/playlist/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\n- 'playlist_mincount': 1,\n- 'params': {'flatplaylist': True},\n- 'info_dict': {\n- 'id': 'PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\n- 'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',\n- 'view_count': int,\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_id': '@NoCopyrightSounds',\n- 'title': 'NCS : All Releases ๐ฟ',\n- 'uploader': 'NoCopyrightSounds',\n- 'availability': 'public',\n- 'channel': 'NoCopyrightSounds',\n- 'tags': [],\n- 'modified_date': '20231112',\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.io/playlist/VLPLFCHGavqRG-q_2ZhmgU2XB2--ZY6irT1c',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- id_ = self._match_id(url)\n- return self.url_result(f'https://music.youtube.com/browse/{id_}', YoutubeTabIE, id_)\ndiff --git a/yt_dlp/extractor/bigflix.py b/yt_dlp/extractor/bigflix.py\ndeleted file mode 100644\nindex 9c55bb9682ef..000000000000\n--- a/yt_dlp/extractor/bigflix.py\n+++ /dev/null\n@@ -1,71 +0,0 @@\n-import base64\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-\n-\n-class BigflixIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?bigflix\\.com/.+/(?P<id>[0-9]+)'\n- _TESTS = [{\n- # 2 formats\n- 'url': 'http://www.bigflix.com/Tamil-movies/Drama-movies/Madarasapatinam/16070',\n- 'info_dict': {\n- 'id': '16070',\n- 'ext': 'mp4',\n- 'title': 'Madarasapatinam',\n- 'description': 'md5:9f0470b26a4ba8e824c823b5d95c2f6b',\n- 'formats': 'mincount:2',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # multiple formats\n- 'url': 'http://www.bigflix.com/Malayalam-movies/Drama-movies/Indian-Rupee/15967',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(\n- r'<div[^>]+class=[\"\\']pagetitle[\"\\'][^>]*>(.+?)</div>',\n- webpage, 'title')\n-\n- def decode_url(quoted_b64_url):\n- return base64.b64decode(urllib.parse.unquote(\n- quoted_b64_url)).decode('utf-8')\n-\n- formats = []\n- for height, encoded_url in re.findall(\n- r'ContentURL_(\\d{3,4})[pP][^=]+=([^&]+)', webpage):\n- video_url = decode_url(encoded_url)\n- f = {\n- 'url': video_url,\n- 'format_id': f'{height}p',\n- 'height': int(height),\n- }\n- if video_url.startswith('rtmp'):\n- f['ext'] = 'flv'\n- formats.append(f)\n-\n- file_url = self._search_regex(\n- r'file=([^&]+)', webpage, 'video url', default=None)\n- if file_url:\n- video_url = decode_url(file_url)\n- if all(f['url'] != video_url for f in formats):\n- formats.append({\n- 'url': decode_url(file_url),\n- })\n-\n- description = self._html_search_meta('description', webpage)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/bokecc.py b/yt_dlp/extractor/bokecc.py\ndeleted file mode 100644\nindex 42047aced12a..000000000000\n--- a/yt_dlp/extractor/bokecc.py\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import ExtractorError\n-\n-\n-class BokeCCBaseIE(InfoExtractor):\n- def _extract_bokecc_formats(self, webpage, video_id, format_id=None):\n- player_params_str = self._html_search_regex(\n- r'<(?:script|embed)[^>]+src=(?P<q>[\"\\'])(?:https?:)?//p\\.bokecc\\.com/(?:player|flash/player\\.swf)\\?(?P<query>.+?)(?P=q)',\n- webpage, 'player params', group='query')\n-\n- player_params = urllib.parse.parse_qs(player_params_str)\n-\n- info_xml = self._download_xml(\n- 'http://p.bokecc.com/servlet/playinfo?uid={}&vid={}&m=1'.format(\n- player_params['siteid'][0], player_params['vid'][0]), video_id)\n-\n- return [{\n- 'format_id': format_id,\n- 'url': quality.find('./copy').attrib['playurl'],\n- 'quality': int(quality.attrib['value']),\n- } for quality in info_xml.findall('./video/quality')]\n-\n-\n-class BokeCCIE(BokeCCBaseIE):\n- IE_DESC = 'CC่ง้ข'\n- _VALID_URL = r'https?://union\\.bokecc\\.com/playvideo\\.bo\\?(?P<query>.*)'\n-\n- _TESTS = [{\n- 'url': 'http://union.bokecc.com/playvideo.bo?vid=E0ABAE9D4F509B189C33DC5901307461&uid=FE644790DE9D154A',\n- 'info_dict': {\n- 'id': 'FE644790DE9D154A_E0ABAE9D4F509B189C33DC5901307461',\n- 'ext': 'flv',\n- 'title': 'BokeCC Video',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- qs = urllib.parse.parse_qs(self._match_valid_url(url).group('query'))\n- if not qs.get('vid') or not qs.get('uid'):\n- raise ExtractorError('Invalid URL', expected=True)\n-\n- video_id = '{}_{}'.format(qs['uid'][0], qs['vid'][0])\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- return {\n- 'id': video_id,\n- 'title': 'BokeCC Video', # no title provided in the webpage\n- 'formats': self._extract_bokecc_formats(webpage, video_id),\n- }\ndiff --git a/yt_dlp/extractor/caffeinetv.py b/yt_dlp/extractor/caffeinetv.py\ndeleted file mode 100644\nindex ea5134d2f398..000000000000\n--- a/yt_dlp/extractor/caffeinetv.py\n+++ /dev/null\n@@ -1,74 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- int_or_none,\n- parse_iso8601,\n- traverse_obj,\n- urljoin,\n-)\n-\n-\n-class CaffeineTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?caffeine\\.tv/[^/?#]+/video/(?P<id>[\\da-f-]+)'\n- _TESTS = [{\n- 'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',\n- 'info_dict': {\n- 'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',\n- 'ext': 'mp4',\n- 'title': 'GOOOOD MORNINNNNN #highlights',\n- 'timestamp': 1654702180,\n- 'upload_date': '20220608',\n- 'uploader': 'RahJON Wicc',\n- 'uploader_id': 'TsuSurf',\n- 'duration': 3145,\n- 'age_limit': 17,\n- 'thumbnail': 'https://www.caffeine.tv/broadcasts/776b6f84-9cd5-42e3-af1d-4a776eeed697/replay/lobby.jpg',\n- 'comment_count': int,\n- 'view_count': int,\n- 'like_count': int,\n- 'tags': ['highlights', 'battlerap'],\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- json_data = self._download_json(\n- f'https://api.caffeine.tv/social/public/activity/{video_id}', video_id)\n- broadcast_info = traverse_obj(json_data, ('broadcast_info', {dict})) or {}\n-\n- video_url = broadcast_info['video_url']\n- ext = determine_ext(video_url)\n- if ext == 'm3u8':\n- formats = self._extract_m3u8_formats(video_url, video_id, 'mp4')\n- else:\n- formats = [{'url': video_url}]\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- **traverse_obj(json_data, {\n- 'like_count': ('like_count', {int_or_none}),\n- 'view_count': ('view_count', {int_or_none}),\n- 'comment_count': ('comment_count', {int_or_none}),\n- 'tags': ('tags', ..., {str}, filter),\n- 'uploader': ('user', 'name', {str}),\n- 'uploader_id': (((None, 'user'), 'username'), {str}, any),\n- 'is_live': ('is_live', {bool}),\n- }),\n- **traverse_obj(broadcast_info, {\n- 'title': ('broadcast_title', {str}),\n- 'duration': ('content_duration', {int_or_none}),\n- 'timestamp': ('broadcast_start_time', {parse_iso8601}),\n- 'thumbnail': ('preview_image_path', {urljoin(url)}),\n- }),\n- 'age_limit': {\n- # assume Apple Store ratings: https://en.wikipedia.org/wiki/Mobile_software_content_rating_system\n- 'FOUR_PLUS': 0,\n- 'NINE_PLUS': 9,\n- 'TWELVE_PLUS': 12,\n- 'SEVENTEEN_PLUS': 17,\n- }.get(broadcast_info.get('content_rating'), 17),\n- }\ndiff --git a/yt_dlp/extractor/callin.py b/yt_dlp/extractor/callin.py\ndeleted file mode 100644\nindex ee2e56f8e0ca..000000000000\n--- a/yt_dlp/extractor/callin.py\n+++ /dev/null\n@@ -1,155 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import float_or_none, int_or_none, make_archive_id, traverse_obj\n-\n-\n-class CallinIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?callin\\.com/episode/(?P<id>[-a-zA-Z]+)'\n- _TESTS = [{\n- 'url': 'https://www.callin.com/episode/the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\n- 'info_dict': {\n- 'id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\n- 'title': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\n- 'ext': 'ts',\n- 'display_id': 'the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\n- 'thumbnail': 're:https://.+\\\\.png',\n- 'description': 'First episode',\n- 'uploader': 'Wesley Yang',\n- 'timestamp': 1639404128.65,\n- 'upload_date': '20211213',\n- 'uploader_id': 'wesyang',\n- 'uploader_url': 'http://wesleyyang.substack.com',\n- 'channel': 'Conversations in Year Zero',\n- 'channel_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\n- 'channel_url': 'https://callin.com/show/conversations-in-year-zero-oJNllRFSfx',\n- 'duration': 9951.936,\n- 'view_count': int,\n- 'categories': ['News & Politics', 'History', 'Technology'],\n- 'cast': ['Wesley Yang', 'KC Johnson', 'Gabi Abramovich'],\n- 'series': 'Conversations in Year Zero',\n- 'series_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\n- 'episode': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\n- 'episode_number': 1,\n- 'episode_id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\n- },\n- }, {\n- 'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\n- 'md5': '14ede27ee2c957b7e4db93140fc0745c',\n- 'info_dict': {\n- 'id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\n- 'ext': 'ts',\n- 'title': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\n- 'description': 'Or, why the government doesnโt like SpaceX',\n- 'channel': 'The Pull Request',\n- 'channel_url': 'https://callin.com/show/the-pull-request-ucnDJmEKAa',\n- 'duration': 3182.472,\n- 'series_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\n- 'uploader_url': 'http://thepullrequest.com',\n- 'upload_date': '20220902',\n- 'episode': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\n- 'display_id': 'fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\n- 'series': 'The Pull Request',\n- 'channel_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\n- 'view_count': int,\n- 'uploader': 'Antonio Garcรญa Martรญnez',\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/1ade9142625344045dc17cf523469ced1d93610762f4c886d06aa190a2f979e8.png',\n- 'episode_id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\n- 'timestamp': 1662100688.005,\n- },\n- }, {\n- 'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',\n- 'md5': '16f704ddbf82a27e3930533b12062f07',\n- 'info_dict': {\n- 'id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\n- 'ext': 'ts',\n- 'title': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\n- 'description': 'Letโs talk todays episode about the primary election shake up in NYC and the elites melting down over student debt cancelation.',\n- 'channel': 'The DEBRIEF With Briahna Joy Gray',\n- 'channel_url': 'https://callin.com/show/the-debrief-with-briahna-joy-gray-siiFDzGegm',\n- 'duration': 10043.16,\n- 'series_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\n- 'uploader_url': 'http://patreon.com/badfaithpodcast',\n- 'upload_date': '20220826',\n- 'episode': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\n- 'display_id': 'episode-',\n- 'series': 'The DEBRIEF With Briahna Joy Gray',\n- 'channel_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\n- 'view_count': int,\n- 'uploader': 'Briahna Gray',\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/461ea0d86172cb6aff7d6c80fd49259cf5e64bdf737a4650f8bc24cf392ca218.png',\n- 'episode_id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\n- 'timestamp': 1661476708.282,\n- },\n- }]\n-\n- def try_get_user_name(self, d):\n- names = [d.get(n) for n in ('first', 'last')]\n- if None in names:\n- return next((n for n in names if n), default=None)\n- return ' '.join(names)\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- next_data = self._search_nextjs_data(webpage, display_id)\n- episode = next_data['props']['pageProps']['episode']\n-\n- video_id = episode['id']\n- title = episode.get('title') or self._generic_title('', webpage)\n- url = episode['m3u8']\n- formats = self._extract_m3u8_formats(url, display_id, ext='ts')\n-\n- show = traverse_obj(episode, ('show', 'title'))\n- show_id = traverse_obj(episode, ('show', 'id'))\n-\n- show_json = None\n- app_slug = (self._html_search_regex(\n- '<script\\\\s+src=[\"\\']/_next/static/([-_a-zA-Z0-9]+)/_',\n- webpage, 'app slug', fatal=False) or next_data.get('buildId'))\n- show_slug = traverse_obj(episode, ('show', 'linkObj', 'resourceUrl'))\n- if app_slug and show_slug and '/' in show_slug:\n- show_slug = show_slug.rsplit('/', 1)[1]\n- show_json_url = f'https://www.callin.com/_next/data/{app_slug}/show/{show_slug}.json'\n- show_json = self._download_json(show_json_url, display_id, fatal=False)\n-\n- host = (traverse_obj(show_json, ('pageProps', 'show', 'hosts', 0))\n- or traverse_obj(episode, ('speakers', 0)))\n-\n- host_nick = traverse_obj(host, ('linkObj', 'resourceUrl'))\n- host_nick = host_nick.rsplit('/', 1)[1] if (host_nick and '/' in host_nick) else None\n-\n- cast = list(filter(None, [\n- self.try_get_user_name(u) for u in\n- traverse_obj(episode, (('speakers', 'callerTags'), ...)) or []\n- ]))\n-\n- episode_list = traverse_obj(show_json, ('pageProps', 'show', 'episodes')) or []\n- episode_number = next(\n- (len(episode_list) - i for i, e in enumerate(episode_list) if e.get('id') == video_id),\n- None)\n-\n- return {\n- 'id': video_id,\n- '_old_archive_ids': [make_archive_id(self, display_id.rsplit('-', 1)[-1])],\n- 'display_id': display_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnail': traverse_obj(episode, ('show', 'photo')),\n- 'description': episode.get('description'),\n- 'uploader': self.try_get_user_name(host) if host else None,\n- 'timestamp': episode.get('publishedAt'),\n- 'uploader_id': host_nick,\n- 'uploader_url': traverse_obj(show_json, ('pageProps', 'show', 'url')),\n- 'channel': show,\n- 'channel_id': show_id,\n- 'channel_url': traverse_obj(episode, ('show', 'linkObj', 'resourceUrl')),\n- 'duration': float_or_none(episode.get('runtime')),\n- 'view_count': int_or_none(episode.get('plays')),\n- 'categories': traverse_obj(episode, ('show', 'categorizations', ..., 'name')),\n- 'cast': cast if cast else None,\n- 'series': show,\n- 'series_id': show_id,\n- 'episode': title,\n- 'episode_number': episode_number,\n- 'episode_id': video_id,\n- }\ndiff --git a/yt_dlp/extractor/camdemy.py b/yt_dlp/extractor/camdemy.py\ndeleted file mode 100644\nindex 34dc095af86b..000000000000\n--- a/yt_dlp/extractor/camdemy.py\n+++ /dev/null\n@@ -1,155 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- parse_duration,\n- str_to_int,\n- unified_strdate,\n-)\n-\n-\n-class CamdemyIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?camdemy\\.com/media/(?P<id>\\d+)'\n- _TESTS = [{\n- # single file\n- 'url': 'http://www.camdemy.com/media/5181/',\n- 'md5': '5a5562b6a98b37873119102e052e311b',\n- 'info_dict': {\n- 'id': '5181',\n- 'ext': 'mp4',\n- 'title': 'Ch1-1 Introduction, Signals (02-23-2012)',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'creator': 'ss11spring',\n- 'duration': 1591,\n- 'upload_date': '20130114',\n- 'view_count': int,\n- },\n- }, {\n- # With non-empty description\n- # webpage returns \"No permission or not login\"\n- 'url': 'http://www.camdemy.com/media/13885',\n- 'md5': '4576a3bb2581f86c61044822adbd1249',\n- 'info_dict': {\n- 'id': '13885',\n- 'ext': 'mp4',\n- 'title': 'EverCam + Camdemy QuickStart',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',\n- 'creator': 'evercam',\n- 'duration': 318,\n- },\n- }, {\n- # External source (YouTube)\n- 'url': 'http://www.camdemy.com/media/14842',\n- 'info_dict': {\n- 'id': '2vsYQzNIsJo',\n- 'ext': 'mp4',\n- 'title': 'Excel 2013 Tutorial - How to add Password Protection',\n- 'description': 'Excel 2013 Tutorial for Beginners - How to add Password Protection',\n- 'upload_date': '20130211',\n- 'uploader': 'Hun Kim',\n- 'uploader_id': 'hunkimtutorials',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- src_from = self._html_search_regex(\n- r\"class=['\\\"]srcFrom['\\\"][^>]*>Sources?(?:\\s+from)?\\s*:\\s*<a[^>]+(?:href|title)=(['\\\"])(?P<url>(?:(?!\\1).)+)\\1\",\n- webpage, 'external source', default=None, group='url')\n- if src_from:\n- return self.url_result(src_from)\n-\n- oembed_obj = self._download_json(\n- 'http://www.camdemy.com/oembed/?format=json&url=' + url, video_id)\n-\n- title = oembed_obj['title']\n- thumb_url = oembed_obj['thumbnail_url']\n- video_folder = urllib.parse.urljoin(thumb_url, 'video/')\n- file_list_doc = self._download_xml(\n- urllib.parse.urljoin(video_folder, 'fileList.xml'),\n- video_id, 'Downloading filelist XML')\n- file_name = file_list_doc.find('./video/item/fileName').text\n- video_url = urllib.parse.urljoin(video_folder, file_name)\n-\n- # Some URLs return \"No permission or not login\" in a webpage despite being\n- # freely available via oembed JSON URL (e.g. http://www.camdemy.com/media/13885)\n- upload_date = unified_strdate(self._search_regex(\n- r'>published on ([^<]+)<', webpage,\n- 'upload date', default=None))\n- view_count = str_to_int(self._search_regex(\n- r'role=[\"\\']viewCnt[\"\\'][^>]*>([\\d,.]+) views',\n- webpage, 'view count', default=None))\n- description = self._html_search_meta(\n- 'description', webpage, default=None) or clean_html(\n- oembed_obj.get('description'))\n-\n- return {\n- 'id': video_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumb_url,\n- 'description': description,\n- 'creator': oembed_obj.get('author_name'),\n- 'duration': parse_duration(oembed_obj.get('duration')),\n- 'upload_date': upload_date,\n- 'view_count': view_count,\n- }\n-\n-\n-class CamdemyFolderIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?camdemy\\.com/folder/(?P<id>\\d+)'\n- _TESTS = [{\n- # links with trailing slash\n- 'url': 'http://www.camdemy.com/folder/450',\n- 'info_dict': {\n- 'id': '450',\n- 'title': 'ไฟก่่็ณป็ตฑ 2012 & 2011 (Signals and Systems)',\n- },\n- 'playlist_mincount': 145,\n- }, {\n- # links without trailing slash\n- # and multi-page\n- 'url': 'http://www.camdemy.com/folder/853',\n- 'info_dict': {\n- 'id': '853',\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\n- },\n- 'playlist_mincount': 20,\n- }, {\n- # with displayMode parameter. For testing the codes to add parameters\n- 'url': 'http://www.camdemy.com/folder/853/?displayMode=defaultOrderByOrg',\n- 'info_dict': {\n- 'id': '853',\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\n- },\n- 'playlist_mincount': 20,\n- }]\n-\n- def _real_extract(self, url):\n- folder_id = self._match_id(url)\n-\n- # Add displayMode=list so that all links are displayed in a single page\n- parsed_url = list(urllib.parse.urlparse(url))\n- query = dict(urllib.parse.parse_qsl(parsed_url[4]))\n- query.update({'displayMode': 'list'})\n- parsed_url[4] = urllib.parse.urlencode(query)\n- final_url = urllib.parse.urlunparse(parsed_url)\n-\n- page = self._download_webpage(final_url, folder_id)\n- matches = re.findall(r\"href='(/media/\\d+/?)'\", page)\n-\n- entries = [self.url_result('http://www.camdemy.com' + media_path)\n- for media_path in matches]\n-\n- folder_title = self._html_search_meta('keywords', page)\n-\n- return self.playlist_result(entries, folder_id, folder_title)\ndiff --git a/yt_dlp/extractor/clippit.py b/yt_dlp/extractor/clippit.py\ndeleted file mode 100644\nindex 393f21730809..000000000000\n--- a/yt_dlp/extractor/clippit.py\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_iso8601,\n- qualities,\n-)\n-\n-\n-class ClippitIE(InfoExtractor):\n-\n- _VALID_URL = r'https?://(?:www\\.)?clippituser\\.tv/c/(?P<id>[a-z]+)'\n- _TEST = {\n- 'url': 'https://www.clippituser.tv/c/evmgm',\n- 'md5': '963ae7a59a2ec4572ab8bf2f2d2c5f09',\n- 'info_dict': {\n- 'id': 'evmgm',\n- 'ext': 'mp4',\n- 'title': 'Bye bye Brutus. #BattleBots - Clippit',\n- 'uploader': 'lizllove',\n- 'uploader_url': 'https://www.clippituser.tv/p/lizllove',\n- 'timestamp': 1472183818,\n- 'upload_date': '20160826',\n- 'description': 'BattleBots | ABC',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(r'<title.*>(.+?)</title>', webpage, 'title')\n-\n- FORMATS = ('sd', 'hd')\n- quality = qualities(FORMATS)\n- formats = []\n- for format_id in FORMATS:\n- url = self._html_search_regex(rf'data-{format_id}-file=\"(.+?)\"',\n- webpage, 'url', fatal=False)\n- if not url:\n- continue\n- match = re.search(r'/(?P<height>\\d+)\\.mp4', url)\n- formats.append({\n- 'url': url,\n- 'format_id': format_id,\n- 'quality': quality(format_id),\n- 'height': int(match.group('height')) if match else None,\n- })\n-\n- uploader = self._html_search_regex(r'class=\"username\".*>\\s+(.+?)\\n',\n- webpage, 'uploader', fatal=False)\n- uploader_url = ('https://www.clippituser.tv/p/' + uploader\n- if uploader else None)\n-\n- timestamp = self._html_search_regex(r'datetime=\"(.+?)\"',\n- webpage, 'date', fatal=False)\n- thumbnail = self._html_search_regex(r'data-image=\"(.+?)\"',\n- webpage, 'thumbnail', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'uploader': uploader,\n- 'uploader_url': uploader_url,\n- 'timestamp': parse_iso8601(timestamp),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': thumbnail,\n- }\ndiff --git a/yt_dlp/extractor/contv.py b/yt_dlp/extractor/contv.py\ndeleted file mode 100644\nindex 63d760a39ba8..000000000000\n--- a/yt_dlp/extractor/contv.py\n+++ /dev/null\n@@ -1,113 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n-)\n-\n-\n-class CONtvIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?contv\\.com/details-movie/(?P<id>[^/]+)'\n- _TESTS = [{\n- 'url': 'https://www.contv.com/details-movie/CEG10022949/days-of-thrills-&-laughter',\n- 'info_dict': {\n- 'id': 'CEG10022949',\n- 'ext': 'mp4',\n- 'title': 'Days Of Thrills & Laughter',\n- 'description': 'md5:5d6b3d0b1829bb93eb72898c734802eb',\n- 'upload_date': '20180703',\n- 'timestamp': 1530634789.61,\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://www.contv.com/details-movie/CLIP-show_fotld_bts/fight-of-the-living-dead:-behind-the-scenes-bites',\n- 'info_dict': {\n- 'id': 'CLIP-show_fotld_bts',\n- 'title': 'Fight of the Living Dead: Behind the Scenes Bites',\n- },\n- 'playlist_mincount': 7,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- details = self._download_json(\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/details/' + video_id,\n- video_id, query={'device': 'web'})\n-\n- if details.get('type') == 'episodic':\n- seasons = self._download_json(\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/seriesfeed/json/' + video_id,\n- video_id)\n- entries = []\n- for season in seasons:\n- for episode in season.get('episodes', []):\n- episode_id = episode.get('id')\n- if not episode_id:\n- continue\n- entries.append(self.url_result(\n- 'https://www.contv.com/details-movie/' + episode_id,\n- CONtvIE.ie_key(), episode_id))\n- return self.playlist_result(entries, video_id, details.get('title'))\n-\n- m_details = details['details']\n- title = details['title']\n-\n- formats = []\n-\n- media_hls_url = m_details.get('media_hls_url')\n- if media_hls_url:\n- formats.extend(self._extract_m3u8_formats(\n- media_hls_url, video_id, 'mp4',\n- m3u8_id='hls', fatal=False))\n-\n- media_mp4_url = m_details.get('media_mp4_url')\n- if media_mp4_url:\n- formats.append({\n- 'format_id': 'http',\n- 'url': media_mp4_url,\n- })\n-\n- subtitles = {}\n- captions = m_details.get('captions') or {}\n- for caption_url in captions.values():\n- subtitles.setdefault('en', []).append({\n- 'url': caption_url,\n- })\n-\n- thumbnails = []\n- for image in m_details.get('images', []):\n- image_url = image.get('url')\n- if not image_url:\n- continue\n- thumbnails.append({\n- 'url': image_url,\n- 'width': int_or_none(image.get('width')),\n- 'height': int_or_none(image.get('height')),\n- })\n-\n- description = None\n- for p in ('large_', 'medium_', 'small_', ''):\n- d = m_details.get(p + 'description')\n- if d:\n- description = d\n- break\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- 'description': description,\n- 'timestamp': float_or_none(details.get('metax_added_on'), 1000),\n- 'subtitles': subtitles,\n- 'duration': float_or_none(m_details.get('duration'), 1000),\n- 'view_count': int_or_none(details.get('num_watched')),\n- 'like_count': int_or_none(details.get('num_fav')),\n- 'categories': details.get('category'),\n- 'tags': details.get('tags'),\n- 'season_number': int_or_none(details.get('season')),\n- 'episode_number': int_or_none(details.get('episode')),\n- 'release_year': int_or_none(details.get('pub_year')),\n- }\ndiff --git a/yt_dlp/extractor/drooble.py b/yt_dlp/extractor/drooble.py\ndeleted file mode 100644\nindex 16e9a6194140..000000000000\n--- a/yt_dlp/extractor/drooble.py\n+++ /dev/null\n@@ -1,113 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- try_get,\n-)\n-\n-\n-class DroobleIE(InfoExtractor):\n- _VALID_URL = r'''(?x)https?://drooble\\.com/(?:\n- (?:(?P<user>[^/]+)/)?(?P<kind>song|videos|music/albums)/(?P<id>\\d+)|\n- (?P<user_2>[^/]+)/(?P<kind_2>videos|music))\n- '''\n- _TESTS = [{\n- 'url': 'https://drooble.com/song/2858030',\n- 'md5': '5ffda90f61c7c318dc0c3df4179eb064',\n- 'info_dict': {\n- 'id': '2858030',\n- 'ext': 'mp3',\n- 'title': 'Skankocillin',\n- 'upload_date': '20200801',\n- 'timestamp': 1596241390,\n- 'uploader_id': '95894',\n- 'uploader': 'Bluebeat Shelter',\n- },\n- }, {\n- 'url': 'https://drooble.com/karl340758/videos/2859183',\n- 'info_dict': {\n- 'id': 'J6QCQY_I5Tk',\n- 'ext': 'mp4',\n- 'title': 'Skankocillin',\n- 'uploader_id': 'UCrSRoI5vVyeYihtWEYua7rg',\n- 'description': 'md5:ffc0bd8ba383db5341a86a6cd7d9bcca',\n- 'upload_date': '20200731',\n- 'uploader': 'Bluebeat Shelter',\n- },\n- }, {\n- 'url': 'https://drooble.com/karl340758/music/albums/2858031',\n- 'info_dict': {\n- 'id': '2858031',\n- },\n- 'playlist_mincount': 8,\n- }, {\n- 'url': 'https://drooble.com/karl340758/music',\n- 'info_dict': {\n- 'id': 'karl340758',\n- },\n- 'playlist_mincount': 8,\n- }, {\n- 'url': 'https://drooble.com/karl340758/videos',\n- 'info_dict': {\n- 'id': 'karl340758',\n- },\n- 'playlist_mincount': 8,\n- }]\n-\n- def _call_api(self, method, video_id, data=None):\n- response = self._download_json(\n- f'https://drooble.com/api/dt/{method}', video_id, data=json.dumps(data).encode())\n- if not response[0]:\n- raise ExtractorError('Unable to download JSON metadata')\n- return response[1]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- user = mobj.group('user') or mobj.group('user_2')\n- kind = mobj.group('kind') or mobj.group('kind_2')\n- display_id = mobj.group('id') or user\n-\n- if mobj.group('kind_2') == 'videos':\n- data = {'from_user': display_id, 'album': -1, 'limit': 18, 'offset': 0, 'order': 'new2old', 'type': 'video'}\n- elif kind in ('music/albums', 'music'):\n- data = {'user': user, 'public_only': True, 'individual_limit': {'singles': 1, 'albums': 1, 'playlists': 1}}\n- else:\n- data = {'url_slug': display_id, 'children': 10, 'order': 'old2new'}\n-\n- method = 'getMusicOverview' if kind in ('music/albums', 'music') else 'getElements'\n- json_data = self._call_api(method, display_id, data=data)\n- if kind in ('music/albums', 'music'):\n- json_data = json_data['singles']['list']\n-\n- entites = []\n- for media in json_data:\n- url = media.get('external_media_url') or media.get('link')\n- if url.startswith('https://www.youtube.com'):\n- entites.append({\n- '_type': 'url',\n- 'url': url,\n- 'ie_key': 'Youtube',\n- })\n- continue\n- is_audio = (media.get('type') or '').lower() == 'audio'\n- entites.append({\n- 'url': url,\n- 'id': media['id'],\n- 'title': media['title'],\n- 'duration': int_or_none(media.get('duration')),\n- 'timestamp': int_or_none(media.get('timestamp')),\n- 'album': try_get(media, lambda x: x['album']['title']),\n- 'uploader': try_get(media, lambda x: x['creator']['display_name']),\n- 'uploader_id': try_get(media, lambda x: x['creator']['id']),\n- 'thumbnail': media.get('image_comment'),\n- 'like_count': int_or_none(media.get('likes')),\n- 'vcodec': 'none' if is_audio else None,\n- 'ext': 'mp3' if is_audio else None,\n- })\n-\n- if len(entites) > 1:\n- return self.playlist_result(entites, display_id)\n-\n- return entites[0]\ndiff --git a/yt_dlp/extractor/duboku.py b/yt_dlp/extractor/duboku.py\ndeleted file mode 100644\nindex 68c3f05731f7..000000000000\n--- a/yt_dlp/extractor/duboku.py\n+++ /dev/null\n@@ -1,246 +0,0 @@\n-import base64\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- extract_attributes,\n- get_elements_by_class,\n- int_or_none,\n- js_to_json,\n- smuggle_url,\n- unescapeHTML,\n-)\n-\n-\n-def _get_elements_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\n- \"\"\"Return the content of the tag with the specified attribute in the passed HTML document\"\"\"\n-\n- if tag is None:\n- tag = '[a-zA-Z0-9:._-]+'\n- if attribute is None:\n- attribute = ''\n- else:\n- attribute = rf'\\s+(?P<attribute>{re.escape(attribute)})'\n- if value is None:\n- value = ''\n- else:\n- value = re.escape(value) if escape_value else value\n- value = f'=[\\'\"]?(?P<value>{value})[\\'\"]?'\n-\n- retlist = []\n- for m in re.finditer(rf'''(?xs)\n- <(?P<tag>{tag})\n- (?:\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\"[^\"]*\"|='[^']*'|))*?\n- {attribute}{value}\n- (?:\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\"[^\"]*\"|='[^']*'|))*?\n- \\s*>\n- (?P<content>.*?)\n- </\\1>\n- ''', html):\n- retlist.append(m)\n-\n- return retlist\n-\n-\n-def _get_element_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\n- retval = _get_elements_by_tag_and_attrib(html, tag, attribute, value, escape_value)\n- return retval[0] if retval else None\n-\n-\n-class DubokuIE(InfoExtractor):\n- IE_NAME = 'duboku'\n- IE_DESC = 'www.duboku.io'\n-\n- _VALID_URL = r'(?:https?://[^/]+\\.duboku\\.io/vodplay/)(?P<id>[0-9]+-[0-9-]+)\\.html.*'\n- _TESTS = [{\n- 'url': 'https://w.duboku.io/vodplay/1575-1-1.html',\n- 'info_dict': {\n- 'id': '1575-1-1',\n- 'ext': 'mp4',\n- 'series': '็ฝ่ฒๆๅ
',\n- 'title': 'contains:็ฝ่ฒๆๅ
',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'season': 'Season 1',\n- 'episode_id': '1',\n- 'season_id': '1',\n- 'episode': 'Episode 1',\n- },\n- 'params': {\n- 'skip_download': 'm3u8 download',\n- },\n- }, {\n- 'url': 'https://w.duboku.io/vodplay/1588-1-1.html',\n- 'info_dict': {\n- 'id': '1588-1-1',\n- 'ext': 'mp4',\n- 'series': 'ไบฒ็ฑ็่ชๅทฑ',\n- 'title': 'contains:็ฌฌ1้',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'season': 'Season 1',\n- 'episode_id': '1',\n- 'season_id': '1',\n- },\n- 'params': {\n- 'skip_download': 'm3u8 download',\n- },\n- }]\n-\n- _PLAYER_DATA_PATTERN = r'player_data\\s*=\\s*(\\{\\s*(.*)})\\s*;?\\s*</script'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- temp = video_id.split('-')\n- series_id = temp[0]\n- season_id = temp[1]\n- episode_id = temp[2]\n-\n- webpage_url = f'https://w.duboku.io/vodplay/{video_id}.html'\n- webpage_html = self._download_webpage(webpage_url, video_id)\n-\n- # extract video url\n-\n- player_data = self._search_regex(\n- self._PLAYER_DATA_PATTERN, webpage_html, 'player_data')\n- player_data = self._parse_json(player_data, video_id, js_to_json)\n-\n- # extract title\n-\n- temp = get_elements_by_class('title', webpage_html)\n- series_title = None\n- title = None\n- for html in temp:\n- mobj = re.search(r'<a\\s+.*>(.*)</a>', html)\n- if mobj:\n- href = extract_attributes(mobj.group(0)).get('href')\n- if href:\n- mobj1 = re.search(r'/(\\d+)\\.html', href)\n- if mobj1 and mobj1.group(1) == series_id:\n- series_title = clean_html(mobj.group(0))\n- series_title = re.sub(r'[\\s\\r\\n\\t]+', ' ', series_title)\n- title = clean_html(html)\n- title = re.sub(r'[\\s\\r\\n\\t]+', ' ', title)\n- break\n-\n- data_url = player_data.get('url')\n- if not data_url:\n- raise ExtractorError('Cannot find url in player_data')\n- player_encrypt = player_data.get('encrypt')\n- if player_encrypt == 1:\n- data_url = urllib.parse.unquote(data_url)\n- elif player_encrypt == 2:\n- data_url = urllib.parse.unquote(base64.b64decode(data_url).decode('ascii'))\n-\n- # if it is an embedded iframe, maybe it's an external source\n- headers = {'Referer': webpage_url}\n- if player_data.get('from') == 'iframe':\n- # use _type url_transparent to retain the meaningful details\n- # of the video.\n- return {\n- '_type': 'url_transparent',\n- 'url': smuggle_url(data_url, {'referer': webpage_url}),\n- 'id': video_id,\n- 'title': title,\n- 'series': series_title,\n- 'season_number': int_or_none(season_id),\n- 'season_id': season_id,\n- 'episode_number': int_or_none(episode_id),\n- 'episode_id': episode_id,\n- }\n-\n- formats = self._extract_m3u8_formats(data_url, video_id, 'mp4', headers=headers)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'series': series_title,\n- 'season_number': int_or_none(season_id),\n- 'season_id': season_id,\n- 'episode_number': int_or_none(episode_id),\n- 'episode_id': episode_id,\n- 'formats': formats,\n- 'http_headers': headers,\n- }\n-\n-\n-class DubokuPlaylistIE(InfoExtractor):\n- IE_NAME = 'duboku:list'\n- IE_DESC = 'www.duboku.io entire series'\n-\n- _VALID_URL = r'(?:https?://[^/]+\\.duboku\\.io/voddetail/)(?P<id>[0-9]+)\\.html.*'\n- _TESTS = [{\n- 'url': 'https://w.duboku.io/voddetail/1575.html',\n- 'info_dict': {\n- 'id': 'startswith:1575',\n- 'title': '็ฝ่ฒๆๅ
',\n- },\n- 'playlist_count': 12,\n- }, {\n- 'url': 'https://w.duboku.io/voddetail/1554.html',\n- 'info_dict': {\n- 'id': 'startswith:1554',\n- 'title': 'ไปฅๅฎถไบบไนๅ',\n- },\n- 'playlist_mincount': 30,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- if mobj is None:\n- raise ExtractorError(f'Invalid URL: {url}')\n- series_id = mobj.group('id')\n- fragment = urllib.parse.urlparse(url).fragment\n-\n- webpage_url = f'https://w.duboku.io/voddetail/{series_id}.html'\n- webpage_html = self._download_webpage(webpage_url, series_id)\n-\n- # extract title\n-\n- title = _get_element_by_tag_and_attrib(webpage_html, 'h1', 'class', 'title')\n- title = unescapeHTML(title.group('content')) if title else None\n- if not title:\n- title = self._html_search_meta('keywords', webpage_html)\n- if not title:\n- title = _get_element_by_tag_and_attrib(webpage_html, 'title')\n- title = unescapeHTML(title.group('content')) if title else None\n-\n- # extract playlists\n-\n- playlists = {}\n- for div in _get_elements_by_tag_and_attrib(\n- webpage_html, attribute='id', value='playlist\\\\d+', escape_value=False):\n- playlist_id = div.group('value')\n- playlist = []\n- for a in _get_elements_by_tag_and_attrib(\n- div.group('content'), 'a', 'href', value='[^\\'\"]+?', escape_value=False):\n- playlist.append({\n- 'href': unescapeHTML(a.group('value')),\n- 'title': unescapeHTML(a.group('content')),\n- })\n- playlists[playlist_id] = playlist\n-\n- # select the specified playlist if url fragment exists\n- playlist = None\n- playlist_id = None\n- if fragment:\n- playlist = playlists.get(fragment)\n- playlist_id = fragment\n- else:\n- first = next(iter(playlists.items()), None)\n- if first:\n- (playlist_id, playlist) = first\n- if not playlist:\n- raise ExtractorError(\n- f'Cannot find {fragment}' if fragment else 'Cannot extract playlist')\n-\n- # return url results\n- return self.playlist_result([\n- self.url_result(\n- urllib.parse.urljoin('https://w.duboku.io', x['href']),\n- ie=DubokuIE.ie_key(), video_title=x.get('title'))\n- for x in playlist], series_id + '#' + playlist_id, title)\ndiff --git a/yt_dlp/extractor/eighttracks.py b/yt_dlp/extractor/eighttracks.py\ndeleted file mode 100644\nindex 3ac4c56ae0fd..000000000000\n--- a/yt_dlp/extractor/eighttracks.py\n+++ /dev/null\n@@ -1,158 +0,0 @@\n-import json\n-import random\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n-)\n-\n-\n-class EightTracksIE(InfoExtractor):\n- IE_NAME = '8tracks'\n- _VALID_URL = r'https?://8tracks\\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'\n- _TEST = {\n- 'name': 'EightTracks',\n- 'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',\n- 'info_dict': {\n- 'id': '1336550',\n- 'display_id': 'youtube-dl-test-tracks-a',\n- 'description': \"test chars: \\\"'/\\\\รคโญ\",\n- 'title': \"youtube-dl test tracks \\\"'/\\\\รคโญ<>\",\n- },\n- 'playlist': [\n- {\n- 'md5': '96ce57f24389fc8734ce47f4c1abcc55',\n- 'info_dict': {\n- 'id': '11885610',\n- 'ext': 'm4a',\n- 'title': \"youtue-dl project<>\\\"' - youtube-dl test track 1 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '4ab26f05c1f7291ea460a3920be8021f',\n- 'info_dict': {\n- 'id': '11885608',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project - youtube-dl test track 2 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'd30b5b5f74217410f4689605c35d1fd7',\n- 'info_dict': {\n- 'id': '11885679',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project as well - youtube-dl test track 3 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '4eb0a669317cd725f6bbd336a29f923a',\n- 'info_dict': {\n- 'id': '11885680',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project as well - youtube-dl test track 4 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '1893e872e263a2705558d1d319ad19e8',\n- 'info_dict': {\n- 'id': '11885682',\n- 'ext': 'm4a',\n- 'title': \"PH - youtube-dl test track 5 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'b673c46f47a216ab1741ae8836af5899',\n- 'info_dict': {\n- 'id': '11885683',\n- 'ext': 'm4a',\n- 'title': \"PH - youtube-dl test track 6 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '1d74534e95df54986da7f5abf7d842b7',\n- 'info_dict': {\n- 'id': '11885684',\n- 'ext': 'm4a',\n- 'title': \"phihag - youtube-dl test track 7 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'f081f47af8f6ae782ed131d38b9cd1c0',\n- 'info_dict': {\n- 'id': '11885685',\n- 'ext': 'm4a',\n- 'title': \"phihag - youtube-dl test track 8 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- ],\n- }\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, playlist_id)\n-\n- data = self._parse_json(\n- self._search_regex(\n- r'(?s)PAGE\\.mix\\s*=\\s*({.+?});\\n', webpage, 'trax information'),\n- playlist_id)\n-\n- session = str(random.randint(0, 1000000000))\n- mix_id = data['id']\n- track_count = data['tracks_count']\n- duration = data['duration']\n- avg_song_duration = float(duration) / track_count\n- # duration is sometimes negative, use predefined avg duration\n- if avg_song_duration <= 0:\n- avg_song_duration = 300\n- first_url = f'http://8tracks.com/sets/{session}/play?player=sm&mix_id={mix_id}&format=jsonh'\n- next_url = first_url\n- entries = []\n-\n- for i in range(track_count):\n- api_json = None\n- download_tries = 0\n-\n- while api_json is None:\n- try:\n- api_json = self._download_webpage(\n- next_url, playlist_id,\n- note='Downloading song information %d/%d' % (i + 1, track_count),\n- errnote='Failed to download song information')\n- except ExtractorError:\n- if download_tries > 3:\n- raise\n- else:\n- download_tries += 1\n- self._sleep(avg_song_duration, playlist_id)\n-\n- api_data = json.loads(api_json)\n- track_data = api_data['set']['track']\n- info = {\n- 'id': str(track_data['id']),\n- 'url': track_data['track_file_stream_url'],\n- 'title': track_data['performer'] + ' - ' + track_data['name'],\n- 'raw_title': track_data['name'],\n- 'uploader_id': data['user']['login'],\n- 'ext': 'm4a',\n- }\n- entries.append(info)\n-\n- next_url = 'http://8tracks.com/sets/{}/next?player=sm&mix_id={}&format=jsonh&track_id={}'.format(\n- session, mix_id, track_data['id'])\n- return {\n- '_type': 'playlist',\n- 'entries': entries,\n- 'id': str(mix_id),\n- 'display_id': playlist_id,\n- 'title': data.get('name'),\n- 'description': data.get('description'),\n- }\ndiff --git a/yt_dlp/extractor/eitb.py b/yt_dlp/extractor/eitb.py\ndeleted file mode 100644\nindex 18b802eb1550..000000000000\n--- a/yt_dlp/extractor/eitb.py\n+++ /dev/null\n@@ -1,81 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking import Request\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- parse_iso8601,\n-)\n-\n-\n-class EitbIE(InfoExtractor):\n- IE_NAME = 'eitb.tv'\n- _VALID_URL = r'https?://(?:www\\.)?eitb\\.tv/(?:eu/bideoa|es/video)/[^/]+/\\d+/(?P<id>\\d+)'\n-\n- _TEST = {\n- 'url': 'http://www.eitb.tv/es/video/60-minutos-60-minutos-2013-2014/4104995148001/4090227752001/lasa-y-zabala-30-anos/',\n- 'md5': 'edf4436247185adee3ea18ce64c47998',\n- 'info_dict': {\n- 'id': '4090227752001',\n- 'ext': 'mp4',\n- 'title': '60 minutos (Lasa y Zabala, 30 aรฑos)',\n- 'description': 'Programa de reportajes de actualidad.',\n- 'duration': 3996.76,\n- 'timestamp': 1381789200,\n- 'upload_date': '20131014',\n- 'tags': list,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video = self._download_json(\n- f'http://mam.eitb.eus/mam/REST/ServiceMultiweb/Video/MULTIWEBTV/{video_id}/',\n- video_id, 'Downloading video JSON')\n-\n- media = video['web_media'][0]\n-\n- formats = []\n- for rendition in media['RENDITIONS']:\n- video_url = rendition.get('PMD_URL')\n- if not video_url:\n- continue\n- tbr = float_or_none(rendition.get('ENCODING_RATE'), 1000)\n- formats.append({\n- 'url': rendition['PMD_URL'],\n- 'format_id': join_nonempty('http', int_or_none(tbr)),\n- 'width': int_or_none(rendition.get('FRAME_WIDTH')),\n- 'height': int_or_none(rendition.get('FRAME_HEIGHT')),\n- 'tbr': tbr,\n- })\n-\n- hls_url = media.get('HLS_SURL')\n- if hls_url:\n- request = Request(\n- 'http://mam.eitb.eus/mam/REST/ServiceMultiweb/DomainRestrictedSecurity/TokenAuth/',\n- headers={'Referer': url})\n- token_data = self._download_json(\n- request, video_id, 'Downloading auth token', fatal=False)\n- if token_data:\n- token = token_data.get('token')\n- if token:\n- formats.extend(self._extract_m3u8_formats(\n- f'{hls_url}?hdnts={token}', video_id, m3u8_id='hls', fatal=False))\n-\n- hds_url = media.get('HDS_SURL')\n- if hds_url:\n- formats.extend(self._extract_f4m_formats(\n- '{}?hdcore=3.7.0'.format(hds_url.replace('euskalsvod', 'euskalvod')),\n- video_id, f4m_id='hds', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'title': media.get('NAME_ES') or media.get('name') or media['NAME_EU'],\n- 'description': media.get('SHORT_DESC_ES') or video.get('desc_group') or media.get('SHORT_DESC_EU'),\n- 'thumbnail': media.get('STILL_URL') or media.get('THUMBNAIL_URL'),\n- 'duration': float_or_none(media.get('LENGTH'), 1000),\n- 'timestamp': parse_iso8601(media.get('BROADCST_DATE'), ' '),\n- 'tags': media.get('TAGS'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/eyedotv.py b/yt_dlp/extractor/eyedotv.py\ndeleted file mode 100644\nindex b8c67ce4ccb7..000000000000\n--- a/yt_dlp/extractor/eyedotv.py\n+++ /dev/null\n@@ -1,61 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n- xpath_text,\n-)\n-\n-\n-class EyedoTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?eyedo\\.tv/[^/]+/(?:#!/)?Live/Detail/(?P<id>[0-9]+)'\n- _TEST = {\n- 'url': 'https://www.eyedo.tv/en-US/#!/Live/Detail/16301',\n- 'md5': 'ba14f17995cdfc20c36ba40e21bf73f7',\n- 'info_dict': {\n- 'id': '16301',\n- 'ext': 'mp4',\n- 'title': 'Journรฉe du conseil scientifique de l\\'Afnic 2015',\n- 'description': 'md5:4abe07293b2f73efc6e1c37028d58c98',\n- 'uploader': 'Afnic Live',\n- 'uploader_id': '8023',\n- },\n- }\n- _ROOT_URL = 'http://live.eyedo.net:1935/'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- video_data = self._download_xml(f'http://eyedo.tv/api/live/GetLive/{video_id}', video_id)\n-\n- def _add_ns(path):\n- return self._xpath_ns(path, 'http://schemas.datacontract.org/2004/07/EyeDo.Core.Implementation.Web.ViewModels.Api')\n-\n- title = xpath_text(video_data, _add_ns('Titre'), 'title', True)\n- state_live_code = xpath_text(video_data, _add_ns('StateLiveCode'), 'title', True)\n- if state_live_code == 'avenir':\n- raise ExtractorError(\n- f'{self.IE_NAME} said: We\\'re sorry, but this video is not yet available.',\n- expected=True)\n-\n- is_live = state_live_code == 'live'\n- m3u8_url = None\n- # http://eyedo.tv/Content/Html5/Scripts/html5view.js\n- if is_live:\n- if xpath_text(video_data, 'Cdn') == 'true':\n- m3u8_url = f'http://rrr.sz.xlcdn.com/?account=eyedo&file=A{video_id}&type=live&service=wowza&protocol=http&output=playlist.m3u8'\n- else:\n- m3u8_url = self._ROOT_URL + f'w/{video_id}/eyedo_720p/playlist.m3u8'\n- else:\n- m3u8_url = self._ROOT_URL + f'replay-w/{video_id}/mp4:{video_id}.mp4/playlist.m3u8'\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native'),\n- 'description': xpath_text(video_data, _add_ns('Description')),\n- 'duration': parse_duration(xpath_text(video_data, _add_ns('Duration'))),\n- 'uploader': xpath_text(video_data, _add_ns('Createur')),\n- 'uploader_id': xpath_text(video_data, _add_ns('CreateurId')),\n- 'chapter': xpath_text(video_data, _add_ns('ChapitreTitre')),\n- 'chapter_id': xpath_text(video_data, _add_ns('ChapitreId')),\n- }\ndiff --git a/yt_dlp/extractor/footyroom.py b/yt_dlp/extractor/footyroom.py\nindex 797e894d679c..c814af24c8f0 100644\n--- a/yt_dlp/extractor/footyroom.py\n+++ b/yt_dlp/extractor/footyroom.py\n@@ -12,14 +12,6 @@ class FootyRoomIE(InfoExtractor):\n },\n 'playlist_count': 2,\n 'add_ie': [StreamableIE.ie_key()],\n- }, {\n- 'url': 'http://footyroom.com/matches/75817984/georgia-vs-germany/review',\n- 'info_dict': {\n- 'id': '75817984',\n- 'title': 'VIDEO Georgia 0 - 2 Germany',\n- },\n- 'playlist_count': 1,\n- 'add_ie': ['Playwire'],\n }]\n \n def _real_extract(self, url):\n@@ -38,13 +30,6 @@ def _real_extract(self, url):\n payload = video.get('payload')\n if not payload:\n continue\n- playwire_url = self._html_search_regex(\n- r'data-config=\"([^\"]+)\"', payload,\n- 'playwire url', default=None)\n- if playwire_url:\n- entries.append(self.url_result(self._proto_relative_url(\n- playwire_url, 'http:'), 'Playwire'))\n-\n streamable_url = StreamableIE._extract_url(payload)\n if streamable_url:\n entries.append(self.url_result(\ndiff --git a/yt_dlp/extractor/franceinter.py b/yt_dlp/extractor/franceinter.py\ndeleted file mode 100644\nindex 779249b8430a..000000000000\n--- a/yt_dlp/extractor/franceinter.py\n+++ /dev/null\n@@ -1,56 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import month_by_name\n-\n-\n-class FranceInterIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?franceinter\\.fr/emissions/(?P<id>[^?#]+)'\n-\n- _TEST = {\n- 'url': 'https://www.franceinter.fr/emissions/affaires-sensibles/affaires-sensibles-07-septembre-2016',\n- 'md5': '9e54d7bdb6fdc02a841007f8a975c094',\n- 'info_dict': {\n- 'id': 'affaires-sensibles/affaires-sensibles-07-septembre-2016',\n- 'ext': 'mp3',\n- 'title': 'Affaire Cahuzac : le contentieux du compte en Suisse',\n- 'description': 'md5:401969c5d318c061f86bda1fa359292b',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20160907',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- video_url = self._search_regex(\n- r'(?s)<div[^>]+class=[\"\\']page-diffusion[\"\\'][^>]*>.*?<button[^>]+data-url=([\"\\'])(?P<url>(?:(?!\\1).)+)\\1',\n- webpage, 'video url', group='url')\n-\n- title = self._og_search_title(webpage)\n- description = self._og_search_description(webpage)\n- thumbnail = self._html_search_meta(['og:image', 'twitter:image'], webpage)\n-\n- upload_date_str = self._search_regex(\n- r'class=[\"\\']\\s*cover-emission-period\\s*[\"\\'][^>]*>[^<]+\\s+(\\d{1,2}\\s+[^\\s]+\\s+\\d{4})<',\n- webpage, 'upload date', fatal=False)\n- if upload_date_str:\n- upload_date_list = upload_date_str.split()\n- upload_date_list.reverse()\n- upload_date_list[1] = '%02d' % (month_by_name(upload_date_list[1], lang='fr') or 0)\n- upload_date_list[2] = '%02d' % int(upload_date_list[2])\n- upload_date = ''.join(upload_date_list)\n- else:\n- upload_date = None\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- 'formats': [{\n- 'url': video_url,\n- 'vcodec': 'none',\n- }],\n- }\ndiff --git a/yt_dlp/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py\ndeleted file mode 100644\nindex 3319b126811a..000000000000\n--- a/yt_dlp/extractor/fujitv.py\n+++ /dev/null\n@@ -1,73 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-\n-\n-class FujiTVFODPlus7IE(InfoExtractor):\n- _VALID_URL = r'https?://fod\\.fujitv\\.co\\.jp/title/(?P<sid>[0-9a-z]{4})/(?P<id>[0-9a-z]+)'\n- _BASE_URL = 'https://i.fod.fujitv.co.jp/'\n- _BITRATE_MAP = {\n- 300: (320, 180),\n- 800: (640, 360),\n- 1200: (1280, 720),\n- 2000: (1280, 720),\n- 4000: (1920, 1080),\n- }\n-\n- _TESTS = [{\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40110076',\n- 'info_dict': {\n- 'id': '5d40110076',\n- 'ext': 'ts',\n- 'title': '#1318 ใใพใๅญใใพใผใใใฎๆด้คจใ่ฆใใใฎๅทป',\n- 'series': 'ใกใณใพใๅญใกใใ',\n- 'series_id': '5d40',\n- 'description': 'md5:b3f51dbfdda162ac4f789e0ff4d65750',\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40110076_a.jpg',\n- },\n- }, {\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40810083',\n- 'info_dict': {\n- 'id': '5d40810083',\n- 'ext': 'ts',\n- 'title': '#1324 ใใพใๅญใจใชใใฎๅญใใฎๅทป๏ผใ็ตๆ๏ผ2ๆใใ ใใซใใชใไผใใฎๅทป',\n- 'description': 'md5:3972d900b896adc8ab1849e310507efa',\n- 'series': 'ใกใณใพใๅญใกใใ',\n- 'series_id': '5d40',\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40810083_a.jpg'},\n- 'skip': 'Video available only in one week',\n- }]\n-\n- def _real_extract(self, url):\n- series_id, video_id = self._match_valid_url(url).groups()\n- self._request_webpage(HEADRequest(url), video_id)\n- json_info = {}\n- token = self._get_cookies(url).get('CT')\n- if token:\n- json_info = self._download_json(\n- f'https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id={video_id}&is_premium=false',\n- video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)\n- else:\n- self.report_warning(f'The token cookie is needed to extract video metadata. {self._login_hint(\"cookies\")}')\n- formats, subtitles = [], {}\n- src_json = self._download_json(f'{self._BASE_URL}abrjson_v2/tv_android/{video_id}', video_id)\n- for src in src_json['video_selector']:\n- if not src.get('url'):\n- continue\n- fmt, subs = self._extract_m3u8_formats_and_subtitles(src['url'], video_id, 'ts')\n- for f in fmt:\n- f.update(dict(zip(('height', 'width'),\n- self._BITRATE_MAP.get(f.get('tbr'), ()), strict=False)))\n- formats.extend(fmt)\n- subtitles = self._merge_subtitles(subtitles, subs)\n-\n- return {\n- 'id': video_id,\n- 'title': json_info.get('ep_title'),\n- 'series': json_info.get('lu_title'),\n- 'series_id': series_id,\n- 'description': json_info.get('ep_description'),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': f'{self._BASE_URL}img/program/{series_id}/episode/{video_id}_a.jpg',\n- '_format_sort_fields': ('tbr', ),\n- }\ndiff --git a/yt_dlp/extractor/gab.py b/yt_dlp/extractor/gab.py\nindex 024628e1ca0b..2684073301c3 100644\n--- a/yt_dlp/extractor/gab.py\n+++ b/yt_dlp/extractor/gab.py\n@@ -1,70 +1,13 @@\n-import re\n-\n from .common import InfoExtractor\n from ..utils import (\n clean_html,\n int_or_none,\n parse_codecs,\n parse_duration,\n- str_to_int,\n unified_timestamp,\n )\n \n \n-class GabTVIE(InfoExtractor):\n- _VALID_URL = r'https?://tv\\.gab\\.com/channel/[^/]+/view/(?P<id>[a-z0-9-]+)'\n- _TESTS = [{\n- 'url': 'https://tv.gab.com/channel/wurzelroot/view/why-was-america-in-afghanistan-61217eacea5665de450d0488',\n- 'info_dict': {\n- 'id': '61217eacea5665de450d0488',\n- 'ext': 'mp4',\n- 'title': 'WHY WAS AMERICA IN AFGHANISTAN - AMERICA FIRST AGAINST AMERICAN OLIGARCHY',\n- 'uploader': 'Wurzelroot',\n- 'uploader_id': '608fb0a85738fd1974984f7d',\n- 'thumbnail': 'https://tv.gab.com/image/61217eacea5665de450d0488',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url).split('-')[-1]\n- webpage = self._download_webpage(url, video_id)\n- channel_id = self._search_regex(r'data-channel-id=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'channel_id')\n- channel_name = self._search_regex(r'data-channel-name=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'channel_name')\n- title = self._search_regex(r'data-episode-title=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'title')\n- view_key = self._search_regex(r'data-view-key=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'view_key')\n- description = clean_html(\n- self._html_search_regex(self._meta_regex('description'), webpage, 'description', group='content')) or None\n- available_resolutions = re.findall(\n- rf'<a\\ data-episode-id=\\\"{video_id}\\\"\\ data-resolution=\\\"(?P<resolution>[^\\\"]+)', webpage)\n-\n- formats = []\n- for resolution in available_resolutions:\n- frmt = {\n- 'url': f'https://tv.gab.com/media/{video_id}?viewKey={view_key}&r={resolution}',\n- 'format_id': resolution,\n- 'vcodec': 'h264',\n- 'acodec': 'aac',\n- 'ext': 'mp4',\n- }\n- if 'audio-' in resolution:\n- frmt['abr'] = str_to_int(resolution.replace('audio-', ''))\n- frmt['height'] = 144\n- frmt['quality'] = -10\n- else:\n- frmt['height'] = str_to_int(resolution.replace('p', ''))\n- formats.append(frmt)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'description': description,\n- 'uploader': channel_name,\n- 'uploader_id': channel_id,\n- 'thumbnail': f'https://tv.gab.com/image/{video_id}',\n- }\n-\n-\n class GabIE(InfoExtractor):\n _VALID_URL = r'https?://(?:www\\.)?gab\\.com/[^/]+/posts/(?P<id>\\d+)'\n _TESTS = [{\ndiff --git a/yt_dlp/extractor/googlepodcasts.py b/yt_dlp/extractor/googlepodcasts.py\ndeleted file mode 100644\nindex 8d1cc4fa119a..000000000000\n--- a/yt_dlp/extractor/googlepodcasts.py\n+++ /dev/null\n@@ -1,84 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_podcast_url,\n- int_or_none,\n- try_get,\n- urlencode_postdata,\n-)\n-\n-\n-class GooglePodcastsBaseIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://podcasts\\.google\\.com/feed/'\n-\n- def _batch_execute(self, func_id, video_id, params):\n- return json.loads(self._download_json(\n- 'https://podcasts.google.com/_/PodcastsUi/data/batchexecute',\n- video_id, data=urlencode_postdata({\n- 'f.req': json.dumps([[[func_id, json.dumps(params), None, '1']]]),\n- }), transform_source=lambda x: self._search_regex(r'(?s)(\\[.+\\])', x, 'data'))[0][2])\n-\n- def _extract_episode(self, episode):\n- return {\n- 'id': episode[4][3],\n- 'title': episode[8],\n- 'url': clean_podcast_url(episode[13]),\n- 'thumbnail': episode[2],\n- 'description': episode[9],\n- 'creator': try_get(episode, lambda x: x[14]),\n- 'timestamp': int_or_none(episode[11]),\n- 'duration': int_or_none(episode[12]),\n- 'series': episode[1],\n- }\n-\n-\n-class GooglePodcastsIE(GooglePodcastsBaseIE):\n- IE_NAME = 'google:podcasts'\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<feed_url>[^/]+)/episode/(?P<id>[^/?&#]+)'\n- _TEST = {\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA/episode/MzBlNWRlN2UtOWE4Yy00ODcwLTk2M2MtM2JlMmUyNmViOTRh',\n- 'md5': 'fa56b2ee8bd0703e27e42d4b104c4766',\n- 'info_dict': {\n- 'id': '30e5de7e-9a8c-4870-963c-3be2e26eb94a',\n- 'ext': 'mp3',\n- 'title': 'WWDTM New Year 2021',\n- 'description': 'We say goodbye to 2020 with Christine Baranksi, Doug Jones, Jonna Mendez, and Kellee Edwards.',\n- 'upload_date': '20210102',\n- 'timestamp': 1609606800,\n- 'duration': 2901,\n- 'series': \"Wait Wait... Don't Tell Me!\",\n- },\n- }\n-\n- def _real_extract(self, url):\n- b64_feed_url, b64_guid = self._match_valid_url(url).groups()\n- episode = self._batch_execute(\n- 'oNjqVe', b64_guid, [b64_feed_url, b64_guid])[1]\n- return self._extract_episode(episode)\n-\n-\n-class GooglePodcastsFeedIE(GooglePodcastsBaseIE):\n- IE_NAME = 'google:podcasts:feed'\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<id>[^/?&#]+)/?(?:[?#&]|$)'\n- _TEST = {\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA',\n- 'info_dict': {\n- 'title': \"Wait Wait... Don't Tell Me!\",\n- 'description': \"NPR's weekly current events quiz. Have a laugh and test your news knowledge while figuring out what's real and what we've made up.\",\n- },\n- 'playlist_mincount': 20,\n- }\n-\n- def _real_extract(self, url):\n- b64_feed_url = self._match_id(url)\n- data = self._batch_execute('ncqJEe', b64_feed_url, [b64_feed_url])\n-\n- entries = []\n- for episode in (try_get(data, lambda x: x[1][0]) or []):\n- entries.append(self._extract_episode(episode))\n-\n- feed = try_get(data, lambda x: x[3]) or []\n- return self.playlist_result(\n- entries, playlist_title=try_get(feed, lambda x: x[0]),\n- playlist_description=try_get(feed, lambda x: x[2]))\ndiff --git a/yt_dlp/extractor/goshgay.py b/yt_dlp/extractor/goshgay.py\ndeleted file mode 100644\nindex 7bcac9bdeaa0..000000000000\n--- a/yt_dlp/extractor/goshgay.py\n+++ /dev/null\n@@ -1,47 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_duration,\n-)\n-\n-\n-class GoshgayIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?goshgay\\.com/video(?P<id>\\d+?)($|/)'\n- _TEST = {\n- 'url': 'http://www.goshgay.com/video299069/diesel_sfw_xxx_video',\n- 'md5': '4b6db9a0a333142eb9f15913142b0ed1',\n- 'info_dict': {\n- 'id': '299069',\n- 'ext': 'flv',\n- 'title': 'DIESEL SFW XXX Video',\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- 'duration': 80,\n- 'age_limit': 18,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(\n- r'<h2>(.*?)<', webpage, 'title')\n- duration = parse_duration(self._html_search_regex(\n- r'<span class=\"duration\">\\s*-?\\s*(.*?)</span>',\n- webpage, 'duration', fatal=False))\n-\n- flashvars = urllib.parse.parse_qs(self._html_search_regex(\n- r'<embed.+?id=\"flash-player-embed\".+?flashvars=\"([^\"]+)\"',\n- webpage, 'flashvars'))\n- thumbnail = flashvars.get('url_bigthumb', [None])[0]\n- video_url = flashvars['flv_url'][0]\n-\n- return {\n- 'id': video_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- 'age_limit': 18,\n- }\ndiff --git a/yt_dlp/extractor/gputechconf.py b/yt_dlp/extractor/gputechconf.py\ndeleted file mode 100644\nindex f31791a718b9..000000000000\n--- a/yt_dlp/extractor/gputechconf.py\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class GPUTechConfIE(InfoExtractor):\n- _VALID_URL = r'https?://on-demand\\.gputechconf\\.com/gtc/2015/video/S(?P<id>\\d+)\\.html'\n- _TEST = {\n- 'url': 'http://on-demand.gputechconf.com/gtc/2015/video/S5156.html',\n- 'md5': 'a8862a00a0fd65b8b43acc5b8e33f798',\n- 'info_dict': {\n- 'id': '5156',\n- 'ext': 'mp4',\n- 'title': 'Coordinating More Than 3 Million CUDA Threads for Social Network Analysis',\n- 'duration': 1219,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- root_path = self._search_regex(\n- r'var\\s+rootPath\\s*=\\s*\"([^\"]+)', webpage, 'root path',\n- default='http://evt.dispeak.com/nvidia/events/gtc15/')\n- xml_file_id = self._search_regex(\n- r'var\\s+xmlFileId\\s*=\\s*\"([^\"]+)', webpage, 'xml file id')\n-\n- return {\n- '_type': 'url_transparent',\n- 'id': video_id,\n- 'url': f'{root_path}xml/{xml_file_id}.xml',\n- 'ie_key': 'DigitallySpeaking',\n- }\ndiff --git a/yt_dlp/extractor/hketv.py b/yt_dlp/extractor/hketv.py\ndeleted file mode 100644\nindex 3998abc121cd..000000000000\n--- a/yt_dlp/extractor/hketv.py\n+++ /dev/null\n@@ -1,183 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- int_or_none,\n- merge_dicts,\n- parse_count,\n- str_or_none,\n- try_get,\n- unified_strdate,\n- urlencode_postdata,\n- urljoin,\n-)\n-\n-\n-class HKETVIE(InfoExtractor):\n- IE_NAME = 'hketv'\n- IE_DESC = '้ฆๆธฏๆ่ฒๅฑๆ่ฒ้ป่ฆ (HKETV) Educational Television, Hong Kong Educational Bureau'\n- _GEO_BYPASS = False\n- _GEO_COUNTRIES = ['HK']\n- _VALID_URL = r'https?://(?:www\\.)?hkedcity\\.net/etv/resource/(?P<id>[0-9]+)'\n- _TESTS = [{\n- 'url': 'https://www.hkedcity.net/etv/resource/2932360618',\n- 'md5': 'f193712f5f7abb208ddef3c5ea6ed0b7',\n- 'info_dict': {\n- 'id': '2932360618',\n- 'ext': 'mp4',\n- 'title': 'ๅ้ฑไธ็(ๅ
ฑไบซ้ฑ่ฎๆจ) (ไธญใ่ฑๆๅญๅนๅฏไพ้ธๆ)',\n- 'description': 'md5:d5286d05219ef50e0613311cbe96e560',\n- 'upload_date': '20181024',\n- 'duration': 900,\n- 'subtitles': 'count:2',\n- },\n- 'skip': 'Geo restricted to HK',\n- }, {\n- 'url': 'https://www.hkedcity.net/etv/resource/972641418',\n- 'md5': '1ed494c1c6cf7866a8290edad9b07dc9',\n- 'info_dict': {\n- 'id': '972641418',\n- 'ext': 'mp4',\n- 'title': '่กฃๅ ๆฅๆฅ (ๅคฉไฝฟ็ณปๅไนไธ)',\n- 'description': 'md5:10bb3d659421e74f58e5db5691627b0f',\n- 'upload_date': '20070109',\n- 'duration': 907,\n- 'subtitles': {},\n- },\n- 'skip': 'Geo restricted to HK',\n- }]\n-\n- _CC_LANGS = {\n- 'ไธญๆ๏ผ็น้ซไธญๆ๏ผ': 'zh-Hant',\n- 'ไธญๆ๏ผ็ฎไฝไธญๆ๏ผ': 'zh-Hans',\n- 'English': 'en',\n- 'Bahasa Indonesia': 'id',\n- '\\u0939\\u093f\\u0928\\u094d\\u0926\\u0940': 'hi',\n- '\\u0928\\u0947\\u092a\\u093e\\u0932\\u0940': 'ne',\n- 'Tagalog': 'tl',\n- '\\u0e44\\u0e17\\u0e22': 'th',\n- '\\u0627\\u0631\\u062f\\u0648': 'ur',\n- }\n- _FORMAT_HEIGHTS = {\n- 'SD': 360,\n- 'HD': 720,\n- }\n- _APPS_BASE_URL = 'https://apps.hkedcity.net'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = (\n- self._html_search_meta(\n- ('ed_title', 'search.ed_title'), webpage, default=None)\n- or self._search_regex(\n- r'data-favorite_title_(?:eng|chi)=([\"\\'])(?P<id>(?:(?!\\1).)+)\\1',\n- webpage, 'title', default=None, group='url')\n- or self._html_search_regex(\n- r'<h1>([^<]+)</h1>', webpage, 'title', default=None)\n- or self._og_search_title(webpage)\n- )\n-\n- file_id = self._search_regex(\n- r'post_var\\[[\"\\']file_id[\"\\']\\s*\\]\\s*=\\s*(.+?);',\n- webpage, 'file ID')\n- curr_url = self._search_regex(\n- r'post_var\\[[\"\\']curr_url[\"\\']\\s*\\]\\s*=\\s*\"(.+?)\";',\n- webpage, 'curr URL')\n- data = {\n- 'action': 'get_info',\n- 'curr_url': curr_url,\n- 'file_id': file_id,\n- 'video_url': file_id,\n- }\n-\n- response = self._download_json(\n- self._APPS_BASE_URL + '/media/play/handler.php', video_id,\n- data=urlencode_postdata(data),\n- headers=merge_dicts({\n- 'Content-Type': 'application/x-www-form-urlencoded'},\n- self.geo_verification_headers()))\n-\n- result = response['result']\n-\n- if not response.get('success') or not response.get('access'):\n- error = clean_html(response.get('access_err_msg'))\n- if 'Video streaming is not available in your country' in error:\n- self.raise_geo_restricted(\n- msg=error, countries=self._GEO_COUNTRIES)\n- else:\n- raise ExtractorError(error, expected=True)\n-\n- formats = []\n-\n- width = int_or_none(result.get('width'))\n- height = int_or_none(result.get('height'))\n-\n- playlist0 = result['playlist'][0]\n- for fmt in playlist0['sources']:\n- file_url = urljoin(self._APPS_BASE_URL, fmt.get('file'))\n- if not file_url:\n- continue\n- # If we ever wanted to provide the final resolved URL that\n- # does not require cookies, albeit with a shorter lifespan:\n- # urlh = self._downloader.urlopen(file_url)\n- # resolved_url = urlh.url\n- label = fmt.get('label')\n- h = self._FORMAT_HEIGHTS.get(label)\n- w = h * width // height if h and width and height else None\n- formats.append({\n- 'format_id': label,\n- 'ext': fmt.get('type'),\n- 'url': file_url,\n- 'width': w,\n- 'height': h,\n- })\n-\n- subtitles = {}\n- tracks = try_get(playlist0, lambda x: x['tracks'], list) or []\n- for track in tracks:\n- if not isinstance(track, dict):\n- continue\n- track_kind = str_or_none(track.get('kind'))\n- if not track_kind or not isinstance(track_kind, str):\n- continue\n- if track_kind.lower() not in ('captions', 'subtitles'):\n- continue\n- track_url = urljoin(self._APPS_BASE_URL, track.get('file'))\n- if not track_url:\n- continue\n- track_label = track.get('label')\n- subtitles.setdefault(self._CC_LANGS.get(\n- track_label, track_label), []).append({\n- 'url': self._proto_relative_url(track_url),\n- 'ext': 'srt',\n- })\n-\n- # Likes\n- emotion = self._download_json(\n- 'https://emocounter.hkedcity.net/handler.php', video_id,\n- data=urlencode_postdata({\n- 'action': 'get_emotion',\n- 'data[bucket_id]': 'etv',\n- 'data[identifier]': video_id,\n- }),\n- headers={'Content-Type': 'application/x-www-form-urlencoded'},\n- fatal=False) or {}\n- like_count = int_or_none(try_get(\n- emotion, lambda x: x['data']['emotion_data'][0]['count']))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': self._html_search_meta(\n- 'description', webpage, fatal=False),\n- 'upload_date': unified_strdate(self._html_search_meta(\n- 'ed_date', webpage, fatal=False), day_first=False),\n- 'duration': int_or_none(result.get('length')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': urljoin(self._APPS_BASE_URL, result.get('image')),\n- 'view_count': parse_count(result.get('view_count')),\n- 'like_count': like_count,\n- }\ndiff --git a/yt_dlp/extractor/idolplus.py b/yt_dlp/extractor/idolplus.py\ndeleted file mode 100644\nindex 3c905b071234..000000000000\n--- a/yt_dlp/extractor/idolplus.py\n+++ /dev/null\n@@ -1,115 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import traverse_obj, try_call, url_or_none\n-\n-\n-class IdolPlusIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?idolplus\\.com/z[us]/(?:concert/|contents/?\\?(?:[^#]+&)?albumId=)(?P<id>\\w+)'\n- _TESTS = [{\n- 'url': 'https://idolplus.com/zs/contents?albumId=M012077298PPV00',\n- 'md5': '2ace3f4661c943a2f7e79f0b88cea1e7',\n- 'info_dict': {\n- 'id': 'M012077298PPV00',\n- 'ext': 'mp4',\n- 'title': '[MultiCam] Aegyo on Top of Aegyo (IZ*ONE EATING TRIP)',\n- 'release_date': '20200707',\n- 'formats': 'count:65',\n- },\n- 'params': {'format': '532-KIM_MINJU'},\n- }, {\n- 'url': 'https://idolplus.com/zs/contents?albumId=M01232H058PPV00&catId=E9TX5',\n- 'info_dict': {\n- 'id': 'M01232H058PPV00',\n- 'ext': 'mp4',\n- 'title': 'YENA (CIRCLE CHART MUSIC AWARDS 2022 RED CARPET)',\n- 'release_date': '20230218',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }, {\n- # live stream\n- 'url': 'https://idolplus.com/zu/contents?albumId=M012323174PPV00',\n- 'info_dict': {\n- 'id': 'M012323174PPV00',\n- 'ext': 'mp4',\n- 'title': 'Hanteo Music Awards 2022 DAY2',\n- 'release_date': '20230211',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }, {\n- 'url': 'https://idolplus.com/zs/concert/M012323039PPV00',\n- 'info_dict': {\n- 'id': 'M012323039PPV00',\n- 'ext': 'mp4',\n- 'title': 'CIRCLE CHART MUSIC AWARDS 2022',\n- 'release_date': '20230218',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_list = traverse_obj(self._download_json(\n- 'https://idolplus.com/api/zs/viewdata/ruleset/build', video_id,\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\n- 'rulesetId': 'contents',\n- 'albumId': video_id,\n- 'distribute': 'PRD',\n- 'loggedIn': 'false',\n- 'region': 'zs',\n- 'countryGroup': '00010',\n- 'lang': 'en',\n- 'saId': '999999999998',\n- }), ('data', 'viewData', ...))\n-\n- player_data = {}\n- while data_list:\n- player_data = data_list.pop()\n- if traverse_obj(player_data, 'type') == 'player':\n- break\n- elif traverse_obj(player_data, ('dataList', ...)):\n- data_list += player_data['dataList']\n-\n- formats = self._extract_m3u8_formats(traverse_obj(player_data, (\n- 'vodPlayerList', 'vodProfile', 0, 'vodServer', 0, 'video_url', {url_or_none})), video_id)\n-\n- subtitles = {}\n- for caption in traverse_obj(player_data, ('vodPlayerList', 'caption')) or []:\n- subtitles.setdefault(caption.get('lang') or 'und', []).append({\n- 'url': caption.get('smi_url'),\n- 'ext': 'vtt',\n- })\n-\n- # Add member multicams as alternative formats\n- if (traverse_obj(player_data, ('detail', 'has_cuesheet')) == 'Y'\n- and traverse_obj(player_data, ('detail', 'is_omni_member')) == 'Y'):\n- cuesheet = traverse_obj(self._download_json(\n- 'https://idolplus.com/gapi/contents/v1.0/content/cuesheet', video_id,\n- 'Downloading JSON metadata for member multicams',\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\n- 'ALBUM_ID': video_id,\n- 'COUNTRY_GRP': '00010',\n- 'LANG': 'en',\n- 'SA_ID': '999999999998',\n- 'COUNTRY_CODE': 'KR',\n- }), ('data', 'cuesheet_item', 0))\n-\n- for member in traverse_obj(cuesheet, ('members', ...)):\n- index = try_call(lambda: int(member['omni_view_index']) - 1)\n- member_video_url = traverse_obj(cuesheet, ('omni_view', index, 'cdn_url', 0, 'url', {url_or_none}))\n- if not member_video_url:\n- continue\n- member_formats = self._extract_m3u8_formats(\n- member_video_url, video_id, note=f'Downloading m3u8 for multicam {member[\"name\"]}')\n- for mf in member_formats:\n- mf['format_id'] = f'{mf[\"format_id\"]}-{member[\"name\"].replace(\" \", \"_\")}'\n- formats.extend(member_formats)\n-\n- return {\n- 'id': video_id,\n- 'title': traverse_obj(player_data, ('detail', 'albumName')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'release_date': traverse_obj(player_data, ('detail', 'broadcastDate')),\n- }\ndiff --git a/yt_dlp/extractor/infoq.py b/yt_dlp/extractor/infoq.py\nindex 5274c9339fa8..533592229380 100644\n--- a/yt_dlp/extractor/infoq.py\n+++ b/yt_dlp/extractor/infoq.py\n@@ -1,7 +1,7 @@\n import base64\n import urllib.parse\n \n-from .bokecc import BokeCCBaseIE\n+from .common import InfoExtractor\n from ..utils import (\n ExtractorError,\n determine_ext,\n@@ -10,7 +10,7 @@\n )\n \n \n-class InfoQIE(BokeCCBaseIE):\n+class InfoQIE(InfoExtractor):\n _VALID_URL = r'https?://(?:www\\.)?infoq\\.com/(?:[^/]+/)+(?P<id>[^/]+)'\n \n _TESTS = [{\n@@ -117,14 +117,10 @@ def _real_extract(self, url):\n video_title = self._html_extract_title(webpage)\n video_description = self._html_search_meta('description', webpage, 'description')\n \n- if '/cn/' in url:\n- # for China videos, HTTP video URL exists but always fails with 403\n- formats = self._extract_bokecc_formats(webpage, video_id)\n- else:\n- formats = (\n- self._extract_rtmp_video(webpage)\n- + self._extract_http_video(webpage)\n- + self._extract_http_audio(webpage, video_id))\n+ formats = (\n+ self._extract_rtmp_video(webpage)\n+ + self._extract_http_video(webpage)\n+ + self._extract_http_audio(webpage, video_id))\n \n return {\n 'id': video_id,\ndiff --git a/yt_dlp/extractor/internetvideoarchive.py b/yt_dlp/extractor/internetvideoarchive.py\ndeleted file mode 100644\nindex 9d2574cb068d..000000000000\n--- a/yt_dlp/extractor/internetvideoarchive.py\n+++ /dev/null\n@@ -1,58 +0,0 @@\n-import json\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import parse_qs\n-\n-\n-class InternetVideoArchiveIE(InfoExtractor):\n- _VALID_URL = r'https?://video\\.internetvideoarchive\\.net/(?:player|flash/players)/.*?\\?.*?publishedid.*?'\n-\n- _TEST = {\n- 'url': 'http://video.internetvideoarchive.net/player/6/configuration.ashx?customerid=69249&publishedid=194487&reporttag=vdbetatitle&playerid=641&autolist=0&domain=www.videodetective.com&maxrate=high&minrate=low&socialplayer=false',\n- 'info_dict': {\n- 'id': '194487',\n- 'ext': 'mp4',\n- 'title': 'Kick-Ass 2',\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- @staticmethod\n- def _build_json_url(query):\n- return 'http://video.internetvideoarchive.net/player/6/configuration.ashx?' + query\n-\n- def _real_extract(self, url):\n- query = parse_qs(url)\n- video_id = query['publishedid'][0]\n- data = self._download_json(\n- 'https://video.internetvideoarchive.net/videojs7/videojs7.ivasettings.ashx',\n- video_id, data=json.dumps({\n- 'customerid': query['customerid'][0],\n- 'publishedid': video_id,\n- }).encode())\n- title = data['Title']\n- formats = self._extract_m3u8_formats(\n- data['VideoUrl'], video_id, 'mp4',\n- 'm3u8_native', m3u8_id='hls', fatal=False)\n- file_url = formats[0]['url']\n- if '.ism/' in file_url:\n- replace_url = lambda x: re.sub(r'\\.ism/[^?]+', '.ism/' + x, file_url)\n- formats.extend(self._extract_f4m_formats(\n- replace_url('.f4m'), video_id, f4m_id='hds', fatal=False))\n- formats.extend(self._extract_mpd_formats(\n- replace_url('.mpd'), video_id, mpd_id='dash', fatal=False))\n- formats.extend(self._extract_ism_formats(\n- replace_url('Manifest'), video_id, ism_id='mss', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnail': data.get('PosterUrl'),\n- 'description': data.get('Description'),\n- }\ndiff --git a/yt_dlp/extractor/izlesene.py b/yt_dlp/extractor/izlesene.py\ndeleted file mode 100644\nindex cf2a269c38f6..000000000000\n--- a/yt_dlp/extractor/izlesene.py\n+++ /dev/null\n@@ -1,111 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- float_or_none,\n- get_element_by_id,\n- int_or_none,\n- parse_iso8601,\n- str_to_int,\n-)\n-\n-\n-class IzleseneIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://(?:(?:www|m)\\.)?izlesene\\.com/\n- (?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)\n- '''\n- _TESTS = [\n- {\n- 'url': 'http://www.izlesene.com/video/sevincten-cildirtan-dogum-gunu-hediyesi/7599694',\n- 'md5': '4384f9f0ea65086734b881085ee05ac2',\n- 'info_dict': {\n- 'id': '7599694',\n- 'ext': 'mp4',\n- 'title': 'Sevinรงten รฤฑldฤฑrtan Doฤum Gรผnรผ Hediyesi',\n- 'description': 'md5:253753e2655dde93f59f74b572454f6d',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'uploader_id': 'pelikzzle',\n- 'timestamp': int,\n- 'upload_date': '20140702',\n- 'duration': 95.395,\n- 'age_limit': 0,\n- },\n- },\n- {\n- 'url': 'http://www.izlesene.com/video/tarkan-dortmund-2006-konseri/17997',\n- 'md5': '97f09b6872bffa284cb7fa4f6910cb72',\n- 'info_dict': {\n- 'id': '17997',\n- 'ext': 'mp4',\n- 'title': 'Tarkan Dortmund 2006 Konseri',\n- 'thumbnail': r're:^https://.*\\.jpg',\n- 'uploader_id': 'parlayankiz',\n- 'timestamp': int,\n- 'upload_date': '20061112',\n- 'duration': 253.666,\n- 'age_limit': 0,\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(f'http://www.izlesene.com/video/{video_id}', video_id)\n-\n- video = self._parse_json(\n- self._search_regex(\n- r'videoObj\\s*=\\s*({.+?})\\s*;\\s*\\n', webpage, 'streams'),\n- video_id)\n-\n- title = video.get('videoTitle') or self._og_search_title(webpage)\n-\n- formats = []\n- for stream in video['media']['level']:\n- source_url = stream.get('source')\n- if not source_url or not isinstance(source_url, str):\n- continue\n- ext = determine_ext(url, 'mp4')\n- quality = stream.get('value')\n- height = int_or_none(quality)\n- formats.append({\n- 'format_id': f'{quality}p' if quality else 'sd',\n- 'url': urllib.parse.unquote(source_url),\n- 'ext': ext,\n- 'height': height,\n- })\n-\n- description = self._og_search_description(webpage, default=None)\n- thumbnail = video.get('posterURL') or self._proto_relative_url(\n- self._og_search_thumbnail(webpage), scheme='http:')\n-\n- uploader = self._html_search_regex(\n- r\"adduserUsername\\s*=\\s*'([^']+)';\",\n- webpage, 'uploader', fatal=False)\n- timestamp = parse_iso8601(self._html_search_meta(\n- 'uploadDate', webpage, 'upload date'))\n-\n- duration = float_or_none(video.get('duration') or self._html_search_regex(\n- r'videoduration[\"\\']?\\s*=\\s*([\"\\'])(?P<value>(?:(?!\\1).)+)\\1',\n- webpage, 'duration', fatal=False, group='value'), scale=1000)\n-\n- view_count = str_to_int(get_element_by_id('videoViewCount', webpage))\n- comment_count = self._html_search_regex(\n- r'comment_count\\s*=\\s*\\'([^\\']+)\\';',\n- webpage, 'comment_count', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'uploader_id': uploader,\n- 'timestamp': timestamp,\n- 'duration': duration,\n- 'view_count': int_or_none(view_count),\n- 'comment_count': int_or_none(comment_count),\n- 'age_limit': self._family_friendly_search(webpage),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/kinja.py b/yt_dlp/extractor/kinja.py\ndeleted file mode 100644\nindex 67c089104c65..000000000000\n--- a/yt_dlp/extractor/kinja.py\n+++ /dev/null\n@@ -1,206 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n- strip_or_none,\n- try_get,\n-)\n-\n-\n-class KinjaEmbedIE(InfoExtractor):\n- IE_NAME = 'kinja:embed'\n- _DOMAIN_REGEX = r'''(?:[^.]+\\.)?\n- (?:\n- avclub|\n- clickhole|\n- deadspin|\n- gizmodo|\n- jalopnik|\n- jezebel|\n- kinja|\n- kotaku|\n- lifehacker|\n- splinternews|\n- the(?:inventory|onion|root|takeout)\n- )\\.com'''\n- _COMMON_REGEX = r'''/\n- (?:\n- ajax/inset|\n- embed/video\n- )/iframe\\?.*?\\bid='''\n- _VALID_URL = rf'''(?x)https?://{_DOMAIN_REGEX}{_COMMON_REGEX}\n- (?P<type>\n- fb|\n- imgur|\n- instagram|\n- jwp(?:layer)?-video|\n- kinjavideo|\n- mcp|\n- megaphone|\n- soundcloud(?:-playlist)?|\n- tumblr-post|\n- twitch-stream|\n- twitter|\n- ustream-channel|\n- vimeo|\n- vine|\n- youtube-(?:list|video)\n- )-(?P<id>[^&]+)'''\n- _EMBED_REGEX = [rf'(?x)<iframe[^>]+?src=(?P<q>[\"\\'])(?P<url>(?:(?:https?:)?//{_DOMAIN_REGEX})?{_COMMON_REGEX}(?:(?!\\1).)+)\\1']\n- _TESTS = [{\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=fb-10103303356633621',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=kinjavideo-100313',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=megaphone-PPY1300931075',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-128574047',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-playlist-317413750',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=tumblr-post-160130699814-daydreams-at-midnight',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitch-stream-libratus_extra',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitter-1068875942473404422',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=ustream-channel-10414700',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vimeo-120153502',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vine-5BlvV5qqPrD',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-list-BCQ3KyrPjgA/PLE6509247C270A72E',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-video-00QyL0AgPAE',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'http://www.clickhole.com/video/dont-understand-bitcoin-man-will-mumble-explanatio-2537',\n- 'info_dict': {\n- 'id': '106351',\n- 'ext': 'mp4',\n- 'title': 'Donโt Understand Bitcoin? This Man Will Mumble An Explanation At You',\n- },\n- 'skip': 'Invalid URL',\n- }]\n- _JWPLATFORM_PROVIDER = ('cdn.jwplayer.com/v2/media/', 'JWPlatform')\n- _PROVIDER_MAP = {\n- 'fb': ('facebook.com/video.php?v=', 'Facebook'),\n- 'imgur': ('imgur.com/', 'Imgur'),\n- 'instagram': ('instagram.com/p/', 'Instagram'),\n- 'jwplayer-video': _JWPLATFORM_PROVIDER,\n- 'jwp-video': _JWPLATFORM_PROVIDER,\n- 'megaphone': ('player.megaphone.fm/', 'Generic'),\n- 'soundcloud': ('api.soundcloud.com/tracks/', 'Soundcloud'),\n- 'soundcloud-playlist': ('api.soundcloud.com/playlists/', 'SoundcloudPlaylist'),\n- 'tumblr-post': ('%s.tumblr.com/post/%s', 'Tumblr'),\n- 'twitch-stream': ('twitch.tv/', 'TwitchStream'),\n- 'twitter': ('twitter.com/i/cards/tfw/v1/', 'TwitterCard'),\n- 'ustream-channel': ('ustream.tv/embed/', 'Ustream'),\n- 'vimeo': ('vimeo.com/', 'Vimeo'),\n- 'vine': ('vine.co/v/', 'Vine'),\n- 'youtube-list': ('youtube.com/embed/%s?list=%s', 'YoutubePlaylist'),\n- 'youtube-video': ('youtube.com/embed/', 'Youtube'),\n- }\n-\n- def _real_extract(self, url):\n- video_type, video_id = self._match_valid_url(url).groups()\n-\n- provider = self._PROVIDER_MAP.get(video_type)\n- if provider:\n- video_id = urllib.parse.unquote(video_id)\n- if video_type == 'tumblr-post':\n- video_id, blog = video_id.split('-', 1)\n- result_url = provider[0] % (blog, video_id)\n- elif video_type == 'youtube-list':\n- video_id, playlist_id = video_id.split('/')\n- result_url = provider[0] % (video_id, playlist_id)\n- else:\n- result_url = provider[0] + video_id\n- return self.url_result('http://' + result_url, provider[1])\n-\n- if video_type == 'kinjavideo':\n- data = self._download_json(\n- 'https://kinja.com/api/core/video/views/videoById',\n- video_id, query={'videoId': video_id})['data']\n- title = data['title']\n-\n- formats = []\n- for k in ('signedPlaylist', 'streaming'):\n- m3u8_url = data.get(k + 'Url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- thumbnail = None\n- poster = data.get('poster') or {}\n- poster_id = poster.get('id')\n- if poster_id:\n- thumbnail = 'https://i.kinja-img.com/gawker-media/image/upload/{}.{}'.format(poster_id, poster.get('format') or 'jpg')\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': strip_or_none(data.get('description')),\n- 'formats': formats,\n- 'tags': data.get('tags'),\n- 'timestamp': int_or_none(try_get(\n- data, lambda x: x['postInfo']['publishTimeMillis']), 1000),\n- 'thumbnail': thumbnail,\n- 'uploader': data.get('network'),\n- }\n- else:\n- video_data = self._download_json(\n- 'https://api.vmh.univision.com/metadata/v1/content/' + video_id,\n- video_id)['videoMetadata']\n- iptc = video_data['photoVideoMetadataIPTC']\n- title = iptc['title']['en']\n- fmg = video_data.get('photoVideoMetadata_fmg') or {}\n- tvss_domain = fmg.get('tvssDomain') or 'https://auth.univision.com'\n- data = self._download_json(\n- tvss_domain + '/api/v3/video-auth/url-signature-tokens',\n- video_id, query={'mcpids': video_id})['data'][0]\n- formats = []\n-\n- rendition_url = data.get('renditionUrl')\n- if rendition_url:\n- formats = self._extract_m3u8_formats(\n- rendition_url, video_id, 'mp4',\n- 'm3u8_native', m3u8_id='hls', fatal=False)\n-\n- fallback_rendition_url = data.get('fallbackRenditionUrl')\n- if fallback_rendition_url:\n- formats.append({\n- 'format_id': 'fallback',\n- 'tbr': int_or_none(self._search_regex(\n- r'_(\\d+)\\.mp4', fallback_rendition_url,\n- 'bitrate', default=None)),\n- 'url': fallback_rendition_url,\n- })\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': try_get(iptc, lambda x: x['cloudinaryLink']['link'], str),\n- 'uploader': fmg.get('network'),\n- 'duration': int_or_none(iptc.get('fileDuration')),\n- 'formats': formats,\n- 'description': try_get(iptc, lambda x: x['description']['en'], str),\n- 'timestamp': parse_iso8601(iptc.get('dateReleased')),\n- }\ndiff --git a/yt_dlp/extractor/koo.py b/yt_dlp/extractor/koo.py\ndeleted file mode 100644\nindex 6ec5b59f9a1f..000000000000\n--- a/yt_dlp/extractor/koo.py\n+++ /dev/null\n@@ -1,115 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- try_get,\n-)\n-\n-\n-class KooIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://(?:www\\.)?kooapp\\.com/koo/[^/]+/(?P<id>[^/&#$?]+)'\n- _TESTS = [{ # Test for video in the comments\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/946c4189-bc2d-4524-b95b-43f641e2adde',\n- 'info_dict': {\n- 'id': '946c4189-bc2d-4524-b95b-43f641e2adde',\n- 'ext': 'mp4',\n- 'title': 'test for video in comment',\n- 'description': 'md5:daa77dc214add4da8b6ea7d2226776e7',\n- 'timestamp': 1632215195,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 7000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for koo with long title\n- 'url': 'https://www.kooapp.com/koo/laxman_kumarDBFEC/33decbf7-5e1e-4bb8-bfd7-04744a064361',\n- 'info_dict': {\n- 'id': '33decbf7-5e1e-4bb8-bfd7-04744a064361',\n- 'ext': 'mp4',\n- 'title': 'md5:47a71c2337295330c5a19a8af1bbf450',\n- 'description': 'md5:06a6a84e9321499486dab541693d8425',\n- 'timestamp': 1632106884,\n- 'uploader_id': 'laxman_kumarDBFEC',\n- 'uploader': 'Laxman Kumar ๐ฎ๐ณ',\n- 'duration': 46000,\n- 'upload_date': '20210920',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for audio\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\n- 'info_dict': {\n- 'id': 'a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\n- 'ext': 'mp4',\n- 'title': 'Test for audio',\n- 'description': 'md5:ecb9a2b6a5d34b736cecb53788cb11e8',\n- 'timestamp': 1632211634,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 214000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for video\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\n- 'info_dict': {\n- 'id': 'a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\n- 'ext': 'mp4',\n- 'title': 'Test for video',\n- 'description': 'md5:7afc4eb839074ddeb2beea5dd6fe9500',\n- 'timestamp': 1632211468,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 14000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for link\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/01bf5b94-81a5-4d8e-a387-5f732022e15a',\n- 'skip': 'No video/audio found at the provided url.',\n- 'info_dict': {\n- 'id': '01bf5b94-81a5-4d8e-a387-5f732022e15a',\n- 'title': 'Test for link',\n- 'ext': 'none',\n- },\n- }, { # Test for images\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\n- 'skip': 'No video/audio found at the provided url.',\n- 'info_dict': {\n- 'id': 'dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\n- 'title': 'Test for images',\n- 'ext': 'none',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.kooapp.com/apiV1/ku/{video_id}?limit=20&offset=0&showSimilarKoos=true', video_id)['parentContent']\n- item_json = next(content['items'][0] for content in data_json\n- if try_get(content, lambda x: x['items'][0]['id']) == video_id)\n- media_json = item_json['mediaMap']\n- formats = []\n-\n- mp4_url = media_json.get('videoMp4')\n- video_m3u8_url = media_json.get('videoHls')\n- if mp4_url:\n- formats.append({\n- 'url': mp4_url,\n- 'ext': 'mp4',\n- })\n- if video_m3u8_url:\n- formats.extend(self._extract_m3u8_formats(video_m3u8_url, video_id, fatal=False, ext='mp4'))\n- if not formats:\n- self.raise_no_formats('No video/audio found at the provided url.', expected=True)\n-\n- return {\n- 'id': video_id,\n- 'title': clean_html(item_json.get('title')),\n- 'description': f'{clean_html(item_json.get(\"title\"))}\\n\\n{clean_html(item_json.get(\"enTransliteration\"))}',\n- 'timestamp': item_json.get('createdAt'),\n- 'uploader_id': item_json.get('handle'),\n- 'uploader': item_json.get('name'),\n- 'duration': media_json.get('duration'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/leeco.py b/yt_dlp/extractor/leeco.py\nindex 58baa3fea796..efec5d738268 100644\n--- a/yt_dlp/extractor/leeco.py\n+++ b/yt_dlp/extractor/leeco.py\n@@ -1,9 +1,6 @@\n-import base64\n import datetime as dt\n-import hashlib\n import re\n import time\n-import urllib.parse\n \n from .common import InfoExtractor\n from ..compat import compat_ord\n@@ -14,8 +11,6 @@\n int_or_none,\n orderedSet,\n parse_iso8601,\n- str_or_none,\n- url_basename,\n urshift,\n )\n \n@@ -248,114 +243,3 @@ def _real_extract(self, url):\n \n return self.playlist_result(entries, playlist_id, playlist_title=title,\n playlist_description=description)\n-\n-\n-class LetvCloudIE(InfoExtractor):\n- # Most of *.letv.com is changed to *.le.com on 2016/01/02\n- # but yuntv.letv.com is kept, so also keep the extractor name\n- IE_DESC = 'ไน่งไบ'\n- _VALID_URL = r'https?://yuntv\\.letv\\.com/bcloud.html\\?.+'\n-\n- _TESTS = [{\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=467623dedf',\n- 'md5': '26450599afd64c513bc77030ad15db44',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_467623dedf',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_467623dedf',\n- },\n- }, {\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=ec93197892&pu=2c7cd40209&auto_play=1&gpcflag=1&width=640&height=360',\n- 'md5': 'e03d9cc8d9c13191e1caf277e42dbd31',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_ec93197892',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_ec93197892',\n- },\n- }, {\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=187060b6fd',\n- 'md5': 'cb988699a776b22d4a41b9d43acfb3ac',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_187060b6fd',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_187060b6fd',\n- },\n- }]\n-\n- @staticmethod\n- def sign_data(obj):\n- if obj['cf'] == 'flash':\n- salt = '2f9d6924b33a165a6d8b5d3d42f4f987'\n- items = ['cf', 'format', 'ran', 'uu', 'ver', 'vu']\n- elif obj['cf'] == 'html5':\n- salt = 'fbeh5player12c43eccf2bec3300344'\n- items = ['cf', 'ran', 'uu', 'bver', 'vu']\n- input_data = ''.join([item + obj[item] for item in items]) + salt\n- obj['sign'] = hashlib.md5(input_data.encode()).hexdigest()\n-\n- def _get_formats(self, cf, uu, vu, media_id):\n- def get_play_json(cf, timestamp):\n- data = {\n- 'cf': cf,\n- 'ver': '2.2',\n- 'bver': 'firefox44.0',\n- 'format': 'json',\n- 'uu': uu,\n- 'vu': vu,\n- 'ran': str(timestamp),\n- }\n- self.sign_data(data)\n- return self._download_json(\n- 'http://api.letvcloud.com/gpc.php?' + urllib.parse.urlencode(data),\n- media_id, f'Downloading playJson data for type {cf}')\n-\n- play_json = get_play_json(cf, time.time())\n- # The server time may be different from local time\n- if play_json.get('code') == 10071:\n- play_json = get_play_json(cf, play_json['timestamp'])\n-\n- if not play_json.get('data'):\n- if play_json.get('message'):\n- raise ExtractorError('Letv cloud said: {}'.format(play_json['message']), expected=True)\n- elif play_json.get('code'):\n- raise ExtractorError('Letv cloud returned error %d' % play_json['code'], expected=True)\n- else:\n- raise ExtractorError('Letv cloud returned an unknown error')\n-\n- def b64decode(s):\n- return base64.b64decode(s).decode('utf-8')\n-\n- formats = []\n- for media in play_json['data']['video_info']['media'].values():\n- play_url = media['play_url']\n- url = b64decode(play_url['main_url'])\n- decoded_url = b64decode(url_basename(url))\n- formats.append({\n- 'url': url,\n- 'ext': determine_ext(decoded_url),\n- 'format_id': str_or_none(play_url.get('vtype')),\n- 'format_note': str_or_none(play_url.get('definition')),\n- 'width': int_or_none(play_url.get('vwidth')),\n- 'height': int_or_none(play_url.get('vheight')),\n- })\n-\n- return formats\n-\n- def _real_extract(self, url):\n- uu_mobj = re.search(r'uu=([\\w]+)', url)\n- vu_mobj = re.search(r'vu=([\\w]+)', url)\n-\n- if not uu_mobj or not vu_mobj:\n- raise ExtractorError(f'Invalid URL: {url}', expected=True)\n-\n- uu = uu_mobj.group(1)\n- vu = vu_mobj.group(1)\n- media_id = uu + '_' + vu\n-\n- formats = self._get_formats('flash', uu, vu, media_id) + self._get_formats('html5', uu, vu, media_id)\n-\n- return {\n- 'id': media_id,\n- 'title': f'Video {media_id}',\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/livestream.py b/yt_dlp/extractor/livestream.py\ndeleted file mode 100644\nindex 7f7947ee7bfe..000000000000\n--- a/yt_dlp/extractor/livestream.py\n+++ /dev/null\n@@ -1,386 +0,0 @@\n-import itertools\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- find_xpath_attr,\n- float_or_none,\n- int_or_none,\n- orderedSet,\n- parse_iso8601,\n- traverse_obj,\n- update_url_query,\n- xpath_attr,\n- xpath_text,\n- xpath_with_ns,\n-)\n-\n-\n-class LivestreamIE(InfoExtractor):\n- IE_NAME = 'livestream'\n- _VALID_URL = r'''(?x)\n- https?://(?:new\\.)?livestream\\.com/\n- (?:accounts/(?P<account_id>\\d+)|(?P<account_name>[^/]+))\n- (?:/events/(?P<event_id>\\d+)|/(?P<event_name>[^/]+))?\n- (?:/videos/(?P<id>\\d+))?\n- '''\n- _EMBED_REGEX = [r'<iframe[^>]+src=\"(?P<url>https?://(?:new\\.)?livestream\\.com/[^\"]+/player[^\"]+)\"']\n-\n- _TESTS = [{\n- 'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',\n- 'md5': '7876c5f5dc3e711b6b73acce4aac1527',\n- 'info_dict': {\n- 'id': '4719370',\n- 'ext': 'mp4',\n- 'title': 'Live from Webster Hall NYC',\n- 'timestamp': 1350008072,\n- 'upload_date': '20121012',\n- 'duration': 5968.0,\n- 'like_count': int,\n- 'view_count': int,\n- 'comment_count': int,\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- },\n- }, {\n- 'url': 'https://livestream.com/coheedandcambria/websterhall',\n- 'info_dict': {\n- 'id': '1585861',\n- 'title': 'Live From Webster Hall',\n- },\n- 'playlist_mincount': 1,\n- }, {\n- 'url': 'https://livestream.com/dayananda/events/7954027',\n- 'info_dict': {\n- 'title': 'Live from Mevo',\n- 'id': '7954027',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- 'url': 'https://livestream.com/accounts/82',\n- 'info_dict': {\n- 'id': '253978',\n- 'view_count': int,\n- 'title': 'trsr',\n- 'comment_count': int,\n- 'like_count': int,\n- 'upload_date': '20120306',\n- 'timestamp': 1331042383,\n- 'thumbnail': 'http://img.new.livestream.com/videos/0000000000000372/cacbeed6-fb68-4b5e-ad9c-e148124e68a9_640x427.jpg',\n- 'duration': 15.332,\n- 'ext': 'mp4',\n- },\n- }, {\n- 'url': 'https://new.livestream.com/accounts/362/events/3557232/videos/67864563/player?autoPlay=false&height=360&mute=false&width=640',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://livestream.com/bsww/concacafbeachsoccercampeonato2015',\n- 'only_matching': True,\n- }]\n- _API_URL_TEMPLATE = 'http://livestream.com/api/accounts/%s/events/%s'\n-\n- def _parse_smil_formats_and_subtitles(\n- self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):\n- base_ele = find_xpath_attr(\n- smil, self._xpath_ns('.//meta', namespace), 'name', 'httpBase')\n- base = base_ele.get('content') if base_ele is not None else 'http://livestreamvod-f.akamaihd.net/'\n-\n- formats = []\n- video_nodes = smil.findall(self._xpath_ns('.//video', namespace))\n-\n- for vn in video_nodes:\n- tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)\n- furl = (\n- update_url_query(urllib.parse.urljoin(base, vn.attrib['src']), {\n- 'v': '3.0.3',\n- 'fp': 'WIN% 14,0,0,145',\n- }))\n- if 'clipBegin' in vn.attrib:\n- furl += '&ssek=' + vn.attrib['clipBegin']\n- formats.append({\n- 'url': furl,\n- 'format_id': 'smil_%d' % tbr,\n- 'ext': 'flv',\n- 'tbr': tbr,\n- 'preference': -1000, # Strictly inferior than all other formats?\n- })\n- return formats, {}\n-\n- def _extract_video_info(self, video_data):\n- video_id = str(video_data['id'])\n-\n- FORMAT_KEYS = (\n- ('sd', 'progressive_url'),\n- ('hd', 'progressive_url_hd'),\n- )\n-\n- formats = []\n- for format_id, key in FORMAT_KEYS:\n- video_url = video_data.get(key)\n- if video_url:\n- ext = determine_ext(video_url)\n- if ext == 'm3u8':\n- continue\n- bitrate = int_or_none(self._search_regex(\n- rf'(\\d+)\\.{ext}', video_url, 'bitrate', default=None))\n- formats.append({\n- 'url': video_url,\n- 'format_id': format_id,\n- 'tbr': bitrate,\n- 'ext': ext,\n- })\n-\n- smil_url = video_data.get('smil_url')\n- if smil_url:\n- formats.extend(self._extract_smil_formats(smil_url, video_id, fatal=False))\n-\n- m3u8_url = video_data.get('m3u8_url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- f4m_url = video_data.get('f4m_url')\n- if f4m_url:\n- formats.extend(self._extract_f4m_formats(\n- f4m_url, video_id, f4m_id='hds', fatal=False))\n-\n- comments = [{\n- 'author_id': comment.get('author_id'),\n- 'author': comment.get('author', {}).get('full_name'),\n- 'id': comment.get('id'),\n- 'text': comment['text'],\n- 'timestamp': parse_iso8601(comment.get('created_at')),\n- } for comment in video_data.get('comments', {}).get('data', [])]\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'title': video_data['caption'],\n- 'description': video_data.get('description'),\n- 'thumbnail': video_data.get('thumbnail_url'),\n- 'duration': float_or_none(video_data.get('duration'), 1000),\n- 'timestamp': parse_iso8601(video_data.get('publish_at')),\n- 'like_count': video_data.get('likes', {}).get('total'),\n- 'comment_count': video_data.get('comments', {}).get('total'),\n- 'view_count': video_data.get('views'),\n- 'comments': comments,\n- }\n-\n- def _extract_stream_info(self, stream_info):\n- broadcast_id = str(stream_info['broadcast_id'])\n- is_live = stream_info.get('is_live')\n-\n- formats = []\n- smil_url = stream_info.get('play_url')\n- if smil_url:\n- formats.extend(self._extract_smil_formats(smil_url, broadcast_id))\n-\n- m3u8_url = stream_info.get('m3u8_url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, broadcast_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- rtsp_url = stream_info.get('rtsp_url')\n- if rtsp_url:\n- formats.append({\n- 'url': rtsp_url,\n- 'format_id': 'rtsp',\n- })\n-\n- return {\n- 'id': broadcast_id,\n- 'formats': formats,\n- 'title': stream_info['stream_title'],\n- 'thumbnail': stream_info.get('thumbnail_url'),\n- 'is_live': is_live,\n- }\n-\n- def _generate_event_playlist(self, event_data):\n- event_id = str(event_data['id'])\n- account_id = str(event_data['owner_account_id'])\n- feed_root_url = self._API_URL_TEMPLATE % (account_id, event_id) + '/feed.json'\n-\n- stream_info = event_data.get('stream_info')\n- if stream_info:\n- return self._extract_stream_info(stream_info)\n-\n- last_video = None\n- for i in itertools.count(1):\n- if last_video is None:\n- info_url = feed_root_url\n- else:\n- info_url = f'{feed_root_url}?&id={last_video}&newer=-1&type=video'\n- videos_info = self._download_json(\n- info_url, event_id, f'Downloading page {i}')['data']\n- videos_info = [v['data'] for v in videos_info if v['type'] == 'video']\n- if not videos_info:\n- break\n- for v in videos_info:\n- v_id = str(v['id'])\n- yield self.url_result(\n- f'http://livestream.com/accounts/{account_id}/events/{event_id}/videos/{v_id}',\n- LivestreamIE, v_id, v.get('caption'))\n- last_video = videos_info[-1]['id']\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- event = mobj.group('event_id') or mobj.group('event_name')\n- account = mobj.group('account_id') or mobj.group('account_name')\n- api_url = f'http://livestream.com/api/accounts/{account}'\n-\n- if video_id:\n- video_data = self._download_json(\n- f'{api_url}/events/{event}/videos/{video_id}', video_id)\n- return self._extract_video_info(video_data)\n- elif event:\n- event_data = self._download_json(f'{api_url}/events/{event}', None)\n- return self.playlist_result(\n- self._generate_event_playlist(event_data), str(event_data['id']), event_data['full_name'])\n-\n- account_data = self._download_json(api_url, None)\n- items = traverse_obj(account_data, (('upcoming_events', 'past_events'), 'data', ...))\n- return self.playlist_result(\n- itertools.chain.from_iterable(map(self._generate_event_playlist, items)),\n- account_data.get('id'), account_data.get('full_name'))\n-\n-\n-# The original version of Livestream uses a different system\n-class LivestreamOriginalIE(InfoExtractor):\n- IE_NAME = 'livestream:original'\n- _VALID_URL = r'''(?x)https?://original\\.livestream\\.com/\n- (?P<user>[^/\\?#]+)(?:/(?P<type>video|folder)\n- (?:(?:\\?.*?Id=|/)(?P<id>.*?)(&|$))?)?\n- '''\n- _TESTS = [{\n- 'url': 'http://original.livestream.com/dealbook/video?clipId=pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\n- 'info_dict': {\n- 'id': 'pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\n- 'ext': 'mp4',\n- 'title': 'Spark 1 (BitCoin) with Cameron Winklevoss & Tyler Winklevoss of Winklevoss Capital',\n- 'duration': 771.301,\n- 'view_count': int,\n- },\n- }, {\n- 'url': 'https://original.livestream.com/newplay/folder?dirId=a07bf706-d0e4-4e75-a747-b021d84f2fd3',\n- 'info_dict': {\n- 'id': 'a07bf706-d0e4-4e75-a747-b021d84f2fd3',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- # live stream\n- 'url': 'http://original.livestream.com/znsbahamas',\n- 'only_matching': True,\n- }]\n-\n- def _extract_video_info(self, user, video_id):\n- api_url = f'http://x{user}x.api.channel.livestream.com/2.0/clipdetails?extendedInfo=true&id={video_id}'\n- info = self._download_xml(api_url, video_id)\n-\n- item = info.find('channel').find('item')\n- title = xpath_text(item, 'title')\n- media_ns = {'media': 'http://search.yahoo.com/mrss'}\n- thumbnail_url = xpath_attr(\n- item, xpath_with_ns('media:thumbnail', media_ns), 'url')\n- duration = float_or_none(xpath_attr(\n- item, xpath_with_ns('media:content', media_ns), 'duration'))\n- ls_ns = {'ls': 'http://api.channel.livestream.com/2.0'}\n- view_count = int_or_none(xpath_text(\n- item, xpath_with_ns('ls:viewsCount', ls_ns)))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': thumbnail_url,\n- 'duration': duration,\n- 'view_count': view_count,\n- }\n-\n- def _extract_video_formats(self, video_data, video_id):\n- formats = []\n-\n- progressive_url = video_data.get('progressiveUrl')\n- if progressive_url:\n- formats.append({\n- 'url': progressive_url,\n- 'format_id': 'http',\n- })\n-\n- m3u8_url = video_data.get('httpUrl')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- rtsp_url = video_data.get('rtspUrl')\n- if rtsp_url:\n- formats.append({\n- 'url': rtsp_url,\n- 'format_id': 'rtsp',\n- })\n-\n- return formats\n-\n- def _extract_folder(self, url, folder_id):\n- webpage = self._download_webpage(url, folder_id)\n- paths = orderedSet(re.findall(\n- r'''(?x)(?:\n- <li\\s+class=\"folder\">\\s*<a\\s+href=\"|\n- <a\\s+href=\"(?=https?://livestre\\.am/)\n- )([^\"]+)\"''', webpage))\n-\n- entries = [{\n- '_type': 'url',\n- 'url': urllib.parse.urljoin(url, p),\n- } for p in paths]\n-\n- return self.playlist_result(entries, folder_id)\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- user = mobj.group('user')\n- url_type = mobj.group('type')\n- content_id = mobj.group('id')\n- if url_type == 'folder':\n- return self._extract_folder(url, content_id)\n- else:\n- # this url is used on mobile devices\n- stream_url = f'http://x{user}x.api.channel.livestream.com/3.0/getstream.json'\n- info = {}\n- if content_id:\n- stream_url += f'?id={content_id}'\n- info = self._extract_video_info(user, content_id)\n- else:\n- content_id = user\n- webpage = self._download_webpage(url, content_id)\n- info = {\n- 'title': self._og_search_title(webpage),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': self._search_regex(r'channelLogo\\.src\\s*=\\s*\"([^\"]+)\"', webpage, 'thumbnail', None),\n- }\n- video_data = self._download_json(stream_url, content_id)\n- is_live = video_data.get('isLive')\n- info.update({\n- 'id': content_id,\n- 'title': info['title'],\n- 'formats': self._extract_video_formats(video_data, content_id),\n- 'is_live': is_live,\n- })\n- return info\n-\n-\n-# The server doesn't support HEAD request, the generic extractor can't detect\n-# the redirection\n-class LivestreamShortenerIE(InfoExtractor):\n- IE_NAME = 'livestream:shortener'\n- IE_DESC = False # Do not list\n- _VALID_URL = r'https?://livestre\\.am/(?P<id>.+)'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- return self.url_result(self._og_search_url(webpage))\ndiff --git a/yt_dlp/extractor/lynda.py b/yt_dlp/extractor/lynda.py\ndeleted file mode 100644\nindex f7cf9261a85c..000000000000\n--- a/yt_dlp/extractor/lynda.py\n+++ /dev/null\n@@ -1,325 +0,0 @@\n-import itertools\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- urlencode_postdata,\n-)\n-\n-\n-class LyndaBaseIE(InfoExtractor):\n- _SIGNIN_URL = 'https://www.lynda.com/signin/lynda'\n- _PASSWORD_URL = 'https://www.lynda.com/signin/password'\n- _USER_URL = 'https://www.lynda.com/signin/user'\n- _ACCOUNT_CREDENTIALS_HINT = 'Use --username and --password options to provide lynda.com account credentials.'\n- _NETRC_MACHINE = 'lynda'\n-\n- @staticmethod\n- def _check_error(json_string, key_or_keys):\n- keys = [key_or_keys] if isinstance(key_or_keys, str) else key_or_keys\n- for key in keys:\n- error = json_string.get(key)\n- if error:\n- raise ExtractorError(f'Unable to login: {error}', expected=True)\n-\n- def _perform_login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):\n- action_url = self._search_regex(\n- r'<form[^>]+action=([\"\\'])(?P<url>.+?)\\1', form_html,\n- 'post url', default=fallback_action_url, group='url')\n-\n- if not action_url.startswith('http'):\n- action_url = urllib.parse.urljoin(self._SIGNIN_URL, action_url)\n-\n- form_data = self._hidden_inputs(form_html)\n- form_data.update(extra_form_data)\n-\n- response = self._download_json(\n- action_url, None, note,\n- data=urlencode_postdata(form_data),\n- headers={\n- 'Referer': referrer_url,\n- 'X-Requested-With': 'XMLHttpRequest',\n- }, expected_status=(418, 500))\n-\n- self._check_error(response, ('email', 'password', 'ErrorMessage'))\n-\n- return response, action_url\n-\n- def _perform_login(self, username, password):\n- # Step 1: download signin page\n- signin_page = self._download_webpage(\n- self._SIGNIN_URL, None, 'Downloading signin page')\n-\n- # Already logged in\n- if any(re.search(p, signin_page) for p in (\n- r'isLoggedIn\\s*:\\s*true', r'logout\\.aspx', r'>Log out<')):\n- return\n-\n- # Step 2: submit email\n- signin_form = self._search_regex(\n- r'(?s)(<form[^>]+data-form-name=[\"\\']signin[\"\\'][^>]*>.+?</form>)',\n- signin_page, 'signin form')\n- signin_page, signin_url = self._login_step(\n- signin_form, self._PASSWORD_URL, {'email': username},\n- 'Submitting email', self._SIGNIN_URL)\n-\n- # Step 3: submit password\n- password_form = signin_page['body']\n- self._login_step(\n- password_form, self._USER_URL, {'email': username, 'password': password},\n- 'Submitting password', signin_url)\n-\n-\n-class LyndaIE(LyndaBaseIE):\n- IE_NAME = 'lynda'\n- IE_DESC = 'lynda.com videos'\n- _VALID_URL = r'''(?x)\n- https?://\n- (?:www\\.)?(?:lynda\\.com|educourse\\.ga)/\n- (?:\n- (?:[^/]+/){2,3}(?P<course_id>\\d+)|\n- player/embed\n- )/\n- (?P<id>\\d+)\n- '''\n-\n- _TIMECODE_REGEX = r'\\[(?P<timecode>\\d+:\\d+:\\d+[\\.,]\\d+)\\]'\n-\n- _TESTS = [{\n- 'url': 'https://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\n- # md5 is unstable\n- 'info_dict': {\n- 'id': '114408',\n- 'ext': 'mp4',\n- 'title': 'Using the exercise files',\n- 'duration': 68,\n- },\n- }, {\n- 'url': 'https://www.lynda.com/player/embed/133770?tr=foo=1;bar=g;fizz=rt&fs=0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://educourse.ga/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Willkommen-Grundlagen-guten-Gestaltung/393570/393572-4.html',\n- 'only_matching': True,\n- }, {\n- # Status=\"NotFound\", Message=\"Transcript not found\"\n- 'url': 'https://www.lynda.com/ASP-NET-tutorials/What-you-should-know/5034180/2811512-4.html',\n- 'only_matching': True,\n- }]\n-\n- def _raise_unavailable(self, video_id):\n- self.raise_login_required(\n- f'Video {video_id} is only available for members')\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- course_id = mobj.group('course_id')\n-\n- query = {\n- 'videoId': video_id,\n- 'type': 'video',\n- }\n-\n- video = self._download_json(\n- 'https://www.lynda.com/ajax/player', video_id,\n- 'Downloading video JSON', fatal=False, query=query)\n-\n- # Fallback scenario\n- if not video:\n- query['courseId'] = course_id\n-\n- play = self._download_json(\n- f'https://www.lynda.com/ajax/course/{course_id}/{video_id}/play', video_id, 'Downloading play JSON')\n-\n- if not play:\n- self._raise_unavailable(video_id)\n-\n- formats = []\n- for formats_dict in play:\n- urls = formats_dict.get('urls')\n- if not isinstance(urls, dict):\n- continue\n- cdn = formats_dict.get('name')\n- for format_id, format_url in urls.items():\n- if not format_url:\n- continue\n- formats.append({\n- 'url': format_url,\n- 'format_id': f'{cdn}-{format_id}' if cdn else format_id,\n- 'height': int_or_none(format_id),\n- })\n-\n- conviva = self._download_json(\n- 'https://www.lynda.com/ajax/player/conviva', video_id,\n- 'Downloading conviva JSON', query=query)\n-\n- return {\n- 'id': video_id,\n- 'title': conviva['VideoTitle'],\n- 'description': conviva.get('VideoDescription'),\n- 'release_year': int_or_none(conviva.get('ReleaseYear')),\n- 'duration': int_or_none(conviva.get('Duration')),\n- 'creator': conviva.get('Author'),\n- 'formats': formats,\n- }\n-\n- if 'Status' in video:\n- raise ExtractorError(\n- 'lynda returned error: {}'.format(video['Message']), expected=True)\n-\n- if video.get('HasAccess') is False:\n- self._raise_unavailable(video_id)\n-\n- video_id = str(video.get('ID') or video_id)\n- duration = int_or_none(video.get('DurationInSeconds'))\n- title = video['Title']\n-\n- formats = []\n-\n- fmts = video.get('Formats')\n- if fmts:\n- formats.extend([{\n- 'url': f['Url'],\n- 'ext': f.get('Extension'),\n- 'width': int_or_none(f.get('Width')),\n- 'height': int_or_none(f.get('Height')),\n- 'filesize': int_or_none(f.get('FileSize')),\n- 'format_id': str(f.get('Resolution')) if f.get('Resolution') else None,\n- } for f in fmts if f.get('Url')])\n-\n- prioritized_streams = video.get('PrioritizedStreams')\n- if prioritized_streams:\n- for prioritized_stream_id, prioritized_stream in prioritized_streams.items():\n- formats.extend([{\n- 'url': video_url,\n- 'height': int_or_none(format_id),\n- 'format_id': f'{prioritized_stream_id}-{format_id}',\n- } for format_id, video_url in prioritized_stream.items()])\n-\n- self._check_formats(formats, video_id)\n-\n- subtitles = self.extract_subtitles(video_id)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'duration': duration,\n- 'subtitles': subtitles,\n- 'formats': formats,\n- }\n-\n- def _fix_subtitles(self, subs):\n- srt = ''\n- seq_counter = 0\n- for seq_current, seq_next in itertools.pairwise(subs):\n- m_current = re.match(self._TIMECODE_REGEX, seq_current['Timecode'])\n- if m_current is None:\n- continue\n- m_next = re.match(self._TIMECODE_REGEX, seq_next['Timecode'])\n- if m_next is None:\n- continue\n- appear_time = m_current.group('timecode')\n- disappear_time = m_next.group('timecode')\n- text = seq_current['Caption'].strip()\n- if text:\n- seq_counter += 1\n- srt += f'{seq_counter}\\r\\n{appear_time} --> {disappear_time}\\r\\n{text}\\r\\n\\r\\n'\n- if srt:\n- return srt\n-\n- def _get_subtitles(self, video_id):\n- url = f'https://www.lynda.com/ajax/player?videoId={video_id}&type=transcript'\n- subs = self._download_webpage(\n- url, video_id, 'Downloading subtitles JSON', fatal=False)\n- if not subs or 'Status=\"NotFound\"' in subs:\n- return {}\n- subs = self._parse_json(subs, video_id, fatal=False)\n- if not subs:\n- return {}\n- fixed_subs = self._fix_subtitles(subs)\n- if fixed_subs:\n- return {'en': [{'ext': 'srt', 'data': fixed_subs}]}\n- return {}\n-\n-\n-class LyndaCourseIE(LyndaBaseIE):\n- IE_NAME = 'lynda:course'\n- IE_DESC = 'lynda.com online courses'\n-\n- # Course link equals to welcome/introduction video link of same course\n- # We will recognize it as course link\n- _VALID_URL = r'https?://(?:www|m)\\.(?:lynda\\.com|educourse\\.ga)/(?P<coursepath>(?:[^/]+/){2,3}(?P<courseid>\\d+))-2\\.html'\n-\n- _TESTS = [{\n- 'url': 'https://www.lynda.com/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- course_path = mobj.group('coursepath')\n- course_id = mobj.group('courseid')\n-\n- item_template = f'https://www.lynda.com/{course_path}/%s-4.html'\n-\n- course = self._download_json(\n- f'https://www.lynda.com/ajax/player?courseId={course_id}&type=course',\n- course_id, 'Downloading course JSON', fatal=False)\n-\n- if not course:\n- webpage = self._download_webpage(url, course_id)\n- entries = [\n- self.url_result(\n- item_template % video_id, ie=LyndaIE.ie_key(),\n- video_id=video_id)\n- for video_id in re.findall(\n- r'data-video-id=[\"\\'](\\d+)', webpage)]\n- return self.playlist_result(\n- entries, course_id,\n- self._og_search_title(webpage, fatal=False),\n- self._og_search_description(webpage))\n-\n- if course.get('Status') == 'NotFound':\n- raise ExtractorError(\n- f'Course {course_id} does not exist', expected=True)\n-\n- unaccessible_videos = 0\n- entries = []\n-\n- # Might want to extract videos right here from video['Formats'] as it seems 'Formats' is not provided\n- # by single video API anymore\n-\n- for chapter in course['Chapters']:\n- for video in chapter.get('Videos', []):\n- if video.get('HasAccess') is False:\n- unaccessible_videos += 1\n- continue\n- video_id = video.get('ID')\n- if video_id:\n- entries.append({\n- '_type': 'url_transparent',\n- 'url': item_template % video_id,\n- 'ie_key': LyndaIE.ie_key(),\n- 'chapter': chapter.get('Title'),\n- 'chapter_number': int_or_none(chapter.get('ChapterIndex')),\n- 'chapter_id': str(chapter.get('ID')),\n- })\n-\n- if unaccessible_videos > 0:\n- self.report_warning(\n- f'{unaccessible_videos} videos are only available for members (or paid members) '\n- f'and will not be downloaded. {self._ACCOUNT_CREDENTIALS_HINT}')\n-\n- course_title = course.get('Title')\n- course_description = course.get('Description')\n-\n- return self.playlist_result(entries, course_id, course_title, course_description)\ndiff --git a/yt_dlp/extractor/microsoftstream.py b/yt_dlp/extractor/microsoftstream.py\ndeleted file mode 100644\nindex b1388108383c..000000000000\n--- a/yt_dlp/extractor/microsoftstream.py\n+++ /dev/null\n@@ -1,121 +0,0 @@\n-import base64\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- merge_dicts,\n- parse_duration,\n- parse_iso8601,\n- parse_resolution,\n- try_get,\n- url_basename,\n-)\n-\n-\n-class MicrosoftStreamIE(InfoExtractor):\n- IE_NAME = 'microsoftstream'\n- IE_DESC = 'Microsoft Stream'\n- _VALID_URL = r'https?://(?:web|www|msit)\\.microsoftstream\\.com/video/(?P<id>[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12})'\n-\n- _TESTS = [{\n- 'url': 'https://web.microsoftstream.com/video/6e51d928-4f46-4f1c-b141-369925e37b62?list=user&userId=f5491e02-e8fe-4e34-b67c-ec2e79a6ecc0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://msit.microsoftstream.com/video/b60f5987-aabd-4e1c-a42f-c559d138f2ca',\n- 'only_matching': True,\n- }]\n-\n- def _get_all_subtitles(self, api_url, video_id, headers):\n- subtitles = {}\n- automatic_captions = {}\n- text_tracks = self._download_json(\n- f'{api_url}/videos/{video_id}/texttracks', video_id,\n- note='Downloading subtitles JSON', fatal=False, headers=headers,\n- query={'api-version': '1.4-private'}).get('value') or []\n- for track in text_tracks:\n- if not track.get('language') or not track.get('url'):\n- continue\n- sub_dict = automatic_captions if track.get('autoGenerated') else subtitles\n- sub_dict.setdefault(track['language'], []).append({\n- 'ext': 'vtt',\n- 'url': track.get('url'),\n- })\n- return {\n- 'subtitles': subtitles,\n- 'automatic_captions': automatic_captions,\n- }\n-\n- def extract_all_subtitles(self, *args, **kwargs):\n- if (self.get_param('writesubtitles', False)\n- or self.get_param('writeautomaticsub', False)\n- or self.get_param('listsubtitles')):\n- return self._get_all_subtitles(*args, **kwargs)\n- return {}\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- if '<title>Microsoft Stream</title>' not in webpage:\n- self.raise_login_required(method='cookies')\n-\n- access_token = self._html_search_regex(r'\"AccessToken\":\"(.+?)\"', webpage, 'access token')\n- api_url = self._html_search_regex(r'\"ApiGatewayUri\":\"(.+?)\"', webpage, 'api url')\n-\n- headers = {'Authorization': f'Bearer {access_token}'}\n-\n- video_data = self._download_json(\n- f'{api_url}/videos/{video_id}', video_id,\n- headers=headers, query={\n- '$expand': 'creator,tokens,status,liveEvent,extensions',\n- 'api-version': '1.4-private',\n- })\n- video_id = video_data.get('id') or video_id\n- language = video_data.get('language')\n-\n- thumbnails = []\n- for thumbnail_id in ('extraSmall', 'small', 'medium', 'large'):\n- thumbnail_url = try_get(video_data, lambda x: x['posterImage'][thumbnail_id]['url'], str)\n- if not thumbnail_url:\n- continue\n- thumb = {\n- 'id': thumbnail_id,\n- 'url': thumbnail_url,\n- }\n- thumb_name = url_basename(thumbnail_url)\n- thumb_name = str(base64.b64decode(thumb_name + '=' * (-len(thumb_name) % 4)))\n- thumb.update(parse_resolution(thumb_name))\n- thumbnails.append(thumb)\n-\n- formats = []\n- for playlist in video_data['playbackUrls']:\n- if playlist['mimeType'] == 'application/vnd.apple.mpegurl':\n- formats.extend(self._extract_m3u8_formats(\n- playlist['playbackUrl'], video_id,\n- ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls',\n- fatal=False, headers=headers))\n- elif playlist['mimeType'] == 'application/dash+xml':\n- formats.extend(self._extract_mpd_formats(\n- playlist['playbackUrl'], video_id, mpd_id='dash',\n- fatal=False, headers=headers))\n- elif playlist['mimeType'] == 'application/vnd.ms-sstr+xml':\n- formats.extend(self._extract_ism_formats(\n- playlist['playbackUrl'], video_id, ism_id='mss',\n- fatal=False, headers=headers))\n- formats = [merge_dicts(f, {'language': language}) for f in formats]\n-\n- return {\n- 'id': video_id,\n- 'title': video_data['name'],\n- 'description': video_data.get('description'),\n- 'uploader': try_get(video_data, lambda x: x['creator']['name'], str),\n- 'uploader_id': try_get(video_data, (lambda x: x['creator']['mail'],\n- lambda x: x['creator']['id']), str),\n- 'thumbnails': thumbnails,\n- **self.extract_all_subtitles(api_url, video_id, headers),\n- 'timestamp': parse_iso8601(video_data.get('created')),\n- 'duration': parse_duration(try_get(video_data, lambda x: x['media']['duration'])),\n- 'webpage_url': f'https://web.microsoftstream.com/video/{video_id}',\n- 'view_count': try_get(video_data, lambda x: x['metrics']['views'], int),\n- 'like_count': try_get(video_data, lambda x: x['metrics']['likes'], int),\n- 'comment_count': try_get(video_data, lambda x: x['metrics']['comments'], int),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/minoto.py b/yt_dlp/extractor/minoto.py\ndeleted file mode 100644\nindex 69832560d055..000000000000\n--- a/yt_dlp/extractor/minoto.py\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_codecs,\n-)\n-\n-\n-class MinotoIE(InfoExtractor):\n- _VALID_URL = r'(?:minoto:|https?://(?:play|iframe|embed)\\.minoto-video\\.com/(?P<player_id>[0-9]+)/)(?P<id>[a-zA-Z0-9]+)'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- player_id = mobj.group('player_id') or '1'\n- video_id = mobj.group('id')\n- video_data = self._download_json(f'http://play.minoto-video.com/{player_id}/{video_id}.js', video_id)\n- video_metadata = video_data['video-metadata']\n- formats = []\n- for fmt in video_data['video-files']:\n- fmt_url = fmt.get('url')\n- if not fmt_url:\n- continue\n- container = fmt.get('container')\n- if container == 'hls':\n- formats.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- else:\n- fmt_profile = fmt.get('profile') or {}\n- formats.append({\n- 'format_id': fmt_profile.get('name-short'),\n- 'format_note': fmt_profile.get('name'),\n- 'url': fmt_url,\n- 'container': container,\n- 'tbr': int_or_none(fmt.get('bitrate')),\n- 'filesize': int_or_none(fmt.get('filesize')),\n- 'width': int_or_none(fmt.get('width')),\n- 'height': int_or_none(fmt.get('height')),\n- **parse_codecs(fmt.get('codecs')),\n- })\n-\n- return {\n- 'id': video_id,\n- 'title': video_metadata['title'],\n- 'description': video_metadata.get('description'),\n- 'thumbnail': video_metadata.get('video-poster', {}).get('url'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/mojvideo.py b/yt_dlp/extractor/mojvideo.py\ndeleted file mode 100644\nindex 6bc362a53cb3..000000000000\n--- a/yt_dlp/extractor/mojvideo.py\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n-)\n-\n-\n-class MojvideoIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?mojvideo\\.com/video-(?P<display_id>[^/]+)/(?P<id>[a-f0-9]+)'\n- _TEST = {\n- 'url': 'http://www.mojvideo.com/video-v-avtu-pred-mano-rdecelaska-alfi-nipic/3d1ed4497707730b2906',\n- 'md5': 'f7fd662cc8ce2be107b0d4f2c0483ae7',\n- 'info_dict': {\n- 'id': '3d1ed4497707730b2906',\n- 'display_id': 'v-avtu-pred-mano-rdecelaska-alfi-nipic',\n- 'ext': 'mp4',\n- 'title': 'V avtu pred mano rdeฤelaska - Alfi Nipiฤ',\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- 'duration': 242,\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- display_id = mobj.group('display_id')\n-\n- # XML is malformed\n- playerapi = self._download_webpage(\n- f'http://www.mojvideo.com/playerapi.php?v={video_id}&t=1', display_id)\n-\n- if '<error>true</error>' in playerapi:\n- error_desc = self._html_search_regex(\n- r'<errordesc>([^<]*)</errordesc>', playerapi, 'error description', fatal=False)\n- raise ExtractorError(f'{self.IE_NAME} said: {error_desc}', expected=True)\n-\n- title = self._html_extract_title(playerapi)\n- video_url = self._html_search_regex(\n- r'<file>([^<]+)</file>', playerapi, 'video URL')\n- thumbnail = self._html_search_regex(\n- r'<preview>([^<]+)</preview>', playerapi, 'thumbnail', fatal=False)\n- duration = parse_duration(self._html_search_regex(\n- r'<duration>([^<]+)</duration>', playerapi, 'duration', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- }\ndiff --git a/yt_dlp/extractor/motherless.py b/yt_dlp/extractor/motherless.py\ndeleted file mode 100644\nindex e236ec3db8d5..000000000000\n--- a/yt_dlp/extractor/motherless.py\n+++ /dev/null\n@@ -1,289 +0,0 @@\n-import datetime as dt\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- OnDemandPagedList,\n- remove_end,\n- str_to_int,\n- unified_strdate,\n-)\n-\n-\n-class MotherlessIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/(?:g/[a-z0-9_]+/|G[VIG]?[A-F0-9]+/)?(?P<id>[A-F0-9]+)'\n- _TESTS = [{\n- 'url': 'http://motherless.com/EE97006',\n- 'md5': 'cb5e7438f7a3c4e886b7bccc1292a3bc',\n- 'info_dict': {\n- 'id': 'EE97006',\n- 'ext': 'mp4',\n- 'title': 'Dogging blond Brit getting glazed (comp)',\n- 'categories': ['UK', 'slag', 'whore', 'dogging', 'cunt', 'cumhound', 'big tits', 'Pearl Necklace'],\n- 'upload_date': '20230519',\n- 'uploader_id': 'deathbird',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'comment_count': int,\n- 'view_count': int,\n- 'like_count': int,\n- },\n- 'params': {\n- # Incomplete cert chains\n- 'nocheckcertificate': True,\n- },\n- }, {\n- 'url': 'http://motherless.com/532291B',\n- 'md5': 'bc59a6b47d1f958e61fbd38a4d31b131',\n- 'info_dict': {\n- 'id': '532291B',\n- 'ext': 'mp4',\n- 'title': 'Amazing girl playing the omegle game, PERFECT!',\n- 'categories': ['Amateur', 'webcam', 'omegle', 'pink', 'young', 'masturbate', 'teen',\n- 'game', 'hairy'],\n- 'upload_date': '20140622',\n- 'uploader_id': 'Sulivana7x',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- },\n- 'skip': '404',\n- }, {\n- 'url': 'http://motherless.com/g/cosplay/633979F',\n- 'expected_exception': 'ExtractorError',\n- }, {\n- 'url': 'http://motherless.com/8B4BBC1',\n- 'info_dict': {\n- 'id': '8B4BBC1',\n- 'ext': 'mp4',\n- 'title': 'VIDEO00441.mp4',\n- 'categories': [],\n- 'upload_date': '20160214',\n- 'uploader_id': 'NMWildGirl',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'like_count': int,\n- 'comment_count': int,\n- 'view_count': int,\n- },\n- 'params': {\n- 'nocheckcertificate': True,\n- },\n- }, {\n- # see https://motherless.com/videos/recent for recent videos with\n- # uploaded date in \"ago\" format\n- 'url': 'https://motherless.com/3C3E2CF',\n- 'info_dict': {\n- 'id': '3C3E2CF',\n- 'ext': 'mp4',\n- 'title': 'a/ Hot Teens',\n- 'categories': list,\n- 'upload_date': '20210104',\n- 'uploader_id': 'anonymous',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'like_count': int,\n- 'comment_count': int,\n- 'view_count': int,\n- },\n- 'params': {\n- 'nocheckcertificate': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- if any(p in webpage for p in (\n- '<title>404 - MOTHERLESS.COM<',\n- \">The page you're looking for cannot be found.<\",\n- '<div class=\"error-page',\n- )):\n- raise ExtractorError(f'Video {video_id} does not exist', expected=True)\n-\n- if '>The content you are trying to view is for friends only.' in webpage:\n- raise ExtractorError(f'Video {video_id} is for friends only', expected=True)\n-\n- title = self._html_search_regex(\n- (r'(?s)<div[^>]+\\bclass=[\"\\']media-meta-title[^>]+>(.+?)</div>',\n- r'id=\"view-upload-title\">\\s+([^<]+)<'), webpage, 'title')\n- video_url = (self._html_search_regex(\n- (r'setup\\(\\{\\s*[\"\\']file[\"\\']\\s*:\\s*([\"\\'])(?P<url>(?:(?!\\1).)+)\\1',\n- r'fileurl\\s*=\\s*([\"\\'])(?P<url>(?:(?!\\1).)+)\\1'),\n- webpage, 'video URL', default=None, group='url')\n- or f'http://cdn4.videos.motherlessmedia.com/videos/{video_id}.mp4?fs=opencloud')\n- age_limit = self._rta_search(webpage)\n- view_count = str_to_int(self._html_search_regex(\n- (r'>([\\d,.]+)\\s+Views<', r'<strong>Views</strong>\\s+([^<]+)<'),\n- webpage, 'view count', fatal=False))\n- like_count = str_to_int(self._html_search_regex(\n- (r'>([\\d,.]+)\\s+Favorites<',\n- r'<strong>Favorited</strong>\\s+([^<]+)<'),\n- webpage, 'like count', fatal=False))\n-\n- upload_date = unified_strdate(self._search_regex(\n- r'class=[\"\\']count[^>]+>(\\d+\\s+[a-zA-Z]{3}\\s+\\d{4})<', webpage,\n- 'upload date', default=None))\n- if not upload_date:\n- uploaded_ago = self._search_regex(\n- r'>\\s*(\\d+[hd])\\s+[aA]go\\b', webpage, 'uploaded ago',\n- default=None)\n- if uploaded_ago:\n- delta = int(uploaded_ago[:-1])\n- _AGO_UNITS = {\n- 'h': 'hours',\n- 'd': 'days',\n- }\n- kwargs = {_AGO_UNITS.get(uploaded_ago[-1]): delta}\n- upload_date = (dt.datetime.now(dt.timezone.utc) - dt.timedelta(**kwargs)).strftime('%Y%m%d')\n-\n- comment_count = len(re.findall(r'''class\\s*=\\s*['\"]media-comment-contents\\b''', webpage))\n- uploader_id = self._html_search_regex(\n- (r'''<span\\b[^>]+\\bclass\\s*=\\s*[\"']username\\b[^>]*>([^<]+)</span>''',\n- r'''(?s)['\"](?:media-meta-member|thumb-member-username)\\b[^>]+>\\s*<a\\b[^>]+\\bhref\\s*=\\s*['\"]/m/([^\"']+)'''),\n- webpage, 'uploader_id', fatal=False)\n- categories = self._html_search_meta('keywords', webpage, default='')\n- categories = [cat.strip() for cat in categories.split(',') if cat.strip()]\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'upload_date': upload_date,\n- 'uploader_id': uploader_id,\n- 'thumbnail': self._og_search_thumbnail(webpage),\n- 'categories': categories,\n- 'view_count': view_count,\n- 'like_count': like_count,\n- 'comment_count': comment_count,\n- 'age_limit': age_limit,\n- 'url': video_url,\n- }\n-\n-\n-class MotherlessPaginatedIE(InfoExtractor):\n- _EXTRA_QUERY = {}\n- _PAGE_SIZE = 60\n-\n- def _correct_path(self, url, item_id):\n- raise NotImplementedError('This method must be implemented by subclasses')\n-\n- def _correct_title(self, title, /):\n- return title.partition(' - Videos')[0] if title else None\n-\n- def _extract_entries(self, webpage, base):\n- for mobj in re.finditer(r'href=\"[^\"]*(?P<href>/[A-F0-9]+)\"\\s+title=\"(?P<title>[^\"]+)',\n- webpage):\n- video_url = urllib.parse.urljoin(base, mobj.group('href'))\n- video_id = MotherlessIE.get_temp_id(video_url)\n-\n- if video_id:\n- yield self.url_result(video_url, MotherlessIE, video_id, mobj.group('title'))\n-\n- def _real_extract(self, url):\n- item_id = self._match_id(url)\n- real_url = self._correct_path(url, item_id)\n- webpage = self._download_webpage(real_url, item_id, 'Downloading page 1')\n-\n- def get_page(idx):\n- page = idx + 1\n- current_page = webpage if not idx else self._download_webpage(\n- real_url, item_id, note=f'Downloading page {page}', query={'page': page, **self._EXTRA_QUERY})\n- yield from self._extract_entries(current_page, real_url)\n-\n- return self.playlist_result(\n- OnDemandPagedList(get_page, self._PAGE_SIZE), item_id,\n- self._correct_title(self._html_extract_title(webpage)))\n-\n-\n-class MotherlessGroupIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/g[vifm]?/(?P<id>[a-z0-9_]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'http://motherless.com/gv/movie_scenes',\n- 'info_dict': {\n- 'id': 'movie_scenes',\n- 'title': 'Movie Scenes',\n- },\n- 'playlist_mincount': 540,\n- }, {\n- 'url': 'http://motherless.com/g/sex_must_be_funny',\n- 'info_dict': {\n- 'id': 'sex_must_be_funny',\n- 'title': 'Sex must be funny',\n- },\n- 'playlist_count': 0,\n- }, {\n- 'url': 'https://motherless.com/gv/beautiful_cock',\n- 'info_dict': {\n- 'id': 'beautiful_cock',\n- 'title': 'Beautiful Cock',\n- },\n- 'playlist_mincount': 371,\n- }]\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/gv/{item_id}')\n-\n-\n-class MotherlessGalleryIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/G[VIG]?(?P<id>[A-F0-9]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://motherless.com/GV338999F',\n- 'info_dict': {\n- 'id': '338999F',\n- 'title': 'Random',\n- },\n- 'playlist_mincount': 100,\n- }, {\n- 'url': 'https://motherless.com/GVABD6213',\n- 'info_dict': {\n- 'id': 'ABD6213',\n- 'title': 'Cuties',\n- },\n- 'playlist_mincount': 1,\n- }, {\n- 'url': 'https://motherless.com/GVBCF7622',\n- 'info_dict': {\n- 'id': 'BCF7622',\n- 'title': 'Vintage',\n- },\n- 'playlist_count': 0,\n- }, {\n- 'url': 'https://motherless.com/G035DE2F',\n- 'info_dict': {\n- 'id': '035DE2F',\n- 'title': 'General',\n- },\n- 'playlist_mincount': 234,\n- }]\n-\n- def _correct_title(self, title, /):\n- return remove_end(title, ' | MOTHERLESS.COM โข')\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/GV{item_id}')\n-\n-\n-class MotherlessUploaderIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/u/(?P<id>\\w+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://motherless.com/u/Mrgo4hrs2023',\n- 'info_dict': {\n- 'id': 'Mrgo4hrs2023',\n- 'title': \"Mrgo4hrs2023's Uploads\",\n- },\n- 'playlist_mincount': 32,\n- }, {\n- 'url': 'https://motherless.com/u/Happy_couple?t=v',\n- 'info_dict': {\n- 'id': 'Happy_couple',\n- 'title': \"Happy_couple's Uploads\",\n- },\n- 'playlist_mincount': 8,\n- }]\n-\n- _EXTRA_QUERY = {'t': 'v'}\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/u/{item_id}?t=v')\ndiff --git a/yt_dlp/extractor/moview.py b/yt_dlp/extractor/moview.py\ndeleted file mode 100644\nindex 560154e1a1e2..000000000000\n--- a/yt_dlp/extractor/moview.py\n+++ /dev/null\n@@ -1,43 +0,0 @@\n-from .jixie import JixieBaseIE\n-\n-\n-class MoviewPlayIE(JixieBaseIE):\n- _VALID_URL = r'https?://www\\.moview\\.id/play/\\d+/(?P<id>[\\w-]+)'\n- _TESTS = [\n- {\n- # drm hls, only use direct link\n- 'url': 'https://www.moview.id/play/174/Candy-Monster',\n- 'info_dict': {\n- 'id': '146182',\n- 'ext': 'mp4',\n- 'display_id': 'Candy-Monster',\n- 'uploader_id': 'Mo165qXUUf',\n- 'duration': 528.2,\n- 'title': 'Candy Monster',\n- 'description': 'Mengapa Candy Monster ingin mengambil permen Chloe?',\n- 'thumbnail': 'https://video.jixie.media/1034/146182/146182_1280x720.jpg',\n- },\n- }, {\n- # non-drm hls\n- 'url': 'https://www.moview.id/play/75/Paris-Van-Java-Episode-16',\n- 'info_dict': {\n- 'id': '28210',\n- 'ext': 'mp4',\n- 'duration': 2595.666667,\n- 'display_id': 'Paris-Van-Java-Episode-16',\n- 'uploader_id': 'Mo165qXUUf',\n- 'thumbnail': 'https://video.jixie.media/1003/28210/28210_1280x720.jpg',\n- 'description': 'md5:2a5e18d98eef9b39d7895029cac96c63',\n- 'title': 'Paris Van Java Episode 16',\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- video_id = self._search_regex(\n- r'video_id\\s*=\\s*\"(?P<video_id>[^\"]+)', webpage, 'video_id')\n-\n- return self._extract_data_from_jixie_id(display_id, video_id, webpage)\ndiff --git a/yt_dlp/extractor/moviezine.py b/yt_dlp/extractor/moviezine.py\ndeleted file mode 100644\nindex 331a56234bce..000000000000\n--- a/yt_dlp/extractor/moviezine.py\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class MoviezineIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?moviezine\\.se/video/(?P<id>[^?#]+)'\n-\n- _TEST = {\n- 'url': 'http://www.moviezine.se/video/205866',\n- 'info_dict': {\n- 'id': '205866',\n- 'ext': 'mp4',\n- 'title': 'Oculus - Trailer 1',\n- 'description': 'md5:40cc6790fc81d931850ca9249b40e8a4',\n- 'thumbnail': r're:http://.*\\.jpg',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n-\n- webpage = self._download_webpage(url, video_id)\n- jsplayer = self._download_webpage(f'http://www.moviezine.se/api/player.js?video={video_id}', video_id, 'Downloading js api player')\n-\n- formats = [{\n- 'format_id': 'sd',\n- 'url': self._html_search_regex(r'file: \"(.+?)\",', jsplayer, 'file'),\n- 'quality': 0,\n- 'ext': 'mp4',\n- }]\n-\n- return {\n- 'id': video_id,\n- 'title': self._search_regex(r'title: \"(.+?)\",', jsplayer, 'title'),\n- 'thumbnail': self._search_regex(r'image: \"(.+?)\",', jsplayer, 'image'),\n- 'formats': formats,\n- 'description': self._og_search_description(webpage),\n- }\ndiff --git a/yt_dlp/extractor/musicdex.py b/yt_dlp/extractor/musicdex.py\ndeleted file mode 100644\nindex 5ca390ef9af5..000000000000\n--- a/yt_dlp/extractor/musicdex.py\n+++ /dev/null\n@@ -1,174 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- date_from_str,\n- format_field,\n- try_get,\n- unified_strdate,\n-)\n-\n-\n-class MusicdexBaseIE(InfoExtractor):\n- def _return_info(self, track_json, album_json, video_id):\n- return {\n- 'id': str(video_id),\n- 'title': track_json.get('name'),\n- 'track': track_json.get('name'),\n- 'description': track_json.get('description'),\n- 'track_number': track_json.get('number'),\n- 'url': format_field(track_json, 'url', 'https://www.musicdex.org/%s'),\n- 'duration': track_json.get('duration'),\n- 'genres': [genre.get('name') for genre in track_json.get('genres') or []],\n- 'like_count': track_json.get('likes_count'),\n- 'view_count': track_json.get('plays'),\n- 'artists': [artist.get('name') for artist in track_json.get('artists') or []],\n- 'album_artists': [artist.get('name') for artist in album_json.get('artists') or []],\n- 'thumbnail': format_field(album_json, 'image', 'https://www.musicdex.org/%s'),\n- 'album': album_json.get('name'),\n- 'release_year': try_get(album_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\n- 'extractor_key': MusicdexSongIE.ie_key(),\n- 'extractor': 'MusicdexSong',\n- }\n-\n-\n-class MusicdexSongIE(MusicdexBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/track/(?P<id>\\d+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/track/306/dual-existence',\n- 'info_dict': {\n- 'id': '306',\n- 'ext': 'mp3',\n- 'title': 'dual existence',\n- 'description': '#NIPPONSEI @ IRC.RIZON.NET',\n- 'track': 'dual existence',\n- 'track_number': 1,\n- 'duration': 266000,\n- 'genres': ['Anime'],\n- 'like_count': int,\n- 'view_count': int,\n- 'artists': ['fripSide'],\n- 'album_artists': ['fripSide'],\n- 'thumbnail': 'https://www.musicdex.org/storage/album/9iDIam1DHTVqUG4UclFIEq1WAFGXfPW4y0TtZa91.png',\n- 'album': 'To Aru Kagaku no Railgun T OP2 Single - dual existence',\n- 'release_year': 2020,\n- },\n- 'params': {'skip_download': True},\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.musicdex.org/secure/tracks/{video_id}?defaultRelations=true', video_id)['track']\n- return self._return_info(data_json, data_json.get('album') or {}, video_id)\n-\n-\n-class MusicdexAlbumIE(MusicdexBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/album/(?P<id>\\d+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/album/56/tenmon-and-eiichiro-yanagi-minori/ef-a-tale-of-memories-original-soundtrack-2-fortissimo',\n- 'playlist_mincount': 28,\n- 'info_dict': {\n- 'id': '56',\n- 'genres': ['OST'],\n- 'view_count': int,\n- 'artists': ['TENMON & Eiichiro Yanagi / minori'],\n- 'title': 'ef - a tale of memories Original Soundtrack 2 ~fortissimo~',\n- 'release_year': 2008,\n- 'thumbnail': 'https://www.musicdex.org/storage/album/2rSHkyYBYfB7sbvElpEyTMcUn6toY7AohOgJuDlE.jpg',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.musicdex.org/secure/albums/{playlist_id}?defaultRelations=true', playlist_id)['album']\n- entries = [self._return_info(track, data_json, track['id'])\n- for track in data_json.get('tracks') or [] if track.get('id')]\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'description': data_json.get('description'),\n- 'genres': [genre.get('name') for genre in data_json.get('genres') or []],\n- 'view_count': data_json.get('plays'),\n- 'artists': [artist.get('name') for artist in data_json.get('artists') or []],\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\n- 'release_year': try_get(data_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\n- 'entries': entries,\n- }\n-\n-\n-class MusicdexPageIE(MusicdexBaseIE): # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor\n- def _entries(self, playlist_id):\n- next_page_url = self._API_URL % playlist_id\n- while next_page_url:\n- data_json = self._download_json(next_page_url, playlist_id)['pagination']\n- yield from data_json.get('data') or []\n- next_page_url = data_json.get('next_page_url')\n-\n-\n-class MusicdexArtistIE(MusicdexPageIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/artist/(?P<id>\\d+)'\n- _API_URL = 'https://www.musicdex.org/secure/artists/%s/albums?page=1'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/artist/11/fripside',\n- 'playlist_mincount': 28,\n- 'info_dict': {\n- 'id': '11',\n- 'view_count': int,\n- 'title': 'fripSide',\n- 'thumbnail': 'https://www.musicdex.org/storage/artist/ZmOz0lN2vsweegB660em3xWffCjLPmTQHqJls5Xx.jpg',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{playlist_id}', playlist_id)['artist']\n- entries = []\n- for album in self._entries(playlist_id):\n- entries.extend(self._return_info(track, album, track['id']) for track in album.get('tracks') or [] if track.get('id'))\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'view_count': data_json.get('plays'),\n- 'thumbnail': format_field(data_json, 'image_small', 'https://www.musicdex.org/%s'),\n- 'entries': entries,\n- }\n-\n-\n-class MusicdexPlaylistIE(MusicdexPageIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/playlist/(?P<id>\\d+)'\n- _API_URL = 'https://www.musicdex.org/secure/playlists/%s/tracks?perPage=10000&page=1'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/playlist/9/test',\n- 'playlist_mincount': 73,\n- 'info_dict': {\n- 'id': '9',\n- 'view_count': int,\n- 'title': 'Test',\n- 'thumbnail': 'https://www.musicdex.org/storage/album/jXATI79f0IbQ2sgsKYOYRCW3zRwF3XsfHhzITCuJ.jpg',\n- 'description': 'Test 123 123 21312 32121321321321312',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{playlist_id}', playlist_id)['playlist']\n- entries = [self._return_info(track, track.get('album') or {}, track['id'])\n- for track in self._entries(playlist_id) or [] if track.get('id')]\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'description': data_json.get('description'),\n- 'view_count': data_json.get('plays'),\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\n- 'entries': entries,\n- }\ndiff --git a/yt_dlp/extractor/nationalgeographic.py b/yt_dlp/extractor/nationalgeographic.py\nindex 43f84a95276a..d06680ccff1f 100644\n--- a/yt_dlp/extractor/nationalgeographic.py\n+++ b/yt_dlp/extractor/nationalgeographic.py\n@@ -1,64 +1,4 @@\n-from .common import InfoExtractor\n from .fox import FOXIE\n-from ..utils import (\n- smuggle_url,\n- url_basename,\n-)\n-\n-\n-class NationalGeographicVideoIE(InfoExtractor):\n- IE_NAME = 'natgeo:video'\n- _VALID_URL = r'https?://video\\.nationalgeographic\\.com/.*?'\n-\n- _TESTS = [\n- {\n- 'url': 'http://video.nationalgeographic.com/video/news/150210-news-crab-mating-vin?source=featuredvideo',\n- 'md5': '730855d559abbad6b42c2be1fa584917',\n- 'info_dict': {\n- 'id': '0000014b-70a1-dd8c-af7f-f7b559330001',\n- 'ext': 'mp4',\n- 'title': 'Mating Crabs Busted by Sharks',\n- 'description': 'md5:16f25aeffdeba55aaa8ec37e093ad8b3',\n- 'timestamp': 1423523799,\n- 'upload_date': '20150209',\n- 'uploader': 'NAGS',\n- },\n- 'add_ie': ['ThePlatform'],\n- 'skip': 'Redirects to main page',\n- },\n- {\n- 'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws',\n- 'md5': '6a3105eb448c070503b3105fb9b320b5',\n- 'info_dict': {\n- 'id': 'ngc-I0IauNSWznb_UV008GxSbwY35BZvgi2e',\n- 'ext': 'mp4',\n- 'title': 'The Real Jaws',\n- 'description': 'md5:8d3e09d9d53a85cd397b4b21b2c77be6',\n- 'timestamp': 1433772632,\n- 'upload_date': '20150608',\n- 'uploader': 'NAGS',\n- },\n- 'add_ie': ['ThePlatform'],\n- 'skip': 'Redirects to main page',\n- },\n- ]\n-\n- def _real_extract(self, url):\n- name = url_basename(url)\n-\n- webpage = self._download_webpage(url, name)\n- guid = self._search_regex(\n- r'id=\"(?:videoPlayer|player-container)\"[^>]+data-guid=\"([^\"]+)\"',\n- webpage, 'guid')\n-\n- return {\n- '_type': 'url_transparent',\n- 'ie_key': 'ThePlatform',\n- 'url': smuggle_url(\n- f'http://link.theplatform.com/s/ngs/media/guid/2423130747/{guid}?mbr=true',\n- {'force_smil_url': True}),\n- 'id': guid,\n- }\n \n \n class NationalGeographicTVIE(FOXIE): # XXX: Do not subclass from concrete IE\ndiff --git a/yt_dlp/extractor/naver.py b/yt_dlp/extractor/naver.py\nindex fa7b56ca75db..ffb4da2622f3 100644\n--- a/yt_dlp/extractor/naver.py\n+++ b/yt_dlp/extractor/naver.py\n@@ -13,11 +13,9 @@\n dict_get,\n int_or_none,\n join_nonempty,\n- merge_dicts,\n parse_iso8601,\n traverse_obj,\n try_get,\n- unified_timestamp,\n update_url_query,\n url_or_none,\n )\n@@ -284,142 +282,3 @@ def _real_extract(self, url):\n }), get_all=False),\n 'is_live': True,\n }\n-\n-\n-class NaverNowIE(NaverBaseIE):\n- IE_NAME = 'navernow'\n- _VALID_URL = r'https?://now\\.naver\\.com/s/now\\.(?P<id>\\w+)'\n- _API_URL = 'https://apis.naver.com/now_web/oldnow_web/v4'\n- _TESTS = [{\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay=',\n- 'md5': 'e05854162c21c221481de16b2944a0bc',\n- 'info_dict': {\n- 'id': '4759-26331132',\n- 'title': '์์ดํคX๋
ธ์ \\r\\n๐๊ฝ๋ฅ๊ฝ๋ฅ๐(1)',\n- 'ext': 'mp4',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'timestamp': 1650369600,\n- 'upload_date': '20220419',\n- 'uploader_id': 'now',\n- 'view_count': int,\n- 'uploader_url': 'https://now.naver.com/show/4759',\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'params': {\n- 'noplaylist': True,\n- },\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\n- 'md5': '9f6118e398aa0f22b2152f554ea7851b',\n- 'info_dict': {\n- 'id': '4759-26601461',\n- 'title': '์์ดํค: ๋ ๋ฆฌ์ ํํ
ํ๋ค๋ ธ์ด,,, ์งํฌ ํญ๋ฐํ๋ ๋
ธ์ ์ฌ๋ณด๐พ [์์ดํค์ ๋ฐ์ฆ์
]ใ
ฃ๋ค์ด๋ฒ NOW.',\n- 'ext': 'mp4',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20220504',\n- 'timestamp': 1651648311,\n- 'uploader_id': 'now',\n- 'view_count': int,\n- 'uploader_url': 'https://now.naver.com/show/4759',\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'params': {\n- 'noplaylist': True,\n- },\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.kihyunplay?shareReplayId=30573291#replay',\n- 'only_matching': True,\n- }]\n-\n- def _extract_replay(self, show_id, replay_id):\n- vod_info = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}', replay_id)\n- in_key = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}/inkey', replay_id)['inKey']\n- return merge_dicts({\n- 'id': f'{show_id}-{replay_id}',\n- 'title': traverse_obj(vod_info, ('episode', 'title')),\n- 'timestamp': unified_timestamp(traverse_obj(vod_info, ('episode', 'start_time'))),\n- 'thumbnail': vod_info.get('thumbnail_image_url'),\n- }, self._extract_video_info(replay_id, vod_info['video_id'], in_key))\n-\n- def _extract_show_replays(self, show_id):\n- page_size = 15\n- page = 1\n- while True:\n- show_vod_info = self._download_json(\n- f'{self._API_URL}/vod-shows/now.{show_id}', show_id,\n- query={'page': page, 'page_size': page_size},\n- note=f'Downloading JSON vod list for show {show_id} - page {page}',\n- )['response']['result']\n- for v in show_vod_info.get('vod_list') or []:\n- yield self._extract_replay(show_id, v['id'])\n-\n- if len(show_vod_info.get('vod_list') or []) < page_size:\n- break\n- page += 1\n-\n- def _extract_show_highlights(self, show_id, highlight_id=None):\n- page_size = 10\n- page = 1\n- while True:\n- highlights_videos = self._download_json(\n- f'{self._API_URL}/shows/now.{show_id}/highlights/videos/', show_id,\n- query={'page': page, 'page_size': page_size},\n- note=f'Downloading JSON highlights for show {show_id} - page {page}')\n-\n- for highlight in highlights_videos.get('results') or []:\n- if highlight_id and highlight.get('clip_no') != int(highlight_id):\n- continue\n- yield merge_dicts({\n- 'id': f'{show_id}-{highlight[\"clip_no\"]}',\n- 'title': highlight.get('title'),\n- 'timestamp': unified_timestamp(highlight.get('regdate')),\n- 'thumbnail': highlight.get('thumbnail_url'),\n- }, self._extract_video_info(highlight['clip_no'], highlight['video_id'], highlight['video_inkey']))\n-\n- if len(highlights_videos.get('results') or []) < page_size:\n- break\n- page += 1\n-\n- def _extract_highlight(self, show_id, highlight_id):\n- try:\n- return next(self._extract_show_highlights(show_id, highlight_id))\n- except StopIteration:\n- raise ExtractorError(f'Unable to find highlight {highlight_id} for show {show_id}')\n-\n- def _real_extract(self, url):\n- show_id = self._match_id(url)\n- qs = urllib.parse.parse_qs(urllib.parse.urlparse(url).query)\n-\n- if not self._yes_playlist(show_id, qs.get('shareHightlight')):\n- return self._extract_highlight(show_id, qs['shareHightlight'][0])\n- elif not self._yes_playlist(show_id, qs.get('shareReplayId')):\n- return self._extract_replay(show_id, qs['shareReplayId'][0])\n-\n- show_info = self._download_json(\n- f'{self._API_URL}/shows/now.{show_id}/', show_id,\n- note=f'Downloading JSON vod list for show {show_id}')\n-\n- return self.playlist_result(\n- itertools.chain(self._extract_show_replays(show_id), self._extract_show_highlights(show_id)),\n- show_id, show_info.get('title'))\ndiff --git a/yt_dlp/extractor/nerdcubed.py b/yt_dlp/extractor/nerdcubed.py\ndeleted file mode 100644\nindex 5f5607a20b25..000000000000\n--- a/yt_dlp/extractor/nerdcubed.py\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import parse_iso8601, url_or_none\n-from ..utils.traversal import traverse_obj\n-\n-\n-class NerdCubedFeedIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?nerdcubed\\.co\\.uk/?(?:$|[#?])'\n- _TEST = {\n- 'url': 'http://www.nerdcubed.co.uk/',\n- 'info_dict': {\n- 'id': 'nerdcubed-feed',\n- 'title': 'nerdcubed.co.uk feed',\n- },\n- 'playlist_mincount': 5500,\n- }\n-\n- def _extract_video(self, feed_entry):\n- return self.url_result(\n- f'https://www.youtube.com/watch?v={feed_entry[\"id\"]}', YoutubeIE,\n- **traverse_obj(feed_entry, {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'timestamp': ('publishedAt', {parse_iso8601}),\n- 'channel': ('source', 'name', {str}),\n- 'channel_id': ('source', 'id', {str}),\n- 'channel_url': ('source', 'url', {str}),\n- 'thumbnail': ('thumbnail', 'source', {url_or_none}),\n- }), url_transparent=True)\n-\n- def _real_extract(self, url):\n- video_id = 'nerdcubed-feed'\n- feed = self._download_json('https://www.nerdcubed.co.uk/_/cdn/videos.json', video_id)\n-\n- return self.playlist_result(\n- map(self._extract_video, traverse_obj(feed, ('videos', lambda _, v: v['id']))),\n- video_id, 'nerdcubed.co.uk feed')\ndiff --git a/yt_dlp/extractor/netverse.py b/yt_dlp/extractor/netverse.py\ndeleted file mode 100644\nindex 2ddec5c0ae17..000000000000\n--- a/yt_dlp/extractor/netverse.py\n+++ /dev/null\n@@ -1,281 +0,0 @@\n-import itertools\n-\n-from .common import InfoExtractor, SearchInfoExtractor\n-from .dailymotion import DailymotionIE\n-from ..utils import smuggle_url, traverse_obj\n-\n-\n-class NetverseBaseIE(InfoExtractor):\n- _ENDPOINTS = {\n- 'watch': 'watchvideo',\n- 'video': 'watchvideo',\n- 'webseries': 'webseries',\n- 'season': 'webseason_videos',\n- }\n-\n- def _call_api(self, slug, endpoint, query={}, season_id='', display_id=None):\n- return self._download_json(\n- f'https://api.netverse.id/medias/api/v2/{self._ENDPOINTS[endpoint]}/{slug}/{season_id}',\n- display_id or slug, query=query)\n-\n- def _get_comments(self, video_id):\n- last_page_number = None\n- for i in itertools.count(1):\n- comment_data = self._download_json(\n- f'https://api.netverse.id/mediadetails/api/v3/videos/comments/{video_id}',\n- video_id, data=b'', fatal=False, query={'page': i},\n- note=f'Downloading JSON comment metadata page {i}') or {}\n- yield from traverse_obj(comment_data, ('response', 'comments', 'data', ..., {\n- 'id': '_id',\n- 'text': 'comment',\n- 'author_id': 'customer_id',\n- 'author': ('customer', 'name'),\n- 'author_thumbnail': ('customer', 'profile_picture'),\n- }))\n-\n- if not last_page_number:\n- last_page_number = traverse_obj(comment_data, ('response', 'comments', 'last_page'))\n- if i >= (last_page_number or 0):\n- break\n-\n-\n-class NetverseIE(NetverseBaseIE):\n- _VALID_URL = r'https?://(?:\\w+\\.)?netverse\\.id/(?P<type>watch|video)/(?P<display_id>[^/?#&]+)'\n- _TESTS = [{\n- # Watch video\n- 'url': 'https://www.netverse.id/watch/waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\n- 'info_dict': {\n- 'id': 'k4yhqUwINAGtmHx3NkL',\n- 'title': 'Waktu Indonesia Bercanda - Edisi Spesial Lebaran 2016',\n- 'ext': 'mp4',\n- 'season': 'Season 2016',\n- 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 22,\n- 'episode': 'Episode 22',\n- 'uploader_id': 'x2ir3vq',\n- 'age_limit': 0,\n- 'tags': [],\n- 'view_count': int,\n- 'display_id': 'waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\n- 'duration': 2990,\n- 'upload_date': '20210722',\n- 'timestamp': 1626919804,\n- 'like_count': int,\n- 'uploader': 'Net Prime',\n- },\n- }, {\n- # series\n- 'url': 'https://www.netverse.id/watch/jadoo-seorang-model',\n- 'info_dict': {\n- 'id': 'x88izwc',\n- 'title': 'Jadoo Seorang Model',\n- 'ext': 'mp4',\n- 'season': 'Season 2',\n- 'description': 'md5:8a74f70812cca267e19ee0635f0af835',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 2,\n- 'episode': 'Episode 2',\n- 'view_count': int,\n- 'like_count': int,\n- 'display_id': 'jadoo-seorang-model',\n- 'uploader_id': 'x2ir3vq',\n- 'duration': 635,\n- 'timestamp': 1646372927,\n- 'tags': ['PG069497-hellojadooseason2eps2'],\n- 'upload_date': '20220304',\n- 'uploader': 'Net Prime',\n- 'age_limit': 0,\n- },\n- 'skip': 'video get Geo-blocked for some country',\n- }, {\n- # non www host\n- 'url': 'https://netverse.id/watch/tetangga-baru',\n- 'info_dict': {\n- 'id': 'k4CNGz7V0HJ7vfwZbXy',\n- 'ext': 'mp4',\n- 'title': 'Tetangga Baru',\n- 'season': 'Season 1',\n- 'description': 'md5:23fcf70e97d461d3029d25d59b2ccfb9',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'timestamp': 1624538169,\n- 'view_count': int,\n- 'upload_date': '20210624',\n- 'age_limit': 0,\n- 'uploader_id': 'x2ir3vq',\n- 'like_count': int,\n- 'uploader': 'Net Prime',\n- 'tags': ['PG008534', 'tetangga', 'Baru'],\n- 'display_id': 'tetangga-baru',\n- 'duration': 1406,\n- },\n- }, {\n- # /video url\n- 'url': 'https://www.netverse.id/video/pg067482-hellojadoo-season1',\n- 'title': 'Namaku Choi Jadoo',\n- 'info_dict': {\n- 'id': 'x887jzz',\n- 'ext': 'mp4',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'season': 'Season 1',\n- 'episode_number': 1,\n- 'description': 'md5:d4f627b3e7a3f9acdc55f6cdd5ea41d5',\n- 'title': 'Namaku Choi Jadoo',\n- 'episode': 'Episode 1',\n- 'age_limit': 0,\n- 'like_count': int,\n- 'view_count': int,\n- 'tags': ['PG067482', 'PG067482-HelloJadoo-season1'],\n- 'duration': 780,\n- 'display_id': 'pg067482-hellojadoo-season1',\n- 'uploader_id': 'x2ir3vq',\n- 'uploader': 'Net Prime',\n- 'timestamp': 1645764984,\n- 'upload_date': '20220225',\n- },\n- 'skip': 'This video get Geo-blocked for some country',\n- }, {\n- # video with comments\n- 'url': 'https://netverse.id/video/episode-1-season-2016-ok-food',\n- 'info_dict': {\n- 'id': 'k6hetBPiQMljSxxvAy7',\n- 'ext': 'mp4',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'display_id': 'episode-1-season-2016-ok-food',\n- 'like_count': int,\n- 'description': '',\n- 'duration': 1471,\n- 'age_limit': 0,\n- 'timestamp': 1642405848,\n- 'episode_number': 1,\n- 'season': 'Season 2016',\n- 'uploader_id': 'x2ir3vq',\n- 'title': 'Episode 1 - Season 2016 - Ok Food',\n- 'upload_date': '20220117',\n- 'tags': [],\n- 'view_count': int,\n- 'episode': 'Episode 1',\n- 'uploader': 'Net Prime',\n- 'comment_count': int,\n- },\n- 'params': {\n- 'getcomments': True,\n- },\n- }, {\n- # video with multiple page comment\n- 'url': 'https://netverse.id/video/match-island-eps-1-fix',\n- 'info_dict': {\n- 'id': 'x8aznjc',\n- 'ext': 'mp4',\n- 'like_count': int,\n- 'tags': ['Match-Island', 'Pd00111'],\n- 'display_id': 'match-island-eps-1-fix',\n- 'view_count': int,\n- 'episode': 'Episode 1',\n- 'uploader': 'Net Prime',\n- 'duration': 4070,\n- 'timestamp': 1653068165,\n- 'description': 'md5:e9cf3b480ad18e9c33b999e3494f223f',\n- 'age_limit': 0,\n- 'title': 'Welcome To Match Island',\n- 'upload_date': '20220520',\n- 'episode_number': 1,\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'uploader_id': 'x2ir3vq',\n- 'season': 'Season 1',\n- 'comment_count': int,\n- },\n- 'params': {\n- 'getcomments': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\n- program_json = self._call_api(display_id, sites_type)\n- videos = program_json['response']['videos']\n-\n- return {\n- '_type': 'url_transparent',\n- 'ie_key': DailymotionIE.ie_key(),\n- 'url': smuggle_url(videos['dailymotion_url'], {'query': {'embedder': 'https://www.netverse.id'}}),\n- 'display_id': display_id,\n- 'title': videos.get('title'),\n- 'season': videos.get('season_name'),\n- 'thumbnail': traverse_obj(videos, ('program_detail', 'thumbnail_image')),\n- 'description': traverse_obj(videos, ('program_detail', 'description')),\n- 'episode_number': videos.get('episode_order'),\n- '__post_extractor': self.extract_comments(display_id),\n- }\n-\n-\n-class NetversePlaylistIE(NetverseBaseIE):\n- _VALID_URL = r'https?://(?:\\w+\\.)?netverse\\.id/(?P<type>webseries)/(?P<display_id>[^/?#&]+)'\n- _TESTS = [{\n- # multiple season\n- 'url': 'https://netverse.id/webseries/tetangga-masa-gitu',\n- 'info_dict': {\n- 'id': 'tetangga-masa-gitu',\n- 'title': 'Tetangga Masa Gitu',\n- },\n- 'playlist_count': 519,\n- }, {\n- # single season\n- 'url': 'https://netverse.id/webseries/kelas-internasional',\n- 'info_dict': {\n- 'id': 'kelas-internasional',\n- 'title': 'Kelas Internasional',\n- },\n- 'playlist_count': 203,\n- }]\n-\n- def parse_playlist(self, json_data, playlist_id):\n- slug_sample = traverse_obj(json_data, ('related', 'data', ..., 'slug'))[0]\n- for season in traverse_obj(json_data, ('seasons', ..., 'id')):\n- playlist_json = self._call_api(\n- slug_sample, 'season', display_id=playlist_id, season_id=season)\n-\n- for current_page in range(playlist_json['response']['season_list']['last_page']):\n- playlist_json = self._call_api(slug_sample, 'season', query={'page': current_page + 1},\n- season_id=season, display_id=playlist_id)\n- for slug in traverse_obj(playlist_json, ('response', ..., 'data', ..., 'slug')):\n- yield self.url_result(f'https://www.netverse.id/video/{slug}', NetverseIE)\n-\n- def _real_extract(self, url):\n- playlist_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\n- playlist_data = self._call_api(playlist_id, sites_type)\n-\n- return self.playlist_result(\n- self.parse_playlist(playlist_data['response'], playlist_id),\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'slug')),\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'title')))\n-\n-\n-class NetverseSearchIE(SearchInfoExtractor):\n- _SEARCH_KEY = 'netsearch'\n-\n- _TESTS = [{\n- 'url': 'netsearch10:tetangga',\n- 'info_dict': {\n- 'id': 'tetangga',\n- 'title': 'tetangga',\n- },\n- 'playlist_count': 10,\n- }]\n-\n- def _search_results(self, query):\n- last_page = None\n- for i in itertools.count(1):\n- search_data = self._download_json(\n- 'https://api.netverse.id/search/elastic/search', query,\n- query={'q': query, 'page': i}, note=f'Downloading page {i}')\n-\n- videos = traverse_obj(search_data, ('response', 'data', ...))\n- for video in videos:\n- yield self.url_result(f'https://netverse.id/video/{video[\"slug\"]}', NetverseIE)\n-\n- last_page = last_page or traverse_obj(search_data, ('response', 'lastpage'))\n- if not videos or i >= (last_page or 0):\n- break\ndiff --git a/yt_dlp/extractor/nuum.py b/yt_dlp/extractor/nuum.py\ndeleted file mode 100644\nindex 697fc6b32e1c..000000000000\n--- a/yt_dlp/extractor/nuum.py\n+++ /dev/null\n@@ -1,201 +0,0 @@\n-import functools\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- OnDemandPagedList,\n- UserNotLive,\n- filter_dict,\n- int_or_none,\n- parse_iso8601,\n- str_or_none,\n- url_or_none,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class NuumBaseIE(InfoExtractor):\n- def _call_api(self, path, video_id, description, query={}):\n- response = self._download_json(\n- f'https://nuum.ru/api/v2/{path}', video_id, query=query,\n- note=f'Downloading {description} metadata',\n- errnote=f'Unable to download {description} metadata')\n- if error := response.get('error'):\n- raise ExtractorError(f'API returned error: {error!r}')\n- return response['result']\n-\n- def _get_channel_info(self, channel_name):\n- return self._call_api(\n- 'broadcasts/public', video_id=channel_name, description='channel',\n- query={\n- 'with_extra': 'true',\n- 'channel_name': channel_name,\n- 'with_deleted': 'true',\n- })\n-\n- def _parse_video_data(self, container, extract_formats=True):\n- stream = traverse_obj(container, ('media_container_streams', 0, {dict})) or {}\n- media = traverse_obj(stream, ('stream_media', 0, {dict})) or {}\n- media_url = traverse_obj(media, (\n- 'media_meta', ('media_archive_url', 'media_url'), {url_or_none}), get_all=False)\n-\n- video_id = str(container['media_container_id'])\n- is_live = media.get('media_status') == 'RUNNING'\n-\n- formats, subtitles = None, None\n- headers = {'Referer': 'https://nuum.ru/'}\n- if extract_formats:\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- media_url, video_id, 'mp4', live=is_live, headers=headers)\n-\n- return filter_dict({\n- 'id': video_id,\n- 'is_live': is_live,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'http_headers': headers,\n- **traverse_obj(container, {\n- 'title': ('media_container_name', {str}),\n- 'description': ('media_container_description', {str}),\n- 'timestamp': ('created_at', {parse_iso8601}),\n- 'channel': ('media_container_channel', 'channel_name', {str}),\n- 'channel_id': ('media_container_channel', 'channel_id', {str_or_none}),\n- }),\n- **traverse_obj(stream, {\n- 'view_count': ('stream_total_viewers', {int_or_none}),\n- 'concurrent_view_count': ('stream_current_viewers', {int_or_none}),\n- }),\n- **traverse_obj(media, {\n- 'duration': ('media_duration', {int_or_none}),\n- 'thumbnail': ('media_meta', ('media_preview_archive_url', 'media_preview_url'), {url_or_none}),\n- }, get_all=False),\n- })\n-\n-\n-class NuumMediaIE(NuumBaseIE):\n- IE_NAME = 'nuum:media'\n- _VALID_URL = r'https?://nuum\\.ru/(?:streams|videos|clips)/(?P<id>[\\d]+)'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/streams/1592713-7-days-to-die',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://nuum.ru/videos/1567547-toxi-hurtz',\n- 'md5': 'ce28837a5bbffe6952d7bfd3d39811b0',\n- 'info_dict': {\n- 'id': '1567547',\n- 'ext': 'mp4',\n- 'title': 'Toxi$ - Hurtz',\n- 'description': '',\n- 'timestamp': 1702631651,\n- 'upload_date': '20231215',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'view_count': int,\n- 'concurrent_view_count': int,\n- 'channel_id': '6911',\n- 'channel': 'toxis',\n- 'duration': 116,\n- },\n- }, {\n- 'url': 'https://nuum.ru/clips/1552564-pro-misu',\n- 'md5': 'b248ae1565b1e55433188f11beeb0ca1',\n- 'info_dict': {\n- 'id': '1552564',\n- 'ext': 'mp4',\n- 'title': 'ะัะพ ะะธัั ๐',\n- 'timestamp': 1701971828,\n- 'upload_date': '20231207',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'view_count': int,\n- 'concurrent_view_count': int,\n- 'channel_id': '3320',\n- 'channel': 'Misalelik',\n- 'duration': 41,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- video_data = self._call_api(f'media-containers/{video_id}', video_id, 'media')\n-\n- return self._parse_video_data(video_data)\n-\n-\n-class NuumLiveIE(NuumBaseIE):\n- IE_NAME = 'nuum:live'\n- _VALID_URL = r'https?://nuum\\.ru/channel/(?P<id>[^/#?]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/channel/mts_live',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- channel = self._match_id(url)\n- channel_info = self._get_channel_info(channel)\n- if traverse_obj(channel_info, ('channel', 'channel_is_live')) is False:\n- raise UserNotLive(video_id=channel)\n-\n- info = self._parse_video_data(channel_info['media_container'])\n- return {\n- 'webpage_url': f'https://nuum.ru/streams/{info[\"id\"]}',\n- 'extractor_key': NuumMediaIE.ie_key(),\n- 'extractor': NuumMediaIE.IE_NAME,\n- **info,\n- }\n-\n-\n-class NuumTabIE(NuumBaseIE):\n- IE_NAME = 'nuum:tab'\n- _VALID_URL = r'https?://nuum\\.ru/channel/(?P<id>[^/#?]+)/(?P<type>streams|videos|clips)'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/channel/dankon_/clips',\n- 'info_dict': {\n- 'id': 'dankon__clips',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 29,\n- }, {\n- 'url': 'https://nuum.ru/channel/dankon_/videos',\n- 'info_dict': {\n- 'id': 'dankon__videos',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 2,\n- }, {\n- 'url': 'https://nuum.ru/channel/dankon_/streams',\n- 'info_dict': {\n- 'id': 'dankon__streams',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 1,\n- }]\n-\n- _PAGE_SIZE = 50\n-\n- def _fetch_page(self, channel_id, tab_type, tab_id, page):\n- CONTAINER_TYPES = {\n- 'clips': ['SHORT_VIDEO', 'REVIEW_VIDEO'],\n- 'videos': ['LONG_VIDEO'],\n- 'streams': ['SINGLE'],\n- }\n-\n- media_containers = self._call_api(\n- 'media-containers', video_id=tab_id, description=f'{tab_type} tab page {page + 1}',\n- query={\n- 'limit': self._PAGE_SIZE,\n- 'offset': page * self._PAGE_SIZE,\n- 'channel_id': channel_id,\n- 'media_container_status': 'STOPPED',\n- 'media_container_type': CONTAINER_TYPES[tab_type],\n- })\n- for container in traverse_obj(media_containers, (..., {dict})):\n- metadata = self._parse_video_data(container, extract_formats=False)\n- yield self.url_result(f'https://nuum.ru/videos/{metadata[\"id\"]}', NuumMediaIE, **metadata)\n-\n- def _real_extract(self, url):\n- channel_name, tab_type = self._match_valid_url(url).group('id', 'type')\n- tab_id = f'{channel_name}_{tab_type}'\n- channel_data = self._get_channel_info(channel_name)['channel']\n-\n- return self.playlist_result(OnDemandPagedList(functools.partial(\n- self._fetch_page, channel_data['channel_id'], tab_type, tab_id), self._PAGE_SIZE),\n- playlist_id=tab_id, playlist_title=channel_data.get('channel_name'))\ndiff --git a/yt_dlp/extractor/onionstudios.py b/yt_dlp/extractor/onionstudios.py\ndeleted file mode 100644\nindex 7e30b2d33dcc..000000000000\n--- a/yt_dlp/extractor/onionstudios.py\n+++ /dev/null\n@@ -1,41 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import js_to_json\n-\n-\n-class OnionStudiosIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?onionstudios\\.com/(?:video(?:s/[^/]+-|/)|embed\\?.*\\bid=)(?P<id>\\d+)(?!-)'\n- _EMBED_REGEX = [r'(?s)<(?:iframe|bulbs-video)[^>]+?src=([\"\\'])(?P<url>(?:https?:)?//(?:www\\.)?onionstudios\\.com/(?:embed.+?|video/\\d+\\.json))\\1']\n-\n- _TESTS = [{\n- 'url': 'http://www.onionstudios.com/videos/hannibal-charges-forward-stops-for-a-cocktail-2937',\n- 'md5': '5a118d466d62b5cd03647cf2c593977f',\n- 'info_dict': {\n- 'id': '3459881',\n- 'ext': 'mp4',\n- 'title': 'Hannibal charges forward, stops for a cocktail',\n- 'description': 'md5:545299bda6abf87e5ec666548c6a9448',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'uploader': 'a.v. club',\n- 'upload_date': '20150619',\n- 'timestamp': 1434728546,\n- },\n- }, {\n- 'url': 'http://www.onionstudios.com/embed?id=2855&autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.onionstudios.com/video/6139.json',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(\n- 'http://onionstudios.com/embed/dc94dc2899fe644c0e7241fa04c1b732.js',\n- video_id)\n- mcp_id = str(self._parse_json(self._search_regex(\n- r'window\\.mcpMapping\\s*=\\s*({.+?});', webpage,\n- 'MCP Mapping'), video_id, js_to_json)[video_id]['mcp_id'])\n- return self.url_result(\n- 'http://kinja.com/ajax/inset/iframe?id=mcp-' + mcp_id,\n- 'KinjaEmbed', mcp_id)\ndiff --git a/yt_dlp/extractor/ora.py b/yt_dlp/extractor/ora.py\ndeleted file mode 100644\nindex c6ba4b0d3ea4..000000000000\n--- a/yt_dlp/extractor/ora.py\n+++ /dev/null\n@@ -1,72 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- get_element_by_attribute,\n- qualities,\n- unescapeHTML,\n-)\n-\n-\n-class OraTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?(?:ora\\.tv|unsafespeech\\.com)/([^/]+/)*(?P<id>[^/\\?#]+)'\n- _TESTS = [{\n- 'url': 'https://www.ora.tv/larrykingnow/2015/12/16/vine-youtube-stars-zach-king-king-bach-on-their-viral-videos-0_36jupg6090pq',\n- 'md5': 'fa33717591c631ec93b04b0e330df786',\n- 'info_dict': {\n- 'id': '50178',\n- 'ext': 'mp4',\n- 'title': 'Vine & YouTube Stars Zach King & King Bach On Their Viral Videos!',\n- 'description': 'md5:ebbc5b1424dd5dba7be7538148287ac1',\n- },\n- }, {\n- 'url': 'http://www.unsafespeech.com/video/2016/5/10/student-self-censorship-and-the-thought-police-on-university-campuses-0_6622bnkppw4d',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- video_data = self._search_regex(\n- r'\"(?:video|current)\"\\s*:\\s*({[^}]+?})', webpage, 'current video')\n- m3u8_url = self._search_regex(\n- r'hls_stream\"?\\s*:\\s*\"([^\"]+)', video_data, 'm3u8 url', None)\n- if m3u8_url:\n- formats = self._extract_m3u8_formats(\n- m3u8_url, display_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False)\n- # similar to GameSpotIE\n- m3u8_path = urllib.parse.urlparse(m3u8_url).path\n- QUALITIES_RE = r'((,[a-z]+\\d+)+,?)'\n- available_qualities = self._search_regex(\n- QUALITIES_RE, m3u8_path, 'qualities').strip(',').split(',')\n- http_path = m3u8_path[1:].split('/', 1)[1]\n- http_template = re.sub(QUALITIES_RE, r'%s', http_path)\n- http_template = http_template.replace('.csmil/master.m3u8', '')\n- http_template = urllib.parse.urljoin(\n- 'http://videocdn-pmd.ora.tv/', http_template)\n- preference = qualities(\n- ['mobile400', 'basic400', 'basic600', 'sd900', 'sd1200', 'sd1500', 'hd720', 'hd1080'])\n- for q in available_qualities:\n- formats.append({\n- 'url': http_template % q,\n- 'format_id': q,\n- 'quality': preference(q),\n- })\n- else:\n- return self.url_result(self._search_regex(\n- r'\"youtube_id\"\\s*:\\s*\"([^\"]+)', webpage, 'youtube id'), 'Youtube')\n-\n- return {\n- 'id': self._search_regex(\n- r'\"id\"\\s*:\\s*(\\d+)', video_data, 'video id', default=display_id),\n- 'display_id': display_id,\n- 'title': unescapeHTML(self._og_search_title(webpage)),\n- 'description': get_element_by_attribute(\n- 'class', 'video_txt_decription', webpage),\n- 'thumbnail': self._proto_relative_url(self._search_regex(\n- r'\"thumb\"\\s*:\\s*\"([^\"]+)', video_data, 'thumbnail', None)),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/piramidetv.py b/yt_dlp/extractor/piramidetv.py\ndeleted file mode 100644\nindex 29afa9b4673e..000000000000\n--- a/yt_dlp/extractor/piramidetv.py\n+++ /dev/null\n@@ -1,99 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import parse_iso8601, smuggle_url, unsmuggle_url, url_or_none\n-from ..utils.traversal import traverse_obj\n-\n-\n-class PiramideTVIE(InfoExtractor):\n- _VALID_URL = r'https?://piramide\\.tv/video/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://piramide.tv/video/wWtBAORdJUTh',\n- 'info_dict': {\n- 'id': 'wWtBAORdJUTh',\n- 'ext': 'mp4',\n- 'title': 'md5:79f9c8183ea6a35c836923142cf0abcc',\n- 'description': '',\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/W86PgQDn/thumbnails/B9gpIxkH.jpg',\n- 'channel': 'Leรณn Picarรณn',\n- 'channel_id': 'leonpicaron',\n- 'timestamp': 1696460362,\n- 'upload_date': '20231004',\n- },\n- }, {\n- 'url': 'https://piramide.tv/video/wcYn6li79NgN',\n- 'info_dict': {\n- 'id': 'wcYn6li79NgN',\n- 'ext': 'mp4',\n- 'title': 'ACEPTO TENER UN BEBE CON MI NOVIA\\u2026? | Parte 1',\n- 'description': '',\n- 'channel': 'ARTA GAME',\n- 'channel_id': 'arta_game',\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/cnEdGp5X/thumbnails/rHAaWfP7.jpg',\n- 'timestamp': 1703434976,\n- 'upload_date': '20231224',\n- },\n- }]\n-\n- def _extract_video(self, video_id):\n- video_data = self._download_json(\n- f'https://hermes.piramide.tv/video/data/{video_id}', video_id, fatal=False)\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- f'https://cdn.piramide.tv/video/{video_id}/manifest.m3u8', video_id, fatal=False)\n- next_video = traverse_obj(video_data, ('video', 'next_video', 'id', {str}))\n- return next_video, {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- **traverse_obj(video_data, ('video', {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'thumbnail': ('media', 'thumbnail', {url_or_none}),\n- 'channel': ('channel', 'name', {str}),\n- 'channel_id': ('channel', 'id', {str}),\n- 'timestamp': ('date', {parse_iso8601}),\n- })),\n- }\n-\n- def _entries(self, video_id):\n- visited = set()\n- while True:\n- visited.add(video_id)\n- next_video, info = self._extract_video(video_id)\n- yield info\n- if not next_video or next_video in visited:\n- break\n- video_id = next_video\n-\n- def _real_extract(self, url):\n- url, smuggled_data = unsmuggle_url(url, {})\n- video_id = self._match_id(url)\n- if self._yes_playlist(video_id, video_id, smuggled_data):\n- return self.playlist_result(self._entries(video_id), video_id)\n- return self._extract_video(video_id)[1]\n-\n-\n-class PiramideTVChannelIE(InfoExtractor):\n- _VALID_URL = r'https?://piramide\\.tv/channel/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://piramide.tv/channel/thekalo',\n- 'playlist_mincount': 10,\n- 'info_dict': {\n- 'id': 'thekalo',\n- },\n- }]\n-\n- def _entries(self, channel_name):\n- videos = self._download_json(\n- f'https://hermes.piramide.tv/channel/list/{channel_name}/date/100000', channel_name)\n- for video in traverse_obj(videos, ('videos', lambda _, v: v['id'])):\n- yield self.url_result(smuggle_url(\n- f'https://piramide.tv/video/{video[\"id\"]}', {'force_noplaylist': True}),\n- **traverse_obj(video, {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- }))\n-\n- def _real_extract(self, url):\n- channel_name = self._match_id(url)\n- return self.playlist_result(self._entries(channel_name), channel_name)\ndiff --git a/yt_dlp/extractor/planetmarathi.py b/yt_dlp/extractor/planetmarathi.py\ndeleted file mode 100644\nindex 94861836a3b0..000000000000\n--- a/yt_dlp/extractor/planetmarathi.py\n+++ /dev/null\n@@ -1,72 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- try_get,\n- unified_strdate,\n-)\n-\n-\n-class PlanetMarathiIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?planetmarathi\\.com/titles/(?P<id>[^/#&?$]+)'\n- _TESTS = [{\n- 'url': 'https://www.planetmarathi.com/titles/ek-unad-divas',\n- 'playlist_mincount': 2,\n- 'info_dict': {\n- 'id': 'ek-unad-divas',\n- },\n- 'playlist': [{\n- 'info_dict': {\n- 'id': 'ASSETS-MOVIE-ASSET-01_ek-unad-divas',\n- 'ext': 'mp4',\n- 'title': 'ek unad divas',\n- 'alt_title': 'เคเคฟเคคเฅเคฐเคชเค',\n- 'description': 'md5:41c7ed6b041c2fea9820a3f3125bd881',\n- 'episode_number': 1,\n- 'duration': 5539,\n- 'upload_date': '20210829',\n- },\n- }], # Trailer skipped\n- }, {\n- 'url': 'https://www.planetmarathi.com/titles/baap-beep-baap-season-1',\n- 'playlist_mincount': 10,\n- 'info_dict': {\n- 'id': 'baap-beep-baap-season-1',\n- },\n- 'playlist': [{\n- 'info_dict': {\n- 'id': 'ASSETS-CHARACTER-PROFILE-SEASON-01-ASSET-01_baap-beep-baap-season-1',\n- 'ext': 'mp4',\n- 'title': 'Manohar Kanhere',\n- 'alt_title': 'เคฎเคจเฅเคนเคฐ เคเคพเคจเฅเคนเฅเคฐเฅ',\n- 'description': 'md5:285ed45d5c0ab5522cac9a043354ebc6',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'duration': 29,\n- 'upload_date': '20210829',\n- },\n- }], # Trailers, Episodes, other Character profiles skipped\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- entries = []\n- json_data = self._download_json(\n- f'https://www.planetmarathi.com/api/v1/titles/{playlist_id}/assets', playlist_id)['assets']\n- for asset in json_data:\n- asset_title = asset['mediaAssetName']['en']\n- if asset_title == 'Movie':\n- asset_title = playlist_id.replace('-', ' ')\n- asset_id = f'{asset[\"sk\"]}_{playlist_id}'.replace('#', '-')\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(asset['mediaAssetURL'], asset_id)\n- entries.append({\n- 'id': asset_id,\n- 'title': asset_title,\n- 'alt_title': try_get(asset, lambda x: x['mediaAssetName']['mr']),\n- 'description': try_get(asset, lambda x: x['mediaAssetDescription']['en']),\n- 'season_number': asset.get('mediaAssetSeason'),\n- 'episode_number': asset.get('mediaAssetIndexForAssetType'),\n- 'duration': asset.get('mediaAssetDurationInSeconds'),\n- 'upload_date': unified_strdate(asset.get('created')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- })\n- return self.playlist_result(entries, playlist_id=playlist_id)\ndiff --git a/yt_dlp/extractor/playplustv.py b/yt_dlp/extractor/playplustv.py\ndeleted file mode 100644\nindex a4439c8bc53a..000000000000\n--- a/yt_dlp/extractor/playplustv.py\n+++ /dev/null\n@@ -1,100 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..networking import PUTRequest\n-from ..networking.exceptions import HTTPError\n-from ..utils import ExtractorError, clean_html, int_or_none\n-\n-\n-class PlayPlusTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?playplus\\.(?:com|tv)/VOD/(?P<project_id>[0-9]+)/(?P<id>[0-9a-f]{32})'\n- _TEST = {\n- 'url': 'https://www.playplus.tv/VOD/7572/db8d274a5163424e967f35a30ddafb8e',\n- 'md5': 'd078cb89d7ab6b9df37ce23c647aef72',\n- 'info_dict': {\n- 'id': 'db8d274a5163424e967f35a30ddafb8e',\n- 'ext': 'mp4',\n- 'title': 'Capรญtulo 179 - Final',\n- 'description': 'md5:01085d62d8033a1e34121d3c3cabc838',\n- 'timestamp': 1529992740,\n- 'upload_date': '20180626',\n- },\n- 'skip': 'Requires account credential',\n- }\n- _NETRC_MACHINE = 'playplustv'\n- _GEO_COUNTRIES = ['BR']\n- _token = None\n- _profile_id = None\n-\n- def _call_api(self, resource, video_id=None, query=None):\n- return self._download_json('https://api.playplus.tv/api/media/v2/get' + resource, video_id, headers={\n- 'Authorization': 'Bearer ' + self._token,\n- }, query=query)\n-\n- def _perform_login(self, username, password):\n- req = PUTRequest(\n- 'https://api.playplus.tv/api/web/login', json.dumps({\n- 'email': username,\n- 'password': password,\n- }).encode(), {\n- 'Content-Type': 'application/json; charset=utf-8',\n- })\n-\n- try:\n- self._token = self._download_json(req, None)['token']\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError) and e.cause.status == 401:\n- raise ExtractorError(self._parse_json(\n- e.cause.response.read(), None)['errorMessage'], expected=True)\n- raise\n-\n- self._profile = self._call_api('Profiles')['list'][0]['_id']\n-\n- def _real_initialize(self):\n- if not self._token:\n- self.raise_login_required(method='password')\n-\n- def _real_extract(self, url):\n- project_id, media_id = self._match_valid_url(url).groups()\n- media = self._call_api(\n- 'Media', media_id, {\n- 'profileId': self._profile,\n- 'projectId': project_id,\n- 'mediaId': media_id,\n- })['obj']\n- title = media['title']\n-\n- formats = []\n- for f in media.get('files', []):\n- f_url = f.get('url')\n- if not f_url:\n- continue\n- file_info = f.get('fileInfo') or {}\n- formats.append({\n- 'url': f_url,\n- 'width': int_or_none(file_info.get('width')),\n- 'height': int_or_none(file_info.get('height')),\n- })\n-\n- thumbnails = []\n- for thumb in media.get('thumbs', []):\n- thumb_url = thumb.get('url')\n- if not thumb_url:\n- continue\n- thumbnails.append({\n- 'url': thumb_url,\n- 'width': int_or_none(thumb.get('width')),\n- 'height': int_or_none(thumb.get('height')),\n- })\n-\n- return {\n- 'id': media_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- 'description': clean_html(media.get('description')) or media.get('shortDescription'),\n- 'timestamp': int_or_none(media.get('publishDate'), 1000),\n- 'view_count': int_or_none(media.get('numberOfViews')),\n- 'comment_count': int_or_none(media.get('numberOfComments')),\n- 'tags': media.get('tags'),\n- }\ndiff --git a/yt_dlp/extractor/playwire.py b/yt_dlp/extractor/playwire.py\ndeleted file mode 100644\nindex 2323bd0cf901..000000000000\n--- a/yt_dlp/extractor/playwire.py\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- dict_get,\n- float_or_none,\n-)\n-\n-\n-class PlaywireIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:config|cdn)\\.playwire\\.com(?:/v2)?/(?P<publisher_id>\\d+)/(?:videos/v2|embed|config)/(?P<id>\\d+)'\n- _EMBED_REGEX = [r'<script[^>]+data-config=([\"\\'])(?P<url>(?:https?:)?//config\\.playwire\\.com/.+?)\\1']\n-\n- _TESTS = [{\n- 'url': 'http://config.playwire.com/14907/videos/v2/3353705/player.json',\n- 'md5': 'e6398701e3595888125729eaa2329ed9',\n- 'info_dict': {\n- 'id': '3353705',\n- 'ext': 'mp4',\n- 'title': 'S04_RM_UCL_Rus',\n- 'thumbnail': r're:^https?://.*\\.png$',\n- 'duration': 145.94,\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- # m3u8 in f4m\n- 'url': 'http://config.playwire.com/21772/videos/v2/4840492/zeus.json',\n- 'info_dict': {\n- 'id': '4840492',\n- 'ext': 'mp4',\n- 'title': 'ITV EL SHOW FULL',\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- # Multiple resolutions while bitrates missing\n- 'url': 'http://cdn.playwire.com/11625/embed/85228.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://config.playwire.com/12421/videos/v2/3389892/zeus.json',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cdn.playwire.com/v2/12342/config/1532636.json',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.cinemablend.com/new/First-Joe-Dirt-2-Trailer-Teaser-Stupid-Greatness-70874.html',\n- 'info_dict': {\n- 'id': '3519514',\n- 'ext': 'mp4',\n- 'title': 'Joe Dirt 2 Beautiful Loser Teaser Trailer',\n- },\n- 'skip': 'Site no longer embeds Playwire',\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- publisher_id, video_id = mobj.group('publisher_id'), mobj.group('id')\n-\n- player = self._download_json(\n- f'http://config.playwire.com/{publisher_id}/videos/v2/{video_id}/zeus.json',\n- video_id)\n-\n- title = player['settings']['title']\n- duration = float_or_none(player.get('duration'), 1000)\n-\n- content = player['content']\n- thumbnail = content.get('poster')\n- src = content['media']['f4m']\n-\n- formats = self._extract_f4m_formats(src, video_id, m3u8_id='hls')\n- for a_format in formats:\n- if not dict_get(a_format, ['tbr', 'width', 'height']):\n- a_format['quality'] = 1 if '-hd.' in a_format['url'] else 0\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/plvideo.py b/yt_dlp/extractor/plvideo.py\ndeleted file mode 100644\nindex 27009ca4cd83..000000000000\n--- a/yt_dlp/extractor/plvideo.py\n+++ /dev/null\n@@ -1,130 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- parse_iso8601,\n- parse_resolution,\n- url_or_none,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class PlVideoIE(InfoExtractor):\n- IE_DESC = 'ะะปะฐััะพัะผะฐ'\n- _VALID_URL = r'https?://(?:www\\.)?plvideo\\.ru/(?:watch\\?(?:[^#]+&)?v=|shorts/)(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://plvideo.ru/watch?v=Y5JzUzkcQTMK',\n- 'md5': 'fe8e18aca892b3b31f3bf492169f8a26',\n- 'info_dict': {\n- 'id': 'Y5JzUzkcQTMK',\n- 'ext': 'mp4',\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-images/v/cover/37/dd/37dd00a4c96c77436ab737e85947abd7/original663a4a3bb713e5.33151959.jpg',\n- 'title': 'Presidente de Cuba llega a Moscรบ en una visita de trabajo',\n- 'channel': 'RT en Espaรฑol',\n- 'channel_id': 'ZH4EKqunVDvo',\n- 'media_type': 'video',\n- 'comment_count': int,\n- 'tags': ['rusia', 'cuba', 'russia', 'miguel dรญaz-canel'],\n- 'description': 'md5:a1a395d900d77a86542a91ee0826c115',\n- 'release_timestamp': 1715096124,\n- 'channel_is_verified': True,\n- 'like_count': int,\n- 'timestamp': 1715095911,\n- 'duration': 44320,\n- 'view_count': int,\n- 'dislike_count': int,\n- 'upload_date': '20240507',\n- 'modified_date': '20240701',\n- 'channel_follower_count': int,\n- 'modified_timestamp': 1719824073,\n- },\n- }, {\n- 'url': 'https://plvideo.ru/shorts/S3Uo9c-VLwFX',\n- 'md5': '7d8fa2279406c69d2fd2a6fc548a9805',\n- 'info_dict': {\n- 'id': 'S3Uo9c-VLwFX',\n- 'ext': 'mp4',\n- 'channel': 'Romaatom',\n- 'tags': 'count:22',\n- 'dislike_count': int,\n- 'upload_date': '20241130',\n- 'description': 'md5:452e6de219bf2f32bb95806c51c3b364',\n- 'duration': 58433,\n- 'modified_date': '20241130',\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-11-cover/S3Uo9c-VLwFX/f9318999-a941-482b-b700-2102a7049366.jpg',\n- 'media_type': 'shorts',\n- 'like_count': int,\n- 'modified_timestamp': 1732961458,\n- 'channel_is_verified': True,\n- 'channel_id': 'erJyyTIbmUd1',\n- 'timestamp': 1732961355,\n- 'comment_count': int,\n- 'title': 'ะะตะปะพััะพะฒ ะพัะผะตะฝะธะป ะฟัะธะบะฐะทั ะพ ะบะฐะดัะพะฒะพะผ ัะตะทะตัะฒะต ะฝะฐ ะณัะฐะถะดะฐะฝัะบะพะน ัะปัะถะฑะต',\n- 'channel_follower_count': int,\n- 'view_count': int,\n- 'release_timestamp': 1732961458,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video_data = self._download_json(\n- f'https://api.g1.plvideo.ru/v1/videos/{video_id}?Aud=18', video_id)\n-\n- is_live = False\n- formats = []\n- subtitles = {}\n- automatic_captions = {}\n- for quality, data in traverse_obj(video_data, ('item', 'profiles', {dict.items}, lambda _, v: url_or_none(v[1]['hls']))):\n- formats.append({\n- 'format_id': quality,\n- 'ext': 'mp4',\n- 'protocol': 'm3u8_native',\n- **traverse_obj(data, {\n- 'url': 'hls',\n- 'fps': ('fps', {float_or_none}),\n- 'aspect_ratio': ('aspectRatio', {float_or_none}),\n- }),\n- **parse_resolution(quality),\n- })\n- if livestream_url := traverse_obj(video_data, ('item', 'livestream', 'url', {url_or_none})):\n- is_live = True\n- formats.extend(self._extract_m3u8_formats(livestream_url, video_id, 'mp4', live=True))\n- for lang, url in traverse_obj(video_data, ('item', 'subtitles', {dict.items}, lambda _, v: url_or_none(v[1]))):\n- if lang.endswith('-auto'):\n- automatic_captions.setdefault(lang[:-5], []).append({\n- 'url': url,\n- })\n- else:\n- subtitles.setdefault(lang, []).append({\n- 'url': url,\n- })\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'automatic_captions': automatic_captions,\n- 'is_live': is_live,\n- **traverse_obj(video_data, ('item', {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'thumbnail': ('cover', 'paths', 'original', 'src', {url_or_none}),\n- 'duration': ('uploadFile', 'videoDuration', {int_or_none}),\n- 'channel': ('channel', 'name', {str}),\n- 'channel_id': ('channel', 'id', {str}),\n- 'channel_follower_count': ('channel', 'stats', 'subscribers', {int_or_none}),\n- 'channel_is_verified': ('channel', 'verified', {bool}),\n- 'tags': ('tags', ..., {str}),\n- 'timestamp': ('createdAt', {parse_iso8601}),\n- 'release_timestamp': ('publishedAt', {parse_iso8601}),\n- 'modified_timestamp': ('updatedAt', {parse_iso8601}),\n- 'view_count': ('stats', 'viewTotalCount', {int_or_none}),\n- 'like_count': ('stats', 'likeCount', {int_or_none}),\n- 'dislike_count': ('stats', 'dislikeCount', {int_or_none}),\n- 'comment_count': ('stats', 'commentCount', {int_or_none}),\n- 'media_type': ('type', {str}),\n- })),\n- }\ndiff --git a/yt_dlp/extractor/prosiebensat1.py b/yt_dlp/extractor/prosiebensat1.py\ndeleted file mode 100644\nindex e8a47120513b..000000000000\n--- a/yt_dlp/extractor/prosiebensat1.py\n+++ /dev/null\n@@ -1,496 +0,0 @@\n-import hashlib\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- determine_ext,\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- merge_dicts,\n- unified_strdate,\n-)\n-\n-\n-class ProSiebenSat1BaseIE(InfoExtractor):\n- _GEO_BYPASS = False\n- _ACCESS_ID = None\n- _SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'\n- _V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'\n-\n- def _extract_video_info(self, url, clip_id):\n- client_location = url\n-\n- video = self._download_json(\n- 'http://vas.sim-technik.de/vas/live/v2/videos',\n- clip_id, 'Downloading videos JSON', query={\n- 'access_token': self._TOKEN,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- 'ids': clip_id,\n- })[0]\n-\n- if not self.get_param('allow_unplayable_formats') and video.get('is_protected') is True:\n- self.report_drm(clip_id)\n-\n- formats = []\n- if self._ACCESS_ID:\n- raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID\n- protocols = self._download_json(\n- self._V4_BASE_URL + 'protocols', clip_id,\n- 'Downloading protocols JSON',\n- headers=self.geo_verification_headers(), query={\n- 'access_id': self._ACCESS_ID,\n- 'client_token': hashlib.sha1((raw_ct).encode()).hexdigest(),\n- 'video_id': clip_id,\n- }, fatal=False, expected_status=(403,)) or {}\n- error = protocols.get('error') or {}\n- if error.get('title') == 'Geo check failed':\n- self.raise_geo_restricted(countries=['AT', 'CH', 'DE'])\n- server_token = protocols.get('server_token')\n- if server_token:\n- urls = (self._download_json(\n- self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={\n- 'access_id': self._ACCESS_ID,\n- 'client_token': hashlib.sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),\n- 'protocols': self._SUPPORTED_PROTOCOLS,\n- 'server_token': server_token,\n- 'video_id': clip_id,\n- }, fatal=False) or {}).get('urls') or {}\n- for protocol, variant in urls.items():\n- source_url = variant.get('clear', {}).get('url')\n- if not source_url:\n- continue\n- if protocol == 'dash':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id=protocol, fatal=False))\n- elif protocol == 'hls':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id=protocol, fatal=False))\n- else:\n- formats.append({\n- 'url': source_url,\n- 'format_id': protocol,\n- })\n- if not formats:\n- source_ids = [str(source['id']) for source in video['sources']]\n-\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\n-\n- sources = self._download_json(\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources',\n- clip_id, 'Downloading sources JSON', query={\n- 'access_token': self._TOKEN,\n- 'client_id': client_id,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- })\n- server_id = sources['server_id']\n-\n- def fix_bitrate(bitrate):\n- bitrate = int_or_none(bitrate)\n- if not bitrate:\n- return None\n- return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate\n-\n- for source_id in source_ids:\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\n- urls = self._download_json(\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources/url',\n- clip_id, 'Downloading urls JSON', fatal=False, query={\n- 'access_token': self._TOKEN,\n- 'client_id': client_id,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- 'server_id': server_id,\n- 'source_ids': source_id,\n- })\n- if not urls:\n- continue\n- if urls.get('status_code') != 0:\n- raise ExtractorError('This video is unavailable', expected=True)\n- urls_sources = urls['sources']\n- if isinstance(urls_sources, dict):\n- urls_sources = urls_sources.values()\n- for source in urls_sources:\n- source_url = source.get('url')\n- if not source_url:\n- continue\n- protocol = source.get('protocol')\n- mimetype = source.get('mimetype')\n- if mimetype == 'application/f4m+xml' or 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m':\n- formats.extend(self._extract_f4m_formats(\n- source_url, clip_id, f4m_id='hds', fatal=False))\n- elif mimetype == 'application/x-mpegURL':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n- elif mimetype == 'application/dash+xml':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id='dash', fatal=False))\n- else:\n- tbr = fix_bitrate(source['bitrate'])\n- if protocol in ('rtmp', 'rtmpe'):\n- mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source_url)\n- if not mobj:\n- continue\n- path = mobj.group('path')\n- mp4colon_index = path.rfind('mp4:')\n- app = path[:mp4colon_index]\n- play_path = path[mp4colon_index:]\n- formats.append({\n- 'url': '{}/{}'.format(mobj.group('url'), app),\n- 'app': app,\n- 'play_path': play_path,\n- 'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',\n- 'page_url': 'http://www.prosieben.de',\n- 'tbr': tbr,\n- 'ext': 'flv',\n- 'format_id': join_nonempty('rtmp', tbr),\n- })\n- else:\n- formats.append({\n- 'url': source_url,\n- 'tbr': tbr,\n- 'format_id': join_nonempty('http', tbr),\n- })\n-\n- return {\n- 'duration': float_or_none(video.get('duration')),\n- 'formats': formats,\n- }\n-\n-\n-class ProSiebenSat1IE(ProSiebenSat1BaseIE):\n- IE_NAME = 'prosiebensat1'\n- IE_DESC = 'ProSiebenSat.1 Digital'\n- _VALID_URL = r'''(?x)\n- https?://\n- (?:www\\.)?\n- (?:\n- (?:beta\\.)?\n- (?:\n- prosieben(?:maxx)?|sixx|sat1(?:gold)?|kabeleins(?:doku)?|the-voice-of-germany|advopedia\n- )\\.(?:de|at|ch)|\n- ran\\.de|fem\\.com|advopedia\\.de|galileo\\.tv/video\n- )\n- /(?P<id>.+)\n- '''\n-\n- _TESTS = [\n- {\n- # Tests changes introduced in https://github.com/ytdl-org/youtube-dl/pull/6242\n- # in response to fixing https://github.com/ytdl-org/youtube-dl/issues/6215:\n- # - malformed f4m manifest support\n- # - proper handling of URLs starting with `https?://` in 2.0 manifests\n- # - recursive child f4m manifests extraction\n- 'url': 'http://www.prosieben.de/tv/circus-halligalli/videos/218-staffel-2-episode-18-jahresrueckblick-ganze-folge',\n- 'info_dict': {\n- 'id': '2104602',\n- 'ext': 'mp4',\n- 'title': 'CIRCUS HALLIGALLI - Episode 18 - Staffel 2',\n- 'description': 'md5:8733c81b702ea472e069bc48bb658fc1',\n- 'upload_date': '20131231',\n- 'duration': 5845.04,\n- 'series': 'CIRCUS HALLIGALLI',\n- 'season_number': 2,\n- 'episode': 'Episode 18 - Staffel 2',\n- 'episode_number': 18,\n- },\n- },\n- {\n- 'url': 'http://www.prosieben.de/videokatalog/Gesellschaft/Leben/Trends/video-Lady-Umstyling-f%C3%BCr-Audrina-Rebekka-Audrina-Fergen-billig-aussehen-Battal-Modica-700544.html',\n- 'info_dict': {\n- 'id': '2570327',\n- 'ext': 'mp4',\n- 'title': 'Lady-Umstyling fรผr Audrina',\n- 'description': 'md5:4c16d0c17a3461a0d43ea4084e96319d',\n- 'upload_date': '20131014',\n- 'duration': 606.76,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'Seems to be broken',\n- },\n- {\n- 'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge',\n- 'info_dict': {\n- 'id': '2429369',\n- 'ext': 'mp4',\n- 'title': 'Countdown fรผr die Autowerkstatt',\n- 'description': 'md5:809fc051a457b5d8666013bc40698817',\n- 'upload_date': '20140223',\n- 'duration': 2595.04,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.sixx.de/stars-style/video/sexy-laufen-in-ugg-boots-clip',\n- 'info_dict': {\n- 'id': '2904997',\n- 'ext': 'mp4',\n- 'title': 'Sexy laufen in Ugg Boots',\n- 'description': 'md5:edf42b8bd5bc4e5da4db4222c5acb7d6',\n- 'upload_date': '20140122',\n- 'duration': 245.32,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.sat1.de/film/der-ruecktritt/video/im-interview-kai-wiesinger-clip',\n- 'info_dict': {\n- 'id': '2906572',\n- 'ext': 'mp4',\n- 'title': 'Im Interview: Kai Wiesinger',\n- 'description': 'md5:e4e5370652ec63b95023e914190b4eb9',\n- 'upload_date': '20140203',\n- 'duration': 522.56,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.kabeleins.de/tv/rosins-restaurants/videos/jagd-auf-fertigkost-im-elsthal-teil-2-ganze-folge',\n- 'info_dict': {\n- 'id': '2992323',\n- 'ext': 'mp4',\n- 'title': 'Jagd auf Fertigkost im Elsthal - Teil 2',\n- 'description': 'md5:2669cde3febe9bce13904f701e774eb6',\n- 'upload_date': '20141014',\n- 'duration': 2410.44,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.ran.de/fussball/bundesliga/video/schalke-toennies-moechte-raul-zurueck-ganze-folge',\n- 'info_dict': {\n- 'id': '3004256',\n- 'ext': 'mp4',\n- 'title': 'Schalke: Tรถnnies mรถchte Raul zurรผck',\n- 'description': 'md5:4b5b271d9bcde223b54390754c8ece3f',\n- 'upload_date': '20140226',\n- 'duration': 228.96,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.the-voice-of-germany.de/video/31-andreas-kuemmert-rocket-man-clip',\n- 'info_dict': {\n- 'id': '2572814',\n- 'ext': 'mp4',\n- 'title': 'The Voice of Germany - Andreas Kรผmmert: Rocket Man',\n- 'description': 'md5:6ddb02b0781c6adf778afea606652e38',\n- 'timestamp': 1382041620,\n- 'upload_date': '20131017',\n- 'duration': 469.88,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- },\n- {\n- 'url': 'http://www.fem.com/videos/beauty-lifestyle/kurztrips-zum-valentinstag',\n- 'info_dict': {\n- 'id': '2156342',\n- 'ext': 'mp4',\n- 'title': 'Kurztrips zum Valentinstag',\n- 'description': 'Romantischer Kurztrip zum Valentinstag? Nina Heinemann verrรคt, was sich hier wirklich lohnt.',\n- 'duration': 307.24,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- },\n- {\n- 'url': 'http://www.prosieben.de/tv/joko-gegen-klaas/videos/playlists/episode-8-ganze-folge-playlist',\n- 'info_dict': {\n- 'id': '439664',\n- 'title': 'Episode 8 - Ganze Folge - Playlist',\n- 'description': 'md5:63b8963e71f481782aeea877658dec84',\n- },\n- 'playlist_count': 2,\n- 'skip': 'This video is unavailable',\n- },\n- {\n- # title in <h2 class=\"subtitle\">\n- 'url': 'http://www.prosieben.de/stars/oscar-award/videos/jetzt-erst-enthuellt-das-geheimnis-von-emma-stones-oscar-robe-clip',\n- 'info_dict': {\n- 'id': '4895826',\n- 'ext': 'mp4',\n- 'title': 'Jetzt erst enthรผllt: Das Geheimnis von Emma Stones Oscar-Robe',\n- 'description': 'md5:e5ace2bc43fadf7b63adc6187e9450b9',\n- 'upload_date': '20170302',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'geo restricted to Germany',\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'http://www.kabeleinsdoku.de/tv/mayday-alarm-im-cockpit/video/102-notlandung-im-hudson-river-ganze-folge',\n- 'only_matching': True,\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/video/11-staffel-1-episode-1-partner-wider-willen-ganze-folge',\n- 'only_matching': True,\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'https://www.galileo.tv/video/diese-emojis-werden-oft-missverstanden',\n- 'only_matching': True,\n- },\n- {\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',\n- 'only_matching': True,\n- },\n- {\n- 'url': 'http://www.advopedia.de/videos/lenssen-klaert-auf/lenssen-klaert-auf-folge-8-staffel-3-feiertage-und-freie-tage',\n- 'only_matching': True,\n- },\n- ]\n-\n- _TOKEN = 'prosieben'\n- _SALT = '01!8d8F_)r9]4s[qeuXfP%'\n- _CLIENT_NAME = 'kolibri-2.0.19-splec4'\n-\n- _ACCESS_ID = 'x_prosiebenmaxx-de'\n- _ENCRYPTION_KEY = 'Eeyeey9oquahthainoofashoyoikosag'\n- _IV = 'Aeluchoc6aevechuipiexeeboowedaok'\n-\n- _CLIPID_REGEXES = [\n- r'\"clip_id\"\\s*:\\s+\"(\\d+)\"',\n- r'clipid: \"(\\d+)\"',\n- r'clip[iI]d=(\\d+)',\n- r'clip[iI][dD]\\s*=\\s*[\"\\'](\\d+)',\n- r\"'itemImageUrl'\\s*:\\s*'/dynamic/thumbnails/full/\\d+/(\\d+)\",\n- r'proMamsId"\\s*:\\s*"(\\d+)',\n- r'proMamsId\"\\s*:\\s*\"(\\d+)',\n- ]\n- _TITLE_REGEXES = [\n- r'<h2 class=\"subtitle\" itemprop=\"name\">\\s*(.+?)</h2>',\n- r'<header class=\"clearfix\">\\s*<h3>(.+?)</h3>',\n- r'<!-- start video -->\\s*<h1>(.+?)</h1>',\n- r'<h1 class=\"att-name\">\\s*(.+?)</h1>',\n- r'<header class=\"module_header\">\\s*<h2>([^<]+)</h2>\\s*</header>',\n- r'<h2 class=\"video-title\" itemprop=\"name\">\\s*(.+?)</h2>',\n- r'<div[^>]+id=\"veeseoTitle\"[^>]*>(.+?)</div>',\n- r'<h2[^>]+class=\"subtitle\"[^>]*>([^<]+)</h2>',\n- ]\n- _DESCRIPTION_REGEXES = [\n- r'<p itemprop=\"description\">\\s*(.+?)</p>',\n- r'<div class=\"videoDecription\">\\s*<p><strong>Beschreibung</strong>: (.+?)</p>',\n- r'<div class=\"g-plusone\" data-size=\"medium\"></div>\\s*</div>\\s*</header>\\s*(.+?)\\s*<footer>',\n- r'<p class=\"att-description\">\\s*(.+?)\\s*</p>',\n- r'<p class=\"video-description\" itemprop=\"description\">\\s*(.+?)</p>',\n- r'<div[^>]+id=\"veeseoDescription\"[^>]*>(.+?)</div>',\n- ]\n- _UPLOAD_DATE_REGEXES = [\n- r'<span>\\s*(\\d{2}\\.\\d{2}\\.\\d{4} \\d{2}:\\d{2}) \\|\\s*<span itemprop=\"duration\"',\n- r'<footer>\\s*(\\d{2}\\.\\d{2}\\.\\d{4}) \\d{2}:\\d{2} Uhr',\n- r'<span style=\"padding-left: 4px;line-height:20px; color:#404040\">(\\d{2}\\.\\d{2}\\.\\d{4})</span>',\n- r'(\\d{2}\\.\\d{2}\\.\\d{4}) \\| \\d{2}:\\d{2} Min<br/>',\n- ]\n- _PAGE_TYPE_REGEXES = [\n- r'<meta name=\"page_type\" content=\"([^\"]+)\">',\n- r\"'itemType'\\s*:\\s*'([^']*)'\",\n- ]\n- _PLAYLIST_ID_REGEXES = [\n- r'content[iI]d=(\\d+)',\n- r\"'itemId'\\s*:\\s*'([^']*)'\",\n- ]\n- _PLAYLIST_CLIP_REGEXES = [\n- r'(?s)data-qvt=.+?<a href=\"([^\"]+)\"',\n- ]\n-\n- def _extract_clip(self, url, webpage):\n- clip_id = self._html_search_regex(\n- self._CLIPID_REGEXES, webpage, 'clip id')\n- title = self._html_search_regex(\n- self._TITLE_REGEXES, webpage, 'title',\n- default=None) or self._og_search_title(webpage)\n- info = self._extract_video_info(url, clip_id)\n- description = self._html_search_regex(\n- self._DESCRIPTION_REGEXES, webpage, 'description', default=None)\n- if description is None:\n- description = self._og_search_description(webpage)\n- thumbnail = self._og_search_thumbnail(webpage)\n- upload_date = unified_strdate(\n- self._html_search_meta('og:published_time', webpage,\n- 'upload date', default=None)\n- or self._html_search_regex(self._UPLOAD_DATE_REGEXES,\n- webpage, 'upload date', default=None))\n-\n- json_ld = self._search_json_ld(webpage, clip_id, default={})\n-\n- return merge_dicts(info, {\n- 'id': clip_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- }, json_ld)\n-\n- def _extract_playlist(self, url, webpage):\n- playlist_id = self._html_search_regex(\n- self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')\n- playlist = self._parse_json(\n- self._search_regex(\n- r'var\\s+contentResources\\s*=\\s*(\\[.+?\\]);\\s*</script',\n- webpage, 'playlist'),\n- playlist_id)\n- entries = []\n- for item in playlist:\n- clip_id = item.get('id') or item.get('upc')\n- if not clip_id:\n- continue\n- info = self._extract_video_info(url, clip_id)\n- info.update({\n- 'id': clip_id,\n- 'title': item.get('title') or item.get('teaser', {}).get('headline'),\n- 'description': item.get('teaser', {}).get('description'),\n- 'thumbnail': item.get('poster'),\n- 'duration': float_or_none(item.get('duration')),\n- 'series': item.get('tvShowTitle'),\n- 'uploader': item.get('broadcastPublisher'),\n- })\n- entries.append(info)\n- return self.playlist_result(entries, playlist_id)\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- page_type = self._search_regex(\n- self._PAGE_TYPE_REGEXES, webpage,\n- 'page type', default='clip').lower()\n- if page_type == 'clip':\n- return self._extract_clip(url, webpage)\n- elif page_type == 'playlist':\n- return self._extract_playlist(url, webpage)\n- else:\n- raise ExtractorError(\n- f'Unsupported page type {page_type}', expected=True)\ndiff --git a/yt_dlp/extractor/puls4.py b/yt_dlp/extractor/puls4.py\ndeleted file mode 100644\nindex b43f0352b9fd..000000000000\n--- a/yt_dlp/extractor/puls4.py\n+++ /dev/null\n@@ -1,50 +0,0 @@\n-from .prosiebensat1 import ProSiebenSat1BaseIE\n-from ..utils import parse_duration, unified_strdate\n-\n-\n-class Puls4IE(ProSiebenSat1BaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?puls4\\.com/(?P<id>[^?#&]+)'\n- _TESTS = [{\n- 'url': 'http://www.puls4.com/2-minuten-2-millionen/staffel-3/videos/2min2miotalk/Tobias-Homberger-von-myclubs-im-2min2miotalk-118118',\n- 'md5': 'fd3c6b0903ac72c9d004f04bc6bb3e03',\n- 'info_dict': {\n- 'id': '118118',\n- 'ext': 'flv',\n- 'title': 'Tobias Homberger von myclubs im #2min2miotalk',\n- 'description': 'md5:f9def7c5e8745d6026d8885487d91955',\n- 'upload_date': '20160830',\n- 'uploader': 'PULS_4',\n- },\n- }, {\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident.-Norbert-Hofer',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident-Analyse-des-Interviews-mit-Norbert-Hofer-416598',\n- 'only_matching': True,\n- }]\n- _TOKEN = 'puls4'\n- _SALT = '01!kaNgaiNgah1Ie4AeSha'\n- _CLIENT_NAME = ''\n-\n- def _real_extract(self, url):\n- path = self._match_id(url)\n- content_path = self._download_json(\n- 'http://www.puls4.com/api/json-fe/page/' + path, path)['content'][0]['url']\n- media = self._download_json(\n- 'http://www.puls4.com' + content_path,\n- content_path)['mediaCurrent']\n- player_content = media['playerContent']\n- info = self._extract_video_info(url, player_content['id'])\n- info.update({\n- 'id': str(media['objectId']),\n- 'title': player_content['title'],\n- 'description': media.get('description'),\n- 'thumbnail': media.get('previewLink'),\n- 'upload_date': unified_strdate(media.get('date')),\n- 'duration': parse_duration(player_content.get('duration')),\n- 'episode': player_content.get('episodePartName'),\n- 'show': media.get('channel'),\n- 'season_id': player_content.get('seasonId'),\n- 'uploader': player_content.get('sourceCompany'),\n- })\n- return info\ndiff --git a/yt_dlp/extractor/radiocomercial.py b/yt_dlp/extractor/radiocomercial.py\ndeleted file mode 100644\nindex 7e4609a62d37..000000000000\n--- a/yt_dlp/extractor/radiocomercial.py\n+++ /dev/null\n@@ -1,154 +0,0 @@\n-import itertools\n-\n-from .common import InfoExtractor\n-from ..networking.exceptions import HTTPError\n-from ..utils import (\n- ExtractorError,\n- extract_attributes,\n- get_element_by_class,\n- get_element_html_by_class,\n- get_element_text_and_html_by_tag,\n- get_elements_html_by_class,\n- int_or_none,\n- join_nonempty,\n- try_call,\n- unified_strdate,\n- update_url,\n- urljoin,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class RadioComercialIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?radiocomercial\\.pt/podcasts/[^/?#]+/t?(?P<season>\\d+)/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao/t6/taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas#page-content-wrapper',\n- 'md5': '5f4fe8e485b29d2e8fd495605bc2c7e4',\n- 'info_dict': {\n- 'id': 'taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas',\n- 'ext': 'mp3',\n- 'title': 'Taylor Swift entranhando-se que nem uma espada no ventre dos fรฃs.',\n- 'release_date': '20231025',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 6',\n- 'season_number': 6,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3/convenca-me-num-minuto-que-os-lobisomens-existem',\n- 'md5': '47e96c273aef96a8eb160cd6cf46d782',\n- 'info_dict': {\n- 'id': 'convenca-me-num-minuto-que-os-lobisomens-existem',\n- 'ext': 'mp3',\n- 'title': 'Convenรงa-me num minuto que os lobisomens existem',\n- 'release_date': '20231026',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 3',\n- 'season_number': 3,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/inacreditavel-by-ines-castel-branco/t2/o-desastre-de-aviao',\n- 'md5': '69be64255420fec23b7259955d771e54',\n- 'info_dict': {\n- 'id': 'o-desastre-de-aviao',\n- 'ext': 'mp3',\n- 'title': 'O desastre de aviรฃo',\n- 'description': 'md5:8a82beeb372641614772baab7246245f',\n- 'release_date': '20231101',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- },\n- 'params': {\n- # inconsistant md5\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/2023/t-n-t-29-de-outubro',\n- 'md5': '91d32d4d4b1407272068b102730fc9fa',\n- 'info_dict': {\n- 'id': 't-n-t-29-de-outubro',\n- 'ext': 'mp3',\n- 'title': 'T.N.T 29 de outubro',\n- 'release_date': '20231029',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 2023',\n- 'season_number': 2023,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id, season = self._match_valid_url(url).group('id', 'season')\n- webpage = self._download_webpage(url, video_id)\n- return {\n- 'id': video_id,\n- 'title': self._html_extract_title(webpage),\n- 'description': self._og_search_description(webpage, default=None),\n- 'release_date': unified_strdate(get_element_by_class(\n- 'date', get_element_html_by_class('descriptions', webpage) or '')),\n- 'thumbnail': self._og_search_thumbnail(webpage),\n- 'season_number': int_or_none(season),\n- 'url': extract_attributes(get_element_html_by_class('audiofile', webpage) or '').get('href'),\n- }\n-\n-\n-class RadioComercialPlaylistIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?radiocomercial\\.pt/podcasts/(?P<id>[\\w-]+)(?:/t?(?P<season>\\d+))?/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3',\n- 'info_dict': {\n- 'id': 'convenca-me-num-minuto_t3',\n- 'title': 'Convenรงa-me num Minuto - Temporada 3',\n- },\n- 'playlist_mincount': 32,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao',\n- 'info_dict': {\n- 'id': 'o-homem-que-mordeu-o-cao',\n- 'title': 'O Homem Que Mordeu o Cรฃo',\n- },\n- 'playlist_mincount': 19,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/as-minhas-coisas-favoritas',\n- 'info_dict': {\n- 'id': 'as-minhas-coisas-favoritas',\n- 'title': 'As Minhas Coisas Favoritas',\n- },\n- 'playlist_mincount': 131,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/t2023',\n- 'info_dict': {\n- 'id': 'tnt-todos-no-top_t2023',\n- 'title': 'TNT - Todos No Top - Temporada 2023',\n- },\n- 'playlist_mincount': 39,\n- }]\n-\n- def _entries(self, url, playlist_id):\n- for page in itertools.count(1):\n- try:\n- webpage = self._download_webpage(\n- f'{url}/{page}', playlist_id, f'Downloading page {page}')\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError) and e.cause.status == 404:\n- break\n- raise\n-\n- episodes = get_elements_html_by_class('tm-ouvir-podcast', webpage)\n- if not episodes:\n- break\n- for url_path in traverse_obj(episodes, (..., {extract_attributes}, 'href')):\n- episode_url = urljoin(url, url_path)\n- if RadioComercialIE.suitable(episode_url):\n- yield episode_url\n-\n- def _real_extract(self, url):\n- podcast, season = self._match_valid_url(url).group('id', 'season')\n- playlist_id = join_nonempty(podcast, season, delim='_t')\n- url = update_url(url, query=None, fragment=None)\n- webpage = self._download_webpage(url, playlist_id)\n-\n- name = try_call(lambda: get_element_text_and_html_by_tag('h1', webpage)[0])\n- title = name if name == season else join_nonempty(name, season, delim=' - Temporada ')\n-\n- return self.playlist_from_matches(\n- self._entries(url, playlist_id), playlist_id, title, ie=RadioComercialIE)\ndiff --git a/yt_dlp/extractor/redge.py b/yt_dlp/extractor/redge.py\ndeleted file mode 100644\nindex 5ae09a096bd1..000000000000\n--- a/yt_dlp/extractor/redge.py\n+++ /dev/null\n@@ -1,134 +0,0 @@\n-\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- parse_qs,\n- update_url_query,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class RedCDNLivxIE(InfoExtractor):\n- _VALID_URL = r'https?://[^.]+\\.(?:dcs\\.redcdn|atmcdn)\\.pl/(?:live(?:dash|hls|ss)|nvr)/o2/(?P<tenant>[^/?#]+)/(?P<id>[^?#]+)\\.livx'\n- IE_NAME = 'redcdnlivx'\n-\n- _TESTS = [{\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/senat/ENC02/channel.livx?indexMode=true&startTime=638272860000&stopTime=638292544000',\n- 'info_dict': {\n- 'id': 'ENC02-638272860000-638292544000',\n- 'ext': 'mp4',\n- 'title': 'ENC02',\n- 'duration': 19683.982,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/sejm/ENC18/live.livx?indexMode=true&startTime=722333096000&stopTime=722335562000',\n- 'info_dict': {\n- 'id': 'ENC18-722333096000-722335562000',\n- 'ext': 'mp4',\n- 'title': 'ENC18',\n- 'duration': 2463.995,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://r.dcs.redcdn.pl/livehls/o2/sportevolution/live/triathlon2018/warsaw.livx/playlist.m3u8?startTime=550305000000&stopTime=550327620000',\n- 'info_dict': {\n- 'id': 'triathlon2018-warsaw-550305000000-550327620000',\n- 'ext': 'mp4',\n- 'title': 'triathlon2018/warsaw',\n- 'duration': 22619.98,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://n-25-12.dcs.redcdn.pl/nvr/o2/sejm/Migacz-ENC01/1.livx?startTime=722347200000&stopTime=722367345000',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://redir.atmcdn.pl/nvr/o2/sejm/ENC08/1.livx?startTime=503831270000&stopTime=503840040000',\n- 'only_matching': True,\n- }]\n-\n- '''\n- Known methods (first in url path):\n- - `livedash` - DASH MPD\n- - `livehls` - HTTP Live Streaming\n- - `livess` - IIS Smooth Streaming\n- - `nvr` - CCTV mode, directly returns a file, typically flv, avc1, aac\n- - `sc` - shoutcast/icecast (audio streams, like radio)\n- '''\n-\n- def _real_extract(self, url):\n- tenant, path = self._match_valid_url(url).group('tenant', 'id')\n- qs = parse_qs(url)\n- start_time = traverse_obj(qs, ('startTime', 0, {int_or_none}))\n- stop_time = traverse_obj(qs, ('stopTime', 0, {int_or_none}))\n-\n- def livx_mode(mode):\n- suffix = ''\n- if mode == 'livess':\n- suffix = '/manifest'\n- elif mode == 'livehls':\n- suffix = '/playlist.m3u8'\n- file_qs = {}\n- if start_time:\n- file_qs['startTime'] = start_time\n- if stop_time:\n- file_qs['stopTime'] = stop_time\n- if mode == 'nvr':\n- file_qs['nolimit'] = 1\n- elif mode != 'sc':\n- file_qs['indexMode'] = 'true'\n- return update_url_query(f'https://r.dcs.redcdn.pl/{mode}/o2/{tenant}/{path}.livx{suffix}', file_qs)\n-\n- # no id or title for a transmission. making ones up.\n- title = path \\\n- .replace('/live', '').replace('live/', '') \\\n- .replace('/channel', '').replace('channel/', '') \\\n- .strip('/')\n- video_id = join_nonempty(title.replace('/', '-'), start_time, stop_time)\n-\n- formats = []\n- # downloading the manifest separately here instead of _extract_ism_formats to also get some stream metadata\n- ism_res = self._download_xml_handle(\n- livx_mode('livess'), video_id,\n- note='Downloading ISM manifest',\n- errnote='Failed to download ISM manifest',\n- fatal=False)\n- ism_doc = None\n- if ism_res is not False:\n- ism_doc, ism_urlh = ism_res\n- formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss')\n-\n- nvr_urlh = self._request_webpage(\n- HEADRequest(livx_mode('nvr')), video_id, 'Follow flv file redirect', fatal=False,\n- expected_status=lambda _: True)\n- if nvr_urlh and nvr_urlh.status == 200:\n- formats.append({\n- 'url': nvr_urlh.url,\n- 'ext': 'flv',\n- 'format_id': 'direct-0',\n- 'preference': -1, # might be slow\n- })\n- formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False))\n- formats.extend(self._extract_m3u8_formats(\n- livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False))\n-\n- time_scale = traverse_obj(ism_doc, ('@TimeScale', {int_or_none})) or 10000000\n- duration = traverse_obj(\n- ism_doc, ('@Duration', {float_or_none(scale=time_scale)})) or None\n-\n- live_status = None\n- if traverse_obj(ism_doc, '@IsLive') == 'TRUE':\n- live_status = 'is_live'\n- elif duration:\n- live_status = 'was_live'\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'duration': duration,\n- 'live_status': live_status,\n- }\ndiff --git a/yt_dlp/extractor/rheinmaintv.py b/yt_dlp/extractor/rheinmaintv.py\ndeleted file mode 100644\nindex c3b352dedea8..000000000000\n--- a/yt_dlp/extractor/rheinmaintv.py\n+++ /dev/null\n@@ -1,94 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import extract_attributes, merge_dicts, remove_end\n-\n-\n-class RheinMainTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?rheinmaintv\\.de/sendungen/(?:[\\w-]+/)*(?P<video_id>(?P<display_id>[\\w-]+)/vom-\\d{2}\\.\\d{2}\\.\\d{4}(?:/\\d+)?)'\n- _TESTS = [{\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/auf-dem-weg-zur-deutschen-meisterschaft/vom-07.11.2022/',\n- 'info_dict': {\n- 'id': 'auf-dem-weg-zur-deutschen-meisterschaft-vom-07.11.2022',\n- 'ext': 'ismv', # ismv+isma will be merged into mp4\n- 'alt_title': 'Auf dem Weg zur Deutschen Meisterschaft',\n- 'title': 'Auf dem Weg zur Deutschen Meisterschaft',\n- 'upload_date': '20221108',\n- 'view_count': int,\n- 'display_id': 'auf-dem-weg-zur-deutschen-meisterschaft',\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'description': 'md5:48c59b74192bc819a9b34af1d5ed1eb9',\n- 'timestamp': 1667933057,\n- 'duration': 243.0,\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\n- 'info_dict': {\n- 'id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften-vom-14.11.2022',\n- 'ext': 'ismv',\n- 'title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\n- 'timestamp': 1668526214,\n- 'display_id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften',\n- 'alt_title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\n- 'view_count': int,\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'duration': 345.0,\n- 'description': 'md5:9370ba29526984006c2cba1372e5c5a0',\n- 'upload_date': '20221115',\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/casino-mainz-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\n- 'info_dict': {\n- 'id': 'casino-mainz-bei-den-deutschen-meisterschaften-vom-14.11.2022',\n- 'ext': 'ismv',\n- 'title': 'Casino Mainz bei den Deutschen Meisterschaften',\n- 'view_count': int,\n- 'timestamp': 1668527402,\n- 'alt_title': 'Casino Mainz bei den Deutschen Meisterschaften',\n- 'upload_date': '20221115',\n- 'display_id': 'casino-mainz-bei-den-deutschen-meisterschaften',\n- 'duration': 348.0,\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'description': 'md5:70fc1660eeba96da17199e5bdff4c0aa',\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/bricks4kids/vom-22.06.2022/',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- display_id = mobj.group('display_id')\n- video_id = mobj.group('video_id').replace('/', '-')\n- webpage = self._download_webpage(url, video_id)\n-\n- source, img = self._search_regex(r'(?s)(?P<source><source[^>]*>)(?P<img><img[^>]*>)',\n- webpage, 'video', group=('source', 'img'))\n- source = extract_attributes(source)\n- img = extract_attributes(img)\n-\n- raw_json_ld = list(self._yield_json_ld(webpage, video_id))\n- json_ld = self._json_ld(raw_json_ld, video_id)\n- json_ld.pop('url', None)\n-\n- ism_manifest_url = (\n- source.get('src')\n- or next(json_ld.get('embedUrl') for json_ld in raw_json_ld if json_ld.get('@type') == 'VideoObject')\n- )\n- formats, subtitles = self._extract_ism_formats_and_subtitles(ism_manifest_url, video_id)\n-\n- return merge_dicts({\n- 'id': video_id,\n- 'display_id': display_id,\n- 'title':\n- self._html_search_regex(r'<h1><span class=\"title\">([^<]*)</span>',\n- webpage, 'headline', default=None)\n- or img.get('title') or json_ld.get('title') or self._og_search_title(webpage)\n- or remove_end(self._html_extract_title(webpage), ' -'),\n- 'alt_title': img.get('alt'),\n- 'description': json_ld.get('description') or self._og_search_description(webpage),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnails': [{'url': img['src']}] if 'src' in img else json_ld.get('thumbnails'),\n- }, json_ld)\ndiff --git a/yt_dlp/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py\ndeleted file mode 100644\nindex e7b1e22978f9..000000000000\n--- a/yt_dlp/extractor/rmcdecouverte.py\n+++ /dev/null\n@@ -1,69 +0,0 @@\n-import urllib.parse\n-\n-from .brightcove import BrightcoveLegacyIE\n-from .common import InfoExtractor\n-from ..utils import smuggle_url\n-\n-\n-class RMCDecouverteIE(InfoExtractor):\n- _VALID_URL = r'https?://rmcdecouverte\\.bfmtv\\.com/(?:[^?#]*_(?P<id>\\d+)|mediaplayer-direct)/?(?:[#?]|$)'\n-\n- _TESTS = [{\n- 'url': 'https://rmcdecouverte.bfmtv.com/vestiges-de-guerre_22240/les-bunkers-secrets-domaha-beach_25303/',\n- 'info_dict': {\n- 'id': '6250879771001',\n- 'ext': 'mp4',\n- 'title': 'LES BUNKERS SECRETS DยดOMAHA BEACH',\n- 'uploader_id': '1969646226001',\n- 'description': 'md5:aed573ca24abde62a148e0eba909657d',\n- 'timestamp': 1619622984,\n- 'upload_date': '20210428',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/',\n- 'info_dict': {\n- 'id': '5983675500001',\n- 'ext': 'mp4',\n- 'title': 'CORVETTE',\n- 'description': 'md5:c1e8295521e45ffebf635d6a7658f506',\n- 'uploader_id': '1969646226001',\n- 'upload_date': '20181226',\n- 'timestamp': 1545861635,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'only available for a week',\n- }, {\n- 'url': 'https://rmcdecouverte.bfmtv.com/avions-furtifs-la-technologie-de-lextreme_10598',\n- 'only_matching': True,\n- }, {\n- # The website accepts any URL as long as it has _\\d+ at the end\n- 'url': 'https://rmcdecouverte.bfmtv.com/any/thing/can/go/here/_10598',\n- 'only_matching': True,\n- }, {\n- # live, geo restricted, bypassable\n- 'url': 'https://rmcdecouverte.bfmtv.com/mediaplayer-direct/',\n- 'only_matching': True,\n- }]\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- display_id = mobj.group('id') or 'direct'\n- webpage = self._download_webpage(url, display_id)\n- brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)\n- if brightcove_legacy_url:\n- brightcove_id = urllib.parse.parse_qs(urllib.parse.urlparse(\n- brightcove_legacy_url).query)['@videoPlayer'][0]\n- else:\n- brightcove_id = self._search_regex(\n- r'data-video-id=[\"\\'](\\d+)', webpage, 'brightcove id')\n- return self.url_result(\n- smuggle_url(\n- self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,\n- {'geo_countries': ['FR']}),\n- 'BrightcoveNew', brightcove_id)\ndiff --git a/yt_dlp/extractor/sejmpl.py b/yt_dlp/extractor/sejmpl.py\nindex eb433d2ac321..6f3b79622cf4 100644\n--- a/yt_dlp/extractor/sejmpl.py\n+++ b/yt_dlp/extractor/sejmpl.py\n@@ -1,7 +1,6 @@\n import datetime as dt\n \n from .common import InfoExtractor\n-from .redge import RedCDNLivxIE\n from ..utils import (\n clean_html,\n join_nonempty,\n@@ -27,6 +26,7 @@ def rfc3339_to_atende(date):\n \n \n class SejmIE(InfoExtractor):\n+ _WORKING = False\n _VALID_URL = (\n r'https?://(?:www\\.)?sejm\\.gov\\.pl/[Ss]ejm(?P<term>\\d+)\\.nsf/transmisje(?:_arch)?\\.xsp(?:\\?[^#]*)?#(?P<id>[\\dA-F]+)',\n r'https?://(?:www\\.)?sejm\\.gov\\.pl/[Ss]ejm(?P<term>\\d+)\\.nsf/transmisje(?:_arch)?\\.xsp\\?(?:[^#]+&)?unid=(?P<id>[\\dA-F]+)',\n@@ -185,7 +185,7 @@ def add_entry(file, legacy_file=False):\n entries.append({\n **common_info,\n '_type': 'url_transparent',\n- 'ie_key': RedCDNLivxIE.ie_key(),\n+ 'ie_key': 'redcdnlivx',\n 'id': stream_id,\n 'title': join_nonempty(title, stream_id, delim=' - '),\n })\ndiff --git a/yt_dlp/extractor/sendtonews.py b/yt_dlp/extractor/sendtonews.py\ndeleted file mode 100644\nindex ecf4b27d7a76..000000000000\n--- a/yt_dlp/extractor/sendtonews.py\n+++ /dev/null\n@@ -1,105 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_protocol,\n- float_or_none,\n- int_or_none,\n- parse_iso8601,\n- unescapeHTML,\n- update_url_query,\n-)\n-\n-\n-class SendtoNewsIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://embed\\.sendtonews\\.com/player2/embedplayer\\.php\\?.*\\bSC=(?P<id>[0-9A-Za-z-]+)'\n-\n- _TEST = {\n- # From http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/\n- 'url': 'http://embed.sendtonews.com/player2/embedplayer.php?SC=GxfCe0Zo7D-175909-5588&type=single&autoplay=on&sound=YES',\n- 'info_dict': {\n- 'id': 'GxfCe0Zo7D-175909-5588',\n- },\n- 'playlist_count': 8,\n- # test the first video only to prevent lengthy tests\n- 'playlist': [{\n- 'info_dict': {\n- 'id': '240385',\n- 'ext': 'mp4',\n- 'title': 'Indians introduce Encarnacion',\n- 'description': 'Indians president of baseball operations Chris Antonetti and Edwin Encarnacion discuss the slugger\\'s three-year contract with Cleveland',\n- 'duration': 137.898,\n- 'thumbnail': r're:https?://.*\\.jpg$',\n- 'upload_date': '20170105',\n- 'timestamp': 1483649762,\n- },\n- }],\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- _URL_TEMPLATE = '//embed.sendtonews.com/player2/embedplayer.php?SC=%s'\n-\n- @classmethod\n- def _extract_embed_urls(cls, url, webpage):\n- mobj = re.search(r'''(?x)<script[^>]+src=([\\'\"])\n- (?:https?:)?//embed\\.sendtonews\\.com/player/responsiveembed\\.php\\?\n- .*\\bSC=(?P<SC>[0-9a-zA-Z-]+).*\n- \\1>''', webpage)\n- if mobj:\n- sc = mobj.group('SC')\n- yield cls._URL_TEMPLATE % sc\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n-\n- data_url = update_url_query(\n- url.replace('embedplayer.php', 'data_read.php'),\n- {'cmd': 'loadInitial'})\n- playlist_data = self._download_json(data_url, playlist_id)\n-\n- entries = []\n- for video in playlist_data['playlistData'][0]:\n- info_dict = self._parse_jwplayer_data(\n- video['jwconfiguration'],\n- require_title=False, m3u8_id='hls', rtmp_params={'no_resume': True})\n-\n- for f in info_dict['formats']:\n- if f.get('tbr'):\n- continue\n- tbr = int_or_none(self._search_regex(\n- r'/(\\d+)k/', f['url'], 'bitrate', default=None))\n- if not tbr:\n- continue\n- f.update({\n- 'format_id': f'{determine_protocol(f)}-{tbr}',\n- 'tbr': tbr,\n- })\n-\n- thumbnails = []\n- if video.get('thumbnailUrl'):\n- thumbnails.append({\n- 'id': 'normal',\n- 'url': video['thumbnailUrl'],\n- })\n- if video.get('smThumbnailUrl'):\n- thumbnails.append({\n- 'id': 'small',\n- 'url': video['smThumbnailUrl'],\n- })\n- info_dict.update({\n- 'title': video['S_headLine'].strip(),\n- 'description': unescapeHTML(video.get('S_fullStory')),\n- 'thumbnails': thumbnails,\n- 'duration': float_or_none(video.get('SM_length')),\n- 'timestamp': parse_iso8601(video.get('S_sysDate'), delimiter=' '),\n- # 'tbr' was explicitly set to be preferred over 'height' originally,\n- # So this is being kept unless someone can confirm this is unnecessary\n- '_format_sort_fields': ('tbr', 'res'),\n- })\n- entries.append(info_dict)\n-\n- return self.playlist_result(entries, playlist_id)\ndiff --git a/yt_dlp/extractor/sharevideos.py b/yt_dlp/extractor/sharevideos.py\ndeleted file mode 100644\nindex 3132c7a82b16..000000000000\n--- a/yt_dlp/extractor/sharevideos.py\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class ShareVideosEmbedIE(InfoExtractor):\n- _VALID_URL = False\n- _EMBED_REGEX = [r'<iframe[^>]+?\\bsrc\\s*=\\s*([\"\\'])(?P<url>(?:https?:)?//embed\\.share-videos\\.se/auto/embed/\\d+\\?.*?\\buid=\\d+.*?)\\1']\ndiff --git a/yt_dlp/extractor/snotr.py b/yt_dlp/extractor/snotr.py\ndeleted file mode 100644\nindex 859e5e8376b6..000000000000\n--- a/yt_dlp/extractor/snotr.py\n+++ /dev/null\n@@ -1,68 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_duration,\n- parse_filesize,\n- str_to_int,\n-)\n-\n-\n-class SnotrIE(InfoExtractor):\n- _VALID_URL = r'http?://(?:www\\.)?snotr\\.com/video/(?P<id>\\d+)/([\\w]+)'\n- _TESTS = [{\n- 'url': 'http://www.snotr.com/video/13708/Drone_flying_through_fireworks',\n- 'info_dict': {\n- 'id': '13708',\n- 'ext': 'mp4',\n- 'title': 'Drone flying through fireworks!',\n- 'duration': 248,\n- 'filesize_approx': 40700000,\n- 'description': 'A drone flying through Fourth of July Fireworks',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- 'expected_warnings': ['description'],\n- }, {\n- 'url': 'http://www.snotr.com/video/530/David_Letteman_-_George_W_Bush_Top_10',\n- 'info_dict': {\n- 'id': '530',\n- 'ext': 'mp4',\n- 'title': 'David Letteman - George W. Bush Top 10',\n- 'duration': 126,\n- 'filesize_approx': 8500000,\n- 'description': 'The top 10 George W. Bush moments, brought to you by David Letterman!',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n-\n- webpage = self._download_webpage(url, video_id)\n- title = self._og_search_title(webpage)\n-\n- description = self._og_search_description(webpage)\n- info_dict = self._parse_html5_media_entries(\n- url, webpage, video_id, m3u8_entry_protocol='m3u8_native')[0]\n-\n- view_count = str_to_int(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Views:</strong>\\s*<span[^>]*>([\\d,\\.]+)',\n- webpage, 'view count', fatal=False))\n-\n- duration = parse_duration(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Length:</strong>\\s*<span[^>]*>([\\d:]+)',\n- webpage, 'duration', fatal=False))\n-\n- filesize_approx = parse_filesize(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Filesize:</strong>\\s*<span[^>]*>([^<]+)',\n- webpage, 'filesize', fatal=False))\n-\n- info_dict.update({\n- 'id': video_id,\n- 'description': description,\n- 'title': title,\n- 'view_count': view_count,\n- 'duration': duration,\n- 'filesize_approx': filesize_approx,\n- })\n-\n- return info_dict\ndiff --git a/yt_dlp/extractor/springboardplatform.py b/yt_dlp/extractor/springboardplatform.py\ndeleted file mode 100644\nindex 9a37dd6752d7..000000000000\n--- a/yt_dlp/extractor/springboardplatform.py\n+++ /dev/null\n@@ -1,122 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- unescapeHTML,\n- unified_timestamp,\n- xpath_attr,\n- xpath_element,\n- xpath_text,\n-)\n-\n-\n-class SpringboardPlatformIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://\n- cms\\.springboardplatform\\.com/\n- (?:\n- (?:previews|embed_iframe)/(?P<index>\\d+)/video/(?P<id>\\d+)|\n- xml_feeds_advanced/index/(?P<index_2>\\d+)/rss3/(?P<id_2>\\d+)\n- )\n- '''\n- _EMBED_REGEX = [r'<iframe\\b[^>]+\\bsrc=([\"\\'])(?P<url>(?:https?:)?//cms\\.springboardplatform\\.com/embed_iframe/\\d+/video/\\d+.*?)\\1']\n- _TESTS = [{\n- 'url': 'http://cms.springboardplatform.com/previews/159/video/981017/0/0/1',\n- 'md5': '5c3cb7b5c55740d482561099e920f192',\n- 'info_dict': {\n- 'id': '981017',\n- 'ext': 'mp4',\n- 'title': 'Redman \"BUD like YOU\" \"Usher Good Kisser\" REMIX',\n- 'description': 'Redman \"BUD like YOU\" \"Usher Good Kisser\" REMIX',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'timestamp': 1409132328,\n- 'upload_date': '20140827',\n- 'duration': 193,\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/159/video/981017/rab007/rapbasement.com/1/1',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/20/video/1731611/ki055/kidzworld.com/10',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cms.springboardplatform.com/xml_feeds_advanced/index/159/rss3/981017/0/0/1/',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.kidzworld.com/article/30935-trolls-the-beat-goes-on-interview-skylar-astin-and-amanda-leighton',\n- 'info_dict': {\n- 'id': '1731611',\n- 'ext': 'mp4',\n- 'title': 'Official Trailer | TROLLS: THE BEAT GOES ON!',\n- },\n- 'skip': 'Invalid URL',\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id') or mobj.group('id_2')\n- index = mobj.group('index') or mobj.group('index_2')\n-\n- video = self._download_xml(\n- f'http://cms.springboardplatform.com/xml_feeds_advanced/index/{index}/rss3/{video_id}', video_id)\n-\n- item = xpath_element(video, './/item', 'item', fatal=True)\n-\n- content = xpath_element(\n- item, './{http://search.yahoo.com/mrss/}content', 'content',\n- fatal=True)\n- title = unescapeHTML(xpath_text(item, './title', 'title', fatal=True))\n-\n- video_url = content.attrib['url']\n-\n- if 'error_video.mp4' in video_url:\n- raise ExtractorError(\n- f'Video {video_id} no longer exists', expected=True)\n-\n- duration = int_or_none(content.get('duration'))\n- tbr = int_or_none(content.get('bitrate'))\n- filesize = int_or_none(content.get('fileSize'))\n- width = int_or_none(content.get('width'))\n- height = int_or_none(content.get('height'))\n-\n- description = unescapeHTML(xpath_text(\n- item, './description', 'description'))\n- thumbnail = xpath_attr(\n- item, './{http://search.yahoo.com/mrss/}thumbnail', 'url',\n- 'thumbnail')\n-\n- timestamp = unified_timestamp(xpath_text(\n- item, './{http://cms.springboardplatform.com/namespaces.html}created',\n- 'timestamp'))\n-\n- formats = [{\n- 'url': video_url,\n- 'format_id': 'http',\n- 'tbr': tbr,\n- 'filesize': filesize,\n- 'width': width,\n- 'height': height,\n- }]\n-\n- m3u8_format = formats[0].copy()\n- m3u8_format.update({\n- 'url': re.sub(r'(https?://)cdn\\.', r'\\1hls.', video_url) + '.m3u8',\n- 'ext': 'mp4',\n- 'format_id': 'hls',\n- 'protocol': 'm3u8_native',\n- })\n- formats.append(m3u8_format)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'timestamp': timestamp,\n- 'duration': duration,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/stanfordoc.py b/yt_dlp/extractor/stanfordoc.py\ndeleted file mode 100644\nindex ab41091cff41..000000000000\n--- a/yt_dlp/extractor/stanfordoc.py\n+++ /dev/null\n@@ -1,89 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- orderedSet,\n- unescapeHTML,\n-)\n-\n-\n-class StanfordOpenClassroomIE(InfoExtractor):\n- IE_NAME = 'stanfordoc'\n- IE_DESC = 'Stanford Open ClassRoom'\n- _VALID_URL = r'https?://openclassroom\\.stanford\\.edu(?P<path>/?|(/MainFolder/(?:HomePage|CoursePage|VideoPage)\\.php([?]course=(?P<course>[^&]+)(&video=(?P<video>[^&]+))?(&.*)?)?))$'\n- _TEST = {\n- 'url': 'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100',\n- 'md5': '544a9468546059d4e80d76265b0443b8',\n- 'info_dict': {\n- 'id': 'PracticalUnix_intro-environment',\n- 'ext': 'mp4',\n- 'title': 'Intro Environment',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n-\n- if mobj.group('course') and mobj.group('video'): # A specific video\n- course = mobj.group('course')\n- video = mobj.group('video')\n- info = {\n- 'id': course + '_' + video,\n- 'uploader': None,\n- 'upload_date': None,\n- }\n-\n- base_url = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'\n- xml_url = base_url + video + '.xml'\n- mdoc = self._download_xml(xml_url, info['id'])\n- try:\n- info['title'] = mdoc.findall('./title')[0].text\n- info['url'] = base_url + mdoc.findall('./videoFile')[0].text\n- except IndexError:\n- raise ExtractorError('Invalid metadata XML file')\n- return info\n- elif mobj.group('course'): # A course page\n- course = mobj.group('course')\n- info = {\n- 'id': course,\n- '_type': 'playlist',\n- 'uploader': None,\n- 'upload_date': None,\n- }\n-\n- coursepage = self._download_webpage(\n- url, info['id'],\n- note='Downloading course info page',\n- errnote='Unable to download course info page')\n-\n- info['title'] = self._html_search_regex(\n- r'<h1>([^<]+)</h1>', coursepage, 'title', default=info['id'])\n-\n- info['description'] = self._html_search_regex(\n- r'(?s)<description>([^<]+)</description>',\n- coursepage, 'description', fatal=False)\n-\n- links = orderedSet(re.findall(r'<a href=\"(VideoPage\\.php\\?[^\"]+)\">', coursepage))\n- info['entries'] = [self.url_result(\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\n- ) for l in links]\n- return info\n- else: # Root page\n- info = {\n- 'id': 'Stanford OpenClassroom',\n- '_type': 'playlist',\n- 'uploader': None,\n- 'upload_date': None,\n- }\n- info['title'] = info['id']\n-\n- root_url = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'\n- rootpage = self._download_webpage(root_url, info['id'],\n- errnote='Unable to download course info page')\n-\n- links = orderedSet(re.findall(r'<a href=\"(CoursePage\\.php\\?[^\"]+)\">', rootpage))\n- info['entries'] = [self.url_result(\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\n- ) for l in links]\n- return info\ndiff --git a/yt_dlp/extractor/stitcher.py b/yt_dlp/extractor/stitcher.py\ndeleted file mode 100644\nindex 09ebabb289d5..000000000000\n--- a/yt_dlp/extractor/stitcher.py\n+++ /dev/null\n@@ -1,141 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- clean_podcast_url,\n- int_or_none,\n- str_or_none,\n- try_get,\n- url_or_none,\n-)\n-\n-\n-class StitcherBaseIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://(?:www\\.)?stitcher\\.com/(?:podcast|show)/'\n-\n- def _call_api(self, path, video_id, query):\n- resp = self._download_json(\n- 'https://api.prod.stitcher.com/' + path,\n- video_id, query=query)\n- error_massage = try_get(resp, lambda x: x['errors'][0]['message'])\n- if error_massage:\n- raise ExtractorError(error_massage, expected=True)\n- return resp['data']\n-\n- def _extract_description(self, data):\n- return clean_html(data.get('html_description') or data.get('description'))\n-\n- def _extract_audio_url(self, episode):\n- return url_or_none(episode.get('audio_url') or episode.get('guid'))\n-\n- def _extract_show_info(self, show):\n- return {\n- 'thumbnail': show.get('image_base_url'),\n- 'series': show.get('title'),\n- }\n-\n- def _extract_episode(self, episode, audio_url, show_info):\n- info = {\n- 'id': str(episode['id']),\n- 'display_id': episode.get('slug'),\n- 'title': episode['title'].strip(),\n- 'description': self._extract_description(episode),\n- 'duration': int_or_none(episode.get('duration')),\n- 'url': clean_podcast_url(audio_url),\n- 'vcodec': 'none',\n- 'timestamp': int_or_none(episode.get('date_published')),\n- 'season_number': int_or_none(episode.get('season')),\n- 'season_id': str_or_none(episode.get('season_id')),\n- }\n- info.update(show_info)\n- return info\n-\n-\n-class StitcherIE(StitcherBaseIE):\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?:[^/]+/)+e(?:pisode)?/(?:[^/#?&]+-)?(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines/e/40789481?autoplay=true',\n- 'md5': 'e9635098e0da10b21a0e2b85585530f6',\n- 'info_dict': {\n- 'id': '40789481',\n- 'ext': 'mp3',\n- 'title': 'Machine Learning Mastery and Cancer Clusters',\n- 'description': 'md5:547adb4081864be114ae3831b4c2b42f',\n- 'duration': 1604,\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20151008',\n- 'timestamp': 1444285800,\n- 'series': 'Talking Machines',\n- },\n- }, {\n- 'url': 'http://www.stitcher.com/podcast/panoply/vulture-tv/e/the-rare-hourlong-comedy-plus-40846275?autoplay=true',\n- 'info_dict': {\n- 'id': '40846275',\n- 'display_id': 'the-rare-hourlong-comedy-plus',\n- 'ext': 'mp3',\n- 'title': \"The CW's 'Crazy Ex-Girlfriend'\",\n- 'description': 'md5:04f1e2f98eb3f5cbb094cea0f9e19b17',\n- 'duration': 2235,\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Page Not Found',\n- }, {\n- # escaped title\n- 'url': 'http://www.stitcher.com/podcast/marketplace-on-stitcher/e/40910226?autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.stitcher.com/podcast/panoply/getting-in/e/episode-2a-how-many-extracurriculars-should-i-have-40876278?autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.stitcher.com/show/threedom/episode/circles-on-a-stick-200212584',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- audio_id = self._match_id(url)\n- data = self._call_api(\n- 'shows/episodes', audio_id, {'episode_ids': audio_id})\n- episode = data['episodes'][0]\n- audio_url = self._extract_audio_url(episode)\n- if not audio_url:\n- self.raise_login_required()\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\n- return self._extract_episode(\n- episode, audio_url, self._extract_show_info(show))\n-\n-\n-class StitcherShowIE(StitcherBaseIE):\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?P<id>[^/#?&]+)/?(?:[?#&]|$)'\n- _TESTS = [{\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines',\n- 'info_dict': {\n- 'id': 'the-talking-machines',\n- 'title': 'Talking Machines',\n- 'description': 'md5:831f0995e40f26c10231af39cf1ebf0b',\n- },\n- 'playlist_mincount': 106,\n- }, {\n- 'url': 'https://www.stitcher.com/show/the-talking-machines',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- show_slug = self._match_id(url)\n- data = self._call_api(\n- f'search/show/{show_slug}/allEpisodes', show_slug, {'count': 10000})\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\n- show_info = self._extract_show_info(show)\n-\n- entries = []\n- for episode in (data.get('episodes') or []):\n- audio_url = self._extract_audio_url(episode)\n- if not audio_url:\n- continue\n- entries.append(self._extract_episode(episode, audio_url, show_info))\n-\n- return self.playlist_result(\n- entries, show_slug, show.get('title'),\n- self._extract_description(show))\ndiff --git a/yt_dlp/extractor/stretchinternet.py b/yt_dlp/extractor/stretchinternet.py\ndeleted file mode 100644\nindex 232837d8d522..000000000000\n--- a/yt_dlp/extractor/stretchinternet.py\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class StretchInternetIE(InfoExtractor):\n- _VALID_URL = r'https?://portal\\.stretchinternet\\.com/[^/]+/(?:portal|full)\\.htm\\?.*?\\beventId=(?P<id>\\d+)'\n- _TEST = {\n- 'url': 'https://portal.stretchinternet.com/umary/portal.htm?eventId=573272&streamType=video',\n- 'info_dict': {\n- 'id': '573272',\n- 'ext': 'mp4',\n- 'title': 'UNIVERSITY OF MARY WRESTLING VS UPPER IOWA',\n- # 'timestamp': 1575668361,\n- # 'upload_date': '20191206',\n- 'uploader_id': '99997',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- media_url = self._download_json(\n- 'https://core.stretchlive.com/trinity/event/tcg/' + video_id,\n- video_id)[0]['media'][0]['url']\n- event = self._download_json(\n- 'https://neo-client.stretchinternet.com/portal-ws/getEvent.json',\n- video_id, query={'eventID': video_id, 'token': 'asdf'})['event']\n-\n- return {\n- 'id': video_id,\n- 'title': event['title'],\n- # TODO: parse US timezone abbreviations\n- # 'timestamp': event.get('dateTimeString'),\n- 'url': 'https://' + media_url,\n- 'uploader_id': event.get('ownerID'),\n- }\ndiff --git a/yt_dlp/extractor/swearnet.py b/yt_dlp/extractor/swearnet.py\ndeleted file mode 100644\nindex 2d6fb3eb4760..000000000000\n--- a/yt_dlp/extractor/swearnet.py\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-from .vidyard import VidyardBaseIE\n-from ..utils import ExtractorError, int_or_none, make_archive_id\n-\n-\n-class SwearnetEpisodeIE(VidyardBaseIE):\n- _VALID_URL = r'https?://www\\.swearnet\\.com/shows/(?P<id>[\\w-]+)/seasons/(?P<season_num>\\d+)/episodes/(?P<episode_num>\\d+)'\n- _TESTS = [{\n- 'url': 'https://www.swearnet.com/shows/gettin-learnt-with-ricky/seasons/1/episodes/1',\n- 'info_dict': {\n- 'id': 'wicK2EOzjOdxkUXGDIgcPw',\n- 'display_id': '232819',\n- 'ext': 'mp4',\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'duration': 719,\n- 'description': r're:Are you drunk and high and craving a grilled cheese sandwich.+',\n- 'season': 'Season 1',\n- 'title': 'Episode 1 - Grilled Cheese Sammich',\n- 'season_number': 1,\n- 'thumbnail': 'https://cdn.vidyard.com/thumbnails/custom/0dd74f9b-388a-452e-b570-b407fb64435b_small.jpg',\n- 'tags': ['Getting Learnt with Ricky', 'drunk', 'grilled cheese', 'high'],\n- '_old_archive_ids': ['swearnetepisode 232819'],\n- },\n- }]\n-\n- def _real_extract(self, url):\n- slug, season_number, episode_number = self._match_valid_url(url).group('id', 'season_num', 'episode_num')\n- webpage = self._download_webpage(url, slug)\n-\n- try:\n- external_id = self._search_regex(r'externalid\\s*=\\s*\"([^\"]+)', webpage, 'externalid')\n- except ExtractorError:\n- if 'Upgrade Now' in webpage:\n- self.raise_login_required()\n- raise\n-\n- info = self._process_video_json(self._fetch_video_json(external_id)['chapters'][0], external_id)\n- if info.get('display_id'):\n- info['_old_archive_ids'] = [make_archive_id(self, info['display_id'])]\n-\n- return {\n- **info,\n- 'season_number': int_or_none(season_number),\n- 'episode_number': int_or_none(episode_number),\n- }\ndiff --git a/yt_dlp/extractor/syvdk.py b/yt_dlp/extractor/syvdk.py\ndeleted file mode 100644\nindex ec166831cde3..000000000000\n--- a/yt_dlp/extractor/syvdk.py\n+++ /dev/null\n@@ -1,33 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import traverse_obj\n-\n-\n-class SYVDKIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?24syv\\.dk/episode/(?P<id>[\\w-]+)'\n-\n- _TESTS = [{\n- 'url': 'https://24syv.dk/episode/isabella-arendt-stiller-op-for-de-konservative-2',\n- 'md5': '429ce5a423dd4b1e1d0bf3a569558089',\n- 'info_dict': {\n- 'id': '12215',\n- 'display_id': 'isabella-arendt-stiller-op-for-de-konservative-2',\n- 'ext': 'mp3',\n- 'title': 'Isabella Arendt stiller op for De Konservative',\n- 'description': 'md5:f5fa6a431813bf37284f3412ad7c6c06',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- info_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['episodeDetails'][0]\n-\n- return {\n- 'id': str(info_data['id']),\n- 'vcodec': 'none',\n- 'ext': 'mp3',\n- 'url': info_data['details']['enclosure'],\n- 'display_id': video_id,\n- 'title': traverse_obj(info_data, ('title', 'rendered')),\n- 'description': traverse_obj(info_data, ('details', 'post_title')),\n- }\ndiff --git a/yt_dlp/extractor/tempo.py b/yt_dlp/extractor/tempo.py\ndeleted file mode 100644\nindex 4cd16f240d6d..000000000000\n--- a/yt_dlp/extractor/tempo.py\n+++ /dev/null\n@@ -1,114 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n- traverse_obj,\n- try_call,\n-)\n-\n-\n-class IVXPlayerIE(InfoExtractor):\n- _VALID_URL = r'ivxplayer:(?P<video_id>\\d+):(?P<player_key>\\w+)'\n- _TESTS = [{\n- 'url': 'ivxplayer:2366065:4a89dfe6bc8f002596b1dfbd600730b1',\n- 'info_dict': {\n- 'id': '2366065',\n- 'ext': 'mp4',\n- 'duration': 112,\n- 'upload_date': '20221204',\n- 'title': 'Film Indonesia di Disney Content Showcase Asia Pacific 2022',\n- 'timestamp': 1670151746,\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2366065?width=300',\n- },\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.cantika.com/video/31737/film-indonesia-di-disney-content-showcase-asia-pacific-2022',\n- 'info_dict': {\n- 'id': '2374200',\n- 'ext': 'mp4',\n- 'duration': 110,\n- 'title': 'Serial Indonesia di Disney Content Showcase Asia Pacific 2022',\n- 'timestamp': 1670639416,\n- 'upload_date': '20221210',\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2374200?width=300',\n- },\n- }, {\n- 'url': 'https://www.gooto.com/video/11437/wuling-suv-ramai-dikunjungi-di-giias-2018',\n- 'info_dict': {\n- 'id': '892109',\n- 'ext': 'mp4',\n- 'title': 'Wuling SUV Ramai Dikunjungi di GIIAS 2018',\n- 'upload_date': '20180811',\n- 'description': 'md5:6d901483d0aacc664aecb4489719aafa',\n- 'duration': 75,\n- 'timestamp': 1534011263,\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/892109?width=300',\n- },\n- }]\n-\n- @classmethod\n- def _extract_embed_urls(cls, url, webpage):\n- # more info at https://player.ivideosmart.com/ivsplayer/v4/dist/js/loader.js\n- mobj = re.search(\n- r'<ivs-player\\s*[^>]+data-ivs-key\\s*=\\s*\"(?P<player_key>[\\w]+)\\s*[^>]+\\bdata-ivs-vid=\"(?P<video_id>[\\w-]+)',\n- webpage)\n- if mobj:\n- yield f'ivxplayer:{mobj.group(\"video_id\")}:{mobj.group(\"player_key\")}'\n- raise cls.StopExtraction\n-\n- def _real_extract(self, url):\n- video_id, player_key = self._match_valid_url(url).group('video_id', 'player_key')\n- json_data = self._download_json(\n- f'https://ivxplayer.ivideosmart.com/prod/video/{video_id}?key={player_key}', video_id)\n-\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- json_data['player']['video_url'], video_id)\n-\n- return {\n- 'id': str(json_data['ivx']['id']),\n- 'title': traverse_obj(json_data, ('ivx', 'name')),\n- 'description': traverse_obj(json_data, ('ivx', 'description')),\n- 'duration': int_or_none(traverse_obj(json_data, ('ivx', 'duration'))),\n- 'timestamp': parse_iso8601(traverse_obj(json_data, ('ivx', 'published_at'))),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': traverse_obj(json_data, ('ivx', 'thumbnail_url')),\n- }\n-\n-\n-class TempoIE(InfoExtractor):\n- _VALID_URL = r'https?://video\\.tempo\\.co/\\w+/\\d+/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://video.tempo.co/read/30058/anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\n- 'info_dict': {\n- 'id': '2144275',\n- 'display_id': 'anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\n- 'ext': 'mp4',\n- 'title': 'Anies Baswedan Ajukan Banding Putusan PTUN Batalkan UMP DKI',\n- 'duration': 85,\n- 'description': 'md5:a6822b7c4c874fa7e5bd63e96a387b66',\n- 'thumbnail': 'https://statik.tempo.co/data/2022/07/27/id_1128287/1128287_720.jpg',\n- 'timestamp': 1658907970,\n- 'upload_date': '20220727',\n- 'tags': ['Anies Baswedan', ' PTUN', ' PTUN | Pengadilan Tata Usaha Negara', ' PTUN Batalkan UMP DKI', ' UMP DKI'],\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- _, video_id, player_key = next(IVXPlayerIE._extract_embed_urls(url, webpage)).split(':')\n-\n- json_ld_data = self._search_json_ld(webpage, display_id)\n-\n- return self.url_result(\n- f'ivxplayer:{video_id}:{player_key}', display_id=display_id,\n- thumbnail=self._html_search_meta('twitter:image:src', webpage) or self._og_search_thumbnail(webpage),\n- tags=try_call(lambda: self._html_search_meta('keywords', webpage).split(',')),\n- description=(json_ld_data.get('description')\n- or self._html_search_meta(('description', 'twitter:description'), webpage)\n- or self._og_search_description(webpage)),\n- url_transparent=True)\ndiff --git a/yt_dlp/extractor/theholetv.py b/yt_dlp/extractor/theholetv.py\ndeleted file mode 100644\nindex a3a7024288eb..000000000000\n--- a/yt_dlp/extractor/theholetv.py\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import extract_attributes, remove_end\n-\n-\n-class TheHoleTvIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?the-hole\\.tv/episodes/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://the-hole.tv/episodes/gromkii-vopros-sergey-orlov',\n- 'md5': 'fea6682f47786f3ae5a6cbd635ec4bf9',\n- 'info_dict': {\n- 'id': 'gromkii-vopros-sergey-orlov',\n- 'ext': 'mp4',\n- 'title': 'ะกะตัะณะตะน ะัะปะพะฒ โ ะัะพะผะบะธะน ะฒะพะฟัะพั',\n- 'thumbnail': 'https://assets-cdn.the-hole.tv/images/t8gan4n6zn627e7wni11b2uemqts',\n- 'description': 'md5:45741a9202331f995d9fb76996759379',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- player_attrs = extract_attributes(self._search_regex(\n- r'(<div[^>]*\\bdata-controller=\"player\"[^>]*>)', webpage, 'video player'))\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- player_attrs['data-player-source-value'], video_id, 'mp4')\n-\n- return {\n- 'id': video_id,\n- 'title': remove_end(self._html_extract_title(webpage), ' โ The Hole'),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': player_attrs.get('data-player-poster-value'),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- }\ndiff --git a/yt_dlp/extractor/traileraddict.py b/yt_dlp/extractor/traileraddict.py\ndeleted file mode 100644\nindex 81c9365585c0..000000000000\n--- a/yt_dlp/extractor/traileraddict.py\n+++ /dev/null\n@@ -1,61 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-\n-\n-class TrailerAddictIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'(?:https?://)?(?:www\\.)?traileraddict\\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'\n- _TEST = {\n- 'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',\n- 'md5': '41365557f3c8c397d091da510e73ceb4',\n- 'info_dict': {\n- 'id': '76184',\n- 'ext': 'mp4',\n- 'title': 'Prince Avalanche Trailer',\n- 'description': 'Trailer for Prince Avalanche.\\n\\nTwo highway road workers spend the summer of 1988 away from their city lives. The isolated landscape becomes a place of misadventure as the men find themselves at odds with each other and the women they left behind.',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- name = mobj.group('movie') + '/' + mobj.group('trailer_name')\n- webpage = self._download_webpage(url, name)\n-\n- title = self._html_extract_title(webpage, 'video title').replace(' - Trailer Addict', '')\n- view_count_str = self._search_regex(\n- r'<span class=\"views_n\">([0-9,.]+)</span>',\n- webpage, 'view count', fatal=False)\n- view_count = (\n- None if view_count_str is None\n- else int(view_count_str.replace(',', '')))\n- video_id = self._search_regex(\n- r'<param\\s+name=\"movie\"\\s+value=\"/emb/([0-9]+)\"\\s*/>',\n- webpage, 'video id')\n-\n- # Presence of (no)watchplus function indicates HD quality is available\n- if re.search(r'function (no)?watchplus()', webpage):\n- fvar = 'fvarhd'\n- else:\n- fvar = 'fvar'\n-\n- info_url = f'http://www.traileraddict.com/{fvar}.php?tid={video_id!s}'\n- info_webpage = self._download_webpage(info_url, video_id, 'Downloading the info webpage')\n-\n- final_url = self._search_regex(r'&fileurl=(.+)',\n- info_webpage, 'Download url').replace('%3F', '?')\n- thumbnail_url = self._search_regex(r'&image=(.+?)&',\n- info_webpage, 'thumbnail url')\n-\n- description = self._html_search_regex(\n- r'(?s)<div class=\"synopsis\">.*?<div class=\"movie_label_info\"[^>]*>(.*?)</div>',\n- webpage, 'description', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'url': final_url,\n- 'title': title,\n- 'thumbnail': thumbnail_url,\n- 'description': description,\n- 'view_count': view_count,\n- }\ndiff --git a/yt_dlp/extractor/triller.py b/yt_dlp/extractor/triller.py\ndeleted file mode 100644\nindex 3bdeedd43e00..000000000000\n--- a/yt_dlp/extractor/triller.py\n+++ /dev/null\n@@ -1,329 +0,0 @@\n-import itertools\n-import json\n-import re\n-\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-from ..utils import (\n- ExtractorError,\n- UnsupportedError,\n- determine_ext,\n- int_or_none,\n- parse_resolution,\n- str_or_none,\n- traverse_obj,\n- unified_timestamp,\n- url_basename,\n- url_or_none,\n- urljoin,\n-)\n-\n-\n-class TrillerBaseIE(InfoExtractor):\n- _NETRC_MACHINE = 'triller'\n- _API_BASE_URL = 'https://social.triller.co/v1.5'\n- _API_HEADERS = {'Origin': 'https://triller.co'}\n-\n- def _perform_login(self, username, password):\n- if self._API_HEADERS.get('Authorization'):\n- return\n-\n- headers = {**self._API_HEADERS, 'Content-Type': 'application/json'}\n- user_check = traverse_obj(self._download_json(\n- f'{self._API_BASE_URL}/api/user/is-valid-username', None, note='Checking username',\n- fatal=False, expected_status=400, headers=headers,\n- data=json.dumps({'username': username}, separators=(',', ':')).encode()), 'status')\n-\n- if user_check: # endpoint returns `\"status\":false` if username exists\n- raise ExtractorError('Unable to login: Invalid username', expected=True)\n-\n- login = self._download_json(\n- f'{self._API_BASE_URL}/user/auth', None, note='Logging in', fatal=False,\n- expected_status=400, headers=headers, data=json.dumps({\n- 'username': username,\n- 'password': password,\n- }, separators=(',', ':')).encode()) or {}\n-\n- if not login.get('auth_token'):\n- if login.get('error') == 1008:\n- raise ExtractorError('Unable to login: Incorrect password', expected=True)\n- raise ExtractorError('Unable to login')\n-\n- self._API_HEADERS['Authorization'] = f'Bearer {login[\"auth_token\"]}'\n-\n- def _get_comments(self, video_id, limit=15):\n- comment_info = self._download_json(\n- f'{self._API_BASE_URL}/api/videos/{video_id}/comments_v2',\n- video_id, fatal=False, note='Downloading comments API JSON',\n- headers=self._API_HEADERS, query={'limit': limit}) or {}\n- if not comment_info.get('comments'):\n- return\n- yield from traverse_obj(comment_info, ('comments', ..., {\n- 'id': ('id', {str_or_none}),\n- 'text': 'body',\n- 'author': ('author', 'username'),\n- 'author_id': ('author', 'user_id'),\n- 'timestamp': ('timestamp', {unified_timestamp}),\n- }))\n-\n- def _parse_video_info(self, video_info, username, user_id, display_id=None):\n- video_id = str(video_info['id'])\n- display_id = display_id or video_info.get('video_uuid')\n-\n- if traverse_obj(video_info, (\n- None, ('transcoded_url', 'video_url', 'stream_url', 'audio_url'),\n- {lambda x: re.search(r'/copyright/', x)}), get_all=False):\n- self.raise_no_formats('This video has been removed due to licensing restrictions', expected=True)\n-\n- def format_info(url):\n- return {\n- 'url': url,\n- 'ext': determine_ext(url),\n- 'format_id': url_basename(url).split('.')[0],\n- }\n-\n- formats = []\n-\n- if determine_ext(video_info.get('transcoded_url')) == 'm3u8':\n- formats.extend(self._extract_m3u8_formats(\n- video_info['transcoded_url'], video_id, 'mp4', m3u8_id='hls', fatal=False))\n-\n- for video in traverse_obj(video_info, ('video_set', lambda _, v: url_or_none(v['url']))):\n- formats.append({\n- **format_info(video['url']),\n- **parse_resolution(video.get('resolution')),\n- 'vcodec': video.get('codec'),\n- 'vbr': int_or_none(video.get('bitrate'), 1000),\n- })\n-\n- video_url = traverse_obj(video_info, 'video_url', 'stream_url', expected_type=url_or_none)\n- if video_url:\n- formats.append({\n- **format_info(video_url),\n- 'vcodec': 'h264',\n- **traverse_obj(video_info, {\n- 'width': 'width',\n- 'height': 'height',\n- 'filesize': 'filesize',\n- }, expected_type=int_or_none),\n- })\n-\n- audio_url = url_or_none(video_info.get('audio_url'))\n- if audio_url:\n- formats.append(format_info(audio_url))\n-\n- comment_count = traverse_obj(video_info, ('comment_count', {int_or_none}))\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'uploader': username,\n- 'uploader_id': user_id or traverse_obj(video_info, ('user', 'user_id', {str_or_none})),\n- 'webpage_url': urljoin(f'https://triller.co/@{username}/video/', display_id),\n- 'uploader_url': f'https://triller.co/@{username}',\n- 'extractor_key': TrillerIE.ie_key(),\n- 'extractor': TrillerIE.IE_NAME,\n- 'formats': formats,\n- 'comment_count': comment_count,\n- '__post_extractor': self.extract_comments(video_id, comment_count),\n- **traverse_obj(video_info, {\n- 'title': ('description', {lambda x: x.replace('\\r\\n', ' ')}),\n- 'description': 'description',\n- 'creator': ((('user'), ('users', lambda _, v: str(v['user_id']) == user_id)), 'name'),\n- 'thumbnail': ('thumbnail_url', {url_or_none}),\n- 'timestamp': ('timestamp', {unified_timestamp}),\n- 'duration': ('duration', {int_or_none}),\n- 'view_count': ('play_count', {int_or_none}),\n- 'like_count': ('likes_count', {int_or_none}),\n- 'artist': 'song_artist',\n- 'track': 'song_title',\n- }, get_all=False),\n- }\n-\n-\n-class TrillerIE(TrillerBaseIE):\n- _VALID_URL = r'''(?x)\n- https?://(?:www\\.)?triller\\.co/\n- @(?P<username>[\\w.]+)/video/(?P<id>[\\da-f]{8}-(?:[\\da-f]{4}-){3}[\\da-f]{12})\n- '''\n- _TESTS = [{\n- 'url': 'https://triller.co/@theestallion/video/2358fcd7-3df2-4c77-84c8-1d091610a6cf',\n- 'md5': '228662d783923b60d78395fedddc0a20',\n- 'info_dict': {\n- 'id': '71595734',\n- 'ext': 'mp4',\n- 'title': 'md5:9a2bf9435c5c4292678996a464669416',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:9a2bf9435c5c4292678996a464669416',\n- 'uploader': 'theestallion',\n- 'uploader_id': '18992236',\n- 'creator': 'Megan Thee Stallion',\n- 'timestamp': 1660598222,\n- 'upload_date': '20220815',\n- 'duration': 47,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Megan Thee Stallion',\n- 'track': 'Her',\n- 'uploader_url': 'https://triller.co/@theestallion',\n- 'comment_count': int,\n- },\n- 'skip': 'This video has been removed due to licensing restrictions',\n- }, {\n- 'url': 'https://triller.co/@charlidamelio/video/46c6fcfa-aa9e-4503-a50c-68444f44cddc',\n- 'md5': '874055f462af5b0699b9dbb527a505a0',\n- 'info_dict': {\n- 'id': '71621339',\n- 'ext': 'mp4',\n- 'title': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\n- 'display_id': '46c6fcfa-aa9e-4503-a50c-68444f44cddc',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\n- 'uploader': 'charlidamelio',\n- 'uploader_id': '1875551',\n- 'creator': 'charli damelio',\n- 'timestamp': 1660773354,\n- 'upload_date': '20220817',\n- 'duration': 16,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Dixie',\n- 'track': 'Someone to Blame',\n- 'uploader_url': 'https://triller.co/@charlidamelio',\n- 'comment_count': int,\n- },\n- }, {\n- 'url': 'https://triller.co/@theestallion/video/07f35f38-1f51-48e2-8c5f-f7a8e829988f',\n- 'md5': 'af7b3553e4b8bfca507636471ee2eb41',\n- 'info_dict': {\n- 'id': '71837829',\n- 'ext': 'mp4',\n- 'title': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio #womeninhiphop',\n- 'display_id': '07f35f38-1f51-48e2-8c5f-f7a8e829988f',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio\\r\\n #womeninhiphop',\n- 'uploader': 'theestallion',\n- 'uploader_id': '18992236',\n- 'creator': 'Megan Thee Stallion',\n- 'timestamp': 1662486178,\n- 'upload_date': '20220906',\n- 'duration': 30,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Unknown',\n- 'track': 'Unknown',\n- 'uploader_url': 'https://triller.co/@theestallion',\n- 'comment_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- username, display_id = self._match_valid_url(url).group('username', 'id')\n-\n- video_info = self._download_json(\n- f'{self._API_BASE_URL}/api/videos/{display_id}', display_id,\n- headers=self._API_HEADERS)['videos'][0]\n-\n- return self._parse_video_info(video_info, username, None, display_id)\n-\n-\n-class TrillerUserIE(TrillerBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?triller\\.co/@(?P<id>[\\w.]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://triller.co/@theestallion',\n- 'playlist_mincount': 12,\n- 'info_dict': {\n- 'id': '18992236',\n- 'title': 'theestallion',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- },\n- }, {\n- 'url': 'https://triller.co/@charlidamelio',\n- 'playlist_mincount': 150,\n- 'info_dict': {\n- 'id': '1875551',\n- 'title': 'charlidamelio',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- },\n- }]\n-\n- def _real_initialize(self):\n- if not self._API_HEADERS.get('Authorization'):\n- guest = self._download_json(\n- f'{self._API_BASE_URL}/user/create_guest', None,\n- note='Creating guest session', data=b'', headers=self._API_HEADERS, query={\n- 'platform': 'Web',\n- 'app_version': '',\n- })\n- if not guest.get('auth_token'):\n- raise ExtractorError('Unable to fetch required auth token for user extraction')\n-\n- self._API_HEADERS['Authorization'] = f'Bearer {guest[\"auth_token\"]}'\n-\n- def _entries(self, username, user_id, limit=6):\n- query = {'limit': limit}\n- for page in itertools.count(1):\n- videos = self._download_json(\n- f'{self._API_BASE_URL}/api/users/{user_id}/videos',\n- username, note=f'Downloading user video list page {page}',\n- headers=self._API_HEADERS, query=query)\n-\n- for video in traverse_obj(videos, ('videos', ...)):\n- yield self._parse_video_info(video, username, user_id)\n-\n- query['before_time'] = traverse_obj(videos, ('videos', -1, 'timestamp'))\n- if not query['before_time']:\n- break\n-\n- def _real_extract(self, url):\n- username = self._match_id(url)\n-\n- user_info = traverse_obj(self._download_json(\n- f'{self._API_BASE_URL}/api/users/by_username/{username}',\n- username, note='Downloading user info', headers=self._API_HEADERS), ('user', {dict})) or {}\n-\n- if user_info.get('private') and user_info.get('followed_by_me') not in (True, 'true'):\n- raise ExtractorError('This user profile is private', expected=True)\n- elif traverse_obj(user_info, (('blocked_by_user', 'blocking_user'), {bool}), get_all=False):\n- raise ExtractorError('The author of the video is blocked', expected=True)\n-\n- user_id = str_or_none(user_info.get('user_id'))\n- if not user_id:\n- raise ExtractorError('Unable to extract user ID')\n-\n- return self.playlist_result(\n- self._entries(username, user_id), user_id, username, thumbnail=user_info.get('avatar_url'))\n-\n-\n-class TrillerShortIE(InfoExtractor):\n- _VALID_URL = r'https?://v\\.triller\\.co/(?P<id>\\w+)'\n- _TESTS = [{\n- 'url': 'https://v.triller.co/WWZNWk',\n- 'md5': '5eb8dc2c971bd8cd794ec9e8d5e9d101',\n- 'info_dict': {\n- 'id': '66210052',\n- 'ext': 'mp4',\n- 'title': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\n- 'display_id': 'f4480e1f-fb4e-45b9-a44c-9e6c679ce7eb',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\n- 'uploader': 'statefairent',\n- 'uploader_id': '487545193',\n- 'creator': 'Officialย Summerย Fairย ofย LA',\n- 'timestamp': 1629655457,\n- 'upload_date': '20210822',\n- 'duration': 19,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Unknown',\n- 'track': 'Unknown',\n- 'uploader_url': 'https://triller.co/@statefairent',\n- 'comment_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- real_url = self._request_webpage(HEADRequest(url), self._match_id(url)).url\n- if self.suitable(real_url): # Prevent infinite loop in case redirect fails\n- raise UnsupportedError(real_url)\n- return self.url_result(real_url)\ndiff --git a/yt_dlp/extractor/tvplayer.py b/yt_dlp/extractor/tvplayer.py\ndeleted file mode 100644\nindex 7c47bc78e313..000000000000\n--- a/yt_dlp/extractor/tvplayer.py\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking.exceptions import HTTPError\n-from ..utils import (\n- ExtractorError,\n- extract_attributes,\n- try_get,\n- urlencode_postdata,\n-)\n-\n-\n-class TVPlayerIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?tvplayer\\.com/watch/(?P<id>[^/?#]+)'\n- _TEST = {\n- 'url': 'http://tvplayer.com/watch/bbcone',\n- 'info_dict': {\n- 'id': '89',\n- 'ext': 'mp4',\n- 'title': r're:^BBC One [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- current_channel = extract_attributes(self._search_regex(\n- r'(<div[^>]+class=\"[^\"]*current-channel[^\"]*\"[^>]*>)',\n- webpage, 'channel element'))\n- title = current_channel['data-name']\n-\n- resource_id = current_channel['data-id']\n-\n- token = self._search_regex(\n- r'data-token=([\"\\'])(?P<token>(?!\\1).+)\\1', webpage,\n- 'token', group='token')\n-\n- context = self._download_json(\n- 'https://tvplayer.com/watch/context', display_id,\n- 'Downloading JSON context', query={\n- 'resource': resource_id,\n- 'gen': token,\n- })\n-\n- validate = context['validate']\n- platform = try_get(\n- context, lambda x: x['platform']['key'], str) or 'firefox'\n-\n- try:\n- response = self._download_json(\n- 'http://api.tvplayer.com/api/v2/stream/live',\n- display_id, 'Downloading JSON stream', headers={\n- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',\n- }, data=urlencode_postdata({\n- 'id': resource_id,\n- 'service': 1,\n- 'platform': platform,\n- 'validate': validate,\n- }))['tvplayer']['response']\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError):\n- response = self._parse_json(\n- e.cause.response.read().decode(), resource_id)['tvplayer']['response']\n- raise ExtractorError(\n- '{} said: {}'.format(self.IE_NAME, response['error']), expected=True)\n- raise\n-\n- formats = self._extract_m3u8_formats(response['stream'], display_id, 'mp4')\n-\n- return {\n- 'id': resource_id,\n- 'display_id': display_id,\n- 'title': title,\n- 'formats': formats,\n- 'is_live': True,\n- }\ndiff --git a/yt_dlp/extractor/ufctv.py b/yt_dlp/extractor/ufctv.py\nindex 2c1c5e0ff15e..13b256cd3fb9 100644\n--- a/yt_dlp/extractor/ufctv.py\n+++ b/yt_dlp/extractor/ufctv.py\n@@ -5,9 +5,3 @@ class UFCTVIE(ImgGamingBaseIE):\n _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\.)?(?:ufc\\.tv|(?:ufc)?fightpass\\.com)|ufcfightpass\\.img(?:dge|gaming)\\.com'\n _NETRC_MACHINE = 'ufctv'\n _REALM = 'ufc'\n-\n-\n-class UFCArabiaIE(ImgGamingBaseIE):\n- _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\.)?ufcarabia\\.(?:ae|com)'\n- _NETRC_MACHINE = 'ufcarabia'\n- _REALM = 'admufc'\ndiff --git a/yt_dlp/extractor/uktvplay.py b/yt_dlp/extractor/uktvplay.py\ndeleted file mode 100644\nindex 9abe3436f2e2..000000000000\n--- a/yt_dlp/extractor/uktvplay.py\n+++ /dev/null\n@@ -1,36 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class UKTVPlayIE(InfoExtractor):\n- _VALID_URL = r'https?://uktvplay\\.(?:uktv\\.)?co\\.uk/(?:.+?\\?.*?\\bvideo=|([^/]+/)*)(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'https://uktvplay.uktv.co.uk/shows/world-at-war/c/200/watch-online/?video=2117008346001',\n- 'info_dict': {\n- 'id': '2117008346001',\n- 'ext': 'mp4',\n- 'title': 'Pincers',\n- 'description': 'Pincers',\n- 'uploader_id': '1242911124001',\n- 'upload_date': '20130124',\n- 'timestamp': 1359049267,\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- 'expected_warnings': ['Failed to download MPD manifest'],\n- }, {\n- 'url': 'https://uktvplay.uktv.co.uk/shows/africa/watch-online/5983349675001',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://uktvplay.co.uk/shows/hornby-a-model-world/series-1/episode-1/6276739790001?autoplaying=true',\n- 'only_matching': True,\n- }]\n- # BRIGHTCOVE_URL_TEMPLATE = 'https://players.brightcove.net/1242911124001/OrCyvJ2gyL_default/index.html?videoId=%s'\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1242911124001/H1xnMOqP_default/index.html?videoId=%s'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self.url_result(\n- self.BRIGHTCOVE_URL_TEMPLATE % video_id,\n- 'BrightcoveNew', video_id)\ndiff --git a/yt_dlp/extractor/unsupported.py b/yt_dlp/extractor/unsupported.py\nindex 1e6f8c56ed36..5d965ec3a271 100644\n--- a/yt_dlp/extractor/unsupported.py\n+++ b/yt_dlp/extractor/unsupported.py\n@@ -71,6 +71,8 @@ class KnownDRMIE(UnsupportedInfoExtractor):\n r'watch\\.telusoriginals\\.com',\n r'video\\.unext\\.jp',\n r'www\\.web\\.nhk',\n+ r'fod\\.fujitv\\.co\\.jp',\n+ r'zee5\\.com',\n )\n \n _TESTS = [{\n@@ -252,6 +254,14 @@ class KnownDRMIE(UnsupportedInfoExtractor):\n # https://github.com/yt-dlp/yt-dlp/issues/14620\n 'url': 'https://www.web.nhk/tv/an/72hours/pl/series-tep-W3W8WRN8M3/ep/QW8ZY6146V',\n 'only_matching': True,\n+ }, {\n+ # https://github.com/yt-dlp/yt-dlp/issues/7064\n+ # https://github.com/yt-dlp/yt-dlp/issues/10264\n+ 'url': 'https://fod.fujitv.co.jp/title/709f/709f130001/',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.zee5.com/',\n+ 'only_matching': True,\n }]\n \n def _real_extract(self, url):\n@@ -291,6 +301,8 @@ class KnownPiracyIE(UnsupportedInfoExtractor):\n r'einthusan\\.(?:tv|com|ca)',\n r'yourupload\\.com',\n r'xanimu\\.com',\n+ r'musicdex\\.org',\n+ r'duboku\\.io',\n )\n \n _TESTS = [{\ndiff --git a/yt_dlp/extractor/utreon.py b/yt_dlp/extractor/utreon.py\ndeleted file mode 100644\nindex fc44df97b0b3..000000000000\n--- a/yt_dlp/extractor/utreon.py\n+++ /dev/null\n@@ -1,98 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- dict_get,\n- int_or_none,\n- str_or_none,\n- try_get,\n- unified_strdate,\n- url_or_none,\n-)\n-\n-\n-class UtreonIE(InfoExtractor):\n- IE_NAME = 'playeur'\n- _VALID_URL = r'https?://(?:www\\.)?(?:utreon|playeur)\\.com/v/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://utreon.com/v/z_I7ikQbuDw',\n- 'info_dict': {\n- 'id': 'z_I7ikQbuDw',\n- 'ext': 'mp4',\n- 'title': 'Freedom Friday meditation - Rising in the wind',\n- 'description': 'md5:a9bf15a42434a062fe313b938343ad1b',\n- 'uploader': 'Heather Dawn Elemental Health',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 586,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/jerJw5EOOVU',\n- 'info_dict': {\n- 'id': 'jerJw5EOOVU',\n- 'ext': 'mp4',\n- 'title': 'When I\\'m alone, I love to reflect in peace, to make my dreams come true... [Quotes and Poems]',\n- 'description': 'md5:4026aa3a2c10169c3649926ac8ef62b6',\n- 'uploader': 'Frases e Poemas Quotes and Poems',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 60,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/C4ZxXhYBBmE',\n- 'info_dict': {\n- 'id': 'C4ZxXhYBBmE',\n- 'ext': 'mp4',\n- 'title': 'Bidenโs Capital Gains Tax Rate to Test Worldโs Highest',\n- 'description': 'md5:995aa9ad0733c0e5863ebdeff954f40e',\n- 'uploader': 'Nomad Capitalist',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 884,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/Y-stEH-FBm8',\n- 'info_dict': {\n- 'id': 'Y-stEH-FBm8',\n- 'ext': 'mp4',\n- 'title': 'Creeper-Chan Pranks Steve! ๐ [MINECRAFT ANIME]',\n- 'description': 'md5:7a48450b0d761b96dec194be0c5ecb5f',\n- 'uploader': 'Merryweather Comics',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210718',\n- 'duration': 151,\n- },\n- }, {\n- 'url': 'https://playeur.com/v/Wzqp-UrxSeu',\n- 'info_dict': {\n- 'id': 'Wzqp-UrxSeu',\n- 'ext': 'mp4',\n- 'title': 'Update: Clockwork Basilisk Books on the Way!',\n- 'description': 'md5:d9756b0b1884c904655b0e170d17cea5',\n- 'uploader': 'Forgotten Weapons',\n- 'release_date': '20240208',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'duration': 262,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- json_data = self._download_json(\n- 'https://api.playeur.com/v1/videos/' + video_id,\n- video_id)\n- videos_json = json_data['videos']\n- formats = [{\n- 'url': format_url,\n- 'format_id': format_key.split('_')[1],\n- 'height': int(format_key.split('_')[1][:-1]),\n- } for format_key, format_url in videos_json.items() if url_or_none(format_url)]\n- thumbnail = url_or_none(dict_get(json_data, ('cover_image_url', 'preview_image_url')))\n- return {\n- 'id': video_id,\n- 'title': json_data['title'],\n- 'formats': formats,\n- 'description': str_or_none(json_data.get('description')),\n- 'duration': int_or_none(json_data.get('duration')),\n- 'uploader': str_or_none(try_get(json_data, lambda x: x['channel']['title'])),\n- 'thumbnail': thumbnail,\n- 'release_date': unified_strdate(json_data.get('published_datetime')),\n- }\ndiff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\nindex 1eb25530f833..dcf48c4ccc2f 100644\n--- a/yt_dlp/extractor/vgtv.py\n+++ b/yt_dlp/extractor/vgtv.py\n@@ -1,7 +1,6 @@\n import re\n \n from .common import InfoExtractor\n-from .xstream import XstreamIE\n from ..utils import (\n ExtractorError,\n float_or_none,\n@@ -9,7 +8,8 @@\n )\n \n \n-class VGTVIE(XstreamIE): # XXX: Do not subclass from concrete IE\n+class VGTVIE(InfoExtractor):\n+ _WORKING = False\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\n _GEO_BYPASS = False\n \ndiff --git a/yt_dlp/extractor/videodetective.py b/yt_dlp/extractor/videodetective.py\ndeleted file mode 100644\nindex 7928a41c2153..000000000000\n--- a/yt_dlp/extractor/videodetective.py\n+++ /dev/null\n@@ -1,27 +0,0 @@\n-from .common import InfoExtractor\n-from .internetvideoarchive import InternetVideoArchiveIE\n-\n-\n-class VideoDetectiveIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?videodetective\\.com/[^/]+/[^/]+/(?P<id>\\d+)'\n-\n- _TEST = {\n- 'url': 'http://www.videodetective.com/movies/kick-ass-2/194487',\n- 'info_dict': {\n- 'id': '194487',\n- 'ext': 'mp4',\n- 'title': 'Kick-Ass 2',\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- query = 'customerid=69249&publishedid=' + video_id\n- return self.url_result(\n- InternetVideoArchiveIE._build_json_url(query),\n- ie=InternetVideoArchiveIE.ie_key())\ndiff --git a/yt_dlp/extractor/videofyme.py b/yt_dlp/extractor/videofyme.py\ndeleted file mode 100644\nindex 6cdda75b2f3b..000000000000\n--- a/yt_dlp/extractor/videofyme.py\n+++ /dev/null\n@@ -1,51 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n-)\n-\n-\n-class VideofyMeIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://(?:www\\.videofy\\.me/.+?|p\\.videofy\\.me/v)/(?P<id>\\d+)(&|#|$)'\n- IE_NAME = 'videofy.me'\n-\n- _TEST = {\n- 'url': 'http://www.videofy.me/thisisvideofyme/1100701',\n- 'md5': 'c77d700bdc16ae2e9f3c26019bd96143',\n- 'info_dict': {\n- 'id': '1100701',\n- 'ext': 'mp4',\n- 'title': 'This is VideofyMe',\n- 'description': '',\n- 'upload_date': '20130326',\n- 'timestamp': 1364288959,\n- 'uploader': 'VideofyMe',\n- 'uploader_id': 'thisisvideofyme',\n- 'view_count': int,\n- 'like_count': int,\n- 'comment_count': int,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- config = self._download_json(f'http://vf-player-info-loader.herokuapp.com/{video_id}.json', video_id)['videoinfo']\n-\n- video = config.get('video')\n- blog = config.get('blog', {})\n-\n- return {\n- 'id': video_id,\n- 'title': video['title'],\n- 'url': video['sources']['source']['url'],\n- 'thumbnail': video.get('thumb'),\n- 'description': video.get('description'),\n- 'timestamp': parse_iso8601(video.get('date')),\n- 'uploader': blog.get('name'),\n- 'uploader_id': blog.get('identifier'),\n- 'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),\n- 'like_count': int_or_none(video.get('likes')),\n- 'comment_count': int_or_none(video.get('nrOfComments')),\n- }\ndiff --git a/yt_dlp/extractor/videoken.py b/yt_dlp/extractor/videoken.py\nindex dc1dcf12bd86..e4d14fe48855 100644\n--- a/yt_dlp/extractor/videoken.py\n+++ b/yt_dlp/extractor/videoken.py\n@@ -1,190 +1,15 @@\n-import base64\n-import functools\n-import math\n-import re\n-import time\n import urllib.parse\n \n from .common import InfoExtractor\n from .slideslive import SlidesLiveIE\n from ..utils import (\n- ExtractorError,\n- InAdvancePagedList,\n- int_or_none,\n remove_start,\n- traverse_obj,\n update_url_query,\n url_or_none,\n )\n \n \n-class VideoKenBaseIE(InfoExtractor):\n- _ORGANIZATIONS = {\n- 'videos.icts.res.in': 'icts',\n- 'videos.cncf.io': 'cncf',\n- 'videos.neurips.cc': 'neurips',\n- }\n- _BASE_URL_RE = rf'https?://(?P<host>{\"|\".join(map(re.escape, _ORGANIZATIONS))})/'\n-\n- _PAGE_SIZE = 12\n-\n- def _get_org_id_and_api_key(self, org, video_id):\n- details = self._download_json(\n- f'https://analytics.videoken.com/api/videolake/{org}/details', video_id,\n- note='Downloading organization ID and API key', headers={\n- 'Accept': 'application/json',\n- })\n- return details['id'], details['apikey']\n-\n- def _create_slideslive_url(self, video_url, video_id, referer):\n- if not video_url and not video_id:\n- return\n- elif not video_url or 'embed/sign-in' in video_url:\n- video_url = f'https://slideslive.com/embed/{remove_start(video_id, \"slideslive-\")}'\n- if url_or_none(referer):\n- return update_url_query(video_url, {\n- 'embed_parent_url': referer,\n- 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\n- })\n- return video_url\n-\n- def _extract_videos(self, videos, url):\n- for video in traverse_obj(videos, (('videos', 'results'), ...)):\n- video_id = traverse_obj(video, 'youtube_id', 'videoid')\n- if not video_id:\n- continue\n- ie_key = None\n- if traverse_obj(video, 'type', 'source') == 'youtube':\n- video_url = video_id\n- ie_key = 'Youtube'\n- else:\n- video_url = traverse_obj(video, 'embed_url', 'embeddableurl', expected_type=url_or_none)\n- if not video_url:\n- continue\n- elif urllib.parse.urlparse(video_url).hostname == 'slideslive.com':\n- ie_key = SlidesLiveIE\n- video_url = self._create_slideslive_url(video_url, video_id, url)\n- yield self.url_result(video_url, ie_key, video_id)\n-\n-\n-class VideoKenIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:(?:topic|category)/[^/#?]+/)?video/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- # neurips -> videoken -> slideslive\n- 'url': 'https://videos.neurips.cc/video/slideslive-38922815',\n- 'info_dict': {\n- 'id': '38922815',\n- 'ext': 'mp4',\n- 'title': 'Efficient Processing of Deep Neural Network: from Algorithms to Hardware Architectures',\n- 'timestamp': 1630939331,\n- 'upload_date': '20210906',\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|png)',\n- 'thumbnails': 'count:330',\n- 'chapters': 'count:329',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\n- }, {\n- # neurips -> videoken -> slideslive -> youtube\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/video/slideslive-38923348',\n- 'info_dict': {\n- 'id': '2Xa_dt78rJE',\n- 'ext': 'mp4',\n- 'display_id': '38923348',\n- 'title': 'Machine Education',\n- 'description': 'Watch full version of this video at https://slideslive.com/38923348.',\n- 'channel': 'SlidesLive Videos - G2',\n- 'channel_id': 'UCOExahQQ588Da8Nft_Ltb9w',\n- 'channel_url': 'https://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\n- 'uploader': 'SlidesLive Videos - G2',\n- 'uploader_id': 'UCOExahQQ588Da8Nft_Ltb9w',\n- 'uploader_url': 'http://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\n- 'duration': 2504,\n- 'timestamp': 1618922125,\n- 'upload_date': '20200131',\n- 'age_limit': 0,\n- 'channel_follower_count': int,\n- 'view_count': int,\n- 'availability': 'unlisted',\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'categories': ['People & Blogs'],\n- 'tags': [],\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|webp)',\n- 'thumbnails': 'count:78',\n- 'chapters': 'count:77',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\n- }, {\n- # icts -> videoken -> youtube\n- 'url': 'https://videos.icts.res.in/topic/random%20variable/video/zysIsojYdvc',\n- 'info_dict': {\n- 'id': 'zysIsojYdvc',\n- 'ext': 'mp4',\n- 'title': 'Small-worlds, complex networks and random graphs (Lecture 3) by Remco van der Hofstad',\n- 'description': 'md5:87433069d79719eeadc1962cc2ace00b',\n- 'channel': 'International Centre for Theoretical Sciences',\n- 'channel_id': 'UCO3xnVTHzB7l-nc8mABUJIQ',\n- 'channel_url': 'https://www.youtube.com/channel/UCO3xnVTHzB7l-nc8mABUJIQ',\n- 'uploader': 'International Centre for Theoretical Sciences',\n- 'uploader_id': 'ICTStalks',\n- 'uploader_url': 'http://www.youtube.com/user/ICTStalks',\n- 'duration': 3372,\n- 'upload_date': '20191004',\n- 'age_limit': 0,\n- 'live_status': 'not_live',\n- 'availability': 'public',\n- 'playable_in_embed': True,\n- 'channel_follower_count': int,\n- 'like_count': int,\n- 'view_count': int,\n- 'categories': ['Science & Technology'],\n- 'tags': [],\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|webp)',\n- 'thumbnails': 'count:42',\n- 'chapters': 'count:20',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/category/478/video/IL4nxbmUIX8',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://videos.cncf.io/topic/kubernetes/video/YAM2d7yTrrI',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://videos.icts.res.in/video/d7HuP_abpKU',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- hostname, video_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], video_id)\n- details = self._download_json(\n- 'https://analytics.videoken.com/api/videoinfo_private', video_id, query={\n- 'videoid': video_id,\n- 'org_id': org_id,\n- }, headers={'Accept': 'application/json'}, note='Downloading VideoKen API JSON',\n- errnote='Failed to download VideoKen API JSON', fatal=False)\n- if details:\n- return next(self._extract_videos({'videos': [details]}, url))\n- # fallback for API error 400 response\n- elif video_id.startswith('slideslive-'):\n- return self.url_result(\n- self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\n- elif re.match(r'^[\\w-]{11}$', video_id):\n- return self.url_result(video_id, 'Youtube', video_id)\n- else:\n- raise ExtractorError('Unable to extract without VideoKen API response')\n-\n-\n-class VideoKenPlayerIE(VideoKenBaseIE):\n+class VideoKenPlayerIE(InfoExtractor):\n _VALID_URL = r'https?://player\\.videoken\\.com/embed/slideslive-(?P<id>\\d+)'\n _TESTS = [{\n 'url': 'https://player.videoken.com/embed/slideslive-38968434',\n@@ -203,135 +28,19 @@ class VideoKenPlayerIE(VideoKenBaseIE):\n },\n }]\n \n+ def _create_slideslive_url(self, video_url, video_id, referer):\n+ if not video_url and not video_id:\n+ return\n+ elif not video_url or 'embed/sign-in' in video_url:\n+ video_url = f'https://slideslive.com/embed/{remove_start(video_id, \"slideslive-\")}'\n+ if url_or_none(referer):\n+ return update_url_query(video_url, {\n+ 'embed_parent_url': referer,\n+ 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\n+ })\n+ return video_url\n+\n def _real_extract(self, url):\n video_id = self._match_id(url)\n return self.url_result(\n self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\n-\n-\n-class VideoKenPlaylistIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:category/\\d+/)?playlist/(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'https://videos.icts.res.in/category/1822/playlist/381',\n- 'playlist_mincount': 117,\n- 'info_dict': {\n- 'id': '381',\n- 'title': 'Cosmology - The Next Decade',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- hostname, playlist_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], playlist_id)\n- videos = self._download_json(\n- f'https://analytics.videoken.com/api/{org_id}/playlistitems/{playlist_id}/',\n- playlist_id, headers={'Accept': 'application/json'}, note='Downloading API JSON')\n- return self.playlist_result(self._extract_videos(videos, url), playlist_id, videos.get('title'))\n-\n-\n-class VideoKenCategoryIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'category/(?P<id>\\d+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://videos.icts.res.in/category/1822/',\n- 'playlist_mincount': 500,\n- 'info_dict': {\n- 'id': '1822',\n- 'title': 'Programs',\n- },\n- }, {\n- 'url': 'https://videos.neurips.cc/category/350/',\n- 'playlist_mincount': 34,\n- 'info_dict': {\n- 'id': '350',\n- 'title': 'NeurIPS 2018',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/category/479/',\n- 'playlist_mincount': 328,\n- 'info_dict': {\n- 'id': '479',\n- 'title': 'KubeCon + CloudNativeCon Europe\\'19',\n- },\n- }]\n-\n- def _get_category_page(self, category_id, org_id, page=1, note=None):\n- return self._download_json(\n- f'https://analytics.videoken.com/api/videolake/{org_id}/category_videos', category_id,\n- fatal=False, note=note if note else f'Downloading category page {page}',\n- query={\n- 'category_id': category_id,\n- 'page_number': page,\n- 'length': self._PAGE_SIZE,\n- }, headers={'Accept': 'application/json'}) or {}\n-\n- def _entries(self, category_id, org_id, url, page):\n- videos = self._get_category_page(category_id, org_id, page + 1)\n- yield from self._extract_videos(videos, url)\n-\n- def _real_extract(self, url):\n- hostname, category_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], category_id)\n- category_info = self._get_category_page(category_id, org_id, note='Downloading category info')\n- category = category_info['category_name']\n- total_pages = math.ceil(int(category_info['recordsTotal']) / self._PAGE_SIZE)\n- return self.playlist_result(InAdvancePagedList(\n- functools.partial(self._entries, category_id, org_id, url),\n- total_pages, self._PAGE_SIZE), category_id, category)\n-\n-\n-class VideoKenTopicIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'topic/(?P<id>[^/#?]+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/',\n- 'playlist_mincount': 500,\n- 'info_dict': {\n- 'id': 'machine_learning',\n- 'title': 'machine learning',\n- },\n- }, {\n- 'url': 'https://videos.icts.res.in/topic/gravitational%20waves/',\n- 'playlist_mincount': 77,\n- 'info_dict': {\n- 'id': 'gravitational_waves',\n- 'title': 'gravitational waves',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/topic/prometheus/',\n- 'playlist_mincount': 134,\n- 'info_dict': {\n- 'id': 'prometheus',\n- 'title': 'prometheus',\n- },\n- }]\n-\n- def _get_topic_page(self, topic, org_id, search_id, api_key, page=1, note=None):\n- return self._download_json(\n- 'https://es.videoken.com/api/v1.0/get_results', topic, fatal=False, query={\n- 'orgid': org_id,\n- 'size': self._PAGE_SIZE,\n- 'query': topic,\n- 'page': page,\n- 'sort': 'upload_desc',\n- 'filter': 'all',\n- 'token': api_key,\n- 'is_topic': 'true',\n- 'category': '',\n- 'searchid': search_id,\n- }, headers={'Accept': 'application/json'},\n- note=note if note else f'Downloading topic page {page}') or {}\n-\n- def _entries(self, topic, org_id, search_id, api_key, url, page):\n- videos = self._get_topic_page(topic, org_id, search_id, api_key, page + 1)\n- yield from self._extract_videos(videos, url)\n-\n- def _real_extract(self, url):\n- hostname, topic_id = self._match_valid_url(url).group('host', 'id')\n- topic = urllib.parse.unquote(topic_id)\n- topic_id = topic.replace(' ', '_')\n- org_id, api_key = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], topic)\n- search_id = base64.b64encode(f':{topic}:{int(time.time())}:transient'.encode()).decode()\n- total_pages = int_or_none(self._get_topic_page(\n- topic, org_id, search_id, api_key, note='Downloading topic info')['total_no_of_pages'])\n- return self.playlist_result(InAdvancePagedList(\n- functools.partial(self._entries, topic, org_id, search_id, api_key, url),\n- total_pages, self._PAGE_SIZE), topic_id, topic)\ndiff --git a/yt_dlp/extractor/videomore.py b/yt_dlp/extractor/videomore.py\ndeleted file mode 100644\nindex c41d3d984553..000000000000\n--- a/yt_dlp/extractor/videomore.py\n+++ /dev/null\n@@ -1,304 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_qs,\n-)\n-\n-\n-class VideomoreBaseIE(InfoExtractor):\n- _API_BASE_URL = 'https://more.tv/api/v3/web/'\n- _VALID_URL_BASE = r'https?://(?:videomore\\.ru|more\\.tv)/'\n-\n- def _download_page_data(self, display_id):\n- return self._download_json(\n- self._API_BASE_URL + 'PageData', display_id, query={\n- 'url': '/' + display_id,\n- })['attributes']['response']['data']\n-\n- def _track_url_result(self, track):\n- track_vod = track['trackVod']\n- video_url = track_vod.get('playerLink') or track_vod['link']\n- return self.url_result(\n- video_url, VideomoreIE.ie_key(), track_vod.get('hubId'))\n-\n-\n-class VideomoreIE(InfoExtractor):\n- IE_NAME = 'videomore'\n- _VALID_URL = r'''(?x)\n- videomore:(?P<sid>\\d+)$|\n- https?://\n- (?:\n- videomore\\.ru/\n- (?:\n- embed|\n- [^/]+/[^/]+\n- )/|\n- (?:\n- (?:player\\.)?videomore\\.ru|\n- siren\\.more\\.tv/player\n- )/[^/]*\\?.*?\\btrack_id=|\n- odysseus\\.more.tv/player/(?P<partner_id>\\d+)/\n- )\n- (?P<id>\\d+)\n- (?:[/?#&]|\\.(?:xml|json)|$)\n- '''\n- _EMBED_REGEX = [r'''(?x)\n- (?:\n- <iframe[^>]+src=([\\'\"])|\n- <object[^>]+data=([\"\\'])https?://videomore\\.ru/player\\.swf\\?.*config=\n- )(?P<url>https?://videomore\\.ru/[^?#\"']+/\\d+(?:\\.xml)?)\n- ''']\n- _TESTS = [{\n- 'url': 'http://videomore.ru/kino_v_detalayah/5_sezon/367617',\n- 'md5': '44455a346edc0d509ac5b5a5b531dc35',\n- 'info_dict': {\n- 'id': '367617',\n- 'ext': 'flv',\n- 'title': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
5 ัะตะทะพะฝ ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\n- 'series': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
',\n- 'episode': 'ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2910,\n- 'view_count': int,\n- 'comment_count': int,\n- 'age_limit': 16,\n- },\n- 'skip': 'The video is not available for viewing.',\n- }, {\n- 'url': 'http://videomore.ru/embed/259974',\n- 'info_dict': {\n- 'id': '259974',\n- 'ext': 'mp4',\n- 'title': 'ะะพะปะพะดะตะถะบะฐ 2 ัะตะทะพะฝ 40 ัะตัะธั',\n- 'series': 'ะะพะปะพะดะตะถะบะฐ',\n- 'season': '2 ัะตะทะพะฝ',\n- 'episode': '40 ัะตัะธั',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2789,\n- 'view_count': int,\n- 'age_limit': 16,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo/341073',\n- 'info_dict': {\n- 'id': '341073',\n- 'ext': 'flv',\n- 'title': 'ะัะพะผะพ ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\n- 'episode': 'ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 29,\n- 'age_limit': 16,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'The video is not available for viewing.',\n- }, {\n- 'url': 'http://videomore.ru/elki_3?track_id=364623',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/embed/364623',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/364623.xml',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/364623.json',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/158031/quotes/33248',\n- 'only_matching': True,\n- }, {\n- 'url': 'videomore:367617',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://player.videomore.ru/?partner_id=97&track_id=736234&autoplay=0&userToken=',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://odysseus.more.tv/player/1788/352317',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://siren.more.tv/player/config?track_id=352317&partner_id=1788&user_token=',\n- 'only_matching': True,\n- }]\n- _GEO_BYPASS = False\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('sid') or mobj.group('id')\n- partner_id = mobj.group('partner_id') or parse_qs(url).get('partner_id', [None])[0] or '97'\n-\n- item = self._download_json(\n- 'https://siren.more.tv/player/config', video_id, query={\n- 'partner_id': partner_id,\n- 'track_id': video_id,\n- })['data']['playlist']['items'][0]\n-\n- title = item.get('title')\n- series = item.get('project_name')\n- season = item.get('season_name')\n- episode = item.get('episode_name')\n- if not title:\n- title = []\n- for v in (series, season, episode):\n- if v:\n- title.append(v)\n- title = ' '.join(title)\n-\n- streams = item.get('streams') or []\n- for protocol in ('DASH', 'HLS'):\n- stream_url = item.get(protocol.lower() + '_url')\n- if stream_url:\n- streams.append({'protocol': protocol, 'url': stream_url})\n-\n- formats = []\n- for stream in streams:\n- stream_url = stream.get('url')\n- if not stream_url:\n- continue\n- protocol = stream.get('protocol')\n- if protocol == 'DASH':\n- formats.extend(self._extract_mpd_formats(\n- stream_url, video_id, mpd_id='dash', fatal=False))\n- elif protocol == 'HLS':\n- formats.extend(self._extract_m3u8_formats(\n- stream_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n- elif protocol == 'MSS':\n- formats.extend(self._extract_ism_formats(\n- stream_url, video_id, ism_id='mss', fatal=False))\n-\n- if not formats:\n- error = item.get('error')\n- if error:\n- if error in ('ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะฝะตะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ะฝะฐ ัะตััะธัะพัะธะธ ััะพะน ัััะฐะฝั', 'ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ัะพะปัะบะพ ะฝะฐ ัะตััะธัะพัะธะธ ะ ะพััะธะธ'):\n- self.raise_geo_restricted(countries=['RU'], metadata_available=True)\n- self.raise_no_formats(error, expected=True)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'series': series,\n- 'season': season,\n- 'episode': episode,\n- 'thumbnail': item.get('thumbnail_url'),\n- 'duration': int_or_none(item.get('duration')),\n- 'view_count': int_or_none(item.get('views')),\n- 'age_limit': int_or_none(item.get('min_age')),\n- 'formats': formats,\n- }\n-\n-\n-class VideomoreVideoIE(VideomoreBaseIE):\n- IE_NAME = 'videomore:video'\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?P<id>(?:(?:[^/]+/){2})?[^/?#&]+)(?:/*|[?#&].*?)$'\n- _TESTS = [{\n- # single video with og:video:iframe\n- 'url': 'http://videomore.ru/elki_3',\n- 'info_dict': {\n- 'id': '364623',\n- 'ext': 'flv',\n- 'title': 'ะะปะบะธ 3',\n- 'description': '',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 5579,\n- 'age_limit': 6,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Requires logging in',\n- }, {\n- # season single series with og:video:iframe\n- 'url': 'http://videomore.ru/poslednii_ment/1_sezon/14_seriya',\n- 'info_dict': {\n- 'id': '352317',\n- 'ext': 'mp4',\n- 'title': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั 1 ัะตะทะพะฝ 14 ัะตัะธั',\n- 'series': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั',\n- 'season': '1 ัะตะทะพะฝ',\n- 'episode': '14 ัะตัะธั',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2464,\n- 'age_limit': 16,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'http://videomore.ru/sejchas_v_seti/serii_221-240/226_vypusk',\n- 'only_matching': True,\n- }, {\n- # single video without og:video:iframe\n- 'url': 'http://videomore.ru/marin_i_ego_druzya',\n- 'info_dict': {\n- 'id': '359073',\n- 'ext': 'flv',\n- 'title': '1 ัะตัะธั. ะะดัะฐะฒััะฒัะน, ะะบะฒะฐะฒะธะปะปั!',\n- 'description': 'md5:c6003179538b5d353e7bcd5b1372b2d7',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 754,\n- 'age_limit': 6,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'redirects to https://more.tv/',\n- }, {\n- 'url': 'https://videomore.ru/molodezhka/6_sezon/29_seriya?utm_so',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://more.tv/poslednii_ment/1_sezon/14_seriya',\n- 'only_matching': True,\n- }]\n-\n- @classmethod\n- def suitable(cls, url):\n- return False if VideomoreIE.suitable(url) else super().suitable(url)\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- return self._track_url_result(self._download_page_data(display_id))\n-\n-\n-class VideomoreSeasonIE(VideomoreBaseIE):\n- IE_NAME = 'videomore:season'\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?!embed)(?P<id>[^/]+/[^/?#&]+)(?:/*|[?#&].*?)$'\n- _TESTS = [{\n- 'url': 'http://videomore.ru/molodezhka/film_o_filme',\n- 'info_dict': {\n- 'id': 'molodezhka/film_o_filme',\n- 'title': 'ะคะธะปัะผ ะพ ัะธะปัะผะต',\n- },\n- 'playlist_mincount': 3,\n- }, {\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo?utm_so',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://more.tv/molodezhka/film_o_filme',\n- 'only_matching': True,\n- }]\n-\n- @classmethod\n- def suitable(cls, url):\n- return (False if (VideomoreIE.suitable(url) or VideomoreVideoIE.suitable(url))\n- else super().suitable(url))\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- season = self._download_page_data(display_id)\n- season_id = str(season['id'])\n- tracks = self._download_json(\n- self._API_BASE_URL + f'seasons/{season_id}/tracks',\n- season_id)['data']\n- entries = []\n- for track in tracks:\n- entries.append(self._track_url_result(track))\n- return self.playlist_result(entries, display_id, season.get('title'))\ndiff --git a/yt_dlp/extractor/vimm.py b/yt_dlp/extractor/vimm.py\ndeleted file mode 100644\nindex 7097149a5528..000000000000\n--- a/yt_dlp/extractor/vimm.py\n+++ /dev/null\n@@ -1,66 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class VimmIE(InfoExtractor):\n- IE_NAME = 'Vimm:stream'\n- _VALID_URL = r'https?://(?:www\\.)?vimm\\.tv/(?:c/)?(?P<id>[0-9a-z-]+)$'\n- _TESTS = [{\n- 'url': 'https://www.vimm.tv/c/calimeatwagon',\n- 'info_dict': {\n- 'id': 'calimeatwagon',\n- 'ext': 'mp4',\n- 'title': 're:^calimeatwagon [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- 'live_status': 'is_live',\n- },\n- 'skip': 'Live',\n- }, {\n- 'url': 'https://www.vimm.tv/octaafradio',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- channel_id = self._match_id(url)\n-\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\n- f'https://www.vimm.tv/hls/{channel_id}.m3u8', channel_id, 'mp4', m3u8_id='hls', live=True)\n-\n- return {\n- 'id': channel_id,\n- 'title': channel_id,\n- 'is_live': True,\n- 'formats': formats,\n- 'subtitles': subs,\n- }\n-\n-\n-class VimmRecordingIE(InfoExtractor):\n- IE_NAME = 'Vimm:recording'\n- _VALID_URL = r'https?://(?:www\\.)?vimm\\.tv/c/(?P<channel_id>[0-9a-z-]+)\\?v=(?P<video_id>[0-9A-Za-z]+)'\n- _TESTS = [{\n- 'url': 'https://www.vimm.tv/c/kaldewei?v=2JZsrPTFxsSz',\n- 'md5': '15122ee95baa32a548e4a3e120b598f1',\n- 'info_dict': {\n- 'id': '2JZsrPTFxsSz',\n- 'ext': 'mp4',\n- 'title': 'VIMM - [DE/GER] Kaldewei Live - In Farbe und Bunt',\n- 'uploader_id': 'kaldewei',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- channel_id, video_id = self._match_valid_url(url).groups()\n-\n- webpage = self._download_webpage(url, video_id)\n- title = self._og_search_title(webpage)\n-\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\n- f'https://d211qfrkztakg3.cloudfront.net/{channel_id}/{video_id}/index.m3u8', video_id, 'mp4', m3u8_id='hls', live=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'is_live': False,\n- 'uploader_id': channel_id,\n- 'formats': formats,\n- 'subtitles': subs,\n- }\ndiff --git a/yt_dlp/extractor/vodpl.py b/yt_dlp/extractor/vodpl.py\ndeleted file mode 100644\nindex 8af1572d074f..000000000000\n--- a/yt_dlp/extractor/vodpl.py\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-from .onet import OnetBaseIE\n-\n-\n-class VODPlIE(OnetBaseIE):\n- _VALID_URL = r'https?://vod\\.pl/(?:[^/]+/)+(?P<id>[0-9a-zA-Z]+)'\n-\n- _TESTS = [{\n- 'url': 'https://vod.pl/filmy/chlopaki-nie-placza/3ep3jns',\n- 'md5': 'a7dc3b2f7faa2421aefb0ecaabf7ec74',\n- 'info_dict': {\n- 'id': '3ep3jns',\n- 'ext': 'mp4',\n- 'title': 'Chลopaki nie pลaczฤ
',\n- 'description': 'md5:f5f03b84712e55f5ac9f0a3f94445224',\n- 'timestamp': 1463415154,\n- 'duration': 5765,\n- 'upload_date': '20160516',\n- },\n- }, {\n- 'url': 'https://vod.pl/seriale/belfer-na-planie-praca-kamery-online/2c10heh',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- info_dict = self._extract_from_id(self._search_mvp_id(webpage), webpage)\n- info_dict['id'] = video_id\n- return info_dict\ndiff --git a/yt_dlp/extractor/vuclip.py b/yt_dlp/extractor/vuclip.py\ndeleted file mode 100644\nindex ad7eab351e3b..000000000000\n--- a/yt_dlp/extractor/vuclip.py\n+++ /dev/null\n@@ -1,66 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n- remove_end,\n-)\n-\n-\n-class VuClipIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:m\\.)?vuclip\\.com/w\\?.*?cid=(?P<id>[0-9]+)'\n-\n- _TEST = {\n- 'url': 'http://m.vuclip.com/w?cid=1129900602&bu=8589892792&frm=w&z=34801&op=0&oc=843169247§ion=recommend',\n- 'info_dict': {\n- 'id': '1129900602',\n- 'ext': '3gp',\n- 'title': 'Top 10 TV Convicts',\n- 'duration': 733,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- ad_m = re.search(\n- r'''value=\"No.*?\" onClick=\"location.href='([^\"']+)'\"''', webpage)\n- if ad_m:\n- urlr = urllib.parse.urlparse(url)\n- adfree_url = urlr.scheme + '://' + urlr.netloc + ad_m.group(1)\n- webpage = self._download_webpage(\n- adfree_url, video_id, note='Download post-ad page')\n-\n- error_msg = self._html_search_regex(\n- r'<p class=\"message\">(.*?)</p>', webpage, 'error message',\n- default=None)\n- if error_msg:\n- raise ExtractorError(\n- f'{self.IE_NAME} said: {error_msg}', expected=True)\n-\n- # These clowns alternate between two page types\n- video_url = self._search_regex(\n- r'<a[^>]+href=\"([^\"]+)\"[^>]*><img[^>]+src=\"[^\"]*/play\\.gif',\n- webpage, 'video URL', default=None)\n- if video_url:\n- formats = [{\n- 'url': video_url,\n- }]\n- else:\n- formats = self._parse_html5_media_entries(url, webpage, video_id)[0]['formats']\n-\n- title = remove_end(self._html_search_regex(\n- r'<title>(.*?)-\\s*Vuclip</title>', webpage, 'title').strip(), ' - Video')\n-\n- duration = parse_duration(self._html_search_regex(\n- r'[(>]([0-9]+:[0-9]+)(?:<span|\\))', webpage, 'duration', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'title': title,\n- 'duration': duration,\n- }\ndiff --git a/yt_dlp/extractor/vvvvid.py b/yt_dlp/extractor/vvvvid.py\ndeleted file mode 100644\nindex 4671bcd1f43d..000000000000\n--- a/yt_dlp/extractor/vvvvid.py\n+++ /dev/null\n@@ -1,336 +0,0 @@\n-import functools\n-import re\n-\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- str_or_none,\n-)\n-\n-\n-class VVVVIDIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://(?:www\\.)?vvvvid\\.it/(?:#!)?(?:show|anime|film|series)/'\n- _VALID_URL = rf'{_VALID_URL_BASE}(?P<show_id>\\d+)/[^/]+/(?P<season_id>\\d+)/(?P<id>[0-9]+)'\n- _TESTS = [{\n- # video_type == 'video/vvvvid'\n- 'url': 'https://www.vvvvid.it/show/498/the-power-of-computing/518/505692/playstation-vr-cambiera-il-nostro-modo-di-giocare',\n- 'info_dict': {\n- 'id': '505692',\n- 'ext': 'mp4',\n- 'title': 'Playstation VR cambierร il nostro modo di giocare',\n- 'duration': 93,\n- 'series': 'The Power of Computing',\n- 'season_id': '518',\n- 'episode': 'Playstation VR cambierร il nostro modo di giocare',\n- 'episode_id': '4747',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'thumbnail': 'https://static.vvvvid.it/img/zoomin/28CA2409-E663-34F0-2B02E72356556EA3_500k.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # video_type == 'video/rcs'\n- 'url': 'https://www.vvvvid.it/#!show/376/death-note-live-action/377/482493/episodio-01',\n- 'info_dict': {\n- 'id': '482493',\n- 'ext': 'mp4',\n- 'title': 'Episodio 01',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Every video/rcs is not working even in real website',\n- }, {\n- # video_type == 'video/youtube'\n- 'url': 'https://www.vvvvid.it/show/404/one-punch-man/406/486683/trailer',\n- 'md5': '33e0edfba720ad73a8782157fdebc648',\n- 'info_dict': {\n- 'id': 'RzmFKUDOUgw',\n- 'ext': 'mp4',\n- 'title': 'Trailer',\n- 'upload_date': '20150906',\n- 'description': 'md5:a5e802558d35247fee285875328c0b80',\n- 'uploader_id': '@EMOTIONLabelChannel',\n- 'uploader': 'EMOTION Label Channel',\n- 'episode_id': '3115',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'availability': str,\n- 'categories': list,\n- 'age_limit': 0,\n- 'channel': 'EMOTION Label Channel',\n- 'channel_follower_count': int,\n- 'channel_id': 'UCQ5URCSs1f5Cz9rh-cDGxNQ',\n- 'channel_url': 'https://www.youtube.com/channel/UCQ5URCSs1f5Cz9rh-cDGxNQ',\n- 'comment_count': int,\n- 'duration': 133,\n- 'episode': 'Trailer',\n- 'heatmap': list,\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'season_id': '406',\n- 'series': 'One-Punch Man',\n- 'tags': list,\n- 'uploader_url': 'https://www.youtube.com/@EMOTIONLabelChannel',\n- 'thumbnail': 'https://i.ytimg.com/vi/RzmFKUDOUgw/maxresdefault.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # video_type == 'video/dash'\n- 'url': 'https://www.vvvvid.it/show/844/le-bizzarre-avventure-di-jojo-vento-aureo/938/527551/golden-wind',\n- 'info_dict': {\n- 'id': '527551',\n- 'ext': 'mp4',\n- 'title': 'Golden Wind',\n- 'duration': 1430,\n- 'series': 'Le bizzarre avventure di Jojo - Vento Aureo',\n- 'season_id': '938',\n- 'episode': 'Golden Wind',\n- 'episode_number': 1,\n- 'episode_id': '9089',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'thumbnail': 'https://static.vvvvid.it/img/thumbs/Dynit/Jojo/Jojo_S05Ep01-t.jpg',\n- 'season': 'Season 5',\n- 'season_number': 5,\n- },\n- 'params': {\n- 'skip_download': True,\n- 'format': 'mp4',\n- },\n- }, {\n- 'url': 'https://www.vvvvid.it/show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048',\n- 'only_matching': True,\n- }]\n- _conn_id = None\n-\n- @functools.cached_property\n- def _headers(self):\n- return {\n- **self.geo_verification_headers(),\n- 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.37',\n- }\n-\n- def _real_initialize(self):\n- self._conn_id = self._download_json(\n- 'https://www.vvvvid.it/user/login',\n- None, headers=self._headers)['data']['conn_id']\n-\n- def _download_info(self, show_id, path, video_id, fatal=True, query=None):\n- q = {\n- 'conn_id': self._conn_id,\n- }\n- if query:\n- q.update(query)\n- response = self._download_json(\n- f'https://www.vvvvid.it/vvvvid/ondemand/{show_id}/{path}',\n- video_id, headers=self._headers, query=q, fatal=fatal)\n- if not (response or fatal):\n- return\n- if response.get('result') == 'error':\n- raise ExtractorError('{} said: {}'.format(\n- self.IE_NAME, response['message']), expected=True)\n- return response['data']\n-\n- def _extract_common_video_info(self, video_data):\n- return {\n- 'thumbnail': video_data.get('thumbnail'),\n- 'episode_id': str_or_none(video_data.get('id')),\n- }\n-\n- def _real_extract(self, url):\n- show_id, season_id, video_id = self._match_valid_url(url).groups()\n-\n- response = self._download_info(\n- show_id, f'season/{season_id}',\n- video_id, query={'video_id': video_id})\n-\n- vid = int(video_id)\n- video_data = next(filter(\n- lambda episode: episode.get('video_id') == vid, response))\n- title = video_data['title']\n- formats = []\n-\n- # vvvvid embed_info decryption algorithm is reverse engineered from function $ds(h) at vvvvid.js\n- def ds(h):\n- g = 'MNOPIJKL89+/4567UVWXQRSTEFGHABCDcdefYZabstuvopqr0123wxyzklmnghij'\n-\n- def f(m):\n- l = []\n- o = 0\n- b = False\n- m_len = len(m)\n- while ((not b) and o < m_len):\n- n = m[o] << 2\n- o += 1\n- k = -1\n- j = -1\n- if o < m_len:\n- n += m[o] >> 4\n- o += 1\n- if o < m_len:\n- k = (m[o - 1] << 4) & 255\n- k += m[o] >> 2\n- o += 1\n- if o < m_len:\n- j = (m[o - 1] << 6) & 255\n- j += m[o]\n- o += 1\n- else:\n- b = True\n- else:\n- b = True\n- else:\n- b = True\n- l.append(n)\n- if k != -1:\n- l.append(k)\n- if j != -1:\n- l.append(j)\n- return l\n-\n- c = []\n- for e in h:\n- c.append(g.index(e))\n-\n- c_len = len(c)\n- for e in range(c_len * 2 - 1, -1, -1):\n- a = c[e % c_len] ^ c[(e + 1) % c_len]\n- c[e % c_len] = a\n-\n- c = f(c)\n- d = ''\n- for e in c:\n- d += chr(e)\n-\n- return d\n-\n- info = {}\n-\n- def metadata_from_url(r_url):\n- if not info and r_url:\n- mobj = re.search(r'_(?:S(\\d+))?Ep(\\d+)', r_url)\n- if mobj:\n- info['episode_number'] = int(mobj.group(2))\n- season_number = mobj.group(1)\n- if season_number:\n- info['season_number'] = int(season_number)\n-\n- video_type = video_data.get('video_type')\n- is_youtube = False\n- for quality in ('', '_sd'):\n- embed_code = video_data.get('embed_info' + quality)\n- if not embed_code:\n- continue\n- embed_code = ds(embed_code)\n- if video_type == 'video/kenc':\n- embed_code = re.sub(r'https?(://[^/]+)/z/', r'https\\1/i/', embed_code).replace('/manifest.f4m', '/master.m3u8')\n- kenc = self._download_json(\n- 'https://www.vvvvid.it/kenc', video_id, query={\n- 'action': 'kt',\n- 'conn_id': self._conn_id,\n- 'url': embed_code,\n- }, fatal=False) or {}\n- kenc_message = kenc.get('message')\n- if kenc_message:\n- embed_code += '?' + ds(kenc_message)\n- formats.extend(self._extract_m3u8_formats(\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- elif video_type == 'video/rcs':\n- formats.extend(self._extract_akamai_formats(embed_code, video_id))\n- elif video_type == 'video/youtube':\n- info.update({\n- '_type': 'url_transparent',\n- 'ie_key': YoutubeIE.ie_key(),\n- 'url': embed_code,\n- })\n- is_youtube = True\n- break\n- elif video_type == 'video/dash':\n- formats.extend(self._extract_m3u8_formats(\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- else:\n- formats.extend(self._extract_wowza_formats(\n- f'http://sb.top-ix.org/videomg/_definst_/mp4:{embed_code}/playlist.m3u8', video_id, skip_protocols=['f4m']))\n- metadata_from_url(embed_code)\n-\n- if not is_youtube:\n- info['formats'] = formats\n-\n- metadata_from_url(video_data.get('thumbnail'))\n- info.update(self._extract_common_video_info(video_data))\n- info.update({\n- 'id': video_id,\n- 'title': title,\n- 'duration': int_or_none(video_data.get('length')),\n- 'series': video_data.get('show_title'),\n- 'season_id': season_id,\n- 'episode': title,\n- 'view_count': int_or_none(video_data.get('views')),\n- 'like_count': int_or_none(video_data.get('video_likes')),\n- 'repost_count': int_or_none(video_data.get('video_shares')),\n- })\n- return info\n-\n-\n-class VVVVIDShowIE(VVVVIDIE): # XXX: Do not subclass from concrete IE\n- _VALID_URL = rf'(?P<base_url>{VVVVIDIE._VALID_URL_BASE}(?P<id>\\d+)(?:/(?P<show_title>[^/?&#]+))?)/?(?:[?#&]|$)'\n- _TESTS = [{\n- 'url': 'https://www.vvvvid.it/show/156/psyco-pass',\n- 'info_dict': {\n- 'id': '156',\n- 'title': 'Psycho-Pass',\n- 'description': 'md5:94d572c0bd85894b193b8aebc9a3a806',\n- },\n- 'playlist_count': 46,\n- }, {\n- 'url': 'https://www.vvvvid.it/show/156',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- base_url, show_id, show_title = self._match_valid_url(url).groups()\n-\n- seasons = self._download_info(\n- show_id, 'seasons/', show_title)\n-\n- show_info = self._download_info(\n- show_id, 'info/', show_title, fatal=False)\n-\n- if not show_title:\n- base_url += '/title'\n-\n- entries = []\n- for season in (seasons or []):\n- episodes = season.get('episodes') or []\n- playlist_title = season.get('name') or show_info.get('title')\n- for episode in episodes:\n- if episode.get('playable') is False:\n- continue\n- season_id = str_or_none(episode.get('season_id'))\n- video_id = str_or_none(episode.get('video_id'))\n- if not (season_id and video_id):\n- continue\n- info = self._extract_common_video_info(episode)\n- info.update({\n- '_type': 'url_transparent',\n- 'ie_key': VVVVIDIE.ie_key(),\n- 'url': '/'.join([base_url, season_id, video_id]),\n- 'title': episode.get('title'),\n- 'description': episode.get('description'),\n- 'season_id': season_id,\n- 'playlist_title': playlist_title,\n- })\n- entries.append(info)\n-\n- return self.playlist_result(\n- entries, show_id, show_info.get('title'), show_info.get('description'))\ndiff --git a/yt_dlp/extractor/wdr.py b/yt_dlp/extractor/wdr.py\nindex 1c1f0ed0526f..d906605d19aa 100644\n--- a/yt_dlp/extractor/wdr.py\n+++ b/yt_dlp/extractor/wdr.py\n@@ -347,35 +347,3 @@ def _real_extract(self, url):\n raise ExtractorError(\n f'{display_id} is not a video', expected=True)\n return self.url_result(zmdb_url_element.text, ie=WDRIE.ie_key())\n-\n-\n-class WDRMobileIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://mobile-ondemand\\.wdr\\.de/\n- .*?/fsk(?P<age_limit>[0-9]+)\n- /[0-9]+/[0-9]+/\n- (?P<id>[0-9]+)_(?P<title>[0-9]+)'''\n- IE_NAME = 'wdr:mobile'\n- _WORKING = False # no such domain\n- _TEST = {\n- 'url': 'http://mobile-ondemand.wdr.de/CMS2010/mdb/ondemand/weltweit/fsk0/42/421735/421735_4283021.mp4',\n- 'info_dict': {\n- 'title': '4283021',\n- 'id': '421735',\n- 'ext': 'mp4',\n- 'age_limit': 0,\n- },\n- 'skip': 'Problems with loading data.',\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- return {\n- 'id': mobj.group('id'),\n- 'title': mobj.group('title'),\n- 'age_limit': int(mobj.group('age_limit')),\n- 'url': url,\n- 'http_headers': {\n- 'User-Agent': 'mobile',\n- },\n- }\ndiff --git a/yt_dlp/extractor/weyyak.py b/yt_dlp/extractor/weyyak.py\ndeleted file mode 100644\nindex ef12be871fc7..000000000000\n--- a/yt_dlp/extractor/weyyak.py\n+++ /dev/null\n@@ -1,86 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- parse_age_limit,\n- traverse_obj,\n- unified_timestamp,\n- url_or_none,\n-)\n-\n-\n-class WeyyakIE(InfoExtractor):\n- _VALID_URL = r'https?://weyyak\\.com/(?P<lang>\\w+)/(?:player/)?(?P<type>episode|movie)/(?P<id>\\d+)'\n- _TESTS = [\n- {\n- 'url': 'https://weyyak.com/en/player/episode/1341952/Ribat-Al-Hob-Episode49',\n- 'md5': '0caf55c1a615531c8fe60f146ae46849',\n- 'info_dict': {\n- 'id': '1341952',\n- 'ext': 'mp4',\n- 'title': 'Ribat Al Hob',\n- 'duration': 2771,\n- 'alt_title': 'ุฑุจุงุท ุงูุญุจ',\n- 'season': 'Season 1',\n- 'season_number': 1,\n- 'episode': 'Episode 49',\n- 'episode_number': 49,\n- 'timestamp': 1485907200,\n- 'upload_date': '20170201',\n- 'thumbnail': r're:^https://content\\.weyyak\\.com/.+/poster-image',\n- 'categories': ['Drama', 'Thrillers', 'Romance'],\n- 'tags': 'count:8',\n- },\n- },\n- {\n- 'url': 'https://weyyak.com/en/movie/233255/8-Seconds',\n- 'md5': 'fe740ae0f63e4d1c8a7fc147a410c564',\n- 'info_dict': {\n- 'id': '233255',\n- 'ext': 'mp4',\n- 'title': '8 Seconds',\n- 'duration': 6490,\n- 'alt_title': '8 ุซูุงูู',\n- 'description': 'md5:45b83a155c30b49950624c7e99600b9d',\n- 'age_limit': 15,\n- 'release_year': 2015,\n- 'timestamp': 1683106031,\n- 'upload_date': '20230503',\n- 'thumbnail': r're:^https://content\\.weyyak\\.com/.+/poster-image',\n- 'categories': ['Drama', 'Social'],\n- 'cast': ['Ceylin Adiyaman', 'Esra Inal'],\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- video_id, lang, type_ = self._match_valid_url(url).group('id', 'lang', 'type')\n-\n- path = 'episode/' if type_ == 'episode' else 'contents/moviedetails?contentkey='\n- data = self._download_json(\n- f'https://msapifo-prod-me.weyyak.z5.com/v1/{lang}/{path}{video_id}', video_id)['data']\n- m3u8_url = self._download_json(\n- f'https://api-weyyak.akamaized.net/get_info/{data[\"video_id\"]}',\n- video_id, 'Extracting video details')['url_video']\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id)\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- **traverse_obj(data, {\n- 'title': ('title', {str}),\n- 'alt_title': ('translated_title', {str}),\n- 'description': ('synopsis', {str}),\n- 'duration': ('length', {float_or_none}),\n- 'age_limit': ('age_rating', {parse_age_limit}),\n- 'season_number': ('season_number', {int_or_none}),\n- 'episode_number': ('episode_number', {int_or_none}),\n- 'thumbnail': ('imagery', 'thumbnail', {url_or_none}),\n- 'categories': ('genres', ..., {str}),\n- 'tags': ('tags', ..., {str}),\n- 'cast': (('main_actor', 'main_actress'), {str}),\n- 'timestamp': ('insertedAt', {unified_timestamp}),\n- 'release_year': ('production_year', {int_or_none}),\n- }),\n- }\ndiff --git a/yt_dlp/extractor/xstream.py b/yt_dlp/extractor/xstream.py\ndeleted file mode 100644\nindex f7b48322cdf6..000000000000\n--- a/yt_dlp/extractor/xstream.py\n+++ /dev/null\n@@ -1,114 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- find_xpath_attr,\n- int_or_none,\n- parse_iso8601,\n- xpath_text,\n- xpath_with_ns,\n-)\n-\n-\n-class XstreamIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- (?:\n- xstream:|\n- https?://frontend\\.xstream\\.(?:dk|net)/\n- )\n- (?P<partner_id>[^/]+)\n- (?:\n- :|\n- /feed/video/\\?.*?\\bid=\n- )\n- (?P<id>\\d+)\n- '''\n- _TESTS = [{\n- 'url': 'http://frontend.xstream.dk/btno/feed/video/?platform=web&id=86588',\n- 'md5': 'd7d17e3337dc80de6d3a540aefbe441b',\n- 'info_dict': {\n- 'id': '86588',\n- 'ext': 'mov',\n- 'title': 'Otto Wollertsen',\n- 'description': 'Vestlendingen Otto Fredrik Wollertsen',\n- 'timestamp': 1430473209,\n- 'upload_date': '20150501',\n- },\n- }, {\n- 'url': 'http://frontend.xstream.dk/ap/feed/video/?platform=web&id=21039',\n- 'only_matching': True,\n- }]\n-\n- def _extract_video_info(self, partner_id, video_id):\n- data = self._download_xml(\n- f'http://frontend.xstream.dk/{partner_id}/feed/video/?platform=web&id={video_id}',\n- video_id)\n-\n- NS_MAP = {\n- 'atom': 'http://www.w3.org/2005/Atom',\n- 'xt': 'http://xstream.dk/',\n- 'media': 'http://search.yahoo.com/mrss/',\n- }\n-\n- entry = data.find(xpath_with_ns('./atom:entry', NS_MAP))\n-\n- title = xpath_text(\n- entry, xpath_with_ns('./atom:title', NS_MAP), 'title')\n- description = xpath_text(\n- entry, xpath_with_ns('./atom:summary', NS_MAP), 'description')\n- timestamp = parse_iso8601(xpath_text(\n- entry, xpath_with_ns('./atom:published', NS_MAP), 'upload date'))\n-\n- formats = []\n- media_group = entry.find(xpath_with_ns('./media:group', NS_MAP))\n- for media_content in media_group.findall(xpath_with_ns('./media:content', NS_MAP)):\n- media_url = media_content.get('url')\n- if not media_url:\n- continue\n- tbr = int_or_none(media_content.get('bitrate'))\n- mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', media_url)\n- if mobj:\n- formats.append({\n- 'url': mobj.group('url'),\n- 'play_path': 'mp4:{}'.format(mobj.group('playpath')),\n- 'app': mobj.group('app'),\n- 'ext': 'flv',\n- 'tbr': tbr,\n- 'format_id': 'rtmp-%d' % tbr,\n- })\n- else:\n- formats.append({\n- 'url': media_url,\n- 'tbr': tbr,\n- })\n-\n- link = find_xpath_attr(\n- entry, xpath_with_ns('./atom:link', NS_MAP), 'rel', 'original')\n- if link is not None:\n- formats.append({\n- 'url': link.get('href'),\n- 'format_id': link.get('rel'),\n- 'quality': 1,\n- })\n-\n- thumbnails = [{\n- 'url': splash.get('url'),\n- 'width': int_or_none(splash.get('width')),\n- 'height': int_or_none(splash.get('height')),\n- } for splash in media_group.findall(xpath_with_ns('./xt:splash', NS_MAP))]\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'timestamp': timestamp,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- partner_id = mobj.group('partner_id')\n- video_id = mobj.group('id')\n-\n- return self._extract_video_info(partner_id, video_id)\ndiff --git a/yt_dlp/extractor/zee5.py b/yt_dlp/extractor/zee5.py\ndeleted file mode 100644\nindex fb523de03b4c..000000000000\n--- a/yt_dlp/extractor/zee5.py\n+++ /dev/null\n@@ -1,269 +0,0 @@\n-import json\n-import time\n-import uuid\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- jwt_decode_hs256,\n- parse_age_limit,\n- str_or_none,\n- try_call,\n- try_get,\n- unified_strdate,\n- unified_timestamp,\n- url_or_none,\n-)\n-\n-\n-class Zee5IE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- (?:\n- zee5:|\n- https?://(?:www\\.)?zee5\\.com/(?:[^#?]+/)?\n- (?:\n- (?:tv-shows|kids|web-series|zee5originals)(?:/[^#/?]+){3}\n- |(?:movies|kids|videos|news|music-videos)/(?!kids-shows)[^#/?]+\n- )/(?P<display_id>[^#/?]+)/\n- )\n- (?P<id>[^#/?]+)/?(?:$|[?#])\n- '''\n- _TESTS = [{\n- 'url': 'https://www.zee5.com/movies/details/adavari-matalaku-ardhale-verule/0-0-movie_1143162669',\n- 'info_dict': {\n- 'id': '0-0-movie_1143162669',\n- 'ext': 'mp4',\n- 'display_id': 'adavari-matalaku-ardhale-verule',\n- 'title': 'Adavari Matalaku Ardhale Verule',\n- 'duration': 9360,\n- 'description': str,\n- 'alt_title': 'Adavari Matalaku Ardhale Verule',\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\n- 'release_date': '20070427',\n- 'upload_date': '20070427',\n- 'timestamp': 1177632000,\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'episode_number': 0,\n- 'episode': 'Episode 0',\n- 'tags': list,\n- },\n- 'params': {\n- 'format': 'bv',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899/yoga-se-hoga-bandbudh-aur-budbak/0-1-239839',\n- 'info_dict': {\n- 'id': '0-1-239839',\n- 'ext': 'mp4',\n- 'display_id': 'yoga-se-hoga-bandbudh-aur-budbak',\n- 'title': 'Yoga Se Hoga-Bandbudh aur Budbak',\n- 'duration': 659,\n- 'description': str,\n- 'alt_title': 'Yoga Se Hoga-Bandbudh aur Budbak',\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\n- 'release_date': '20150101',\n- 'upload_date': '20150101',\n- 'timestamp': 1420070400,\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'series': 'Bandbudh Aur Budbak',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'season': 'Season 1',\n- 'tags': list,\n- },\n- 'params': {\n- 'format': 'bv',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408/maine-dekhi-hai-uski-mrityu/0-1-6z587412',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/kids/kids-movies/maya-bommalu/0-0-movie_1040370005',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/news/details/jana-sena-chief-pawan-kalyan-shows-slippers-to-ysrcp-leaders/0-0-newsauto_6ettj4242oo0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/music-videos/details/adhento-gaani-vunnapaatuga-jersey-nani-shraddha-srinath/0-0-56973',\n- 'only_matching': True,\n- }]\n- _DEVICE_ID = str(uuid.uuid4())\n- _USER_TOKEN = None\n- _LOGIN_HINT = 'Use \"--username <mobile_number>\" to login using otp or \"--username token\" and \"--password <user_token>\" to login using user token.'\n- _NETRC_MACHINE = 'zee5'\n- _GEO_COUNTRIES = ['IN']\n- _USER_COUNTRY = None\n-\n- def _perform_login(self, username, password):\n- if len(username) == 10 and username.isdigit() and self._USER_TOKEN is None:\n- self.report_login()\n- otp_request_json = self._download_json(f'https://b2bapi.zee5.com/device/sendotp_v1.php?phoneno=91{username}',\n- None, note='Sending OTP')\n- if otp_request_json['code'] == 0:\n- self.to_screen(otp_request_json['message'])\n- else:\n- raise ExtractorError(otp_request_json['message'], expected=True)\n- otp_code = self._get_tfa_info('OTP')\n- otp_verify_json = self._download_json(f'https://b2bapi.zee5.com/device/verifyotp_v1.php?phoneno=91{username}&otp={otp_code}&guest_token={self._DEVICE_ID}&platform=web',\n- None, note='Verifying OTP', fatal=False)\n- if not otp_verify_json:\n- raise ExtractorError('Unable to verify OTP.', expected=True)\n- self._USER_TOKEN = otp_verify_json.get('token')\n- if not self._USER_TOKEN:\n- raise ExtractorError(otp_request_json['message'], expected=True)\n- elif username.lower() == 'token' and try_call(lambda: jwt_decode_hs256(password)):\n- self._USER_TOKEN = password\n- else:\n- raise ExtractorError(self._LOGIN_HINT, expected=True)\n-\n- token = jwt_decode_hs256(self._USER_TOKEN)\n- if token.get('exp', 0) <= int(time.time()):\n- raise ExtractorError('User token has expired', expected=True)\n- self._USER_COUNTRY = token.get('current_country')\n-\n- def _real_extract(self, url):\n- video_id, display_id = self._match_valid_url(url).group('id', 'display_id')\n- access_token_request = self._download_json(\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\n- video_id, note='Downloading access token')['platform_token']\n- data = {\n- 'x-access-token': access_token_request['token'],\n- }\n- if self._USER_TOKEN:\n- data['Authorization'] = f'bearer {self._USER_TOKEN}'\n- else:\n- data['X-Z5-Guest-Token'] = self._DEVICE_ID\n-\n- json_data = self._download_json(\n- 'https://spapi.zee5.com/singlePlayback/getDetails/secure', video_id, query={\n- 'content_id': video_id,\n- 'device_id': self._DEVICE_ID,\n- 'platform_name': 'desktop_web',\n- 'country': self._USER_COUNTRY or self.get_param('geo_bypass_country') or 'IN',\n- 'check_parental_control': False,\n- }, headers={'content-type': 'application/json'}, data=json.dumps(data).encode())\n- asset_data = json_data['assetDetails']\n- show_data = json_data.get('showDetails', {})\n- if 'premium' in asset_data['business_type']:\n- raise ExtractorError('Premium content is DRM protected.', expected=True)\n- if not asset_data.get('hls_url'):\n- self.raise_login_required(self._LOGIN_HINT, metadata_available=True, method=None)\n- formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(asset_data['hls_url'], video_id, 'mp4', fatal=False)\n-\n- subtitles = {}\n- for sub in asset_data.get('subtitle_url', []):\n- sub_url = sub.get('url')\n- if not sub_url:\n- continue\n- subtitles.setdefault(sub.get('language', 'en'), []).append({\n- 'url': self._proto_relative_url(sub_url),\n- })\n- subtitles = self._merge_subtitles(subtitles, m3u8_subs)\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'title': asset_data['title'],\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'duration': int_or_none(asset_data.get('duration')),\n- 'description': str_or_none(asset_data.get('description')),\n- 'alt_title': str_or_none(asset_data.get('original_title')),\n- 'uploader': str_or_none(asset_data.get('content_owner')),\n- 'age_limit': parse_age_limit(asset_data.get('age_rating')),\n- 'release_date': unified_strdate(asset_data.get('release_date')),\n- 'timestamp': unified_timestamp(asset_data.get('release_date')),\n- 'thumbnail': url_or_none(asset_data.get('image_url')),\n- 'series': str_or_none(asset_data.get('tvshow_name')),\n- 'season': try_get(show_data, lambda x: x['seasons']['title'], str),\n- 'season_number': int_or_none(try_get(show_data, lambda x: x['seasons'][0]['orderid'])),\n- 'episode_number': int_or_none(try_get(asset_data, lambda x: x['orderid'])),\n- 'tags': try_get(asset_data, lambda x: x['tags'], list),\n- }\n-\n-\n-class Zee5SeriesIE(InfoExtractor):\n- IE_NAME = 'zee5:series'\n- _VALID_URL = r'''(?x)\n- (?:\n- zee5:series:|\n- https?://(?:www\\.)?zee5\\.com/(?:[^#?]+/)?\n- (?:tv-shows|web-series|kids|zee5originals)/(?!kids-movies)(?:[^#/?]+/){2}\n- )\n- (?P<id>[^#/?]+)(?:/episodes)?/?(?:$|[?#])\n- '''\n- _TESTS = [{\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899',\n- 'playlist_mincount': 156,\n- 'info_dict': {\n- 'id': '0-6-1899',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/bhabi-ji-ghar-par-hai/0-6-199',\n- 'playlist_mincount': 1500,\n- 'info_dict': {\n- 'id': '0-6-199',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/agent-raghav-crime-branch/0-6-965',\n- 'playlist_mincount': 24,\n- 'info_dict': {\n- 'id': '0-6-965',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/ta/tv-shows/details/nagabhairavi/0-6-3201',\n- 'playlist_mincount': 3,\n- 'info_dict': {\n- 'id': '0-6-3201',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/khwaabon-ki-zamin-par/0-6-270',\n- 'playlist_mincount': 150,\n- 'info_dict': {\n- 'id': '0-6-270',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/chala-hawa-yeu-dya-ladies-zindabaad/0-6-2943/episodes',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408',\n- 'only_matching': True,\n- }]\n-\n- def _entries(self, show_id):\n- access_token_request = self._download_json(\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\n- show_id, note='Downloading access token')['platform_token']\n- headers = {\n- 'X-Access-Token': access_token_request['token'],\n- 'Referer': 'https://www.zee5.com/',\n- }\n- show_url = f'https://gwapi.zee5.com/content/tvshow/{show_id}?translation=en&country=IN'\n-\n- page_num = 0\n- show_json = self._download_json(show_url, video_id=show_id, headers=headers)\n- for season in show_json.get('seasons') or []:\n- season_id = try_get(season, lambda x: x['id'], str)\n- next_url = f'https://gwapi.zee5.com/content/tvshow/?season_id={season_id}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100'\n- while next_url:\n- page_num += 1\n- episodes_json = self._download_json(\n- next_url, video_id=show_id, headers=headers,\n- note=f'Downloading JSON metadata page {page_num}')\n- for episode in try_get(episodes_json, lambda x: x['episode'], list) or []:\n- video_id = episode.get('id')\n- yield self.url_result(\n- f'zee5:{video_id}',\n- ie=Zee5IE.ie_key(), video_id=video_id)\n- next_url = url_or_none(episodes_json.get('next_episode_api'))\n-\n- def _real_extract(self, url):\n- show_id = self._match_id(url)\n- return self.playlist_result(self._entries(show_id), playlist_id=show_id)\n\n","summary":"Edited 95 file(s) in yt_dlp/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"test/test_subtitles.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_subtitles.py b/test/test_subtitles.py\\nindex 53e0b4eaf8dc..32e80df952c0 100644\\n--- a/test/test_subtitles.py\\n+++ b/test/test_subtitles.py\\n@@ -16,7 +16,6 @@\\n CeskaTelevizeIE,\\n DailymotionIE,\\n DemocracynowIE,\\n- LyndaIE,\\n RaiPlayIE,\\n RTVEALaCartaIE,\\n TedTalkIE,\\n@@ -250,20 +249,6 @@ def test_nosubtitles(self):\\n self.assertFalse(subtitles)\\n \\n \\n-@is_download_test\\n-@unittest.skip('IE broken')\\n-class TestLyndaSubtitles(BaseTestSubtitles):\\n- url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'\\n- IE = LyndaIE\\n-\\n- def test_allsubtitles(self):\\n- self.DL.params['writesubtitles'] = True\\n- self.DL.params['allsubtitles'] = True\\n- subtitles = self.getSubtitles()\\n- self.assertEqual(set(subtitles.keys()), {'en'})\\n- self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')\\n-\\n-\\n @is_download_test\\n @unittest.skip('IE broken')\\n class TestNPOSubtitles(BaseTestSubtitles):\\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/extractor/_extractors.py\",\n \"yt_dlp/extractor/airtv.py\",\n \"yt_dlp/extractor/alsace20tv.py\",\n \"yt_dlp/extractor/anchorfm.py\",\n \"yt_dlp/extractor/appletrailers.py\",\n \"yt_dlp/extractor/atvat.py\",\n \"yt_dlp/extractor/awaan.py\",\n \"yt_dlp/extractor/axs.py\",\n \"yt_dlp/extractor/beatbump.py\",\n \"yt_dlp/extractor/bigflix.py\",\n \"yt_dlp/extractor/bokecc.py\",\n \"yt_dlp/extractor/caffeinetv.py\",\n \"yt_dlp/extractor/callin.py\",\n \"yt_dlp/extractor/camdemy.py\",\n \"yt_dlp/extractor/clippit.py\",\n \"yt_dlp/extractor/contv.py\",\n \"yt_dlp/extractor/drooble.py\",\n \"yt_dlp/extractor/duboku.py\",\n \"yt_dlp/extractor/eighttracks.py\",\n \"yt_dlp/extractor/eitb.py\",\n \"yt_dlp/extractor/eyedotv.py\",\n \"yt_dlp/extractor/footyroom.py\",\n \"yt_dlp/extractor/franceinter.py\",\n \"yt_dlp/extractor/fujitv.py\",\n \"yt_dlp/extractor/gab.py\",\n \"yt_dlp/extractor/googlepodcasts.py\",\n \"yt_dlp/extractor/goshgay.py\",\n \"yt_dlp/extractor/gputechconf.py\",\n \"yt_dlp/extractor/hketv.py\",\n \"yt_dlp/extractor/idolplus.py\",\n \"yt_dlp/extractor/infoq.py\",\n \"yt_dlp/extractor/internetvideoarchive.py\",\n \"yt_dlp/extractor/izlesene.py\",\n \"yt_dlp/extractor/kinja.py\",\n \"yt_dlp/extractor/koo.py\",\n \"yt_dlp/extractor/leeco.py\",\n \"yt_dlp/extractor/livestream.py\",\n \"yt_dlp/extractor/lynda.py\",\n \"yt_dlp/extractor/microsoftstream.py\",\n \"yt_dlp/extractor/minoto.py\",\n \"yt_dlp/extractor/mojvideo.py\",\n \"yt_dlp/extractor/motherless.py\",\n \"yt_dlp/extractor/moview.py\",\n \"yt_dlp/extractor/moviezine.py\",\n \"yt_dlp/extractor/musicdex.py\",\n \"yt_dlp/extractor/nationalgeographic.py\",\n \"yt_dlp/extractor/naver.py\",\n \"yt_dlp/extractor/nerdcubed.py\",\n \"yt_dlp/extractor/netverse.py\",\n \"yt_dlp/extractor/nuum.py\",\n \"yt_dlp/extractor/onionstudios.py\",\n \"yt_dlp/extractor/ora.py\",\n \"yt_dlp/extractor/piramidetv.py\",\n \"yt_dlp/extractor/planetmarathi.py\",\n \"yt_dlp/extractor/playplustv.py\",\n \"yt_dlp/extractor/playwire.py\",\n \"yt_dlp/extractor/plvideo.py\",\n \"yt_dlp/extractor/prosiebensat1.py\",\n \"yt_dlp/extractor/puls4.py\",\n \"yt_dlp/extractor/radiocomercial.py\",\n \"yt_dlp/extractor/redge.py\",\n \"yt_dlp/extractor/rheinmaintv.py\",\n \"yt_dlp/extractor/rmcdecouverte.py\",\n \"yt_dlp/extractor/sejmpl.py\",\n \"yt_dlp/extractor/sendtonews.py\",\n \"yt_dlp/extractor/sharevideos.py\",\n \"yt_dlp/extractor/snotr.py\",\n \"yt_dlp/extractor/springboardplatform.py\",\n \"yt_dlp/extractor/stanfordoc.py\",\n \"yt_dlp/extractor/stitcher.py\",\n \"yt_dlp/extractor/stretchinternet.py\",\n \"yt_dlp/extractor/swearnet.py\",\n \"yt_dlp/extractor/syvdk.py\",\n \"yt_dlp/extractor/tempo.py\",\n \"yt_dlp/extractor/theholetv.py\",\n \"yt_dlp/extractor/traileraddict.py\",\n \"yt_dlp/extractor/triller.py\",\n \"yt_dlp/extractor/tvplayer.py\",\n \"yt_dlp/extractor/ufctv.py\",\n \"yt_dlp/extractor/uktvplay.py\",\n \"yt_dlp/extractor/unsupported.py\",\n \"yt_dlp/extractor/utreon.py\",\n \"yt_dlp/extractor/vgtv.py\",\n \"yt_dlp/extractor/videodetective.py\",\n \"yt_dlp/extractor/videofyme.py\",\n \"yt_dlp/extractor/videoken.py\",\n \"yt_dlp/extractor/videomore.py\",\n \"yt_dlp/extractor/vimm.py\",\n \"yt_dlp/extractor/vodpl.py\",\n \"yt_dlp/extractor/vuclip.py\",\n \"yt_dlp/extractor/vvvvid.py\",\n \"yt_dlp/extractor/wdr.py\",\n \"yt_dlp/extractor/weyyak.py\",\n \"yt_dlp/extractor/xstream.py\",\n \"yt_dlp/extractor/zee5.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py\\nindex 1a29a93edaf8..f47a36099a12 100644\\n--- a/yt_dlp/extractor/_extractors.py\\n+++ b/yt_dlp/extractor/_extractors.py\\n@@ -54,7 +54,6 @@\\n WyborczaPodcastIE,\\n WyborczaVideoIE,\\n )\\n-from .airtv import AirTVIE\\n from .aitube import AitubeKZVideoIE\\n from .alibaba import AlibabaIE\\n from .aliexpress import AliExpressLiveIE\\n@@ -65,10 +64,6 @@\\n AllstarProfileIE,\\n )\\n from .alphaporno import AlphaPornoIE\\n-from .alsace20tv import (\\n- Alsace20TVEmbedIE,\\n- Alsace20TVIE,\\n-)\\n from .altcensored import (\\n AltCensoredChannelIE,\\n AltCensoredIE,\\n@@ -93,7 +88,6 @@\\n AmericasTestKitchenIE,\\n AmericasTestKitchenSeasonIE,\\n )\\n-from .anchorfm import AnchorFMEpisodeIE\\n from .angel import AngelIE\\n from .antenna import (\\n Ant1NewsGrArticleIE,\\n@@ -106,10 +100,6 @@\\n from .aparat import AparatIE\\n from .appleconnect import AppleConnectIE\\n from .applepodcasts import ApplePodcastsIE\\n-from .appletrailers import (\\n- AppleTrailersIE,\\n- AppleTrailersSectionIE,\\n-)\\n from .archiveorg import (\\n ArchiveOrgIE,\\n YoutubeWebArchiveIE,\\n@@ -140,7 +130,6 @@\\n from .asobistage import AsobiStageIE\\n from .atresplayer import AtresPlayerIE\\n from .atscaleconf import AtScaleConfEventIE\\n-from .atvat import ATVAtIE\\n from .audimedia import AudiMediaIE\\n from .audioboom import AudioBoomIE\\n from .audiodraft import (\\n@@ -157,13 +146,6 @@\\n AudiusProfileIE,\\n AudiusTrackIE,\\n )\\n-from .awaan import (\\n- AWAANIE,\\n- AWAANLiveIE,\\n- AWAANSeasonIE,\\n- AWAANVideoIE,\\n-)\\n-from .axs import AxsIE\\n from .azmedien import AZMedienIE\\n from .baidu import BaiduVideoIE\\n from .banbye import (\\n@@ -190,10 +172,6 @@\\n BBCCoUkPlaylistIE,\\n )\\n from .beacon import BeaconTvIE\\n-from .beatbump import (\\n- BeatBumpPlaylistIE,\\n- BeatBumpVideoIE,\\n-)\\n from .beatport import BeatportIE\\n from .beeg import BeegIE\\n from .behindkink import BehindKinkIE\\n@@ -210,7 +188,6 @@\\n BibelTVSeriesIE,\\n BibelTVVideoIE,\\n )\\n-from .bigflix import BigflixIE\\n from .bigo import BigoIE\\n from .bild import BildIE\\n from .bilibili import (\\n@@ -255,7 +232,6 @@\\n from .blogger import BloggerIE\\n from .bloomberg import BloombergIE\\n from .bluesky import BlueskyIE\\n-from .bokecc import BokeCCIE\\n from .bongacams import BongaCamsIE\\n from .boosty import BoostyIE\\n from .bostonglobe import BostonGlobeIE\\n@@ -288,14 +264,8 @@\\n from .buzzfeed import BuzzFeedIE\\n from .byutv import BYUtvIE\\n from .c56 import C56IE\\n-from .caffeinetv import CaffeineTVIE\\n-from .callin import CallinIE\\n from .caltrans import CaltransIE\\n from .cam4 import CAM4IE\\n-from .camdemy import (\\n- CamdemyFolderIE,\\n- CamdemyIE,\\n-)\\n from .camfm import (\\n CamFMEpisodeIE,\\n CamFMShowIE,\\n@@ -371,7 +341,6 @@\\n from .ciscowebex import CiscoWebexIE\\n from .cjsw import CJSWIE\\n from .clipchamp import ClipchampIE\\n-from .clippit import ClippitIE\\n from .cliprs import ClipRsIE\\n from .closertotruth import CloserToTruthIE\\n from .cloudflarestream import CloudflareStreamIE\\n@@ -395,7 +364,6 @@\\n ViewSourceIE,\\n )\\n from .condenast import CondeNastIE\\n-from .contv import CONtvIE\\n from .corus import CorusIE\\n from .coub import CoubIE\\n from .cozytv import CozyTVIE\\n@@ -510,7 +478,6 @@\\n )\\n from .drbonanza import DRBonanzaIE\\n from .dreisat import DreiSatIE\\n-from .drooble import DroobleIE\\n from .dropbox import DropboxIE\\n from .dropout import (\\n DropoutIE,\\n@@ -525,10 +492,6 @@\\n DRTVSeriesIE,\\n )\\n from .dtube import DTubeIE\\n-from .duboku import (\\n- DubokuIE,\\n- DubokuPlaylistIE,\\n-)\\n from .dumpert import DumpertIE\\n from .duoplay import DuoplayIE\\n from .dvtv import DVTVIE\\n@@ -546,8 +509,6 @@\\n EggsArtistIE,\\n EggsIE,\\n )\\n-from .eighttracks import EightTracksIE\\n-from .eitb import EitbIE\\n from .elementorembed import ElementorEmbedIE\\n from .elonet import ElonetIE\\n from .elpais import ElPaisIE\\n@@ -591,7 +552,6 @@\\n from .eurosport import EurosportIE\\n from .euscreen import EUScreenIE\\n from .expressen import ExpressenIE\\n-from .eyedotv import EyedoTVIE\\n from .facebook import (\\n FacebookAdsIE,\\n FacebookIE,\\n@@ -655,7 +615,6 @@\\n from .foxsports import FoxSportsIE\\n from .fptplay import FptplayIE\\n from .francaisfacile import FrancaisFacileIE\\n-from .franceinter import FranceInterIE\\n from .francetv import (\\n FranceTVIE,\\n FranceTVInfoIE,\\n@@ -672,14 +631,10 @@\\n FrontendMastersIE,\\n FrontendMastersLessonIE,\\n )\\n-from .fujitv import FujiTVFODPlus7IE\\n from .funk import FunkIE\\n from .funker530 import Funker530IE\\n from .fuyintv import FuyinTVIE\\n-from .gab import (\\n- GabIE,\\n- GabTVIE,\\n-)\\n+from .gab import GabIE\\n from .gaia import GaiaIE\\n from .gamedevtv import GameDevTVDashboardIE\\n from .gamejolt import (\\n@@ -743,16 +698,10 @@\\n GoogleDriveFolderIE,\\n GoogleDriveIE,\\n )\\n-from .googlepodcasts import (\\n- GooglePodcastsFeedIE,\\n- GooglePodcastsIE,\\n-)\\n from .googlesearch import GoogleSearchIE\\n from .goplay import GoPlayIE\\n from .gopro import GoProIE\\n-from .goshgay import GoshgayIE\\n from .gotostage import GoToStageIE\\n-from .gputechconf import GPUTechConfIE\\n from .graspop import GraspopIE\\n from .gronkh import (\\n GronkhFeedIE,\\n@@ -769,7 +718,6 @@\\n from .hidive import HiDiveIE\\n from .historicfilms import HistoricFilmsIE\\n from .hitrecord import HitRecordIE\\n-from .hketv import HKETVIE\\n from .hollywoodreporter import (\\n HollywoodReporterIE,\\n HollywoodReporterPlaylistIE,\\n@@ -818,7 +766,6 @@\\n IdagioRecordingIE,\\n IdagioTrackIE,\\n )\\n-from .idolplus import IdolPlusIE\\n from .ign import (\\n IGNIE,\\n IGNArticleIE,\\n@@ -851,7 +798,6 @@\\n InstagramUserIE,\\n )\\n from .internazionale import InternazionaleIE\\n-from .internetvideoarchive import InternetVideoArchiveIE\\n from .iprima import (\\n IPrimaCNNIE,\\n IPrimaIE,\\n@@ -886,7 +832,6 @@\\n IwaraUserIE,\\n )\\n from .ixigua import IxiguaIE\\n-from .izlesene import IzleseneIE\\n from .jamendo import (\\n JamendoAlbumIE,\\n JamendoIE,\\n@@ -939,11 +884,9 @@\\n KikaIE,\\n KikaPlaylistIE,\\n )\\n-from .kinja import KinjaEmbedIE\\n from .kinopoisk import KinoPoiskIE\\n from .kommunetv import KommunetvIE\\n from .kompas import KompasVideoIE\\n-from .koo import KooIE\\n from .krasview import KrasViewIE\\n from .kth import KTHIE\\n from .ku6 import Ku6IE\\n@@ -991,7 +934,6 @@\\n from .leeco import (\\n LeIE,\\n LePlaylistIE,\\n- LetvCloudIE,\\n )\\n from .lefigaro import (\\n LeFigaroVideoEmbedIE,\\n@@ -1020,11 +962,6 @@\\n from .listennotes import ListenNotesIE\\n from .litv import LiTVIE\\n from .livejournal import LiveJournalIE\\n-from .livestream import (\\n- LivestreamIE,\\n- LivestreamOriginalIE,\\n- LivestreamShortenerIE,\\n-)\\n from .livestreamfails import LivestreamfailsIE\\n from .lnk import LnkIE\\n from .locipo import (\\n@@ -1048,10 +985,6 @@\\n LSMReplayIE,\\n )\\n from .lumni import LumniIE\\n-from .lynda import (\\n- LyndaCourseIE,\\n- LyndaIE,\\n-)\\n from .maariv import MaarivIE\\n from .magellantv import MagellanTVIE\\n from .magentamusik import MagentaMusikIE\\n@@ -1117,13 +1050,11 @@\\n MicrosoftLearnSessionIE,\\n MicrosoftMediusIE,\\n )\\n-from .microsoftstream import MicrosoftStreamIE\\n from .minds import (\\n MindsChannelIE,\\n MindsGroupIE,\\n MindsIE,\\n )\\n-from .minoto import MinotoIE\\n from .mir24tv import Mir24TvIE\\n from .mirrativ import (\\n MirrativIE,\\n@@ -1157,18 +1088,9 @@\\n from .mlssoccer import MLSSoccerIE\\n from .mocha import MochaVideoIE\\n from .mojevideo import MojevideoIE\\n-from .mojvideo import MojvideoIE\\n from .monstercat import MonstercatIE\\n-from .motherless import (\\n- MotherlessGalleryIE,\\n- MotherlessGroupIE,\\n- MotherlessIE,\\n- MotherlessUploaderIE,\\n-)\\n from .motorsport import MotorsportIE\\n from .moviepilot import MoviepilotIE\\n-from .moview import MoviewPlayIE\\n-from .moviezine import MoviezineIE\\n from .movingimage import MovingImageIE\\n from .msn import MSNIE\\n from .mtv import MTVIE\\n@@ -1179,12 +1101,6 @@\\n )\\n from .museai import MuseAIIE\\n from .musescore import MuseScoreIE\\n-from .musicdex import (\\n- MusicdexAlbumIE,\\n- MusicdexArtistIE,\\n- MusicdexPlaylistIE,\\n- MusicdexSongIE,\\n-)\\n from .mux import MuxIE\\n from .mx3 import (\\n Mx3IE,\\n@@ -1212,14 +1128,10 @@\\n NateIE,\\n NateProgramIE,\\n )\\n-from .nationalgeographic import (\\n- NationalGeographicTVIE,\\n- NationalGeographicVideoIE,\\n-)\\n+from .nationalgeographic import NationalGeographicTVIE\\n from .naver import (\\n NaverIE,\\n NaverLiveIE,\\n- NaverNowIE,\\n )\\n from .nba import (\\n NBAIE,\\n@@ -1257,7 +1169,6 @@\\n NebulaSubscriptionsIE,\\n )\\n from .nekohacker import NekoHackerIE\\n-from .nerdcubed import NerdCubedFeedIE\\n from .nest import (\\n NestClipIE,\\n NestIE,\\n@@ -1275,11 +1186,6 @@\\n NetEaseMusicProgramIE,\\n NetEaseMusicSingerIE,\\n )\\n-from .netverse import (\\n- NetverseIE,\\n- NetversePlaylistIE,\\n- NetverseSearchIE,\\n-)\\n from .netzkino import NetzkinoIE\\n from .newgrounds import (\\n NewgroundsIE,\\n@@ -1389,11 +1295,6 @@\\n from .ntvde import NTVDeIE\\n from .ntvru import NTVRuIE\\n from .nubilesporn import NubilesPornIE\\n-from .nuum import (\\n- NuumLiveIE,\\n- NuumMediaIE,\\n- NuumTabIE,\\n-)\\n from .nuvid import NuvidIE\\n from .nytimes import (\\n NYTimesArticleIE,\\n@@ -1426,7 +1327,6 @@\\n OnetMVPIE,\\n OnetPlIE,\\n )\\n-from .onionstudios import OnionStudiosIE\\n from .onsen import OnsenIE\\n from .opencast import (\\n OpencastIE,\\n@@ -1437,7 +1337,6 @@\\n OpenRecIE,\\n OpenRecMovieIE,\\n )\\n-from .ora import OraTVIE\\n from .orf import (\\n ORFIPTVIE,\\n ORFONIE,\\n@@ -1511,26 +1410,18 @@\\n PinterestCollectionIE,\\n PinterestIE,\\n )\\n-from .piramidetv import (\\n- PiramideTVChannelIE,\\n- PiramideTVIE,\\n-)\\n-from .planetmarathi import PlanetMarathiIE\\n from .platzi import (\\n PlatziCourseIE,\\n PlatziIE,\\n )\\n from .playerfm import PlayerFmIE\\n-from .playplustv import PlayPlusTVIE\\n from .playsuisse import PlaySuisseIE\\n from .playtvak import PlaytvakIE\\n-from .playwire import PlaywireIE\\n from .pluralsight import (\\n PluralsightCourseIE,\\n PluralsightIE,\\n )\\n from .plutotv import PlutoTVIE\\n-from .plvideo import PlVideoIE\\n from .plyr import PlyrEmbedIE\\n from .podbayfm import (\\n PodbayFMChannelIE,\\n@@ -1574,7 +1465,6 @@\\n from .premiershiprugby import PremiershipRugbyIE\\n from .presstv import PressTVIE\\n from .projectveritas import ProjectVeritasIE\\n-from .prosiebensat1 import ProSiebenSat1IE\\n from .prx import (\\n PRXAccountIE,\\n PRXSeriesIE,\\n@@ -1586,7 +1476,6 @@\\n PuhuTVIE,\\n PuhuTVSerieIE,\\n )\\n-from .puls4 import Puls4IE\\n from .pyvideo import PyvideoIE\\n from .qdance import QDanceIE\\n from .qingting import QingTingIE\\n@@ -1610,10 +1499,6 @@\\n RadioCanadaAudioVideoIE,\\n RadioCanadaIE,\\n )\\n-from .radiocomercial import (\\n- RadioComercialIE,\\n- RadioComercialPlaylistIE,\\n-)\\n from .radiode import RadioDeIE\\n from .radiofrance import (\\n FranceCultureIE,\\n@@ -1678,7 +1563,6 @@\\n RedBullTVRrnContentIE,\\n )\\n from .reddit import RedditIE\\n-from .redge import RedCDNLivxIE\\n from .redgifs import (\\n RedGifsIE,\\n RedGifsSearchIE,\\n@@ -1692,13 +1576,11 @@\\n from .restudy import RestudyIE\\n from .reuters import ReutersIE\\n from .reverbnation import ReverbNationIE\\n-from .rheinmaintv import RheinMainTVIE\\n from .ridehome import RideHomeIE\\n from .rinsefm import (\\n RinseFMArtistPlaylistIE,\\n RinseFMIE,\\n )\\n-from .rmcdecouverte import RMCDecouverteIE\\n from .rockstargames import RockstarGamesIE\\n from .rokfin import (\\n RokfinChannelIE,\\n@@ -1815,7 +1697,6 @@\\n SenateGovIE,\\n SenateISVPIE,\\n )\\n-from .sendtonews import SendtoNewsIE\\n from .servus import ServusIE\\n from .sevenplus import SevenPlusIE\\n from .sexu import SexuIE\\n@@ -1828,7 +1709,6 @@\\n ShahidShowIE,\\n )\\n from .sharepoint import SharePointIE\\n-from .sharevideos import ShareVideosEmbedIE\\n from .shemaroome import ShemarooMeIE\\n from .shiey import ShieyIE\\n from .showroomlive import ShowRoomLiveIE\\n@@ -1873,7 +1753,6 @@\\n SmotrimPlaylistIE,\\n )\\n from .snapchat import SnapchatSpotlightIE\\n-from .snotr import SnotrIE\\n from .softwhiteunderbelly import SoftWhiteUnderbellyIE\\n from .sohu import (\\n SohuIE,\\n@@ -1923,7 +1802,6 @@\\n SpreakerIE,\\n SpreakerShowIE,\\n )\\n-from .springboardplatform import SpringboardPlatformIE\\n from .sproutvideo import (\\n SproutVideoIE,\\n VidsIoIE,\\n@@ -1940,7 +1818,6 @@\\n TheaterComplexTownVODIE,\\n )\\n from .stageplus import StagePlusVODConcertIE\\n-from .stanfordoc import StanfordOpenClassroomIE\\n from .startrek import StarTrekIE\\n from .startv import StarTVIE\\n from .steam import (\\n@@ -1948,10 +1825,6 @@\\n SteamCommunityIE,\\n SteamIE,\\n )\\n-from .stitcher import (\\n- StitcherIE,\\n- StitcherShowIE,\\n-)\\n from .storyfire import (\\n StoryFireIE,\\n StoryFireSeriesIE,\\n@@ -1961,7 +1834,6 @@\\n from .streamable import StreamableIE\\n from .streamcz import StreamCZIE\\n from .streetvoice import StreetVoiceIE\\n-from .stretchinternet import StretchInternetIE\\n from .stripchat import StripchatIE\\n from .stv import STVPlayerIE\\n from .subsplash import (\\n@@ -1979,8 +1851,6 @@\\n SVTPlayIE,\\n SVTSeriesIE,\\n )\\n-from .swearnet import SwearnetEpisodeIE\\n-from .syvdk import SYVDKIE\\n from .sztvhu import SztvHuIE\\n from .tagesschau import TagesschauIE\\n from .taptap import (\\n@@ -2039,10 +1909,6 @@\\n )\\n from .teletask import TeleTaskIE\\n from .telewebion import TelewebionIE\\n-from .tempo import (\\n- IVXPlayerIE,\\n- TempoIE,\\n-)\\n from .tencent import (\\n IflixEpisodeIE,\\n IflixSeriesIE,\\n@@ -2068,7 +1934,6 @@\\n TheGuardianPodcastPlaylistIE,\\n )\\n from .thehighwire import TheHighWireIE\\n-from .theholetv import TheHoleTvIE\\n from .theintercept import TheInterceptIE\\n from .theplatform import (\\n ThePlatformFeedIE,\\n@@ -2120,12 +1985,6 @@\\n ToypicsIE,\\n ToypicsUserIE,\\n )\\n-from .traileraddict import TrailerAddictIE\\n-from .triller import (\\n- TrillerIE,\\n- TrillerShortIE,\\n- TrillerUserIE,\\n-)\\n from .trovo import (\\n TrovoChannelClipIE,\\n TrovoChannelVodIE,\\n@@ -2208,7 +2067,6 @@\\n TVPlayHomeIE,\\n TVPlayIE,\\n )\\n-from .tvplayer import TVPlayerIE\\n from .tvw import (\\n TvwIE,\\n TvwNewsIE,\\n@@ -2248,12 +2106,8 @@\\n UdemyIE,\\n )\\n from .udn import UDNEmbedIE\\n-from .ufctv import (\\n- UFCTVIE,\\n- UFCArabiaIE,\\n-)\\n+from .ufctv import UFCTVIE\\n from .ukcolumn import UkColumnIE\\n-from .uktvplay import UKTVPlayIE\\n from .uliza import (\\n UlizaPlayerIE,\\n UlizaPortalIE,\\n@@ -2283,7 +2137,6 @@\\n UstudioEmbedIE,\\n UstudioIE,\\n )\\n-from .utreon import UtreonIE\\n from .varzesh3 import Varzesh3IE\\n from .vbox7 import Vbox7IE\\n from .veo import VeoIE\\n@@ -2308,20 +2161,7 @@\\n VideocampusSachsenIE,\\n ViMPPlaylistIE,\\n )\\n-from .videodetective import VideoDetectiveIE\\n-from .videofyme import VideofyMeIE\\n-from .videoken import (\\n- VideoKenCategoryIE,\\n- VideoKenIE,\\n- VideoKenPlayerIE,\\n- VideoKenPlaylistIE,\\n- VideoKenTopicIE,\\n-)\\n-from .videomore import (\\n- VideomoreIE,\\n- VideomoreSeasonIE,\\n- VideomoreVideoIE,\\n-)\\n+from .videoken import VideoKenPlayerIE\\n from .videopress import VideoPressIE\\n from .vidflex import VidflexIE\\n from .vidio import (\\n@@ -2351,10 +2191,6 @@\\n VimeoUserIE,\\n VimeoWatchLaterIE,\\n )\\n-from .vimm import (\\n- VimmIE,\\n- VimmRecordingIE,\\n-)\\n from .viously import ViouslyIE\\n from .viqeo import ViqeoIE\\n from .visir import VisirIE\\n@@ -2372,7 +2208,6 @@\\n VKWallPostIE,\\n )\\n from .vocaroo import VocarooIE\\n-from .vodpl import VODPlIE\\n from .vodplatform import VODPlatformIE\\n from .voicy import (\\n VoicyChannelIE,\\n@@ -2404,11 +2239,6 @@\\n VTVIE,\\n VTVGoIE,\\n )\\n-from .vuclip import VuClipIE\\n-from .vvvvid import (\\n- VVVVIDIE,\\n- VVVVIDShowIE,\\n-)\\n from .walla import WallaIE\\n from .washingtonpost import (\\n WashingtonPostArticleIE,\\n@@ -2418,7 +2248,6 @@\\n from .wdr import (\\n WDRIE,\\n WDRElefantIE,\\n- WDRMobileIE,\\n WDRPageIE,\\n )\\n from .webcamerapl import WebcameraplIE\\n@@ -2445,7 +2274,6 @@\\n WeverseMomentIE,\\n )\\n from .wevidi import WeVidiIE\\n-from .weyyak import WeyyakIE\\n from .whowatch import WhoWatchIE\\n from .whyp import WhypIE\\n from .wikimedia import WikimediaIE\\n@@ -2494,7 +2322,6 @@\\n from .xinpianchang import XinpianchangIE\\n from .xminus import XMinusIE\\n from .xnxx import XNXXIE\\n-from .xstream import XstreamIE\\n from .xvideos import (\\n XVideosIE,\\n XVideosQuickiesIE,\\n@@ -2618,10 +2445,6 @@\\n ZDFIE,\\n ZDFChannelIE,\\n )\\n-from .zee5 import (\\n- Zee5IE,\\n- Zee5SeriesIE,\\n-)\\n from .zeenews import ZeeNewsIE\\n from .zenporn import ZenPornIE\\n from .zetland import ZetlandDKArticleIE\\ndiff --git a/yt_dlp/extractor/airtv.py b/yt_dlp/extractor/airtv.py\\ndeleted file mode 100644\\nindex cee660dfcf41..000000000000\\n--- a/yt_dlp/extractor/airtv.py\\n+++ /dev/null\\n@@ -1,96 +0,0 @@\\n-from .common import InfoExtractor\\n-from .youtube import YoutubeIE\\n-from ..utils import (\\n- determine_ext,\\n- int_or_none,\\n- mimetype2ext,\\n- parse_iso8601,\\n- traverse_obj,\\n-)\\n-\\n-\\n-class AirTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://www\\\\.air\\\\.tv/watch\\\\?v=(?P<id>\\\\w+)'\\n- _TESTS = [{\\n- # without youtube_id\\n- 'url': 'https://www.air.tv/watch?v=W87jcWleSn2hXZN47zJZsQ',\\n- 'info_dict': {\\n- 'id': 'W87jcWleSn2hXZN47zJZsQ',\\n- 'ext': 'mp4',\\n- 'release_date': '20221003',\\n- 'release_timestamp': 1664792603,\\n- 'channel_id': 'vgfManQlRQKgoFQ8i8peFQ',\\n- 'title': 'md5:c12d49ed367c3dadaa67659aff43494c',\\n- 'upload_date': '20221003',\\n- 'duration': 151,\\n- 'view_count': int,\\n- 'thumbnail': 'https://cdn-sp-gcs.air.tv/videos/W/8/W87jcWleSn2hXZN47zJZsQ/b13fc56464f47d9d62a36d110b9b5a72-4096x2160_9.jpg',\\n- 'timestamp': 1664792603,\\n- },\\n- }, {\\n- # with youtube_id\\n- 'url': 'https://www.air.tv/watch?v=sv57EC8tRXG6h8dNXFUU1Q',\\n- 'info_dict': {\\n- 'id': '2ZTqmpee-bQ',\\n- 'ext': 'mp4',\\n- 'comment_count': int,\\n- 'tags': 'count:11',\\n- 'channel_follower_count': int,\\n- 'like_count': int,\\n- 'uploader': 'Newsflare',\\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/2ZTqmpee-bQ/maxresdefault.webp',\\n- 'availability': 'public',\\n- 'title': 'Geese Chase Alligator Across Golf Course',\\n- 'uploader_id': 'NewsflareBreaking',\\n- 'channel_url': 'https://www.youtube.com/channel/UCzSSoloGEz10HALUAbYhngQ',\\n- 'description': 'md5:99b21d9cea59330149efbd9706e208f5',\\n- 'age_limit': 0,\\n- 'channel_id': 'UCzSSoloGEz10HALUAbYhngQ',\\n- 'uploader_url': 'http://www.youtube.com/user/NewsflareBreaking',\\n- 'view_count': int,\\n- 'categories': ['News & Politics'],\\n- 'live_status': 'not_live',\\n- 'playable_in_embed': True,\\n- 'channel': 'Newsflare',\\n- 'duration': 37,\\n- 'upload_date': '20180511',\\n- },\\n- }]\\n-\\n- def _get_formats_and_subtitle(self, json_data, video_id):\\n- formats, subtitles = [], {}\\n- for source in traverse_obj(json_data, 'sources', 'sources_desktop', ...):\\n- ext = determine_ext(source.get('src'), mimetype2ext(source.get('type')))\\n- if ext == 'm3u8':\\n- fmts, subs = self._extract_m3u8_formats_and_subtitles(source.get('src'), video_id)\\n- formats.extend(fmts)\\n- self._merge_subtitles(subs, target=subtitles)\\n- else:\\n- formats.append({'url': source.get('src'), 'ext': ext})\\n- return formats, subtitles\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['initialState']['videos'][display_id]\\n- if nextjs_json.get('youtube_id'):\\n- return self.url_result(\\n- f'https://www.youtube.com/watch?v={nextjs_json.get(\\\"youtube_id\\\")}', YoutubeIE)\\n-\\n- formats, subtitles = self._get_formats_and_subtitle(nextjs_json, display_id)\\n- return {\\n- 'id': display_id,\\n- 'title': nextjs_json.get('title') or self._html_search_meta('og:title', webpage),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'description': nextjs_json.get('description') or None,\\n- 'duration': int_or_none(nextjs_json.get('duration')),\\n- 'thumbnails': [\\n- {'url': thumbnail}\\n- for thumbnail in traverse_obj(nextjs_json, ('default_thumbnails', ...))],\\n- 'channel_id': traverse_obj(nextjs_json, 'channel', 'channel_slug'),\\n- 'timestamp': parse_iso8601(nextjs_json.get('created')),\\n- 'release_timestamp': parse_iso8601(nextjs_json.get('published')),\\n- 'view_count': int_or_none(nextjs_json.get('views')),\\n- }\\ndiff --git a/yt_dlp/extractor/alsace20tv.py b/yt_dlp/extractor/alsace20tv.py\\ndeleted file mode 100644\\nindex c315e4f21704..000000000000\\n--- a/yt_dlp/extractor/alsace20tv.py\\n+++ /dev/null\\n@@ -1,83 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- clean_html,\\n- dict_get,\\n- get_element_by_class,\\n- int_or_none,\\n- unified_strdate,\\n- url_or_none,\\n-)\\n-\\n-\\n-class Alsace20TVBaseIE(InfoExtractor):\\n- def _extract_video(self, video_id, url=None):\\n- info = self._download_json(\\n- f'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key={video_id}&habillage=0&mode=html',\\n- video_id) or {}\\n- title = info.get('titre')\\n-\\n- formats = []\\n- for res, fmt_url in (info.get('files') or {}).items():\\n- formats.extend(\\n- self._extract_smil_formats(fmt_url, video_id, fatal=False)\\n- if '/smil:_' in fmt_url\\n- else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))\\n-\\n- webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''\\n- thumbnail = url_or_none(dict_get(info, ('image', 'preview')) or self._og_search_thumbnail(webpage))\\n- upload_date = self._search_regex(r'/(\\\\d{6})_', thumbnail, 'upload_date', default=None)\\n- upload_date = unified_strdate(f'20{upload_date[:2]}-{upload_date[2:4]}-{upload_date[4:]}') if upload_date else None\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'description': clean_html(get_element_by_class('wysiwyg', webpage)),\\n- 'upload_date': upload_date,\\n- 'thumbnail': thumbnail,\\n- 'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),\\n- 'view_count': int_or_none(info.get('nb_vues')),\\n- }\\n-\\n-\\n-class Alsace20TVIE(Alsace20TVBaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?alsace20\\\\.tv/(?:[\\\\w-]+/)+[\\\\w-]+-(?P<id>[\\\\w]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',\\n- 'info_dict': {\\n- 'id': 'lyNHCXpYJh',\\n- 'ext': 'mp4',\\n- 'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',\\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\\n- 'upload_date': '20220203',\\n- 'thumbnail': r're:https?://.+\\\\.jpg',\\n- 'duration': 1073,\\n- 'view_count': int,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- return self._extract_video(video_id, url)\\n-\\n-\\n-class Alsace20TVEmbedIE(Alsace20TVBaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?alsace20\\\\.tv/emb/(?P<id>[\\\\w]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',\\n- # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',\\n- 'info_dict': {\\n- 'id': 'lyNHCXpYJh',\\n- 'ext': 'mp4',\\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\\n- 'upload_date': '20220203',\\n- 'thumbnail': r're:https?://.+\\\\.jpg',\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'format': 'bestvideo',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- return self._extract_video(video_id)\\ndiff --git a/yt_dlp/extractor/anchorfm.py b/yt_dlp/extractor/anchorfm.py\\ndeleted file mode 100644\\nindex 652154a4a821..000000000000\\n--- a/yt_dlp/extractor/anchorfm.py\\n+++ /dev/null\\n@@ -1,98 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- clean_html,\\n- float_or_none,\\n- int_or_none,\\n- str_or_none,\\n- traverse_obj,\\n- unified_timestamp,\\n-)\\n-\\n-\\n-class AnchorFMEpisodeIE(InfoExtractor):\\n- _VALID_URL = r'https?://anchor\\\\.fm/(?P<channel_name>\\\\w+)/(?:embed/)?episodes/[\\\\w-]+-(?P<episode_id>\\\\w+)'\\n- _EMBED_REGEX = [rf'<iframe[^>]+\\\\bsrc=[\\\\'\\\"](?P<url>{_VALID_URL})']\\n- _TESTS = [{\\n- 'url': 'https://anchor.fm/lovelyti/episodes/Chrisean-Rock-takes-to-twitter-to-announce-shes-pregnant--Blueface-denies-he-is-the-father-e1tpt3d',\\n- 'info_dict': {\\n- 'id': 'e1tpt3d',\\n- 'ext': 'mp3',\\n- 'title': ' Chrisean Rock takes to twitter to announce she\\\\'s pregnant, Blueface denies he is the father!',\\n- 'description': 'md5:207d167de3e28ceb4ddc1ebf5a30044c',\\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_nologo/1034827/1034827-1658438968460-5f3bfdf3601e8.jpg',\\n- 'duration': 624.718,\\n- 'uploader': 'Lovelyti ',\\n- 'uploader_id': '991541',\\n- 'channel': 'lovelyti',\\n- 'modified_date': '20230121',\\n- 'modified_timestamp': 1674285178,\\n- 'release_date': '20230121',\\n- 'release_timestamp': 1674285179,\\n- 'episode_id': 'e1tpt3d',\\n- },\\n- }, {\\n- # embed url\\n- 'url': 'https://anchor.fm/apakatatempo/embed/episodes/S2E75-Perang-Bintang-di-Balik-Kasus-Ferdy-Sambo-dan-Ismail-Bolong-e1shjqd',\\n- 'info_dict': {\\n- 'id': 'e1shjqd',\\n- 'ext': 'mp3',\\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\\n- 'duration': 1042.008,\\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\\n- 'release_date': '20221221',\\n- 'release_timestamp': 1671595916,\\n- 'modified_date': '20221221',\\n- 'modified_timestamp': 1671590834,\\n- 'channel': 'apakatatempo',\\n- 'uploader': 'Podcast Tempo',\\n- 'uploader_id': '2585461',\\n- 'season': 'Season 2',\\n- 'season_number': 2,\\n- 'episode_id': 'e1shjqd',\\n- },\\n- }]\\n-\\n- _WEBPAGE_TESTS = [{\\n- 'url': 'https://podcast.tempo.co/podcast/192/perang-bintang-di-balik-kasus-ferdy-sambo-dan-ismail-bolong',\\n- 'info_dict': {\\n- 'id': 'e1shjqd',\\n- 'ext': 'mp3',\\n- 'release_date': '20221221',\\n- 'duration': 1042.008,\\n- 'season': 'Season 2',\\n- 'modified_timestamp': 1671590834,\\n- 'uploader_id': '2585461',\\n- 'modified_date': '20221221',\\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\\n- 'season_number': 2,\\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\\n- 'release_timestamp': 1671595916,\\n- 'episode_id': 'e1shjqd',\\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\\n- 'uploader': 'Podcast Tempo',\\n- 'channel': 'apakatatempo',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- channel_name, episode_id = self._match_valid_url(url).group('channel_name', 'episode_id')\\n- api_data = self._download_json(f'https://anchor.fm/api/v3/episodes/{episode_id}', episode_id)\\n-\\n- return {\\n- 'id': episode_id,\\n- 'title': traverse_obj(api_data, ('episode', 'title')),\\n- 'url': traverse_obj(api_data, ('episode', 'episodeEnclosureUrl'), ('episodeAudios', 0, 'url')),\\n- 'ext': 'mp3',\\n- 'vcodec': 'none',\\n- 'thumbnail': traverse_obj(api_data, ('episode', 'episodeImage')),\\n- 'description': clean_html(traverse_obj(api_data, ('episode', ('description', 'descriptionPreview')), get_all=False)),\\n- 'duration': float_or_none(traverse_obj(api_data, ('episode', 'duration')), 1000),\\n- 'modified_timestamp': unified_timestamp(traverse_obj(api_data, ('episode', 'modified'))),\\n- 'release_timestamp': int_or_none(traverse_obj(api_data, ('episode', 'publishOnUnixTimestamp'))),\\n- 'episode_id': episode_id,\\n- 'uploader': traverse_obj(api_data, ('creator', 'name')),\\n- 'uploader_id': str_or_none(traverse_obj(api_data, ('creator', 'userId'))),\\n- 'season_number': int_or_none(traverse_obj(api_data, ('episode', 'podcastSeasonNumber'))),\\n- 'channel': channel_name or traverse_obj(api_data, ('creator', 'vanitySlug')),\\n- }\\ndiff --git a/yt_dlp/extractor/appletrailers.py b/yt_dlp/extractor/appletrailers.py\\ndeleted file mode 100644\\nindex 0a600f6df91a..000000000000\\n--- a/yt_dlp/extractor/appletrailers.py\\n+++ /dev/null\\n@@ -1,277 +0,0 @@\\n-import json\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_duration,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class AppleTrailersIE(InfoExtractor):\\n- IE_NAME = 'appletrailers'\\n- _VALID_URL = r'https?://(?:www\\\\.|movie)?trailers\\\\.apple\\\\.com/(?:trailers|ca)/(?P<company>[^/]+)/(?P<movie>[^/]+)'\\n- _TESTS = [{\\n- 'url': 'http://trailers.apple.com/trailers/wb/manofsteel/',\\n- 'info_dict': {\\n- 'id': '5111',\\n- 'title': 'Man of Steel',\\n- },\\n- 'playlist': [\\n- {\\n- 'md5': 'd97a8e575432dbcb81b7c3acb741f8a8',\\n- 'info_dict': {\\n- 'id': 'manofsteel-trailer4',\\n- 'ext': 'mov',\\n- 'duration': 111,\\n- 'title': 'Trailer 4',\\n- 'upload_date': '20130523',\\n- 'uploader_id': 'wb',\\n- },\\n- },\\n- {\\n- 'md5': 'b8017b7131b721fb4e8d6f49e1df908c',\\n- 'info_dict': {\\n- 'id': 'manofsteel-trailer3',\\n- 'ext': 'mov',\\n- 'duration': 182,\\n- 'title': 'Trailer 3',\\n- 'upload_date': '20130417',\\n- 'uploader_id': 'wb',\\n- },\\n- },\\n- {\\n- 'md5': 'd0f1e1150989b9924679b441f3404d48',\\n- 'info_dict': {\\n- 'id': 'manofsteel-trailer',\\n- 'ext': 'mov',\\n- 'duration': 148,\\n- 'title': 'Trailer',\\n- 'upload_date': '20121212',\\n- 'uploader_id': 'wb',\\n- },\\n- },\\n- {\\n- 'md5': '5fe08795b943eb2e757fa95cb6def1cb',\\n- 'info_dict': {\\n- 'id': 'manofsteel-teaser',\\n- 'ext': 'mov',\\n- 'duration': 93,\\n- 'title': 'Teaser',\\n- 'upload_date': '20120721',\\n- 'uploader_id': 'wb',\\n- },\\n- },\\n- ],\\n- }, {\\n- 'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',\\n- 'info_dict': {\\n- 'id': '4489',\\n- 'title': 'Blackthorn',\\n- },\\n- 'playlist_mincount': 2,\\n- 'expected_warnings': ['Unable to download JSON metadata'],\\n- }, {\\n- # json data only available from http://trailers.apple.com/trailers/feeds/data/15881.json\\n- 'url': 'http://trailers.apple.com/trailers/fox/kungfupanda3/',\\n- 'info_dict': {\\n- 'id': '15881',\\n- 'title': 'Kung Fu Panda 3',\\n- },\\n- 'playlist_mincount': 4,\\n- }, {\\n- 'url': 'http://trailers.apple.com/ca/metropole/autrui/',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://movietrailers.apple.com/trailers/focus_features/kuboandthetwostrings/',\\n- 'only_matching': True,\\n- }]\\n-\\n- _JSON_RE = r'iTunes.playURL\\\\((.*?)\\\\);'\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- movie = mobj.group('movie')\\n- uploader_id = mobj.group('company')\\n-\\n- webpage = self._download_webpage(url, movie)\\n- film_id = self._search_regex(r\\\"FilmId\\\\s*=\\\\s*'(\\\\d+)'\\\", webpage, 'film id')\\n- film_data = self._download_json(\\n- f'http://trailers.apple.com/trailers/feeds/data/{film_id}.json',\\n- film_id, fatal=False)\\n-\\n- if film_data:\\n- entries = []\\n- for clip in film_data.get('clips', []):\\n- clip_title = clip['title']\\n-\\n- formats = []\\n- for version, version_data in clip.get('versions', {}).items():\\n- for size, size_data in version_data.get('sizes', {}).items():\\n- src = size_data.get('src')\\n- if not src:\\n- continue\\n- formats.append({\\n- 'format_id': f'{version}-{size}',\\n- 'url': re.sub(r'_(\\\\d+p\\\\.mov)', r'_h\\\\1', src),\\n- 'width': int_or_none(size_data.get('width')),\\n- 'height': int_or_none(size_data.get('height')),\\n- 'language': version[:2],\\n- })\\n-\\n- entries.append({\\n- 'id': movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', clip_title).lower(),\\n- 'formats': formats,\\n- 'title': clip_title,\\n- 'thumbnail': clip.get('screen') or clip.get('thumb'),\\n- 'duration': parse_duration(clip.get('runtime') or clip.get('faded')),\\n- 'upload_date': unified_strdate(clip.get('posted')),\\n- 'uploader_id': uploader_id,\\n- })\\n-\\n- page_data = film_data.get('page', {})\\n- return self.playlist_result(entries, film_id, page_data.get('movie_title'))\\n-\\n- playlist_url = urllib.parse.urljoin(url, 'includes/playlists/itunes.inc')\\n-\\n- def fix_html(s):\\n- s = re.sub(r'(?s)<script[^<]*?>.*?</script>', '', s)\\n- s = re.sub(r'<img ([^<]*?)/?>', r'<img \\\\1/>', s)\\n- # The ' in the onClick attributes are not escaped, it couldn't be parsed\\n- # like: http://trailers.apple.com/trailers/wb/gravity/\\n-\\n- def _clean_json(m):\\n- return 'iTunes.playURL({});'.format(m.group(1).replace('\\\\'', '''))\\n- s = re.sub(self._JSON_RE, _clean_json, s)\\n- return f'<html>{s}</html>'\\n- doc = self._download_xml(playlist_url, movie, transform_source=fix_html)\\n-\\n- playlist = []\\n- for li in doc.findall('./div/ul/li'):\\n- on_click = li.find('.//a').attrib['onClick']\\n- trailer_info_json = self._search_regex(self._JSON_RE,\\n- on_click, 'trailer info')\\n- trailer_info = json.loads(trailer_info_json)\\n- first_url = trailer_info.get('url')\\n- if not first_url:\\n- continue\\n- title = trailer_info['title']\\n- video_id = movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', title).lower()\\n- thumbnail = li.find('.//img').attrib['src']\\n- upload_date = trailer_info['posted'].replace('-', '')\\n-\\n- runtime = trailer_info['runtime']\\n- m = re.search(r'(?P<minutes>[0-9]+):(?P<seconds>[0-9]{1,2})', runtime)\\n- duration = None\\n- if m:\\n- duration = 60 * int(m.group('minutes')) + int(m.group('seconds'))\\n-\\n- trailer_id = first_url.split('/')[-1].rpartition('_')[0].lower()\\n- settings_json_url = urllib.parse.urljoin(url, f'includes/settings/{trailer_id}.json')\\n- settings = self._download_json(settings_json_url, trailer_id, 'Downloading settings json')\\n-\\n- formats = []\\n- for fmt in settings['metadata']['sizes']:\\n- # The src is a file pointing to the real video file\\n- format_url = re.sub(r'_(\\\\d*p\\\\.mov)', r'_h\\\\1', fmt['src'])\\n- formats.append({\\n- 'url': format_url,\\n- 'format': fmt['type'],\\n- 'width': int_or_none(fmt['width']),\\n- 'height': int_or_none(fmt['height']),\\n- })\\n-\\n- playlist.append({\\n- '_type': 'video',\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'title': title,\\n- 'duration': duration,\\n- 'thumbnail': thumbnail,\\n- 'upload_date': upload_date,\\n- 'uploader_id': uploader_id,\\n- 'http_headers': {\\n- 'User-Agent': 'QuickTime compatible (yt-dlp)',\\n- },\\n- })\\n-\\n- return {\\n- '_type': 'playlist',\\n- 'id': movie,\\n- 'entries': playlist,\\n- }\\n-\\n-\\n-class AppleTrailersSectionIE(InfoExtractor):\\n- IE_NAME = 'appletrailers:section'\\n- _SECTIONS = {\\n- 'justadded': {\\n- 'feed_path': 'just_added',\\n- 'title': 'Just Added',\\n- },\\n- 'exclusive': {\\n- 'feed_path': 'exclusive',\\n- 'title': 'Exclusive',\\n- },\\n- 'justhd': {\\n- 'feed_path': 'just_hd',\\n- 'title': 'Just HD',\\n- },\\n- 'mostpopular': {\\n- 'feed_path': 'most_pop',\\n- 'title': 'Most Popular',\\n- },\\n- 'moviestudios': {\\n- 'feed_path': 'studios',\\n- 'title': 'Movie Studios',\\n- },\\n- }\\n- _VALID_URL = r'https?://(?:www\\\\.)?trailers\\\\.apple\\\\.com/#section=(?P<id>{})'.format('|'.join(_SECTIONS))\\n- _TESTS = [{\\n- 'url': 'http://trailers.apple.com/#section=justadded',\\n- 'info_dict': {\\n- 'title': 'Just Added',\\n- 'id': 'justadded',\\n- },\\n- 'playlist_mincount': 80,\\n- }, {\\n- 'url': 'http://trailers.apple.com/#section=exclusive',\\n- 'info_dict': {\\n- 'title': 'Exclusive',\\n- 'id': 'exclusive',\\n- },\\n- 'playlist_mincount': 80,\\n- }, {\\n- 'url': 'http://trailers.apple.com/#section=justhd',\\n- 'info_dict': {\\n- 'title': 'Just HD',\\n- 'id': 'justhd',\\n- },\\n- 'playlist_mincount': 80,\\n- }, {\\n- 'url': 'http://trailers.apple.com/#section=mostpopular',\\n- 'info_dict': {\\n- 'title': 'Most Popular',\\n- 'id': 'mostpopular',\\n- },\\n- 'playlist_mincount': 30,\\n- }, {\\n- 'url': 'http://trailers.apple.com/#section=moviestudios',\\n- 'info_dict': {\\n- 'title': 'Movie Studios',\\n- 'id': 'moviestudios',\\n- },\\n- 'playlist_mincount': 80,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- section = self._match_id(url)\\n- section_data = self._download_json(\\n- 'http://trailers.apple.com/trailers/home/feeds/{}.json'.format(self._SECTIONS[section]['feed_path']),\\n- section)\\n- entries = [\\n- self.url_result('http://trailers.apple.com' + e['location'])\\n- for e in section_data]\\n- return self.playlist_result(entries, section, self._SECTIONS[section]['title'])\\ndiff --git a/yt_dlp/extractor/atvat.py b/yt_dlp/extractor/atvat.py\\ndeleted file mode 100644\\nindex b05eccf182ba..000000000000\\n--- a/yt_dlp/extractor/atvat.py\\n+++ /dev/null\\n@@ -1,107 +0,0 @@\\n-import datetime as dt\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- float_or_none,\\n- jwt_encode,\\n- try_get,\\n-)\\n-\\n-\\n-class ATVAtIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?atv\\\\.at/tv/(?:[^/]+/){2,3}(?P<id>.*)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/bauer-sucht-frau/bauer-sucht-frau-staffel-18-folge-3-die-hofwochen',\\n- 'md5': '3c3b4aaca9f63e32b35e04a9c2515903',\\n- 'info_dict': {\\n- 'id': 'v-ce9cgn1e70n5-1',\\n- 'ext': 'mp4',\\n- 'title': 'Bauer sucht Frau - Staffel 18 Folge 3 - Die Hofwochen',\\n- },\\n- }, {\\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/episode-01/bauer-sucht-frau-staffel-18-vorstellungsfolge-1',\\n- 'only_matching': True,\\n- }]\\n-\\n- # extracted from bootstrap.js function (search for e.encryption_key and use your browser's debugger)\\n- _ACCESS_ID = 'x_atv'\\n- _ENCRYPTION_KEY = 'Hohnaekeishoogh2omaeghooquooshia'\\n-\\n- def _extract_video_info(self, url, content, video):\\n- clip_id = content.get('splitId', content['id'])\\n- formats = []\\n- clip_urls = video['urls']\\n- for protocol, variant in clip_urls.items():\\n- source_url = try_get(variant, lambda x: x['clear']['url'])\\n- if not source_url:\\n- continue\\n- if protocol == 'dash':\\n- formats.extend(self._extract_mpd_formats(\\n- source_url, clip_id, mpd_id=protocol, fatal=False))\\n- elif protocol == 'hls':\\n- formats.extend(self._extract_m3u8_formats(\\n- source_url, clip_id, 'mp4', 'm3u8_native',\\n- m3u8_id=protocol, fatal=False))\\n- else:\\n- formats.append({\\n- 'url': source_url,\\n- 'format_id': protocol,\\n- })\\n-\\n- return {\\n- 'id': clip_id,\\n- 'title': content.get('title'),\\n- 'duration': float_or_none(content.get('duration')),\\n- 'series': content.get('tvShowTitle'),\\n- 'formats': formats,\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n- json_data = self._parse_json(\\n- self._search_regex(r'<script id=\\\"state\\\" type=\\\"text/plain\\\">(.*)</script>', webpage, 'json_data'),\\n- video_id=video_id)\\n-\\n- video_title = json_data['views']['default']['page']['title']\\n- content_resource = json_data['views']['default']['page']['contentResource']\\n- content_id = content_resource[0]['id']\\n- content_ids = [{'id': id_, 'subclip_start': content['start'], 'subclip_end': content['end']}\\n- for id_, content in enumerate(content_resource)]\\n-\\n- time_of_request = dt.datetime.now()\\n- not_before = time_of_request - dt.timedelta(minutes=5)\\n- expire = time_of_request + dt.timedelta(minutes=5)\\n- payload = {\\n- 'content_ids': {\\n- content_id: content_ids,\\n- },\\n- 'secure_delivery': True,\\n- 'iat': int(time_of_request.timestamp()),\\n- 'nbf': int(not_before.timestamp()),\\n- 'exp': int(expire.timestamp()),\\n- }\\n- videos = self._download_json(\\n- 'https://vas-v4.p7s1video.net/4.0/getsources',\\n- content_id, 'Downloading videos JSON', query={\\n- 'token': jwt_encode(payload, self._ENCRYPTION_KEY, headers={'kid': self._ACCESS_ID}),\\n- })\\n-\\n- video_id, videos_data = next(iter(videos['data'].items()))\\n- error_msg = try_get(videos_data, lambda x: x['error']['title'])\\n- if error_msg == 'Geo check failed':\\n- self.raise_geo_restricted(error_msg)\\n- elif error_msg:\\n- raise ExtractorError(error_msg)\\n- entries = [\\n- self._extract_video_info(url, content_resource[video['id']], video)\\n- for video in videos_data]\\n-\\n- return {\\n- '_type': 'multi_video',\\n- 'id': video_id,\\n- 'title': video_title,\\n- 'entries': entries,\\n- }\\ndiff --git a/yt_dlp/extractor/awaan.py b/yt_dlp/extractor/awaan.py\\ndeleted file mode 100644\\nindex 4066a5a83f2a..000000000000\\n--- a/yt_dlp/extractor/awaan.py\\n+++ /dev/null\\n@@ -1,181 +0,0 @@\\n-import base64\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- format_field,\\n- int_or_none,\\n- parse_iso8601,\\n- smuggle_url,\\n- unsmuggle_url,\\n- urlencode_postdata,\\n-)\\n-\\n-\\n-class AWAANIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:awaan|dcndigital)\\\\.ae/(?:#/)?show/(?P<show_id>\\\\d+)/[^/]+(?:/(?P<id>\\\\d+)/(?P<season_id>\\\\d+))?'\\n-\\n- def _real_extract(self, url):\\n- show_id, video_id, season_id = self._match_valid_url(url).groups()\\n- if video_id and int(video_id) > 0:\\n- return self.url_result(\\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo')\\n- elif season_id and int(season_id) > 0:\\n- return self.url_result(smuggle_url(\\n- f'http://awaan.ae/program/season/{season_id}',\\n- {'show_id': show_id}), 'AWAANSeason')\\n- else:\\n- return self.url_result(\\n- f'http://awaan.ae/program/{show_id}', 'AWAANSeason')\\n-\\n-\\n-class AWAANBaseIE(InfoExtractor):\\n- def _parse_video_data(self, video_data, video_id, is_live):\\n- title = video_data.get('title_en') or video_data['title_ar']\\n- img = video_data.get('img')\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': video_data.get('description_en') or video_data.get('description_ar'),\\n- 'thumbnail': format_field(img, None, 'http://admin.mangomolo.com/analytics/%s'),\\n- 'duration': int_or_none(video_data.get('duration')),\\n- 'timestamp': parse_iso8601(video_data.get('create_time'), ' '),\\n- 'is_live': is_live,\\n- 'uploader_id': video_data.get('user_id'),\\n- }\\n-\\n-\\n-class AWAANVideoIE(AWAANBaseIE):\\n- IE_NAME = 'awaan:video'\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:awaan|dcndigital)\\\\.ae/(?:#/)?(?:video(?:/[^/]+)?|media|catchup/[^/]+/[^/]+)/(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- 'url': 'http://www.dcndigital.ae/#/video/%D8%B1%D8%AD%D9%84%D8%A9-%D8%A7%D9%84%D8%B9%D9%85%D8%B1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/17375',\\n- 'md5': '5f61c33bfc7794315c671a62d43116aa',\\n- 'info_dict':\\n- {\\n- 'id': '17375',\\n- 'ext': 'mp4',\\n- 'title': 'ุฑุญูุฉ ุงูุนู
ุฑ : ุงูุญููุฉ 1',\\n- 'description': 'md5:0156e935d870acb8ef0a66d24070c6d6',\\n- 'duration': 2041,\\n- 'timestamp': 1227504126,\\n- 'upload_date': '20081124',\\n- 'uploader_id': '71',\\n- },\\n- }, {\\n- 'url': 'http://awaan.ae/video/26723981/%D8%AF%D8%A7%D8%B1-%D8%A7%D9%84%D8%B3%D9%84%D8%A7%D9%85:-%D8%AE%D9%8A%D8%B1-%D8%AF%D9%88%D8%B1-%D8%A7%D9%84%D8%A3%D9%86%D8%B5%D8%A7%D8%B1',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- video_data = self._download_json(\\n- f'http://admin.mangomolo.com/analytics/index.php/plus/video?id={video_id}',\\n- video_id, headers={'Origin': 'http://awaan.ae'})\\n- info = self._parse_video_data(video_data, video_id, False)\\n-\\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' + urllib.parse.urlencode({\\n- 'id': video_data['id'],\\n- 'user_id': video_data['user_id'],\\n- 'signature': video_data['signature'],\\n- 'countries': 'Q0M=',\\n- 'filter': 'DENY',\\n- })\\n- info.update({\\n- '_type': 'url_transparent',\\n- 'url': embed_url,\\n- 'ie_key': 'MangomoloVideo',\\n- })\\n- return info\\n-\\n-\\n-class AWAANLiveIE(AWAANBaseIE):\\n- IE_NAME = 'awaan:live'\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:awaan|dcndigital)\\\\.ae/(?:#/)?live/(?P<id>\\\\d+)'\\n- _TEST = {\\n- 'url': 'http://awaan.ae/live/6/dubai-tv',\\n- 'info_dict': {\\n- 'id': '6',\\n- 'ext': 'mp4',\\n- 'title': 're:Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\\n- 'upload_date': '20150107',\\n- 'timestamp': 1420588800,\\n- 'uploader_id': '71',\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- channel_id = self._match_id(url)\\n-\\n- channel_data = self._download_json(\\n- f'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id={channel_id}',\\n- channel_id, headers={'Origin': 'http://awaan.ae'})\\n- info = self._parse_video_data(channel_data, channel_id, True)\\n-\\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' + urllib.parse.urlencode({\\n- 'id': base64.b64encode(channel_data['user_id'].encode()).decode(),\\n- 'channelid': base64.b64encode(channel_data['id'].encode()).decode(),\\n- 'signature': channel_data['signature'],\\n- 'countries': 'Q0M=',\\n- 'filter': 'DENY',\\n- })\\n- info.update({\\n- '_type': 'url_transparent',\\n- 'url': embed_url,\\n- 'ie_key': 'MangomoloLive',\\n- })\\n- return info\\n-\\n-\\n-class AWAANSeasonIE(InfoExtractor):\\n- IE_NAME = 'awaan:season'\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:awaan|dcndigital)\\\\.ae/(?:#/)?program/(?:(?P<show_id>\\\\d+)|season/(?P<season_id>\\\\d+))'\\n- _TEST = {\\n- 'url': 'http://dcndigital.ae/#/program/205024/%D9%85%D8%AD%D8%A7%D8%B6%D8%B1%D8%A7%D8%AA-%D8%A7%D9%84%D8%B4%D9%8A%D8%AE-%D8%A7%D9%84%D8%B4%D8%B9%D8%B1%D8%A7%D9%88%D9%8A',\\n- 'info_dict':\\n- {\\n- 'id': '7910',\\n- 'title': 'ู
ุญุงุถุฑุงุช ุงูุดูุฎ ุงูุดุนุฑุงูู',\\n- },\\n- 'playlist_mincount': 27,\\n- }\\n-\\n- def _real_extract(self, url):\\n- url, smuggled_data = unsmuggle_url(url, {})\\n- show_id, season_id = self._match_valid_url(url).groups()\\n-\\n- data = {}\\n- if season_id:\\n- data['season'] = season_id\\n- show_id = smuggled_data.get('show_id')\\n- if show_id is None:\\n- season = self._download_json(\\n- f'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id={season_id}',\\n- season_id, headers={'Origin': 'http://awaan.ae'})\\n- show_id = season['id']\\n- data['show_id'] = show_id\\n- show = self._download_json(\\n- 'http://admin.mangomolo.com/analytics/index.php/plus/show',\\n- show_id, data=urlencode_postdata(data), headers={\\n- 'Origin': 'http://awaan.ae',\\n- 'Content-Type': 'application/x-www-form-urlencoded',\\n- })\\n- if not season_id:\\n- season_id = show['default_season']\\n- for season in show['seasons']:\\n- if season['id'] == season_id:\\n- title = season.get('title_en') or season['title_ar']\\n-\\n- entries = []\\n- for video in show['videos']:\\n- video_id = str(video['id'])\\n- entries.append(self.url_result(\\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo', video_id))\\n-\\n- return self.playlist_result(entries, season_id, title)\\ndiff --git a/yt_dlp/extractor/axs.py b/yt_dlp/extractor/axs.py\\ndeleted file mode 100644\\nindex 7e9166771239..000000000000\\n--- a/yt_dlp/extractor/axs.py\\n+++ /dev/null\\n@@ -1,89 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- float_or_none,\\n- js_to_json,\\n- parse_iso8601,\\n- traverse_obj,\\n- url_or_none,\\n-)\\n-\\n-\\n-class AxsIE(InfoExtractor):\\n- IE_NAME = 'axs.tv'\\n- _VALID_URL = r'https?://(?:www\\\\.)?axs\\\\.tv/(?:channel/(?:[^/?#]+/)+)?video/(?P<id>[^/?#]+)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.axs.tv/video/5f4dc776b70e4f1c194f22ef/',\\n- 'md5': '8d97736ae8e50c64df528e5e676778cf',\\n- 'info_dict': {\\n- 'id': '5f4dc776b70e4f1c194f22ef',\\n- 'title': 'Small Town',\\n- 'ext': 'mp4',\\n- 'description': 'md5:e314d28bfaa227a4d7ec965fae19997f',\\n- 'upload_date': '20230602',\\n- 'timestamp': 1685729564,\\n- 'duration': 1284.216,\\n- 'series': 'Rock & Roll Road Trip with Sammy Hagar',\\n- 'season': 'Season 2',\\n- 'season_number': 2,\\n- 'episode': '3',\\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4e9d330a0c3b295a7e8394',\\n- },\\n- }, {\\n- 'url': 'https://www.axs.tv/channel/rock-star-interview/video/daryl-hall',\\n- 'md5': '300ae795cd8f9984652c0949734ffbdc',\\n- 'info_dict': {\\n- 'id': '5f488148b70e4f392572977c',\\n- 'display_id': 'daryl-hall',\\n- 'title': 'Daryl Hall',\\n- 'ext': 'mp4',\\n- 'description': 'md5:e54ecaa0f4b5683fc9259e9e4b196628',\\n- 'upload_date': '20230214',\\n- 'timestamp': 1676403615,\\n- 'duration': 2570.668,\\n- 'series': 'The Big Interview with Dan Rather',\\n- 'season': 'Season 3',\\n- 'season_number': 3,\\n- 'episode': '5',\\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4d1901f340b50d937cec32',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- webpage_json_data = self._search_json(\\n- r'mountObj\\\\s*=', webpage, 'video ID data', display_id,\\n- transform_source=js_to_json)\\n- video_id = webpage_json_data['video_id']\\n- company_id = webpage_json_data['company_id']\\n-\\n- meta = self._download_json(\\n- f'https://api.myspotlight.tv/dotplayer/video/{company_id}/{video_id}',\\n- video_id, query={'device_type': 'desktop_web'})['video']\\n-\\n- formats = self._extract_m3u8_formats(\\n- meta['video_m3u8'], video_id, 'mp4', m3u8_id='hls')\\n-\\n- subtitles = {}\\n- for cc in traverse_obj(meta, ('closeCaption', lambda _, v: url_or_none(v['srtPath']))):\\n- subtitles.setdefault(cc.get('srtShortLang') or 'en', []).append(\\n- {'ext': cc.get('srtExt'), 'url': cc['srtPath']})\\n-\\n- return {\\n- 'id': video_id,\\n- 'display_id': display_id,\\n- 'formats': formats,\\n- **traverse_obj(meta, {\\n- 'title': ('title', {str}),\\n- 'description': ('description', {str}),\\n- 'series': ('seriestitle', {str}),\\n- 'season_number': ('season', {int}),\\n- 'episode': ('episode', {str}),\\n- 'duration': ('duration', {float_or_none}),\\n- 'timestamp': ('updated_at', {parse_iso8601}),\\n- 'thumbnail': ('thumb', {url_or_none}),\\n- }),\\n- 'subtitles': subtitles,\\n- }\\ndiff --git a/yt_dlp/extractor/beatbump.py b/yt_dlp/extractor/beatbump.py\\ndeleted file mode 100644\\nindex 777a1b3268df..000000000000\\n--- a/yt_dlp/extractor/beatbump.py\\n+++ /dev/null\\n@@ -1,111 +0,0 @@\\n-from .common import InfoExtractor\\n-from .youtube import YoutubeIE, YoutubeTabIE\\n-\\n-\\n-class BeatBumpVideoIE(InfoExtractor):\\n- _VALID_URL = r'https?://beatbump\\\\.(?:ml|io)/listen\\\\?id=(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://beatbump.ml/listen?id=MgNrAu2pzNs',\\n- 'md5': '5ff3fff41d3935b9810a9731e485fe66',\\n- 'info_dict': {\\n- 'id': 'MgNrAu2pzNs',\\n- 'ext': 'mp4',\\n- 'artist': 'Stephen',\\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',\\n- 'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',\\n- 'upload_date': '20190312',\\n- 'categories': ['Music'],\\n- 'playable_in_embed': True,\\n- 'duration': 169,\\n- 'like_count': int,\\n- 'alt_title': 'Voyeur Girl',\\n- 'view_count': int,\\n- 'track': 'Voyeur Girl',\\n- 'uploader': 'Stephen',\\n- 'title': 'Voyeur Girl',\\n- 'channel_follower_count': int,\\n- 'age_limit': 0,\\n- 'availability': 'public',\\n- 'live_status': 'not_live',\\n- 'album': 'it\\\\'s too much love to know my dear',\\n- 'channel': 'Stephen',\\n- 'comment_count': int,\\n- 'description': 'md5:7ae382a65843d6df2685993e90a8628f',\\n- 'tags': 'count:11',\\n- 'creator': 'Stephen',\\n- 'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',\\n- 'channel_is_verified': True,\\n- 'heatmap': 'count:100',\\n- },\\n- }, {\\n- 'url': 'https://beatbump.io/listen?id=LDGZAprNGWo',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- id_ = self._match_id(url)\\n- return self.url_result(f'https://music.youtube.com/watch?v={id_}', YoutubeIE, id_)\\n-\\n-\\n-class BeatBumpPlaylistIE(InfoExtractor):\\n- _VALID_URL = r'https?://beatbump\\\\.(?:ml|io)/(?:release\\\\?id=|artist/|playlist/)(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://beatbump.ml/release?id=MPREb_gTAcphH99wE',\\n- 'playlist_count': 50,\\n- 'info_dict': {\\n- 'id': 'OLAK5uy_l1m0thk3g31NmIIz_vMIbWtyv7eZixlH0',\\n- 'availability': 'unlisted',\\n- 'view_count': int,\\n- 'title': 'Album - Royalty Free Music Library V2 (50 Songs)',\\n- 'description': '',\\n- 'tags': [],\\n- 'modified_date': '20231110',\\n- },\\n- 'expected_warnings': ['YouTube Music is not directly supported'],\\n- }, {\\n- 'url': 'https://beatbump.ml/artist/UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- 'playlist_mincount': 1,\\n- 'params': {'flatplaylist': True},\\n- 'info_dict': {\\n- 'id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- 'uploader_id': '@NoCopyrightSounds',\\n- 'channel_follower_count': int,\\n- 'title': 'NoCopyrightSounds',\\n- 'uploader': 'NoCopyrightSounds',\\n- 'description': 'md5:cd4fd53d81d363d05eee6c1b478b491a',\\n- 'channel': 'NoCopyrightSounds',\\n- 'tags': 'count:65',\\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- 'channel_is_verified': True,\\n- },\\n- 'expected_warnings': ['YouTube Music is not directly supported'],\\n- }, {\\n- 'url': 'https://beatbump.ml/playlist/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\\n- 'playlist_mincount': 1,\\n- 'params': {'flatplaylist': True},\\n- 'info_dict': {\\n- 'id': 'PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\\n- 'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',\\n- 'view_count': int,\\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- 'uploader_id': '@NoCopyrightSounds',\\n- 'title': 'NCS : All Releases ๐ฟ',\\n- 'uploader': 'NoCopyrightSounds',\\n- 'availability': 'public',\\n- 'channel': 'NoCopyrightSounds',\\n- 'tags': [],\\n- 'modified_date': '20231112',\\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\\n- },\\n- 'expected_warnings': ['YouTube Music is not directly supported'],\\n- }, {\\n- 'url': 'https://beatbump.io/playlist/VLPLFCHGavqRG-q_2ZhmgU2XB2--ZY6irT1c',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- id_ = self._match_id(url)\\n- return self.url_result(f'https://music.youtube.com/browse/{id_}', YoutubeTabIE, id_)\\ndiff --git a/yt_dlp/extractor/bigflix.py b/yt_dlp/extractor/bigflix.py\\ndeleted file mode 100644\\nindex 9c55bb9682ef..000000000000\\n--- a/yt_dlp/extractor/bigflix.py\\n+++ /dev/null\\n@@ -1,71 +0,0 @@\\n-import base64\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-\\n-\\n-class BigflixIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?bigflix\\\\.com/.+/(?P<id>[0-9]+)'\\n- _TESTS = [{\\n- # 2 formats\\n- 'url': 'http://www.bigflix.com/Tamil-movies/Drama-movies/Madarasapatinam/16070',\\n- 'info_dict': {\\n- 'id': '16070',\\n- 'ext': 'mp4',\\n- 'title': 'Madarasapatinam',\\n- 'description': 'md5:9f0470b26a4ba8e824c823b5d95c2f6b',\\n- 'formats': 'mincount:2',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- # multiple formats\\n- 'url': 'http://www.bigflix.com/Malayalam-movies/Drama-movies/Indian-Rupee/15967',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- title = self._html_search_regex(\\n- r'<div[^>]+class=[\\\"\\\\']pagetitle[\\\"\\\\'][^>]*>(.+?)</div>',\\n- webpage, 'title')\\n-\\n- def decode_url(quoted_b64_url):\\n- return base64.b64decode(urllib.parse.unquote(\\n- quoted_b64_url)).decode('utf-8')\\n-\\n- formats = []\\n- for height, encoded_url in re.findall(\\n- r'ContentURL_(\\\\d{3,4})[pP][^=]+=([^&]+)', webpage):\\n- video_url = decode_url(encoded_url)\\n- f = {\\n- 'url': video_url,\\n- 'format_id': f'{height}p',\\n- 'height': int(height),\\n- }\\n- if video_url.startswith('rtmp'):\\n- f['ext'] = 'flv'\\n- formats.append(f)\\n-\\n- file_url = self._search_regex(\\n- r'file=([^&]+)', webpage, 'video url', default=None)\\n- if file_url:\\n- video_url = decode_url(file_url)\\n- if all(f['url'] != video_url for f in formats):\\n- formats.append({\\n- 'url': decode_url(file_url),\\n- })\\n-\\n- description = self._html_search_meta('description', webpage)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': description,\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/bokecc.py b/yt_dlp/extractor/bokecc.py\\ndeleted file mode 100644\\nindex 42047aced12a..000000000000\\n--- a/yt_dlp/extractor/bokecc.py\\n+++ /dev/null\\n@@ -1,52 +0,0 @@\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import ExtractorError\\n-\\n-\\n-class BokeCCBaseIE(InfoExtractor):\\n- def _extract_bokecc_formats(self, webpage, video_id, format_id=None):\\n- player_params_str = self._html_search_regex(\\n- r'<(?:script|embed)[^>]+src=(?P<q>[\\\"\\\\'])(?:https?:)?//p\\\\.bokecc\\\\.com/(?:player|flash/player\\\\.swf)\\\\?(?P<query>.+?)(?P=q)',\\n- webpage, 'player params', group='query')\\n-\\n- player_params = urllib.parse.parse_qs(player_params_str)\\n-\\n- info_xml = self._download_xml(\\n- 'http://p.bokecc.com/servlet/playinfo?uid={}&vid={}&m=1'.format(\\n- player_params['siteid'][0], player_params['vid'][0]), video_id)\\n-\\n- return [{\\n- 'format_id': format_id,\\n- 'url': quality.find('./copy').attrib['playurl'],\\n- 'quality': int(quality.attrib['value']),\\n- } for quality in info_xml.findall('./video/quality')]\\n-\\n-\\n-class BokeCCIE(BokeCCBaseIE):\\n- IE_DESC = 'CC่ง้ข'\\n- _VALID_URL = r'https?://union\\\\.bokecc\\\\.com/playvideo\\\\.bo\\\\?(?P<query>.*)'\\n-\\n- _TESTS = [{\\n- 'url': 'http://union.bokecc.com/playvideo.bo?vid=E0ABAE9D4F509B189C33DC5901307461&uid=FE644790DE9D154A',\\n- 'info_dict': {\\n- 'id': 'FE644790DE9D154A_E0ABAE9D4F509B189C33DC5901307461',\\n- 'ext': 'flv',\\n- 'title': 'BokeCC Video',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- qs = urllib.parse.parse_qs(self._match_valid_url(url).group('query'))\\n- if not qs.get('vid') or not qs.get('uid'):\\n- raise ExtractorError('Invalid URL', expected=True)\\n-\\n- video_id = '{}_{}'.format(qs['uid'][0], qs['vid'][0])\\n-\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': 'BokeCC Video', # no title provided in the webpage\\n- 'formats': self._extract_bokecc_formats(webpage, video_id),\\n- }\\ndiff --git a/yt_dlp/extractor/caffeinetv.py b/yt_dlp/extractor/caffeinetv.py\\ndeleted file mode 100644\\nindex ea5134d2f398..000000000000\\n--- a/yt_dlp/extractor/caffeinetv.py\\n+++ /dev/null\\n@@ -1,74 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- determine_ext,\\n- int_or_none,\\n- parse_iso8601,\\n- traverse_obj,\\n- urljoin,\\n-)\\n-\\n-\\n-class CaffeineTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?caffeine\\\\.tv/[^/?#]+/video/(?P<id>[\\\\da-f-]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',\\n- 'info_dict': {\\n- 'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',\\n- 'ext': 'mp4',\\n- 'title': 'GOOOOD MORNINNNNN #highlights',\\n- 'timestamp': 1654702180,\\n- 'upload_date': '20220608',\\n- 'uploader': 'RahJON Wicc',\\n- 'uploader_id': 'TsuSurf',\\n- 'duration': 3145,\\n- 'age_limit': 17,\\n- 'thumbnail': 'https://www.caffeine.tv/broadcasts/776b6f84-9cd5-42e3-af1d-4a776eeed697/replay/lobby.jpg',\\n- 'comment_count': int,\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'tags': ['highlights', 'battlerap'],\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- json_data = self._download_json(\\n- f'https://api.caffeine.tv/social/public/activity/{video_id}', video_id)\\n- broadcast_info = traverse_obj(json_data, ('broadcast_info', {dict})) or {}\\n-\\n- video_url = broadcast_info['video_url']\\n- ext = determine_ext(video_url)\\n- if ext == 'm3u8':\\n- formats = self._extract_m3u8_formats(video_url, video_id, 'mp4')\\n- else:\\n- formats = [{'url': video_url}]\\n-\\n- return {\\n- 'id': video_id,\\n- 'formats': formats,\\n- **traverse_obj(json_data, {\\n- 'like_count': ('like_count', {int_or_none}),\\n- 'view_count': ('view_count', {int_or_none}),\\n- 'comment_count': ('comment_count', {int_or_none}),\\n- 'tags': ('tags', ..., {str}, filter),\\n- 'uploader': ('user', 'name', {str}),\\n- 'uploader_id': (((None, 'user'), 'username'), {str}, any),\\n- 'is_live': ('is_live', {bool}),\\n- }),\\n- **traverse_obj(broadcast_info, {\\n- 'title': ('broadcast_title', {str}),\\n- 'duration': ('content_duration', {int_or_none}),\\n- 'timestamp': ('broadcast_start_time', {parse_iso8601}),\\n- 'thumbnail': ('preview_image_path', {urljoin(url)}),\\n- }),\\n- 'age_limit': {\\n- # assume Apple Store ratings: https://en.wikipedia.org/wiki/Mobile_software_content_rating_system\\n- 'FOUR_PLUS': 0,\\n- 'NINE_PLUS': 9,\\n- 'TWELVE_PLUS': 12,\\n- 'SEVENTEEN_PLUS': 17,\\n- }.get(broadcast_info.get('content_rating'), 17),\\n- }\\ndiff --git a/yt_dlp/extractor/callin.py b/yt_dlp/extractor/callin.py\\ndeleted file mode 100644\\nindex ee2e56f8e0ca..000000000000\\n--- a/yt_dlp/extractor/callin.py\\n+++ /dev/null\\n@@ -1,155 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import float_or_none, int_or_none, make_archive_id, traverse_obj\\n-\\n-\\n-class CallinIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?callin\\\\.com/episode/(?P<id>[-a-zA-Z]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.callin.com/episode/the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\\n- 'info_dict': {\\n- 'id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\\n- 'title': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\\n- 'ext': 'ts',\\n- 'display_id': 'the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\\n- 'thumbnail': 're:https://.+\\\\\\\\.png',\\n- 'description': 'First episode',\\n- 'uploader': 'Wesley Yang',\\n- 'timestamp': 1639404128.65,\\n- 'upload_date': '20211213',\\n- 'uploader_id': 'wesyang',\\n- 'uploader_url': 'http://wesleyyang.substack.com',\\n- 'channel': 'Conversations in Year Zero',\\n- 'channel_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\\n- 'channel_url': 'https://callin.com/show/conversations-in-year-zero-oJNllRFSfx',\\n- 'duration': 9951.936,\\n- 'view_count': int,\\n- 'categories': ['News & Politics', 'History', 'Technology'],\\n- 'cast': ['Wesley Yang', 'KC Johnson', 'Gabi Abramovich'],\\n- 'series': 'Conversations in Year Zero',\\n- 'series_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\\n- 'episode': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\\n- 'episode_number': 1,\\n- 'episode_id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\\n- },\\n- }, {\\n- 'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\\n- 'md5': '14ede27ee2c957b7e4db93140fc0745c',\\n- 'info_dict': {\\n- 'id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\\n- 'ext': 'ts',\\n- 'title': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\\n- 'description': 'Or, why the government doesnโt like SpaceX',\\n- 'channel': 'The Pull Request',\\n- 'channel_url': 'https://callin.com/show/the-pull-request-ucnDJmEKAa',\\n- 'duration': 3182.472,\\n- 'series_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\\n- 'uploader_url': 'http://thepullrequest.com',\\n- 'upload_date': '20220902',\\n- 'episode': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\\n- 'display_id': 'fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\\n- 'series': 'The Pull Request',\\n- 'channel_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\\n- 'view_count': int,\\n- 'uploader': 'Antonio Garcรญa Martรญnez',\\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/1ade9142625344045dc17cf523469ced1d93610762f4c886d06aa190a2f979e8.png',\\n- 'episode_id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\\n- 'timestamp': 1662100688.005,\\n- },\\n- }, {\\n- 'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',\\n- 'md5': '16f704ddbf82a27e3930533b12062f07',\\n- 'info_dict': {\\n- 'id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\\n- 'ext': 'ts',\\n- 'title': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\\n- 'description': 'Letโs talk todays episode about the primary election shake up in NYC and the elites melting down over student debt cancelation.',\\n- 'channel': 'The DEBRIEF With Briahna Joy Gray',\\n- 'channel_url': 'https://callin.com/show/the-debrief-with-briahna-joy-gray-siiFDzGegm',\\n- 'duration': 10043.16,\\n- 'series_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\\n- 'uploader_url': 'http://patreon.com/badfaithpodcast',\\n- 'upload_date': '20220826',\\n- 'episode': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\\n- 'display_id': 'episode-',\\n- 'series': 'The DEBRIEF With Briahna Joy Gray',\\n- 'channel_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\\n- 'view_count': int,\\n- 'uploader': 'Briahna Gray',\\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/461ea0d86172cb6aff7d6c80fd49259cf5e64bdf737a4650f8bc24cf392ca218.png',\\n- 'episode_id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\\n- 'timestamp': 1661476708.282,\\n- },\\n- }]\\n-\\n- def try_get_user_name(self, d):\\n- names = [d.get(n) for n in ('first', 'last')]\\n- if None in names:\\n- return next((n for n in names if n), default=None)\\n- return ' '.join(names)\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- next_data = self._search_nextjs_data(webpage, display_id)\\n- episode = next_data['props']['pageProps']['episode']\\n-\\n- video_id = episode['id']\\n- title = episode.get('title') or self._generic_title('', webpage)\\n- url = episode['m3u8']\\n- formats = self._extract_m3u8_formats(url, display_id, ext='ts')\\n-\\n- show = traverse_obj(episode, ('show', 'title'))\\n- show_id = traverse_obj(episode, ('show', 'id'))\\n-\\n- show_json = None\\n- app_slug = (self._html_search_regex(\\n- '<script\\\\\\\\s+src=[\\\"\\\\']/_next/static/([-_a-zA-Z0-9]+)/_',\\n- webpage, 'app slug', fatal=False) or next_data.get('buildId'))\\n- show_slug = traverse_obj(episode, ('show', 'linkObj', 'resourceUrl'))\\n- if app_slug and show_slug and '/' in show_slug:\\n- show_slug = show_slug.rsplit('/', 1)[1]\\n- show_json_url = f'https://www.callin.com/_next/data/{app_slug}/show/{show_slug}.json'\\n- show_json = self._download_json(show_json_url, display_id, fatal=False)\\n-\\n- host = (traverse_obj(show_json, ('pageProps', 'show', 'hosts', 0))\\n- or traverse_obj(episode, ('speakers', 0)))\\n-\\n- host_nick = traverse_obj(host, ('linkObj', 'resourceUrl'))\\n- host_nick = host_nick.rsplit('/', 1)[1] if (host_nick and '/' in host_nick) else None\\n-\\n- cast = list(filter(None, [\\n- self.try_get_user_name(u) for u in\\n- traverse_obj(episode, (('speakers', 'callerTags'), ...)) or []\\n- ]))\\n-\\n- episode_list = traverse_obj(show_json, ('pageProps', 'show', 'episodes')) or []\\n- episode_number = next(\\n- (len(episode_list) - i for i, e in enumerate(episode_list) if e.get('id') == video_id),\\n- None)\\n-\\n- return {\\n- 'id': video_id,\\n- '_old_archive_ids': [make_archive_id(self, display_id.rsplit('-', 1)[-1])],\\n- 'display_id': display_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'thumbnail': traverse_obj(episode, ('show', 'photo')),\\n- 'description': episode.get('description'),\\n- 'uploader': self.try_get_user_name(host) if host else None,\\n- 'timestamp': episode.get('publishedAt'),\\n- 'uploader_id': host_nick,\\n- 'uploader_url': traverse_obj(show_json, ('pageProps', 'show', 'url')),\\n- 'channel': show,\\n- 'channel_id': show_id,\\n- 'channel_url': traverse_obj(episode, ('show', 'linkObj', 'resourceUrl')),\\n- 'duration': float_or_none(episode.get('runtime')),\\n- 'view_count': int_or_none(episode.get('plays')),\\n- 'categories': traverse_obj(episode, ('show', 'categorizations', ..., 'name')),\\n- 'cast': cast if cast else None,\\n- 'series': show,\\n- 'series_id': show_id,\\n- 'episode': title,\\n- 'episode_number': episode_number,\\n- 'episode_id': video_id,\\n- }\\ndiff --git a/yt_dlp/extractor/camdemy.py b/yt_dlp/extractor/camdemy.py\\ndeleted file mode 100644\\nindex 34dc095af86b..000000000000\\n--- a/yt_dlp/extractor/camdemy.py\\n+++ /dev/null\\n@@ -1,155 +0,0 @@\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- clean_html,\\n- parse_duration,\\n- str_to_int,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class CamdemyIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?camdemy\\\\.com/media/(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- # single file\\n- 'url': 'http://www.camdemy.com/media/5181/',\\n- 'md5': '5a5562b6a98b37873119102e052e311b',\\n- 'info_dict': {\\n- 'id': '5181',\\n- 'ext': 'mp4',\\n- 'title': 'Ch1-1 Introduction, Signals (02-23-2012)',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- 'creator': 'ss11spring',\\n- 'duration': 1591,\\n- 'upload_date': '20130114',\\n- 'view_count': int,\\n- },\\n- }, {\\n- # With non-empty description\\n- # webpage returns \\\"No permission or not login\\\"\\n- 'url': 'http://www.camdemy.com/media/13885',\\n- 'md5': '4576a3bb2581f86c61044822adbd1249',\\n- 'info_dict': {\\n- 'id': '13885',\\n- 'ext': 'mp4',\\n- 'title': 'EverCam + Camdemy QuickStart',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- 'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',\\n- 'creator': 'evercam',\\n- 'duration': 318,\\n- },\\n- }, {\\n- # External source (YouTube)\\n- 'url': 'http://www.camdemy.com/media/14842',\\n- 'info_dict': {\\n- 'id': '2vsYQzNIsJo',\\n- 'ext': 'mp4',\\n- 'title': 'Excel 2013 Tutorial - How to add Password Protection',\\n- 'description': 'Excel 2013 Tutorial for Beginners - How to add Password Protection',\\n- 'upload_date': '20130211',\\n- 'uploader': 'Hun Kim',\\n- 'uploader_id': 'hunkimtutorials',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- src_from = self._html_search_regex(\\n- r\\\"class=['\\\\\\\"]srcFrom['\\\\\\\"][^>]*>Sources?(?:\\\\s+from)?\\\\s*:\\\\s*<a[^>]+(?:href|title)=(['\\\\\\\"])(?P<url>(?:(?!\\\\1).)+)\\\\1\\\",\\n- webpage, 'external source', default=None, group='url')\\n- if src_from:\\n- return self.url_result(src_from)\\n-\\n- oembed_obj = self._download_json(\\n- 'http://www.camdemy.com/oembed/?format=json&url=' + url, video_id)\\n-\\n- title = oembed_obj['title']\\n- thumb_url = oembed_obj['thumbnail_url']\\n- video_folder = urllib.parse.urljoin(thumb_url, 'video/')\\n- file_list_doc = self._download_xml(\\n- urllib.parse.urljoin(video_folder, 'fileList.xml'),\\n- video_id, 'Downloading filelist XML')\\n- file_name = file_list_doc.find('./video/item/fileName').text\\n- video_url = urllib.parse.urljoin(video_folder, file_name)\\n-\\n- # Some URLs return \\\"No permission or not login\\\" in a webpage despite being\\n- # freely available via oembed JSON URL (e.g. http://www.camdemy.com/media/13885)\\n- upload_date = unified_strdate(self._search_regex(\\n- r'>published on ([^<]+)<', webpage,\\n- 'upload date', default=None))\\n- view_count = str_to_int(self._search_regex(\\n- r'role=[\\\"\\\\']viewCnt[\\\"\\\\'][^>]*>([\\\\d,.]+) views',\\n- webpage, 'view count', default=None))\\n- description = self._html_search_meta(\\n- 'description', webpage, default=None) or clean_html(\\n- oembed_obj.get('description'))\\n-\\n- return {\\n- 'id': video_id,\\n- 'url': video_url,\\n- 'title': title,\\n- 'thumbnail': thumb_url,\\n- 'description': description,\\n- 'creator': oembed_obj.get('author_name'),\\n- 'duration': parse_duration(oembed_obj.get('duration')),\\n- 'upload_date': upload_date,\\n- 'view_count': view_count,\\n- }\\n-\\n-\\n-class CamdemyFolderIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?camdemy\\\\.com/folder/(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- # links with trailing slash\\n- 'url': 'http://www.camdemy.com/folder/450',\\n- 'info_dict': {\\n- 'id': '450',\\n- 'title': 'ไฟก่่็ณป็ตฑ 2012 & 2011 (Signals and Systems)',\\n- },\\n- 'playlist_mincount': 145,\\n- }, {\\n- # links without trailing slash\\n- # and multi-page\\n- 'url': 'http://www.camdemy.com/folder/853',\\n- 'info_dict': {\\n- 'id': '853',\\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\\n- },\\n- 'playlist_mincount': 20,\\n- }, {\\n- # with displayMode parameter. For testing the codes to add parameters\\n- 'url': 'http://www.camdemy.com/folder/853/?displayMode=defaultOrderByOrg',\\n- 'info_dict': {\\n- 'id': '853',\\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\\n- },\\n- 'playlist_mincount': 20,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- folder_id = self._match_id(url)\\n-\\n- # Add displayMode=list so that all links are displayed in a single page\\n- parsed_url = list(urllib.parse.urlparse(url))\\n- query = dict(urllib.parse.parse_qsl(parsed_url[4]))\\n- query.update({'displayMode': 'list'})\\n- parsed_url[4] = urllib.parse.urlencode(query)\\n- final_url = urllib.parse.urlunparse(parsed_url)\\n-\\n- page = self._download_webpage(final_url, folder_id)\\n- matches = re.findall(r\\\"href='(/media/\\\\d+/?)'\\\", page)\\n-\\n- entries = [self.url_result('http://www.camdemy.com' + media_path)\\n- for media_path in matches]\\n-\\n- folder_title = self._html_search_meta('keywords', page)\\n-\\n- return self.playlist_result(entries, folder_id, folder_title)\\ndiff --git a/yt_dlp/extractor/clippit.py b/yt_dlp/extractor/clippit.py\\ndeleted file mode 100644\\nindex 393f21730809..000000000000\\n--- a/yt_dlp/extractor/clippit.py\\n+++ /dev/null\\n@@ -1,70 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- parse_iso8601,\\n- qualities,\\n-)\\n-\\n-\\n-class ClippitIE(InfoExtractor):\\n-\\n- _VALID_URL = r'https?://(?:www\\\\.)?clippituser\\\\.tv/c/(?P<id>[a-z]+)'\\n- _TEST = {\\n- 'url': 'https://www.clippituser.tv/c/evmgm',\\n- 'md5': '963ae7a59a2ec4572ab8bf2f2d2c5f09',\\n- 'info_dict': {\\n- 'id': 'evmgm',\\n- 'ext': 'mp4',\\n- 'title': 'Bye bye Brutus. #BattleBots - Clippit',\\n- 'uploader': 'lizllove',\\n- 'uploader_url': 'https://www.clippituser.tv/p/lizllove',\\n- 'timestamp': 1472183818,\\n- 'upload_date': '20160826',\\n- 'description': 'BattleBots | ABC',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- title = self._html_search_regex(r'<title.*>(.+?)</title>', webpage, 'title')\\n-\\n- FORMATS = ('sd', 'hd')\\n- quality = qualities(FORMATS)\\n- formats = []\\n- for format_id in FORMATS:\\n- url = self._html_search_regex(rf'data-{format_id}-file=\\\"(.+?)\\\"',\\n- webpage, 'url', fatal=False)\\n- if not url:\\n- continue\\n- match = re.search(r'/(?P<height>\\\\d+)\\\\.mp4', url)\\n- formats.append({\\n- 'url': url,\\n- 'format_id': format_id,\\n- 'quality': quality(format_id),\\n- 'height': int(match.group('height')) if match else None,\\n- })\\n-\\n- uploader = self._html_search_regex(r'class=\\\"username\\\".*>\\\\s+(.+?)\\\\n',\\n- webpage, 'uploader', fatal=False)\\n- uploader_url = ('https://www.clippituser.tv/p/' + uploader\\n- if uploader else None)\\n-\\n- timestamp = self._html_search_regex(r'datetime=\\\"(.+?)\\\"',\\n- webpage, 'date', fatal=False)\\n- thumbnail = self._html_search_regex(r'data-image=\\\"(.+?)\\\"',\\n- webpage, 'thumbnail', fatal=False)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'uploader': uploader,\\n- 'uploader_url': uploader_url,\\n- 'timestamp': parse_iso8601(timestamp),\\n- 'description': self._og_search_description(webpage),\\n- 'thumbnail': thumbnail,\\n- }\\ndiff --git a/yt_dlp/extractor/contv.py b/yt_dlp/extractor/contv.py\\ndeleted file mode 100644\\nindex 63d760a39ba8..000000000000\\n--- a/yt_dlp/extractor/contv.py\\n+++ /dev/null\\n@@ -1,113 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- float_or_none,\\n- int_or_none,\\n-)\\n-\\n-\\n-class CONtvIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?contv\\\\.com/details-movie/(?P<id>[^/]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.contv.com/details-movie/CEG10022949/days-of-thrills-&-laughter',\\n- 'info_dict': {\\n- 'id': 'CEG10022949',\\n- 'ext': 'mp4',\\n- 'title': 'Days Of Thrills & Laughter',\\n- 'description': 'md5:5d6b3d0b1829bb93eb72898c734802eb',\\n- 'upload_date': '20180703',\\n- 'timestamp': 1530634789.61,\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }, {\\n- 'url': 'https://www.contv.com/details-movie/CLIP-show_fotld_bts/fight-of-the-living-dead:-behind-the-scenes-bites',\\n- 'info_dict': {\\n- 'id': 'CLIP-show_fotld_bts',\\n- 'title': 'Fight of the Living Dead: Behind the Scenes Bites',\\n- },\\n- 'playlist_mincount': 7,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- details = self._download_json(\\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/details/' + video_id,\\n- video_id, query={'device': 'web'})\\n-\\n- if details.get('type') == 'episodic':\\n- seasons = self._download_json(\\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/seriesfeed/json/' + video_id,\\n- video_id)\\n- entries = []\\n- for season in seasons:\\n- for episode in season.get('episodes', []):\\n- episode_id = episode.get('id')\\n- if not episode_id:\\n- continue\\n- entries.append(self.url_result(\\n- 'https://www.contv.com/details-movie/' + episode_id,\\n- CONtvIE.ie_key(), episode_id))\\n- return self.playlist_result(entries, video_id, details.get('title'))\\n-\\n- m_details = details['details']\\n- title = details['title']\\n-\\n- formats = []\\n-\\n- media_hls_url = m_details.get('media_hls_url')\\n- if media_hls_url:\\n- formats.extend(self._extract_m3u8_formats(\\n- media_hls_url, video_id, 'mp4',\\n- m3u8_id='hls', fatal=False))\\n-\\n- media_mp4_url = m_details.get('media_mp4_url')\\n- if media_mp4_url:\\n- formats.append({\\n- 'format_id': 'http',\\n- 'url': media_mp4_url,\\n- })\\n-\\n- subtitles = {}\\n- captions = m_details.get('captions') or {}\\n- for caption_url in captions.values():\\n- subtitles.setdefault('en', []).append({\\n- 'url': caption_url,\\n- })\\n-\\n- thumbnails = []\\n- for image in m_details.get('images', []):\\n- image_url = image.get('url')\\n- if not image_url:\\n- continue\\n- thumbnails.append({\\n- 'url': image_url,\\n- 'width': int_or_none(image.get('width')),\\n- 'height': int_or_none(image.get('height')),\\n- })\\n-\\n- description = None\\n- for p in ('large_', 'medium_', 'small_', ''):\\n- d = m_details.get(p + 'description')\\n- if d:\\n- description = d\\n- break\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'thumbnails': thumbnails,\\n- 'description': description,\\n- 'timestamp': float_or_none(details.get('metax_added_on'), 1000),\\n- 'subtitles': subtitles,\\n- 'duration': float_or_none(m_details.get('duration'), 1000),\\n- 'view_count': int_or_none(details.get('num_watched')),\\n- 'like_count': int_or_none(details.get('num_fav')),\\n- 'categories': details.get('category'),\\n- 'tags': details.get('tags'),\\n- 'season_number': int_or_none(details.get('season')),\\n- 'episode_number': int_or_none(details.get('episode')),\\n- 'release_year': int_or_none(details.get('pub_year')),\\n- }\\ndiff --git a/yt_dlp/extractor/drooble.py b/yt_dlp/extractor/drooble.py\\ndeleted file mode 100644\\nindex 16e9a6194140..000000000000\\n--- a/yt_dlp/extractor/drooble.py\\n+++ /dev/null\\n@@ -1,113 +0,0 @@\\n-import json\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- int_or_none,\\n- try_get,\\n-)\\n-\\n-\\n-class DroobleIE(InfoExtractor):\\n- _VALID_URL = r'''(?x)https?://drooble\\\\.com/(?:\\n- (?:(?P<user>[^/]+)/)?(?P<kind>song|videos|music/albums)/(?P<id>\\\\d+)|\\n- (?P<user_2>[^/]+)/(?P<kind_2>videos|music))\\n- '''\\n- _TESTS = [{\\n- 'url': 'https://drooble.com/song/2858030',\\n- 'md5': '5ffda90f61c7c318dc0c3df4179eb064',\\n- 'info_dict': {\\n- 'id': '2858030',\\n- 'ext': 'mp3',\\n- 'title': 'Skankocillin',\\n- 'upload_date': '20200801',\\n- 'timestamp': 1596241390,\\n- 'uploader_id': '95894',\\n- 'uploader': 'Bluebeat Shelter',\\n- },\\n- }, {\\n- 'url': 'https://drooble.com/karl340758/videos/2859183',\\n- 'info_dict': {\\n- 'id': 'J6QCQY_I5Tk',\\n- 'ext': 'mp4',\\n- 'title': 'Skankocillin',\\n- 'uploader_id': 'UCrSRoI5vVyeYihtWEYua7rg',\\n- 'description': 'md5:ffc0bd8ba383db5341a86a6cd7d9bcca',\\n- 'upload_date': '20200731',\\n- 'uploader': 'Bluebeat Shelter',\\n- },\\n- }, {\\n- 'url': 'https://drooble.com/karl340758/music/albums/2858031',\\n- 'info_dict': {\\n- 'id': '2858031',\\n- },\\n- 'playlist_mincount': 8,\\n- }, {\\n- 'url': 'https://drooble.com/karl340758/music',\\n- 'info_dict': {\\n- 'id': 'karl340758',\\n- },\\n- 'playlist_mincount': 8,\\n- }, {\\n- 'url': 'https://drooble.com/karl340758/videos',\\n- 'info_dict': {\\n- 'id': 'karl340758',\\n- },\\n- 'playlist_mincount': 8,\\n- }]\\n-\\n- def _call_api(self, method, video_id, data=None):\\n- response = self._download_json(\\n- f'https://drooble.com/api/dt/{method}', video_id, data=json.dumps(data).encode())\\n- if not response[0]:\\n- raise ExtractorError('Unable to download JSON metadata')\\n- return response[1]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- user = mobj.group('user') or mobj.group('user_2')\\n- kind = mobj.group('kind') or mobj.group('kind_2')\\n- display_id = mobj.group('id') or user\\n-\\n- if mobj.group('kind_2') == 'videos':\\n- data = {'from_user': display_id, 'album': -1, 'limit': 18, 'offset': 0, 'order': 'new2old', 'type': 'video'}\\n- elif kind in ('music/albums', 'music'):\\n- data = {'user': user, 'public_only': True, 'individual_limit': {'singles': 1, 'albums': 1, 'playlists': 1}}\\n- else:\\n- data = {'url_slug': display_id, 'children': 10, 'order': 'old2new'}\\n-\\n- method = 'getMusicOverview' if kind in ('music/albums', 'music') else 'getElements'\\n- json_data = self._call_api(method, display_id, data=data)\\n- if kind in ('music/albums', 'music'):\\n- json_data = json_data['singles']['list']\\n-\\n- entites = []\\n- for media in json_data:\\n- url = media.get('external_media_url') or media.get('link')\\n- if url.startswith('https://www.youtube.com'):\\n- entites.append({\\n- '_type': 'url',\\n- 'url': url,\\n- 'ie_key': 'Youtube',\\n- })\\n- continue\\n- is_audio = (media.get('type') or '').lower() == 'audio'\\n- entites.append({\\n- 'url': url,\\n- 'id': media['id'],\\n- 'title': media['title'],\\n- 'duration': int_or_none(media.get('duration')),\\n- 'timestamp': int_or_none(media.get('timestamp')),\\n- 'album': try_get(media, lambda x: x['album']['title']),\\n- 'uploader': try_get(media, lambda x: x['creator']['display_name']),\\n- 'uploader_id': try_get(media, lambda x: x['creator']['id']),\\n- 'thumbnail': media.get('image_comment'),\\n- 'like_count': int_or_none(media.get('likes')),\\n- 'vcodec': 'none' if is_audio else None,\\n- 'ext': 'mp3' if is_audio else None,\\n- })\\n-\\n- if len(entites) > 1:\\n- return self.playlist_result(entites, display_id)\\n-\\n- return entites[0]\\ndiff --git a/yt_dlp/extractor/duboku.py b/yt_dlp/extractor/duboku.py\\ndeleted file mode 100644\\nindex 68c3f05731f7..000000000000\\n--- a/yt_dlp/extractor/duboku.py\\n+++ /dev/null\\n@@ -1,246 +0,0 @@\\n-import base64\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- clean_html,\\n- extract_attributes,\\n- get_elements_by_class,\\n- int_or_none,\\n- js_to_json,\\n- smuggle_url,\\n- unescapeHTML,\\n-)\\n-\\n-\\n-def _get_elements_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\\n- \\\"\\\"\\\"Return the content of the tag with the specified attribute in the passed HTML document\\\"\\\"\\\"\\n-\\n- if tag is None:\\n- tag = '[a-zA-Z0-9:._-]+'\\n- if attribute is None:\\n- attribute = ''\\n- else:\\n- attribute = rf'\\\\s+(?P<attribute>{re.escape(attribute)})'\\n- if value is None:\\n- value = ''\\n- else:\\n- value = re.escape(value) if escape_value else value\\n- value = f'=[\\\\'\\\"]?(?P<value>{value})[\\\\'\\\"]?'\\n-\\n- retlist = []\\n- for m in re.finditer(rf'''(?xs)\\n- <(?P<tag>{tag})\\n- (?:\\\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\\\"[^\\\"]*\\\"|='[^']*'|))*?\\n- {attribute}{value}\\n- (?:\\\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\\\"[^\\\"]*\\\"|='[^']*'|))*?\\n- \\\\s*>\\n- (?P<content>.*?)\\n- </\\\\1>\\n- ''', html):\\n- retlist.append(m)\\n-\\n- return retlist\\n-\\n-\\n-def _get_element_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\\n- retval = _get_elements_by_tag_and_attrib(html, tag, attribute, value, escape_value)\\n- return retval[0] if retval else None\\n-\\n-\\n-class DubokuIE(InfoExtractor):\\n- IE_NAME = 'duboku'\\n- IE_DESC = 'www.duboku.io'\\n-\\n- _VALID_URL = r'(?:https?://[^/]+\\\\.duboku\\\\.io/vodplay/)(?P<id>[0-9]+-[0-9-]+)\\\\.html.*'\\n- _TESTS = [{\\n- 'url': 'https://w.duboku.io/vodplay/1575-1-1.html',\\n- 'info_dict': {\\n- 'id': '1575-1-1',\\n- 'ext': 'mp4',\\n- 'series': '็ฝ่ฒๆๅ
',\\n- 'title': 'contains:็ฝ่ฒๆๅ
',\\n- 'season_number': 1,\\n- 'episode_number': 1,\\n- 'season': 'Season 1',\\n- 'episode_id': '1',\\n- 'season_id': '1',\\n- 'episode': 'Episode 1',\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8 download',\\n- },\\n- }, {\\n- 'url': 'https://w.duboku.io/vodplay/1588-1-1.html',\\n- 'info_dict': {\\n- 'id': '1588-1-1',\\n- 'ext': 'mp4',\\n- 'series': 'ไบฒ็ฑ็่ชๅทฑ',\\n- 'title': 'contains:็ฌฌ1้',\\n- 'season_number': 1,\\n- 'episode_number': 1,\\n- 'episode': 'Episode 1',\\n- 'season': 'Season 1',\\n- 'episode_id': '1',\\n- 'season_id': '1',\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8 download',\\n- },\\n- }]\\n-\\n- _PLAYER_DATA_PATTERN = r'player_data\\\\s*=\\\\s*(\\\\{\\\\s*(.*)})\\\\s*;?\\\\s*</script'\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- temp = video_id.split('-')\\n- series_id = temp[0]\\n- season_id = temp[1]\\n- episode_id = temp[2]\\n-\\n- webpage_url = f'https://w.duboku.io/vodplay/{video_id}.html'\\n- webpage_html = self._download_webpage(webpage_url, video_id)\\n-\\n- # extract video url\\n-\\n- player_data = self._search_regex(\\n- self._PLAYER_DATA_PATTERN, webpage_html, 'player_data')\\n- player_data = self._parse_json(player_data, video_id, js_to_json)\\n-\\n- # extract title\\n-\\n- temp = get_elements_by_class('title', webpage_html)\\n- series_title = None\\n- title = None\\n- for html in temp:\\n- mobj = re.search(r'<a\\\\s+.*>(.*)</a>', html)\\n- if mobj:\\n- href = extract_attributes(mobj.group(0)).get('href')\\n- if href:\\n- mobj1 = re.search(r'/(\\\\d+)\\\\.html', href)\\n- if mobj1 and mobj1.group(1) == series_id:\\n- series_title = clean_html(mobj.group(0))\\n- series_title = re.sub(r'[\\\\s\\\\r\\\\n\\\\t]+', ' ', series_title)\\n- title = clean_html(html)\\n- title = re.sub(r'[\\\\s\\\\r\\\\n\\\\t]+', ' ', title)\\n- break\\n-\\n- data_url = player_data.get('url')\\n- if not data_url:\\n- raise ExtractorError('Cannot find url in player_data')\\n- player_encrypt = player_data.get('encrypt')\\n- if player_encrypt == 1:\\n- data_url = urllib.parse.unquote(data_url)\\n- elif player_encrypt == 2:\\n- data_url = urllib.parse.unquote(base64.b64decode(data_url).decode('ascii'))\\n-\\n- # if it is an embedded iframe, maybe it's an external source\\n- headers = {'Referer': webpage_url}\\n- if player_data.get('from') == 'iframe':\\n- # use _type url_transparent to retain the meaningful details\\n- # of the video.\\n- return {\\n- '_type': 'url_transparent',\\n- 'url': smuggle_url(data_url, {'referer': webpage_url}),\\n- 'id': video_id,\\n- 'title': title,\\n- 'series': series_title,\\n- 'season_number': int_or_none(season_id),\\n- 'season_id': season_id,\\n- 'episode_number': int_or_none(episode_id),\\n- 'episode_id': episode_id,\\n- }\\n-\\n- formats = self._extract_m3u8_formats(data_url, video_id, 'mp4', headers=headers)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'series': series_title,\\n- 'season_number': int_or_none(season_id),\\n- 'season_id': season_id,\\n- 'episode_number': int_or_none(episode_id),\\n- 'episode_id': episode_id,\\n- 'formats': formats,\\n- 'http_headers': headers,\\n- }\\n-\\n-\\n-class DubokuPlaylistIE(InfoExtractor):\\n- IE_NAME = 'duboku:list'\\n- IE_DESC = 'www.duboku.io entire series'\\n-\\n- _VALID_URL = r'(?:https?://[^/]+\\\\.duboku\\\\.io/voddetail/)(?P<id>[0-9]+)\\\\.html.*'\\n- _TESTS = [{\\n- 'url': 'https://w.duboku.io/voddetail/1575.html',\\n- 'info_dict': {\\n- 'id': 'startswith:1575',\\n- 'title': '็ฝ่ฒๆๅ
',\\n- },\\n- 'playlist_count': 12,\\n- }, {\\n- 'url': 'https://w.duboku.io/voddetail/1554.html',\\n- 'info_dict': {\\n- 'id': 'startswith:1554',\\n- 'title': 'ไปฅๅฎถไบบไนๅ',\\n- },\\n- 'playlist_mincount': 30,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- if mobj is None:\\n- raise ExtractorError(f'Invalid URL: {url}')\\n- series_id = mobj.group('id')\\n- fragment = urllib.parse.urlparse(url).fragment\\n-\\n- webpage_url = f'https://w.duboku.io/voddetail/{series_id}.html'\\n- webpage_html = self._download_webpage(webpage_url, series_id)\\n-\\n- # extract title\\n-\\n- title = _get_element_by_tag_and_attrib(webpage_html, 'h1', 'class', 'title')\\n- title = unescapeHTML(title.group('content')) if title else None\\n- if not title:\\n- title = self._html_search_meta('keywords', webpage_html)\\n- if not title:\\n- title = _get_element_by_tag_and_attrib(webpage_html, 'title')\\n- title = unescapeHTML(title.group('content')) if title else None\\n-\\n- # extract playlists\\n-\\n- playlists = {}\\n- for div in _get_elements_by_tag_and_attrib(\\n- webpage_html, attribute='id', value='playlist\\\\\\\\d+', escape_value=False):\\n- playlist_id = div.group('value')\\n- playlist = []\\n- for a in _get_elements_by_tag_and_attrib(\\n- div.group('content'), 'a', 'href', value='[^\\\\'\\\"]+?', escape_value=False):\\n- playlist.append({\\n- 'href': unescapeHTML(a.group('value')),\\n- 'title': unescapeHTML(a.group('content')),\\n- })\\n- playlists[playlist_id] = playlist\\n-\\n- # select the specified playlist if url fragment exists\\n- playlist = None\\n- playlist_id = None\\n- if fragment:\\n- playlist = playlists.get(fragment)\\n- playlist_id = fragment\\n- else:\\n- first = next(iter(playlists.items()), None)\\n- if first:\\n- (playlist_id, playlist) = first\\n- if not playlist:\\n- raise ExtractorError(\\n- f'Cannot find {fragment}' if fragment else 'Cannot extract playlist')\\n-\\n- # return url results\\n- return self.playlist_result([\\n- self.url_result(\\n- urllib.parse.urljoin('https://w.duboku.io', x['href']),\\n- ie=DubokuIE.ie_key(), video_title=x.get('title'))\\n- for x in playlist], series_id + '#' + playlist_id, title)\\ndiff --git a/yt_dlp/extractor/eighttracks.py b/yt_dlp/extractor/eighttracks.py\\ndeleted file mode 100644\\nindex 3ac4c56ae0fd..000000000000\\n--- a/yt_dlp/extractor/eighttracks.py\\n+++ /dev/null\\n@@ -1,158 +0,0 @@\\n-import json\\n-import random\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n-)\\n-\\n-\\n-class EightTracksIE(InfoExtractor):\\n- IE_NAME = '8tracks'\\n- _VALID_URL = r'https?://8tracks\\\\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'\\n- _TEST = {\\n- 'name': 'EightTracks',\\n- 'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',\\n- 'info_dict': {\\n- 'id': '1336550',\\n- 'display_id': 'youtube-dl-test-tracks-a',\\n- 'description': \\\"test chars: \\\\\\\"'/\\\\\\\\รคโญ\\\",\\n- 'title': \\\"youtube-dl test tracks \\\\\\\"'/\\\\\\\\รคโญ<>\\\",\\n- },\\n- 'playlist': [\\n- {\\n- 'md5': '96ce57f24389fc8734ce47f4c1abcc55',\\n- 'info_dict': {\\n- 'id': '11885610',\\n- 'ext': 'm4a',\\n- 'title': \\\"youtue-dl project<>\\\\\\\"' - youtube-dl test track 1 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': '4ab26f05c1f7291ea460a3920be8021f',\\n- 'info_dict': {\\n- 'id': '11885608',\\n- 'ext': 'm4a',\\n- 'title': \\\"youtube-dl project - youtube-dl test track 2 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': 'd30b5b5f74217410f4689605c35d1fd7',\\n- 'info_dict': {\\n- 'id': '11885679',\\n- 'ext': 'm4a',\\n- 'title': \\\"youtube-dl project as well - youtube-dl test track 3 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': '4eb0a669317cd725f6bbd336a29f923a',\\n- 'info_dict': {\\n- 'id': '11885680',\\n- 'ext': 'm4a',\\n- 'title': \\\"youtube-dl project as well - youtube-dl test track 4 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': '1893e872e263a2705558d1d319ad19e8',\\n- 'info_dict': {\\n- 'id': '11885682',\\n- 'ext': 'm4a',\\n- 'title': \\\"PH - youtube-dl test track 5 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': 'b673c46f47a216ab1741ae8836af5899',\\n- 'info_dict': {\\n- 'id': '11885683',\\n- 'ext': 'm4a',\\n- 'title': \\\"PH - youtube-dl test track 6 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': '1d74534e95df54986da7f5abf7d842b7',\\n- 'info_dict': {\\n- 'id': '11885684',\\n- 'ext': 'm4a',\\n- 'title': \\\"phihag - youtube-dl test track 7 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- {\\n- 'md5': 'f081f47af8f6ae782ed131d38b9cd1c0',\\n- 'info_dict': {\\n- 'id': '11885685',\\n- 'ext': 'm4a',\\n- 'title': \\\"phihag - youtube-dl test track 8 \\\\\\\"'/\\\\\\\\\\\\u00e4\\\\u21ad\\\",\\n- 'uploader_id': 'ytdl',\\n- },\\n- },\\n- ],\\n- }\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(url, playlist_id)\\n-\\n- data = self._parse_json(\\n- self._search_regex(\\n- r'(?s)PAGE\\\\.mix\\\\s*=\\\\s*({.+?});\\\\n', webpage, 'trax information'),\\n- playlist_id)\\n-\\n- session = str(random.randint(0, 1000000000))\\n- mix_id = data['id']\\n- track_count = data['tracks_count']\\n- duration = data['duration']\\n- avg_song_duration = float(duration) / track_count\\n- # duration is sometimes negative, use predefined avg duration\\n- if avg_song_duration <= 0:\\n- avg_song_duration = 300\\n- first_url = f'http://8tracks.com/sets/{session}/play?player=sm&mix_id={mix_id}&format=jsonh'\\n- next_url = first_url\\n- entries = []\\n-\\n- for i in range(track_count):\\n- api_json = None\\n- download_tries = 0\\n-\\n- while api_json is None:\\n- try:\\n- api_json = self._download_webpage(\\n- next_url, playlist_id,\\n- note='Downloading song information %d/%d' % (i + 1, track_count),\\n- errnote='Failed to download song information')\\n- except ExtractorError:\\n- if download_tries > 3:\\n- raise\\n- else:\\n- download_tries += 1\\n- self._sleep(avg_song_duration, playlist_id)\\n-\\n- api_data = json.loads(api_json)\\n- track_data = api_data['set']['track']\\n- info = {\\n- 'id': str(track_data['id']),\\n- 'url': track_data['track_file_stream_url'],\\n- 'title': track_data['performer'] + ' - ' + track_data['name'],\\n- 'raw_title': track_data['name'],\\n- 'uploader_id': data['user']['login'],\\n- 'ext': 'm4a',\\n- }\\n- entries.append(info)\\n-\\n- next_url = 'http://8tracks.com/sets/{}/next?player=sm&mix_id={}&format=jsonh&track_id={}'.format(\\n- session, mix_id, track_data['id'])\\n- return {\\n- '_type': 'playlist',\\n- 'entries': entries,\\n- 'id': str(mix_id),\\n- 'display_id': playlist_id,\\n- 'title': data.get('name'),\\n- 'description': data.get('description'),\\n- }\\ndiff --git a/yt_dlp/extractor/eitb.py b/yt_dlp/extractor/eitb.py\\ndeleted file mode 100644\\nindex 18b802eb1550..000000000000\\n--- a/yt_dlp/extractor/eitb.py\\n+++ /dev/null\\n@@ -1,81 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..networking import Request\\n-from ..utils import (\\n- float_or_none,\\n- int_or_none,\\n- join_nonempty,\\n- parse_iso8601,\\n-)\\n-\\n-\\n-class EitbIE(InfoExtractor):\\n- IE_NAME = 'eitb.tv'\\n- _VALID_URL = r'https?://(?:www\\\\.)?eitb\\\\.tv/(?:eu/bideoa|es/video)/[^/]+/\\\\d+/(?P<id>\\\\d+)'\\n-\\n- _TEST = {\\n- 'url': 'http://www.eitb.tv/es/video/60-minutos-60-minutos-2013-2014/4104995148001/4090227752001/lasa-y-zabala-30-anos/',\\n- 'md5': 'edf4436247185adee3ea18ce64c47998',\\n- 'info_dict': {\\n- 'id': '4090227752001',\\n- 'ext': 'mp4',\\n- 'title': '60 minutos (Lasa y Zabala, 30 aรฑos)',\\n- 'description': 'Programa de reportajes de actualidad.',\\n- 'duration': 3996.76,\\n- 'timestamp': 1381789200,\\n- 'upload_date': '20131014',\\n- 'tags': list,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- video = self._download_json(\\n- f'http://mam.eitb.eus/mam/REST/ServiceMultiweb/Video/MULTIWEBTV/{video_id}/',\\n- video_id, 'Downloading video JSON')\\n-\\n- media = video['web_media'][0]\\n-\\n- formats = []\\n- for rendition in media['RENDITIONS']:\\n- video_url = rendition.get('PMD_URL')\\n- if not video_url:\\n- continue\\n- tbr = float_or_none(rendition.get('ENCODING_RATE'), 1000)\\n- formats.append({\\n- 'url': rendition['PMD_URL'],\\n- 'format_id': join_nonempty('http', int_or_none(tbr)),\\n- 'width': int_or_none(rendition.get('FRAME_WIDTH')),\\n- 'height': int_or_none(rendition.get('FRAME_HEIGHT')),\\n- 'tbr': tbr,\\n- })\\n-\\n- hls_url = media.get('HLS_SURL')\\n- if hls_url:\\n- request = Request(\\n- 'http://mam.eitb.eus/mam/REST/ServiceMultiweb/DomainRestrictedSecurity/TokenAuth/',\\n- headers={'Referer': url})\\n- token_data = self._download_json(\\n- request, video_id, 'Downloading auth token', fatal=False)\\n- if token_data:\\n- token = token_data.get('token')\\n- if token:\\n- formats.extend(self._extract_m3u8_formats(\\n- f'{hls_url}?hdnts={token}', video_id, m3u8_id='hls', fatal=False))\\n-\\n- hds_url = media.get('HDS_SURL')\\n- if hds_url:\\n- formats.extend(self._extract_f4m_formats(\\n- '{}?hdcore=3.7.0'.format(hds_url.replace('euskalsvod', 'euskalvod')),\\n- video_id, f4m_id='hds', fatal=False))\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': media.get('NAME_ES') or media.get('name') or media['NAME_EU'],\\n- 'description': media.get('SHORT_DESC_ES') or video.get('desc_group') or media.get('SHORT_DESC_EU'),\\n- 'thumbnail': media.get('STILL_URL') or media.get('THUMBNAIL_URL'),\\n- 'duration': float_or_none(media.get('LENGTH'), 1000),\\n- 'timestamp': parse_iso8601(media.get('BROADCST_DATE'), ' '),\\n- 'tags': media.get('TAGS'),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/eyedotv.py b/yt_dlp/extractor/eyedotv.py\\ndeleted file mode 100644\\nindex b8c67ce4ccb7..000000000000\\n--- a/yt_dlp/extractor/eyedotv.py\\n+++ /dev/null\\n@@ -1,61 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- parse_duration,\\n- xpath_text,\\n-)\\n-\\n-\\n-class EyedoTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?eyedo\\\\.tv/[^/]+/(?:#!/)?Live/Detail/(?P<id>[0-9]+)'\\n- _TEST = {\\n- 'url': 'https://www.eyedo.tv/en-US/#!/Live/Detail/16301',\\n- 'md5': 'ba14f17995cdfc20c36ba40e21bf73f7',\\n- 'info_dict': {\\n- 'id': '16301',\\n- 'ext': 'mp4',\\n- 'title': 'Journรฉe du conseil scientifique de l\\\\'Afnic 2015',\\n- 'description': 'md5:4abe07293b2f73efc6e1c37028d58c98',\\n- 'uploader': 'Afnic Live',\\n- 'uploader_id': '8023',\\n- },\\n- }\\n- _ROOT_URL = 'http://live.eyedo.net:1935/'\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- video_data = self._download_xml(f'http://eyedo.tv/api/live/GetLive/{video_id}', video_id)\\n-\\n- def _add_ns(path):\\n- return self._xpath_ns(path, 'http://schemas.datacontract.org/2004/07/EyeDo.Core.Implementation.Web.ViewModels.Api')\\n-\\n- title = xpath_text(video_data, _add_ns('Titre'), 'title', True)\\n- state_live_code = xpath_text(video_data, _add_ns('StateLiveCode'), 'title', True)\\n- if state_live_code == 'avenir':\\n- raise ExtractorError(\\n- f'{self.IE_NAME} said: We\\\\'re sorry, but this video is not yet available.',\\n- expected=True)\\n-\\n- is_live = state_live_code == 'live'\\n- m3u8_url = None\\n- # http://eyedo.tv/Content/Html5/Scripts/html5view.js\\n- if is_live:\\n- if xpath_text(video_data, 'Cdn') == 'true':\\n- m3u8_url = f'http://rrr.sz.xlcdn.com/?account=eyedo&file=A{video_id}&type=live&service=wowza&protocol=http&output=playlist.m3u8'\\n- else:\\n- m3u8_url = self._ROOT_URL + f'w/{video_id}/eyedo_720p/playlist.m3u8'\\n- else:\\n- m3u8_url = self._ROOT_URL + f'replay-w/{video_id}/mp4:{video_id}.mp4/playlist.m3u8'\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': self._extract_m3u8_formats(\\n- m3u8_url, video_id, 'mp4', 'm3u8_native'),\\n- 'description': xpath_text(video_data, _add_ns('Description')),\\n- 'duration': parse_duration(xpath_text(video_data, _add_ns('Duration'))),\\n- 'uploader': xpath_text(video_data, _add_ns('Createur')),\\n- 'uploader_id': xpath_text(video_data, _add_ns('CreateurId')),\\n- 'chapter': xpath_text(video_data, _add_ns('ChapitreTitre')),\\n- 'chapter_id': xpath_text(video_data, _add_ns('ChapitreId')),\\n- }\\ndiff --git a/yt_dlp/extractor/footyroom.py b/yt_dlp/extractor/footyroom.py\\nindex 797e894d679c..c814af24c8f0 100644\\n--- a/yt_dlp/extractor/footyroom.py\\n+++ b/yt_dlp/extractor/footyroom.py\\n@@ -12,14 +12,6 @@ class FootyRoomIE(InfoExtractor):\\n },\\n 'playlist_count': 2,\\n 'add_ie': [StreamableIE.ie_key()],\\n- }, {\\n- 'url': 'http://footyroom.com/matches/75817984/georgia-vs-germany/review',\\n- 'info_dict': {\\n- 'id': '75817984',\\n- 'title': 'VIDEO Georgia 0 - 2 Germany',\\n- },\\n- 'playlist_count': 1,\\n- 'add_ie': ['Playwire'],\\n }]\\n \\n def _real_extract(self, url):\\n@@ -38,13 +30,6 @@ def _real_extract(self, url):\\n payload = video.get('payload')\\n if not payload:\\n continue\\n- playwire_url = self._html_search_regex(\\n- r'data-config=\\\"([^\\\"]+)\\\"', payload,\\n- 'playwire url', default=None)\\n- if playwire_url:\\n- entries.append(self.url_result(self._proto_relative_url(\\n- playwire_url, 'http:'), 'Playwire'))\\n-\\n streamable_url = StreamableIE._extract_url(payload)\\n if streamable_url:\\n entries.append(self.url_result(\\ndiff --git a/yt_dlp/extractor/franceinter.py b/yt_dlp/extractor/franceinter.py\\ndeleted file mode 100644\\nindex 779249b8430a..000000000000\\n--- a/yt_dlp/extractor/franceinter.py\\n+++ /dev/null\\n@@ -1,56 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import month_by_name\\n-\\n-\\n-class FranceInterIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?franceinter\\\\.fr/emissions/(?P<id>[^?#]+)'\\n-\\n- _TEST = {\\n- 'url': 'https://www.franceinter.fr/emissions/affaires-sensibles/affaires-sensibles-07-septembre-2016',\\n- 'md5': '9e54d7bdb6fdc02a841007f8a975c094',\\n- 'info_dict': {\\n- 'id': 'affaires-sensibles/affaires-sensibles-07-septembre-2016',\\n- 'ext': 'mp3',\\n- 'title': 'Affaire Cahuzac : le contentieux du compte en Suisse',\\n- 'description': 'md5:401969c5d318c061f86bda1fa359292b',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'upload_date': '20160907',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- video_url = self._search_regex(\\n- r'(?s)<div[^>]+class=[\\\"\\\\']page-diffusion[\\\"\\\\'][^>]*>.*?<button[^>]+data-url=([\\\"\\\\'])(?P<url>(?:(?!\\\\1).)+)\\\\1',\\n- webpage, 'video url', group='url')\\n-\\n- title = self._og_search_title(webpage)\\n- description = self._og_search_description(webpage)\\n- thumbnail = self._html_search_meta(['og:image', 'twitter:image'], webpage)\\n-\\n- upload_date_str = self._search_regex(\\n- r'class=[\\\"\\\\']\\\\s*cover-emission-period\\\\s*[\\\"\\\\'][^>]*>[^<]+\\\\s+(\\\\d{1,2}\\\\s+[^\\\\s]+\\\\s+\\\\d{4})<',\\n- webpage, 'upload date', fatal=False)\\n- if upload_date_str:\\n- upload_date_list = upload_date_str.split()\\n- upload_date_list.reverse()\\n- upload_date_list[1] = '%02d' % (month_by_name(upload_date_list[1], lang='fr') or 0)\\n- upload_date_list[2] = '%02d' % int(upload_date_list[2])\\n- upload_date = ''.join(upload_date_list)\\n- else:\\n- upload_date = None\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': description,\\n- 'thumbnail': thumbnail,\\n- 'upload_date': upload_date,\\n- 'formats': [{\\n- 'url': video_url,\\n- 'vcodec': 'none',\\n- }],\\n- }\\ndiff --git a/yt_dlp/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py\\ndeleted file mode 100644\\nindex 3319b126811a..000000000000\\n--- a/yt_dlp/extractor/fujitv.py\\n+++ /dev/null\\n@@ -1,73 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..networking import HEADRequest\\n-\\n-\\n-class FujiTVFODPlus7IE(InfoExtractor):\\n- _VALID_URL = r'https?://fod\\\\.fujitv\\\\.co\\\\.jp/title/(?P<sid>[0-9a-z]{4})/(?P<id>[0-9a-z]+)'\\n- _BASE_URL = 'https://i.fod.fujitv.co.jp/'\\n- _BITRATE_MAP = {\\n- 300: (320, 180),\\n- 800: (640, 360),\\n- 1200: (1280, 720),\\n- 2000: (1280, 720),\\n- 4000: (1920, 1080),\\n- }\\n-\\n- _TESTS = [{\\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40110076',\\n- 'info_dict': {\\n- 'id': '5d40110076',\\n- 'ext': 'ts',\\n- 'title': '#1318 ใใพใๅญใใพใผใใใฎๆด้คจใ่ฆใใใฎๅทป',\\n- 'series': 'ใกใณใพใๅญใกใใ',\\n- 'series_id': '5d40',\\n- 'description': 'md5:b3f51dbfdda162ac4f789e0ff4d65750',\\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40110076_a.jpg',\\n- },\\n- }, {\\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40810083',\\n- 'info_dict': {\\n- 'id': '5d40810083',\\n- 'ext': 'ts',\\n- 'title': '#1324 ใใพใๅญใจใชใใฎๅญใใฎๅทป๏ผใ็ตๆ๏ผ2ๆใใ ใใซใใชใไผใใฎๅทป',\\n- 'description': 'md5:3972d900b896adc8ab1849e310507efa',\\n- 'series': 'ใกใณใพใๅญใกใใ',\\n- 'series_id': '5d40',\\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40810083_a.jpg'},\\n- 'skip': 'Video available only in one week',\\n- }]\\n-\\n- def _real_extract(self, url):\\n- series_id, video_id = self._match_valid_url(url).groups()\\n- self._request_webpage(HEADRequest(url), video_id)\\n- json_info = {}\\n- token = self._get_cookies(url).get('CT')\\n- if token:\\n- json_info = self._download_json(\\n- f'https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id={video_id}&is_premium=false',\\n- video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)\\n- else:\\n- self.report_warning(f'The token cookie is needed to extract video metadata. {self._login_hint(\\\"cookies\\\")}')\\n- formats, subtitles = [], {}\\n- src_json = self._download_json(f'{self._BASE_URL}abrjson_v2/tv_android/{video_id}', video_id)\\n- for src in src_json['video_selector']:\\n- if not src.get('url'):\\n- continue\\n- fmt, subs = self._extract_m3u8_formats_and_subtitles(src['url'], video_id, 'ts')\\n- for f in fmt:\\n- f.update(dict(zip(('height', 'width'),\\n- self._BITRATE_MAP.get(f.get('tbr'), ()), strict=False)))\\n- formats.extend(fmt)\\n- subtitles = self._merge_subtitles(subtitles, subs)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': json_info.get('ep_title'),\\n- 'series': json_info.get('lu_title'),\\n- 'series_id': series_id,\\n- 'description': json_info.get('ep_description'),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'thumbnail': f'{self._BASE_URL}img/program/{series_id}/episode/{video_id}_a.jpg',\\n- '_format_sort_fields': ('tbr', ),\\n- }\\ndiff --git a/yt_dlp/extractor/gab.py b/yt_dlp/extractor/gab.py\\nindex 024628e1ca0b..2684073301c3 100644\\n--- a/yt_dlp/extractor/gab.py\\n+++ b/yt_dlp/extractor/gab.py\\n@@ -1,70 +1,13 @@\\n-import re\\n-\\n from .common import InfoExtractor\\n from ..utils import (\\n clean_html,\\n int_or_none,\\n parse_codecs,\\n parse_duration,\\n- str_to_int,\\n unified_timestamp,\\n )\\n \\n \\n-class GabTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://tv\\\\.gab\\\\.com/channel/[^/]+/view/(?P<id>[a-z0-9-]+)'\\n- _TESTS = [{\\n- 'url': 'https://tv.gab.com/channel/wurzelroot/view/why-was-america-in-afghanistan-61217eacea5665de450d0488',\\n- 'info_dict': {\\n- 'id': '61217eacea5665de450d0488',\\n- 'ext': 'mp4',\\n- 'title': 'WHY WAS AMERICA IN AFGHANISTAN - AMERICA FIRST AGAINST AMERICAN OLIGARCHY',\\n- 'uploader': 'Wurzelroot',\\n- 'uploader_id': '608fb0a85738fd1974984f7d',\\n- 'thumbnail': 'https://tv.gab.com/image/61217eacea5665de450d0488',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url).split('-')[-1]\\n- webpage = self._download_webpage(url, video_id)\\n- channel_id = self._search_regex(r'data-channel-id=\\\\\\\"(?P<channel_id>[^\\\\\\\"]+)', webpage, 'channel_id')\\n- channel_name = self._search_regex(r'data-channel-name=\\\\\\\"(?P<channel_id>[^\\\\\\\"]+)', webpage, 'channel_name')\\n- title = self._search_regex(r'data-episode-title=\\\\\\\"(?P<channel_id>[^\\\\\\\"]+)', webpage, 'title')\\n- view_key = self._search_regex(r'data-view-key=\\\\\\\"(?P<channel_id>[^\\\\\\\"]+)', webpage, 'view_key')\\n- description = clean_html(\\n- self._html_search_regex(self._meta_regex('description'), webpage, 'description', group='content')) or None\\n- available_resolutions = re.findall(\\n- rf'<a\\\\ data-episode-id=\\\\\\\"{video_id}\\\\\\\"\\\\ data-resolution=\\\\\\\"(?P<resolution>[^\\\\\\\"]+)', webpage)\\n-\\n- formats = []\\n- for resolution in available_resolutions:\\n- frmt = {\\n- 'url': f'https://tv.gab.com/media/{video_id}?viewKey={view_key}&r={resolution}',\\n- 'format_id': resolution,\\n- 'vcodec': 'h264',\\n- 'acodec': 'aac',\\n- 'ext': 'mp4',\\n- }\\n- if 'audio-' in resolution:\\n- frmt['abr'] = str_to_int(resolution.replace('audio-', ''))\\n- frmt['height'] = 144\\n- frmt['quality'] = -10\\n- else:\\n- frmt['height'] = str_to_int(resolution.replace('p', ''))\\n- formats.append(frmt)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'description': description,\\n- 'uploader': channel_name,\\n- 'uploader_id': channel_id,\\n- 'thumbnail': f'https://tv.gab.com/image/{video_id}',\\n- }\\n-\\n-\\n class GabIE(InfoExtractor):\\n _VALID_URL = r'https?://(?:www\\\\.)?gab\\\\.com/[^/]+/posts/(?P<id>\\\\d+)'\\n _TESTS = [{\\ndiff --git a/yt_dlp/extractor/googlepodcasts.py b/yt_dlp/extractor/googlepodcasts.py\\ndeleted file mode 100644\\nindex 8d1cc4fa119a..000000000000\\n--- a/yt_dlp/extractor/googlepodcasts.py\\n+++ /dev/null\\n@@ -1,84 +0,0 @@\\n-import json\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- clean_podcast_url,\\n- int_or_none,\\n- try_get,\\n- urlencode_postdata,\\n-)\\n-\\n-\\n-class GooglePodcastsBaseIE(InfoExtractor):\\n- _VALID_URL_BASE = r'https?://podcasts\\\\.google\\\\.com/feed/'\\n-\\n- def _batch_execute(self, func_id, video_id, params):\\n- return json.loads(self._download_json(\\n- 'https://podcasts.google.com/_/PodcastsUi/data/batchexecute',\\n- video_id, data=urlencode_postdata({\\n- 'f.req': json.dumps([[[func_id, json.dumps(params), None, '1']]]),\\n- }), transform_source=lambda x: self._search_regex(r'(?s)(\\\\[.+\\\\])', x, 'data'))[0][2])\\n-\\n- def _extract_episode(self, episode):\\n- return {\\n- 'id': episode[4][3],\\n- 'title': episode[8],\\n- 'url': clean_podcast_url(episode[13]),\\n- 'thumbnail': episode[2],\\n- 'description': episode[9],\\n- 'creator': try_get(episode, lambda x: x[14]),\\n- 'timestamp': int_or_none(episode[11]),\\n- 'duration': int_or_none(episode[12]),\\n- 'series': episode[1],\\n- }\\n-\\n-\\n-class GooglePodcastsIE(GooglePodcastsBaseIE):\\n- IE_NAME = 'google:podcasts'\\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<feed_url>[^/]+)/episode/(?P<id>[^/?&#]+)'\\n- _TEST = {\\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA/episode/MzBlNWRlN2UtOWE4Yy00ODcwLTk2M2MtM2JlMmUyNmViOTRh',\\n- 'md5': 'fa56b2ee8bd0703e27e42d4b104c4766',\\n- 'info_dict': {\\n- 'id': '30e5de7e-9a8c-4870-963c-3be2e26eb94a',\\n- 'ext': 'mp3',\\n- 'title': 'WWDTM New Year 2021',\\n- 'description': 'We say goodbye to 2020 with Christine Baranksi, Doug Jones, Jonna Mendez, and Kellee Edwards.',\\n- 'upload_date': '20210102',\\n- 'timestamp': 1609606800,\\n- 'duration': 2901,\\n- 'series': \\\"Wait Wait... Don't Tell Me!\\\",\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- b64_feed_url, b64_guid = self._match_valid_url(url).groups()\\n- episode = self._batch_execute(\\n- 'oNjqVe', b64_guid, [b64_feed_url, b64_guid])[1]\\n- return self._extract_episode(episode)\\n-\\n-\\n-class GooglePodcastsFeedIE(GooglePodcastsBaseIE):\\n- IE_NAME = 'google:podcasts:feed'\\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<id>[^/?&#]+)/?(?:[?#&]|$)'\\n- _TEST = {\\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA',\\n- 'info_dict': {\\n- 'title': \\\"Wait Wait... Don't Tell Me!\\\",\\n- 'description': \\\"NPR's weekly current events quiz. Have a laugh and test your news knowledge while figuring out what's real and what we've made up.\\\",\\n- },\\n- 'playlist_mincount': 20,\\n- }\\n-\\n- def _real_extract(self, url):\\n- b64_feed_url = self._match_id(url)\\n- data = self._batch_execute('ncqJEe', b64_feed_url, [b64_feed_url])\\n-\\n- entries = []\\n- for episode in (try_get(data, lambda x: x[1][0]) or []):\\n- entries.append(self._extract_episode(episode))\\n-\\n- feed = try_get(data, lambda x: x[3]) or []\\n- return self.playlist_result(\\n- entries, playlist_title=try_get(feed, lambda x: x[0]),\\n- playlist_description=try_get(feed, lambda x: x[2]))\\ndiff --git a/yt_dlp/extractor/goshgay.py b/yt_dlp/extractor/goshgay.py\\ndeleted file mode 100644\\nindex 7bcac9bdeaa0..000000000000\\n--- a/yt_dlp/extractor/goshgay.py\\n+++ /dev/null\\n@@ -1,47 +0,0 @@\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- parse_duration,\\n-)\\n-\\n-\\n-class GoshgayIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?goshgay\\\\.com/video(?P<id>\\\\d+?)($|/)'\\n- _TEST = {\\n- 'url': 'http://www.goshgay.com/video299069/diesel_sfw_xxx_video',\\n- 'md5': '4b6db9a0a333142eb9f15913142b0ed1',\\n- 'info_dict': {\\n- 'id': '299069',\\n- 'ext': 'flv',\\n- 'title': 'DIESEL SFW XXX Video',\\n- 'thumbnail': r're:^http://.*\\\\.jpg$',\\n- 'duration': 80,\\n- 'age_limit': 18,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- title = self._html_search_regex(\\n- r'<h2>(.*?)<', webpage, 'title')\\n- duration = parse_duration(self._html_search_regex(\\n- r'<span class=\\\"duration\\\">\\\\s*-?\\\\s*(.*?)</span>',\\n- webpage, 'duration', fatal=False))\\n-\\n- flashvars = urllib.parse.parse_qs(self._html_search_regex(\\n- r'<embed.+?id=\\\"flash-player-embed\\\".+?flashvars=\\\"([^\\\"]+)\\\"',\\n- webpage, 'flashvars'))\\n- thumbnail = flashvars.get('url_bigthumb', [None])[0]\\n- video_url = flashvars['flv_url'][0]\\n-\\n- return {\\n- 'id': video_id,\\n- 'url': video_url,\\n- 'title': title,\\n- 'thumbnail': thumbnail,\\n- 'duration': duration,\\n- 'age_limit': 18,\\n- }\\ndiff --git a/yt_dlp/extractor/gputechconf.py b/yt_dlp/extractor/gputechconf.py\\ndeleted file mode 100644\\nindex f31791a718b9..000000000000\\n--- a/yt_dlp/extractor/gputechconf.py\\n+++ /dev/null\\n@@ -1,32 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class GPUTechConfIE(InfoExtractor):\\n- _VALID_URL = r'https?://on-demand\\\\.gputechconf\\\\.com/gtc/2015/video/S(?P<id>\\\\d+)\\\\.html'\\n- _TEST = {\\n- 'url': 'http://on-demand.gputechconf.com/gtc/2015/video/S5156.html',\\n- 'md5': 'a8862a00a0fd65b8b43acc5b8e33f798',\\n- 'info_dict': {\\n- 'id': '5156',\\n- 'ext': 'mp4',\\n- 'title': 'Coordinating More Than 3 Million CUDA Threads for Social Network Analysis',\\n- 'duration': 1219,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- root_path = self._search_regex(\\n- r'var\\\\s+rootPath\\\\s*=\\\\s*\\\"([^\\\"]+)', webpage, 'root path',\\n- default='http://evt.dispeak.com/nvidia/events/gtc15/')\\n- xml_file_id = self._search_regex(\\n- r'var\\\\s+xmlFileId\\\\s*=\\\\s*\\\"([^\\\"]+)', webpage, 'xml file id')\\n-\\n- return {\\n- '_type': 'url_transparent',\\n- 'id': video_id,\\n- 'url': f'{root_path}xml/{xml_file_id}.xml',\\n- 'ie_key': 'DigitallySpeaking',\\n- }\\ndiff --git a/yt_dlp/extractor/hketv.py b/yt_dlp/extractor/hketv.py\\ndeleted file mode 100644\\nindex 3998abc121cd..000000000000\\n--- a/yt_dlp/extractor/hketv.py\\n+++ /dev/null\\n@@ -1,183 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- clean_html,\\n- int_or_none,\\n- merge_dicts,\\n- parse_count,\\n- str_or_none,\\n- try_get,\\n- unified_strdate,\\n- urlencode_postdata,\\n- urljoin,\\n-)\\n-\\n-\\n-class HKETVIE(InfoExtractor):\\n- IE_NAME = 'hketv'\\n- IE_DESC = '้ฆๆธฏๆ่ฒๅฑๆ่ฒ้ป่ฆ (HKETV) Educational Television, Hong Kong Educational Bureau'\\n- _GEO_BYPASS = False\\n- _GEO_COUNTRIES = ['HK']\\n- _VALID_URL = r'https?://(?:www\\\\.)?hkedcity\\\\.net/etv/resource/(?P<id>[0-9]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.hkedcity.net/etv/resource/2932360618',\\n- 'md5': 'f193712f5f7abb208ddef3c5ea6ed0b7',\\n- 'info_dict': {\\n- 'id': '2932360618',\\n- 'ext': 'mp4',\\n- 'title': 'ๅ้ฑไธ็(ๅ
ฑไบซ้ฑ่ฎๆจ) (ไธญใ่ฑๆๅญๅนๅฏไพ้ธๆ)',\\n- 'description': 'md5:d5286d05219ef50e0613311cbe96e560',\\n- 'upload_date': '20181024',\\n- 'duration': 900,\\n- 'subtitles': 'count:2',\\n- },\\n- 'skip': 'Geo restricted to HK',\\n- }, {\\n- 'url': 'https://www.hkedcity.net/etv/resource/972641418',\\n- 'md5': '1ed494c1c6cf7866a8290edad9b07dc9',\\n- 'info_dict': {\\n- 'id': '972641418',\\n- 'ext': 'mp4',\\n- 'title': '่กฃๅ ๆฅๆฅ (ๅคฉไฝฟ็ณปๅไนไธ)',\\n- 'description': 'md5:10bb3d659421e74f58e5db5691627b0f',\\n- 'upload_date': '20070109',\\n- 'duration': 907,\\n- 'subtitles': {},\\n- },\\n- 'skip': 'Geo restricted to HK',\\n- }]\\n-\\n- _CC_LANGS = {\\n- 'ไธญๆ๏ผ็น้ซไธญๆ๏ผ': 'zh-Hant',\\n- 'ไธญๆ๏ผ็ฎไฝไธญๆ๏ผ': 'zh-Hans',\\n- 'English': 'en',\\n- 'Bahasa Indonesia': 'id',\\n- '\\\\u0939\\\\u093f\\\\u0928\\\\u094d\\\\u0926\\\\u0940': 'hi',\\n- '\\\\u0928\\\\u0947\\\\u092a\\\\u093e\\\\u0932\\\\u0940': 'ne',\\n- 'Tagalog': 'tl',\\n- '\\\\u0e44\\\\u0e17\\\\u0e22': 'th',\\n- '\\\\u0627\\\\u0631\\\\u062f\\\\u0648': 'ur',\\n- }\\n- _FORMAT_HEIGHTS = {\\n- 'SD': 360,\\n- 'HD': 720,\\n- }\\n- _APPS_BASE_URL = 'https://apps.hkedcity.net'\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- title = (\\n- self._html_search_meta(\\n- ('ed_title', 'search.ed_title'), webpage, default=None)\\n- or self._search_regex(\\n- r'data-favorite_title_(?:eng|chi)=([\\\"\\\\'])(?P<id>(?:(?!\\\\1).)+)\\\\1',\\n- webpage, 'title', default=None, group='url')\\n- or self._html_search_regex(\\n- r'<h1>([^<]+)</h1>', webpage, 'title', default=None)\\n- or self._og_search_title(webpage)\\n- )\\n-\\n- file_id = self._search_regex(\\n- r'post_var\\\\[[\\\"\\\\']file_id[\\\"\\\\']\\\\s*\\\\]\\\\s*=\\\\s*(.+?);',\\n- webpage, 'file ID')\\n- curr_url = self._search_regex(\\n- r'post_var\\\\[[\\\"\\\\']curr_url[\\\"\\\\']\\\\s*\\\\]\\\\s*=\\\\s*\\\"(.+?)\\\";',\\n- webpage, 'curr URL')\\n- data = {\\n- 'action': 'get_info',\\n- 'curr_url': curr_url,\\n- 'file_id': file_id,\\n- 'video_url': file_id,\\n- }\\n-\\n- response = self._download_json(\\n- self._APPS_BASE_URL + '/media/play/handler.php', video_id,\\n- data=urlencode_postdata(data),\\n- headers=merge_dicts({\\n- 'Content-Type': 'application/x-www-form-urlencoded'},\\n- self.geo_verification_headers()))\\n-\\n- result = response['result']\\n-\\n- if not response.get('success') or not response.get('access'):\\n- error = clean_html(response.get('access_err_msg'))\\n- if 'Video streaming is not available in your country' in error:\\n- self.raise_geo_restricted(\\n- msg=error, countries=self._GEO_COUNTRIES)\\n- else:\\n- raise ExtractorError(error, expected=True)\\n-\\n- formats = []\\n-\\n- width = int_or_none(result.get('width'))\\n- height = int_or_none(result.get('height'))\\n-\\n- playlist0 = result['playlist'][0]\\n- for fmt in playlist0['sources']:\\n- file_url = urljoin(self._APPS_BASE_URL, fmt.get('file'))\\n- if not file_url:\\n- continue\\n- # If we ever wanted to provide the final resolved URL that\\n- # does not require cookies, albeit with a shorter lifespan:\\n- # urlh = self._downloader.urlopen(file_url)\\n- # resolved_url = urlh.url\\n- label = fmt.get('label')\\n- h = self._FORMAT_HEIGHTS.get(label)\\n- w = h * width // height if h and width and height else None\\n- formats.append({\\n- 'format_id': label,\\n- 'ext': fmt.get('type'),\\n- 'url': file_url,\\n- 'width': w,\\n- 'height': h,\\n- })\\n-\\n- subtitles = {}\\n- tracks = try_get(playlist0, lambda x: x['tracks'], list) or []\\n- for track in tracks:\\n- if not isinstance(track, dict):\\n- continue\\n- track_kind = str_or_none(track.get('kind'))\\n- if not track_kind or not isinstance(track_kind, str):\\n- continue\\n- if track_kind.lower() not in ('captions', 'subtitles'):\\n- continue\\n- track_url = urljoin(self._APPS_BASE_URL, track.get('file'))\\n- if not track_url:\\n- continue\\n- track_label = track.get('label')\\n- subtitles.setdefault(self._CC_LANGS.get(\\n- track_label, track_label), []).append({\\n- 'url': self._proto_relative_url(track_url),\\n- 'ext': 'srt',\\n- })\\n-\\n- # Likes\\n- emotion = self._download_json(\\n- 'https://emocounter.hkedcity.net/handler.php', video_id,\\n- data=urlencode_postdata({\\n- 'action': 'get_emotion',\\n- 'data[bucket_id]': 'etv',\\n- 'data[identifier]': video_id,\\n- }),\\n- headers={'Content-Type': 'application/x-www-form-urlencoded'},\\n- fatal=False) or {}\\n- like_count = int_or_none(try_get(\\n- emotion, lambda x: x['data']['emotion_data'][0]['count']))\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': self._html_search_meta(\\n- 'description', webpage, fatal=False),\\n- 'upload_date': unified_strdate(self._html_search_meta(\\n- 'ed_date', webpage, fatal=False), day_first=False),\\n- 'duration': int_or_none(result.get('length')),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'thumbnail': urljoin(self._APPS_BASE_URL, result.get('image')),\\n- 'view_count': parse_count(result.get('view_count')),\\n- 'like_count': like_count,\\n- }\\ndiff --git a/yt_dlp/extractor/idolplus.py b/yt_dlp/extractor/idolplus.py\\ndeleted file mode 100644\\nindex 3c905b071234..000000000000\\n--- a/yt_dlp/extractor/idolplus.py\\n+++ /dev/null\\n@@ -1,115 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import traverse_obj, try_call, url_or_none\\n-\\n-\\n-class IdolPlusIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?idolplus\\\\.com/z[us]/(?:concert/|contents/?\\\\?(?:[^#]+&)?albumId=)(?P<id>\\\\w+)'\\n- _TESTS = [{\\n- 'url': 'https://idolplus.com/zs/contents?albumId=M012077298PPV00',\\n- 'md5': '2ace3f4661c943a2f7e79f0b88cea1e7',\\n- 'info_dict': {\\n- 'id': 'M012077298PPV00',\\n- 'ext': 'mp4',\\n- 'title': '[MultiCam] Aegyo on Top of Aegyo (IZ*ONE EATING TRIP)',\\n- 'release_date': '20200707',\\n- 'formats': 'count:65',\\n- },\\n- 'params': {'format': '532-KIM_MINJU'},\\n- }, {\\n- 'url': 'https://idolplus.com/zs/contents?albumId=M01232H058PPV00&catId=E9TX5',\\n- 'info_dict': {\\n- 'id': 'M01232H058PPV00',\\n- 'ext': 'mp4',\\n- 'title': 'YENA (CIRCLE CHART MUSIC AWARDS 2022 RED CARPET)',\\n- 'release_date': '20230218',\\n- 'formats': 'count:5',\\n- },\\n- 'params': {'skip_download': 'm3u8'},\\n- }, {\\n- # live stream\\n- 'url': 'https://idolplus.com/zu/contents?albumId=M012323174PPV00',\\n- 'info_dict': {\\n- 'id': 'M012323174PPV00',\\n- 'ext': 'mp4',\\n- 'title': 'Hanteo Music Awards 2022 DAY2',\\n- 'release_date': '20230211',\\n- 'formats': 'count:5',\\n- },\\n- 'params': {'skip_download': 'm3u8'},\\n- }, {\\n- 'url': 'https://idolplus.com/zs/concert/M012323039PPV00',\\n- 'info_dict': {\\n- 'id': 'M012323039PPV00',\\n- 'ext': 'mp4',\\n- 'title': 'CIRCLE CHART MUSIC AWARDS 2022',\\n- 'release_date': '20230218',\\n- 'formats': 'count:5',\\n- },\\n- 'params': {'skip_download': 'm3u8'},\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- data_list = traverse_obj(self._download_json(\\n- 'https://idolplus.com/api/zs/viewdata/ruleset/build', video_id,\\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\\n- 'rulesetId': 'contents',\\n- 'albumId': video_id,\\n- 'distribute': 'PRD',\\n- 'loggedIn': 'false',\\n- 'region': 'zs',\\n- 'countryGroup': '00010',\\n- 'lang': 'en',\\n- 'saId': '999999999998',\\n- }), ('data', 'viewData', ...))\\n-\\n- player_data = {}\\n- while data_list:\\n- player_data = data_list.pop()\\n- if traverse_obj(player_data, 'type') == 'player':\\n- break\\n- elif traverse_obj(player_data, ('dataList', ...)):\\n- data_list += player_data['dataList']\\n-\\n- formats = self._extract_m3u8_formats(traverse_obj(player_data, (\\n- 'vodPlayerList', 'vodProfile', 0, 'vodServer', 0, 'video_url', {url_or_none})), video_id)\\n-\\n- subtitles = {}\\n- for caption in traverse_obj(player_data, ('vodPlayerList', 'caption')) or []:\\n- subtitles.setdefault(caption.get('lang') or 'und', []).append({\\n- 'url': caption.get('smi_url'),\\n- 'ext': 'vtt',\\n- })\\n-\\n- # Add member multicams as alternative formats\\n- if (traverse_obj(player_data, ('detail', 'has_cuesheet')) == 'Y'\\n- and traverse_obj(player_data, ('detail', 'is_omni_member')) == 'Y'):\\n- cuesheet = traverse_obj(self._download_json(\\n- 'https://idolplus.com/gapi/contents/v1.0/content/cuesheet', video_id,\\n- 'Downloading JSON metadata for member multicams',\\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\\n- 'ALBUM_ID': video_id,\\n- 'COUNTRY_GRP': '00010',\\n- 'LANG': 'en',\\n- 'SA_ID': '999999999998',\\n- 'COUNTRY_CODE': 'KR',\\n- }), ('data', 'cuesheet_item', 0))\\n-\\n- for member in traverse_obj(cuesheet, ('members', ...)):\\n- index = try_call(lambda: int(member['omni_view_index']) - 1)\\n- member_video_url = traverse_obj(cuesheet, ('omni_view', index, 'cdn_url', 0, 'url', {url_or_none}))\\n- if not member_video_url:\\n- continue\\n- member_formats = self._extract_m3u8_formats(\\n- member_video_url, video_id, note=f'Downloading m3u8 for multicam {member[\\\"name\\\"]}')\\n- for mf in member_formats:\\n- mf['format_id'] = f'{mf[\\\"format_id\\\"]}-{member[\\\"name\\\"].replace(\\\" \\\", \\\"_\\\")}'\\n- formats.extend(member_formats)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': traverse_obj(player_data, ('detail', 'albumName')),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'release_date': traverse_obj(player_data, ('detail', 'broadcastDate')),\\n- }\\ndiff --git a/yt_dlp/extractor/infoq.py b/yt_dlp/extractor/infoq.py\\nindex 5274c9339fa8..533592229380 100644\\n--- a/yt_dlp/extractor/infoq.py\\n+++ b/yt_dlp/extractor/infoq.py\\n@@ -1,7 +1,7 @@\\n import base64\\n import urllib.parse\\n \\n-from .bokecc import BokeCCBaseIE\\n+from .common import InfoExtractor\\n from ..utils import (\\n ExtractorError,\\n determine_ext,\\n@@ -10,7 +10,7 @@\\n )\\n \\n \\n-class InfoQIE(BokeCCBaseIE):\\n+class InfoQIE(InfoExtractor):\\n _VALID_URL = r'https?://(?:www\\\\.)?infoq\\\\.com/(?:[^/]+/)+(?P<id>[^/]+)'\\n \\n _TESTS = [{\\n@@ -117,14 +117,10 @@ def _real_extract(self, url):\\n video_title = self._html_extract_title(webpage)\\n video_description = self._html_search_meta('description', webpage, 'description')\\n \\n- if '/cn/' in url:\\n- # for China videos, HTTP video URL exists but always fails with 403\\n- formats = self._extract_bokecc_formats(webpage, video_id)\\n- else:\\n- formats = (\\n- self._extract_rtmp_video(webpage)\\n- + self._extract_http_video(webpage)\\n- + self._extract_http_audio(webpage, video_id))\\n+ formats = (\\n+ self._extract_rtmp_video(webpage)\\n+ + self._extract_http_video(webpage)\\n+ + self._extract_http_audio(webpage, video_id))\\n \\n return {\\n 'id': video_id,\\ndiff --git a/yt_dlp/extractor/internetvideoarchive.py b/yt_dlp/extractor/internetvideoarchive.py\\ndeleted file mode 100644\\nindex 9d2574cb068d..000000000000\\n--- a/yt_dlp/extractor/internetvideoarchive.py\\n+++ /dev/null\\n@@ -1,58 +0,0 @@\\n-import json\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import parse_qs\\n-\\n-\\n-class InternetVideoArchiveIE(InfoExtractor):\\n- _VALID_URL = r'https?://video\\\\.internetvideoarchive\\\\.net/(?:player|flash/players)/.*?\\\\?.*?publishedid.*?'\\n-\\n- _TEST = {\\n- 'url': 'http://video.internetvideoarchive.net/player/6/configuration.ashx?customerid=69249&publishedid=194487&reporttag=vdbetatitle&playerid=641&autolist=0&domain=www.videodetective.com&maxrate=high&minrate=low&socialplayer=false',\\n- 'info_dict': {\\n- 'id': '194487',\\n- 'ext': 'mp4',\\n- 'title': 'Kick-Ass 2',\\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }\\n-\\n- @staticmethod\\n- def _build_json_url(query):\\n- return 'http://video.internetvideoarchive.net/player/6/configuration.ashx?' + query\\n-\\n- def _real_extract(self, url):\\n- query = parse_qs(url)\\n- video_id = query['publishedid'][0]\\n- data = self._download_json(\\n- 'https://video.internetvideoarchive.net/videojs7/videojs7.ivasettings.ashx',\\n- video_id, data=json.dumps({\\n- 'customerid': query['customerid'][0],\\n- 'publishedid': video_id,\\n- }).encode())\\n- title = data['Title']\\n- formats = self._extract_m3u8_formats(\\n- data['VideoUrl'], video_id, 'mp4',\\n- 'm3u8_native', m3u8_id='hls', fatal=False)\\n- file_url = formats[0]['url']\\n- if '.ism/' in file_url:\\n- replace_url = lambda x: re.sub(r'\\\\.ism/[^?]+', '.ism/' + x, file_url)\\n- formats.extend(self._extract_f4m_formats(\\n- replace_url('.f4m'), video_id, f4m_id='hds', fatal=False))\\n- formats.extend(self._extract_mpd_formats(\\n- replace_url('.mpd'), video_id, mpd_id='dash', fatal=False))\\n- formats.extend(self._extract_ism_formats(\\n- replace_url('Manifest'), video_id, ism_id='mss', fatal=False))\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'thumbnail': data.get('PosterUrl'),\\n- 'description': data.get('Description'),\\n- }\\ndiff --git a/yt_dlp/extractor/izlesene.py b/yt_dlp/extractor/izlesene.py\\ndeleted file mode 100644\\nindex cf2a269c38f6..000000000000\\n--- a/yt_dlp/extractor/izlesene.py\\n+++ /dev/null\\n@@ -1,111 +0,0 @@\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- determine_ext,\\n- float_or_none,\\n- get_element_by_id,\\n- int_or_none,\\n- parse_iso8601,\\n- str_to_int,\\n-)\\n-\\n-\\n-class IzleseneIE(InfoExtractor):\\n- _VALID_URL = r'''(?x)\\n- https?://(?:(?:www|m)\\\\.)?izlesene\\\\.com/\\n- (?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)\\n- '''\\n- _TESTS = [\\n- {\\n- 'url': 'http://www.izlesene.com/video/sevincten-cildirtan-dogum-gunu-hediyesi/7599694',\\n- 'md5': '4384f9f0ea65086734b881085ee05ac2',\\n- 'info_dict': {\\n- 'id': '7599694',\\n- 'ext': 'mp4',\\n- 'title': 'Sevinรงten รฤฑldฤฑrtan Doฤum Gรผnรผ Hediyesi',\\n- 'description': 'md5:253753e2655dde93f59f74b572454f6d',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'uploader_id': 'pelikzzle',\\n- 'timestamp': int,\\n- 'upload_date': '20140702',\\n- 'duration': 95.395,\\n- 'age_limit': 0,\\n- },\\n- },\\n- {\\n- 'url': 'http://www.izlesene.com/video/tarkan-dortmund-2006-konseri/17997',\\n- 'md5': '97f09b6872bffa284cb7fa4f6910cb72',\\n- 'info_dict': {\\n- 'id': '17997',\\n- 'ext': 'mp4',\\n- 'title': 'Tarkan Dortmund 2006 Konseri',\\n- 'thumbnail': r're:^https://.*\\\\.jpg',\\n- 'uploader_id': 'parlayankiz',\\n- 'timestamp': int,\\n- 'upload_date': '20061112',\\n- 'duration': 253.666,\\n- 'age_limit': 0,\\n- },\\n- },\\n- ]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(f'http://www.izlesene.com/video/{video_id}', video_id)\\n-\\n- video = self._parse_json(\\n- self._search_regex(\\n- r'videoObj\\\\s*=\\\\s*({.+?})\\\\s*;\\\\s*\\\\n', webpage, 'streams'),\\n- video_id)\\n-\\n- title = video.get('videoTitle') or self._og_search_title(webpage)\\n-\\n- formats = []\\n- for stream in video['media']['level']:\\n- source_url = stream.get('source')\\n- if not source_url or not isinstance(source_url, str):\\n- continue\\n- ext = determine_ext(url, 'mp4')\\n- quality = stream.get('value')\\n- height = int_or_none(quality)\\n- formats.append({\\n- 'format_id': f'{quality}p' if quality else 'sd',\\n- 'url': urllib.parse.unquote(source_url),\\n- 'ext': ext,\\n- 'height': height,\\n- })\\n-\\n- description = self._og_search_description(webpage, default=None)\\n- thumbnail = video.get('posterURL') or self._proto_relative_url(\\n- self._og_search_thumbnail(webpage), scheme='http:')\\n-\\n- uploader = self._html_search_regex(\\n- r\\\"adduserUsername\\\\s*=\\\\s*'([^']+)';\\\",\\n- webpage, 'uploader', fatal=False)\\n- timestamp = parse_iso8601(self._html_search_meta(\\n- 'uploadDate', webpage, 'upload date'))\\n-\\n- duration = float_or_none(video.get('duration') or self._html_search_regex(\\n- r'videoduration[\\\"\\\\']?\\\\s*=\\\\s*([\\\"\\\\'])(?P<value>(?:(?!\\\\1).)+)\\\\1',\\n- webpage, 'duration', fatal=False, group='value'), scale=1000)\\n-\\n- view_count = str_to_int(get_element_by_id('videoViewCount', webpage))\\n- comment_count = self._html_search_regex(\\n- r'comment_count\\\\s*=\\\\s*\\\\'([^\\\\']+)\\\\';',\\n- webpage, 'comment_count', fatal=False)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': description,\\n- 'thumbnail': thumbnail,\\n- 'uploader_id': uploader,\\n- 'timestamp': timestamp,\\n- 'duration': duration,\\n- 'view_count': int_or_none(view_count),\\n- 'comment_count': int_or_none(comment_count),\\n- 'age_limit': self._family_friendly_search(webpage),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/kinja.py b/yt_dlp/extractor/kinja.py\\ndeleted file mode 100644\\nindex 67c089104c65..000000000000\\n--- a/yt_dlp/extractor/kinja.py\\n+++ /dev/null\\n@@ -1,206 +0,0 @@\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_iso8601,\\n- strip_or_none,\\n- try_get,\\n-)\\n-\\n-\\n-class KinjaEmbedIE(InfoExtractor):\\n- IE_NAME = 'kinja:embed'\\n- _DOMAIN_REGEX = r'''(?:[^.]+\\\\.)?\\n- (?:\\n- avclub|\\n- clickhole|\\n- deadspin|\\n- gizmodo|\\n- jalopnik|\\n- jezebel|\\n- kinja|\\n- kotaku|\\n- lifehacker|\\n- splinternews|\\n- the(?:inventory|onion|root|takeout)\\n- )\\\\.com'''\\n- _COMMON_REGEX = r'''/\\n- (?:\\n- ajax/inset|\\n- embed/video\\n- )/iframe\\\\?.*?\\\\bid='''\\n- _VALID_URL = rf'''(?x)https?://{_DOMAIN_REGEX}{_COMMON_REGEX}\\n- (?P<type>\\n- fb|\\n- imgur|\\n- instagram|\\n- jwp(?:layer)?-video|\\n- kinjavideo|\\n- mcp|\\n- megaphone|\\n- soundcloud(?:-playlist)?|\\n- tumblr-post|\\n- twitch-stream|\\n- twitter|\\n- ustream-channel|\\n- vimeo|\\n- vine|\\n- youtube-(?:list|video)\\n- )-(?P<id>[^&]+)'''\\n- _EMBED_REGEX = [rf'(?x)<iframe[^>]+?src=(?P<q>[\\\"\\\\'])(?P<url>(?:(?:https?:)?//{_DOMAIN_REGEX})?{_COMMON_REGEX}(?:(?!\\\\1).)+)\\\\1']\\n- _TESTS = [{\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=fb-10103303356633621',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=kinjavideo-100313',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=megaphone-PPY1300931075',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-128574047',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-playlist-317413750',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=tumblr-post-160130699814-daydreams-at-midnight',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitch-stream-libratus_extra',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitter-1068875942473404422',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=ustream-channel-10414700',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vimeo-120153502',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vine-5BlvV5qqPrD',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-list-BCQ3KyrPjgA/PLE6509247C270A72E',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-video-00QyL0AgPAE',\\n- 'only_matching': True,\\n- }]\\n- _WEBPAGE_TESTS = [{\\n- 'url': 'http://www.clickhole.com/video/dont-understand-bitcoin-man-will-mumble-explanatio-2537',\\n- 'info_dict': {\\n- 'id': '106351',\\n- 'ext': 'mp4',\\n- 'title': 'Donโt Understand Bitcoin? This Man Will Mumble An Explanation At You',\\n- },\\n- 'skip': 'Invalid URL',\\n- }]\\n- _JWPLATFORM_PROVIDER = ('cdn.jwplayer.com/v2/media/', 'JWPlatform')\\n- _PROVIDER_MAP = {\\n- 'fb': ('facebook.com/video.php?v=', 'Facebook'),\\n- 'imgur': ('imgur.com/', 'Imgur'),\\n- 'instagram': ('instagram.com/p/', 'Instagram'),\\n- 'jwplayer-video': _JWPLATFORM_PROVIDER,\\n- 'jwp-video': _JWPLATFORM_PROVIDER,\\n- 'megaphone': ('player.megaphone.fm/', 'Generic'),\\n- 'soundcloud': ('api.soundcloud.com/tracks/', 'Soundcloud'),\\n- 'soundcloud-playlist': ('api.soundcloud.com/playlists/', 'SoundcloudPlaylist'),\\n- 'tumblr-post': ('%s.tumblr.com/post/%s', 'Tumblr'),\\n- 'twitch-stream': ('twitch.tv/', 'TwitchStream'),\\n- 'twitter': ('twitter.com/i/cards/tfw/v1/', 'TwitterCard'),\\n- 'ustream-channel': ('ustream.tv/embed/', 'Ustream'),\\n- 'vimeo': ('vimeo.com/', 'Vimeo'),\\n- 'vine': ('vine.co/v/', 'Vine'),\\n- 'youtube-list': ('youtube.com/embed/%s?list=%s', 'YoutubePlaylist'),\\n- 'youtube-video': ('youtube.com/embed/', 'Youtube'),\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_type, video_id = self._match_valid_url(url).groups()\\n-\\n- provider = self._PROVIDER_MAP.get(video_type)\\n- if provider:\\n- video_id = urllib.parse.unquote(video_id)\\n- if video_type == 'tumblr-post':\\n- video_id, blog = video_id.split('-', 1)\\n- result_url = provider[0] % (blog, video_id)\\n- elif video_type == 'youtube-list':\\n- video_id, playlist_id = video_id.split('/')\\n- result_url = provider[0] % (video_id, playlist_id)\\n- else:\\n- result_url = provider[0] + video_id\\n- return self.url_result('http://' + result_url, provider[1])\\n-\\n- if video_type == 'kinjavideo':\\n- data = self._download_json(\\n- 'https://kinja.com/api/core/video/views/videoById',\\n- video_id, query={'videoId': video_id})['data']\\n- title = data['title']\\n-\\n- formats = []\\n- for k in ('signedPlaylist', 'streaming'):\\n- m3u8_url = data.get(k + 'Url')\\n- if m3u8_url:\\n- formats.extend(self._extract_m3u8_formats(\\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n-\\n- thumbnail = None\\n- poster = data.get('poster') or {}\\n- poster_id = poster.get('id')\\n- if poster_id:\\n- thumbnail = 'https://i.kinja-img.com/gawker-media/image/upload/{}.{}'.format(poster_id, poster.get('format') or 'jpg')\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': strip_or_none(data.get('description')),\\n- 'formats': formats,\\n- 'tags': data.get('tags'),\\n- 'timestamp': int_or_none(try_get(\\n- data, lambda x: x['postInfo']['publishTimeMillis']), 1000),\\n- 'thumbnail': thumbnail,\\n- 'uploader': data.get('network'),\\n- }\\n- else:\\n- video_data = self._download_json(\\n- 'https://api.vmh.univision.com/metadata/v1/content/' + video_id,\\n- video_id)['videoMetadata']\\n- iptc = video_data['photoVideoMetadataIPTC']\\n- title = iptc['title']['en']\\n- fmg = video_data.get('photoVideoMetadata_fmg') or {}\\n- tvss_domain = fmg.get('tvssDomain') or 'https://auth.univision.com'\\n- data = self._download_json(\\n- tvss_domain + '/api/v3/video-auth/url-signature-tokens',\\n- video_id, query={'mcpids': video_id})['data'][0]\\n- formats = []\\n-\\n- rendition_url = data.get('renditionUrl')\\n- if rendition_url:\\n- formats = self._extract_m3u8_formats(\\n- rendition_url, video_id, 'mp4',\\n- 'm3u8_native', m3u8_id='hls', fatal=False)\\n-\\n- fallback_rendition_url = data.get('fallbackRenditionUrl')\\n- if fallback_rendition_url:\\n- formats.append({\\n- 'format_id': 'fallback',\\n- 'tbr': int_or_none(self._search_regex(\\n- r'_(\\\\d+)\\\\.mp4', fallback_rendition_url,\\n- 'bitrate', default=None)),\\n- 'url': fallback_rendition_url,\\n- })\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'thumbnail': try_get(iptc, lambda x: x['cloudinaryLink']['link'], str),\\n- 'uploader': fmg.get('network'),\\n- 'duration': int_or_none(iptc.get('fileDuration')),\\n- 'formats': formats,\\n- 'description': try_get(iptc, lambda x: x['description']['en'], str),\\n- 'timestamp': parse_iso8601(iptc.get('dateReleased')),\\n- }\\ndiff --git a/yt_dlp/extractor/koo.py b/yt_dlp/extractor/koo.py\\ndeleted file mode 100644\\nindex 6ec5b59f9a1f..000000000000\\n--- a/yt_dlp/extractor/koo.py\\n+++ /dev/null\\n@@ -1,115 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- clean_html,\\n- try_get,\\n-)\\n-\\n-\\n-class KooIE(InfoExtractor):\\n- _WORKING = False\\n- _VALID_URL = r'https?://(?:www\\\\.)?kooapp\\\\.com/koo/[^/]+/(?P<id>[^/&#$?]+)'\\n- _TESTS = [{ # Test for video in the comments\\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/946c4189-bc2d-4524-b95b-43f641e2adde',\\n- 'info_dict': {\\n- 'id': '946c4189-bc2d-4524-b95b-43f641e2adde',\\n- 'ext': 'mp4',\\n- 'title': 'test for video in comment',\\n- 'description': 'md5:daa77dc214add4da8b6ea7d2226776e7',\\n- 'timestamp': 1632215195,\\n- 'uploader_id': 'ytdlpTestAccount',\\n- 'uploader': 'yt-dlpTestAccount',\\n- 'duration': 7000,\\n- 'upload_date': '20210921',\\n- },\\n- 'params': {'skip_download': True},\\n- }, { # Test for koo with long title\\n- 'url': 'https://www.kooapp.com/koo/laxman_kumarDBFEC/33decbf7-5e1e-4bb8-bfd7-04744a064361',\\n- 'info_dict': {\\n- 'id': '33decbf7-5e1e-4bb8-bfd7-04744a064361',\\n- 'ext': 'mp4',\\n- 'title': 'md5:47a71c2337295330c5a19a8af1bbf450',\\n- 'description': 'md5:06a6a84e9321499486dab541693d8425',\\n- 'timestamp': 1632106884,\\n- 'uploader_id': 'laxman_kumarDBFEC',\\n- 'uploader': 'Laxman Kumar ๐ฎ๐ณ',\\n- 'duration': 46000,\\n- 'upload_date': '20210920',\\n- },\\n- 'params': {'skip_download': True},\\n- }, { # Test for audio\\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\\n- 'info_dict': {\\n- 'id': 'a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\\n- 'ext': 'mp4',\\n- 'title': 'Test for audio',\\n- 'description': 'md5:ecb9a2b6a5d34b736cecb53788cb11e8',\\n- 'timestamp': 1632211634,\\n- 'uploader_id': 'ytdlpTestAccount',\\n- 'uploader': 'yt-dlpTestAccount',\\n- 'duration': 214000,\\n- 'upload_date': '20210921',\\n- },\\n- 'params': {'skip_download': True},\\n- }, { # Test for video\\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\\n- 'info_dict': {\\n- 'id': 'a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\\n- 'ext': 'mp4',\\n- 'title': 'Test for video',\\n- 'description': 'md5:7afc4eb839074ddeb2beea5dd6fe9500',\\n- 'timestamp': 1632211468,\\n- 'uploader_id': 'ytdlpTestAccount',\\n- 'uploader': 'yt-dlpTestAccount',\\n- 'duration': 14000,\\n- 'upload_date': '20210921',\\n- },\\n- 'params': {'skip_download': True},\\n- }, { # Test for link\\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/01bf5b94-81a5-4d8e-a387-5f732022e15a',\\n- 'skip': 'No video/audio found at the provided url.',\\n- 'info_dict': {\\n- 'id': '01bf5b94-81a5-4d8e-a387-5f732022e15a',\\n- 'title': 'Test for link',\\n- 'ext': 'none',\\n- },\\n- }, { # Test for images\\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\\n- 'skip': 'No video/audio found at the provided url.',\\n- 'info_dict': {\\n- 'id': 'dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\\n- 'title': 'Test for images',\\n- 'ext': 'none',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- data_json = self._download_json(\\n- f'https://www.kooapp.com/apiV1/ku/{video_id}?limit=20&offset=0&showSimilarKoos=true', video_id)['parentContent']\\n- item_json = next(content['items'][0] for content in data_json\\n- if try_get(content, lambda x: x['items'][0]['id']) == video_id)\\n- media_json = item_json['mediaMap']\\n- formats = []\\n-\\n- mp4_url = media_json.get('videoMp4')\\n- video_m3u8_url = media_json.get('videoHls')\\n- if mp4_url:\\n- formats.append({\\n- 'url': mp4_url,\\n- 'ext': 'mp4',\\n- })\\n- if video_m3u8_url:\\n- formats.extend(self._extract_m3u8_formats(video_m3u8_url, video_id, fatal=False, ext='mp4'))\\n- if not formats:\\n- self.raise_no_formats('No video/audio found at the provided url.', expected=True)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': clean_html(item_json.get('title')),\\n- 'description': f'{clean_html(item_json.get(\\\"title\\\"))}\\\\n\\\\n{clean_html(item_json.get(\\\"enTransliteration\\\"))}',\\n- 'timestamp': item_json.get('createdAt'),\\n- 'uploader_id': item_json.get('handle'),\\n- 'uploader': item_json.get('name'),\\n- 'duration': media_json.get('duration'),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/leeco.py b/yt_dlp/extractor/leeco.py\\nindex 58baa3fea796..efec5d738268 100644\\n--- a/yt_dlp/extractor/leeco.py\\n+++ b/yt_dlp/extractor/leeco.py\\n@@ -1,9 +1,6 @@\\n-import base64\\n import datetime as dt\\n-import hashlib\\n import re\\n import time\\n-import urllib.parse\\n \\n from .common import InfoExtractor\\n from ..compat import compat_ord\\n@@ -14,8 +11,6 @@\\n int_or_none,\\n orderedSet,\\n parse_iso8601,\\n- str_or_none,\\n- url_basename,\\n urshift,\\n )\\n \\n@@ -248,114 +243,3 @@ def _real_extract(self, url):\\n \\n return self.playlist_result(entries, playlist_id, playlist_title=title,\\n playlist_description=description)\\n-\\n-\\n-class LetvCloudIE(InfoExtractor):\\n- # Most of *.letv.com is changed to *.le.com on 2016/01/02\\n- # but yuntv.letv.com is kept, so also keep the extractor name\\n- IE_DESC = 'ไน่งไบ'\\n- _VALID_URL = r'https?://yuntv\\\\.letv\\\\.com/bcloud.html\\\\?.+'\\n-\\n- _TESTS = [{\\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=467623dedf',\\n- 'md5': '26450599afd64c513bc77030ad15db44',\\n- 'info_dict': {\\n- 'id': 'p7jnfw5hw9_467623dedf',\\n- 'ext': 'mp4',\\n- 'title': 'Video p7jnfw5hw9_467623dedf',\\n- },\\n- }, {\\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=ec93197892&pu=2c7cd40209&auto_play=1&gpcflag=1&width=640&height=360',\\n- 'md5': 'e03d9cc8d9c13191e1caf277e42dbd31',\\n- 'info_dict': {\\n- 'id': 'p7jnfw5hw9_ec93197892',\\n- 'ext': 'mp4',\\n- 'title': 'Video p7jnfw5hw9_ec93197892',\\n- },\\n- }, {\\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=187060b6fd',\\n- 'md5': 'cb988699a776b22d4a41b9d43acfb3ac',\\n- 'info_dict': {\\n- 'id': 'p7jnfw5hw9_187060b6fd',\\n- 'ext': 'mp4',\\n- 'title': 'Video p7jnfw5hw9_187060b6fd',\\n- },\\n- }]\\n-\\n- @staticmethod\\n- def sign_data(obj):\\n- if obj['cf'] == 'flash':\\n- salt = '2f9d6924b33a165a6d8b5d3d42f4f987'\\n- items = ['cf', 'format', 'ran', 'uu', 'ver', 'vu']\\n- elif obj['cf'] == 'html5':\\n- salt = 'fbeh5player12c43eccf2bec3300344'\\n- items = ['cf', 'ran', 'uu', 'bver', 'vu']\\n- input_data = ''.join([item + obj[item] for item in items]) + salt\\n- obj['sign'] = hashlib.md5(input_data.encode()).hexdigest()\\n-\\n- def _get_formats(self, cf, uu, vu, media_id):\\n- def get_play_json(cf, timestamp):\\n- data = {\\n- 'cf': cf,\\n- 'ver': '2.2',\\n- 'bver': 'firefox44.0',\\n- 'format': 'json',\\n- 'uu': uu,\\n- 'vu': vu,\\n- 'ran': str(timestamp),\\n- }\\n- self.sign_data(data)\\n- return self._download_json(\\n- 'http://api.letvcloud.com/gpc.php?' + urllib.parse.urlencode(data),\\n- media_id, f'Downloading playJson data for type {cf}')\\n-\\n- play_json = get_play_json(cf, time.time())\\n- # The server time may be different from local time\\n- if play_json.get('code') == 10071:\\n- play_json = get_play_json(cf, play_json['timestamp'])\\n-\\n- if not play_json.get('data'):\\n- if play_json.get('message'):\\n- raise ExtractorError('Letv cloud said: {}'.format(play_json['message']), expected=True)\\n- elif play_json.get('code'):\\n- raise ExtractorError('Letv cloud returned error %d' % play_json['code'], expected=True)\\n- else:\\n- raise ExtractorError('Letv cloud returned an unknown error')\\n-\\n- def b64decode(s):\\n- return base64.b64decode(s).decode('utf-8')\\n-\\n- formats = []\\n- for media in play_json['data']['video_info']['media'].values():\\n- play_url = media['play_url']\\n- url = b64decode(play_url['main_url'])\\n- decoded_url = b64decode(url_basename(url))\\n- formats.append({\\n- 'url': url,\\n- 'ext': determine_ext(decoded_url),\\n- 'format_id': str_or_none(play_url.get('vtype')),\\n- 'format_note': str_or_none(play_url.get('definition')),\\n- 'width': int_or_none(play_url.get('vwidth')),\\n- 'height': int_or_none(play_url.get('vheight')),\\n- })\\n-\\n- return formats\\n-\\n- def _real_extract(self, url):\\n- uu_mobj = re.search(r'uu=([\\\\w]+)', url)\\n- vu_mobj = re.search(r'vu=([\\\\w]+)', url)\\n-\\n- if not uu_mobj or not vu_mobj:\\n- raise ExtractorError(f'Invalid URL: {url}', expected=True)\\n-\\n- uu = uu_mobj.group(1)\\n- vu = vu_mobj.group(1)\\n- media_id = uu + '_' + vu\\n-\\n- formats = self._get_formats('flash', uu, vu, media_id) + self._get_formats('html5', uu, vu, media_id)\\n-\\n- return {\\n- 'id': media_id,\\n- 'title': f'Video {media_id}',\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/livestream.py b/yt_dlp/extractor/livestream.py\\ndeleted file mode 100644\\nindex 7f7947ee7bfe..000000000000\\n--- a/yt_dlp/extractor/livestream.py\\n+++ /dev/null\\n@@ -1,386 +0,0 @@\\n-import itertools\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- determine_ext,\\n- find_xpath_attr,\\n- float_or_none,\\n- int_or_none,\\n- orderedSet,\\n- parse_iso8601,\\n- traverse_obj,\\n- update_url_query,\\n- xpath_attr,\\n- xpath_text,\\n- xpath_with_ns,\\n-)\\n-\\n-\\n-class LivestreamIE(InfoExtractor):\\n- IE_NAME = 'livestream'\\n- _VALID_URL = r'''(?x)\\n- https?://(?:new\\\\.)?livestream\\\\.com/\\n- (?:accounts/(?P<account_id>\\\\d+)|(?P<account_name>[^/]+))\\n- (?:/events/(?P<event_id>\\\\d+)|/(?P<event_name>[^/]+))?\\n- (?:/videos/(?P<id>\\\\d+))?\\n- '''\\n- _EMBED_REGEX = [r'<iframe[^>]+src=\\\"(?P<url>https?://(?:new\\\\.)?livestream\\\\.com/[^\\\"]+/player[^\\\"]+)\\\"']\\n-\\n- _TESTS = [{\\n- 'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',\\n- 'md5': '7876c5f5dc3e711b6b73acce4aac1527',\\n- 'info_dict': {\\n- 'id': '4719370',\\n- 'ext': 'mp4',\\n- 'title': 'Live from Webster Hall NYC',\\n- 'timestamp': 1350008072,\\n- 'upload_date': '20121012',\\n- 'duration': 5968.0,\\n- 'like_count': int,\\n- 'view_count': int,\\n- 'comment_count': int,\\n- 'thumbnail': r're:^http://.*\\\\.jpg$',\\n- },\\n- }, {\\n- 'url': 'https://livestream.com/coheedandcambria/websterhall',\\n- 'info_dict': {\\n- 'id': '1585861',\\n- 'title': 'Live From Webster Hall',\\n- },\\n- 'playlist_mincount': 1,\\n- }, {\\n- 'url': 'https://livestream.com/dayananda/events/7954027',\\n- 'info_dict': {\\n- 'title': 'Live from Mevo',\\n- 'id': '7954027',\\n- },\\n- 'playlist_mincount': 4,\\n- }, {\\n- 'url': 'https://livestream.com/accounts/82',\\n- 'info_dict': {\\n- 'id': '253978',\\n- 'view_count': int,\\n- 'title': 'trsr',\\n- 'comment_count': int,\\n- 'like_count': int,\\n- 'upload_date': '20120306',\\n- 'timestamp': 1331042383,\\n- 'thumbnail': 'http://img.new.livestream.com/videos/0000000000000372/cacbeed6-fb68-4b5e-ad9c-e148124e68a9_640x427.jpg',\\n- 'duration': 15.332,\\n- 'ext': 'mp4',\\n- },\\n- }, {\\n- 'url': 'https://new.livestream.com/accounts/362/events/3557232/videos/67864563/player?autoPlay=false&height=360&mute=false&width=640',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://livestream.com/bsww/concacafbeachsoccercampeonato2015',\\n- 'only_matching': True,\\n- }]\\n- _API_URL_TEMPLATE = 'http://livestream.com/api/accounts/%s/events/%s'\\n-\\n- def _parse_smil_formats_and_subtitles(\\n- self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):\\n- base_ele = find_xpath_attr(\\n- smil, self._xpath_ns('.//meta', namespace), 'name', 'httpBase')\\n- base = base_ele.get('content') if base_ele is not None else 'http://livestreamvod-f.akamaihd.net/'\\n-\\n- formats = []\\n- video_nodes = smil.findall(self._xpath_ns('.//video', namespace))\\n-\\n- for vn in video_nodes:\\n- tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)\\n- furl = (\\n- update_url_query(urllib.parse.urljoin(base, vn.attrib['src']), {\\n- 'v': '3.0.3',\\n- 'fp': 'WIN% 14,0,0,145',\\n- }))\\n- if 'clipBegin' in vn.attrib:\\n- furl += '&ssek=' + vn.attrib['clipBegin']\\n- formats.append({\\n- 'url': furl,\\n- 'format_id': 'smil_%d' % tbr,\\n- 'ext': 'flv',\\n- 'tbr': tbr,\\n- 'preference': -1000, # Strictly inferior than all other formats?\\n- })\\n- return formats, {}\\n-\\n- def _extract_video_info(self, video_data):\\n- video_id = str(video_data['id'])\\n-\\n- FORMAT_KEYS = (\\n- ('sd', 'progressive_url'),\\n- ('hd', 'progressive_url_hd'),\\n- )\\n-\\n- formats = []\\n- for format_id, key in FORMAT_KEYS:\\n- video_url = video_data.get(key)\\n- if video_url:\\n- ext = determine_ext(video_url)\\n- if ext == 'm3u8':\\n- continue\\n- bitrate = int_or_none(self._search_regex(\\n- rf'(\\\\d+)\\\\.{ext}', video_url, 'bitrate', default=None))\\n- formats.append({\\n- 'url': video_url,\\n- 'format_id': format_id,\\n- 'tbr': bitrate,\\n- 'ext': ext,\\n- })\\n-\\n- smil_url = video_data.get('smil_url')\\n- if smil_url:\\n- formats.extend(self._extract_smil_formats(smil_url, video_id, fatal=False))\\n-\\n- m3u8_url = video_data.get('m3u8_url')\\n- if m3u8_url:\\n- formats.extend(self._extract_m3u8_formats(\\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n-\\n- f4m_url = video_data.get('f4m_url')\\n- if f4m_url:\\n- formats.extend(self._extract_f4m_formats(\\n- f4m_url, video_id, f4m_id='hds', fatal=False))\\n-\\n- comments = [{\\n- 'author_id': comment.get('author_id'),\\n- 'author': comment.get('author', {}).get('full_name'),\\n- 'id': comment.get('id'),\\n- 'text': comment['text'],\\n- 'timestamp': parse_iso8601(comment.get('created_at')),\\n- } for comment in video_data.get('comments', {}).get('data', [])]\\n-\\n- return {\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'title': video_data['caption'],\\n- 'description': video_data.get('description'),\\n- 'thumbnail': video_data.get('thumbnail_url'),\\n- 'duration': float_or_none(video_data.get('duration'), 1000),\\n- 'timestamp': parse_iso8601(video_data.get('publish_at')),\\n- 'like_count': video_data.get('likes', {}).get('total'),\\n- 'comment_count': video_data.get('comments', {}).get('total'),\\n- 'view_count': video_data.get('views'),\\n- 'comments': comments,\\n- }\\n-\\n- def _extract_stream_info(self, stream_info):\\n- broadcast_id = str(stream_info['broadcast_id'])\\n- is_live = stream_info.get('is_live')\\n-\\n- formats = []\\n- smil_url = stream_info.get('play_url')\\n- if smil_url:\\n- formats.extend(self._extract_smil_formats(smil_url, broadcast_id))\\n-\\n- m3u8_url = stream_info.get('m3u8_url')\\n- if m3u8_url:\\n- formats.extend(self._extract_m3u8_formats(\\n- m3u8_url, broadcast_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n-\\n- rtsp_url = stream_info.get('rtsp_url')\\n- if rtsp_url:\\n- formats.append({\\n- 'url': rtsp_url,\\n- 'format_id': 'rtsp',\\n- })\\n-\\n- return {\\n- 'id': broadcast_id,\\n- 'formats': formats,\\n- 'title': stream_info['stream_title'],\\n- 'thumbnail': stream_info.get('thumbnail_url'),\\n- 'is_live': is_live,\\n- }\\n-\\n- def _generate_event_playlist(self, event_data):\\n- event_id = str(event_data['id'])\\n- account_id = str(event_data['owner_account_id'])\\n- feed_root_url = self._API_URL_TEMPLATE % (account_id, event_id) + '/feed.json'\\n-\\n- stream_info = event_data.get('stream_info')\\n- if stream_info:\\n- return self._extract_stream_info(stream_info)\\n-\\n- last_video = None\\n- for i in itertools.count(1):\\n- if last_video is None:\\n- info_url = feed_root_url\\n- else:\\n- info_url = f'{feed_root_url}?&id={last_video}&newer=-1&type=video'\\n- videos_info = self._download_json(\\n- info_url, event_id, f'Downloading page {i}')['data']\\n- videos_info = [v['data'] for v in videos_info if v['type'] == 'video']\\n- if not videos_info:\\n- break\\n- for v in videos_info:\\n- v_id = str(v['id'])\\n- yield self.url_result(\\n- f'http://livestream.com/accounts/{account_id}/events/{event_id}/videos/{v_id}',\\n- LivestreamIE, v_id, v.get('caption'))\\n- last_video = videos_info[-1]['id']\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id')\\n- event = mobj.group('event_id') or mobj.group('event_name')\\n- account = mobj.group('account_id') or mobj.group('account_name')\\n- api_url = f'http://livestream.com/api/accounts/{account}'\\n-\\n- if video_id:\\n- video_data = self._download_json(\\n- f'{api_url}/events/{event}/videos/{video_id}', video_id)\\n- return self._extract_video_info(video_data)\\n- elif event:\\n- event_data = self._download_json(f'{api_url}/events/{event}', None)\\n- return self.playlist_result(\\n- self._generate_event_playlist(event_data), str(event_data['id']), event_data['full_name'])\\n-\\n- account_data = self._download_json(api_url, None)\\n- items = traverse_obj(account_data, (('upcoming_events', 'past_events'), 'data', ...))\\n- return self.playlist_result(\\n- itertools.chain.from_iterable(map(self._generate_event_playlist, items)),\\n- account_data.get('id'), account_data.get('full_name'))\\n-\\n-\\n-# The original version of Livestream uses a different system\\n-class LivestreamOriginalIE(InfoExtractor):\\n- IE_NAME = 'livestream:original'\\n- _VALID_URL = r'''(?x)https?://original\\\\.livestream\\\\.com/\\n- (?P<user>[^/\\\\?#]+)(?:/(?P<type>video|folder)\\n- (?:(?:\\\\?.*?Id=|/)(?P<id>.*?)(&|$))?)?\\n- '''\\n- _TESTS = [{\\n- 'url': 'http://original.livestream.com/dealbook/video?clipId=pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\\n- 'info_dict': {\\n- 'id': 'pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\\n- 'ext': 'mp4',\\n- 'title': 'Spark 1 (BitCoin) with Cameron Winklevoss & Tyler Winklevoss of Winklevoss Capital',\\n- 'duration': 771.301,\\n- 'view_count': int,\\n- },\\n- }, {\\n- 'url': 'https://original.livestream.com/newplay/folder?dirId=a07bf706-d0e4-4e75-a747-b021d84f2fd3',\\n- 'info_dict': {\\n- 'id': 'a07bf706-d0e4-4e75-a747-b021d84f2fd3',\\n- },\\n- 'playlist_mincount': 4,\\n- }, {\\n- # live stream\\n- 'url': 'http://original.livestream.com/znsbahamas',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _extract_video_info(self, user, video_id):\\n- api_url = f'http://x{user}x.api.channel.livestream.com/2.0/clipdetails?extendedInfo=true&id={video_id}'\\n- info = self._download_xml(api_url, video_id)\\n-\\n- item = info.find('channel').find('item')\\n- title = xpath_text(item, 'title')\\n- media_ns = {'media': 'http://search.yahoo.com/mrss'}\\n- thumbnail_url = xpath_attr(\\n- item, xpath_with_ns('media:thumbnail', media_ns), 'url')\\n- duration = float_or_none(xpath_attr(\\n- item, xpath_with_ns('media:content', media_ns), 'duration'))\\n- ls_ns = {'ls': 'http://api.channel.livestream.com/2.0'}\\n- view_count = int_or_none(xpath_text(\\n- item, xpath_with_ns('ls:viewsCount', ls_ns)))\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'thumbnail': thumbnail_url,\\n- 'duration': duration,\\n- 'view_count': view_count,\\n- }\\n-\\n- def _extract_video_formats(self, video_data, video_id):\\n- formats = []\\n-\\n- progressive_url = video_data.get('progressiveUrl')\\n- if progressive_url:\\n- formats.append({\\n- 'url': progressive_url,\\n- 'format_id': 'http',\\n- })\\n-\\n- m3u8_url = video_data.get('httpUrl')\\n- if m3u8_url:\\n- formats.extend(self._extract_m3u8_formats(\\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n-\\n- rtsp_url = video_data.get('rtspUrl')\\n- if rtsp_url:\\n- formats.append({\\n- 'url': rtsp_url,\\n- 'format_id': 'rtsp',\\n- })\\n-\\n- return formats\\n-\\n- def _extract_folder(self, url, folder_id):\\n- webpage = self._download_webpage(url, folder_id)\\n- paths = orderedSet(re.findall(\\n- r'''(?x)(?:\\n- <li\\\\s+class=\\\"folder\\\">\\\\s*<a\\\\s+href=\\\"|\\n- <a\\\\s+href=\\\"(?=https?://livestre\\\\.am/)\\n- )([^\\\"]+)\\\"''', webpage))\\n-\\n- entries = [{\\n- '_type': 'url',\\n- 'url': urllib.parse.urljoin(url, p),\\n- } for p in paths]\\n-\\n- return self.playlist_result(entries, folder_id)\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- user = mobj.group('user')\\n- url_type = mobj.group('type')\\n- content_id = mobj.group('id')\\n- if url_type == 'folder':\\n- return self._extract_folder(url, content_id)\\n- else:\\n- # this url is used on mobile devices\\n- stream_url = f'http://x{user}x.api.channel.livestream.com/3.0/getstream.json'\\n- info = {}\\n- if content_id:\\n- stream_url += f'?id={content_id}'\\n- info = self._extract_video_info(user, content_id)\\n- else:\\n- content_id = user\\n- webpage = self._download_webpage(url, content_id)\\n- info = {\\n- 'title': self._og_search_title(webpage),\\n- 'description': self._og_search_description(webpage),\\n- 'thumbnail': self._search_regex(r'channelLogo\\\\.src\\\\s*=\\\\s*\\\"([^\\\"]+)\\\"', webpage, 'thumbnail', None),\\n- }\\n- video_data = self._download_json(stream_url, content_id)\\n- is_live = video_data.get('isLive')\\n- info.update({\\n- 'id': content_id,\\n- 'title': info['title'],\\n- 'formats': self._extract_video_formats(video_data, content_id),\\n- 'is_live': is_live,\\n- })\\n- return info\\n-\\n-\\n-# The server doesn't support HEAD request, the generic extractor can't detect\\n-# the redirection\\n-class LivestreamShortenerIE(InfoExtractor):\\n- IE_NAME = 'livestream:shortener'\\n- IE_DESC = False # Do not list\\n- _VALID_URL = r'https?://livestre\\\\.am/(?P<id>.+)'\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- return self.url_result(self._og_search_url(webpage))\\ndiff --git a/yt_dlp/extractor/lynda.py b/yt_dlp/extractor/lynda.py\\ndeleted file mode 100644\\nindex f7cf9261a85c..000000000000\\n--- a/yt_dlp/extractor/lynda.py\\n+++ /dev/null\\n@@ -1,325 +0,0 @@\\n-import itertools\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- int_or_none,\\n- urlencode_postdata,\\n-)\\n-\\n-\\n-class LyndaBaseIE(InfoExtractor):\\n- _SIGNIN_URL = 'https://www.lynda.com/signin/lynda'\\n- _PASSWORD_URL = 'https://www.lynda.com/signin/password'\\n- _USER_URL = 'https://www.lynda.com/signin/user'\\n- _ACCOUNT_CREDENTIALS_HINT = 'Use --username and --password options to provide lynda.com account credentials.'\\n- _NETRC_MACHINE = 'lynda'\\n-\\n- @staticmethod\\n- def _check_error(json_string, key_or_keys):\\n- keys = [key_or_keys] if isinstance(key_or_keys, str) else key_or_keys\\n- for key in keys:\\n- error = json_string.get(key)\\n- if error:\\n- raise ExtractorError(f'Unable to login: {error}', expected=True)\\n-\\n- def _perform_login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):\\n- action_url = self._search_regex(\\n- r'<form[^>]+action=([\\\"\\\\'])(?P<url>.+?)\\\\1', form_html,\\n- 'post url', default=fallback_action_url, group='url')\\n-\\n- if not action_url.startswith('http'):\\n- action_url = urllib.parse.urljoin(self._SIGNIN_URL, action_url)\\n-\\n- form_data = self._hidden_inputs(form_html)\\n- form_data.update(extra_form_data)\\n-\\n- response = self._download_json(\\n- action_url, None, note,\\n- data=urlencode_postdata(form_data),\\n- headers={\\n- 'Referer': referrer_url,\\n- 'X-Requested-With': 'XMLHttpRequest',\\n- }, expected_status=(418, 500))\\n-\\n- self._check_error(response, ('email', 'password', 'ErrorMessage'))\\n-\\n- return response, action_url\\n-\\n- def _perform_login(self, username, password):\\n- # Step 1: download signin page\\n- signin_page = self._download_webpage(\\n- self._SIGNIN_URL, None, 'Downloading signin page')\\n-\\n- # Already logged in\\n- if any(re.search(p, signin_page) for p in (\\n- r'isLoggedIn\\\\s*:\\\\s*true', r'logout\\\\.aspx', r'>Log out<')):\\n- return\\n-\\n- # Step 2: submit email\\n- signin_form = self._search_regex(\\n- r'(?s)(<form[^>]+data-form-name=[\\\"\\\\']signin[\\\"\\\\'][^>]*>.+?</form>)',\\n- signin_page, 'signin form')\\n- signin_page, signin_url = self._login_step(\\n- signin_form, self._PASSWORD_URL, {'email': username},\\n- 'Submitting email', self._SIGNIN_URL)\\n-\\n- # Step 3: submit password\\n- password_form = signin_page['body']\\n- self._login_step(\\n- password_form, self._USER_URL, {'email': username, 'password': password},\\n- 'Submitting password', signin_url)\\n-\\n-\\n-class LyndaIE(LyndaBaseIE):\\n- IE_NAME = 'lynda'\\n- IE_DESC = 'lynda.com videos'\\n- _VALID_URL = r'''(?x)\\n- https?://\\n- (?:www\\\\.)?(?:lynda\\\\.com|educourse\\\\.ga)/\\n- (?:\\n- (?:[^/]+/){2,3}(?P<course_id>\\\\d+)|\\n- player/embed\\n- )/\\n- (?P<id>\\\\d+)\\n- '''\\n-\\n- _TIMECODE_REGEX = r'\\\\[(?P<timecode>\\\\d+:\\\\d+:\\\\d+[\\\\.,]\\\\d+)\\\\]'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\\n- # md5 is unstable\\n- 'info_dict': {\\n- 'id': '114408',\\n- 'ext': 'mp4',\\n- 'title': 'Using the exercise files',\\n- 'duration': 68,\\n- },\\n- }, {\\n- 'url': 'https://www.lynda.com/player/embed/133770?tr=foo=1;bar=g;fizz=rt&fs=0',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://educourse.ga/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Willkommen-Grundlagen-guten-Gestaltung/393570/393572-4.html',\\n- 'only_matching': True,\\n- }, {\\n- # Status=\\\"NotFound\\\", Message=\\\"Transcript not found\\\"\\n- 'url': 'https://www.lynda.com/ASP-NET-tutorials/What-you-should-know/5034180/2811512-4.html',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _raise_unavailable(self, video_id):\\n- self.raise_login_required(\\n- f'Video {video_id} is only available for members')\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id')\\n- course_id = mobj.group('course_id')\\n-\\n- query = {\\n- 'videoId': video_id,\\n- 'type': 'video',\\n- }\\n-\\n- video = self._download_json(\\n- 'https://www.lynda.com/ajax/player', video_id,\\n- 'Downloading video JSON', fatal=False, query=query)\\n-\\n- # Fallback scenario\\n- if not video:\\n- query['courseId'] = course_id\\n-\\n- play = self._download_json(\\n- f'https://www.lynda.com/ajax/course/{course_id}/{video_id}/play', video_id, 'Downloading play JSON')\\n-\\n- if not play:\\n- self._raise_unavailable(video_id)\\n-\\n- formats = []\\n- for formats_dict in play:\\n- urls = formats_dict.get('urls')\\n- if not isinstance(urls, dict):\\n- continue\\n- cdn = formats_dict.get('name')\\n- for format_id, format_url in urls.items():\\n- if not format_url:\\n- continue\\n- formats.append({\\n- 'url': format_url,\\n- 'format_id': f'{cdn}-{format_id}' if cdn else format_id,\\n- 'height': int_or_none(format_id),\\n- })\\n-\\n- conviva = self._download_json(\\n- 'https://www.lynda.com/ajax/player/conviva', video_id,\\n- 'Downloading conviva JSON', query=query)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': conviva['VideoTitle'],\\n- 'description': conviva.get('VideoDescription'),\\n- 'release_year': int_or_none(conviva.get('ReleaseYear')),\\n- 'duration': int_or_none(conviva.get('Duration')),\\n- 'creator': conviva.get('Author'),\\n- 'formats': formats,\\n- }\\n-\\n- if 'Status' in video:\\n- raise ExtractorError(\\n- 'lynda returned error: {}'.format(video['Message']), expected=True)\\n-\\n- if video.get('HasAccess') is False:\\n- self._raise_unavailable(video_id)\\n-\\n- video_id = str(video.get('ID') or video_id)\\n- duration = int_or_none(video.get('DurationInSeconds'))\\n- title = video['Title']\\n-\\n- formats = []\\n-\\n- fmts = video.get('Formats')\\n- if fmts:\\n- formats.extend([{\\n- 'url': f['Url'],\\n- 'ext': f.get('Extension'),\\n- 'width': int_or_none(f.get('Width')),\\n- 'height': int_or_none(f.get('Height')),\\n- 'filesize': int_or_none(f.get('FileSize')),\\n- 'format_id': str(f.get('Resolution')) if f.get('Resolution') else None,\\n- } for f in fmts if f.get('Url')])\\n-\\n- prioritized_streams = video.get('PrioritizedStreams')\\n- if prioritized_streams:\\n- for prioritized_stream_id, prioritized_stream in prioritized_streams.items():\\n- formats.extend([{\\n- 'url': video_url,\\n- 'height': int_or_none(format_id),\\n- 'format_id': f'{prioritized_stream_id}-{format_id}',\\n- } for format_id, video_url in prioritized_stream.items()])\\n-\\n- self._check_formats(formats, video_id)\\n-\\n- subtitles = self.extract_subtitles(video_id)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'duration': duration,\\n- 'subtitles': subtitles,\\n- 'formats': formats,\\n- }\\n-\\n- def _fix_subtitles(self, subs):\\n- srt = ''\\n- seq_counter = 0\\n- for seq_current, seq_next in itertools.pairwise(subs):\\n- m_current = re.match(self._TIMECODE_REGEX, seq_current['Timecode'])\\n- if m_current is None:\\n- continue\\n- m_next = re.match(self._TIMECODE_REGEX, seq_next['Timecode'])\\n- if m_next is None:\\n- continue\\n- appear_time = m_current.group('timecode')\\n- disappear_time = m_next.group('timecode')\\n- text = seq_current['Caption'].strip()\\n- if text:\\n- seq_counter += 1\\n- srt += f'{seq_counter}\\\\r\\\\n{appear_time} --> {disappear_time}\\\\r\\\\n{text}\\\\r\\\\n\\\\r\\\\n'\\n- if srt:\\n- return srt\\n-\\n- def _get_subtitles(self, video_id):\\n- url = f'https://www.lynda.com/ajax/player?videoId={video_id}&type=transcript'\\n- subs = self._download_webpage(\\n- url, video_id, 'Downloading subtitles JSON', fatal=False)\\n- if not subs or 'Status=\\\"NotFound\\\"' in subs:\\n- return {}\\n- subs = self._parse_json(subs, video_id, fatal=False)\\n- if not subs:\\n- return {}\\n- fixed_subs = self._fix_subtitles(subs)\\n- if fixed_subs:\\n- return {'en': [{'ext': 'srt', 'data': fixed_subs}]}\\n- return {}\\n-\\n-\\n-class LyndaCourseIE(LyndaBaseIE):\\n- IE_NAME = 'lynda:course'\\n- IE_DESC = 'lynda.com online courses'\\n-\\n- # Course link equals to welcome/introduction video link of same course\\n- # We will recognize it as course link\\n- _VALID_URL = r'https?://(?:www|m)\\\\.(?:lynda\\\\.com|educourse\\\\.ga)/(?P<coursepath>(?:[^/]+/){2,3}(?P<courseid>\\\\d+))-2\\\\.html'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.lynda.com/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- course_path = mobj.group('coursepath')\\n- course_id = mobj.group('courseid')\\n-\\n- item_template = f'https://www.lynda.com/{course_path}/%s-4.html'\\n-\\n- course = self._download_json(\\n- f'https://www.lynda.com/ajax/player?courseId={course_id}&type=course',\\n- course_id, 'Downloading course JSON', fatal=False)\\n-\\n- if not course:\\n- webpage = self._download_webpage(url, course_id)\\n- entries = [\\n- self.url_result(\\n- item_template % video_id, ie=LyndaIE.ie_key(),\\n- video_id=video_id)\\n- for video_id in re.findall(\\n- r'data-video-id=[\\\"\\\\'](\\\\d+)', webpage)]\\n- return self.playlist_result(\\n- entries, course_id,\\n- self._og_search_title(webpage, fatal=False),\\n- self._og_search_description(webpage))\\n-\\n- if course.get('Status') == 'NotFound':\\n- raise ExtractorError(\\n- f'Course {course_id} does not exist', expected=True)\\n-\\n- unaccessible_videos = 0\\n- entries = []\\n-\\n- # Might want to extract videos right here from video['Formats'] as it seems 'Formats' is not provided\\n- # by single video API anymore\\n-\\n- for chapter in course['Chapters']:\\n- for video in chapter.get('Videos', []):\\n- if video.get('HasAccess') is False:\\n- unaccessible_videos += 1\\n- continue\\n- video_id = video.get('ID')\\n- if video_id:\\n- entries.append({\\n- '_type': 'url_transparent',\\n- 'url': item_template % video_id,\\n- 'ie_key': LyndaIE.ie_key(),\\n- 'chapter': chapter.get('Title'),\\n- 'chapter_number': int_or_none(chapter.get('ChapterIndex')),\\n- 'chapter_id': str(chapter.get('ID')),\\n- })\\n-\\n- if unaccessible_videos > 0:\\n- self.report_warning(\\n- f'{unaccessible_videos} videos are only available for members (or paid members) '\\n- f'and will not be downloaded. {self._ACCOUNT_CREDENTIALS_HINT}')\\n-\\n- course_title = course.get('Title')\\n- course_description = course.get('Description')\\n-\\n- return self.playlist_result(entries, course_id, course_title, course_description)\\ndiff --git a/yt_dlp/extractor/microsoftstream.py b/yt_dlp/extractor/microsoftstream.py\\ndeleted file mode 100644\\nindex b1388108383c..000000000000\\n--- a/yt_dlp/extractor/microsoftstream.py\\n+++ /dev/null\\n@@ -1,121 +0,0 @@\\n-import base64\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- merge_dicts,\\n- parse_duration,\\n- parse_iso8601,\\n- parse_resolution,\\n- try_get,\\n- url_basename,\\n-)\\n-\\n-\\n-class MicrosoftStreamIE(InfoExtractor):\\n- IE_NAME = 'microsoftstream'\\n- IE_DESC = 'Microsoft Stream'\\n- _VALID_URL = r'https?://(?:web|www|msit)\\\\.microsoftstream\\\\.com/video/(?P<id>[\\\\da-f]{8}-[\\\\da-f]{4}-[\\\\da-f]{4}-[\\\\da-f]{4}-[\\\\da-f]{12})'\\n-\\n- _TESTS = [{\\n- 'url': 'https://web.microsoftstream.com/video/6e51d928-4f46-4f1c-b141-369925e37b62?list=user&userId=f5491e02-e8fe-4e34-b67c-ec2e79a6ecc0',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://msit.microsoftstream.com/video/b60f5987-aabd-4e1c-a42f-c559d138f2ca',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _get_all_subtitles(self, api_url, video_id, headers):\\n- subtitles = {}\\n- automatic_captions = {}\\n- text_tracks = self._download_json(\\n- f'{api_url}/videos/{video_id}/texttracks', video_id,\\n- note='Downloading subtitles JSON', fatal=False, headers=headers,\\n- query={'api-version': '1.4-private'}).get('value') or []\\n- for track in text_tracks:\\n- if not track.get('language') or not track.get('url'):\\n- continue\\n- sub_dict = automatic_captions if track.get('autoGenerated') else subtitles\\n- sub_dict.setdefault(track['language'], []).append({\\n- 'ext': 'vtt',\\n- 'url': track.get('url'),\\n- })\\n- return {\\n- 'subtitles': subtitles,\\n- 'automatic_captions': automatic_captions,\\n- }\\n-\\n- def extract_all_subtitles(self, *args, **kwargs):\\n- if (self.get_param('writesubtitles', False)\\n- or self.get_param('writeautomaticsub', False)\\n- or self.get_param('listsubtitles')):\\n- return self._get_all_subtitles(*args, **kwargs)\\n- return {}\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n- if '<title>Microsoft Stream</title>' not in webpage:\\n- self.raise_login_required(method='cookies')\\n-\\n- access_token = self._html_search_regex(r'\\\"AccessToken\\\":\\\"(.+?)\\\"', webpage, 'access token')\\n- api_url = self._html_search_regex(r'\\\"ApiGatewayUri\\\":\\\"(.+?)\\\"', webpage, 'api url')\\n-\\n- headers = {'Authorization': f'Bearer {access_token}'}\\n-\\n- video_data = self._download_json(\\n- f'{api_url}/videos/{video_id}', video_id,\\n- headers=headers, query={\\n- '$expand': 'creator,tokens,status,liveEvent,extensions',\\n- 'api-version': '1.4-private',\\n- })\\n- video_id = video_data.get('id') or video_id\\n- language = video_data.get('language')\\n-\\n- thumbnails = []\\n- for thumbnail_id in ('extraSmall', 'small', 'medium', 'large'):\\n- thumbnail_url = try_get(video_data, lambda x: x['posterImage'][thumbnail_id]['url'], str)\\n- if not thumbnail_url:\\n- continue\\n- thumb = {\\n- 'id': thumbnail_id,\\n- 'url': thumbnail_url,\\n- }\\n- thumb_name = url_basename(thumbnail_url)\\n- thumb_name = str(base64.b64decode(thumb_name + '=' * (-len(thumb_name) % 4)))\\n- thumb.update(parse_resolution(thumb_name))\\n- thumbnails.append(thumb)\\n-\\n- formats = []\\n- for playlist in video_data['playbackUrls']:\\n- if playlist['mimeType'] == 'application/vnd.apple.mpegurl':\\n- formats.extend(self._extract_m3u8_formats(\\n- playlist['playbackUrl'], video_id,\\n- ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls',\\n- fatal=False, headers=headers))\\n- elif playlist['mimeType'] == 'application/dash+xml':\\n- formats.extend(self._extract_mpd_formats(\\n- playlist['playbackUrl'], video_id, mpd_id='dash',\\n- fatal=False, headers=headers))\\n- elif playlist['mimeType'] == 'application/vnd.ms-sstr+xml':\\n- formats.extend(self._extract_ism_formats(\\n- playlist['playbackUrl'], video_id, ism_id='mss',\\n- fatal=False, headers=headers))\\n- formats = [merge_dicts(f, {'language': language}) for f in formats]\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': video_data['name'],\\n- 'description': video_data.get('description'),\\n- 'uploader': try_get(video_data, lambda x: x['creator']['name'], str),\\n- 'uploader_id': try_get(video_data, (lambda x: x['creator']['mail'],\\n- lambda x: x['creator']['id']), str),\\n- 'thumbnails': thumbnails,\\n- **self.extract_all_subtitles(api_url, video_id, headers),\\n- 'timestamp': parse_iso8601(video_data.get('created')),\\n- 'duration': parse_duration(try_get(video_data, lambda x: x['media']['duration'])),\\n- 'webpage_url': f'https://web.microsoftstream.com/video/{video_id}',\\n- 'view_count': try_get(video_data, lambda x: x['metrics']['views'], int),\\n- 'like_count': try_get(video_data, lambda x: x['metrics']['likes'], int),\\n- 'comment_count': try_get(video_data, lambda x: x['metrics']['comments'], int),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/minoto.py b/yt_dlp/extractor/minoto.py\\ndeleted file mode 100644\\nindex 69832560d055..000000000000\\n--- a/yt_dlp/extractor/minoto.py\\n+++ /dev/null\\n@@ -1,45 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_codecs,\\n-)\\n-\\n-\\n-class MinotoIE(InfoExtractor):\\n- _VALID_URL = r'(?:minoto:|https?://(?:play|iframe|embed)\\\\.minoto-video\\\\.com/(?P<player_id>[0-9]+)/)(?P<id>[a-zA-Z0-9]+)'\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- player_id = mobj.group('player_id') or '1'\\n- video_id = mobj.group('id')\\n- video_data = self._download_json(f'http://play.minoto-video.com/{player_id}/{video_id}.js', video_id)\\n- video_metadata = video_data['video-metadata']\\n- formats = []\\n- for fmt in video_data['video-files']:\\n- fmt_url = fmt.get('url')\\n- if not fmt_url:\\n- continue\\n- container = fmt.get('container')\\n- if container == 'hls':\\n- formats.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False))\\n- else:\\n- fmt_profile = fmt.get('profile') or {}\\n- formats.append({\\n- 'format_id': fmt_profile.get('name-short'),\\n- 'format_note': fmt_profile.get('name'),\\n- 'url': fmt_url,\\n- 'container': container,\\n- 'tbr': int_or_none(fmt.get('bitrate')),\\n- 'filesize': int_or_none(fmt.get('filesize')),\\n- 'width': int_or_none(fmt.get('width')),\\n- 'height': int_or_none(fmt.get('height')),\\n- **parse_codecs(fmt.get('codecs')),\\n- })\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': video_metadata['title'],\\n- 'description': video_metadata.get('description'),\\n- 'thumbnail': video_metadata.get('video-poster', {}).get('url'),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/mojvideo.py b/yt_dlp/extractor/mojvideo.py\\ndeleted file mode 100644\\nindex 6bc362a53cb3..000000000000\\n--- a/yt_dlp/extractor/mojvideo.py\\n+++ /dev/null\\n@@ -1,52 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- parse_duration,\\n-)\\n-\\n-\\n-class MojvideoIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?mojvideo\\\\.com/video-(?P<display_id>[^/]+)/(?P<id>[a-f0-9]+)'\\n- _TEST = {\\n- 'url': 'http://www.mojvideo.com/video-v-avtu-pred-mano-rdecelaska-alfi-nipic/3d1ed4497707730b2906',\\n- 'md5': 'f7fd662cc8ce2be107b0d4f2c0483ae7',\\n- 'info_dict': {\\n- 'id': '3d1ed4497707730b2906',\\n- 'display_id': 'v-avtu-pred-mano-rdecelaska-alfi-nipic',\\n- 'ext': 'mp4',\\n- 'title': 'V avtu pred mano rdeฤelaska - Alfi Nipiฤ',\\n- 'thumbnail': r're:^http://.*\\\\.jpg$',\\n- 'duration': 242,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id')\\n- display_id = mobj.group('display_id')\\n-\\n- # XML is malformed\\n- playerapi = self._download_webpage(\\n- f'http://www.mojvideo.com/playerapi.php?v={video_id}&t=1', display_id)\\n-\\n- if '<error>true</error>' in playerapi:\\n- error_desc = self._html_search_regex(\\n- r'<errordesc>([^<]*)</errordesc>', playerapi, 'error description', fatal=False)\\n- raise ExtractorError(f'{self.IE_NAME} said: {error_desc}', expected=True)\\n-\\n- title = self._html_extract_title(playerapi)\\n- video_url = self._html_search_regex(\\n- r'<file>([^<]+)</file>', playerapi, 'video URL')\\n- thumbnail = self._html_search_regex(\\n- r'<preview>([^<]+)</preview>', playerapi, 'thumbnail', fatal=False)\\n- duration = parse_duration(self._html_search_regex(\\n- r'<duration>([^<]+)</duration>', playerapi, 'duration', fatal=False))\\n-\\n- return {\\n- 'id': video_id,\\n- 'display_id': display_id,\\n- 'url': video_url,\\n- 'title': title,\\n- 'thumbnail': thumbnail,\\n- 'duration': duration,\\n- }\\ndiff --git a/yt_dlp/extractor/motherless.py b/yt_dlp/extractor/motherless.py\\ndeleted file mode 100644\\nindex e236ec3db8d5..000000000000\\n--- a/yt_dlp/extractor/motherless.py\\n+++ /dev/null\\n@@ -1,289 +0,0 @@\\n-import datetime as dt\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- OnDemandPagedList,\\n- remove_end,\\n- str_to_int,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class MotherlessIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?motherless\\\\.com/(?:g/[a-z0-9_]+/|G[VIG]?[A-F0-9]+/)?(?P<id>[A-F0-9]+)'\\n- _TESTS = [{\\n- 'url': 'http://motherless.com/EE97006',\\n- 'md5': 'cb5e7438f7a3c4e886b7bccc1292a3bc',\\n- 'info_dict': {\\n- 'id': 'EE97006',\\n- 'ext': 'mp4',\\n- 'title': 'Dogging blond Brit getting glazed (comp)',\\n- 'categories': ['UK', 'slag', 'whore', 'dogging', 'cunt', 'cumhound', 'big tits', 'Pearl Necklace'],\\n- 'upload_date': '20230519',\\n- 'uploader_id': 'deathbird',\\n- 'thumbnail': r're:https?://.*\\\\.jpg',\\n- 'age_limit': 18,\\n- 'comment_count': int,\\n- 'view_count': int,\\n- 'like_count': int,\\n- },\\n- 'params': {\\n- # Incomplete cert chains\\n- 'nocheckcertificate': True,\\n- },\\n- }, {\\n- 'url': 'http://motherless.com/532291B',\\n- 'md5': 'bc59a6b47d1f958e61fbd38a4d31b131',\\n- 'info_dict': {\\n- 'id': '532291B',\\n- 'ext': 'mp4',\\n- 'title': 'Amazing girl playing the omegle game, PERFECT!',\\n- 'categories': ['Amateur', 'webcam', 'omegle', 'pink', 'young', 'masturbate', 'teen',\\n- 'game', 'hairy'],\\n- 'upload_date': '20140622',\\n- 'uploader_id': 'Sulivana7x',\\n- 'thumbnail': r're:https?://.*\\\\.jpg',\\n- 'age_limit': 18,\\n- },\\n- 'skip': '404',\\n- }, {\\n- 'url': 'http://motherless.com/g/cosplay/633979F',\\n- 'expected_exception': 'ExtractorError',\\n- }, {\\n- 'url': 'http://motherless.com/8B4BBC1',\\n- 'info_dict': {\\n- 'id': '8B4BBC1',\\n- 'ext': 'mp4',\\n- 'title': 'VIDEO00441.mp4',\\n- 'categories': [],\\n- 'upload_date': '20160214',\\n- 'uploader_id': 'NMWildGirl',\\n- 'thumbnail': r're:https?://.*\\\\.jpg',\\n- 'age_limit': 18,\\n- 'like_count': int,\\n- 'comment_count': int,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'nocheckcertificate': True,\\n- },\\n- }, {\\n- # see https://motherless.com/videos/recent for recent videos with\\n- # uploaded date in \\\"ago\\\" format\\n- 'url': 'https://motherless.com/3C3E2CF',\\n- 'info_dict': {\\n- 'id': '3C3E2CF',\\n- 'ext': 'mp4',\\n- 'title': 'a/ Hot Teens',\\n- 'categories': list,\\n- 'upload_date': '20210104',\\n- 'uploader_id': 'anonymous',\\n- 'thumbnail': r're:https?://.*\\\\.jpg',\\n- 'age_limit': 18,\\n- 'like_count': int,\\n- 'comment_count': int,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'nocheckcertificate': True,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- if any(p in webpage for p in (\\n- '<title>404 - MOTHERLESS.COM<',\\n- \\\">The page you're looking for cannot be found.<\\\",\\n- '<div class=\\\"error-page',\\n- )):\\n- raise ExtractorError(f'Video {video_id} does not exist', expected=True)\\n-\\n- if '>The content you are trying to view is for friends only.' in webpage:\\n- raise ExtractorError(f'Video {video_id} is for friends only', expected=True)\\n-\\n- title = self._html_search_regex(\\n- (r'(?s)<div[^>]+\\\\bclass=[\\\"\\\\']media-meta-title[^>]+>(.+?)</div>',\\n- r'id=\\\"view-upload-title\\\">\\\\s+([^<]+)<'), webpage, 'title')\\n- video_url = (self._html_search_regex(\\n- (r'setup\\\\(\\\\{\\\\s*[\\\"\\\\']file[\\\"\\\\']\\\\s*:\\\\s*([\\\"\\\\'])(?P<url>(?:(?!\\\\1).)+)\\\\1',\\n- r'fileurl\\\\s*=\\\\s*([\\\"\\\\'])(?P<url>(?:(?!\\\\1).)+)\\\\1'),\\n- webpage, 'video URL', default=None, group='url')\\n- or f'http://cdn4.videos.motherlessmedia.com/videos/{video_id}.mp4?fs=opencloud')\\n- age_limit = self._rta_search(webpage)\\n- view_count = str_to_int(self._html_search_regex(\\n- (r'>([\\\\d,.]+)\\\\s+Views<', r'<strong>Views</strong>\\\\s+([^<]+)<'),\\n- webpage, 'view count', fatal=False))\\n- like_count = str_to_int(self._html_search_regex(\\n- (r'>([\\\\d,.]+)\\\\s+Favorites<',\\n- r'<strong>Favorited</strong>\\\\s+([^<]+)<'),\\n- webpage, 'like count', fatal=False))\\n-\\n- upload_date = unified_strdate(self._search_regex(\\n- r'class=[\\\"\\\\']count[^>]+>(\\\\d+\\\\s+[a-zA-Z]{3}\\\\s+\\\\d{4})<', webpage,\\n- 'upload date', default=None))\\n- if not upload_date:\\n- uploaded_ago = self._search_regex(\\n- r'>\\\\s*(\\\\d+[hd])\\\\s+[aA]go\\\\b', webpage, 'uploaded ago',\\n- default=None)\\n- if uploaded_ago:\\n- delta = int(uploaded_ago[:-1])\\n- _AGO_UNITS = {\\n- 'h': 'hours',\\n- 'd': 'days',\\n- }\\n- kwargs = {_AGO_UNITS.get(uploaded_ago[-1]): delta}\\n- upload_date = (dt.datetime.now(dt.timezone.utc) - dt.timedelta(**kwargs)).strftime('%Y%m%d')\\n-\\n- comment_count = len(re.findall(r'''class\\\\s*=\\\\s*['\\\"]media-comment-contents\\\\b''', webpage))\\n- uploader_id = self._html_search_regex(\\n- (r'''<span\\\\b[^>]+\\\\bclass\\\\s*=\\\\s*[\\\"']username\\\\b[^>]*>([^<]+)</span>''',\\n- r'''(?s)['\\\"](?:media-meta-member|thumb-member-username)\\\\b[^>]+>\\\\s*<a\\\\b[^>]+\\\\bhref\\\\s*=\\\\s*['\\\"]/m/([^\\\"']+)'''),\\n- webpage, 'uploader_id', fatal=False)\\n- categories = self._html_search_meta('keywords', webpage, default='')\\n- categories = [cat.strip() for cat in categories.split(',') if cat.strip()]\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'upload_date': upload_date,\\n- 'uploader_id': uploader_id,\\n- 'thumbnail': self._og_search_thumbnail(webpage),\\n- 'categories': categories,\\n- 'view_count': view_count,\\n- 'like_count': like_count,\\n- 'comment_count': comment_count,\\n- 'age_limit': age_limit,\\n- 'url': video_url,\\n- }\\n-\\n-\\n-class MotherlessPaginatedIE(InfoExtractor):\\n- _EXTRA_QUERY = {}\\n- _PAGE_SIZE = 60\\n-\\n- def _correct_path(self, url, item_id):\\n- raise NotImplementedError('This method must be implemented by subclasses')\\n-\\n- def _correct_title(self, title, /):\\n- return title.partition(' - Videos')[0] if title else None\\n-\\n- def _extract_entries(self, webpage, base):\\n- for mobj in re.finditer(r'href=\\\"[^\\\"]*(?P<href>/[A-F0-9]+)\\\"\\\\s+title=\\\"(?P<title>[^\\\"]+)',\\n- webpage):\\n- video_url = urllib.parse.urljoin(base, mobj.group('href'))\\n- video_id = MotherlessIE.get_temp_id(video_url)\\n-\\n- if video_id:\\n- yield self.url_result(video_url, MotherlessIE, video_id, mobj.group('title'))\\n-\\n- def _real_extract(self, url):\\n- item_id = self._match_id(url)\\n- real_url = self._correct_path(url, item_id)\\n- webpage = self._download_webpage(real_url, item_id, 'Downloading page 1')\\n-\\n- def get_page(idx):\\n- page = idx + 1\\n- current_page = webpage if not idx else self._download_webpage(\\n- real_url, item_id, note=f'Downloading page {page}', query={'page': page, **self._EXTRA_QUERY})\\n- yield from self._extract_entries(current_page, real_url)\\n-\\n- return self.playlist_result(\\n- OnDemandPagedList(get_page, self._PAGE_SIZE), item_id,\\n- self._correct_title(self._html_extract_title(webpage)))\\n-\\n-\\n-class MotherlessGroupIE(MotherlessPaginatedIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?motherless\\\\.com/g[vifm]?/(?P<id>[a-z0-9_]+)/?(?:$|[#?])'\\n- _TESTS = [{\\n- 'url': 'http://motherless.com/gv/movie_scenes',\\n- 'info_dict': {\\n- 'id': 'movie_scenes',\\n- 'title': 'Movie Scenes',\\n- },\\n- 'playlist_mincount': 540,\\n- }, {\\n- 'url': 'http://motherless.com/g/sex_must_be_funny',\\n- 'info_dict': {\\n- 'id': 'sex_must_be_funny',\\n- 'title': 'Sex must be funny',\\n- },\\n- 'playlist_count': 0,\\n- }, {\\n- 'url': 'https://motherless.com/gv/beautiful_cock',\\n- 'info_dict': {\\n- 'id': 'beautiful_cock',\\n- 'title': 'Beautiful Cock',\\n- },\\n- 'playlist_mincount': 371,\\n- }]\\n-\\n- def _correct_path(self, url, item_id):\\n- return urllib.parse.urljoin(url, f'/gv/{item_id}')\\n-\\n-\\n-class MotherlessGalleryIE(MotherlessPaginatedIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?motherless\\\\.com/G[VIG]?(?P<id>[A-F0-9]+)/?(?:$|[#?])'\\n- _TESTS = [{\\n- 'url': 'https://motherless.com/GV338999F',\\n- 'info_dict': {\\n- 'id': '338999F',\\n- 'title': 'Random',\\n- },\\n- 'playlist_mincount': 100,\\n- }, {\\n- 'url': 'https://motherless.com/GVABD6213',\\n- 'info_dict': {\\n- 'id': 'ABD6213',\\n- 'title': 'Cuties',\\n- },\\n- 'playlist_mincount': 1,\\n- }, {\\n- 'url': 'https://motherless.com/GVBCF7622',\\n- 'info_dict': {\\n- 'id': 'BCF7622',\\n- 'title': 'Vintage',\\n- },\\n- 'playlist_count': 0,\\n- }, {\\n- 'url': 'https://motherless.com/G035DE2F',\\n- 'info_dict': {\\n- 'id': '035DE2F',\\n- 'title': 'General',\\n- },\\n- 'playlist_mincount': 234,\\n- }]\\n-\\n- def _correct_title(self, title, /):\\n- return remove_end(title, ' | MOTHERLESS.COM โข')\\n-\\n- def _correct_path(self, url, item_id):\\n- return urllib.parse.urljoin(url, f'/GV{item_id}')\\n-\\n-\\n-class MotherlessUploaderIE(MotherlessPaginatedIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?motherless\\\\.com/u/(?P<id>\\\\w+)/?(?:$|[?#])'\\n- _TESTS = [{\\n- 'url': 'https://motherless.com/u/Mrgo4hrs2023',\\n- 'info_dict': {\\n- 'id': 'Mrgo4hrs2023',\\n- 'title': \\\"Mrgo4hrs2023's Uploads\\\",\\n- },\\n- 'playlist_mincount': 32,\\n- }, {\\n- 'url': 'https://motherless.com/u/Happy_couple?t=v',\\n- 'info_dict': {\\n- 'id': 'Happy_couple',\\n- 'title': \\\"Happy_couple's Uploads\\\",\\n- },\\n- 'playlist_mincount': 8,\\n- }]\\n-\\n- _EXTRA_QUERY = {'t': 'v'}\\n-\\n- def _correct_path(self, url, item_id):\\n- return urllib.parse.urljoin(url, f'/u/{item_id}?t=v')\\ndiff --git a/yt_dlp/extractor/moview.py b/yt_dlp/extractor/moview.py\\ndeleted file mode 100644\\nindex 560154e1a1e2..000000000000\\n--- a/yt_dlp/extractor/moview.py\\n+++ /dev/null\\n@@ -1,43 +0,0 @@\\n-from .jixie import JixieBaseIE\\n-\\n-\\n-class MoviewPlayIE(JixieBaseIE):\\n- _VALID_URL = r'https?://www\\\\.moview\\\\.id/play/\\\\d+/(?P<id>[\\\\w-]+)'\\n- _TESTS = [\\n- {\\n- # drm hls, only use direct link\\n- 'url': 'https://www.moview.id/play/174/Candy-Monster',\\n- 'info_dict': {\\n- 'id': '146182',\\n- 'ext': 'mp4',\\n- 'display_id': 'Candy-Monster',\\n- 'uploader_id': 'Mo165qXUUf',\\n- 'duration': 528.2,\\n- 'title': 'Candy Monster',\\n- 'description': 'Mengapa Candy Monster ingin mengambil permen Chloe?',\\n- 'thumbnail': 'https://video.jixie.media/1034/146182/146182_1280x720.jpg',\\n- },\\n- }, {\\n- # non-drm hls\\n- 'url': 'https://www.moview.id/play/75/Paris-Van-Java-Episode-16',\\n- 'info_dict': {\\n- 'id': '28210',\\n- 'ext': 'mp4',\\n- 'duration': 2595.666667,\\n- 'display_id': 'Paris-Van-Java-Episode-16',\\n- 'uploader_id': 'Mo165qXUUf',\\n- 'thumbnail': 'https://video.jixie.media/1003/28210/28210_1280x720.jpg',\\n- 'description': 'md5:2a5e18d98eef9b39d7895029cac96c63',\\n- 'title': 'Paris Van Java Episode 16',\\n- },\\n- },\\n- ]\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- video_id = self._search_regex(\\n- r'video_id\\\\s*=\\\\s*\\\"(?P<video_id>[^\\\"]+)', webpage, 'video_id')\\n-\\n- return self._extract_data_from_jixie_id(display_id, video_id, webpage)\\ndiff --git a/yt_dlp/extractor/moviezine.py b/yt_dlp/extractor/moviezine.py\\ndeleted file mode 100644\\nindex 331a56234bce..000000000000\\n--- a/yt_dlp/extractor/moviezine.py\\n+++ /dev/null\\n@@ -1,38 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class MoviezineIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?moviezine\\\\.se/video/(?P<id>[^?#]+)'\\n-\\n- _TEST = {\\n- 'url': 'http://www.moviezine.se/video/205866',\\n- 'info_dict': {\\n- 'id': '205866',\\n- 'ext': 'mp4',\\n- 'title': 'Oculus - Trailer 1',\\n- 'description': 'md5:40cc6790fc81d931850ca9249b40e8a4',\\n- 'thumbnail': r're:http://.*\\\\.jpg',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id')\\n-\\n- webpage = self._download_webpage(url, video_id)\\n- jsplayer = self._download_webpage(f'http://www.moviezine.se/api/player.js?video={video_id}', video_id, 'Downloading js api player')\\n-\\n- formats = [{\\n- 'format_id': 'sd',\\n- 'url': self._html_search_regex(r'file: \\\"(.+?)\\\",', jsplayer, 'file'),\\n- 'quality': 0,\\n- 'ext': 'mp4',\\n- }]\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': self._search_regex(r'title: \\\"(.+?)\\\",', jsplayer, 'title'),\\n- 'thumbnail': self._search_regex(r'image: \\\"(.+?)\\\",', jsplayer, 'image'),\\n- 'formats': formats,\\n- 'description': self._og_search_description(webpage),\\n- }\\ndiff --git a/yt_dlp/extractor/musicdex.py b/yt_dlp/extractor/musicdex.py\\ndeleted file mode 100644\\nindex 5ca390ef9af5..000000000000\\n--- a/yt_dlp/extractor/musicdex.py\\n+++ /dev/null\\n@@ -1,174 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- date_from_str,\\n- format_field,\\n- try_get,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class MusicdexBaseIE(InfoExtractor):\\n- def _return_info(self, track_json, album_json, video_id):\\n- return {\\n- 'id': str(video_id),\\n- 'title': track_json.get('name'),\\n- 'track': track_json.get('name'),\\n- 'description': track_json.get('description'),\\n- 'track_number': track_json.get('number'),\\n- 'url': format_field(track_json, 'url', 'https://www.musicdex.org/%s'),\\n- 'duration': track_json.get('duration'),\\n- 'genres': [genre.get('name') for genre in track_json.get('genres') or []],\\n- 'like_count': track_json.get('likes_count'),\\n- 'view_count': track_json.get('plays'),\\n- 'artists': [artist.get('name') for artist in track_json.get('artists') or []],\\n- 'album_artists': [artist.get('name') for artist in album_json.get('artists') or []],\\n- 'thumbnail': format_field(album_json, 'image', 'https://www.musicdex.org/%s'),\\n- 'album': album_json.get('name'),\\n- 'release_year': try_get(album_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\\n- 'extractor_key': MusicdexSongIE.ie_key(),\\n- 'extractor': 'MusicdexSong',\\n- }\\n-\\n-\\n-class MusicdexSongIE(MusicdexBaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?musicdex\\\\.org/track/(?P<id>\\\\d+)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.musicdex.org/track/306/dual-existence',\\n- 'info_dict': {\\n- 'id': '306',\\n- 'ext': 'mp3',\\n- 'title': 'dual existence',\\n- 'description': '#NIPPONSEI @ IRC.RIZON.NET',\\n- 'track': 'dual existence',\\n- 'track_number': 1,\\n- 'duration': 266000,\\n- 'genres': ['Anime'],\\n- 'like_count': int,\\n- 'view_count': int,\\n- 'artists': ['fripSide'],\\n- 'album_artists': ['fripSide'],\\n- 'thumbnail': 'https://www.musicdex.org/storage/album/9iDIam1DHTVqUG4UclFIEq1WAFGXfPW4y0TtZa91.png',\\n- 'album': 'To Aru Kagaku no Railgun T OP2 Single - dual existence',\\n- 'release_year': 2020,\\n- },\\n- 'params': {'skip_download': True},\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- data_json = self._download_json(\\n- f'https://www.musicdex.org/secure/tracks/{video_id}?defaultRelations=true', video_id)['track']\\n- return self._return_info(data_json, data_json.get('album') or {}, video_id)\\n-\\n-\\n-class MusicdexAlbumIE(MusicdexBaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?musicdex\\\\.org/album/(?P<id>\\\\d+)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.musicdex.org/album/56/tenmon-and-eiichiro-yanagi-minori/ef-a-tale-of-memories-original-soundtrack-2-fortissimo',\\n- 'playlist_mincount': 28,\\n- 'info_dict': {\\n- 'id': '56',\\n- 'genres': ['OST'],\\n- 'view_count': int,\\n- 'artists': ['TENMON & Eiichiro Yanagi / minori'],\\n- 'title': 'ef - a tale of memories Original Soundtrack 2 ~fortissimo~',\\n- 'release_year': 2008,\\n- 'thumbnail': 'https://www.musicdex.org/storage/album/2rSHkyYBYfB7sbvElpEyTMcUn6toY7AohOgJuDlE.jpg',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n- data_json = self._download_json(\\n- f'https://www.musicdex.org/secure/albums/{playlist_id}?defaultRelations=true', playlist_id)['album']\\n- entries = [self._return_info(track, data_json, track['id'])\\n- for track in data_json.get('tracks') or [] if track.get('id')]\\n-\\n- return {\\n- '_type': 'playlist',\\n- 'id': playlist_id,\\n- 'title': data_json.get('name'),\\n- 'description': data_json.get('description'),\\n- 'genres': [genre.get('name') for genre in data_json.get('genres') or []],\\n- 'view_count': data_json.get('plays'),\\n- 'artists': [artist.get('name') for artist in data_json.get('artists') or []],\\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\\n- 'release_year': try_get(data_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\\n- 'entries': entries,\\n- }\\n-\\n-\\n-class MusicdexPageIE(MusicdexBaseIE): # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor\\n- def _entries(self, playlist_id):\\n- next_page_url = self._API_URL % playlist_id\\n- while next_page_url:\\n- data_json = self._download_json(next_page_url, playlist_id)['pagination']\\n- yield from data_json.get('data') or []\\n- next_page_url = data_json.get('next_page_url')\\n-\\n-\\n-class MusicdexArtistIE(MusicdexPageIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?musicdex\\\\.org/artist/(?P<id>\\\\d+)'\\n- _API_URL = 'https://www.musicdex.org/secure/artists/%s/albums?page=1'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.musicdex.org/artist/11/fripside',\\n- 'playlist_mincount': 28,\\n- 'info_dict': {\\n- 'id': '11',\\n- 'view_count': int,\\n- 'title': 'fripSide',\\n- 'thumbnail': 'https://www.musicdex.org/storage/artist/ZmOz0lN2vsweegB660em3xWffCjLPmTQHqJls5Xx.jpg',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n- data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{playlist_id}', playlist_id)['artist']\\n- entries = []\\n- for album in self._entries(playlist_id):\\n- entries.extend(self._return_info(track, album, track['id']) for track in album.get('tracks') or [] if track.get('id'))\\n-\\n- return {\\n- '_type': 'playlist',\\n- 'id': playlist_id,\\n- 'title': data_json.get('name'),\\n- 'view_count': data_json.get('plays'),\\n- 'thumbnail': format_field(data_json, 'image_small', 'https://www.musicdex.org/%s'),\\n- 'entries': entries,\\n- }\\n-\\n-\\n-class MusicdexPlaylistIE(MusicdexPageIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?musicdex\\\\.org/playlist/(?P<id>\\\\d+)'\\n- _API_URL = 'https://www.musicdex.org/secure/playlists/%s/tracks?perPage=10000&page=1'\\n-\\n- _TESTS = [{\\n- 'url': 'https://www.musicdex.org/playlist/9/test',\\n- 'playlist_mincount': 73,\\n- 'info_dict': {\\n- 'id': '9',\\n- 'view_count': int,\\n- 'title': 'Test',\\n- 'thumbnail': 'https://www.musicdex.org/storage/album/jXATI79f0IbQ2sgsKYOYRCW3zRwF3XsfHhzITCuJ.jpg',\\n- 'description': 'Test 123 123 21312 32121321321321312',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n- data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{playlist_id}', playlist_id)['playlist']\\n- entries = [self._return_info(track, track.get('album') or {}, track['id'])\\n- for track in self._entries(playlist_id) or [] if track.get('id')]\\n-\\n- return {\\n- '_type': 'playlist',\\n- 'id': playlist_id,\\n- 'title': data_json.get('name'),\\n- 'description': data_json.get('description'),\\n- 'view_count': data_json.get('plays'),\\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\\n- 'entries': entries,\\n- }\\ndiff --git a/yt_dlp/extractor/nationalgeographic.py b/yt_dlp/extractor/nationalgeographic.py\\nindex 43f84a95276a..d06680ccff1f 100644\\n--- a/yt_dlp/extractor/nationalgeographic.py\\n+++ b/yt_dlp/extractor/nationalgeographic.py\\n@@ -1,64 +1,4 @@\\n-from .common import InfoExtractor\\n from .fox import FOXIE\\n-from ..utils import (\\n- smuggle_url,\\n- url_basename,\\n-)\\n-\\n-\\n-class NationalGeographicVideoIE(InfoExtractor):\\n- IE_NAME = 'natgeo:video'\\n- _VALID_URL = r'https?://video\\\\.nationalgeographic\\\\.com/.*?'\\n-\\n- _TESTS = [\\n- {\\n- 'url': 'http://video.nationalgeographic.com/video/news/150210-news-crab-mating-vin?source=featuredvideo',\\n- 'md5': '730855d559abbad6b42c2be1fa584917',\\n- 'info_dict': {\\n- 'id': '0000014b-70a1-dd8c-af7f-f7b559330001',\\n- 'ext': 'mp4',\\n- 'title': 'Mating Crabs Busted by Sharks',\\n- 'description': 'md5:16f25aeffdeba55aaa8ec37e093ad8b3',\\n- 'timestamp': 1423523799,\\n- 'upload_date': '20150209',\\n- 'uploader': 'NAGS',\\n- },\\n- 'add_ie': ['ThePlatform'],\\n- 'skip': 'Redirects to main page',\\n- },\\n- {\\n- 'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws',\\n- 'md5': '6a3105eb448c070503b3105fb9b320b5',\\n- 'info_dict': {\\n- 'id': 'ngc-I0IauNSWznb_UV008GxSbwY35BZvgi2e',\\n- 'ext': 'mp4',\\n- 'title': 'The Real Jaws',\\n- 'description': 'md5:8d3e09d9d53a85cd397b4b21b2c77be6',\\n- 'timestamp': 1433772632,\\n- 'upload_date': '20150608',\\n- 'uploader': 'NAGS',\\n- },\\n- 'add_ie': ['ThePlatform'],\\n- 'skip': 'Redirects to main page',\\n- },\\n- ]\\n-\\n- def _real_extract(self, url):\\n- name = url_basename(url)\\n-\\n- webpage = self._download_webpage(url, name)\\n- guid = self._search_regex(\\n- r'id=\\\"(?:videoPlayer|player-container)\\\"[^>]+data-guid=\\\"([^\\\"]+)\\\"',\\n- webpage, 'guid')\\n-\\n- return {\\n- '_type': 'url_transparent',\\n- 'ie_key': 'ThePlatform',\\n- 'url': smuggle_url(\\n- f'http://link.theplatform.com/s/ngs/media/guid/2423130747/{guid}?mbr=true',\\n- {'force_smil_url': True}),\\n- 'id': guid,\\n- }\\n \\n \\n class NationalGeographicTVIE(FOXIE): # XXX: Do not subclass from concrete IE\\ndiff --git a/yt_dlp/extractor/naver.py b/yt_dlp/extractor/naver.py\\nindex fa7b56ca75db..ffb4da2622f3 100644\\n--- a/yt_dlp/extractor/naver.py\\n+++ b/yt_dlp/extractor/naver.py\\n@@ -13,11 +13,9 @@\\n dict_get,\\n int_or_none,\\n join_nonempty,\\n- merge_dicts,\\n parse_iso8601,\\n traverse_obj,\\n try_get,\\n- unified_timestamp,\\n update_url_query,\\n url_or_none,\\n )\\n@@ -284,142 +282,3 @@ def _real_extract(self, url):\\n }), get_all=False),\\n 'is_live': True,\\n }\\n-\\n-\\n-class NaverNowIE(NaverBaseIE):\\n- IE_NAME = 'navernow'\\n- _VALID_URL = r'https?://now\\\\.naver\\\\.com/s/now\\\\.(?P<id>\\\\w+)'\\n- _API_URL = 'https://apis.naver.com/now_web/oldnow_web/v4'\\n- _TESTS = [{\\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay=',\\n- 'md5': 'e05854162c21c221481de16b2944a0bc',\\n- 'info_dict': {\\n- 'id': '4759-26331132',\\n- 'title': '์์ดํคX๋
ธ์ \\\\r\\\\n๐๊ฝ๋ฅ๊ฝ๋ฅ๐(1)',\\n- 'ext': 'mp4',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'timestamp': 1650369600,\\n- 'upload_date': '20220419',\\n- 'uploader_id': 'now',\\n- 'view_count': int,\\n- 'uploader_url': 'https://now.naver.com/show/4759',\\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\\n- },\\n- 'params': {\\n- 'noplaylist': True,\\n- },\\n- }, {\\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\\n- 'md5': '9f6118e398aa0f22b2152f554ea7851b',\\n- 'info_dict': {\\n- 'id': '4759-26601461',\\n- 'title': '์์ดํค: ๋ ๋ฆฌ์ ํํ
ํ๋ค๋ ธ์ด,,, ์งํฌ ํญ๋ฐํ๋ ๋
ธ์ ์ฌ๋ณด๐พ [์์ดํค์ ๋ฐ์ฆ์
]ใ
ฃ๋ค์ด๋ฒ NOW.',\\n- 'ext': 'mp4',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'upload_date': '20220504',\\n- 'timestamp': 1651648311,\\n- 'uploader_id': 'now',\\n- 'view_count': int,\\n- 'uploader_url': 'https://now.naver.com/show/4759',\\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\\n- },\\n- 'params': {\\n- 'noplaylist': True,\\n- },\\n- }, {\\n- 'url': 'https://now.naver.com/s/now.4759',\\n- 'info_dict': {\\n- 'id': '4759',\\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\\n- },\\n- 'playlist_mincount': 101,\\n- }, {\\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay',\\n- 'info_dict': {\\n- 'id': '4759',\\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\\n- },\\n- 'playlist_mincount': 101,\\n- }, {\\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\\n- 'info_dict': {\\n- 'id': '4759',\\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\\n- },\\n- 'playlist_mincount': 101,\\n- }, {\\n- 'url': 'https://now.naver.com/s/now.kihyunplay?shareReplayId=30573291#replay',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _extract_replay(self, show_id, replay_id):\\n- vod_info = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}', replay_id)\\n- in_key = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}/inkey', replay_id)['inKey']\\n- return merge_dicts({\\n- 'id': f'{show_id}-{replay_id}',\\n- 'title': traverse_obj(vod_info, ('episode', 'title')),\\n- 'timestamp': unified_timestamp(traverse_obj(vod_info, ('episode', 'start_time'))),\\n- 'thumbnail': vod_info.get('thumbnail_image_url'),\\n- }, self._extract_video_info(replay_id, vod_info['video_id'], in_key))\\n-\\n- def _extract_show_replays(self, show_id):\\n- page_size = 15\\n- page = 1\\n- while True:\\n- show_vod_info = self._download_json(\\n- f'{self._API_URL}/vod-shows/now.{show_id}', show_id,\\n- query={'page': page, 'page_size': page_size},\\n- note=f'Downloading JSON vod list for show {show_id} - page {page}',\\n- )['response']['result']\\n- for v in show_vod_info.get('vod_list') or []:\\n- yield self._extract_replay(show_id, v['id'])\\n-\\n- if len(show_vod_info.get('vod_list') or []) < page_size:\\n- break\\n- page += 1\\n-\\n- def _extract_show_highlights(self, show_id, highlight_id=None):\\n- page_size = 10\\n- page = 1\\n- while True:\\n- highlights_videos = self._download_json(\\n- f'{self._API_URL}/shows/now.{show_id}/highlights/videos/', show_id,\\n- query={'page': page, 'page_size': page_size},\\n- note=f'Downloading JSON highlights for show {show_id} - page {page}')\\n-\\n- for highlight in highlights_videos.get('results') or []:\\n- if highlight_id and highlight.get('clip_no') != int(highlight_id):\\n- continue\\n- yield merge_dicts({\\n- 'id': f'{show_id}-{highlight[\\\"clip_no\\\"]}',\\n- 'title': highlight.get('title'),\\n- 'timestamp': unified_timestamp(highlight.get('regdate')),\\n- 'thumbnail': highlight.get('thumbnail_url'),\\n- }, self._extract_video_info(highlight['clip_no'], highlight['video_id'], highlight['video_inkey']))\\n-\\n- if len(highlights_videos.get('results') or []) < page_size:\\n- break\\n- page += 1\\n-\\n- def _extract_highlight(self, show_id, highlight_id):\\n- try:\\n- return next(self._extract_show_highlights(show_id, highlight_id))\\n- except StopIteration:\\n- raise ExtractorError(f'Unable to find highlight {highlight_id} for show {show_id}')\\n-\\n- def _real_extract(self, url):\\n- show_id = self._match_id(url)\\n- qs = urllib.parse.parse_qs(urllib.parse.urlparse(url).query)\\n-\\n- if not self._yes_playlist(show_id, qs.get('shareHightlight')):\\n- return self._extract_highlight(show_id, qs['shareHightlight'][0])\\n- elif not self._yes_playlist(show_id, qs.get('shareReplayId')):\\n- return self._extract_replay(show_id, qs['shareReplayId'][0])\\n-\\n- show_info = self._download_json(\\n- f'{self._API_URL}/shows/now.{show_id}/', show_id,\\n- note=f'Downloading JSON vod list for show {show_id}')\\n-\\n- return self.playlist_result(\\n- itertools.chain(self._extract_show_replays(show_id), self._extract_show_highlights(show_id)),\\n- show_id, show_info.get('title'))\\ndiff --git a/yt_dlp/extractor/nerdcubed.py b/yt_dlp/extractor/nerdcubed.py\\ndeleted file mode 100644\\nindex 5f5607a20b25..000000000000\\n--- a/yt_dlp/extractor/nerdcubed.py\\n+++ /dev/null\\n@@ -1,38 +0,0 @@\\n-from .common import InfoExtractor\\n-from .youtube import YoutubeIE\\n-from ..utils import parse_iso8601, url_or_none\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class NerdCubedFeedIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?nerdcubed\\\\.co\\\\.uk/?(?:$|[#?])'\\n- _TEST = {\\n- 'url': 'http://www.nerdcubed.co.uk/',\\n- 'info_dict': {\\n- 'id': 'nerdcubed-feed',\\n- 'title': 'nerdcubed.co.uk feed',\\n- },\\n- 'playlist_mincount': 5500,\\n- }\\n-\\n- def _extract_video(self, feed_entry):\\n- return self.url_result(\\n- f'https://www.youtube.com/watch?v={feed_entry[\\\"id\\\"]}', YoutubeIE,\\n- **traverse_obj(feed_entry, {\\n- 'id': ('id', {str}),\\n- 'title': ('title', {str}),\\n- 'description': ('description', {str}),\\n- 'timestamp': ('publishedAt', {parse_iso8601}),\\n- 'channel': ('source', 'name', {str}),\\n- 'channel_id': ('source', 'id', {str}),\\n- 'channel_url': ('source', 'url', {str}),\\n- 'thumbnail': ('thumbnail', 'source', {url_or_none}),\\n- }), url_transparent=True)\\n-\\n- def _real_extract(self, url):\\n- video_id = 'nerdcubed-feed'\\n- feed = self._download_json('https://www.nerdcubed.co.uk/_/cdn/videos.json', video_id)\\n-\\n- return self.playlist_result(\\n- map(self._extract_video, traverse_obj(feed, ('videos', lambda _, v: v['id']))),\\n- video_id, 'nerdcubed.co.uk feed')\\ndiff --git a/yt_dlp/extractor/netverse.py b/yt_dlp/extractor/netverse.py\\ndeleted file mode 100644\\nindex 2ddec5c0ae17..000000000000\\n--- a/yt_dlp/extractor/netverse.py\\n+++ /dev/null\\n@@ -1,281 +0,0 @@\\n-import itertools\\n-\\n-from .common import InfoExtractor, SearchInfoExtractor\\n-from .dailymotion import DailymotionIE\\n-from ..utils import smuggle_url, traverse_obj\\n-\\n-\\n-class NetverseBaseIE(InfoExtractor):\\n- _ENDPOINTS = {\\n- 'watch': 'watchvideo',\\n- 'video': 'watchvideo',\\n- 'webseries': 'webseries',\\n- 'season': 'webseason_videos',\\n- }\\n-\\n- def _call_api(self, slug, endpoint, query={}, season_id='', display_id=None):\\n- return self._download_json(\\n- f'https://api.netverse.id/medias/api/v2/{self._ENDPOINTS[endpoint]}/{slug}/{season_id}',\\n- display_id or slug, query=query)\\n-\\n- def _get_comments(self, video_id):\\n- last_page_number = None\\n- for i in itertools.count(1):\\n- comment_data = self._download_json(\\n- f'https://api.netverse.id/mediadetails/api/v3/videos/comments/{video_id}',\\n- video_id, data=b'', fatal=False, query={'page': i},\\n- note=f'Downloading JSON comment metadata page {i}') or {}\\n- yield from traverse_obj(comment_data, ('response', 'comments', 'data', ..., {\\n- 'id': '_id',\\n- 'text': 'comment',\\n- 'author_id': 'customer_id',\\n- 'author': ('customer', 'name'),\\n- 'author_thumbnail': ('customer', 'profile_picture'),\\n- }))\\n-\\n- if not last_page_number:\\n- last_page_number = traverse_obj(comment_data, ('response', 'comments', 'last_page'))\\n- if i >= (last_page_number or 0):\\n- break\\n-\\n-\\n-class NetverseIE(NetverseBaseIE):\\n- _VALID_URL = r'https?://(?:\\\\w+\\\\.)?netverse\\\\.id/(?P<type>watch|video)/(?P<display_id>[^/?#&]+)'\\n- _TESTS = [{\\n- # Watch video\\n- 'url': 'https://www.netverse.id/watch/waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\\n- 'info_dict': {\\n- 'id': 'k4yhqUwINAGtmHx3NkL',\\n- 'title': 'Waktu Indonesia Bercanda - Edisi Spesial Lebaran 2016',\\n- 'ext': 'mp4',\\n- 'season': 'Season 2016',\\n- 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'episode_number': 22,\\n- 'episode': 'Episode 22',\\n- 'uploader_id': 'x2ir3vq',\\n- 'age_limit': 0,\\n- 'tags': [],\\n- 'view_count': int,\\n- 'display_id': 'waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\\n- 'duration': 2990,\\n- 'upload_date': '20210722',\\n- 'timestamp': 1626919804,\\n- 'like_count': int,\\n- 'uploader': 'Net Prime',\\n- },\\n- }, {\\n- # series\\n- 'url': 'https://www.netverse.id/watch/jadoo-seorang-model',\\n- 'info_dict': {\\n- 'id': 'x88izwc',\\n- 'title': 'Jadoo Seorang Model',\\n- 'ext': 'mp4',\\n- 'season': 'Season 2',\\n- 'description': 'md5:8a74f70812cca267e19ee0635f0af835',\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'episode_number': 2,\\n- 'episode': 'Episode 2',\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'display_id': 'jadoo-seorang-model',\\n- 'uploader_id': 'x2ir3vq',\\n- 'duration': 635,\\n- 'timestamp': 1646372927,\\n- 'tags': ['PG069497-hellojadooseason2eps2'],\\n- 'upload_date': '20220304',\\n- 'uploader': 'Net Prime',\\n- 'age_limit': 0,\\n- },\\n- 'skip': 'video get Geo-blocked for some country',\\n- }, {\\n- # non www host\\n- 'url': 'https://netverse.id/watch/tetangga-baru',\\n- 'info_dict': {\\n- 'id': 'k4CNGz7V0HJ7vfwZbXy',\\n- 'ext': 'mp4',\\n- 'title': 'Tetangga Baru',\\n- 'season': 'Season 1',\\n- 'description': 'md5:23fcf70e97d461d3029d25d59b2ccfb9',\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'episode_number': 1,\\n- 'episode': 'Episode 1',\\n- 'timestamp': 1624538169,\\n- 'view_count': int,\\n- 'upload_date': '20210624',\\n- 'age_limit': 0,\\n- 'uploader_id': 'x2ir3vq',\\n- 'like_count': int,\\n- 'uploader': 'Net Prime',\\n- 'tags': ['PG008534', 'tetangga', 'Baru'],\\n- 'display_id': 'tetangga-baru',\\n- 'duration': 1406,\\n- },\\n- }, {\\n- # /video url\\n- 'url': 'https://www.netverse.id/video/pg067482-hellojadoo-season1',\\n- 'title': 'Namaku Choi Jadoo',\\n- 'info_dict': {\\n- 'id': 'x887jzz',\\n- 'ext': 'mp4',\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'season': 'Season 1',\\n- 'episode_number': 1,\\n- 'description': 'md5:d4f627b3e7a3f9acdc55f6cdd5ea41d5',\\n- 'title': 'Namaku Choi Jadoo',\\n- 'episode': 'Episode 1',\\n- 'age_limit': 0,\\n- 'like_count': int,\\n- 'view_count': int,\\n- 'tags': ['PG067482', 'PG067482-HelloJadoo-season1'],\\n- 'duration': 780,\\n- 'display_id': 'pg067482-hellojadoo-season1',\\n- 'uploader_id': 'x2ir3vq',\\n- 'uploader': 'Net Prime',\\n- 'timestamp': 1645764984,\\n- 'upload_date': '20220225',\\n- },\\n- 'skip': 'This video get Geo-blocked for some country',\\n- }, {\\n- # video with comments\\n- 'url': 'https://netverse.id/video/episode-1-season-2016-ok-food',\\n- 'info_dict': {\\n- 'id': 'k6hetBPiQMljSxxvAy7',\\n- 'ext': 'mp4',\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'display_id': 'episode-1-season-2016-ok-food',\\n- 'like_count': int,\\n- 'description': '',\\n- 'duration': 1471,\\n- 'age_limit': 0,\\n- 'timestamp': 1642405848,\\n- 'episode_number': 1,\\n- 'season': 'Season 2016',\\n- 'uploader_id': 'x2ir3vq',\\n- 'title': 'Episode 1 - Season 2016 - Ok Food',\\n- 'upload_date': '20220117',\\n- 'tags': [],\\n- 'view_count': int,\\n- 'episode': 'Episode 1',\\n- 'uploader': 'Net Prime',\\n- 'comment_count': int,\\n- },\\n- 'params': {\\n- 'getcomments': True,\\n- },\\n- }, {\\n- # video with multiple page comment\\n- 'url': 'https://netverse.id/video/match-island-eps-1-fix',\\n- 'info_dict': {\\n- 'id': 'x8aznjc',\\n- 'ext': 'mp4',\\n- 'like_count': int,\\n- 'tags': ['Match-Island', 'Pd00111'],\\n- 'display_id': 'match-island-eps-1-fix',\\n- 'view_count': int,\\n- 'episode': 'Episode 1',\\n- 'uploader': 'Net Prime',\\n- 'duration': 4070,\\n- 'timestamp': 1653068165,\\n- 'description': 'md5:e9cf3b480ad18e9c33b999e3494f223f',\\n- 'age_limit': 0,\\n- 'title': 'Welcome To Match Island',\\n- 'upload_date': '20220520',\\n- 'episode_number': 1,\\n- 'thumbnail': r're:https?://s\\\\d+\\\\.dmcdn\\\\.net/v/[^/]+/x1080',\\n- 'uploader_id': 'x2ir3vq',\\n- 'season': 'Season 1',\\n- 'comment_count': int,\\n- },\\n- 'params': {\\n- 'getcomments': True,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- display_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\\n- program_json = self._call_api(display_id, sites_type)\\n- videos = program_json['response']['videos']\\n-\\n- return {\\n- '_type': 'url_transparent',\\n- 'ie_key': DailymotionIE.ie_key(),\\n- 'url': smuggle_url(videos['dailymotion_url'], {'query': {'embedder': 'https://www.netverse.id'}}),\\n- 'display_id': display_id,\\n- 'title': videos.get('title'),\\n- 'season': videos.get('season_name'),\\n- 'thumbnail': traverse_obj(videos, ('program_detail', 'thumbnail_image')),\\n- 'description': traverse_obj(videos, ('program_detail', 'description')),\\n- 'episode_number': videos.get('episode_order'),\\n- '__post_extractor': self.extract_comments(display_id),\\n- }\\n-\\n-\\n-class NetversePlaylistIE(NetverseBaseIE):\\n- _VALID_URL = r'https?://(?:\\\\w+\\\\.)?netverse\\\\.id/(?P<type>webseries)/(?P<display_id>[^/?#&]+)'\\n- _TESTS = [{\\n- # multiple season\\n- 'url': 'https://netverse.id/webseries/tetangga-masa-gitu',\\n- 'info_dict': {\\n- 'id': 'tetangga-masa-gitu',\\n- 'title': 'Tetangga Masa Gitu',\\n- },\\n- 'playlist_count': 519,\\n- }, {\\n- # single season\\n- 'url': 'https://netverse.id/webseries/kelas-internasional',\\n- 'info_dict': {\\n- 'id': 'kelas-internasional',\\n- 'title': 'Kelas Internasional',\\n- },\\n- 'playlist_count': 203,\\n- }]\\n-\\n- def parse_playlist(self, json_data, playlist_id):\\n- slug_sample = traverse_obj(json_data, ('related', 'data', ..., 'slug'))[0]\\n- for season in traverse_obj(json_data, ('seasons', ..., 'id')):\\n- playlist_json = self._call_api(\\n- slug_sample, 'season', display_id=playlist_id, season_id=season)\\n-\\n- for current_page in range(playlist_json['response']['season_list']['last_page']):\\n- playlist_json = self._call_api(slug_sample, 'season', query={'page': current_page + 1},\\n- season_id=season, display_id=playlist_id)\\n- for slug in traverse_obj(playlist_json, ('response', ..., 'data', ..., 'slug')):\\n- yield self.url_result(f'https://www.netverse.id/video/{slug}', NetverseIE)\\n-\\n- def _real_extract(self, url):\\n- playlist_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\\n- playlist_data = self._call_api(playlist_id, sites_type)\\n-\\n- return self.playlist_result(\\n- self.parse_playlist(playlist_data['response'], playlist_id),\\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'slug')),\\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'title')))\\n-\\n-\\n-class NetverseSearchIE(SearchInfoExtractor):\\n- _SEARCH_KEY = 'netsearch'\\n-\\n- _TESTS = [{\\n- 'url': 'netsearch10:tetangga',\\n- 'info_dict': {\\n- 'id': 'tetangga',\\n- 'title': 'tetangga',\\n- },\\n- 'playlist_count': 10,\\n- }]\\n-\\n- def _search_results(self, query):\\n- last_page = None\\n- for i in itertools.count(1):\\n- search_data = self._download_json(\\n- 'https://api.netverse.id/search/elastic/search', query,\\n- query={'q': query, 'page': i}, note=f'Downloading page {i}')\\n-\\n- videos = traverse_obj(search_data, ('response', 'data', ...))\\n- for video in videos:\\n- yield self.url_result(f'https://netverse.id/video/{video[\\\"slug\\\"]}', NetverseIE)\\n-\\n- last_page = last_page or traverse_obj(search_data, ('response', 'lastpage'))\\n- if not videos or i >= (last_page or 0):\\n- break\\ndiff --git a/yt_dlp/extractor/nuum.py b/yt_dlp/extractor/nuum.py\\ndeleted file mode 100644\\nindex 697fc6b32e1c..000000000000\\n--- a/yt_dlp/extractor/nuum.py\\n+++ /dev/null\\n@@ -1,201 +0,0 @@\\n-import functools\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- OnDemandPagedList,\\n- UserNotLive,\\n- filter_dict,\\n- int_or_none,\\n- parse_iso8601,\\n- str_or_none,\\n- url_or_none,\\n-)\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class NuumBaseIE(InfoExtractor):\\n- def _call_api(self, path, video_id, description, query={}):\\n- response = self._download_json(\\n- f'https://nuum.ru/api/v2/{path}', video_id, query=query,\\n- note=f'Downloading {description} metadata',\\n- errnote=f'Unable to download {description} metadata')\\n- if error := response.get('error'):\\n- raise ExtractorError(f'API returned error: {error!r}')\\n- return response['result']\\n-\\n- def _get_channel_info(self, channel_name):\\n- return self._call_api(\\n- 'broadcasts/public', video_id=channel_name, description='channel',\\n- query={\\n- 'with_extra': 'true',\\n- 'channel_name': channel_name,\\n- 'with_deleted': 'true',\\n- })\\n-\\n- def _parse_video_data(self, container, extract_formats=True):\\n- stream = traverse_obj(container, ('media_container_streams', 0, {dict})) or {}\\n- media = traverse_obj(stream, ('stream_media', 0, {dict})) or {}\\n- media_url = traverse_obj(media, (\\n- 'media_meta', ('media_archive_url', 'media_url'), {url_or_none}), get_all=False)\\n-\\n- video_id = str(container['media_container_id'])\\n- is_live = media.get('media_status') == 'RUNNING'\\n-\\n- formats, subtitles = None, None\\n- headers = {'Referer': 'https://nuum.ru/'}\\n- if extract_formats:\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\\n- media_url, video_id, 'mp4', live=is_live, headers=headers)\\n-\\n- return filter_dict({\\n- 'id': video_id,\\n- 'is_live': is_live,\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'http_headers': headers,\\n- **traverse_obj(container, {\\n- 'title': ('media_container_name', {str}),\\n- 'description': ('media_container_description', {str}),\\n- 'timestamp': ('created_at', {parse_iso8601}),\\n- 'channel': ('media_container_channel', 'channel_name', {str}),\\n- 'channel_id': ('media_container_channel', 'channel_id', {str_or_none}),\\n- }),\\n- **traverse_obj(stream, {\\n- 'view_count': ('stream_total_viewers', {int_or_none}),\\n- 'concurrent_view_count': ('stream_current_viewers', {int_or_none}),\\n- }),\\n- **traverse_obj(media, {\\n- 'duration': ('media_duration', {int_or_none}),\\n- 'thumbnail': ('media_meta', ('media_preview_archive_url', 'media_preview_url'), {url_or_none}),\\n- }, get_all=False),\\n- })\\n-\\n-\\n-class NuumMediaIE(NuumBaseIE):\\n- IE_NAME = 'nuum:media'\\n- _VALID_URL = r'https?://nuum\\\\.ru/(?:streams|videos|clips)/(?P<id>[\\\\d]+)'\\n- _TESTS = [{\\n- 'url': 'https://nuum.ru/streams/1592713-7-days-to-die',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://nuum.ru/videos/1567547-toxi-hurtz',\\n- 'md5': 'ce28837a5bbffe6952d7bfd3d39811b0',\\n- 'info_dict': {\\n- 'id': '1567547',\\n- 'ext': 'mp4',\\n- 'title': 'Toxi$ - Hurtz',\\n- 'description': '',\\n- 'timestamp': 1702631651,\\n- 'upload_date': '20231215',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'view_count': int,\\n- 'concurrent_view_count': int,\\n- 'channel_id': '6911',\\n- 'channel': 'toxis',\\n- 'duration': 116,\\n- },\\n- }, {\\n- 'url': 'https://nuum.ru/clips/1552564-pro-misu',\\n- 'md5': 'b248ae1565b1e55433188f11beeb0ca1',\\n- 'info_dict': {\\n- 'id': '1552564',\\n- 'ext': 'mp4',\\n- 'title': 'ะัะพ ะะธัั ๐',\\n- 'timestamp': 1701971828,\\n- 'upload_date': '20231207',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'view_count': int,\\n- 'concurrent_view_count': int,\\n- 'channel_id': '3320',\\n- 'channel': 'Misalelik',\\n- 'duration': 41,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- video_data = self._call_api(f'media-containers/{video_id}', video_id, 'media')\\n-\\n- return self._parse_video_data(video_data)\\n-\\n-\\n-class NuumLiveIE(NuumBaseIE):\\n- IE_NAME = 'nuum:live'\\n- _VALID_URL = r'https?://nuum\\\\.ru/channel/(?P<id>[^/#?]+)/?(?:$|[#?])'\\n- _TESTS = [{\\n- 'url': 'https://nuum.ru/channel/mts_live',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- channel = self._match_id(url)\\n- channel_info = self._get_channel_info(channel)\\n- if traverse_obj(channel_info, ('channel', 'channel_is_live')) is False:\\n- raise UserNotLive(video_id=channel)\\n-\\n- info = self._parse_video_data(channel_info['media_container'])\\n- return {\\n- 'webpage_url': f'https://nuum.ru/streams/{info[\\\"id\\\"]}',\\n- 'extractor_key': NuumMediaIE.ie_key(),\\n- 'extractor': NuumMediaIE.IE_NAME,\\n- **info,\\n- }\\n-\\n-\\n-class NuumTabIE(NuumBaseIE):\\n- IE_NAME = 'nuum:tab'\\n- _VALID_URL = r'https?://nuum\\\\.ru/channel/(?P<id>[^/#?]+)/(?P<type>streams|videos|clips)'\\n- _TESTS = [{\\n- 'url': 'https://nuum.ru/channel/dankon_/clips',\\n- 'info_dict': {\\n- 'id': 'dankon__clips',\\n- 'title': 'Dankon_',\\n- },\\n- 'playlist_mincount': 29,\\n- }, {\\n- 'url': 'https://nuum.ru/channel/dankon_/videos',\\n- 'info_dict': {\\n- 'id': 'dankon__videos',\\n- 'title': 'Dankon_',\\n- },\\n- 'playlist_mincount': 2,\\n- }, {\\n- 'url': 'https://nuum.ru/channel/dankon_/streams',\\n- 'info_dict': {\\n- 'id': 'dankon__streams',\\n- 'title': 'Dankon_',\\n- },\\n- 'playlist_mincount': 1,\\n- }]\\n-\\n- _PAGE_SIZE = 50\\n-\\n- def _fetch_page(self, channel_id, tab_type, tab_id, page):\\n- CONTAINER_TYPES = {\\n- 'clips': ['SHORT_VIDEO', 'REVIEW_VIDEO'],\\n- 'videos': ['LONG_VIDEO'],\\n- 'streams': ['SINGLE'],\\n- }\\n-\\n- media_containers = self._call_api(\\n- 'media-containers', video_id=tab_id, description=f'{tab_type} tab page {page + 1}',\\n- query={\\n- 'limit': self._PAGE_SIZE,\\n- 'offset': page * self._PAGE_SIZE,\\n- 'channel_id': channel_id,\\n- 'media_container_status': 'STOPPED',\\n- 'media_container_type': CONTAINER_TYPES[tab_type],\\n- })\\n- for container in traverse_obj(media_containers, (..., {dict})):\\n- metadata = self._parse_video_data(container, extract_formats=False)\\n- yield self.url_result(f'https://nuum.ru/videos/{metadata[\\\"id\\\"]}', NuumMediaIE, **metadata)\\n-\\n- def _real_extract(self, url):\\n- channel_name, tab_type = self._match_valid_url(url).group('id', 'type')\\n- tab_id = f'{channel_name}_{tab_type}'\\n- channel_data = self._get_channel_info(channel_name)['channel']\\n-\\n- return self.playlist_result(OnDemandPagedList(functools.partial(\\n- self._fetch_page, channel_data['channel_id'], tab_type, tab_id), self._PAGE_SIZE),\\n- playlist_id=tab_id, playlist_title=channel_data.get('channel_name'))\\ndiff --git a/yt_dlp/extractor/onionstudios.py b/yt_dlp/extractor/onionstudios.py\\ndeleted file mode 100644\\nindex 7e30b2d33dcc..000000000000\\n--- a/yt_dlp/extractor/onionstudios.py\\n+++ /dev/null\\n@@ -1,41 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import js_to_json\\n-\\n-\\n-class OnionStudiosIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?onionstudios\\\\.com/(?:video(?:s/[^/]+-|/)|embed\\\\?.*\\\\bid=)(?P<id>\\\\d+)(?!-)'\\n- _EMBED_REGEX = [r'(?s)<(?:iframe|bulbs-video)[^>]+?src=([\\\"\\\\'])(?P<url>(?:https?:)?//(?:www\\\\.)?onionstudios\\\\.com/(?:embed.+?|video/\\\\d+\\\\.json))\\\\1']\\n-\\n- _TESTS = [{\\n- 'url': 'http://www.onionstudios.com/videos/hannibal-charges-forward-stops-for-a-cocktail-2937',\\n- 'md5': '5a118d466d62b5cd03647cf2c593977f',\\n- 'info_dict': {\\n- 'id': '3459881',\\n- 'ext': 'mp4',\\n- 'title': 'Hannibal charges forward, stops for a cocktail',\\n- 'description': 'md5:545299bda6abf87e5ec666548c6a9448',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- 'uploader': 'a.v. club',\\n- 'upload_date': '20150619',\\n- 'timestamp': 1434728546,\\n- },\\n- }, {\\n- 'url': 'http://www.onionstudios.com/embed?id=2855&autoplay=true',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://www.onionstudios.com/video/6139.json',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- webpage = self._download_webpage(\\n- 'http://onionstudios.com/embed/dc94dc2899fe644c0e7241fa04c1b732.js',\\n- video_id)\\n- mcp_id = str(self._parse_json(self._search_regex(\\n- r'window\\\\.mcpMapping\\\\s*=\\\\s*({.+?});', webpage,\\n- 'MCP Mapping'), video_id, js_to_json)[video_id]['mcp_id'])\\n- return self.url_result(\\n- 'http://kinja.com/ajax/inset/iframe?id=mcp-' + mcp_id,\\n- 'KinjaEmbed', mcp_id)\\ndiff --git a/yt_dlp/extractor/ora.py b/yt_dlp/extractor/ora.py\\ndeleted file mode 100644\\nindex c6ba4b0d3ea4..000000000000\\n--- a/yt_dlp/extractor/ora.py\\n+++ /dev/null\\n@@ -1,72 +0,0 @@\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- get_element_by_attribute,\\n- qualities,\\n- unescapeHTML,\\n-)\\n-\\n-\\n-class OraTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:ora\\\\.tv|unsafespeech\\\\.com)/([^/]+/)*(?P<id>[^/\\\\?#]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.ora.tv/larrykingnow/2015/12/16/vine-youtube-stars-zach-king-king-bach-on-their-viral-videos-0_36jupg6090pq',\\n- 'md5': 'fa33717591c631ec93b04b0e330df786',\\n- 'info_dict': {\\n- 'id': '50178',\\n- 'ext': 'mp4',\\n- 'title': 'Vine & YouTube Stars Zach King & King Bach On Their Viral Videos!',\\n- 'description': 'md5:ebbc5b1424dd5dba7be7538148287ac1',\\n- },\\n- }, {\\n- 'url': 'http://www.unsafespeech.com/video/2016/5/10/student-self-censorship-and-the-thought-police-on-university-campuses-0_6622bnkppw4d',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- video_data = self._search_regex(\\n- r'\\\"(?:video|current)\\\"\\\\s*:\\\\s*({[^}]+?})', webpage, 'current video')\\n- m3u8_url = self._search_regex(\\n- r'hls_stream\\\"?\\\\s*:\\\\s*\\\"([^\\\"]+)', video_data, 'm3u8 url', None)\\n- if m3u8_url:\\n- formats = self._extract_m3u8_formats(\\n- m3u8_url, display_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False)\\n- # similar to GameSpotIE\\n- m3u8_path = urllib.parse.urlparse(m3u8_url).path\\n- QUALITIES_RE = r'((,[a-z]+\\\\d+)+,?)'\\n- available_qualities = self._search_regex(\\n- QUALITIES_RE, m3u8_path, 'qualities').strip(',').split(',')\\n- http_path = m3u8_path[1:].split('/', 1)[1]\\n- http_template = re.sub(QUALITIES_RE, r'%s', http_path)\\n- http_template = http_template.replace('.csmil/master.m3u8', '')\\n- http_template = urllib.parse.urljoin(\\n- 'http://videocdn-pmd.ora.tv/', http_template)\\n- preference = qualities(\\n- ['mobile400', 'basic400', 'basic600', 'sd900', 'sd1200', 'sd1500', 'hd720', 'hd1080'])\\n- for q in available_qualities:\\n- formats.append({\\n- 'url': http_template % q,\\n- 'format_id': q,\\n- 'quality': preference(q),\\n- })\\n- else:\\n- return self.url_result(self._search_regex(\\n- r'\\\"youtube_id\\\"\\\\s*:\\\\s*\\\"([^\\\"]+)', webpage, 'youtube id'), 'Youtube')\\n-\\n- return {\\n- 'id': self._search_regex(\\n- r'\\\"id\\\"\\\\s*:\\\\s*(\\\\d+)', video_data, 'video id', default=display_id),\\n- 'display_id': display_id,\\n- 'title': unescapeHTML(self._og_search_title(webpage)),\\n- 'description': get_element_by_attribute(\\n- 'class', 'video_txt_decription', webpage),\\n- 'thumbnail': self._proto_relative_url(self._search_regex(\\n- r'\\\"thumb\\\"\\\\s*:\\\\s*\\\"([^\\\"]+)', video_data, 'thumbnail', None)),\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/piramidetv.py b/yt_dlp/extractor/piramidetv.py\\ndeleted file mode 100644\\nindex 29afa9b4673e..000000000000\\n--- a/yt_dlp/extractor/piramidetv.py\\n+++ /dev/null\\n@@ -1,99 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import parse_iso8601, smuggle_url, unsmuggle_url, url_or_none\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class PiramideTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://piramide\\\\.tv/video/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://piramide.tv/video/wWtBAORdJUTh',\\n- 'info_dict': {\\n- 'id': 'wWtBAORdJUTh',\\n- 'ext': 'mp4',\\n- 'title': 'md5:79f9c8183ea6a35c836923142cf0abcc',\\n- 'description': '',\\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/W86PgQDn/thumbnails/B9gpIxkH.jpg',\\n- 'channel': 'Leรณn Picarรณn',\\n- 'channel_id': 'leonpicaron',\\n- 'timestamp': 1696460362,\\n- 'upload_date': '20231004',\\n- },\\n- }, {\\n- 'url': 'https://piramide.tv/video/wcYn6li79NgN',\\n- 'info_dict': {\\n- 'id': 'wcYn6li79NgN',\\n- 'ext': 'mp4',\\n- 'title': 'ACEPTO TENER UN BEBE CON MI NOVIA\\\\u2026? | Parte 1',\\n- 'description': '',\\n- 'channel': 'ARTA GAME',\\n- 'channel_id': 'arta_game',\\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/cnEdGp5X/thumbnails/rHAaWfP7.jpg',\\n- 'timestamp': 1703434976,\\n- 'upload_date': '20231224',\\n- },\\n- }]\\n-\\n- def _extract_video(self, video_id):\\n- video_data = self._download_json(\\n- f'https://hermes.piramide.tv/video/data/{video_id}', video_id, fatal=False)\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\\n- f'https://cdn.piramide.tv/video/{video_id}/manifest.m3u8', video_id, fatal=False)\\n- next_video = traverse_obj(video_data, ('video', 'next_video', 'id', {str}))\\n- return next_video, {\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- **traverse_obj(video_data, ('video', {\\n- 'id': ('id', {str}),\\n- 'title': ('title', {str}),\\n- 'description': ('description', {str}),\\n- 'thumbnail': ('media', 'thumbnail', {url_or_none}),\\n- 'channel': ('channel', 'name', {str}),\\n- 'channel_id': ('channel', 'id', {str}),\\n- 'timestamp': ('date', {parse_iso8601}),\\n- })),\\n- }\\n-\\n- def _entries(self, video_id):\\n- visited = set()\\n- while True:\\n- visited.add(video_id)\\n- next_video, info = self._extract_video(video_id)\\n- yield info\\n- if not next_video or next_video in visited:\\n- break\\n- video_id = next_video\\n-\\n- def _real_extract(self, url):\\n- url, smuggled_data = unsmuggle_url(url, {})\\n- video_id = self._match_id(url)\\n- if self._yes_playlist(video_id, video_id, smuggled_data):\\n- return self.playlist_result(self._entries(video_id), video_id)\\n- return self._extract_video(video_id)[1]\\n-\\n-\\n-class PiramideTVChannelIE(InfoExtractor):\\n- _VALID_URL = r'https?://piramide\\\\.tv/channel/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://piramide.tv/channel/thekalo',\\n- 'playlist_mincount': 10,\\n- 'info_dict': {\\n- 'id': 'thekalo',\\n- },\\n- }]\\n-\\n- def _entries(self, channel_name):\\n- videos = self._download_json(\\n- f'https://hermes.piramide.tv/channel/list/{channel_name}/date/100000', channel_name)\\n- for video in traverse_obj(videos, ('videos', lambda _, v: v['id'])):\\n- yield self.url_result(smuggle_url(\\n- f'https://piramide.tv/video/{video[\\\"id\\\"]}', {'force_noplaylist': True}),\\n- **traverse_obj(video, {\\n- 'id': ('id', {str}),\\n- 'title': ('title', {str}),\\n- 'description': ('description', {str}),\\n- }))\\n-\\n- def _real_extract(self, url):\\n- channel_name = self._match_id(url)\\n- return self.playlist_result(self._entries(channel_name), channel_name)\\ndiff --git a/yt_dlp/extractor/planetmarathi.py b/yt_dlp/extractor/planetmarathi.py\\ndeleted file mode 100644\\nindex 94861836a3b0..000000000000\\n--- a/yt_dlp/extractor/planetmarathi.py\\n+++ /dev/null\\n@@ -1,72 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- try_get,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class PlanetMarathiIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?planetmarathi\\\\.com/titles/(?P<id>[^/#&?$]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.planetmarathi.com/titles/ek-unad-divas',\\n- 'playlist_mincount': 2,\\n- 'info_dict': {\\n- 'id': 'ek-unad-divas',\\n- },\\n- 'playlist': [{\\n- 'info_dict': {\\n- 'id': 'ASSETS-MOVIE-ASSET-01_ek-unad-divas',\\n- 'ext': 'mp4',\\n- 'title': 'ek unad divas',\\n- 'alt_title': 'เคเคฟเคคเฅเคฐเคชเค',\\n- 'description': 'md5:41c7ed6b041c2fea9820a3f3125bd881',\\n- 'episode_number': 1,\\n- 'duration': 5539,\\n- 'upload_date': '20210829',\\n- },\\n- }], # Trailer skipped\\n- }, {\\n- 'url': 'https://www.planetmarathi.com/titles/baap-beep-baap-season-1',\\n- 'playlist_mincount': 10,\\n- 'info_dict': {\\n- 'id': 'baap-beep-baap-season-1',\\n- },\\n- 'playlist': [{\\n- 'info_dict': {\\n- 'id': 'ASSETS-CHARACTER-PROFILE-SEASON-01-ASSET-01_baap-beep-baap-season-1',\\n- 'ext': 'mp4',\\n- 'title': 'Manohar Kanhere',\\n- 'alt_title': 'เคฎเคจเฅเคนเคฐ เคเคพเคจเฅเคนเฅเคฐเฅ',\\n- 'description': 'md5:285ed45d5c0ab5522cac9a043354ebc6',\\n- 'season_number': 1,\\n- 'episode_number': 1,\\n- 'duration': 29,\\n- 'upload_date': '20210829',\\n- },\\n- }], # Trailers, Episodes, other Character profiles skipped\\n- }]\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n- entries = []\\n- json_data = self._download_json(\\n- f'https://www.planetmarathi.com/api/v1/titles/{playlist_id}/assets', playlist_id)['assets']\\n- for asset in json_data:\\n- asset_title = asset['mediaAssetName']['en']\\n- if asset_title == 'Movie':\\n- asset_title = playlist_id.replace('-', ' ')\\n- asset_id = f'{asset[\\\"sk\\\"]}_{playlist_id}'.replace('#', '-')\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(asset['mediaAssetURL'], asset_id)\\n- entries.append({\\n- 'id': asset_id,\\n- 'title': asset_title,\\n- 'alt_title': try_get(asset, lambda x: x['mediaAssetName']['mr']),\\n- 'description': try_get(asset, lambda x: x['mediaAssetDescription']['en']),\\n- 'season_number': asset.get('mediaAssetSeason'),\\n- 'episode_number': asset.get('mediaAssetIndexForAssetType'),\\n- 'duration': asset.get('mediaAssetDurationInSeconds'),\\n- 'upload_date': unified_strdate(asset.get('created')),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- })\\n- return self.playlist_result(entries, playlist_id=playlist_id)\\ndiff --git a/yt_dlp/extractor/playplustv.py b/yt_dlp/extractor/playplustv.py\\ndeleted file mode 100644\\nindex a4439c8bc53a..000000000000\\n--- a/yt_dlp/extractor/playplustv.py\\n+++ /dev/null\\n@@ -1,100 +0,0 @@\\n-import json\\n-\\n-from .common import InfoExtractor\\n-from ..networking import PUTRequest\\n-from ..networking.exceptions import HTTPError\\n-from ..utils import ExtractorError, clean_html, int_or_none\\n-\\n-\\n-class PlayPlusTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?playplus\\\\.(?:com|tv)/VOD/(?P<project_id>[0-9]+)/(?P<id>[0-9a-f]{32})'\\n- _TEST = {\\n- 'url': 'https://www.playplus.tv/VOD/7572/db8d274a5163424e967f35a30ddafb8e',\\n- 'md5': 'd078cb89d7ab6b9df37ce23c647aef72',\\n- 'info_dict': {\\n- 'id': 'db8d274a5163424e967f35a30ddafb8e',\\n- 'ext': 'mp4',\\n- 'title': 'Capรญtulo 179 - Final',\\n- 'description': 'md5:01085d62d8033a1e34121d3c3cabc838',\\n- 'timestamp': 1529992740,\\n- 'upload_date': '20180626',\\n- },\\n- 'skip': 'Requires account credential',\\n- }\\n- _NETRC_MACHINE = 'playplustv'\\n- _GEO_COUNTRIES = ['BR']\\n- _token = None\\n- _profile_id = None\\n-\\n- def _call_api(self, resource, video_id=None, query=None):\\n- return self._download_json('https://api.playplus.tv/api/media/v2/get' + resource, video_id, headers={\\n- 'Authorization': 'Bearer ' + self._token,\\n- }, query=query)\\n-\\n- def _perform_login(self, username, password):\\n- req = PUTRequest(\\n- 'https://api.playplus.tv/api/web/login', json.dumps({\\n- 'email': username,\\n- 'password': password,\\n- }).encode(), {\\n- 'Content-Type': 'application/json; charset=utf-8',\\n- })\\n-\\n- try:\\n- self._token = self._download_json(req, None)['token']\\n- except ExtractorError as e:\\n- if isinstance(e.cause, HTTPError) and e.cause.status == 401:\\n- raise ExtractorError(self._parse_json(\\n- e.cause.response.read(), None)['errorMessage'], expected=True)\\n- raise\\n-\\n- self._profile = self._call_api('Profiles')['list'][0]['_id']\\n-\\n- def _real_initialize(self):\\n- if not self._token:\\n- self.raise_login_required(method='password')\\n-\\n- def _real_extract(self, url):\\n- project_id, media_id = self._match_valid_url(url).groups()\\n- media = self._call_api(\\n- 'Media', media_id, {\\n- 'profileId': self._profile,\\n- 'projectId': project_id,\\n- 'mediaId': media_id,\\n- })['obj']\\n- title = media['title']\\n-\\n- formats = []\\n- for f in media.get('files', []):\\n- f_url = f.get('url')\\n- if not f_url:\\n- continue\\n- file_info = f.get('fileInfo') or {}\\n- formats.append({\\n- 'url': f_url,\\n- 'width': int_or_none(file_info.get('width')),\\n- 'height': int_or_none(file_info.get('height')),\\n- })\\n-\\n- thumbnails = []\\n- for thumb in media.get('thumbs', []):\\n- thumb_url = thumb.get('url')\\n- if not thumb_url:\\n- continue\\n- thumbnails.append({\\n- 'url': thumb_url,\\n- 'width': int_or_none(thumb.get('width')),\\n- 'height': int_or_none(thumb.get('height')),\\n- })\\n-\\n- return {\\n- 'id': media_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'thumbnails': thumbnails,\\n- 'description': clean_html(media.get('description')) or media.get('shortDescription'),\\n- 'timestamp': int_or_none(media.get('publishDate'), 1000),\\n- 'view_count': int_or_none(media.get('numberOfViews')),\\n- 'comment_count': int_or_none(media.get('numberOfComments')),\\n- 'tags': media.get('tags'),\\n- }\\ndiff --git a/yt_dlp/extractor/playwire.py b/yt_dlp/extractor/playwire.py\\ndeleted file mode 100644\\nindex 2323bd0cf901..000000000000\\n--- a/yt_dlp/extractor/playwire.py\\n+++ /dev/null\\n@@ -1,79 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- dict_get,\\n- float_or_none,\\n-)\\n-\\n-\\n-class PlaywireIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:config|cdn)\\\\.playwire\\\\.com(?:/v2)?/(?P<publisher_id>\\\\d+)/(?:videos/v2|embed|config)/(?P<id>\\\\d+)'\\n- _EMBED_REGEX = [r'<script[^>]+data-config=([\\\"\\\\'])(?P<url>(?:https?:)?//config\\\\.playwire\\\\.com/.+?)\\\\1']\\n-\\n- _TESTS = [{\\n- 'url': 'http://config.playwire.com/14907/videos/v2/3353705/player.json',\\n- 'md5': 'e6398701e3595888125729eaa2329ed9',\\n- 'info_dict': {\\n- 'id': '3353705',\\n- 'ext': 'mp4',\\n- 'title': 'S04_RM_UCL_Rus',\\n- 'thumbnail': r're:^https?://.*\\\\.png$',\\n- 'duration': 145.94,\\n- },\\n- 'skip': 'Invalid URL',\\n- }, {\\n- # m3u8 in f4m\\n- 'url': 'http://config.playwire.com/21772/videos/v2/4840492/zeus.json',\\n- 'info_dict': {\\n- 'id': '4840492',\\n- 'ext': 'mp4',\\n- 'title': 'ITV EL SHOW FULL',\\n- },\\n- 'skip': 'Invalid URL',\\n- }, {\\n- # Multiple resolutions while bitrates missing\\n- 'url': 'http://cdn.playwire.com/11625/embed/85228.html',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://config.playwire.com/12421/videos/v2/3389892/zeus.json',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://cdn.playwire.com/v2/12342/config/1532636.json',\\n- 'only_matching': True,\\n- }]\\n- _WEBPAGE_TESTS = [{\\n- 'url': 'https://www.cinemablend.com/new/First-Joe-Dirt-2-Trailer-Teaser-Stupid-Greatness-70874.html',\\n- 'info_dict': {\\n- 'id': '3519514',\\n- 'ext': 'mp4',\\n- 'title': 'Joe Dirt 2 Beautiful Loser Teaser Trailer',\\n- },\\n- 'skip': 'Site no longer embeds Playwire',\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- publisher_id, video_id = mobj.group('publisher_id'), mobj.group('id')\\n-\\n- player = self._download_json(\\n- f'http://config.playwire.com/{publisher_id}/videos/v2/{video_id}/zeus.json',\\n- video_id)\\n-\\n- title = player['settings']['title']\\n- duration = float_or_none(player.get('duration'), 1000)\\n-\\n- content = player['content']\\n- thumbnail = content.get('poster')\\n- src = content['media']['f4m']\\n-\\n- formats = self._extract_f4m_formats(src, video_id, m3u8_id='hls')\\n- for a_format in formats:\\n- if not dict_get(a_format, ['tbr', 'width', 'height']):\\n- a_format['quality'] = 1 if '-hd.' in a_format['url'] else 0\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'thumbnail': thumbnail,\\n- 'duration': duration,\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/plvideo.py b/yt_dlp/extractor/plvideo.py\\ndeleted file mode 100644\\nindex 27009ca4cd83..000000000000\\n--- a/yt_dlp/extractor/plvideo.py\\n+++ /dev/null\\n@@ -1,130 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- float_or_none,\\n- int_or_none,\\n- parse_iso8601,\\n- parse_resolution,\\n- url_or_none,\\n-)\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class PlVideoIE(InfoExtractor):\\n- IE_DESC = 'ะะปะฐััะพัะผะฐ'\\n- _VALID_URL = r'https?://(?:www\\\\.)?plvideo\\\\.ru/(?:watch\\\\?(?:[^#]+&)?v=|shorts/)(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://plvideo.ru/watch?v=Y5JzUzkcQTMK',\\n- 'md5': 'fe8e18aca892b3b31f3bf492169f8a26',\\n- 'info_dict': {\\n- 'id': 'Y5JzUzkcQTMK',\\n- 'ext': 'mp4',\\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-images/v/cover/37/dd/37dd00a4c96c77436ab737e85947abd7/original663a4a3bb713e5.33151959.jpg',\\n- 'title': 'Presidente de Cuba llega a Moscรบ en una visita de trabajo',\\n- 'channel': 'RT en Espaรฑol',\\n- 'channel_id': 'ZH4EKqunVDvo',\\n- 'media_type': 'video',\\n- 'comment_count': int,\\n- 'tags': ['rusia', 'cuba', 'russia', 'miguel dรญaz-canel'],\\n- 'description': 'md5:a1a395d900d77a86542a91ee0826c115',\\n- 'release_timestamp': 1715096124,\\n- 'channel_is_verified': True,\\n- 'like_count': int,\\n- 'timestamp': 1715095911,\\n- 'duration': 44320,\\n- 'view_count': int,\\n- 'dislike_count': int,\\n- 'upload_date': '20240507',\\n- 'modified_date': '20240701',\\n- 'channel_follower_count': int,\\n- 'modified_timestamp': 1719824073,\\n- },\\n- }, {\\n- 'url': 'https://plvideo.ru/shorts/S3Uo9c-VLwFX',\\n- 'md5': '7d8fa2279406c69d2fd2a6fc548a9805',\\n- 'info_dict': {\\n- 'id': 'S3Uo9c-VLwFX',\\n- 'ext': 'mp4',\\n- 'channel': 'Romaatom',\\n- 'tags': 'count:22',\\n- 'dislike_count': int,\\n- 'upload_date': '20241130',\\n- 'description': 'md5:452e6de219bf2f32bb95806c51c3b364',\\n- 'duration': 58433,\\n- 'modified_date': '20241130',\\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-11-cover/S3Uo9c-VLwFX/f9318999-a941-482b-b700-2102a7049366.jpg',\\n- 'media_type': 'shorts',\\n- 'like_count': int,\\n- 'modified_timestamp': 1732961458,\\n- 'channel_is_verified': True,\\n- 'channel_id': 'erJyyTIbmUd1',\\n- 'timestamp': 1732961355,\\n- 'comment_count': int,\\n- 'title': 'ะะตะปะพััะพะฒ ะพัะผะตะฝะธะป ะฟัะธะบะฐะทั ะพ ะบะฐะดัะพะฒะพะผ ัะตะทะตัะฒะต ะฝะฐ ะณัะฐะถะดะฐะฝัะบะพะน ัะปัะถะฑะต',\\n- 'channel_follower_count': int,\\n- 'view_count': int,\\n- 'release_timestamp': 1732961458,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- video_data = self._download_json(\\n- f'https://api.g1.plvideo.ru/v1/videos/{video_id}?Aud=18', video_id)\\n-\\n- is_live = False\\n- formats = []\\n- subtitles = {}\\n- automatic_captions = {}\\n- for quality, data in traverse_obj(video_data, ('item', 'profiles', {dict.items}, lambda _, v: url_or_none(v[1]['hls']))):\\n- formats.append({\\n- 'format_id': quality,\\n- 'ext': 'mp4',\\n- 'protocol': 'm3u8_native',\\n- **traverse_obj(data, {\\n- 'url': 'hls',\\n- 'fps': ('fps', {float_or_none}),\\n- 'aspect_ratio': ('aspectRatio', {float_or_none}),\\n- }),\\n- **parse_resolution(quality),\\n- })\\n- if livestream_url := traverse_obj(video_data, ('item', 'livestream', 'url', {url_or_none})):\\n- is_live = True\\n- formats.extend(self._extract_m3u8_formats(livestream_url, video_id, 'mp4', live=True))\\n- for lang, url in traverse_obj(video_data, ('item', 'subtitles', {dict.items}, lambda _, v: url_or_none(v[1]))):\\n- if lang.endswith('-auto'):\\n- automatic_captions.setdefault(lang[:-5], []).append({\\n- 'url': url,\\n- })\\n- else:\\n- subtitles.setdefault(lang, []).append({\\n- 'url': url,\\n- })\\n-\\n- return {\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'automatic_captions': automatic_captions,\\n- 'is_live': is_live,\\n- **traverse_obj(video_data, ('item', {\\n- 'id': ('id', {str}),\\n- 'title': ('title', {str}),\\n- 'description': ('description', {str}),\\n- 'thumbnail': ('cover', 'paths', 'original', 'src', {url_or_none}),\\n- 'duration': ('uploadFile', 'videoDuration', {int_or_none}),\\n- 'channel': ('channel', 'name', {str}),\\n- 'channel_id': ('channel', 'id', {str}),\\n- 'channel_follower_count': ('channel', 'stats', 'subscribers', {int_or_none}),\\n- 'channel_is_verified': ('channel', 'verified', {bool}),\\n- 'tags': ('tags', ..., {str}),\\n- 'timestamp': ('createdAt', {parse_iso8601}),\\n- 'release_timestamp': ('publishedAt', {parse_iso8601}),\\n- 'modified_timestamp': ('updatedAt', {parse_iso8601}),\\n- 'view_count': ('stats', 'viewTotalCount', {int_or_none}),\\n- 'like_count': ('stats', 'likeCount', {int_or_none}),\\n- 'dislike_count': ('stats', 'dislikeCount', {int_or_none}),\\n- 'comment_count': ('stats', 'commentCount', {int_or_none}),\\n- 'media_type': ('type', {str}),\\n- })),\\n- }\\ndiff --git a/yt_dlp/extractor/prosiebensat1.py b/yt_dlp/extractor/prosiebensat1.py\\ndeleted file mode 100644\\nindex e8a47120513b..000000000000\\n--- a/yt_dlp/extractor/prosiebensat1.py\\n+++ /dev/null\\n@@ -1,496 +0,0 @@\\n-import hashlib\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- determine_ext,\\n- float_or_none,\\n- int_or_none,\\n- join_nonempty,\\n- merge_dicts,\\n- unified_strdate,\\n-)\\n-\\n-\\n-class ProSiebenSat1BaseIE(InfoExtractor):\\n- _GEO_BYPASS = False\\n- _ACCESS_ID = None\\n- _SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'\\n- _V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'\\n-\\n- def _extract_video_info(self, url, clip_id):\\n- client_location = url\\n-\\n- video = self._download_json(\\n- 'http://vas.sim-technik.de/vas/live/v2/videos',\\n- clip_id, 'Downloading videos JSON', query={\\n- 'access_token': self._TOKEN,\\n- 'client_location': client_location,\\n- 'client_name': self._CLIENT_NAME,\\n- 'ids': clip_id,\\n- })[0]\\n-\\n- if not self.get_param('allow_unplayable_formats') and video.get('is_protected') is True:\\n- self.report_drm(clip_id)\\n-\\n- formats = []\\n- if self._ACCESS_ID:\\n- raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID\\n- protocols = self._download_json(\\n- self._V4_BASE_URL + 'protocols', clip_id,\\n- 'Downloading protocols JSON',\\n- headers=self.geo_verification_headers(), query={\\n- 'access_id': self._ACCESS_ID,\\n- 'client_token': hashlib.sha1((raw_ct).encode()).hexdigest(),\\n- 'video_id': clip_id,\\n- }, fatal=False, expected_status=(403,)) or {}\\n- error = protocols.get('error') or {}\\n- if error.get('title') == 'Geo check failed':\\n- self.raise_geo_restricted(countries=['AT', 'CH', 'DE'])\\n- server_token = protocols.get('server_token')\\n- if server_token:\\n- urls = (self._download_json(\\n- self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={\\n- 'access_id': self._ACCESS_ID,\\n- 'client_token': hashlib.sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),\\n- 'protocols': self._SUPPORTED_PROTOCOLS,\\n- 'server_token': server_token,\\n- 'video_id': clip_id,\\n- }, fatal=False) or {}).get('urls') or {}\\n- for protocol, variant in urls.items():\\n- source_url = variant.get('clear', {}).get('url')\\n- if not source_url:\\n- continue\\n- if protocol == 'dash':\\n- formats.extend(self._extract_mpd_formats(\\n- source_url, clip_id, mpd_id=protocol, fatal=False))\\n- elif protocol == 'hls':\\n- formats.extend(self._extract_m3u8_formats(\\n- source_url, clip_id, 'mp4', 'm3u8_native',\\n- m3u8_id=protocol, fatal=False))\\n- else:\\n- formats.append({\\n- 'url': source_url,\\n- 'format_id': protocol,\\n- })\\n- if not formats:\\n- source_ids = [str(source['id']) for source in video['sources']]\\n-\\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\\n-\\n- sources = self._download_json(\\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources',\\n- clip_id, 'Downloading sources JSON', query={\\n- 'access_token': self._TOKEN,\\n- 'client_id': client_id,\\n- 'client_location': client_location,\\n- 'client_name': self._CLIENT_NAME,\\n- })\\n- server_id = sources['server_id']\\n-\\n- def fix_bitrate(bitrate):\\n- bitrate = int_or_none(bitrate)\\n- if not bitrate:\\n- return None\\n- return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate\\n-\\n- for source_id in source_ids:\\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\\n- urls = self._download_json(\\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources/url',\\n- clip_id, 'Downloading urls JSON', fatal=False, query={\\n- 'access_token': self._TOKEN,\\n- 'client_id': client_id,\\n- 'client_location': client_location,\\n- 'client_name': self._CLIENT_NAME,\\n- 'server_id': server_id,\\n- 'source_ids': source_id,\\n- })\\n- if not urls:\\n- continue\\n- if urls.get('status_code') != 0:\\n- raise ExtractorError('This video is unavailable', expected=True)\\n- urls_sources = urls['sources']\\n- if isinstance(urls_sources, dict):\\n- urls_sources = urls_sources.values()\\n- for source in urls_sources:\\n- source_url = source.get('url')\\n- if not source_url:\\n- continue\\n- protocol = source.get('protocol')\\n- mimetype = source.get('mimetype')\\n- if mimetype == 'application/f4m+xml' or 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m':\\n- formats.extend(self._extract_f4m_formats(\\n- source_url, clip_id, f4m_id='hds', fatal=False))\\n- elif mimetype == 'application/x-mpegURL':\\n- formats.extend(self._extract_m3u8_formats(\\n- source_url, clip_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n- elif mimetype == 'application/dash+xml':\\n- formats.extend(self._extract_mpd_formats(\\n- source_url, clip_id, mpd_id='dash', fatal=False))\\n- else:\\n- tbr = fix_bitrate(source['bitrate'])\\n- if protocol in ('rtmp', 'rtmpe'):\\n- mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source_url)\\n- if not mobj:\\n- continue\\n- path = mobj.group('path')\\n- mp4colon_index = path.rfind('mp4:')\\n- app = path[:mp4colon_index]\\n- play_path = path[mp4colon_index:]\\n- formats.append({\\n- 'url': '{}/{}'.format(mobj.group('url'), app),\\n- 'app': app,\\n- 'play_path': play_path,\\n- 'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',\\n- 'page_url': 'http://www.prosieben.de',\\n- 'tbr': tbr,\\n- 'ext': 'flv',\\n- 'format_id': join_nonempty('rtmp', tbr),\\n- })\\n- else:\\n- formats.append({\\n- 'url': source_url,\\n- 'tbr': tbr,\\n- 'format_id': join_nonempty('http', tbr),\\n- })\\n-\\n- return {\\n- 'duration': float_or_none(video.get('duration')),\\n- 'formats': formats,\\n- }\\n-\\n-\\n-class ProSiebenSat1IE(ProSiebenSat1BaseIE):\\n- IE_NAME = 'prosiebensat1'\\n- IE_DESC = 'ProSiebenSat.1 Digital'\\n- _VALID_URL = r'''(?x)\\n- https?://\\n- (?:www\\\\.)?\\n- (?:\\n- (?:beta\\\\.)?\\n- (?:\\n- prosieben(?:maxx)?|sixx|sat1(?:gold)?|kabeleins(?:doku)?|the-voice-of-germany|advopedia\\n- )\\\\.(?:de|at|ch)|\\n- ran\\\\.de|fem\\\\.com|advopedia\\\\.de|galileo\\\\.tv/video\\n- )\\n- /(?P<id>.+)\\n- '''\\n-\\n- _TESTS = [\\n- {\\n- # Tests changes introduced in https://github.com/ytdl-org/youtube-dl/pull/6242\\n- # in response to fixing https://github.com/ytdl-org/youtube-dl/issues/6215:\\n- # - malformed f4m manifest support\\n- # - proper handling of URLs starting with `https?://` in 2.0 manifests\\n- # - recursive child f4m manifests extraction\\n- 'url': 'http://www.prosieben.de/tv/circus-halligalli/videos/218-staffel-2-episode-18-jahresrueckblick-ganze-folge',\\n- 'info_dict': {\\n- 'id': '2104602',\\n- 'ext': 'mp4',\\n- 'title': 'CIRCUS HALLIGALLI - Episode 18 - Staffel 2',\\n- 'description': 'md5:8733c81b702ea472e069bc48bb658fc1',\\n- 'upload_date': '20131231',\\n- 'duration': 5845.04,\\n- 'series': 'CIRCUS HALLIGALLI',\\n- 'season_number': 2,\\n- 'episode': 'Episode 18 - Staffel 2',\\n- 'episode_number': 18,\\n- },\\n- },\\n- {\\n- 'url': 'http://www.prosieben.de/videokatalog/Gesellschaft/Leben/Trends/video-Lady-Umstyling-f%C3%BCr-Audrina-Rebekka-Audrina-Fergen-billig-aussehen-Battal-Modica-700544.html',\\n- 'info_dict': {\\n- 'id': '2570327',\\n- 'ext': 'mp4',\\n- 'title': 'Lady-Umstyling fรผr Audrina',\\n- 'description': 'md5:4c16d0c17a3461a0d43ea4084e96319d',\\n- 'upload_date': '20131014',\\n- 'duration': 606.76,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'Seems to be broken',\\n- },\\n- {\\n- 'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge',\\n- 'info_dict': {\\n- 'id': '2429369',\\n- 'ext': 'mp4',\\n- 'title': 'Countdown fรผr die Autowerkstatt',\\n- 'description': 'md5:809fc051a457b5d8666013bc40698817',\\n- 'upload_date': '20140223',\\n- 'duration': 2595.04,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- 'url': 'http://www.sixx.de/stars-style/video/sexy-laufen-in-ugg-boots-clip',\\n- 'info_dict': {\\n- 'id': '2904997',\\n- 'ext': 'mp4',\\n- 'title': 'Sexy laufen in Ugg Boots',\\n- 'description': 'md5:edf42b8bd5bc4e5da4db4222c5acb7d6',\\n- 'upload_date': '20140122',\\n- 'duration': 245.32,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- 'url': 'http://www.sat1.de/film/der-ruecktritt/video/im-interview-kai-wiesinger-clip',\\n- 'info_dict': {\\n- 'id': '2906572',\\n- 'ext': 'mp4',\\n- 'title': 'Im Interview: Kai Wiesinger',\\n- 'description': 'md5:e4e5370652ec63b95023e914190b4eb9',\\n- 'upload_date': '20140203',\\n- 'duration': 522.56,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- 'url': 'http://www.kabeleins.de/tv/rosins-restaurants/videos/jagd-auf-fertigkost-im-elsthal-teil-2-ganze-folge',\\n- 'info_dict': {\\n- 'id': '2992323',\\n- 'ext': 'mp4',\\n- 'title': 'Jagd auf Fertigkost im Elsthal - Teil 2',\\n- 'description': 'md5:2669cde3febe9bce13904f701e774eb6',\\n- 'upload_date': '20141014',\\n- 'duration': 2410.44,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- 'url': 'http://www.ran.de/fussball/bundesliga/video/schalke-toennies-moechte-raul-zurueck-ganze-folge',\\n- 'info_dict': {\\n- 'id': '3004256',\\n- 'ext': 'mp4',\\n- 'title': 'Schalke: Tรถnnies mรถchte Raul zurรผck',\\n- 'description': 'md5:4b5b271d9bcde223b54390754c8ece3f',\\n- 'upload_date': '20140226',\\n- 'duration': 228.96,\\n- },\\n- 'params': {\\n- # rtmp download\\n- 'skip_download': True,\\n- },\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- 'url': 'http://www.the-voice-of-germany.de/video/31-andreas-kuemmert-rocket-man-clip',\\n- 'info_dict': {\\n- 'id': '2572814',\\n- 'ext': 'mp4',\\n- 'title': 'The Voice of Germany - Andreas Kรผmmert: Rocket Man',\\n- 'description': 'md5:6ddb02b0781c6adf778afea606652e38',\\n- 'timestamp': 1382041620,\\n- 'upload_date': '20131017',\\n- 'duration': 469.88,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- },\\n- {\\n- 'url': 'http://www.fem.com/videos/beauty-lifestyle/kurztrips-zum-valentinstag',\\n- 'info_dict': {\\n- 'id': '2156342',\\n- 'ext': 'mp4',\\n- 'title': 'Kurztrips zum Valentinstag',\\n- 'description': 'Romantischer Kurztrip zum Valentinstag? Nina Heinemann verrรคt, was sich hier wirklich lohnt.',\\n- 'duration': 307.24,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- },\\n- {\\n- 'url': 'http://www.prosieben.de/tv/joko-gegen-klaas/videos/playlists/episode-8-ganze-folge-playlist',\\n- 'info_dict': {\\n- 'id': '439664',\\n- 'title': 'Episode 8 - Ganze Folge - Playlist',\\n- 'description': 'md5:63b8963e71f481782aeea877658dec84',\\n- },\\n- 'playlist_count': 2,\\n- 'skip': 'This video is unavailable',\\n- },\\n- {\\n- # title in <h2 class=\\\"subtitle\\\">\\n- 'url': 'http://www.prosieben.de/stars/oscar-award/videos/jetzt-erst-enthuellt-das-geheimnis-von-emma-stones-oscar-robe-clip',\\n- 'info_dict': {\\n- 'id': '4895826',\\n- 'ext': 'mp4',\\n- 'title': 'Jetzt erst enthรผllt: Das Geheimnis von Emma Stones Oscar-Robe',\\n- 'description': 'md5:e5ace2bc43fadf7b63adc6187e9450b9',\\n- 'upload_date': '20170302',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'geo restricted to Germany',\\n- },\\n- {\\n- # geo restricted to Germany\\n- 'url': 'http://www.kabeleinsdoku.de/tv/mayday-alarm-im-cockpit/video/102-notlandung-im-hudson-river-ganze-folge',\\n- 'only_matching': True,\\n- },\\n- {\\n- # geo restricted to Germany\\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/video/11-staffel-1-episode-1-partner-wider-willen-ganze-folge',\\n- 'only_matching': True,\\n- },\\n- {\\n- # geo restricted to Germany\\n- 'url': 'https://www.galileo.tv/video/diese-emojis-werden-oft-missverstanden',\\n- 'only_matching': True,\\n- },\\n- {\\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',\\n- 'only_matching': True,\\n- },\\n- {\\n- 'url': 'http://www.advopedia.de/videos/lenssen-klaert-auf/lenssen-klaert-auf-folge-8-staffel-3-feiertage-und-freie-tage',\\n- 'only_matching': True,\\n- },\\n- ]\\n-\\n- _TOKEN = 'prosieben'\\n- _SALT = '01!8d8F_)r9]4s[qeuXfP%'\\n- _CLIENT_NAME = 'kolibri-2.0.19-splec4'\\n-\\n- _ACCESS_ID = 'x_prosiebenmaxx-de'\\n- _ENCRYPTION_KEY = 'Eeyeey9oquahthainoofashoyoikosag'\\n- _IV = 'Aeluchoc6aevechuipiexeeboowedaok'\\n-\\n- _CLIPID_REGEXES = [\\n- r'\\\"clip_id\\\"\\\\s*:\\\\s+\\\"(\\\\d+)\\\"',\\n- r'clipid: \\\"(\\\\d+)\\\"',\\n- r'clip[iI]d=(\\\\d+)',\\n- r'clip[iI][dD]\\\\s*=\\\\s*[\\\"\\\\'](\\\\d+)',\\n- r\\\"'itemImageUrl'\\\\s*:\\\\s*'/dynamic/thumbnails/full/\\\\d+/(\\\\d+)\\\",\\n- r'proMamsId"\\\\s*:\\\\s*"(\\\\d+)',\\n- r'proMamsId\\\"\\\\s*:\\\\s*\\\"(\\\\d+)',\\n- ]\\n- _TITLE_REGEXES = [\\n- r'<h2 class=\\\"subtitle\\\" itemprop=\\\"name\\\">\\\\s*(.+?)</h2>',\\n- r'<header class=\\\"clearfix\\\">\\\\s*<h3>(.+?)</h3>',\\n- r'<!-- start video -->\\\\s*<h1>(.+?)</h1>',\\n- r'<h1 class=\\\"att-name\\\">\\\\s*(.+?)</h1>',\\n- r'<header class=\\\"module_header\\\">\\\\s*<h2>([^<]+)</h2>\\\\s*</header>',\\n- r'<h2 class=\\\"video-title\\\" itemprop=\\\"name\\\">\\\\s*(.+?)</h2>',\\n- r'<div[^>]+id=\\\"veeseoTitle\\\"[^>]*>(.+?)</div>',\\n- r'<h2[^>]+class=\\\"subtitle\\\"[^>]*>([^<]+)</h2>',\\n- ]\\n- _DESCRIPTION_REGEXES = [\\n- r'<p itemprop=\\\"description\\\">\\\\s*(.+?)</p>',\\n- r'<div class=\\\"videoDecription\\\">\\\\s*<p><strong>Beschreibung</strong>: (.+?)</p>',\\n- r'<div class=\\\"g-plusone\\\" data-size=\\\"medium\\\"></div>\\\\s*</div>\\\\s*</header>\\\\s*(.+?)\\\\s*<footer>',\\n- r'<p class=\\\"att-description\\\">\\\\s*(.+?)\\\\s*</p>',\\n- r'<p class=\\\"video-description\\\" itemprop=\\\"description\\\">\\\\s*(.+?)</p>',\\n- r'<div[^>]+id=\\\"veeseoDescription\\\"[^>]*>(.+?)</div>',\\n- ]\\n- _UPLOAD_DATE_REGEXES = [\\n- r'<span>\\\\s*(\\\\d{2}\\\\.\\\\d{2}\\\\.\\\\d{4} \\\\d{2}:\\\\d{2}) \\\\|\\\\s*<span itemprop=\\\"duration\\\"',\\n- r'<footer>\\\\s*(\\\\d{2}\\\\.\\\\d{2}\\\\.\\\\d{4}) \\\\d{2}:\\\\d{2} Uhr',\\n- r'<span style=\\\"padding-left: 4px;line-height:20px; color:#404040\\\">(\\\\d{2}\\\\.\\\\d{2}\\\\.\\\\d{4})</span>',\\n- r'(\\\\d{2}\\\\.\\\\d{2}\\\\.\\\\d{4}) \\\\| \\\\d{2}:\\\\d{2} Min<br/>',\\n- ]\\n- _PAGE_TYPE_REGEXES = [\\n- r'<meta name=\\\"page_type\\\" content=\\\"([^\\\"]+)\\\">',\\n- r\\\"'itemType'\\\\s*:\\\\s*'([^']*)'\\\",\\n- ]\\n- _PLAYLIST_ID_REGEXES = [\\n- r'content[iI]d=(\\\\d+)',\\n- r\\\"'itemId'\\\\s*:\\\\s*'([^']*)'\\\",\\n- ]\\n- _PLAYLIST_CLIP_REGEXES = [\\n- r'(?s)data-qvt=.+?<a href=\\\"([^\\\"]+)\\\"',\\n- ]\\n-\\n- def _extract_clip(self, url, webpage):\\n- clip_id = self._html_search_regex(\\n- self._CLIPID_REGEXES, webpage, 'clip id')\\n- title = self._html_search_regex(\\n- self._TITLE_REGEXES, webpage, 'title',\\n- default=None) or self._og_search_title(webpage)\\n- info = self._extract_video_info(url, clip_id)\\n- description = self._html_search_regex(\\n- self._DESCRIPTION_REGEXES, webpage, 'description', default=None)\\n- if description is None:\\n- description = self._og_search_description(webpage)\\n- thumbnail = self._og_search_thumbnail(webpage)\\n- upload_date = unified_strdate(\\n- self._html_search_meta('og:published_time', webpage,\\n- 'upload date', default=None)\\n- or self._html_search_regex(self._UPLOAD_DATE_REGEXES,\\n- webpage, 'upload date', default=None))\\n-\\n- json_ld = self._search_json_ld(webpage, clip_id, default={})\\n-\\n- return merge_dicts(info, {\\n- 'id': clip_id,\\n- 'title': title,\\n- 'description': description,\\n- 'thumbnail': thumbnail,\\n- 'upload_date': upload_date,\\n- }, json_ld)\\n-\\n- def _extract_playlist(self, url, webpage):\\n- playlist_id = self._html_search_regex(\\n- self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')\\n- playlist = self._parse_json(\\n- self._search_regex(\\n- r'var\\\\s+contentResources\\\\s*=\\\\s*(\\\\[.+?\\\\]);\\\\s*</script',\\n- webpage, 'playlist'),\\n- playlist_id)\\n- entries = []\\n- for item in playlist:\\n- clip_id = item.get('id') or item.get('upc')\\n- if not clip_id:\\n- continue\\n- info = self._extract_video_info(url, clip_id)\\n- info.update({\\n- 'id': clip_id,\\n- 'title': item.get('title') or item.get('teaser', {}).get('headline'),\\n- 'description': item.get('teaser', {}).get('description'),\\n- 'thumbnail': item.get('poster'),\\n- 'duration': float_or_none(item.get('duration')),\\n- 'series': item.get('tvShowTitle'),\\n- 'uploader': item.get('broadcastPublisher'),\\n- })\\n- entries.append(info)\\n- return self.playlist_result(entries, playlist_id)\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n- page_type = self._search_regex(\\n- self._PAGE_TYPE_REGEXES, webpage,\\n- 'page type', default='clip').lower()\\n- if page_type == 'clip':\\n- return self._extract_clip(url, webpage)\\n- elif page_type == 'playlist':\\n- return self._extract_playlist(url, webpage)\\n- else:\\n- raise ExtractorError(\\n- f'Unsupported page type {page_type}', expected=True)\\ndiff --git a/yt_dlp/extractor/puls4.py b/yt_dlp/extractor/puls4.py\\ndeleted file mode 100644\\nindex b43f0352b9fd..000000000000\\n--- a/yt_dlp/extractor/puls4.py\\n+++ /dev/null\\n@@ -1,50 +0,0 @@\\n-from .prosiebensat1 import ProSiebenSat1BaseIE\\n-from ..utils import parse_duration, unified_strdate\\n-\\n-\\n-class Puls4IE(ProSiebenSat1BaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?puls4\\\\.com/(?P<id>[^?#&]+)'\\n- _TESTS = [{\\n- 'url': 'http://www.puls4.com/2-minuten-2-millionen/staffel-3/videos/2min2miotalk/Tobias-Homberger-von-myclubs-im-2min2miotalk-118118',\\n- 'md5': 'fd3c6b0903ac72c9d004f04bc6bb3e03',\\n- 'info_dict': {\\n- 'id': '118118',\\n- 'ext': 'flv',\\n- 'title': 'Tobias Homberger von myclubs im #2min2miotalk',\\n- 'description': 'md5:f9def7c5e8745d6026d8885487d91955',\\n- 'upload_date': '20160830',\\n- 'uploader': 'PULS_4',\\n- },\\n- }, {\\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident.-Norbert-Hofer',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident-Analyse-des-Interviews-mit-Norbert-Hofer-416598',\\n- 'only_matching': True,\\n- }]\\n- _TOKEN = 'puls4'\\n- _SALT = '01!kaNgaiNgah1Ie4AeSha'\\n- _CLIENT_NAME = ''\\n-\\n- def _real_extract(self, url):\\n- path = self._match_id(url)\\n- content_path = self._download_json(\\n- 'http://www.puls4.com/api/json-fe/page/' + path, path)['content'][0]['url']\\n- media = self._download_json(\\n- 'http://www.puls4.com' + content_path,\\n- content_path)['mediaCurrent']\\n- player_content = media['playerContent']\\n- info = self._extract_video_info(url, player_content['id'])\\n- info.update({\\n- 'id': str(media['objectId']),\\n- 'title': player_content['title'],\\n- 'description': media.get('description'),\\n- 'thumbnail': media.get('previewLink'),\\n- 'upload_date': unified_strdate(media.get('date')),\\n- 'duration': parse_duration(player_content.get('duration')),\\n- 'episode': player_content.get('episodePartName'),\\n- 'show': media.get('channel'),\\n- 'season_id': player_content.get('seasonId'),\\n- 'uploader': player_content.get('sourceCompany'),\\n- })\\n- return info\\ndiff --git a/yt_dlp/extractor/radiocomercial.py b/yt_dlp/extractor/radiocomercial.py\\ndeleted file mode 100644\\nindex 7e4609a62d37..000000000000\\n--- a/yt_dlp/extractor/radiocomercial.py\\n+++ /dev/null\\n@@ -1,154 +0,0 @@\\n-import itertools\\n-\\n-from .common import InfoExtractor\\n-from ..networking.exceptions import HTTPError\\n-from ..utils import (\\n- ExtractorError,\\n- extract_attributes,\\n- get_element_by_class,\\n- get_element_html_by_class,\\n- get_element_text_and_html_by_tag,\\n- get_elements_html_by_class,\\n- int_or_none,\\n- join_nonempty,\\n- try_call,\\n- unified_strdate,\\n- update_url,\\n- urljoin,\\n-)\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class RadioComercialIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?radiocomercial\\\\.pt/podcasts/[^/?#]+/t?(?P<season>\\\\d+)/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao/t6/taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas#page-content-wrapper',\\n- 'md5': '5f4fe8e485b29d2e8fd495605bc2c7e4',\\n- 'info_dict': {\\n- 'id': 'taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas',\\n- 'ext': 'mp3',\\n- 'title': 'Taylor Swift entranhando-se que nem uma espada no ventre dos fรฃs.',\\n- 'release_date': '20231025',\\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\\n- 'season': 'Season 6',\\n- 'season_number': 6,\\n- },\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3/convenca-me-num-minuto-que-os-lobisomens-existem',\\n- 'md5': '47e96c273aef96a8eb160cd6cf46d782',\\n- 'info_dict': {\\n- 'id': 'convenca-me-num-minuto-que-os-lobisomens-existem',\\n- 'ext': 'mp3',\\n- 'title': 'Convenรงa-me num minuto que os lobisomens existem',\\n- 'release_date': '20231026',\\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\\n- 'season': 'Season 3',\\n- 'season_number': 3,\\n- },\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/inacreditavel-by-ines-castel-branco/t2/o-desastre-de-aviao',\\n- 'md5': '69be64255420fec23b7259955d771e54',\\n- 'info_dict': {\\n- 'id': 'o-desastre-de-aviao',\\n- 'ext': 'mp3',\\n- 'title': 'O desastre de aviรฃo',\\n- 'description': 'md5:8a82beeb372641614772baab7246245f',\\n- 'release_date': '20231101',\\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\\n- 'season': 'Season 2',\\n- 'season_number': 2,\\n- },\\n- 'params': {\\n- # inconsistant md5\\n- 'skip_download': True,\\n- },\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/2023/t-n-t-29-de-outubro',\\n- 'md5': '91d32d4d4b1407272068b102730fc9fa',\\n- 'info_dict': {\\n- 'id': 't-n-t-29-de-outubro',\\n- 'ext': 'mp3',\\n- 'title': 'T.N.T 29 de outubro',\\n- 'release_date': '20231029',\\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\\n- 'season': 'Season 2023',\\n- 'season_number': 2023,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id, season = self._match_valid_url(url).group('id', 'season')\\n- webpage = self._download_webpage(url, video_id)\\n- return {\\n- 'id': video_id,\\n- 'title': self._html_extract_title(webpage),\\n- 'description': self._og_search_description(webpage, default=None),\\n- 'release_date': unified_strdate(get_element_by_class(\\n- 'date', get_element_html_by_class('descriptions', webpage) or '')),\\n- 'thumbnail': self._og_search_thumbnail(webpage),\\n- 'season_number': int_or_none(season),\\n- 'url': extract_attributes(get_element_html_by_class('audiofile', webpage) or '').get('href'),\\n- }\\n-\\n-\\n-class RadioComercialPlaylistIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?radiocomercial\\\\.pt/podcasts/(?P<id>[\\\\w-]+)(?:/t?(?P<season>\\\\d+))?/?(?:$|[?#])'\\n- _TESTS = [{\\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3',\\n- 'info_dict': {\\n- 'id': 'convenca-me-num-minuto_t3',\\n- 'title': 'Convenรงa-me num Minuto - Temporada 3',\\n- },\\n- 'playlist_mincount': 32,\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao',\\n- 'info_dict': {\\n- 'id': 'o-homem-que-mordeu-o-cao',\\n- 'title': 'O Homem Que Mordeu o Cรฃo',\\n- },\\n- 'playlist_mincount': 19,\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/as-minhas-coisas-favoritas',\\n- 'info_dict': {\\n- 'id': 'as-minhas-coisas-favoritas',\\n- 'title': 'As Minhas Coisas Favoritas',\\n- },\\n- 'playlist_mincount': 131,\\n- }, {\\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/t2023',\\n- 'info_dict': {\\n- 'id': 'tnt-todos-no-top_t2023',\\n- 'title': 'TNT - Todos No Top - Temporada 2023',\\n- },\\n- 'playlist_mincount': 39,\\n- }]\\n-\\n- def _entries(self, url, playlist_id):\\n- for page in itertools.count(1):\\n- try:\\n- webpage = self._download_webpage(\\n- f'{url}/{page}', playlist_id, f'Downloading page {page}')\\n- except ExtractorError as e:\\n- if isinstance(e.cause, HTTPError) and e.cause.status == 404:\\n- break\\n- raise\\n-\\n- episodes = get_elements_html_by_class('tm-ouvir-podcast', webpage)\\n- if not episodes:\\n- break\\n- for url_path in traverse_obj(episodes, (..., {extract_attributes}, 'href')):\\n- episode_url = urljoin(url, url_path)\\n- if RadioComercialIE.suitable(episode_url):\\n- yield episode_url\\n-\\n- def _real_extract(self, url):\\n- podcast, season = self._match_valid_url(url).group('id', 'season')\\n- playlist_id = join_nonempty(podcast, season, delim='_t')\\n- url = update_url(url, query=None, fragment=None)\\n- webpage = self._download_webpage(url, playlist_id)\\n-\\n- name = try_call(lambda: get_element_text_and_html_by_tag('h1', webpage)[0])\\n- title = name if name == season else join_nonempty(name, season, delim=' - Temporada ')\\n-\\n- return self.playlist_from_matches(\\n- self._entries(url, playlist_id), playlist_id, title, ie=RadioComercialIE)\\ndiff --git a/yt_dlp/extractor/redge.py b/yt_dlp/extractor/redge.py\\ndeleted file mode 100644\\nindex 5ae09a096bd1..000000000000\\n--- a/yt_dlp/extractor/redge.py\\n+++ /dev/null\\n@@ -1,134 +0,0 @@\\n-\\n-from .common import InfoExtractor\\n-from ..networking import HEADRequest\\n-from ..utils import (\\n- float_or_none,\\n- int_or_none,\\n- join_nonempty,\\n- parse_qs,\\n- update_url_query,\\n-)\\n-from ..utils.traversal import traverse_obj\\n-\\n-\\n-class RedCDNLivxIE(InfoExtractor):\\n- _VALID_URL = r'https?://[^.]+\\\\.(?:dcs\\\\.redcdn|atmcdn)\\\\.pl/(?:live(?:dash|hls|ss)|nvr)/o2/(?P<tenant>[^/?#]+)/(?P<id>[^?#]+)\\\\.livx'\\n- IE_NAME = 'redcdnlivx'\\n-\\n- _TESTS = [{\\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/senat/ENC02/channel.livx?indexMode=true&startTime=638272860000&stopTime=638292544000',\\n- 'info_dict': {\\n- 'id': 'ENC02-638272860000-638292544000',\\n- 'ext': 'mp4',\\n- 'title': 'ENC02',\\n- 'duration': 19683.982,\\n- 'live_status': 'was_live',\\n- },\\n- }, {\\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/sejm/ENC18/live.livx?indexMode=true&startTime=722333096000&stopTime=722335562000',\\n- 'info_dict': {\\n- 'id': 'ENC18-722333096000-722335562000',\\n- 'ext': 'mp4',\\n- 'title': 'ENC18',\\n- 'duration': 2463.995,\\n- 'live_status': 'was_live',\\n- },\\n- }, {\\n- 'url': 'https://r.dcs.redcdn.pl/livehls/o2/sportevolution/live/triathlon2018/warsaw.livx/playlist.m3u8?startTime=550305000000&stopTime=550327620000',\\n- 'info_dict': {\\n- 'id': 'triathlon2018-warsaw-550305000000-550327620000',\\n- 'ext': 'mp4',\\n- 'title': 'triathlon2018/warsaw',\\n- 'duration': 22619.98,\\n- 'live_status': 'was_live',\\n- },\\n- }, {\\n- 'url': 'https://n-25-12.dcs.redcdn.pl/nvr/o2/sejm/Migacz-ENC01/1.livx?startTime=722347200000&stopTime=722367345000',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://redir.atmcdn.pl/nvr/o2/sejm/ENC08/1.livx?startTime=503831270000&stopTime=503840040000',\\n- 'only_matching': True,\\n- }]\\n-\\n- '''\\n- Known methods (first in url path):\\n- - `livedash` - DASH MPD\\n- - `livehls` - HTTP Live Streaming\\n- - `livess` - IIS Smooth Streaming\\n- - `nvr` - CCTV mode, directly returns a file, typically flv, avc1, aac\\n- - `sc` - shoutcast/icecast (audio streams, like radio)\\n- '''\\n-\\n- def _real_extract(self, url):\\n- tenant, path = self._match_valid_url(url).group('tenant', 'id')\\n- qs = parse_qs(url)\\n- start_time = traverse_obj(qs, ('startTime', 0, {int_or_none}))\\n- stop_time = traverse_obj(qs, ('stopTime', 0, {int_or_none}))\\n-\\n- def livx_mode(mode):\\n- suffix = ''\\n- if mode == 'livess':\\n- suffix = '/manifest'\\n- elif mode == 'livehls':\\n- suffix = '/playlist.m3u8'\\n- file_qs = {}\\n- if start_time:\\n- file_qs['startTime'] = start_time\\n- if stop_time:\\n- file_qs['stopTime'] = stop_time\\n- if mode == 'nvr':\\n- file_qs['nolimit'] = 1\\n- elif mode != 'sc':\\n- file_qs['indexMode'] = 'true'\\n- return update_url_query(f'https://r.dcs.redcdn.pl/{mode}/o2/{tenant}/{path}.livx{suffix}', file_qs)\\n-\\n- # no id or title for a transmission. making ones up.\\n- title = path \\\\\\n- .replace('/live', '').replace('live/', '') \\\\\\n- .replace('/channel', '').replace('channel/', '') \\\\\\n- .strip('/')\\n- video_id = join_nonempty(title.replace('/', '-'), start_time, stop_time)\\n-\\n- formats = []\\n- # downloading the manifest separately here instead of _extract_ism_formats to also get some stream metadata\\n- ism_res = self._download_xml_handle(\\n- livx_mode('livess'), video_id,\\n- note='Downloading ISM manifest',\\n- errnote='Failed to download ISM manifest',\\n- fatal=False)\\n- ism_doc = None\\n- if ism_res is not False:\\n- ism_doc, ism_urlh = ism_res\\n- formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss')\\n-\\n- nvr_urlh = self._request_webpage(\\n- HEADRequest(livx_mode('nvr')), video_id, 'Follow flv file redirect', fatal=False,\\n- expected_status=lambda _: True)\\n- if nvr_urlh and nvr_urlh.status == 200:\\n- formats.append({\\n- 'url': nvr_urlh.url,\\n- 'ext': 'flv',\\n- 'format_id': 'direct-0',\\n- 'preference': -1, # might be slow\\n- })\\n- formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False))\\n- formats.extend(self._extract_m3u8_formats(\\n- livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False))\\n-\\n- time_scale = traverse_obj(ism_doc, ('@TimeScale', {int_or_none})) or 10000000\\n- duration = traverse_obj(\\n- ism_doc, ('@Duration', {float_or_none(scale=time_scale)})) or None\\n-\\n- live_status = None\\n- if traverse_obj(ism_doc, '@IsLive') == 'TRUE':\\n- live_status = 'is_live'\\n- elif duration:\\n- live_status = 'was_live'\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'duration': duration,\\n- 'live_status': live_status,\\n- }\\ndiff --git a/yt_dlp/extractor/rheinmaintv.py b/yt_dlp/extractor/rheinmaintv.py\\ndeleted file mode 100644\\nindex c3b352dedea8..000000000000\\n--- a/yt_dlp/extractor/rheinmaintv.py\\n+++ /dev/null\\n@@ -1,94 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import extract_attributes, merge_dicts, remove_end\\n-\\n-\\n-class RheinMainTVIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?rheinmaintv\\\\.de/sendungen/(?:[\\\\w-]+/)*(?P<video_id>(?P<display_id>[\\\\w-]+)/vom-\\\\d{2}\\\\.\\\\d{2}\\\\.\\\\d{4}(?:/\\\\d+)?)'\\n- _TESTS = [{\\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/auf-dem-weg-zur-deutschen-meisterschaft/vom-07.11.2022/',\\n- 'info_dict': {\\n- 'id': 'auf-dem-weg-zur-deutschen-meisterschaft-vom-07.11.2022',\\n- 'ext': 'ismv', # ismv+isma will be merged into mp4\\n- 'alt_title': 'Auf dem Weg zur Deutschen Meisterschaft',\\n- 'title': 'Auf dem Weg zur Deutschen Meisterschaft',\\n- 'upload_date': '20221108',\\n- 'view_count': int,\\n- 'display_id': 'auf-dem-weg-zur-deutschen-meisterschaft',\\n- 'thumbnail': r're:^https://.+\\\\.jpg',\\n- 'description': 'md5:48c59b74192bc819a9b34af1d5ed1eb9',\\n- 'timestamp': 1667933057,\\n- 'duration': 243.0,\\n- },\\n- 'params': {'skip_download': 'ism'},\\n- }, {\\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\\n- 'info_dict': {\\n- 'id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften-vom-14.11.2022',\\n- 'ext': 'ismv',\\n- 'title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\\n- 'timestamp': 1668526214,\\n- 'display_id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften',\\n- 'alt_title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\\n- 'view_count': int,\\n- 'thumbnail': r're:^https://.+\\\\.jpg',\\n- 'duration': 345.0,\\n- 'description': 'md5:9370ba29526984006c2cba1372e5c5a0',\\n- 'upload_date': '20221115',\\n- },\\n- 'params': {'skip_download': 'ism'},\\n- }, {\\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/casino-mainz-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\\n- 'info_dict': {\\n- 'id': 'casino-mainz-bei-den-deutschen-meisterschaften-vom-14.11.2022',\\n- 'ext': 'ismv',\\n- 'title': 'Casino Mainz bei den Deutschen Meisterschaften',\\n- 'view_count': int,\\n- 'timestamp': 1668527402,\\n- 'alt_title': 'Casino Mainz bei den Deutschen Meisterschaften',\\n- 'upload_date': '20221115',\\n- 'display_id': 'casino-mainz-bei-den-deutschen-meisterschaften',\\n- 'duration': 348.0,\\n- 'thumbnail': r're:^https://.+\\\\.jpg',\\n- 'description': 'md5:70fc1660eeba96da17199e5bdff4c0aa',\\n- },\\n- 'params': {'skip_download': 'ism'},\\n- }, {\\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/bricks4kids/vom-22.06.2022/',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- display_id = mobj.group('display_id')\\n- video_id = mobj.group('video_id').replace('/', '-')\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- source, img = self._search_regex(r'(?s)(?P<source><source[^>]*>)(?P<img><img[^>]*>)',\\n- webpage, 'video', group=('source', 'img'))\\n- source = extract_attributes(source)\\n- img = extract_attributes(img)\\n-\\n- raw_json_ld = list(self._yield_json_ld(webpage, video_id))\\n- json_ld = self._json_ld(raw_json_ld, video_id)\\n- json_ld.pop('url', None)\\n-\\n- ism_manifest_url = (\\n- source.get('src')\\n- or next(json_ld.get('embedUrl') for json_ld in raw_json_ld if json_ld.get('@type') == 'VideoObject')\\n- )\\n- formats, subtitles = self._extract_ism_formats_and_subtitles(ism_manifest_url, video_id)\\n-\\n- return merge_dicts({\\n- 'id': video_id,\\n- 'display_id': display_id,\\n- 'title':\\n- self._html_search_regex(r'<h1><span class=\\\"title\\\">([^<]*)</span>',\\n- webpage, 'headline', default=None)\\n- or img.get('title') or json_ld.get('title') or self._og_search_title(webpage)\\n- or remove_end(self._html_extract_title(webpage), ' -'),\\n- 'alt_title': img.get('alt'),\\n- 'description': json_ld.get('description') or self._og_search_description(webpage),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'thumbnails': [{'url': img['src']}] if 'src' in img else json_ld.get('thumbnails'),\\n- }, json_ld)\\ndiff --git a/yt_dlp/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py\\ndeleted file mode 100644\\nindex e7b1e22978f9..000000000000\\n--- a/yt_dlp/extractor/rmcdecouverte.py\\n+++ /dev/null\\n@@ -1,69 +0,0 @@\\n-import urllib.parse\\n-\\n-from .brightcove import BrightcoveLegacyIE\\n-from .common import InfoExtractor\\n-from ..utils import smuggle_url\\n-\\n-\\n-class RMCDecouverteIE(InfoExtractor):\\n- _VALID_URL = r'https?://rmcdecouverte\\\\.bfmtv\\\\.com/(?:[^?#]*_(?P<id>\\\\d+)|mediaplayer-direct)/?(?:[#?]|$)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://rmcdecouverte.bfmtv.com/vestiges-de-guerre_22240/les-bunkers-secrets-domaha-beach_25303/',\\n- 'info_dict': {\\n- 'id': '6250879771001',\\n- 'ext': 'mp4',\\n- 'title': 'LES BUNKERS SECRETS DยดOMAHA BEACH',\\n- 'uploader_id': '1969646226001',\\n- 'description': 'md5:aed573ca24abde62a148e0eba909657d',\\n- 'timestamp': 1619622984,\\n- 'upload_date': '20210428',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- 'url': 'https://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/',\\n- 'info_dict': {\\n- 'id': '5983675500001',\\n- 'ext': 'mp4',\\n- 'title': 'CORVETTE',\\n- 'description': 'md5:c1e8295521e45ffebf635d6a7658f506',\\n- 'uploader_id': '1969646226001',\\n- 'upload_date': '20181226',\\n- 'timestamp': 1545861635,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'only available for a week',\\n- }, {\\n- 'url': 'https://rmcdecouverte.bfmtv.com/avions-furtifs-la-technologie-de-lextreme_10598',\\n- 'only_matching': True,\\n- }, {\\n- # The website accepts any URL as long as it has _\\\\d+ at the end\\n- 'url': 'https://rmcdecouverte.bfmtv.com/any/thing/can/go/here/_10598',\\n- 'only_matching': True,\\n- }, {\\n- # live, geo restricted, bypassable\\n- 'url': 'https://rmcdecouverte.bfmtv.com/mediaplayer-direct/',\\n- 'only_matching': True,\\n- }]\\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- display_id = mobj.group('id') or 'direct'\\n- webpage = self._download_webpage(url, display_id)\\n- brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)\\n- if brightcove_legacy_url:\\n- brightcove_id = urllib.parse.parse_qs(urllib.parse.urlparse(\\n- brightcove_legacy_url).query)['@videoPlayer'][0]\\n- else:\\n- brightcove_id = self._search_regex(\\n- r'data-video-id=[\\\"\\\\'](\\\\d+)', webpage, 'brightcove id')\\n- return self.url_result(\\n- smuggle_url(\\n- self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,\\n- {'geo_countries': ['FR']}),\\n- 'BrightcoveNew', brightcove_id)\\ndiff --git a/yt_dlp/extractor/sejmpl.py b/yt_dlp/extractor/sejmpl.py\\nindex eb433d2ac321..6f3b79622cf4 100644\\n--- a/yt_dlp/extractor/sejmpl.py\\n+++ b/yt_dlp/extractor/sejmpl.py\\n@@ -1,7 +1,6 @@\\n import datetime as dt\\n \\n from .common import InfoExtractor\\n-from .redge import RedCDNLivxIE\\n from ..utils import (\\n clean_html,\\n join_nonempty,\\n@@ -27,6 +26,7 @@ def rfc3339_to_atende(date):\\n \\n \\n class SejmIE(InfoExtractor):\\n+ _WORKING = False\\n _VALID_URL = (\\n r'https?://(?:www\\\\.)?sejm\\\\.gov\\\\.pl/[Ss]ejm(?P<term>\\\\d+)\\\\.nsf/transmisje(?:_arch)?\\\\.xsp(?:\\\\?[^#]*)?#(?P<id>[\\\\dA-F]+)',\\n r'https?://(?:www\\\\.)?sejm\\\\.gov\\\\.pl/[Ss]ejm(?P<term>\\\\d+)\\\\.nsf/transmisje(?:_arch)?\\\\.xsp\\\\?(?:[^#]+&)?unid=(?P<id>[\\\\dA-F]+)',\\n@@ -185,7 +185,7 @@ def add_entry(file, legacy_file=False):\\n entries.append({\\n **common_info,\\n '_type': 'url_transparent',\\n- 'ie_key': RedCDNLivxIE.ie_key(),\\n+ 'ie_key': 'redcdnlivx',\\n 'id': stream_id,\\n 'title': join_nonempty(title, stream_id, delim=' - '),\\n })\\ndiff --git a/yt_dlp/extractor/sendtonews.py b/yt_dlp/extractor/sendtonews.py\\ndeleted file mode 100644\\nindex ecf4b27d7a76..000000000000\\n--- a/yt_dlp/extractor/sendtonews.py\\n+++ /dev/null\\n@@ -1,105 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- determine_protocol,\\n- float_or_none,\\n- int_or_none,\\n- parse_iso8601,\\n- unescapeHTML,\\n- update_url_query,\\n-)\\n-\\n-\\n-class SendtoNewsIE(InfoExtractor):\\n- _WORKING = False\\n- _VALID_URL = r'https?://embed\\\\.sendtonews\\\\.com/player2/embedplayer\\\\.php\\\\?.*\\\\bSC=(?P<id>[0-9A-Za-z-]+)'\\n-\\n- _TEST = {\\n- # From http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/\\n- 'url': 'http://embed.sendtonews.com/player2/embedplayer.php?SC=GxfCe0Zo7D-175909-5588&type=single&autoplay=on&sound=YES',\\n- 'info_dict': {\\n- 'id': 'GxfCe0Zo7D-175909-5588',\\n- },\\n- 'playlist_count': 8,\\n- # test the first video only to prevent lengthy tests\\n- 'playlist': [{\\n- 'info_dict': {\\n- 'id': '240385',\\n- 'ext': 'mp4',\\n- 'title': 'Indians introduce Encarnacion',\\n- 'description': 'Indians president of baseball operations Chris Antonetti and Edwin Encarnacion discuss the slugger\\\\'s three-year contract with Cleveland',\\n- 'duration': 137.898,\\n- 'thumbnail': r're:https?://.*\\\\.jpg$',\\n- 'upload_date': '20170105',\\n- 'timestamp': 1483649762,\\n- },\\n- }],\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }\\n-\\n- _URL_TEMPLATE = '//embed.sendtonews.com/player2/embedplayer.php?SC=%s'\\n-\\n- @classmethod\\n- def _extract_embed_urls(cls, url, webpage):\\n- mobj = re.search(r'''(?x)<script[^>]+src=([\\\\'\\\"])\\n- (?:https?:)?//embed\\\\.sendtonews\\\\.com/player/responsiveembed\\\\.php\\\\?\\n- .*\\\\bSC=(?P<SC>[0-9a-zA-Z-]+).*\\n- \\\\1>''', webpage)\\n- if mobj:\\n- sc = mobj.group('SC')\\n- yield cls._URL_TEMPLATE % sc\\n-\\n- def _real_extract(self, url):\\n- playlist_id = self._match_id(url)\\n-\\n- data_url = update_url_query(\\n- url.replace('embedplayer.php', 'data_read.php'),\\n- {'cmd': 'loadInitial'})\\n- playlist_data = self._download_json(data_url, playlist_id)\\n-\\n- entries = []\\n- for video in playlist_data['playlistData'][0]:\\n- info_dict = self._parse_jwplayer_data(\\n- video['jwconfiguration'],\\n- require_title=False, m3u8_id='hls', rtmp_params={'no_resume': True})\\n-\\n- for f in info_dict['formats']:\\n- if f.get('tbr'):\\n- continue\\n- tbr = int_or_none(self._search_regex(\\n- r'/(\\\\d+)k/', f['url'], 'bitrate', default=None))\\n- if not tbr:\\n- continue\\n- f.update({\\n- 'format_id': f'{determine_protocol(f)}-{tbr}',\\n- 'tbr': tbr,\\n- })\\n-\\n- thumbnails = []\\n- if video.get('thumbnailUrl'):\\n- thumbnails.append({\\n- 'id': 'normal',\\n- 'url': video['thumbnailUrl'],\\n- })\\n- if video.get('smThumbnailUrl'):\\n- thumbnails.append({\\n- 'id': 'small',\\n- 'url': video['smThumbnailUrl'],\\n- })\\n- info_dict.update({\\n- 'title': video['S_headLine'].strip(),\\n- 'description': unescapeHTML(video.get('S_fullStory')),\\n- 'thumbnails': thumbnails,\\n- 'duration': float_or_none(video.get('SM_length')),\\n- 'timestamp': parse_iso8601(video.get('S_sysDate'), delimiter=' '),\\n- # 'tbr' was explicitly set to be preferred over 'height' originally,\\n- # So this is being kept unless someone can confirm this is unnecessary\\n- '_format_sort_fields': ('tbr', 'res'),\\n- })\\n- entries.append(info_dict)\\n-\\n- return self.playlist_result(entries, playlist_id)\\ndiff --git a/yt_dlp/extractor/sharevideos.py b/yt_dlp/extractor/sharevideos.py\\ndeleted file mode 100644\\nindex 3132c7a82b16..000000000000\\n--- a/yt_dlp/extractor/sharevideos.py\\n+++ /dev/null\\n@@ -1,6 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class ShareVideosEmbedIE(InfoExtractor):\\n- _VALID_URL = False\\n- _EMBED_REGEX = [r'<iframe[^>]+?\\\\bsrc\\\\s*=\\\\s*([\\\"\\\\'])(?P<url>(?:https?:)?//embed\\\\.share-videos\\\\.se/auto/embed/\\\\d+\\\\?.*?\\\\buid=\\\\d+.*?)\\\\1']\\ndiff --git a/yt_dlp/extractor/snotr.py b/yt_dlp/extractor/snotr.py\\ndeleted file mode 100644\\nindex 859e5e8376b6..000000000000\\n--- a/yt_dlp/extractor/snotr.py\\n+++ /dev/null\\n@@ -1,68 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- parse_duration,\\n- parse_filesize,\\n- str_to_int,\\n-)\\n-\\n-\\n-class SnotrIE(InfoExtractor):\\n- _VALID_URL = r'http?://(?:www\\\\.)?snotr\\\\.com/video/(?P<id>\\\\d+)/([\\\\w]+)'\\n- _TESTS = [{\\n- 'url': 'http://www.snotr.com/video/13708/Drone_flying_through_fireworks',\\n- 'info_dict': {\\n- 'id': '13708',\\n- 'ext': 'mp4',\\n- 'title': 'Drone flying through fireworks!',\\n- 'duration': 248,\\n- 'filesize_approx': 40700000,\\n- 'description': 'A drone flying through Fourth of July Fireworks',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- },\\n- 'expected_warnings': ['description'],\\n- }, {\\n- 'url': 'http://www.snotr.com/video/530/David_Letteman_-_George_W_Bush_Top_10',\\n- 'info_dict': {\\n- 'id': '530',\\n- 'ext': 'mp4',\\n- 'title': 'David Letteman - George W. Bush Top 10',\\n- 'duration': 126,\\n- 'filesize_approx': 8500000,\\n- 'description': 'The top 10 George W. Bush moments, brought to you by David Letterman!',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id')\\n-\\n- webpage = self._download_webpage(url, video_id)\\n- title = self._og_search_title(webpage)\\n-\\n- description = self._og_search_description(webpage)\\n- info_dict = self._parse_html5_media_entries(\\n- url, webpage, video_id, m3u8_entry_protocol='m3u8_native')[0]\\n-\\n- view_count = str_to_int(self._html_search_regex(\\n- r'<p[^>]*>\\\\s*<strong[^>]*>Views:</strong>\\\\s*<span[^>]*>([\\\\d,\\\\.]+)',\\n- webpage, 'view count', fatal=False))\\n-\\n- duration = parse_duration(self._html_search_regex(\\n- r'<p[^>]*>\\\\s*<strong[^>]*>Length:</strong>\\\\s*<span[^>]*>([\\\\d:]+)',\\n- webpage, 'duration', fatal=False))\\n-\\n- filesize_approx = parse_filesize(self._html_search_regex(\\n- r'<p[^>]*>\\\\s*<strong[^>]*>Filesize:</strong>\\\\s*<span[^>]*>([^<]+)',\\n- webpage, 'filesize', fatal=False))\\n-\\n- info_dict.update({\\n- 'id': video_id,\\n- 'description': description,\\n- 'title': title,\\n- 'view_count': view_count,\\n- 'duration': duration,\\n- 'filesize_approx': filesize_approx,\\n- })\\n-\\n- return info_dict\\ndiff --git a/yt_dlp/extractor/springboardplatform.py b/yt_dlp/extractor/springboardplatform.py\\ndeleted file mode 100644\\nindex 9a37dd6752d7..000000000000\\n--- a/yt_dlp/extractor/springboardplatform.py\\n+++ /dev/null\\n@@ -1,122 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- int_or_none,\\n- unescapeHTML,\\n- unified_timestamp,\\n- xpath_attr,\\n- xpath_element,\\n- xpath_text,\\n-)\\n-\\n-\\n-class SpringboardPlatformIE(InfoExtractor):\\n- _VALID_URL = r'''(?x)\\n- https?://\\n- cms\\\\.springboardplatform\\\\.com/\\n- (?:\\n- (?:previews|embed_iframe)/(?P<index>\\\\d+)/video/(?P<id>\\\\d+)|\\n- xml_feeds_advanced/index/(?P<index_2>\\\\d+)/rss3/(?P<id_2>\\\\d+)\\n- )\\n- '''\\n- _EMBED_REGEX = [r'<iframe\\\\b[^>]+\\\\bsrc=([\\\"\\\\'])(?P<url>(?:https?:)?//cms\\\\.springboardplatform\\\\.com/embed_iframe/\\\\d+/video/\\\\d+.*?)\\\\1']\\n- _TESTS = [{\\n- 'url': 'http://cms.springboardplatform.com/previews/159/video/981017/0/0/1',\\n- 'md5': '5c3cb7b5c55740d482561099e920f192',\\n- 'info_dict': {\\n- 'id': '981017',\\n- 'ext': 'mp4',\\n- 'title': 'Redman \\\"BUD like YOU\\\" \\\"Usher Good Kisser\\\" REMIX',\\n- 'description': 'Redman \\\"BUD like YOU\\\" \\\"Usher Good Kisser\\\" REMIX',\\n- 'thumbnail': r're:https?://.+\\\\.jpg',\\n- 'timestamp': 1409132328,\\n- 'upload_date': '20140827',\\n- 'duration': 193,\\n- },\\n- 'skip': 'Invalid URL',\\n- }, {\\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/159/video/981017/rab007/rapbasement.com/1/1',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/20/video/1731611/ki055/kidzworld.com/10',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://cms.springboardplatform.com/xml_feeds_advanced/index/159/rss3/981017/0/0/1/',\\n- 'only_matching': True,\\n- }]\\n- _WEBPAGE_TESTS = [{\\n- 'url': 'https://www.kidzworld.com/article/30935-trolls-the-beat-goes-on-interview-skylar-astin-and-amanda-leighton',\\n- 'info_dict': {\\n- 'id': '1731611',\\n- 'ext': 'mp4',\\n- 'title': 'Official Trailer | TROLLS: THE BEAT GOES ON!',\\n- },\\n- 'skip': 'Invalid URL',\\n- }]\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('id') or mobj.group('id_2')\\n- index = mobj.group('index') or mobj.group('index_2')\\n-\\n- video = self._download_xml(\\n- f'http://cms.springboardplatform.com/xml_feeds_advanced/index/{index}/rss3/{video_id}', video_id)\\n-\\n- item = xpath_element(video, './/item', 'item', fatal=True)\\n-\\n- content = xpath_element(\\n- item, './{http://search.yahoo.com/mrss/}content', 'content',\\n- fatal=True)\\n- title = unescapeHTML(xpath_text(item, './title', 'title', fatal=True))\\n-\\n- video_url = content.attrib['url']\\n-\\n- if 'error_video.mp4' in video_url:\\n- raise ExtractorError(\\n- f'Video {video_id} no longer exists', expected=True)\\n-\\n- duration = int_or_none(content.get('duration'))\\n- tbr = int_or_none(content.get('bitrate'))\\n- filesize = int_or_none(content.get('fileSize'))\\n- width = int_or_none(content.get('width'))\\n- height = int_or_none(content.get('height'))\\n-\\n- description = unescapeHTML(xpath_text(\\n- item, './description', 'description'))\\n- thumbnail = xpath_attr(\\n- item, './{http://search.yahoo.com/mrss/}thumbnail', 'url',\\n- 'thumbnail')\\n-\\n- timestamp = unified_timestamp(xpath_text(\\n- item, './{http://cms.springboardplatform.com/namespaces.html}created',\\n- 'timestamp'))\\n-\\n- formats = [{\\n- 'url': video_url,\\n- 'format_id': 'http',\\n- 'tbr': tbr,\\n- 'filesize': filesize,\\n- 'width': width,\\n- 'height': height,\\n- }]\\n-\\n- m3u8_format = formats[0].copy()\\n- m3u8_format.update({\\n- 'url': re.sub(r'(https?://)cdn\\\\.', r'\\\\1hls.', video_url) + '.m3u8',\\n- 'ext': 'mp4',\\n- 'format_id': 'hls',\\n- 'protocol': 'm3u8_native',\\n- })\\n- formats.append(m3u8_format)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': description,\\n- 'thumbnail': thumbnail,\\n- 'timestamp': timestamp,\\n- 'duration': duration,\\n- 'formats': formats,\\n- }\\ndiff --git a/yt_dlp/extractor/stanfordoc.py b/yt_dlp/extractor/stanfordoc.py\\ndeleted file mode 100644\\nindex ab41091cff41..000000000000\\n--- a/yt_dlp/extractor/stanfordoc.py\\n+++ /dev/null\\n@@ -1,89 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- orderedSet,\\n- unescapeHTML,\\n-)\\n-\\n-\\n-class StanfordOpenClassroomIE(InfoExtractor):\\n- IE_NAME = 'stanfordoc'\\n- IE_DESC = 'Stanford Open ClassRoom'\\n- _VALID_URL = r'https?://openclassroom\\\\.stanford\\\\.edu(?P<path>/?|(/MainFolder/(?:HomePage|CoursePage|VideoPage)\\\\.php([?]course=(?P<course>[^&]+)(&video=(?P<video>[^&]+))?(&.*)?)?))$'\\n- _TEST = {\\n- 'url': 'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100',\\n- 'md5': '544a9468546059d4e80d76265b0443b8',\\n- 'info_dict': {\\n- 'id': 'PracticalUnix_intro-environment',\\n- 'ext': 'mp4',\\n- 'title': 'Intro Environment',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n-\\n- if mobj.group('course') and mobj.group('video'): # A specific video\\n- course = mobj.group('course')\\n- video = mobj.group('video')\\n- info = {\\n- 'id': course + '_' + video,\\n- 'uploader': None,\\n- 'upload_date': None,\\n- }\\n-\\n- base_url = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'\\n- xml_url = base_url + video + '.xml'\\n- mdoc = self._download_xml(xml_url, info['id'])\\n- try:\\n- info['title'] = mdoc.findall('./title')[0].text\\n- info['url'] = base_url + mdoc.findall('./videoFile')[0].text\\n- except IndexError:\\n- raise ExtractorError('Invalid metadata XML file')\\n- return info\\n- elif mobj.group('course'): # A course page\\n- course = mobj.group('course')\\n- info = {\\n- 'id': course,\\n- '_type': 'playlist',\\n- 'uploader': None,\\n- 'upload_date': None,\\n- }\\n-\\n- coursepage = self._download_webpage(\\n- url, info['id'],\\n- note='Downloading course info page',\\n- errnote='Unable to download course info page')\\n-\\n- info['title'] = self._html_search_regex(\\n- r'<h1>([^<]+)</h1>', coursepage, 'title', default=info['id'])\\n-\\n- info['description'] = self._html_search_regex(\\n- r'(?s)<description>([^<]+)</description>',\\n- coursepage, 'description', fatal=False)\\n-\\n- links = orderedSet(re.findall(r'<a href=\\\"(VideoPage\\\\.php\\\\?[^\\\"]+)\\\">', coursepage))\\n- info['entries'] = [self.url_result(\\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\\n- ) for l in links]\\n- return info\\n- else: # Root page\\n- info = {\\n- 'id': 'Stanford OpenClassroom',\\n- '_type': 'playlist',\\n- 'uploader': None,\\n- 'upload_date': None,\\n- }\\n- info['title'] = info['id']\\n-\\n- root_url = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'\\n- rootpage = self._download_webpage(root_url, info['id'],\\n- errnote='Unable to download course info page')\\n-\\n- links = orderedSet(re.findall(r'<a href=\\\"(CoursePage\\\\.php\\\\?[^\\\"]+)\\\">', rootpage))\\n- info['entries'] = [self.url_result(\\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\\n- ) for l in links]\\n- return info\\ndiff --git a/yt_dlp/extractor/stitcher.py b/yt_dlp/extractor/stitcher.py\\ndeleted file mode 100644\\nindex 09ebabb289d5..000000000000\\n--- a/yt_dlp/extractor/stitcher.py\\n+++ /dev/null\\n@@ -1,141 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- clean_html,\\n- clean_podcast_url,\\n- int_or_none,\\n- str_or_none,\\n- try_get,\\n- url_or_none,\\n-)\\n-\\n-\\n-class StitcherBaseIE(InfoExtractor):\\n- _VALID_URL_BASE = r'https?://(?:www\\\\.)?stitcher\\\\.com/(?:podcast|show)/'\\n-\\n- def _call_api(self, path, video_id, query):\\n- resp = self._download_json(\\n- 'https://api.prod.stitcher.com/' + path,\\n- video_id, query=query)\\n- error_massage = try_get(resp, lambda x: x['errors'][0]['message'])\\n- if error_massage:\\n- raise ExtractorError(error_massage, expected=True)\\n- return resp['data']\\n-\\n- def _extract_description(self, data):\\n- return clean_html(data.get('html_description') or data.get('description'))\\n-\\n- def _extract_audio_url(self, episode):\\n- return url_or_none(episode.get('audio_url') or episode.get('guid'))\\n-\\n- def _extract_show_info(self, show):\\n- return {\\n- 'thumbnail': show.get('image_base_url'),\\n- 'series': show.get('title'),\\n- }\\n-\\n- def _extract_episode(self, episode, audio_url, show_info):\\n- info = {\\n- 'id': str(episode['id']),\\n- 'display_id': episode.get('slug'),\\n- 'title': episode['title'].strip(),\\n- 'description': self._extract_description(episode),\\n- 'duration': int_or_none(episode.get('duration')),\\n- 'url': clean_podcast_url(audio_url),\\n- 'vcodec': 'none',\\n- 'timestamp': int_or_none(episode.get('date_published')),\\n- 'season_number': int_or_none(episode.get('season')),\\n- 'season_id': str_or_none(episode.get('season_id')),\\n- }\\n- info.update(show_info)\\n- return info\\n-\\n-\\n-class StitcherIE(StitcherBaseIE):\\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?:[^/]+/)+e(?:pisode)?/(?:[^/#?&]+-)?(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines/e/40789481?autoplay=true',\\n- 'md5': 'e9635098e0da10b21a0e2b85585530f6',\\n- 'info_dict': {\\n- 'id': '40789481',\\n- 'ext': 'mp3',\\n- 'title': 'Machine Learning Mastery and Cancer Clusters',\\n- 'description': 'md5:547adb4081864be114ae3831b4c2b42f',\\n- 'duration': 1604,\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'upload_date': '20151008',\\n- 'timestamp': 1444285800,\\n- 'series': 'Talking Machines',\\n- },\\n- }, {\\n- 'url': 'http://www.stitcher.com/podcast/panoply/vulture-tv/e/the-rare-hourlong-comedy-plus-40846275?autoplay=true',\\n- 'info_dict': {\\n- 'id': '40846275',\\n- 'display_id': 'the-rare-hourlong-comedy-plus',\\n- 'ext': 'mp3',\\n- 'title': \\\"The CW's 'Crazy Ex-Girlfriend'\\\",\\n- 'description': 'md5:04f1e2f98eb3f5cbb094cea0f9e19b17',\\n- 'duration': 2235,\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'Page Not Found',\\n- }, {\\n- # escaped title\\n- 'url': 'http://www.stitcher.com/podcast/marketplace-on-stitcher/e/40910226?autoplay=true',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://www.stitcher.com/podcast/panoply/getting-in/e/episode-2a-how-many-extracurriculars-should-i-have-40876278?autoplay=true',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.stitcher.com/show/threedom/episode/circles-on-a-stick-200212584',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- audio_id = self._match_id(url)\\n- data = self._call_api(\\n- 'shows/episodes', audio_id, {'episode_ids': audio_id})\\n- episode = data['episodes'][0]\\n- audio_url = self._extract_audio_url(episode)\\n- if not audio_url:\\n- self.raise_login_required()\\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\\n- return self._extract_episode(\\n- episode, audio_url, self._extract_show_info(show))\\n-\\n-\\n-class StitcherShowIE(StitcherBaseIE):\\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?P<id>[^/#?&]+)/?(?:[?#&]|$)'\\n- _TESTS = [{\\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines',\\n- 'info_dict': {\\n- 'id': 'the-talking-machines',\\n- 'title': 'Talking Machines',\\n- 'description': 'md5:831f0995e40f26c10231af39cf1ebf0b',\\n- },\\n- 'playlist_mincount': 106,\\n- }, {\\n- 'url': 'https://www.stitcher.com/show/the-talking-machines',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- show_slug = self._match_id(url)\\n- data = self._call_api(\\n- f'search/show/{show_slug}/allEpisodes', show_slug, {'count': 10000})\\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\\n- show_info = self._extract_show_info(show)\\n-\\n- entries = []\\n- for episode in (data.get('episodes') or []):\\n- audio_url = self._extract_audio_url(episode)\\n- if not audio_url:\\n- continue\\n- entries.append(self._extract_episode(episode, audio_url, show_info))\\n-\\n- return self.playlist_result(\\n- entries, show_slug, show.get('title'),\\n- self._extract_description(show))\\ndiff --git a/yt_dlp/extractor/stretchinternet.py b/yt_dlp/extractor/stretchinternet.py\\ndeleted file mode 100644\\nindex 232837d8d522..000000000000\\n--- a/yt_dlp/extractor/stretchinternet.py\\n+++ /dev/null\\n@@ -1,35 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class StretchInternetIE(InfoExtractor):\\n- _VALID_URL = r'https?://portal\\\\.stretchinternet\\\\.com/[^/]+/(?:portal|full)\\\\.htm\\\\?.*?\\\\beventId=(?P<id>\\\\d+)'\\n- _TEST = {\\n- 'url': 'https://portal.stretchinternet.com/umary/portal.htm?eventId=573272&streamType=video',\\n- 'info_dict': {\\n- 'id': '573272',\\n- 'ext': 'mp4',\\n- 'title': 'UNIVERSITY OF MARY WRESTLING VS UPPER IOWA',\\n- # 'timestamp': 1575668361,\\n- # 'upload_date': '20191206',\\n- 'uploader_id': '99997',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- media_url = self._download_json(\\n- 'https://core.stretchlive.com/trinity/event/tcg/' + video_id,\\n- video_id)[0]['media'][0]['url']\\n- event = self._download_json(\\n- 'https://neo-client.stretchinternet.com/portal-ws/getEvent.json',\\n- video_id, query={'eventID': video_id, 'token': 'asdf'})['event']\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': event['title'],\\n- # TODO: parse US timezone abbreviations\\n- # 'timestamp': event.get('dateTimeString'),\\n- 'url': 'https://' + media_url,\\n- 'uploader_id': event.get('ownerID'),\\n- }\\ndiff --git a/yt_dlp/extractor/swearnet.py b/yt_dlp/extractor/swearnet.py\\ndeleted file mode 100644\\nindex 2d6fb3eb4760..000000000000\\n--- a/yt_dlp/extractor/swearnet.py\\n+++ /dev/null\\n@@ -1,45 +0,0 @@\\n-from .vidyard import VidyardBaseIE\\n-from ..utils import ExtractorError, int_or_none, make_archive_id\\n-\\n-\\n-class SwearnetEpisodeIE(VidyardBaseIE):\\n- _VALID_URL = r'https?://www\\\\.swearnet\\\\.com/shows/(?P<id>[\\\\w-]+)/seasons/(?P<season_num>\\\\d+)/episodes/(?P<episode_num>\\\\d+)'\\n- _TESTS = [{\\n- 'url': 'https://www.swearnet.com/shows/gettin-learnt-with-ricky/seasons/1/episodes/1',\\n- 'info_dict': {\\n- 'id': 'wicK2EOzjOdxkUXGDIgcPw',\\n- 'display_id': '232819',\\n- 'ext': 'mp4',\\n- 'episode_number': 1,\\n- 'episode': 'Episode 1',\\n- 'duration': 719,\\n- 'description': r're:Are you drunk and high and craving a grilled cheese sandwich.+',\\n- 'season': 'Season 1',\\n- 'title': 'Episode 1 - Grilled Cheese Sammich',\\n- 'season_number': 1,\\n- 'thumbnail': 'https://cdn.vidyard.com/thumbnails/custom/0dd74f9b-388a-452e-b570-b407fb64435b_small.jpg',\\n- 'tags': ['Getting Learnt with Ricky', 'drunk', 'grilled cheese', 'high'],\\n- '_old_archive_ids': ['swearnetepisode 232819'],\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- slug, season_number, episode_number = self._match_valid_url(url).group('id', 'season_num', 'episode_num')\\n- webpage = self._download_webpage(url, slug)\\n-\\n- try:\\n- external_id = self._search_regex(r'externalid\\\\s*=\\\\s*\\\"([^\\\"]+)', webpage, 'externalid')\\n- except ExtractorError:\\n- if 'Upgrade Now' in webpage:\\n- self.raise_login_required()\\n- raise\\n-\\n- info = self._process_video_json(self._fetch_video_json(external_id)['chapters'][0], external_id)\\n- if info.get('display_id'):\\n- info['_old_archive_ids'] = [make_archive_id(self, info['display_id'])]\\n-\\n- return {\\n- **info,\\n- 'season_number': int_or_none(season_number),\\n- 'episode_number': int_or_none(episode_number),\\n- }\\ndiff --git a/yt_dlp/extractor/syvdk.py b/yt_dlp/extractor/syvdk.py\\ndeleted file mode 100644\\nindex ec166831cde3..000000000000\\n--- a/yt_dlp/extractor/syvdk.py\\n+++ /dev/null\\n@@ -1,33 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import traverse_obj\\n-\\n-\\n-class SYVDKIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?24syv\\\\.dk/episode/(?P<id>[\\\\w-]+)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://24syv.dk/episode/isabella-arendt-stiller-op-for-de-konservative-2',\\n- 'md5': '429ce5a423dd4b1e1d0bf3a569558089',\\n- 'info_dict': {\\n- 'id': '12215',\\n- 'display_id': 'isabella-arendt-stiller-op-for-de-konservative-2',\\n- 'ext': 'mp3',\\n- 'title': 'Isabella Arendt stiller op for De Konservative',\\n- 'description': 'md5:f5fa6a431813bf37284f3412ad7c6c06',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n- info_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['episodeDetails'][0]\\n-\\n- return {\\n- 'id': str(info_data['id']),\\n- 'vcodec': 'none',\\n- 'ext': 'mp3',\\n- 'url': info_data['details']['enclosure'],\\n- 'display_id': video_id,\\n- 'title': traverse_obj(info_data, ('title', 'rendered')),\\n- 'description': traverse_obj(info_data, ('details', 'post_title')),\\n- }\\ndiff --git a/yt_dlp/extractor/tempo.py b/yt_dlp/extractor/tempo.py\\ndeleted file mode 100644\\nindex 4cd16f240d6d..000000000000\\n--- a/yt_dlp/extractor/tempo.py\\n+++ /dev/null\\n@@ -1,114 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_iso8601,\\n- traverse_obj,\\n- try_call,\\n-)\\n-\\n-\\n-class IVXPlayerIE(InfoExtractor):\\n- _VALID_URL = r'ivxplayer:(?P<video_id>\\\\d+):(?P<player_key>\\\\w+)'\\n- _TESTS = [{\\n- 'url': 'ivxplayer:2366065:4a89dfe6bc8f002596b1dfbd600730b1',\\n- 'info_dict': {\\n- 'id': '2366065',\\n- 'ext': 'mp4',\\n- 'duration': 112,\\n- 'upload_date': '20221204',\\n- 'title': 'Film Indonesia di Disney Content Showcase Asia Pacific 2022',\\n- 'timestamp': 1670151746,\\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2366065?width=300',\\n- },\\n- }]\\n- _WEBPAGE_TESTS = [{\\n- 'url': 'https://www.cantika.com/video/31737/film-indonesia-di-disney-content-showcase-asia-pacific-2022',\\n- 'info_dict': {\\n- 'id': '2374200',\\n- 'ext': 'mp4',\\n- 'duration': 110,\\n- 'title': 'Serial Indonesia di Disney Content Showcase Asia Pacific 2022',\\n- 'timestamp': 1670639416,\\n- 'upload_date': '20221210',\\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2374200?width=300',\\n- },\\n- }, {\\n- 'url': 'https://www.gooto.com/video/11437/wuling-suv-ramai-dikunjungi-di-giias-2018',\\n- 'info_dict': {\\n- 'id': '892109',\\n- 'ext': 'mp4',\\n- 'title': 'Wuling SUV Ramai Dikunjungi di GIIAS 2018',\\n- 'upload_date': '20180811',\\n- 'description': 'md5:6d901483d0aacc664aecb4489719aafa',\\n- 'duration': 75,\\n- 'timestamp': 1534011263,\\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/892109?width=300',\\n- },\\n- }]\\n-\\n- @classmethod\\n- def _extract_embed_urls(cls, url, webpage):\\n- # more info at https://player.ivideosmart.com/ivsplayer/v4/dist/js/loader.js\\n- mobj = re.search(\\n- r'<ivs-player\\\\s*[^>]+data-ivs-key\\\\s*=\\\\s*\\\"(?P<player_key>[\\\\w]+)\\\\s*[^>]+\\\\bdata-ivs-vid=\\\"(?P<video_id>[\\\\w-]+)',\\n- webpage)\\n- if mobj:\\n- yield f'ivxplayer:{mobj.group(\\\"video_id\\\")}:{mobj.group(\\\"player_key\\\")}'\\n- raise cls.StopExtraction\\n-\\n- def _real_extract(self, url):\\n- video_id, player_key = self._match_valid_url(url).group('video_id', 'player_key')\\n- json_data = self._download_json(\\n- f'https://ivxplayer.ivideosmart.com/prod/video/{video_id}?key={player_key}', video_id)\\n-\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\\n- json_data['player']['video_url'], video_id)\\n-\\n- return {\\n- 'id': str(json_data['ivx']['id']),\\n- 'title': traverse_obj(json_data, ('ivx', 'name')),\\n- 'description': traverse_obj(json_data, ('ivx', 'description')),\\n- 'duration': int_or_none(traverse_obj(json_data, ('ivx', 'duration'))),\\n- 'timestamp': parse_iso8601(traverse_obj(json_data, ('ivx', 'published_at'))),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'thumbnail': traverse_obj(json_data, ('ivx', 'thumbnail_url')),\\n- }\\n-\\n-\\n-class TempoIE(InfoExtractor):\\n- _VALID_URL = r'https?://video\\\\.tempo\\\\.co/\\\\w+/\\\\d+/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://video.tempo.co/read/30058/anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\\n- 'info_dict': {\\n- 'id': '2144275',\\n- 'display_id': 'anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\\n- 'ext': 'mp4',\\n- 'title': 'Anies Baswedan Ajukan Banding Putusan PTUN Batalkan UMP DKI',\\n- 'duration': 85,\\n- 'description': 'md5:a6822b7c4c874fa7e5bd63e96a387b66',\\n- 'thumbnail': 'https://statik.tempo.co/data/2022/07/27/id_1128287/1128287_720.jpg',\\n- 'timestamp': 1658907970,\\n- 'upload_date': '20220727',\\n- 'tags': ['Anies Baswedan', ' PTUN', ' PTUN | Pengadilan Tata Usaha Negara', ' PTUN Batalkan UMP DKI', ' UMP DKI'],\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- _, video_id, player_key = next(IVXPlayerIE._extract_embed_urls(url, webpage)).split(':')\\n-\\n- json_ld_data = self._search_json_ld(webpage, display_id)\\n-\\n- return self.url_result(\\n- f'ivxplayer:{video_id}:{player_key}', display_id=display_id,\\n- thumbnail=self._html_search_meta('twitter:image:src', webpage) or self._og_search_thumbnail(webpage),\\n- tags=try_call(lambda: self._html_search_meta('keywords', webpage).split(',')),\\n- description=(json_ld_data.get('description')\\n- or self._html_search_meta(('description', 'twitter:description'), webpage)\\n- or self._og_search_description(webpage)),\\n- url_transparent=True)\\ndiff --git a/yt_dlp/extractor/theholetv.py b/yt_dlp/extractor/theholetv.py\\ndeleted file mode 100644\\nindex a3a7024288eb..000000000000\\n--- a/yt_dlp/extractor/theholetv.py\\n+++ /dev/null\\n@@ -1,35 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import extract_attributes, remove_end\\n-\\n-\\n-class TheHoleTvIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?the-hole\\\\.tv/episodes/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://the-hole.tv/episodes/gromkii-vopros-sergey-orlov',\\n- 'md5': 'fea6682f47786f3ae5a6cbd635ec4bf9',\\n- 'info_dict': {\\n- 'id': 'gromkii-vopros-sergey-orlov',\\n- 'ext': 'mp4',\\n- 'title': 'ะกะตัะณะตะน ะัะปะพะฒ โ ะัะพะผะบะธะน ะฒะพะฟัะพั',\\n- 'thumbnail': 'https://assets-cdn.the-hole.tv/images/t8gan4n6zn627e7wni11b2uemqts',\\n- 'description': 'md5:45741a9202331f995d9fb76996759379',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- player_attrs = extract_attributes(self._search_regex(\\n- r'(<div[^>]*\\\\bdata-controller=\\\"player\\\"[^>]*>)', webpage, 'video player'))\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\\n- player_attrs['data-player-source-value'], video_id, 'mp4')\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': remove_end(self._html_extract_title(webpage), ' โ The Hole'),\\n- 'description': self._og_search_description(webpage),\\n- 'thumbnail': player_attrs.get('data-player-poster-value'),\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- }\\ndiff --git a/yt_dlp/extractor/traileraddict.py b/yt_dlp/extractor/traileraddict.py\\ndeleted file mode 100644\\nindex 81c9365585c0..000000000000\\n--- a/yt_dlp/extractor/traileraddict.py\\n+++ /dev/null\\n@@ -1,61 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-\\n-\\n-class TrailerAddictIE(InfoExtractor):\\n- _WORKING = False\\n- _VALID_URL = r'(?:https?://)?(?:www\\\\.)?traileraddict\\\\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'\\n- _TEST = {\\n- 'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',\\n- 'md5': '41365557f3c8c397d091da510e73ceb4',\\n- 'info_dict': {\\n- 'id': '76184',\\n- 'ext': 'mp4',\\n- 'title': 'Prince Avalanche Trailer',\\n- 'description': 'Trailer for Prince Avalanche.\\\\n\\\\nTwo highway road workers spend the summer of 1988 away from their city lives. The isolated landscape becomes a place of misadventure as the men find themselves at odds with each other and the women they left behind.',\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- name = mobj.group('movie') + '/' + mobj.group('trailer_name')\\n- webpage = self._download_webpage(url, name)\\n-\\n- title = self._html_extract_title(webpage, 'video title').replace(' - Trailer Addict', '')\\n- view_count_str = self._search_regex(\\n- r'<span class=\\\"views_n\\\">([0-9,.]+)</span>',\\n- webpage, 'view count', fatal=False)\\n- view_count = (\\n- None if view_count_str is None\\n- else int(view_count_str.replace(',', '')))\\n- video_id = self._search_regex(\\n- r'<param\\\\s+name=\\\"movie\\\"\\\\s+value=\\\"/emb/([0-9]+)\\\"\\\\s*/>',\\n- webpage, 'video id')\\n-\\n- # Presence of (no)watchplus function indicates HD quality is available\\n- if re.search(r'function (no)?watchplus()', webpage):\\n- fvar = 'fvarhd'\\n- else:\\n- fvar = 'fvar'\\n-\\n- info_url = f'http://www.traileraddict.com/{fvar}.php?tid={video_id!s}'\\n- info_webpage = self._download_webpage(info_url, video_id, 'Downloading the info webpage')\\n-\\n- final_url = self._search_regex(r'&fileurl=(.+)',\\n- info_webpage, 'Download url').replace('%3F', '?')\\n- thumbnail_url = self._search_regex(r'&image=(.+?)&',\\n- info_webpage, 'thumbnail url')\\n-\\n- description = self._html_search_regex(\\n- r'(?s)<div class=\\\"synopsis\\\">.*?<div class=\\\"movie_label_info\\\"[^>]*>(.*?)</div>',\\n- webpage, 'description', fatal=False)\\n-\\n- return {\\n- 'id': video_id,\\n- 'url': final_url,\\n- 'title': title,\\n- 'thumbnail': thumbnail_url,\\n- 'description': description,\\n- 'view_count': view_count,\\n- }\\ndiff --git a/yt_dlp/extractor/triller.py b/yt_dlp/extractor/triller.py\\ndeleted file mode 100644\\nindex 3bdeedd43e00..000000000000\\n--- a/yt_dlp/extractor/triller.py\\n+++ /dev/null\\n@@ -1,329 +0,0 @@\\n-import itertools\\n-import json\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..networking import HEADRequest\\n-from ..utils import (\\n- ExtractorError,\\n- UnsupportedError,\\n- determine_ext,\\n- int_or_none,\\n- parse_resolution,\\n- str_or_none,\\n- traverse_obj,\\n- unified_timestamp,\\n- url_basename,\\n- url_or_none,\\n- urljoin,\\n-)\\n-\\n-\\n-class TrillerBaseIE(InfoExtractor):\\n- _NETRC_MACHINE = 'triller'\\n- _API_BASE_URL = 'https://social.triller.co/v1.5'\\n- _API_HEADERS = {'Origin': 'https://triller.co'}\\n-\\n- def _perform_login(self, username, password):\\n- if self._API_HEADERS.get('Authorization'):\\n- return\\n-\\n- headers = {**self._API_HEADERS, 'Content-Type': 'application/json'}\\n- user_check = traverse_obj(self._download_json(\\n- f'{self._API_BASE_URL}/api/user/is-valid-username', None, note='Checking username',\\n- fatal=False, expected_status=400, headers=headers,\\n- data=json.dumps({'username': username}, separators=(',', ':')).encode()), 'status')\\n-\\n- if user_check: # endpoint returns `\\\"status\\\":false` if username exists\\n- raise ExtractorError('Unable to login: Invalid username', expected=True)\\n-\\n- login = self._download_json(\\n- f'{self._API_BASE_URL}/user/auth', None, note='Logging in', fatal=False,\\n- expected_status=400, headers=headers, data=json.dumps({\\n- 'username': username,\\n- 'password': password,\\n- }, separators=(',', ':')).encode()) or {}\\n-\\n- if not login.get('auth_token'):\\n- if login.get('error') == 1008:\\n- raise ExtractorError('Unable to login: Incorrect password', expected=True)\\n- raise ExtractorError('Unable to login')\\n-\\n- self._API_HEADERS['Authorization'] = f'Bearer {login[\\\"auth_token\\\"]}'\\n-\\n- def _get_comments(self, video_id, limit=15):\\n- comment_info = self._download_json(\\n- f'{self._API_BASE_URL}/api/videos/{video_id}/comments_v2',\\n- video_id, fatal=False, note='Downloading comments API JSON',\\n- headers=self._API_HEADERS, query={'limit': limit}) or {}\\n- if not comment_info.get('comments'):\\n- return\\n- yield from traverse_obj(comment_info, ('comments', ..., {\\n- 'id': ('id', {str_or_none}),\\n- 'text': 'body',\\n- 'author': ('author', 'username'),\\n- 'author_id': ('author', 'user_id'),\\n- 'timestamp': ('timestamp', {unified_timestamp}),\\n- }))\\n-\\n- def _parse_video_info(self, video_info, username, user_id, display_id=None):\\n- video_id = str(video_info['id'])\\n- display_id = display_id or video_info.get('video_uuid')\\n-\\n- if traverse_obj(video_info, (\\n- None, ('transcoded_url', 'video_url', 'stream_url', 'audio_url'),\\n- {lambda x: re.search(r'/copyright/', x)}), get_all=False):\\n- self.raise_no_formats('This video has been removed due to licensing restrictions', expected=True)\\n-\\n- def format_info(url):\\n- return {\\n- 'url': url,\\n- 'ext': determine_ext(url),\\n- 'format_id': url_basename(url).split('.')[0],\\n- }\\n-\\n- formats = []\\n-\\n- if determine_ext(video_info.get('transcoded_url')) == 'm3u8':\\n- formats.extend(self._extract_m3u8_formats(\\n- video_info['transcoded_url'], video_id, 'mp4', m3u8_id='hls', fatal=False))\\n-\\n- for video in traverse_obj(video_info, ('video_set', lambda _, v: url_or_none(v['url']))):\\n- formats.append({\\n- **format_info(video['url']),\\n- **parse_resolution(video.get('resolution')),\\n- 'vcodec': video.get('codec'),\\n- 'vbr': int_or_none(video.get('bitrate'), 1000),\\n- })\\n-\\n- video_url = traverse_obj(video_info, 'video_url', 'stream_url', expected_type=url_or_none)\\n- if video_url:\\n- formats.append({\\n- **format_info(video_url),\\n- 'vcodec': 'h264',\\n- **traverse_obj(video_info, {\\n- 'width': 'width',\\n- 'height': 'height',\\n- 'filesize': 'filesize',\\n- }, expected_type=int_or_none),\\n- })\\n-\\n- audio_url = url_or_none(video_info.get('audio_url'))\\n- if audio_url:\\n- formats.append(format_info(audio_url))\\n-\\n- comment_count = traverse_obj(video_info, ('comment_count', {int_or_none}))\\n-\\n- return {\\n- 'id': video_id,\\n- 'display_id': display_id,\\n- 'uploader': username,\\n- 'uploader_id': user_id or traverse_obj(video_info, ('user', 'user_id', {str_or_none})),\\n- 'webpage_url': urljoin(f'https://triller.co/@{username}/video/', display_id),\\n- 'uploader_url': f'https://triller.co/@{username}',\\n- 'extractor_key': TrillerIE.ie_key(),\\n- 'extractor': TrillerIE.IE_NAME,\\n- 'formats': formats,\\n- 'comment_count': comment_count,\\n- '__post_extractor': self.extract_comments(video_id, comment_count),\\n- **traverse_obj(video_info, {\\n- 'title': ('description', {lambda x: x.replace('\\\\r\\\\n', ' ')}),\\n- 'description': 'description',\\n- 'creator': ((('user'), ('users', lambda _, v: str(v['user_id']) == user_id)), 'name'),\\n- 'thumbnail': ('thumbnail_url', {url_or_none}),\\n- 'timestamp': ('timestamp', {unified_timestamp}),\\n- 'duration': ('duration', {int_or_none}),\\n- 'view_count': ('play_count', {int_or_none}),\\n- 'like_count': ('likes_count', {int_or_none}),\\n- 'artist': 'song_artist',\\n- 'track': 'song_title',\\n- }, get_all=False),\\n- }\\n-\\n-\\n-class TrillerIE(TrillerBaseIE):\\n- _VALID_URL = r'''(?x)\\n- https?://(?:www\\\\.)?triller\\\\.co/\\n- @(?P<username>[\\\\w.]+)/video/(?P<id>[\\\\da-f]{8}-(?:[\\\\da-f]{4}-){3}[\\\\da-f]{12})\\n- '''\\n- _TESTS = [{\\n- 'url': 'https://triller.co/@theestallion/video/2358fcd7-3df2-4c77-84c8-1d091610a6cf',\\n- 'md5': '228662d783923b60d78395fedddc0a20',\\n- 'info_dict': {\\n- 'id': '71595734',\\n- 'ext': 'mp4',\\n- 'title': 'md5:9a2bf9435c5c4292678996a464669416',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- 'description': 'md5:9a2bf9435c5c4292678996a464669416',\\n- 'uploader': 'theestallion',\\n- 'uploader_id': '18992236',\\n- 'creator': 'Megan Thee Stallion',\\n- 'timestamp': 1660598222,\\n- 'upload_date': '20220815',\\n- 'duration': 47,\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'artist': 'Megan Thee Stallion',\\n- 'track': 'Her',\\n- 'uploader_url': 'https://triller.co/@theestallion',\\n- 'comment_count': int,\\n- },\\n- 'skip': 'This video has been removed due to licensing restrictions',\\n- }, {\\n- 'url': 'https://triller.co/@charlidamelio/video/46c6fcfa-aa9e-4503-a50c-68444f44cddc',\\n- 'md5': '874055f462af5b0699b9dbb527a505a0',\\n- 'info_dict': {\\n- 'id': '71621339',\\n- 'ext': 'mp4',\\n- 'title': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\\n- 'display_id': '46c6fcfa-aa9e-4503-a50c-68444f44cddc',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- 'description': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\\n- 'uploader': 'charlidamelio',\\n- 'uploader_id': '1875551',\\n- 'creator': 'charli damelio',\\n- 'timestamp': 1660773354,\\n- 'upload_date': '20220817',\\n- 'duration': 16,\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'artist': 'Dixie',\\n- 'track': 'Someone to Blame',\\n- 'uploader_url': 'https://triller.co/@charlidamelio',\\n- 'comment_count': int,\\n- },\\n- }, {\\n- 'url': 'https://triller.co/@theestallion/video/07f35f38-1f51-48e2-8c5f-f7a8e829988f',\\n- 'md5': 'af7b3553e4b8bfca507636471ee2eb41',\\n- 'info_dict': {\\n- 'id': '71837829',\\n- 'ext': 'mp4',\\n- 'title': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio #womeninhiphop',\\n- 'display_id': '07f35f38-1f51-48e2-8c5f-f7a8e829988f',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- 'description': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio\\\\r\\\\n #womeninhiphop',\\n- 'uploader': 'theestallion',\\n- 'uploader_id': '18992236',\\n- 'creator': 'Megan Thee Stallion',\\n- 'timestamp': 1662486178,\\n- 'upload_date': '20220906',\\n- 'duration': 30,\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'artist': 'Unknown',\\n- 'track': 'Unknown',\\n- 'uploader_url': 'https://triller.co/@theestallion',\\n- 'comment_count': int,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- username, display_id = self._match_valid_url(url).group('username', 'id')\\n-\\n- video_info = self._download_json(\\n- f'{self._API_BASE_URL}/api/videos/{display_id}', display_id,\\n- headers=self._API_HEADERS)['videos'][0]\\n-\\n- return self._parse_video_info(video_info, username, None, display_id)\\n-\\n-\\n-class TrillerUserIE(TrillerBaseIE):\\n- _VALID_URL = r'https?://(?:www\\\\.)?triller\\\\.co/@(?P<id>[\\\\w.]+)/?(?:$|[#?])'\\n- _TESTS = [{\\n- 'url': 'https://triller.co/@theestallion',\\n- 'playlist_mincount': 12,\\n- 'info_dict': {\\n- 'id': '18992236',\\n- 'title': 'theestallion',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- },\\n- }, {\\n- 'url': 'https://triller.co/@charlidamelio',\\n- 'playlist_mincount': 150,\\n- 'info_dict': {\\n- 'id': '1875551',\\n- 'title': 'charlidamelio',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- },\\n- }]\\n-\\n- def _real_initialize(self):\\n- if not self._API_HEADERS.get('Authorization'):\\n- guest = self._download_json(\\n- f'{self._API_BASE_URL}/user/create_guest', None,\\n- note='Creating guest session', data=b'', headers=self._API_HEADERS, query={\\n- 'platform': 'Web',\\n- 'app_version': '',\\n- })\\n- if not guest.get('auth_token'):\\n- raise ExtractorError('Unable to fetch required auth token for user extraction')\\n-\\n- self._API_HEADERS['Authorization'] = f'Bearer {guest[\\\"auth_token\\\"]}'\\n-\\n- def _entries(self, username, user_id, limit=6):\\n- query = {'limit': limit}\\n- for page in itertools.count(1):\\n- videos = self._download_json(\\n- f'{self._API_BASE_URL}/api/users/{user_id}/videos',\\n- username, note=f'Downloading user video list page {page}',\\n- headers=self._API_HEADERS, query=query)\\n-\\n- for video in traverse_obj(videos, ('videos', ...)):\\n- yield self._parse_video_info(video, username, user_id)\\n-\\n- query['before_time'] = traverse_obj(videos, ('videos', -1, 'timestamp'))\\n- if not query['before_time']:\\n- break\\n-\\n- def _real_extract(self, url):\\n- username = self._match_id(url)\\n-\\n- user_info = traverse_obj(self._download_json(\\n- f'{self._API_BASE_URL}/api/users/by_username/{username}',\\n- username, note='Downloading user info', headers=self._API_HEADERS), ('user', {dict})) or {}\\n-\\n- if user_info.get('private') and user_info.get('followed_by_me') not in (True, 'true'):\\n- raise ExtractorError('This user profile is private', expected=True)\\n- elif traverse_obj(user_info, (('blocked_by_user', 'blocking_user'), {bool}), get_all=False):\\n- raise ExtractorError('The author of the video is blocked', expected=True)\\n-\\n- user_id = str_or_none(user_info.get('user_id'))\\n- if not user_id:\\n- raise ExtractorError('Unable to extract user ID')\\n-\\n- return self.playlist_result(\\n- self._entries(username, user_id), user_id, username, thumbnail=user_info.get('avatar_url'))\\n-\\n-\\n-class TrillerShortIE(InfoExtractor):\\n- _VALID_URL = r'https?://v\\\\.triller\\\\.co/(?P<id>\\\\w+)'\\n- _TESTS = [{\\n- 'url': 'https://v.triller.co/WWZNWk',\\n- 'md5': '5eb8dc2c971bd8cd794ec9e8d5e9d101',\\n- 'info_dict': {\\n- 'id': '66210052',\\n- 'ext': 'mp4',\\n- 'title': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\\n- 'display_id': 'f4480e1f-fb4e-45b9-a44c-9e6c679ce7eb',\\n- 'thumbnail': r're:^https://uploads\\\\.cdn\\\\.triller\\\\.co/.+\\\\.jpg$',\\n- 'description': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\\n- 'uploader': 'statefairent',\\n- 'uploader_id': '487545193',\\n- 'creator': 'Officialย Summerย Fairย ofย LA',\\n- 'timestamp': 1629655457,\\n- 'upload_date': '20210822',\\n- 'duration': 19,\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'artist': 'Unknown',\\n- 'track': 'Unknown',\\n- 'uploader_url': 'https://triller.co/@statefairent',\\n- 'comment_count': int,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- real_url = self._request_webpage(HEADRequest(url), self._match_id(url)).url\\n- if self.suitable(real_url): # Prevent infinite loop in case redirect fails\\n- raise UnsupportedError(real_url)\\n- return self.url_result(real_url)\\ndiff --git a/yt_dlp/extractor/tvplayer.py b/yt_dlp/extractor/tvplayer.py\\ndeleted file mode 100644\\nindex 7c47bc78e313..000000000000\\n--- a/yt_dlp/extractor/tvplayer.py\\n+++ /dev/null\\n@@ -1,79 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..networking.exceptions import HTTPError\\n-from ..utils import (\\n- ExtractorError,\\n- extract_attributes,\\n- try_get,\\n- urlencode_postdata,\\n-)\\n-\\n-\\n-class TVPlayerIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?tvplayer\\\\.com/watch/(?P<id>[^/?#]+)'\\n- _TEST = {\\n- 'url': 'http://tvplayer.com/watch/bbcone',\\n- 'info_dict': {\\n- 'id': '89',\\n- 'ext': 'mp4',\\n- 'title': r're:^BBC One [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- webpage = self._download_webpage(url, display_id)\\n-\\n- current_channel = extract_attributes(self._search_regex(\\n- r'(<div[^>]+class=\\\"[^\\\"]*current-channel[^\\\"]*\\\"[^>]*>)',\\n- webpage, 'channel element'))\\n- title = current_channel['data-name']\\n-\\n- resource_id = current_channel['data-id']\\n-\\n- token = self._search_regex(\\n- r'data-token=([\\\"\\\\'])(?P<token>(?!\\\\1).+)\\\\1', webpage,\\n- 'token', group='token')\\n-\\n- context = self._download_json(\\n- 'https://tvplayer.com/watch/context', display_id,\\n- 'Downloading JSON context', query={\\n- 'resource': resource_id,\\n- 'gen': token,\\n- })\\n-\\n- validate = context['validate']\\n- platform = try_get(\\n- context, lambda x: x['platform']['key'], str) or 'firefox'\\n-\\n- try:\\n- response = self._download_json(\\n- 'http://api.tvplayer.com/api/v2/stream/live',\\n- display_id, 'Downloading JSON stream', headers={\\n- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',\\n- }, data=urlencode_postdata({\\n- 'id': resource_id,\\n- 'service': 1,\\n- 'platform': platform,\\n- 'validate': validate,\\n- }))['tvplayer']['response']\\n- except ExtractorError as e:\\n- if isinstance(e.cause, HTTPError):\\n- response = self._parse_json(\\n- e.cause.response.read().decode(), resource_id)['tvplayer']['response']\\n- raise ExtractorError(\\n- '{} said: {}'.format(self.IE_NAME, response['error']), expected=True)\\n- raise\\n-\\n- formats = self._extract_m3u8_formats(response['stream'], display_id, 'mp4')\\n-\\n- return {\\n- 'id': resource_id,\\n- 'display_id': display_id,\\n- 'title': title,\\n- 'formats': formats,\\n- 'is_live': True,\\n- }\\ndiff --git a/yt_dlp/extractor/ufctv.py b/yt_dlp/extractor/ufctv.py\\nindex 2c1c5e0ff15e..13b256cd3fb9 100644\\n--- a/yt_dlp/extractor/ufctv.py\\n+++ b/yt_dlp/extractor/ufctv.py\\n@@ -5,9 +5,3 @@ class UFCTVIE(ImgGamingBaseIE):\\n _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\\\.)?(?:ufc\\\\.tv|(?:ufc)?fightpass\\\\.com)|ufcfightpass\\\\.img(?:dge|gaming)\\\\.com'\\n _NETRC_MACHINE = 'ufctv'\\n _REALM = 'ufc'\\n-\\n-\\n-class UFCArabiaIE(ImgGamingBaseIE):\\n- _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\\\.)?ufcarabia\\\\.(?:ae|com)'\\n- _NETRC_MACHINE = 'ufcarabia'\\n- _REALM = 'admufc'\\ndiff --git a/yt_dlp/extractor/uktvplay.py b/yt_dlp/extractor/uktvplay.py\\ndeleted file mode 100644\\nindex 9abe3436f2e2..000000000000\\n--- a/yt_dlp/extractor/uktvplay.py\\n+++ /dev/null\\n@@ -1,36 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class UKTVPlayIE(InfoExtractor):\\n- _VALID_URL = r'https?://uktvplay\\\\.(?:uktv\\\\.)?co\\\\.uk/(?:.+?\\\\?.*?\\\\bvideo=|([^/]+/)*)(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- 'url': 'https://uktvplay.uktv.co.uk/shows/world-at-war/c/200/watch-online/?video=2117008346001',\\n- 'info_dict': {\\n- 'id': '2117008346001',\\n- 'ext': 'mp4',\\n- 'title': 'Pincers',\\n- 'description': 'Pincers',\\n- 'uploader_id': '1242911124001',\\n- 'upload_date': '20130124',\\n- 'timestamp': 1359049267,\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- 'expected_warnings': ['Failed to download MPD manifest'],\\n- }, {\\n- 'url': 'https://uktvplay.uktv.co.uk/shows/africa/watch-online/5983349675001',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://uktvplay.co.uk/shows/hornby-a-model-world/series-1/episode-1/6276739790001?autoplaying=true',\\n- 'only_matching': True,\\n- }]\\n- # BRIGHTCOVE_URL_TEMPLATE = 'https://players.brightcove.net/1242911124001/OrCyvJ2gyL_default/index.html?videoId=%s'\\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1242911124001/H1xnMOqP_default/index.html?videoId=%s'\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- return self.url_result(\\n- self.BRIGHTCOVE_URL_TEMPLATE % video_id,\\n- 'BrightcoveNew', video_id)\\ndiff --git a/yt_dlp/extractor/unsupported.py b/yt_dlp/extractor/unsupported.py\\nindex 1e6f8c56ed36..5d965ec3a271 100644\\n--- a/yt_dlp/extractor/unsupported.py\\n+++ b/yt_dlp/extractor/unsupported.py\\n@@ -71,6 +71,8 @@ class KnownDRMIE(UnsupportedInfoExtractor):\\n r'watch\\\\.telusoriginals\\\\.com',\\n r'video\\\\.unext\\\\.jp',\\n r'www\\\\.web\\\\.nhk',\\n+ r'fod\\\\.fujitv\\\\.co\\\\.jp',\\n+ r'zee5\\\\.com',\\n )\\n \\n _TESTS = [{\\n@@ -252,6 +254,14 @@ class KnownDRMIE(UnsupportedInfoExtractor):\\n # https://github.com/yt-dlp/yt-dlp/issues/14620\\n 'url': 'https://www.web.nhk/tv/an/72hours/pl/series-tep-W3W8WRN8M3/ep/QW8ZY6146V',\\n 'only_matching': True,\\n+ }, {\\n+ # https://github.com/yt-dlp/yt-dlp/issues/7064\\n+ # https://github.com/yt-dlp/yt-dlp/issues/10264\\n+ 'url': 'https://fod.fujitv.co.jp/title/709f/709f130001/',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.zee5.com/',\\n+ 'only_matching': True,\\n }]\\n \\n def _real_extract(self, url):\\n@@ -291,6 +301,8 @@ class KnownPiracyIE(UnsupportedInfoExtractor):\\n r'einthusan\\\\.(?:tv|com|ca)',\\n r'yourupload\\\\.com',\\n r'xanimu\\\\.com',\\n+ r'musicdex\\\\.org',\\n+ r'duboku\\\\.io',\\n )\\n \\n _TESTS = [{\\ndiff --git a/yt_dlp/extractor/utreon.py b/yt_dlp/extractor/utreon.py\\ndeleted file mode 100644\\nindex fc44df97b0b3..000000000000\\n--- a/yt_dlp/extractor/utreon.py\\n+++ /dev/null\\n@@ -1,98 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- dict_get,\\n- int_or_none,\\n- str_or_none,\\n- try_get,\\n- unified_strdate,\\n- url_or_none,\\n-)\\n-\\n-\\n-class UtreonIE(InfoExtractor):\\n- IE_NAME = 'playeur'\\n- _VALID_URL = r'https?://(?:www\\\\.)?(?:utreon|playeur)\\\\.com/v/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- 'url': 'https://utreon.com/v/z_I7ikQbuDw',\\n- 'info_dict': {\\n- 'id': 'z_I7ikQbuDw',\\n- 'ext': 'mp4',\\n- 'title': 'Freedom Friday meditation - Rising in the wind',\\n- 'description': 'md5:a9bf15a42434a062fe313b938343ad1b',\\n- 'uploader': 'Heather Dawn Elemental Health',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'release_date': '20210723',\\n- 'duration': 586,\\n- },\\n- }, {\\n- 'url': 'https://utreon.com/v/jerJw5EOOVU',\\n- 'info_dict': {\\n- 'id': 'jerJw5EOOVU',\\n- 'ext': 'mp4',\\n- 'title': 'When I\\\\'m alone, I love to reflect in peace, to make my dreams come true... [Quotes and Poems]',\\n- 'description': 'md5:4026aa3a2c10169c3649926ac8ef62b6',\\n- 'uploader': 'Frases e Poemas Quotes and Poems',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'release_date': '20210723',\\n- 'duration': 60,\\n- },\\n- }, {\\n- 'url': 'https://utreon.com/v/C4ZxXhYBBmE',\\n- 'info_dict': {\\n- 'id': 'C4ZxXhYBBmE',\\n- 'ext': 'mp4',\\n- 'title': 'Bidenโs Capital Gains Tax Rate to Test Worldโs Highest',\\n- 'description': 'md5:995aa9ad0733c0e5863ebdeff954f40e',\\n- 'uploader': 'Nomad Capitalist',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'release_date': '20210723',\\n- 'duration': 884,\\n- },\\n- }, {\\n- 'url': 'https://utreon.com/v/Y-stEH-FBm8',\\n- 'info_dict': {\\n- 'id': 'Y-stEH-FBm8',\\n- 'ext': 'mp4',\\n- 'title': 'Creeper-Chan Pranks Steve! ๐ [MINECRAFT ANIME]',\\n- 'description': 'md5:7a48450b0d761b96dec194be0c5ecb5f',\\n- 'uploader': 'Merryweather Comics',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'release_date': '20210718',\\n- 'duration': 151,\\n- },\\n- }, {\\n- 'url': 'https://playeur.com/v/Wzqp-UrxSeu',\\n- 'info_dict': {\\n- 'id': 'Wzqp-UrxSeu',\\n- 'ext': 'mp4',\\n- 'title': 'Update: Clockwork Basilisk Books on the Way!',\\n- 'description': 'md5:d9756b0b1884c904655b0e170d17cea5',\\n- 'uploader': 'Forgotten Weapons',\\n- 'release_date': '20240208',\\n- 'thumbnail': r're:^https?://.+\\\\.jpg',\\n- 'duration': 262,\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- json_data = self._download_json(\\n- 'https://api.playeur.com/v1/videos/' + video_id,\\n- video_id)\\n- videos_json = json_data['videos']\\n- formats = [{\\n- 'url': format_url,\\n- 'format_id': format_key.split('_')[1],\\n- 'height': int(format_key.split('_')[1][:-1]),\\n- } for format_key, format_url in videos_json.items() if url_or_none(format_url)]\\n- thumbnail = url_or_none(dict_get(json_data, ('cover_image_url', 'preview_image_url')))\\n- return {\\n- 'id': video_id,\\n- 'title': json_data['title'],\\n- 'formats': formats,\\n- 'description': str_or_none(json_data.get('description')),\\n- 'duration': int_or_none(json_data.get('duration')),\\n- 'uploader': str_or_none(try_get(json_data, lambda x: x['channel']['title'])),\\n- 'thumbnail': thumbnail,\\n- 'release_date': unified_strdate(json_data.get('published_datetime')),\\n- }\\ndiff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\\nindex 1eb25530f833..dcf48c4ccc2f 100644\\n--- a/yt_dlp/extractor/vgtv.py\\n+++ b/yt_dlp/extractor/vgtv.py\\n@@ -1,7 +1,6 @@\\n import re\\n \\n from .common import InfoExtractor\\n-from .xstream import XstreamIE\\n from ..utils import (\\n ExtractorError,\\n float_or_none,\\n@@ -9,7 +8,8 @@\\n )\\n \\n \\n-class VGTVIE(XstreamIE): # XXX: Do not subclass from concrete IE\\n+class VGTVIE(InfoExtractor):\\n+ _WORKING = False\\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\\n _GEO_BYPASS = False\\n \\ndiff --git a/yt_dlp/extractor/videodetective.py b/yt_dlp/extractor/videodetective.py\\ndeleted file mode 100644\\nindex 7928a41c2153..000000000000\\n--- a/yt_dlp/extractor/videodetective.py\\n+++ /dev/null\\n@@ -1,27 +0,0 @@\\n-from .common import InfoExtractor\\n-from .internetvideoarchive import InternetVideoArchiveIE\\n-\\n-\\n-class VideoDetectiveIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:www\\\\.)?videodetective\\\\.com/[^/]+/[^/]+/(?P<id>\\\\d+)'\\n-\\n- _TEST = {\\n- 'url': 'http://www.videodetective.com/movies/kick-ass-2/194487',\\n- 'info_dict': {\\n- 'id': '194487',\\n- 'ext': 'mp4',\\n- 'title': 'Kick-Ass 2',\\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\\n- },\\n- 'params': {\\n- # m3u8 download\\n- 'skip_download': True,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- query = 'customerid=69249&publishedid=' + video_id\\n- return self.url_result(\\n- InternetVideoArchiveIE._build_json_url(query),\\n- ie=InternetVideoArchiveIE.ie_key())\\ndiff --git a/yt_dlp/extractor/videofyme.py b/yt_dlp/extractor/videofyme.py\\ndeleted file mode 100644\\nindex 6cdda75b2f3b..000000000000\\n--- a/yt_dlp/extractor/videofyme.py\\n+++ /dev/null\\n@@ -1,51 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_iso8601,\\n-)\\n-\\n-\\n-class VideofyMeIE(InfoExtractor):\\n- _WORKING = False\\n- _VALID_URL = r'https?://(?:www\\\\.videofy\\\\.me/.+?|p\\\\.videofy\\\\.me/v)/(?P<id>\\\\d+)(&|#|$)'\\n- IE_NAME = 'videofy.me'\\n-\\n- _TEST = {\\n- 'url': 'http://www.videofy.me/thisisvideofyme/1100701',\\n- 'md5': 'c77d700bdc16ae2e9f3c26019bd96143',\\n- 'info_dict': {\\n- 'id': '1100701',\\n- 'ext': 'mp4',\\n- 'title': 'This is VideofyMe',\\n- 'description': '',\\n- 'upload_date': '20130326',\\n- 'timestamp': 1364288959,\\n- 'uploader': 'VideofyMe',\\n- 'uploader_id': 'thisisvideofyme',\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'comment_count': int,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n-\\n- config = self._download_json(f'http://vf-player-info-loader.herokuapp.com/{video_id}.json', video_id)['videoinfo']\\n-\\n- video = config.get('video')\\n- blog = config.get('blog', {})\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': video['title'],\\n- 'url': video['sources']['source']['url'],\\n- 'thumbnail': video.get('thumb'),\\n- 'description': video.get('description'),\\n- 'timestamp': parse_iso8601(video.get('date')),\\n- 'uploader': blog.get('name'),\\n- 'uploader_id': blog.get('identifier'),\\n- 'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),\\n- 'like_count': int_or_none(video.get('likes')),\\n- 'comment_count': int_or_none(video.get('nrOfComments')),\\n- }\\ndiff --git a/yt_dlp/extractor/videoken.py b/yt_dlp/extractor/videoken.py\\nindex dc1dcf12bd86..e4d14fe48855 100644\\n--- a/yt_dlp/extractor/videoken.py\\n+++ b/yt_dlp/extractor/videoken.py\\n@@ -1,190 +1,15 @@\\n-import base64\\n-import functools\\n-import math\\n-import re\\n-import time\\n import urllib.parse\\n \\n from .common import InfoExtractor\\n from .slideslive import SlidesLiveIE\\n from ..utils import (\\n- ExtractorError,\\n- InAdvancePagedList,\\n- int_or_none,\\n remove_start,\\n- traverse_obj,\\n update_url_query,\\n url_or_none,\\n )\\n \\n \\n-class VideoKenBaseIE(InfoExtractor):\\n- _ORGANIZATIONS = {\\n- 'videos.icts.res.in': 'icts',\\n- 'videos.cncf.io': 'cncf',\\n- 'videos.neurips.cc': 'neurips',\\n- }\\n- _BASE_URL_RE = rf'https?://(?P<host>{\\\"|\\\".join(map(re.escape, _ORGANIZATIONS))})/'\\n-\\n- _PAGE_SIZE = 12\\n-\\n- def _get_org_id_and_api_key(self, org, video_id):\\n- details = self._download_json(\\n- f'https://analytics.videoken.com/api/videolake/{org}/details', video_id,\\n- note='Downloading organization ID and API key', headers={\\n- 'Accept': 'application/json',\\n- })\\n- return details['id'], details['apikey']\\n-\\n- def _create_slideslive_url(self, video_url, video_id, referer):\\n- if not video_url and not video_id:\\n- return\\n- elif not video_url or 'embed/sign-in' in video_url:\\n- video_url = f'https://slideslive.com/embed/{remove_start(video_id, \\\"slideslive-\\\")}'\\n- if url_or_none(referer):\\n- return update_url_query(video_url, {\\n- 'embed_parent_url': referer,\\n- 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\\n- })\\n- return video_url\\n-\\n- def _extract_videos(self, videos, url):\\n- for video in traverse_obj(videos, (('videos', 'results'), ...)):\\n- video_id = traverse_obj(video, 'youtube_id', 'videoid')\\n- if not video_id:\\n- continue\\n- ie_key = None\\n- if traverse_obj(video, 'type', 'source') == 'youtube':\\n- video_url = video_id\\n- ie_key = 'Youtube'\\n- else:\\n- video_url = traverse_obj(video, 'embed_url', 'embeddableurl', expected_type=url_or_none)\\n- if not video_url:\\n- continue\\n- elif urllib.parse.urlparse(video_url).hostname == 'slideslive.com':\\n- ie_key = SlidesLiveIE\\n- video_url = self._create_slideslive_url(video_url, video_id, url)\\n- yield self.url_result(video_url, ie_key, video_id)\\n-\\n-\\n-class VideoKenIE(VideoKenBaseIE):\\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:(?:topic|category)/[^/#?]+/)?video/(?P<id>[\\\\w-]+)'\\n- _TESTS = [{\\n- # neurips -> videoken -> slideslive\\n- 'url': 'https://videos.neurips.cc/video/slideslive-38922815',\\n- 'info_dict': {\\n- 'id': '38922815',\\n- 'ext': 'mp4',\\n- 'title': 'Efficient Processing of Deep Neural Network: from Algorithms to Hardware Architectures',\\n- 'timestamp': 1630939331,\\n- 'upload_date': '20210906',\\n- 'thumbnail': r're:^https?://.*\\\\.(?:jpg|png)',\\n- 'thumbnails': 'count:330',\\n- 'chapters': 'count:329',\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8',\\n- },\\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\\n- }, {\\n- # neurips -> videoken -> slideslive -> youtube\\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/video/slideslive-38923348',\\n- 'info_dict': {\\n- 'id': '2Xa_dt78rJE',\\n- 'ext': 'mp4',\\n- 'display_id': '38923348',\\n- 'title': 'Machine Education',\\n- 'description': 'Watch full version of this video at https://slideslive.com/38923348.',\\n- 'channel': 'SlidesLive Videos - G2',\\n- 'channel_id': 'UCOExahQQ588Da8Nft_Ltb9w',\\n- 'channel_url': 'https://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\\n- 'uploader': 'SlidesLive Videos - G2',\\n- 'uploader_id': 'UCOExahQQ588Da8Nft_Ltb9w',\\n- 'uploader_url': 'http://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\\n- 'duration': 2504,\\n- 'timestamp': 1618922125,\\n- 'upload_date': '20200131',\\n- 'age_limit': 0,\\n- 'channel_follower_count': int,\\n- 'view_count': int,\\n- 'availability': 'unlisted',\\n- 'live_status': 'not_live',\\n- 'playable_in_embed': True,\\n- 'categories': ['People & Blogs'],\\n- 'tags': [],\\n- 'thumbnail': r're:^https?://.*\\\\.(?:jpg|webp)',\\n- 'thumbnails': 'count:78',\\n- 'chapters': 'count:77',\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8',\\n- },\\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\\n- }, {\\n- # icts -> videoken -> youtube\\n- 'url': 'https://videos.icts.res.in/topic/random%20variable/video/zysIsojYdvc',\\n- 'info_dict': {\\n- 'id': 'zysIsojYdvc',\\n- 'ext': 'mp4',\\n- 'title': 'Small-worlds, complex networks and random graphs (Lecture 3) by Remco van der Hofstad',\\n- 'description': 'md5:87433069d79719eeadc1962cc2ace00b',\\n- 'channel': 'International Centre for Theoretical Sciences',\\n- 'channel_id': 'UCO3xnVTHzB7l-nc8mABUJIQ',\\n- 'channel_url': 'https://www.youtube.com/channel/UCO3xnVTHzB7l-nc8mABUJIQ',\\n- 'uploader': 'International Centre for Theoretical Sciences',\\n- 'uploader_id': 'ICTStalks',\\n- 'uploader_url': 'http://www.youtube.com/user/ICTStalks',\\n- 'duration': 3372,\\n- 'upload_date': '20191004',\\n- 'age_limit': 0,\\n- 'live_status': 'not_live',\\n- 'availability': 'public',\\n- 'playable_in_embed': True,\\n- 'channel_follower_count': int,\\n- 'like_count': int,\\n- 'view_count': int,\\n- 'categories': ['Science & Technology'],\\n- 'tags': [],\\n- 'thumbnail': r're:^https?://.*\\\\.(?:jpg|webp)',\\n- 'thumbnails': 'count:42',\\n- 'chapters': 'count:20',\\n- },\\n- 'params': {\\n- 'skip_download': 'm3u8',\\n- },\\n- }, {\\n- 'url': 'https://videos.cncf.io/category/478/video/IL4nxbmUIX8',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://videos.cncf.io/topic/kubernetes/video/YAM2d7yTrrI',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://videos.icts.res.in/video/d7HuP_abpKU',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- hostname, video_id = self._match_valid_url(url).group('host', 'id')\\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], video_id)\\n- details = self._download_json(\\n- 'https://analytics.videoken.com/api/videoinfo_private', video_id, query={\\n- 'videoid': video_id,\\n- 'org_id': org_id,\\n- }, headers={'Accept': 'application/json'}, note='Downloading VideoKen API JSON',\\n- errnote='Failed to download VideoKen API JSON', fatal=False)\\n- if details:\\n- return next(self._extract_videos({'videos': [details]}, url))\\n- # fallback for API error 400 response\\n- elif video_id.startswith('slideslive-'):\\n- return self.url_result(\\n- self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\\n- elif re.match(r'^[\\\\w-]{11}$', video_id):\\n- return self.url_result(video_id, 'Youtube', video_id)\\n- else:\\n- raise ExtractorError('Unable to extract without VideoKen API response')\\n-\\n-\\n-class VideoKenPlayerIE(VideoKenBaseIE):\\n+class VideoKenPlayerIE(InfoExtractor):\\n _VALID_URL = r'https?://player\\\\.videoken\\\\.com/embed/slideslive-(?P<id>\\\\d+)'\\n _TESTS = [{\\n 'url': 'https://player.videoken.com/embed/slideslive-38968434',\\n@@ -203,135 +28,19 @@ class VideoKenPlayerIE(VideoKenBaseIE):\\n },\\n }]\\n \\n+ def _create_slideslive_url(self, video_url, video_id, referer):\\n+ if not video_url and not video_id:\\n+ return\\n+ elif not video_url or 'embed/sign-in' in video_url:\\n+ video_url = f'https://slideslive.com/embed/{remove_start(video_id, \\\"slideslive-\\\")}'\\n+ if url_or_none(referer):\\n+ return update_url_query(video_url, {\\n+ 'embed_parent_url': referer,\\n+ 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\\n+ })\\n+ return video_url\\n+\\n def _real_extract(self, url):\\n video_id = self._match_id(url)\\n return self.url_result(\\n self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\\n-\\n-\\n-class VideoKenPlaylistIE(VideoKenBaseIE):\\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:category/\\\\d+/)?playlist/(?P<id>\\\\d+)'\\n- _TESTS = [{\\n- 'url': 'https://videos.icts.res.in/category/1822/playlist/381',\\n- 'playlist_mincount': 117,\\n- 'info_dict': {\\n- 'id': '381',\\n- 'title': 'Cosmology - The Next Decade',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- hostname, playlist_id = self._match_valid_url(url).group('host', 'id')\\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], playlist_id)\\n- videos = self._download_json(\\n- f'https://analytics.videoken.com/api/{org_id}/playlistitems/{playlist_id}/',\\n- playlist_id, headers={'Accept': 'application/json'}, note='Downloading API JSON')\\n- return self.playlist_result(self._extract_videos(videos, url), playlist_id, videos.get('title'))\\n-\\n-\\n-class VideoKenCategoryIE(VideoKenBaseIE):\\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'category/(?P<id>\\\\d+)/?(?:$|[?#])'\\n- _TESTS = [{\\n- 'url': 'https://videos.icts.res.in/category/1822/',\\n- 'playlist_mincount': 500,\\n- 'info_dict': {\\n- 'id': '1822',\\n- 'title': 'Programs',\\n- },\\n- }, {\\n- 'url': 'https://videos.neurips.cc/category/350/',\\n- 'playlist_mincount': 34,\\n- 'info_dict': {\\n- 'id': '350',\\n- 'title': 'NeurIPS 2018',\\n- },\\n- }, {\\n- 'url': 'https://videos.cncf.io/category/479/',\\n- 'playlist_mincount': 328,\\n- 'info_dict': {\\n- 'id': '479',\\n- 'title': 'KubeCon + CloudNativeCon Europe\\\\'19',\\n- },\\n- }]\\n-\\n- def _get_category_page(self, category_id, org_id, page=1, note=None):\\n- return self._download_json(\\n- f'https://analytics.videoken.com/api/videolake/{org_id}/category_videos', category_id,\\n- fatal=False, note=note if note else f'Downloading category page {page}',\\n- query={\\n- 'category_id': category_id,\\n- 'page_number': page,\\n- 'length': self._PAGE_SIZE,\\n- }, headers={'Accept': 'application/json'}) or {}\\n-\\n- def _entries(self, category_id, org_id, url, page):\\n- videos = self._get_category_page(category_id, org_id, page + 1)\\n- yield from self._extract_videos(videos, url)\\n-\\n- def _real_extract(self, url):\\n- hostname, category_id = self._match_valid_url(url).group('host', 'id')\\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], category_id)\\n- category_info = self._get_category_page(category_id, org_id, note='Downloading category info')\\n- category = category_info['category_name']\\n- total_pages = math.ceil(int(category_info['recordsTotal']) / self._PAGE_SIZE)\\n- return self.playlist_result(InAdvancePagedList(\\n- functools.partial(self._entries, category_id, org_id, url),\\n- total_pages, self._PAGE_SIZE), category_id, category)\\n-\\n-\\n-class VideoKenTopicIE(VideoKenBaseIE):\\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'topic/(?P<id>[^/#?]+)/?(?:$|[?#])'\\n- _TESTS = [{\\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/',\\n- 'playlist_mincount': 500,\\n- 'info_dict': {\\n- 'id': 'machine_learning',\\n- 'title': 'machine learning',\\n- },\\n- }, {\\n- 'url': 'https://videos.icts.res.in/topic/gravitational%20waves/',\\n- 'playlist_mincount': 77,\\n- 'info_dict': {\\n- 'id': 'gravitational_waves',\\n- 'title': 'gravitational waves',\\n- },\\n- }, {\\n- 'url': 'https://videos.cncf.io/topic/prometheus/',\\n- 'playlist_mincount': 134,\\n- 'info_dict': {\\n- 'id': 'prometheus',\\n- 'title': 'prometheus',\\n- },\\n- }]\\n-\\n- def _get_topic_page(self, topic, org_id, search_id, api_key, page=1, note=None):\\n- return self._download_json(\\n- 'https://es.videoken.com/api/v1.0/get_results', topic, fatal=False, query={\\n- 'orgid': org_id,\\n- 'size': self._PAGE_SIZE,\\n- 'query': topic,\\n- 'page': page,\\n- 'sort': 'upload_desc',\\n- 'filter': 'all',\\n- 'token': api_key,\\n- 'is_topic': 'true',\\n- 'category': '',\\n- 'searchid': search_id,\\n- }, headers={'Accept': 'application/json'},\\n- note=note if note else f'Downloading topic page {page}') or {}\\n-\\n- def _entries(self, topic, org_id, search_id, api_key, url, page):\\n- videos = self._get_topic_page(topic, org_id, search_id, api_key, page + 1)\\n- yield from self._extract_videos(videos, url)\\n-\\n- def _real_extract(self, url):\\n- hostname, topic_id = self._match_valid_url(url).group('host', 'id')\\n- topic = urllib.parse.unquote(topic_id)\\n- topic_id = topic.replace(' ', '_')\\n- org_id, api_key = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], topic)\\n- search_id = base64.b64encode(f':{topic}:{int(time.time())}:transient'.encode()).decode()\\n- total_pages = int_or_none(self._get_topic_page(\\n- topic, org_id, search_id, api_key, note='Downloading topic info')['total_no_of_pages'])\\n- return self.playlist_result(InAdvancePagedList(\\n- functools.partial(self._entries, topic, org_id, search_id, api_key, url),\\n- total_pages, self._PAGE_SIZE), topic_id, topic)\\ndiff --git a/yt_dlp/extractor/videomore.py b/yt_dlp/extractor/videomore.py\\ndeleted file mode 100644\\nindex c41d3d984553..000000000000\\n--- a/yt_dlp/extractor/videomore.py\\n+++ /dev/null\\n@@ -1,304 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- int_or_none,\\n- parse_qs,\\n-)\\n-\\n-\\n-class VideomoreBaseIE(InfoExtractor):\\n- _API_BASE_URL = 'https://more.tv/api/v3/web/'\\n- _VALID_URL_BASE = r'https?://(?:videomore\\\\.ru|more\\\\.tv)/'\\n-\\n- def _download_page_data(self, display_id):\\n- return self._download_json(\\n- self._API_BASE_URL + 'PageData', display_id, query={\\n- 'url': '/' + display_id,\\n- })['attributes']['response']['data']\\n-\\n- def _track_url_result(self, track):\\n- track_vod = track['trackVod']\\n- video_url = track_vod.get('playerLink') or track_vod['link']\\n- return self.url_result(\\n- video_url, VideomoreIE.ie_key(), track_vod.get('hubId'))\\n-\\n-\\n-class VideomoreIE(InfoExtractor):\\n- IE_NAME = 'videomore'\\n- _VALID_URL = r'''(?x)\\n- videomore:(?P<sid>\\\\d+)$|\\n- https?://\\n- (?:\\n- videomore\\\\.ru/\\n- (?:\\n- embed|\\n- [^/]+/[^/]+\\n- )/|\\n- (?:\\n- (?:player\\\\.)?videomore\\\\.ru|\\n- siren\\\\.more\\\\.tv/player\\n- )/[^/]*\\\\?.*?\\\\btrack_id=|\\n- odysseus\\\\.more.tv/player/(?P<partner_id>\\\\d+)/\\n- )\\n- (?P<id>\\\\d+)\\n- (?:[/?#&]|\\\\.(?:xml|json)|$)\\n- '''\\n- _EMBED_REGEX = [r'''(?x)\\n- (?:\\n- <iframe[^>]+src=([\\\\'\\\"])|\\n- <object[^>]+data=([\\\"\\\\'])https?://videomore\\\\.ru/player\\\\.swf\\\\?.*config=\\n- )(?P<url>https?://videomore\\\\.ru/[^?#\\\"']+/\\\\d+(?:\\\\.xml)?)\\n- ''']\\n- _TESTS = [{\\n- 'url': 'http://videomore.ru/kino_v_detalayah/5_sezon/367617',\\n- 'md5': '44455a346edc0d509ac5b5a5b531dc35',\\n- 'info_dict': {\\n- 'id': '367617',\\n- 'ext': 'flv',\\n- 'title': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
5 ัะตะทะพะฝ ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\\n- 'series': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
',\\n- 'episode': 'ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 2910,\\n- 'view_count': int,\\n- 'comment_count': int,\\n- 'age_limit': 16,\\n- },\\n- 'skip': 'The video is not available for viewing.',\\n- }, {\\n- 'url': 'http://videomore.ru/embed/259974',\\n- 'info_dict': {\\n- 'id': '259974',\\n- 'ext': 'mp4',\\n- 'title': 'ะะพะปะพะดะตะถะบะฐ 2 ัะตะทะพะฝ 40 ัะตัะธั',\\n- 'series': 'ะะพะปะพะดะตะถะบะฐ',\\n- 'season': '2 ัะตะทะพะฝ',\\n- 'episode': '40 ัะตัะธั',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 2789,\\n- 'view_count': int,\\n- 'age_limit': 16,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo/341073',\\n- 'info_dict': {\\n- 'id': '341073',\\n- 'ext': 'flv',\\n- 'title': 'ะัะพะผะพ ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\\n- 'episode': 'ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 29,\\n- 'age_limit': 16,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'The video is not available for viewing.',\\n- }, {\\n- 'url': 'http://videomore.ru/elki_3?track_id=364623',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://videomore.ru/embed/364623',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://videomore.ru/video/tracks/364623.xml',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://videomore.ru/video/tracks/364623.json',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'http://videomore.ru/video/tracks/158031/quotes/33248',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'videomore:367617',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://player.videomore.ru/?partner_id=97&track_id=736234&autoplay=0&userToken=',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://odysseus.more.tv/player/1788/352317',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://siren.more.tv/player/config?track_id=352317&partner_id=1788&user_token=',\\n- 'only_matching': True,\\n- }]\\n- _GEO_BYPASS = False\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- video_id = mobj.group('sid') or mobj.group('id')\\n- partner_id = mobj.group('partner_id') or parse_qs(url).get('partner_id', [None])[0] or '97'\\n-\\n- item = self._download_json(\\n- 'https://siren.more.tv/player/config', video_id, query={\\n- 'partner_id': partner_id,\\n- 'track_id': video_id,\\n- })['data']['playlist']['items'][0]\\n-\\n- title = item.get('title')\\n- series = item.get('project_name')\\n- season = item.get('season_name')\\n- episode = item.get('episode_name')\\n- if not title:\\n- title = []\\n- for v in (series, season, episode):\\n- if v:\\n- title.append(v)\\n- title = ' '.join(title)\\n-\\n- streams = item.get('streams') or []\\n- for protocol in ('DASH', 'HLS'):\\n- stream_url = item.get(protocol.lower() + '_url')\\n- if stream_url:\\n- streams.append({'protocol': protocol, 'url': stream_url})\\n-\\n- formats = []\\n- for stream in streams:\\n- stream_url = stream.get('url')\\n- if not stream_url:\\n- continue\\n- protocol = stream.get('protocol')\\n- if protocol == 'DASH':\\n- formats.extend(self._extract_mpd_formats(\\n- stream_url, video_id, mpd_id='dash', fatal=False))\\n- elif protocol == 'HLS':\\n- formats.extend(self._extract_m3u8_formats(\\n- stream_url, video_id, 'mp4', 'm3u8_native',\\n- m3u8_id='hls', fatal=False))\\n- elif protocol == 'MSS':\\n- formats.extend(self._extract_ism_formats(\\n- stream_url, video_id, ism_id='mss', fatal=False))\\n-\\n- if not formats:\\n- error = item.get('error')\\n- if error:\\n- if error in ('ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะฝะตะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ะฝะฐ ัะตััะธัะพัะธะธ ััะพะน ัััะฐะฝั', 'ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ัะพะปัะบะพ ะฝะฐ ัะตััะธัะพัะธะธ ะ ะพััะธะธ'):\\n- self.raise_geo_restricted(countries=['RU'], metadata_available=True)\\n- self.raise_no_formats(error, expected=True)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'series': series,\\n- 'season': season,\\n- 'episode': episode,\\n- 'thumbnail': item.get('thumbnail_url'),\\n- 'duration': int_or_none(item.get('duration')),\\n- 'view_count': int_or_none(item.get('views')),\\n- 'age_limit': int_or_none(item.get('min_age')),\\n- 'formats': formats,\\n- }\\n-\\n-\\n-class VideomoreVideoIE(VideomoreBaseIE):\\n- IE_NAME = 'videomore:video'\\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?P<id>(?:(?:[^/]+/){2})?[^/?#&]+)(?:/*|[?#&].*?)$'\\n- _TESTS = [{\\n- # single video with og:video:iframe\\n- 'url': 'http://videomore.ru/elki_3',\\n- 'info_dict': {\\n- 'id': '364623',\\n- 'ext': 'flv',\\n- 'title': 'ะะปะบะธ 3',\\n- 'description': '',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 5579,\\n- 'age_limit': 6,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'Requires logging in',\\n- }, {\\n- # season single series with og:video:iframe\\n- 'url': 'http://videomore.ru/poslednii_ment/1_sezon/14_seriya',\\n- 'info_dict': {\\n- 'id': '352317',\\n- 'ext': 'mp4',\\n- 'title': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั 1 ัะตะทะพะฝ 14 ัะตัะธั',\\n- 'series': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั',\\n- 'season': '1 ัะตะทะพะฝ',\\n- 'episode': '14 ัะตัะธั',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 2464,\\n- 'age_limit': 16,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- 'url': 'http://videomore.ru/sejchas_v_seti/serii_221-240/226_vypusk',\\n- 'only_matching': True,\\n- }, {\\n- # single video without og:video:iframe\\n- 'url': 'http://videomore.ru/marin_i_ego_druzya',\\n- 'info_dict': {\\n- 'id': '359073',\\n- 'ext': 'flv',\\n- 'title': '1 ัะตัะธั. ะะดัะฐะฒััะฒัะน, ะะบะฒะฐะฒะธะปะปั!',\\n- 'description': 'md5:c6003179538b5d353e7bcd5b1372b2d7',\\n- 'thumbnail': r're:^https?://.*\\\\.jpg',\\n- 'duration': 754,\\n- 'age_limit': 6,\\n- 'view_count': int,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'redirects to https://more.tv/',\\n- }, {\\n- 'url': 'https://videomore.ru/molodezhka/6_sezon/29_seriya?utm_so',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://more.tv/poslednii_ment/1_sezon/14_seriya',\\n- 'only_matching': True,\\n- }]\\n-\\n- @classmethod\\n- def suitable(cls, url):\\n- return False if VideomoreIE.suitable(url) else super().suitable(url)\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- return self._track_url_result(self._download_page_data(display_id))\\n-\\n-\\n-class VideomoreSeasonIE(VideomoreBaseIE):\\n- IE_NAME = 'videomore:season'\\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?!embed)(?P<id>[^/]+/[^/?#&]+)(?:/*|[?#&].*?)$'\\n- _TESTS = [{\\n- 'url': 'http://videomore.ru/molodezhka/film_o_filme',\\n- 'info_dict': {\\n- 'id': 'molodezhka/film_o_filme',\\n- 'title': 'ะคะธะปัะผ ะพ ัะธะปัะผะต',\\n- },\\n- 'playlist_mincount': 3,\\n- }, {\\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo?utm_so',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://more.tv/molodezhka/film_o_filme',\\n- 'only_matching': True,\\n- }]\\n-\\n- @classmethod\\n- def suitable(cls, url):\\n- return (False if (VideomoreIE.suitable(url) or VideomoreVideoIE.suitable(url))\\n- else super().suitable(url))\\n-\\n- def _real_extract(self, url):\\n- display_id = self._match_id(url)\\n- season = self._download_page_data(display_id)\\n- season_id = str(season['id'])\\n- tracks = self._download_json(\\n- self._API_BASE_URL + f'seasons/{season_id}/tracks',\\n- season_id)['data']\\n- entries = []\\n- for track in tracks:\\n- entries.append(self._track_url_result(track))\\n- return self.playlist_result(entries, display_id, season.get('title'))\\ndiff --git a/yt_dlp/extractor/vimm.py b/yt_dlp/extractor/vimm.py\\ndeleted file mode 100644\\nindex 7097149a5528..000000000000\\n--- a/yt_dlp/extractor/vimm.py\\n+++ /dev/null\\n@@ -1,66 +0,0 @@\\n-from .common import InfoExtractor\\n-\\n-\\n-class VimmIE(InfoExtractor):\\n- IE_NAME = 'Vimm:stream'\\n- _VALID_URL = r'https?://(?:www\\\\.)?vimm\\\\.tv/(?:c/)?(?P<id>[0-9a-z-]+)$'\\n- _TESTS = [{\\n- 'url': 'https://www.vimm.tv/c/calimeatwagon',\\n- 'info_dict': {\\n- 'id': 'calimeatwagon',\\n- 'ext': 'mp4',\\n- 'title': 're:^calimeatwagon [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\\n- 'live_status': 'is_live',\\n- },\\n- 'skip': 'Live',\\n- }, {\\n- 'url': 'https://www.vimm.tv/octaafradio',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- channel_id = self._match_id(url)\\n-\\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\\n- f'https://www.vimm.tv/hls/{channel_id}.m3u8', channel_id, 'mp4', m3u8_id='hls', live=True)\\n-\\n- return {\\n- 'id': channel_id,\\n- 'title': channel_id,\\n- 'is_live': True,\\n- 'formats': formats,\\n- 'subtitles': subs,\\n- }\\n-\\n-\\n-class VimmRecordingIE(InfoExtractor):\\n- IE_NAME = 'Vimm:recording'\\n- _VALID_URL = r'https?://(?:www\\\\.)?vimm\\\\.tv/c/(?P<channel_id>[0-9a-z-]+)\\\\?v=(?P<video_id>[0-9A-Za-z]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.vimm.tv/c/kaldewei?v=2JZsrPTFxsSz',\\n- 'md5': '15122ee95baa32a548e4a3e120b598f1',\\n- 'info_dict': {\\n- 'id': '2JZsrPTFxsSz',\\n- 'ext': 'mp4',\\n- 'title': 'VIMM - [DE/GER] Kaldewei Live - In Farbe und Bunt',\\n- 'uploader_id': 'kaldewei',\\n- },\\n- }]\\n-\\n- def _real_extract(self, url):\\n- channel_id, video_id = self._match_valid_url(url).groups()\\n-\\n- webpage = self._download_webpage(url, video_id)\\n- title = self._og_search_title(webpage)\\n-\\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\\n- f'https://d211qfrkztakg3.cloudfront.net/{channel_id}/{video_id}/index.m3u8', video_id, 'mp4', m3u8_id='hls', live=False)\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'is_live': False,\\n- 'uploader_id': channel_id,\\n- 'formats': formats,\\n- 'subtitles': subs,\\n- }\\ndiff --git a/yt_dlp/extractor/vodpl.py b/yt_dlp/extractor/vodpl.py\\ndeleted file mode 100644\\nindex 8af1572d074f..000000000000\\n--- a/yt_dlp/extractor/vodpl.py\\n+++ /dev/null\\n@@ -1,29 +0,0 @@\\n-from .onet import OnetBaseIE\\n-\\n-\\n-class VODPlIE(OnetBaseIE):\\n- _VALID_URL = r'https?://vod\\\\.pl/(?:[^/]+/)+(?P<id>[0-9a-zA-Z]+)'\\n-\\n- _TESTS = [{\\n- 'url': 'https://vod.pl/filmy/chlopaki-nie-placza/3ep3jns',\\n- 'md5': 'a7dc3b2f7faa2421aefb0ecaabf7ec74',\\n- 'info_dict': {\\n- 'id': '3ep3jns',\\n- 'ext': 'mp4',\\n- 'title': 'Chลopaki nie pลaczฤ
',\\n- 'description': 'md5:f5f03b84712e55f5ac9f0a3f94445224',\\n- 'timestamp': 1463415154,\\n- 'duration': 5765,\\n- 'upload_date': '20160516',\\n- },\\n- }, {\\n- 'url': 'https://vod.pl/seriale/belfer-na-planie-praca-kamery-online/2c10heh',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n- info_dict = self._extract_from_id(self._search_mvp_id(webpage), webpage)\\n- info_dict['id'] = video_id\\n- return info_dict\\ndiff --git a/yt_dlp/extractor/vuclip.py b/yt_dlp/extractor/vuclip.py\\ndeleted file mode 100644\\nindex ad7eab351e3b..000000000000\\n--- a/yt_dlp/extractor/vuclip.py\\n+++ /dev/null\\n@@ -1,66 +0,0 @@\\n-import re\\n-import urllib.parse\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- parse_duration,\\n- remove_end,\\n-)\\n-\\n-\\n-class VuClipIE(InfoExtractor):\\n- _VALID_URL = r'https?://(?:m\\\\.)?vuclip\\\\.com/w\\\\?.*?cid=(?P<id>[0-9]+)'\\n-\\n- _TEST = {\\n- 'url': 'http://m.vuclip.com/w?cid=1129900602&bu=8589892792&frm=w&z=34801&op=0&oc=843169247§ion=recommend',\\n- 'info_dict': {\\n- 'id': '1129900602',\\n- 'ext': '3gp',\\n- 'title': 'Top 10 TV Convicts',\\n- 'duration': 733,\\n- },\\n- }\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage(url, video_id)\\n-\\n- ad_m = re.search(\\n- r'''value=\\\"No.*?\\\" onClick=\\\"location.href='([^\\\"']+)'\\\"''', webpage)\\n- if ad_m:\\n- urlr = urllib.parse.urlparse(url)\\n- adfree_url = urlr.scheme + '://' + urlr.netloc + ad_m.group(1)\\n- webpage = self._download_webpage(\\n- adfree_url, video_id, note='Download post-ad page')\\n-\\n- error_msg = self._html_search_regex(\\n- r'<p class=\\\"message\\\">(.*?)</p>', webpage, 'error message',\\n- default=None)\\n- if error_msg:\\n- raise ExtractorError(\\n- f'{self.IE_NAME} said: {error_msg}', expected=True)\\n-\\n- # These clowns alternate between two page types\\n- video_url = self._search_regex(\\n- r'<a[^>]+href=\\\"([^\\\"]+)\\\"[^>]*><img[^>]+src=\\\"[^\\\"]*/play\\\\.gif',\\n- webpage, 'video URL', default=None)\\n- if video_url:\\n- formats = [{\\n- 'url': video_url,\\n- }]\\n- else:\\n- formats = self._parse_html5_media_entries(url, webpage, video_id)[0]['formats']\\n-\\n- title = remove_end(self._html_search_regex(\\n- r'<title>(.*?)-\\\\s*Vuclip</title>', webpage, 'title').strip(), ' - Video')\\n-\\n- duration = parse_duration(self._html_search_regex(\\n- r'[(>]([0-9]+:[0-9]+)(?:<span|\\\\))', webpage, 'duration', fatal=False))\\n-\\n- return {\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'title': title,\\n- 'duration': duration,\\n- }\\ndiff --git a/yt_dlp/extractor/vvvvid.py b/yt_dlp/extractor/vvvvid.py\\ndeleted file mode 100644\\nindex 4671bcd1f43d..000000000000\\n--- a/yt_dlp/extractor/vvvvid.py\\n+++ /dev/null\\n@@ -1,336 +0,0 @@\\n-import functools\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from .youtube import YoutubeIE\\n-from ..utils import (\\n- ExtractorError,\\n- int_or_none,\\n- str_or_none,\\n-)\\n-\\n-\\n-class VVVVIDIE(InfoExtractor):\\n- _VALID_URL_BASE = r'https?://(?:www\\\\.)?vvvvid\\\\.it/(?:#!)?(?:show|anime|film|series)/'\\n- _VALID_URL = rf'{_VALID_URL_BASE}(?P<show_id>\\\\d+)/[^/]+/(?P<season_id>\\\\d+)/(?P<id>[0-9]+)'\\n- _TESTS = [{\\n- # video_type == 'video/vvvvid'\\n- 'url': 'https://www.vvvvid.it/show/498/the-power-of-computing/518/505692/playstation-vr-cambiera-il-nostro-modo-di-giocare',\\n- 'info_dict': {\\n- 'id': '505692',\\n- 'ext': 'mp4',\\n- 'title': 'Playstation VR cambierร il nostro modo di giocare',\\n- 'duration': 93,\\n- 'series': 'The Power of Computing',\\n- 'season_id': '518',\\n- 'episode': 'Playstation VR cambierร il nostro modo di giocare',\\n- 'episode_id': '4747',\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'repost_count': int,\\n- 'thumbnail': 'https://static.vvvvid.it/img/zoomin/28CA2409-E663-34F0-2B02E72356556EA3_500k.jpg',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- # video_type == 'video/rcs'\\n- 'url': 'https://www.vvvvid.it/#!show/376/death-note-live-action/377/482493/episodio-01',\\n- 'info_dict': {\\n- 'id': '482493',\\n- 'ext': 'mp4',\\n- 'title': 'Episodio 01',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- 'skip': 'Every video/rcs is not working even in real website',\\n- }, {\\n- # video_type == 'video/youtube'\\n- 'url': 'https://www.vvvvid.it/show/404/one-punch-man/406/486683/trailer',\\n- 'md5': '33e0edfba720ad73a8782157fdebc648',\\n- 'info_dict': {\\n- 'id': 'RzmFKUDOUgw',\\n- 'ext': 'mp4',\\n- 'title': 'Trailer',\\n- 'upload_date': '20150906',\\n- 'description': 'md5:a5e802558d35247fee285875328c0b80',\\n- 'uploader_id': '@EMOTIONLabelChannel',\\n- 'uploader': 'EMOTION Label Channel',\\n- 'episode_id': '3115',\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'repost_count': int,\\n- 'availability': str,\\n- 'categories': list,\\n- 'age_limit': 0,\\n- 'channel': 'EMOTION Label Channel',\\n- 'channel_follower_count': int,\\n- 'channel_id': 'UCQ5URCSs1f5Cz9rh-cDGxNQ',\\n- 'channel_url': 'https://www.youtube.com/channel/UCQ5URCSs1f5Cz9rh-cDGxNQ',\\n- 'comment_count': int,\\n- 'duration': 133,\\n- 'episode': 'Trailer',\\n- 'heatmap': list,\\n- 'live_status': 'not_live',\\n- 'playable_in_embed': True,\\n- 'season_id': '406',\\n- 'series': 'One-Punch Man',\\n- 'tags': list,\\n- 'uploader_url': 'https://www.youtube.com/@EMOTIONLabelChannel',\\n- 'thumbnail': 'https://i.ytimg.com/vi/RzmFKUDOUgw/maxresdefault.jpg',\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- },\\n- }, {\\n- # video_type == 'video/dash'\\n- 'url': 'https://www.vvvvid.it/show/844/le-bizzarre-avventure-di-jojo-vento-aureo/938/527551/golden-wind',\\n- 'info_dict': {\\n- 'id': '527551',\\n- 'ext': 'mp4',\\n- 'title': 'Golden Wind',\\n- 'duration': 1430,\\n- 'series': 'Le bizzarre avventure di Jojo - Vento Aureo',\\n- 'season_id': '938',\\n- 'episode': 'Golden Wind',\\n- 'episode_number': 1,\\n- 'episode_id': '9089',\\n- 'view_count': int,\\n- 'like_count': int,\\n- 'repost_count': int,\\n- 'thumbnail': 'https://static.vvvvid.it/img/thumbs/Dynit/Jojo/Jojo_S05Ep01-t.jpg',\\n- 'season': 'Season 5',\\n- 'season_number': 5,\\n- },\\n- 'params': {\\n- 'skip_download': True,\\n- 'format': 'mp4',\\n- },\\n- }, {\\n- 'url': 'https://www.vvvvid.it/show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048',\\n- 'only_matching': True,\\n- }]\\n- _conn_id = None\\n-\\n- @functools.cached_property\\n- def _headers(self):\\n- return {\\n- **self.geo_verification_headers(),\\n- 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.37',\\n- }\\n-\\n- def _real_initialize(self):\\n- self._conn_id = self._download_json(\\n- 'https://www.vvvvid.it/user/login',\\n- None, headers=self._headers)['data']['conn_id']\\n-\\n- def _download_info(self, show_id, path, video_id, fatal=True, query=None):\\n- q = {\\n- 'conn_id': self._conn_id,\\n- }\\n- if query:\\n- q.update(query)\\n- response = self._download_json(\\n- f'https://www.vvvvid.it/vvvvid/ondemand/{show_id}/{path}',\\n- video_id, headers=self._headers, query=q, fatal=fatal)\\n- if not (response or fatal):\\n- return\\n- if response.get('result') == 'error':\\n- raise ExtractorError('{} said: {}'.format(\\n- self.IE_NAME, response['message']), expected=True)\\n- return response['data']\\n-\\n- def _extract_common_video_info(self, video_data):\\n- return {\\n- 'thumbnail': video_data.get('thumbnail'),\\n- 'episode_id': str_or_none(video_data.get('id')),\\n- }\\n-\\n- def _real_extract(self, url):\\n- show_id, season_id, video_id = self._match_valid_url(url).groups()\\n-\\n- response = self._download_info(\\n- show_id, f'season/{season_id}',\\n- video_id, query={'video_id': video_id})\\n-\\n- vid = int(video_id)\\n- video_data = next(filter(\\n- lambda episode: episode.get('video_id') == vid, response))\\n- title = video_data['title']\\n- formats = []\\n-\\n- # vvvvid embed_info decryption algorithm is reverse engineered from function $ds(h) at vvvvid.js\\n- def ds(h):\\n- g = 'MNOPIJKL89+/4567UVWXQRSTEFGHABCDcdefYZabstuvopqr0123wxyzklmnghij'\\n-\\n- def f(m):\\n- l = []\\n- o = 0\\n- b = False\\n- m_len = len(m)\\n- while ((not b) and o < m_len):\\n- n = m[o] << 2\\n- o += 1\\n- k = -1\\n- j = -1\\n- if o < m_len:\\n- n += m[o] >> 4\\n- o += 1\\n- if o < m_len:\\n- k = (m[o - 1] << 4) & 255\\n- k += m[o] >> 2\\n- o += 1\\n- if o < m_len:\\n- j = (m[o - 1] << 6) & 255\\n- j += m[o]\\n- o += 1\\n- else:\\n- b = True\\n- else:\\n- b = True\\n- else:\\n- b = True\\n- l.append(n)\\n- if k != -1:\\n- l.append(k)\\n- if j != -1:\\n- l.append(j)\\n- return l\\n-\\n- c = []\\n- for e in h:\\n- c.append(g.index(e))\\n-\\n- c_len = len(c)\\n- for e in range(c_len * 2 - 1, -1, -1):\\n- a = c[e % c_len] ^ c[(e + 1) % c_len]\\n- c[e % c_len] = a\\n-\\n- c = f(c)\\n- d = ''\\n- for e in c:\\n- d += chr(e)\\n-\\n- return d\\n-\\n- info = {}\\n-\\n- def metadata_from_url(r_url):\\n- if not info and r_url:\\n- mobj = re.search(r'_(?:S(\\\\d+))?Ep(\\\\d+)', r_url)\\n- if mobj:\\n- info['episode_number'] = int(mobj.group(2))\\n- season_number = mobj.group(1)\\n- if season_number:\\n- info['season_number'] = int(season_number)\\n-\\n- video_type = video_data.get('video_type')\\n- is_youtube = False\\n- for quality in ('', '_sd'):\\n- embed_code = video_data.get('embed_info' + quality)\\n- if not embed_code:\\n- continue\\n- embed_code = ds(embed_code)\\n- if video_type == 'video/kenc':\\n- embed_code = re.sub(r'https?(://[^/]+)/z/', r'https\\\\1/i/', embed_code).replace('/manifest.f4m', '/master.m3u8')\\n- kenc = self._download_json(\\n- 'https://www.vvvvid.it/kenc', video_id, query={\\n- 'action': 'kt',\\n- 'conn_id': self._conn_id,\\n- 'url': embed_code,\\n- }, fatal=False) or {}\\n- kenc_message = kenc.get('message')\\n- if kenc_message:\\n- embed_code += '?' + ds(kenc_message)\\n- formats.extend(self._extract_m3u8_formats(\\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\\n- elif video_type == 'video/rcs':\\n- formats.extend(self._extract_akamai_formats(embed_code, video_id))\\n- elif video_type == 'video/youtube':\\n- info.update({\\n- '_type': 'url_transparent',\\n- 'ie_key': YoutubeIE.ie_key(),\\n- 'url': embed_code,\\n- })\\n- is_youtube = True\\n- break\\n- elif video_type == 'video/dash':\\n- formats.extend(self._extract_m3u8_formats(\\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\\n- else:\\n- formats.extend(self._extract_wowza_formats(\\n- f'http://sb.top-ix.org/videomg/_definst_/mp4:{embed_code}/playlist.m3u8', video_id, skip_protocols=['f4m']))\\n- metadata_from_url(embed_code)\\n-\\n- if not is_youtube:\\n- info['formats'] = formats\\n-\\n- metadata_from_url(video_data.get('thumbnail'))\\n- info.update(self._extract_common_video_info(video_data))\\n- info.update({\\n- 'id': video_id,\\n- 'title': title,\\n- 'duration': int_or_none(video_data.get('length')),\\n- 'series': video_data.get('show_title'),\\n- 'season_id': season_id,\\n- 'episode': title,\\n- 'view_count': int_or_none(video_data.get('views')),\\n- 'like_count': int_or_none(video_data.get('video_likes')),\\n- 'repost_count': int_or_none(video_data.get('video_shares')),\\n- })\\n- return info\\n-\\n-\\n-class VVVVIDShowIE(VVVVIDIE): # XXX: Do not subclass from concrete IE\\n- _VALID_URL = rf'(?P<base_url>{VVVVIDIE._VALID_URL_BASE}(?P<id>\\\\d+)(?:/(?P<show_title>[^/?&#]+))?)/?(?:[?#&]|$)'\\n- _TESTS = [{\\n- 'url': 'https://www.vvvvid.it/show/156/psyco-pass',\\n- 'info_dict': {\\n- 'id': '156',\\n- 'title': 'Psycho-Pass',\\n- 'description': 'md5:94d572c0bd85894b193b8aebc9a3a806',\\n- },\\n- 'playlist_count': 46,\\n- }, {\\n- 'url': 'https://www.vvvvid.it/show/156',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- base_url, show_id, show_title = self._match_valid_url(url).groups()\\n-\\n- seasons = self._download_info(\\n- show_id, 'seasons/', show_title)\\n-\\n- show_info = self._download_info(\\n- show_id, 'info/', show_title, fatal=False)\\n-\\n- if not show_title:\\n- base_url += '/title'\\n-\\n- entries = []\\n- for season in (seasons or []):\\n- episodes = season.get('episodes') or []\\n- playlist_title = season.get('name') or show_info.get('title')\\n- for episode in episodes:\\n- if episode.get('playable') is False:\\n- continue\\n- season_id = str_or_none(episode.get('season_id'))\\n- video_id = str_or_none(episode.get('video_id'))\\n- if not (season_id and video_id):\\n- continue\\n- info = self._extract_common_video_info(episode)\\n- info.update({\\n- '_type': 'url_transparent',\\n- 'ie_key': VVVVIDIE.ie_key(),\\n- 'url': '/'.join([base_url, season_id, video_id]),\\n- 'title': episode.get('title'),\\n- 'description': episode.get('description'),\\n- 'season_id': season_id,\\n- 'playlist_title': playlist_title,\\n- })\\n- entries.append(info)\\n-\\n- return self.playlist_result(\\n- entries, show_id, show_info.get('title'), show_info.get('description'))\\ndiff --git a/yt_dlp/extractor/wdr.py b/yt_dlp/extractor/wdr.py\\nindex 1c1f0ed0526f..d906605d19aa 100644\\n--- a/yt_dlp/extractor/wdr.py\\n+++ b/yt_dlp/extractor/wdr.py\\n@@ -347,35 +347,3 @@ def _real_extract(self, url):\\n raise ExtractorError(\\n f'{display_id} is not a video', expected=True)\\n return self.url_result(zmdb_url_element.text, ie=WDRIE.ie_key())\\n-\\n-\\n-class WDRMobileIE(InfoExtractor):\\n- _VALID_URL = r'''(?x)\\n- https?://mobile-ondemand\\\\.wdr\\\\.de/\\n- .*?/fsk(?P<age_limit>[0-9]+)\\n- /[0-9]+/[0-9]+/\\n- (?P<id>[0-9]+)_(?P<title>[0-9]+)'''\\n- IE_NAME = 'wdr:mobile'\\n- _WORKING = False # no such domain\\n- _TEST = {\\n- 'url': 'http://mobile-ondemand.wdr.de/CMS2010/mdb/ondemand/weltweit/fsk0/42/421735/421735_4283021.mp4',\\n- 'info_dict': {\\n- 'title': '4283021',\\n- 'id': '421735',\\n- 'ext': 'mp4',\\n- 'age_limit': 0,\\n- },\\n- 'skip': 'Problems with loading data.',\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- return {\\n- 'id': mobj.group('id'),\\n- 'title': mobj.group('title'),\\n- 'age_limit': int(mobj.group('age_limit')),\\n- 'url': url,\\n- 'http_headers': {\\n- 'User-Agent': 'mobile',\\n- },\\n- }\\ndiff --git a/yt_dlp/extractor/weyyak.py b/yt_dlp/extractor/weyyak.py\\ndeleted file mode 100644\\nindex ef12be871fc7..000000000000\\n--- a/yt_dlp/extractor/weyyak.py\\n+++ /dev/null\\n@@ -1,86 +0,0 @@\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- float_or_none,\\n- int_or_none,\\n- parse_age_limit,\\n- traverse_obj,\\n- unified_timestamp,\\n- url_or_none,\\n-)\\n-\\n-\\n-class WeyyakIE(InfoExtractor):\\n- _VALID_URL = r'https?://weyyak\\\\.com/(?P<lang>\\\\w+)/(?:player/)?(?P<type>episode|movie)/(?P<id>\\\\d+)'\\n- _TESTS = [\\n- {\\n- 'url': 'https://weyyak.com/en/player/episode/1341952/Ribat-Al-Hob-Episode49',\\n- 'md5': '0caf55c1a615531c8fe60f146ae46849',\\n- 'info_dict': {\\n- 'id': '1341952',\\n- 'ext': 'mp4',\\n- 'title': 'Ribat Al Hob',\\n- 'duration': 2771,\\n- 'alt_title': 'ุฑุจุงุท ุงูุญุจ',\\n- 'season': 'Season 1',\\n- 'season_number': 1,\\n- 'episode': 'Episode 49',\\n- 'episode_number': 49,\\n- 'timestamp': 1485907200,\\n- 'upload_date': '20170201',\\n- 'thumbnail': r're:^https://content\\\\.weyyak\\\\.com/.+/poster-image',\\n- 'categories': ['Drama', 'Thrillers', 'Romance'],\\n- 'tags': 'count:8',\\n- },\\n- },\\n- {\\n- 'url': 'https://weyyak.com/en/movie/233255/8-Seconds',\\n- 'md5': 'fe740ae0f63e4d1c8a7fc147a410c564',\\n- 'info_dict': {\\n- 'id': '233255',\\n- 'ext': 'mp4',\\n- 'title': '8 Seconds',\\n- 'duration': 6490,\\n- 'alt_title': '8 ุซูุงูู',\\n- 'description': 'md5:45b83a155c30b49950624c7e99600b9d',\\n- 'age_limit': 15,\\n- 'release_year': 2015,\\n- 'timestamp': 1683106031,\\n- 'upload_date': '20230503',\\n- 'thumbnail': r're:^https://content\\\\.weyyak\\\\.com/.+/poster-image',\\n- 'categories': ['Drama', 'Social'],\\n- 'cast': ['Ceylin Adiyaman', 'Esra Inal'],\\n- },\\n- },\\n- ]\\n-\\n- def _real_extract(self, url):\\n- video_id, lang, type_ = self._match_valid_url(url).group('id', 'lang', 'type')\\n-\\n- path = 'episode/' if type_ == 'episode' else 'contents/moviedetails?contentkey='\\n- data = self._download_json(\\n- f'https://msapifo-prod-me.weyyak.z5.com/v1/{lang}/{path}{video_id}', video_id)['data']\\n- m3u8_url = self._download_json(\\n- f'https://api-weyyak.akamaized.net/get_info/{data[\\\"video_id\\\"]}',\\n- video_id, 'Extracting video details')['url_video']\\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id)\\n-\\n- return {\\n- 'id': video_id,\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- **traverse_obj(data, {\\n- 'title': ('title', {str}),\\n- 'alt_title': ('translated_title', {str}),\\n- 'description': ('synopsis', {str}),\\n- 'duration': ('length', {float_or_none}),\\n- 'age_limit': ('age_rating', {parse_age_limit}),\\n- 'season_number': ('season_number', {int_or_none}),\\n- 'episode_number': ('episode_number', {int_or_none}),\\n- 'thumbnail': ('imagery', 'thumbnail', {url_or_none}),\\n- 'categories': ('genres', ..., {str}),\\n- 'tags': ('tags', ..., {str}),\\n- 'cast': (('main_actor', 'main_actress'), {str}),\\n- 'timestamp': ('insertedAt', {unified_timestamp}),\\n- 'release_year': ('production_year', {int_or_none}),\\n- }),\\n- }\\ndiff --git a/yt_dlp/extractor/xstream.py b/yt_dlp/extractor/xstream.py\\ndeleted file mode 100644\\nindex f7b48322cdf6..000000000000\\n--- a/yt_dlp/extractor/xstream.py\\n+++ /dev/null\\n@@ -1,114 +0,0 @@\\n-import re\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- find_xpath_attr,\\n- int_or_none,\\n- parse_iso8601,\\n- xpath_text,\\n- xpath_with_ns,\\n-)\\n-\\n-\\n-class XstreamIE(InfoExtractor):\\n- _VALID_URL = r'''(?x)\\n- (?:\\n- xstream:|\\n- https?://frontend\\\\.xstream\\\\.(?:dk|net)/\\n- )\\n- (?P<partner_id>[^/]+)\\n- (?:\\n- :|\\n- /feed/video/\\\\?.*?\\\\bid=\\n- )\\n- (?P<id>\\\\d+)\\n- '''\\n- _TESTS = [{\\n- 'url': 'http://frontend.xstream.dk/btno/feed/video/?platform=web&id=86588',\\n- 'md5': 'd7d17e3337dc80de6d3a540aefbe441b',\\n- 'info_dict': {\\n- 'id': '86588',\\n- 'ext': 'mov',\\n- 'title': 'Otto Wollertsen',\\n- 'description': 'Vestlendingen Otto Fredrik Wollertsen',\\n- 'timestamp': 1430473209,\\n- 'upload_date': '20150501',\\n- },\\n- }, {\\n- 'url': 'http://frontend.xstream.dk/ap/feed/video/?platform=web&id=21039',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _extract_video_info(self, partner_id, video_id):\\n- data = self._download_xml(\\n- f'http://frontend.xstream.dk/{partner_id}/feed/video/?platform=web&id={video_id}',\\n- video_id)\\n-\\n- NS_MAP = {\\n- 'atom': 'http://www.w3.org/2005/Atom',\\n- 'xt': 'http://xstream.dk/',\\n- 'media': 'http://search.yahoo.com/mrss/',\\n- }\\n-\\n- entry = data.find(xpath_with_ns('./atom:entry', NS_MAP))\\n-\\n- title = xpath_text(\\n- entry, xpath_with_ns('./atom:title', NS_MAP), 'title')\\n- description = xpath_text(\\n- entry, xpath_with_ns('./atom:summary', NS_MAP), 'description')\\n- timestamp = parse_iso8601(xpath_text(\\n- entry, xpath_with_ns('./atom:published', NS_MAP), 'upload date'))\\n-\\n- formats = []\\n- media_group = entry.find(xpath_with_ns('./media:group', NS_MAP))\\n- for media_content in media_group.findall(xpath_with_ns('./media:content', NS_MAP)):\\n- media_url = media_content.get('url')\\n- if not media_url:\\n- continue\\n- tbr = int_or_none(media_content.get('bitrate'))\\n- mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', media_url)\\n- if mobj:\\n- formats.append({\\n- 'url': mobj.group('url'),\\n- 'play_path': 'mp4:{}'.format(mobj.group('playpath')),\\n- 'app': mobj.group('app'),\\n- 'ext': 'flv',\\n- 'tbr': tbr,\\n- 'format_id': 'rtmp-%d' % tbr,\\n- })\\n- else:\\n- formats.append({\\n- 'url': media_url,\\n- 'tbr': tbr,\\n- })\\n-\\n- link = find_xpath_attr(\\n- entry, xpath_with_ns('./atom:link', NS_MAP), 'rel', 'original')\\n- if link is not None:\\n- formats.append({\\n- 'url': link.get('href'),\\n- 'format_id': link.get('rel'),\\n- 'quality': 1,\\n- })\\n-\\n- thumbnails = [{\\n- 'url': splash.get('url'),\\n- 'width': int_or_none(splash.get('width')),\\n- 'height': int_or_none(splash.get('height')),\\n- } for splash in media_group.findall(xpath_with_ns('./xt:splash', NS_MAP))]\\n-\\n- return {\\n- 'id': video_id,\\n- 'title': title,\\n- 'description': description,\\n- 'timestamp': timestamp,\\n- 'formats': formats,\\n- 'thumbnails': thumbnails,\\n- }\\n-\\n- def _real_extract(self, url):\\n- mobj = self._match_valid_url(url)\\n- partner_id = mobj.group('partner_id')\\n- video_id = mobj.group('id')\\n-\\n- return self._extract_video_info(partner_id, video_id)\\ndiff --git a/yt_dlp/extractor/zee5.py b/yt_dlp/extractor/zee5.py\\ndeleted file mode 100644\\nindex fb523de03b4c..000000000000\\n--- a/yt_dlp/extractor/zee5.py\\n+++ /dev/null\\n@@ -1,269 +0,0 @@\\n-import json\\n-import time\\n-import uuid\\n-\\n-from .common import InfoExtractor\\n-from ..utils import (\\n- ExtractorError,\\n- int_or_none,\\n- jwt_decode_hs256,\\n- parse_age_limit,\\n- str_or_none,\\n- try_call,\\n- try_get,\\n- unified_strdate,\\n- unified_timestamp,\\n- url_or_none,\\n-)\\n-\\n-\\n-class Zee5IE(InfoExtractor):\\n- _VALID_URL = r'''(?x)\\n- (?:\\n- zee5:|\\n- https?://(?:www\\\\.)?zee5\\\\.com/(?:[^#?]+/)?\\n- (?:\\n- (?:tv-shows|kids|web-series|zee5originals)(?:/[^#/?]+){3}\\n- |(?:movies|kids|videos|news|music-videos)/(?!kids-shows)[^#/?]+\\n- )/(?P<display_id>[^#/?]+)/\\n- )\\n- (?P<id>[^#/?]+)/?(?:$|[?#])\\n- '''\\n- _TESTS = [{\\n- 'url': 'https://www.zee5.com/movies/details/adavari-matalaku-ardhale-verule/0-0-movie_1143162669',\\n- 'info_dict': {\\n- 'id': '0-0-movie_1143162669',\\n- 'ext': 'mp4',\\n- 'display_id': 'adavari-matalaku-ardhale-verule',\\n- 'title': 'Adavari Matalaku Ardhale Verule',\\n- 'duration': 9360,\\n- 'description': str,\\n- 'alt_title': 'Adavari Matalaku Ardhale Verule',\\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\\n- 'release_date': '20070427',\\n- 'upload_date': '20070427',\\n- 'timestamp': 1177632000,\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- 'episode_number': 0,\\n- 'episode': 'Episode 0',\\n- 'tags': list,\\n- },\\n- 'params': {\\n- 'format': 'bv',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899/yoga-se-hoga-bandbudh-aur-budbak/0-1-239839',\\n- 'info_dict': {\\n- 'id': '0-1-239839',\\n- 'ext': 'mp4',\\n- 'display_id': 'yoga-se-hoga-bandbudh-aur-budbak',\\n- 'title': 'Yoga Se Hoga-Bandbudh aur Budbak',\\n- 'duration': 659,\\n- 'description': str,\\n- 'alt_title': 'Yoga Se Hoga-Bandbudh aur Budbak',\\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\\n- 'release_date': '20150101',\\n- 'upload_date': '20150101',\\n- 'timestamp': 1420070400,\\n- 'thumbnail': r're:^https?://.*\\\\.jpg$',\\n- 'series': 'Bandbudh Aur Budbak',\\n- 'season_number': 1,\\n- 'episode_number': 1,\\n- 'episode': 'Episode 1',\\n- 'season': 'Season 1',\\n- 'tags': list,\\n- },\\n- 'params': {\\n- 'format': 'bv',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408/maine-dekhi-hai-uski-mrityu/0-1-6z587412',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/kids/kids-movies/maya-bommalu/0-0-movie_1040370005',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/news/details/jana-sena-chief-pawan-kalyan-shows-slippers-to-ysrcp-leaders/0-0-newsauto_6ettj4242oo0',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/music-videos/details/adhento-gaani-vunnapaatuga-jersey-nani-shraddha-srinath/0-0-56973',\\n- 'only_matching': True,\\n- }]\\n- _DEVICE_ID = str(uuid.uuid4())\\n- _USER_TOKEN = None\\n- _LOGIN_HINT = 'Use \\\"--username <mobile_number>\\\" to login using otp or \\\"--username token\\\" and \\\"--password <user_token>\\\" to login using user token.'\\n- _NETRC_MACHINE = 'zee5'\\n- _GEO_COUNTRIES = ['IN']\\n- _USER_COUNTRY = None\\n-\\n- def _perform_login(self, username, password):\\n- if len(username) == 10 and username.isdigit() and self._USER_TOKEN is None:\\n- self.report_login()\\n- otp_request_json = self._download_json(f'https://b2bapi.zee5.com/device/sendotp_v1.php?phoneno=91{username}',\\n- None, note='Sending OTP')\\n- if otp_request_json['code'] == 0:\\n- self.to_screen(otp_request_json['message'])\\n- else:\\n- raise ExtractorError(otp_request_json['message'], expected=True)\\n- otp_code = self._get_tfa_info('OTP')\\n- otp_verify_json = self._download_json(f'https://b2bapi.zee5.com/device/verifyotp_v1.php?phoneno=91{username}&otp={otp_code}&guest_token={self._DEVICE_ID}&platform=web',\\n- None, note='Verifying OTP', fatal=False)\\n- if not otp_verify_json:\\n- raise ExtractorError('Unable to verify OTP.', expected=True)\\n- self._USER_TOKEN = otp_verify_json.get('token')\\n- if not self._USER_TOKEN:\\n- raise ExtractorError(otp_request_json['message'], expected=True)\\n- elif username.lower() == 'token' and try_call(lambda: jwt_decode_hs256(password)):\\n- self._USER_TOKEN = password\\n- else:\\n- raise ExtractorError(self._LOGIN_HINT, expected=True)\\n-\\n- token = jwt_decode_hs256(self._USER_TOKEN)\\n- if token.get('exp', 0) <= int(time.time()):\\n- raise ExtractorError('User token has expired', expected=True)\\n- self._USER_COUNTRY = token.get('current_country')\\n-\\n- def _real_extract(self, url):\\n- video_id, display_id = self._match_valid_url(url).group('id', 'display_id')\\n- access_token_request = self._download_json(\\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\\n- video_id, note='Downloading access token')['platform_token']\\n- data = {\\n- 'x-access-token': access_token_request['token'],\\n- }\\n- if self._USER_TOKEN:\\n- data['Authorization'] = f'bearer {self._USER_TOKEN}'\\n- else:\\n- data['X-Z5-Guest-Token'] = self._DEVICE_ID\\n-\\n- json_data = self._download_json(\\n- 'https://spapi.zee5.com/singlePlayback/getDetails/secure', video_id, query={\\n- 'content_id': video_id,\\n- 'device_id': self._DEVICE_ID,\\n- 'platform_name': 'desktop_web',\\n- 'country': self._USER_COUNTRY or self.get_param('geo_bypass_country') or 'IN',\\n- 'check_parental_control': False,\\n- }, headers={'content-type': 'application/json'}, data=json.dumps(data).encode())\\n- asset_data = json_data['assetDetails']\\n- show_data = json_data.get('showDetails', {})\\n- if 'premium' in asset_data['business_type']:\\n- raise ExtractorError('Premium content is DRM protected.', expected=True)\\n- if not asset_data.get('hls_url'):\\n- self.raise_login_required(self._LOGIN_HINT, metadata_available=True, method=None)\\n- formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(asset_data['hls_url'], video_id, 'mp4', fatal=False)\\n-\\n- subtitles = {}\\n- for sub in asset_data.get('subtitle_url', []):\\n- sub_url = sub.get('url')\\n- if not sub_url:\\n- continue\\n- subtitles.setdefault(sub.get('language', 'en'), []).append({\\n- 'url': self._proto_relative_url(sub_url),\\n- })\\n- subtitles = self._merge_subtitles(subtitles, m3u8_subs)\\n- return {\\n- 'id': video_id,\\n- 'display_id': display_id,\\n- 'title': asset_data['title'],\\n- 'formats': formats,\\n- 'subtitles': subtitles,\\n- 'duration': int_or_none(asset_data.get('duration')),\\n- 'description': str_or_none(asset_data.get('description')),\\n- 'alt_title': str_or_none(asset_data.get('original_title')),\\n- 'uploader': str_or_none(asset_data.get('content_owner')),\\n- 'age_limit': parse_age_limit(asset_data.get('age_rating')),\\n- 'release_date': unified_strdate(asset_data.get('release_date')),\\n- 'timestamp': unified_timestamp(asset_data.get('release_date')),\\n- 'thumbnail': url_or_none(asset_data.get('image_url')),\\n- 'series': str_or_none(asset_data.get('tvshow_name')),\\n- 'season': try_get(show_data, lambda x: x['seasons']['title'], str),\\n- 'season_number': int_or_none(try_get(show_data, lambda x: x['seasons'][0]['orderid'])),\\n- 'episode_number': int_or_none(try_get(asset_data, lambda x: x['orderid'])),\\n- 'tags': try_get(asset_data, lambda x: x['tags'], list),\\n- }\\n-\\n-\\n-class Zee5SeriesIE(InfoExtractor):\\n- IE_NAME = 'zee5:series'\\n- _VALID_URL = r'''(?x)\\n- (?:\\n- zee5:series:|\\n- https?://(?:www\\\\.)?zee5\\\\.com/(?:[^#?]+/)?\\n- (?:tv-shows|web-series|kids|zee5originals)/(?!kids-movies)(?:[^#/?]+/){2}\\n- )\\n- (?P<id>[^#/?]+)(?:/episodes)?/?(?:$|[?#])\\n- '''\\n- _TESTS = [{\\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899',\\n- 'playlist_mincount': 156,\\n- 'info_dict': {\\n- 'id': '0-6-1899',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/tv-shows/details/bhabi-ji-ghar-par-hai/0-6-199',\\n- 'playlist_mincount': 1500,\\n- 'info_dict': {\\n- 'id': '0-6-199',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/tv-shows/details/agent-raghav-crime-branch/0-6-965',\\n- 'playlist_mincount': 24,\\n- 'info_dict': {\\n- 'id': '0-6-965',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/ta/tv-shows/details/nagabhairavi/0-6-3201',\\n- 'playlist_mincount': 3,\\n- 'info_dict': {\\n- 'id': '0-6-3201',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/khwaabon-ki-zamin-par/0-6-270',\\n- 'playlist_mincount': 150,\\n- 'info_dict': {\\n- 'id': '0-6-270',\\n- },\\n- }, {\\n- 'url': 'https://www.zee5.com/tv-shows/details/chala-hawa-yeu-dya-ladies-zindabaad/0-6-2943/episodes',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _entries(self, show_id):\\n- access_token_request = self._download_json(\\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\\n- show_id, note='Downloading access token')['platform_token']\\n- headers = {\\n- 'X-Access-Token': access_token_request['token'],\\n- 'Referer': 'https://www.zee5.com/',\\n- }\\n- show_url = f'https://gwapi.zee5.com/content/tvshow/{show_id}?translation=en&country=IN'\\n-\\n- page_num = 0\\n- show_json = self._download_json(show_url, video_id=show_id, headers=headers)\\n- for season in show_json.get('seasons') or []:\\n- season_id = try_get(season, lambda x: x['id'], str)\\n- next_url = f'https://gwapi.zee5.com/content/tvshow/?season_id={season_id}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100'\\n- while next_url:\\n- page_num += 1\\n- episodes_json = self._download_json(\\n- next_url, video_id=show_id, headers=headers,\\n- note=f'Downloading JSON metadata page {page_num}')\\n- for episode in try_get(episodes_json, lambda x: x['episode'], list) or []:\\n- video_id = episode.get('id')\\n- yield self.url_result(\\n- f'zee5:{video_id}',\\n- ie=Zee5IE.ie_key(), video_id=video_id)\\n- next_url = url_or_none(episodes_json.get('next_episode_api'))\\n-\\n- def _real_extract(self, url):\\n- show_id = self._match_id(url)\\n- return self.playlist_result(self._entries(show_id), playlist_id=show_id)\\n\\n\",\n \"summary\": \"Edited 95 file(s) in yt_dlp/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s2","comment":"it calls a non-existent `_extract_video_info` method now\r\n```suggestion\r\n _WORKING = False\r\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\r\n```","revised_diff":"diff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\nindex 1eb25530f833..dcf48c4ccc2f 100644\n--- a/yt_dlp/extractor/vgtv.py\n+++ b/yt_dlp/extractor/vgtv.py\n@@ -1,7 +1,6 @@\n import re\n \n from .common import InfoExtractor\n-from .xstream import XstreamIE\n from ..utils import (\n ExtractorError,\n float_or_none,\n@@ -9,7 +8,8 @@\n )\n \n \n-class VGTVIE(XstreamIE): # XXX: Do not subclass from concrete IE\n+class VGTVIE(InfoExtractor):\n+ _WORKING = False\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\n _GEO_BYPASS = False\n \n"}],"string":"[\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"it calls a non-existent `_extract_video_info` method now\\r\\n```suggestion\\r\\n _WORKING = False\\r\\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\\nindex 1eb25530f833..dcf48c4ccc2f 100644\\n--- a/yt_dlp/extractor/vgtv.py\\n+++ b/yt_dlp/extractor/vgtv.py\\n@@ -1,7 +1,6 @@\\n import re\\n \\n from .common import InfoExtractor\\n-from .xstream import XstreamIE\\n from ..utils import (\\n ExtractorError,\\n float_or_none,\\n@@ -9,7 +8,8 @@\\n )\\n \\n \\n-class VGTVIE(XstreamIE): # XXX: Do not subclass from concrete IE\\n+class VGTVIE(InfoExtractor):\\n+ _WORKING = False\\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\\n _GEO_BYPASS = False\\n \\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py\nindex 1a29a93edaf8..f47a36099a12 100644\n--- a/yt_dlp/extractor/_extractors.py\n+++ b/yt_dlp/extractor/_extractors.py\n@@ -54,7 +54,6 @@\n WyborczaPodcastIE,\n WyborczaVideoIE,\n )\n-from .airtv import AirTVIE\n from .aitube import AitubeKZVideoIE\n from .alibaba import AlibabaIE\n from .aliexpress import AliExpressLiveIE\n@@ -65,10 +64,6 @@\n AllstarProfileIE,\n )\n from .alphaporno import AlphaPornoIE\n-from .alsace20tv import (\n- Alsace20TVEmbedIE,\n- Alsace20TVIE,\n-)\n from .altcensored import (\n AltCensoredChannelIE,\n AltCensoredIE,\n@@ -93,7 +88,6 @@\n AmericasTestKitchenIE,\n AmericasTestKitchenSeasonIE,\n )\n-from .anchorfm import AnchorFMEpisodeIE\n from .angel import AngelIE\n from .antenna import (\n Ant1NewsGrArticleIE,\n@@ -106,10 +100,6 @@\n from .aparat import AparatIE\n from .appleconnect import AppleConnectIE\n from .applepodcasts import ApplePodcastsIE\n-from .appletrailers import (\n- AppleTrailersIE,\n- AppleTrailersSectionIE,\n-)\n from .archiveorg import (\n ArchiveOrgIE,\n YoutubeWebArchiveIE,\n@@ -140,7 +130,6 @@\n from .asobistage import AsobiStageIE\n from .atresplayer import AtresPlayerIE\n from .atscaleconf import AtScaleConfEventIE\n-from .atvat import ATVAtIE\n from .audimedia import AudiMediaIE\n from .audioboom import AudioBoomIE\n from .audiodraft import (\n@@ -157,13 +146,6 @@\n AudiusProfileIE,\n AudiusTrackIE,\n )\n-from .awaan import (\n- AWAANIE,\n- AWAANLiveIE,\n- AWAANSeasonIE,\n- AWAANVideoIE,\n-)\n-from .axs import AxsIE\n from .azmedien import AZMedienIE\n from .baidu import BaiduVideoIE\n from .banbye import (\n@@ -190,10 +172,6 @@\n BBCCoUkPlaylistIE,\n )\n from .beacon import BeaconTvIE\n-from .beatbump import (\n- BeatBumpPlaylistIE,\n- BeatBumpVideoIE,\n-)\n from .beatport import BeatportIE\n from .beeg import BeegIE\n from .behindkink import BehindKinkIE\n@@ -210,7 +188,6 @@\n BibelTVSeriesIE,\n BibelTVVideoIE,\n )\n-from .bigflix import BigflixIE\n from .bigo import BigoIE\n from .bild import BildIE\n from .bilibili import (\n@@ -255,7 +232,6 @@\n from .blogger import BloggerIE\n from .bloomberg import BloombergIE\n from .bluesky import BlueskyIE\n-from .bokecc import BokeCCIE\n from .bongacams import BongaCamsIE\n from .boosty import BoostyIE\n from .bostonglobe import BostonGlobeIE\n@@ -288,14 +264,8 @@\n from .buzzfeed import BuzzFeedIE\n from .byutv import BYUtvIE\n from .c56 import C56IE\n-from .caffeinetv import CaffeineTVIE\n-from .callin import CallinIE\n from .caltrans import CaltransIE\n from .cam4 import CAM4IE\n-from .camdemy import (\n- CamdemyFolderIE,\n- CamdemyIE,\n-)\n from .camfm import (\n CamFMEpisodeIE,\n CamFMShowIE,\n@@ -371,7 +341,6 @@\n from .ciscowebex import CiscoWebexIE\n from .cjsw import CJSWIE\n from .clipchamp import ClipchampIE\n-from .clippit import ClippitIE\n from .cliprs import ClipRsIE\n from .closertotruth import CloserToTruthIE\n from .cloudflarestream import CloudflareStreamIE\n@@ -395,7 +364,6 @@\n ViewSourceIE,\n )\n from .condenast import CondeNastIE\n-from .contv import CONtvIE\n from .corus import CorusIE\n from .coub import CoubIE\n from .cozytv import CozyTVIE\n@@ -510,7 +478,6 @@\n )\n from .drbonanza import DRBonanzaIE\n from .dreisat import DreiSatIE\n-from .drooble import DroobleIE\n from .dropbox import DropboxIE\n from .dropout import (\n DropoutIE,\n@@ -525,10 +492,6 @@\n DRTVSeriesIE,\n )\n from .dtube import DTubeIE\n-from .duboku import (\n- DubokuIE,\n- DubokuPlaylistIE,\n-)\n from .dumpert import DumpertIE\n from .duoplay import DuoplayIE\n from .dvtv import DVTVIE\n@@ -546,8 +509,6 @@\n EggsArtistIE,\n EggsIE,\n )\n-from .eighttracks import EightTracksIE\n-from .eitb import EitbIE\n from .elementorembed import ElementorEmbedIE\n from .elonet import ElonetIE\n from .elpais import ElPaisIE\n@@ -591,7 +552,6 @@\n from .eurosport import EurosportIE\n from .euscreen import EUScreenIE\n from .expressen import ExpressenIE\n-from .eyedotv import EyedoTVIE\n from .facebook import (\n FacebookAdsIE,\n FacebookIE,\n@@ -655,7 +615,6 @@\n from .foxsports import FoxSportsIE\n from .fptplay import FptplayIE\n from .francaisfacile import FrancaisFacileIE\n-from .franceinter import FranceInterIE\n from .francetv import (\n FranceTVIE,\n FranceTVInfoIE,\n@@ -672,14 +631,10 @@\n FrontendMastersIE,\n FrontendMastersLessonIE,\n )\n-from .fujitv import FujiTVFODPlus7IE\n from .funk import FunkIE\n from .funker530 import Funker530IE\n from .fuyintv import FuyinTVIE\n-from .gab import (\n- GabIE,\n- GabTVIE,\n-)\n+from .gab import GabIE\n from .gaia import GaiaIE\n from .gamedevtv import GameDevTVDashboardIE\n from .gamejolt import (\n@@ -743,16 +698,10 @@\n GoogleDriveFolderIE,\n GoogleDriveIE,\n )\n-from .googlepodcasts import (\n- GooglePodcastsFeedIE,\n- GooglePodcastsIE,\n-)\n from .googlesearch import GoogleSearchIE\n from .goplay import GoPlayIE\n from .gopro import GoProIE\n-from .goshgay import GoshgayIE\n from .gotostage import GoToStageIE\n-from .gputechconf import GPUTechConfIE\n from .graspop import GraspopIE\n from .gronkh import (\n GronkhFeedIE,\n@@ -769,7 +718,6 @@\n from .hidive import HiDiveIE\n from .historicfilms import HistoricFilmsIE\n from .hitrecord import HitRecordIE\n-from .hketv import HKETVIE\n from .hollywoodreporter import (\n HollywoodReporterIE,\n HollywoodReporterPlaylistIE,\n@@ -818,7 +766,6 @@\n IdagioRecordingIE,\n IdagioTrackIE,\n )\n-from .idolplus import IdolPlusIE\n from .ign import (\n IGNIE,\n IGNArticleIE,\n@@ -851,7 +798,6 @@\n InstagramUserIE,\n )\n from .internazionale import InternazionaleIE\n-from .internetvideoarchive import InternetVideoArchiveIE\n from .iprima import (\n IPrimaCNNIE,\n IPrimaIE,\n@@ -886,7 +832,6 @@\n IwaraUserIE,\n )\n from .ixigua import IxiguaIE\n-from .izlesene import IzleseneIE\n from .jamendo import (\n JamendoAlbumIE,\n JamendoIE,\n@@ -939,11 +884,9 @@\n KikaIE,\n KikaPlaylistIE,\n )\n-from .kinja import KinjaEmbedIE\n from .kinopoisk import KinoPoiskIE\n from .kommunetv import KommunetvIE\n from .kompas import KompasVideoIE\n-from .koo import KooIE\n from .krasview import KrasViewIE\n from .kth import KTHIE\n from .ku6 import Ku6IE\n@@ -991,7 +934,6 @@\n from .leeco import (\n LeIE,\n LePlaylistIE,\n- LetvCloudIE,\n )\n from .lefigaro import (\n LeFigaroVideoEmbedIE,\n@@ -1020,11 +962,6 @@\n from .listennotes import ListenNotesIE\n from .litv import LiTVIE\n from .livejournal import LiveJournalIE\n-from .livestream import (\n- LivestreamIE,\n- LivestreamOriginalIE,\n- LivestreamShortenerIE,\n-)\n from .livestreamfails import LivestreamfailsIE\n from .lnk import LnkIE\n from .locipo import (\n@@ -1048,10 +985,6 @@\n LSMReplayIE,\n )\n from .lumni import LumniIE\n-from .lynda import (\n- LyndaCourseIE,\n- LyndaIE,\n-)\n from .maariv import MaarivIE\n from .magellantv import MagellanTVIE\n from .magentamusik import MagentaMusikIE\n@@ -1117,13 +1050,11 @@\n MicrosoftLearnSessionIE,\n MicrosoftMediusIE,\n )\n-from .microsoftstream import MicrosoftStreamIE\n from .minds import (\n MindsChannelIE,\n MindsGroupIE,\n MindsIE,\n )\n-from .minoto import MinotoIE\n from .mir24tv import Mir24TvIE\n from .mirrativ import (\n MirrativIE,\n@@ -1157,18 +1088,9 @@\n from .mlssoccer import MLSSoccerIE\n from .mocha import MochaVideoIE\n from .mojevideo import MojevideoIE\n-from .mojvideo import MojvideoIE\n from .monstercat import MonstercatIE\n-from .motherless import (\n- MotherlessGalleryIE,\n- MotherlessGroupIE,\n- MotherlessIE,\n- MotherlessUploaderIE,\n-)\n from .motorsport import MotorsportIE\n from .moviepilot import MoviepilotIE\n-from .moview import MoviewPlayIE\n-from .moviezine import MoviezineIE\n from .movingimage import MovingImageIE\n from .msn import MSNIE\n from .mtv import MTVIE\n@@ -1179,12 +1101,6 @@\n )\n from .museai import MuseAIIE\n from .musescore import MuseScoreIE\n-from .musicdex import (\n- MusicdexAlbumIE,\n- MusicdexArtistIE,\n- MusicdexPlaylistIE,\n- MusicdexSongIE,\n-)\n from .mux import MuxIE\n from .mx3 import (\n Mx3IE,\n@@ -1212,14 +1128,10 @@\n NateIE,\n NateProgramIE,\n )\n-from .nationalgeographic import (\n- NationalGeographicTVIE,\n- NationalGeographicVideoIE,\n-)\n+from .nationalgeographic import NationalGeographicTVIE\n from .naver import (\n NaverIE,\n NaverLiveIE,\n- NaverNowIE,\n )\n from .nba import (\n NBAIE,\n@@ -1257,7 +1169,6 @@\n NebulaSubscriptionsIE,\n )\n from .nekohacker import NekoHackerIE\n-from .nerdcubed import NerdCubedFeedIE\n from .nest import (\n NestClipIE,\n NestIE,\n@@ -1275,11 +1186,6 @@\n NetEaseMusicProgramIE,\n NetEaseMusicSingerIE,\n )\n-from .netverse import (\n- NetverseIE,\n- NetversePlaylistIE,\n- NetverseSearchIE,\n-)\n from .netzkino import NetzkinoIE\n from .newgrounds import (\n NewgroundsIE,\n@@ -1389,11 +1295,6 @@\n from .ntvde import NTVDeIE\n from .ntvru import NTVRuIE\n from .nubilesporn import NubilesPornIE\n-from .nuum import (\n- NuumLiveIE,\n- NuumMediaIE,\n- NuumTabIE,\n-)\n from .nuvid import NuvidIE\n from .nytimes import (\n NYTimesArticleIE,\n@@ -1426,7 +1327,6 @@\n OnetMVPIE,\n OnetPlIE,\n )\n-from .onionstudios import OnionStudiosIE\n from .onsen import OnsenIE\n from .opencast import (\n OpencastIE,\n@@ -1437,7 +1337,6 @@\n OpenRecIE,\n OpenRecMovieIE,\n )\n-from .ora import OraTVIE\n from .orf import (\n ORFIPTVIE,\n ORFONIE,\n@@ -1511,26 +1410,18 @@\n PinterestCollectionIE,\n PinterestIE,\n )\n-from .piramidetv import (\n- PiramideTVChannelIE,\n- PiramideTVIE,\n-)\n-from .planetmarathi import PlanetMarathiIE\n from .platzi import (\n PlatziCourseIE,\n PlatziIE,\n )\n from .playerfm import PlayerFmIE\n-from .playplustv import PlayPlusTVIE\n from .playsuisse import PlaySuisseIE\n from .playtvak import PlaytvakIE\n-from .playwire import PlaywireIE\n from .pluralsight import (\n PluralsightCourseIE,\n PluralsightIE,\n )\n from .plutotv import PlutoTVIE\n-from .plvideo import PlVideoIE\n from .plyr import PlyrEmbedIE\n from .podbayfm import (\n PodbayFMChannelIE,\n@@ -1574,7 +1465,6 @@\n from .premiershiprugby import PremiershipRugbyIE\n from .presstv import PressTVIE\n from .projectveritas import ProjectVeritasIE\n-from .prosiebensat1 import ProSiebenSat1IE\n from .prx import (\n PRXAccountIE,\n PRXSeriesIE,\n@@ -1586,7 +1476,6 @@\n PuhuTVIE,\n PuhuTVSerieIE,\n )\n-from .puls4 import Puls4IE\n from .pyvideo import PyvideoIE\n from .qdance import QDanceIE\n from .qingting import QingTingIE\n@@ -1610,10 +1499,6 @@\n RadioCanadaAudioVideoIE,\n RadioCanadaIE,\n )\n-from .radiocomercial import (\n- RadioComercialIE,\n- RadioComercialPlaylistIE,\n-)\n from .radiode import RadioDeIE\n from .radiofrance import (\n FranceCultureIE,\n@@ -1678,7 +1563,6 @@\n RedBullTVRrnContentIE,\n )\n from .reddit import RedditIE\n-from .redge import RedCDNLivxIE\n from .redgifs import (\n RedGifsIE,\n RedGifsSearchIE,\n@@ -1692,13 +1576,11 @@\n from .restudy import RestudyIE\n from .reuters import ReutersIE\n from .reverbnation import ReverbNationIE\n-from .rheinmaintv import RheinMainTVIE\n from .ridehome import RideHomeIE\n from .rinsefm import (\n RinseFMArtistPlaylistIE,\n RinseFMIE,\n )\n-from .rmcdecouverte import RMCDecouverteIE\n from .rockstargames import RockstarGamesIE\n from .rokfin import (\n RokfinChannelIE,\n@@ -1815,7 +1697,6 @@\n SenateGovIE,\n SenateISVPIE,\n )\n-from .sendtonews import SendtoNewsIE\n from .servus import ServusIE\n from .sevenplus import SevenPlusIE\n from .sexu import SexuIE\n@@ -1828,7 +1709,6 @@\n ShahidShowIE,\n )\n from .sharepoint import SharePointIE\n-from .sharevideos import ShareVideosEmbedIE\n from .shemaroome import ShemarooMeIE\n from .shiey import ShieyIE\n from .showroomlive import ShowRoomLiveIE\n@@ -1873,7 +1753,6 @@\n SmotrimPlaylistIE,\n )\n from .snapchat import SnapchatSpotlightIE\n-from .snotr import SnotrIE\n from .softwhiteunderbelly import SoftWhiteUnderbellyIE\n from .sohu import (\n SohuIE,\n@@ -1923,7 +1802,6 @@\n SpreakerIE,\n SpreakerShowIE,\n )\n-from .springboardplatform import SpringboardPlatformIE\n from .sproutvideo import (\n SproutVideoIE,\n VidsIoIE,\n@@ -1940,7 +1818,6 @@\n TheaterComplexTownVODIE,\n )\n from .stageplus import StagePlusVODConcertIE\n-from .stanfordoc import StanfordOpenClassroomIE\n from .startrek import StarTrekIE\n from .startv import StarTVIE\n from .steam import (\n@@ -1948,10 +1825,6 @@\n SteamCommunityIE,\n SteamIE,\n )\n-from .stitcher import (\n- StitcherIE,\n- StitcherShowIE,\n-)\n from .storyfire import (\n StoryFireIE,\n StoryFireSeriesIE,\n@@ -1961,7 +1834,6 @@\n from .streamable import StreamableIE\n from .streamcz import StreamCZIE\n from .streetvoice import StreetVoiceIE\n-from .stretchinternet import StretchInternetIE\n from .stripchat import StripchatIE\n from .stv import STVPlayerIE\n from .subsplash import (\n@@ -1979,8 +1851,6 @@\n SVTPlayIE,\n SVTSeriesIE,\n )\n-from .swearnet import SwearnetEpisodeIE\n-from .syvdk import SYVDKIE\n from .sztvhu import SztvHuIE\n from .tagesschau import TagesschauIE\n from .taptap import (\n@@ -2039,10 +1909,6 @@\n )\n from .teletask import TeleTaskIE\n from .telewebion import TelewebionIE\n-from .tempo import (\n- IVXPlayerIE,\n- TempoIE,\n-)\n from .tencent import (\n IflixEpisodeIE,\n IflixSeriesIE,\n@@ -2068,7 +1934,6 @@\n TheGuardianPodcastPlaylistIE,\n )\n from .thehighwire import TheHighWireIE\n-from .theholetv import TheHoleTvIE\n from .theintercept import TheInterceptIE\n from .theplatform import (\n ThePlatformFeedIE,\n@@ -2120,12 +1985,6 @@\n ToypicsIE,\n ToypicsUserIE,\n )\n-from .traileraddict import TrailerAddictIE\n-from .triller import (\n- TrillerIE,\n- TrillerShortIE,\n- TrillerUserIE,\n-)\n from .trovo import (\n TrovoChannelClipIE,\n TrovoChannelVodIE,\n@@ -2208,7 +2067,6 @@\n TVPlayHomeIE,\n TVPlayIE,\n )\n-from .tvplayer import TVPlayerIE\n from .tvw import (\n TvwIE,\n TvwNewsIE,\n@@ -2248,12 +2106,8 @@\n UdemyIE,\n )\n from .udn import UDNEmbedIE\n-from .ufctv import (\n- UFCTVIE,\n- UFCArabiaIE,\n-)\n+from .ufctv import UFCTVIE\n from .ukcolumn import UkColumnIE\n-from .uktvplay import UKTVPlayIE\n from .uliza import (\n UlizaPlayerIE,\n UlizaPortalIE,\n@@ -2283,7 +2137,6 @@\n UstudioEmbedIE,\n UstudioIE,\n )\n-from .utreon import UtreonIE\n from .varzesh3 import Varzesh3IE\n from .vbox7 import Vbox7IE\n from .veo import VeoIE\n@@ -2308,20 +2161,7 @@\n VideocampusSachsenIE,\n ViMPPlaylistIE,\n )\n-from .videodetective import VideoDetectiveIE\n-from .videofyme import VideofyMeIE\n-from .videoken import (\n- VideoKenCategoryIE,\n- VideoKenIE,\n- VideoKenPlayerIE,\n- VideoKenPlaylistIE,\n- VideoKenTopicIE,\n-)\n-from .videomore import (\n- VideomoreIE,\n- VideomoreSeasonIE,\n- VideomoreVideoIE,\n-)\n+from .videoken import VideoKenPlayerIE\n from .videopress import VideoPressIE\n from .vidflex import VidflexIE\n from .vidio import (\n@@ -2351,10 +2191,6 @@\n VimeoUserIE,\n VimeoWatchLaterIE,\n )\n-from .vimm import (\n- VimmIE,\n- VimmRecordingIE,\n-)\n from .viously import ViouslyIE\n from .viqeo import ViqeoIE\n from .visir import VisirIE\n@@ -2372,7 +2208,6 @@\n VKWallPostIE,\n )\n from .vocaroo import VocarooIE\n-from .vodpl import VODPlIE\n from .vodplatform import VODPlatformIE\n from .voicy import (\n VoicyChannelIE,\n@@ -2404,11 +2239,6 @@\n VTVIE,\n VTVGoIE,\n )\n-from .vuclip import VuClipIE\n-from .vvvvid import (\n- VVVVIDIE,\n- VVVVIDShowIE,\n-)\n from .walla import WallaIE\n from .washingtonpost import (\n WashingtonPostArticleIE,\n@@ -2418,7 +2248,6 @@\n from .wdr import (\n WDRIE,\n WDRElefantIE,\n- WDRMobileIE,\n WDRPageIE,\n )\n from .webcamerapl import WebcameraplIE\n@@ -2445,7 +2274,6 @@\n WeverseMomentIE,\n )\n from .wevidi import WeVidiIE\n-from .weyyak import WeyyakIE\n from .whowatch import WhoWatchIE\n from .whyp import WhypIE\n from .wikimedia import WikimediaIE\n@@ -2494,7 +2322,6 @@\n from .xinpianchang import XinpianchangIE\n from .xminus import XMinusIE\n from .xnxx import XNXXIE\n-from .xstream import XstreamIE\n from .xvideos import (\n XVideosIE,\n XVideosQuickiesIE,\n@@ -2618,10 +2445,6 @@\n ZDFIE,\n ZDFChannelIE,\n )\n-from .zee5 import (\n- Zee5IE,\n- Zee5SeriesIE,\n-)\n from .zeenews import ZeeNewsIE\n from .zenporn import ZenPornIE\n from .zetland import ZetlandDKArticleIE\ndiff --git a/yt_dlp/extractor/airtv.py b/yt_dlp/extractor/airtv.py\ndeleted file mode 100644\nindex cee660dfcf41..000000000000\n--- a/yt_dlp/extractor/airtv.py\n+++ /dev/null\n@@ -1,96 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import (\n- determine_ext,\n- int_or_none,\n- mimetype2ext,\n- parse_iso8601,\n- traverse_obj,\n-)\n-\n-\n-class AirTVIE(InfoExtractor):\n- _VALID_URL = r'https?://www\\.air\\.tv/watch\\?v=(?P<id>\\w+)'\n- _TESTS = [{\n- # without youtube_id\n- 'url': 'https://www.air.tv/watch?v=W87jcWleSn2hXZN47zJZsQ',\n- 'info_dict': {\n- 'id': 'W87jcWleSn2hXZN47zJZsQ',\n- 'ext': 'mp4',\n- 'release_date': '20221003',\n- 'release_timestamp': 1664792603,\n- 'channel_id': 'vgfManQlRQKgoFQ8i8peFQ',\n- 'title': 'md5:c12d49ed367c3dadaa67659aff43494c',\n- 'upload_date': '20221003',\n- 'duration': 151,\n- 'view_count': int,\n- 'thumbnail': 'https://cdn-sp-gcs.air.tv/videos/W/8/W87jcWleSn2hXZN47zJZsQ/b13fc56464f47d9d62a36d110b9b5a72-4096x2160_9.jpg',\n- 'timestamp': 1664792603,\n- },\n- }, {\n- # with youtube_id\n- 'url': 'https://www.air.tv/watch?v=sv57EC8tRXG6h8dNXFUU1Q',\n- 'info_dict': {\n- 'id': '2ZTqmpee-bQ',\n- 'ext': 'mp4',\n- 'comment_count': int,\n- 'tags': 'count:11',\n- 'channel_follower_count': int,\n- 'like_count': int,\n- 'uploader': 'Newsflare',\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/2ZTqmpee-bQ/maxresdefault.webp',\n- 'availability': 'public',\n- 'title': 'Geese Chase Alligator Across Golf Course',\n- 'uploader_id': 'NewsflareBreaking',\n- 'channel_url': 'https://www.youtube.com/channel/UCzSSoloGEz10HALUAbYhngQ',\n- 'description': 'md5:99b21d9cea59330149efbd9706e208f5',\n- 'age_limit': 0,\n- 'channel_id': 'UCzSSoloGEz10HALUAbYhngQ',\n- 'uploader_url': 'http://www.youtube.com/user/NewsflareBreaking',\n- 'view_count': int,\n- 'categories': ['News & Politics'],\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'channel': 'Newsflare',\n- 'duration': 37,\n- 'upload_date': '20180511',\n- },\n- }]\n-\n- def _get_formats_and_subtitle(self, json_data, video_id):\n- formats, subtitles = [], {}\n- for source in traverse_obj(json_data, 'sources', 'sources_desktop', ...):\n- ext = determine_ext(source.get('src'), mimetype2ext(source.get('type')))\n- if ext == 'm3u8':\n- fmts, subs = self._extract_m3u8_formats_and_subtitles(source.get('src'), video_id)\n- formats.extend(fmts)\n- self._merge_subtitles(subs, target=subtitles)\n- else:\n- formats.append({'url': source.get('src'), 'ext': ext})\n- return formats, subtitles\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['initialState']['videos'][display_id]\n- if nextjs_json.get('youtube_id'):\n- return self.url_result(\n- f'https://www.youtube.com/watch?v={nextjs_json.get(\"youtube_id\")}', YoutubeIE)\n-\n- formats, subtitles = self._get_formats_and_subtitle(nextjs_json, display_id)\n- return {\n- 'id': display_id,\n- 'title': nextjs_json.get('title') or self._html_search_meta('og:title', webpage),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'description': nextjs_json.get('description') or None,\n- 'duration': int_or_none(nextjs_json.get('duration')),\n- 'thumbnails': [\n- {'url': thumbnail}\n- for thumbnail in traverse_obj(nextjs_json, ('default_thumbnails', ...))],\n- 'channel_id': traverse_obj(nextjs_json, 'channel', 'channel_slug'),\n- 'timestamp': parse_iso8601(nextjs_json.get('created')),\n- 'release_timestamp': parse_iso8601(nextjs_json.get('published')),\n- 'view_count': int_or_none(nextjs_json.get('views')),\n- }\ndiff --git a/yt_dlp/extractor/alsace20tv.py b/yt_dlp/extractor/alsace20tv.py\ndeleted file mode 100644\nindex c315e4f21704..000000000000\n--- a/yt_dlp/extractor/alsace20tv.py\n+++ /dev/null\n@@ -1,83 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- dict_get,\n- get_element_by_class,\n- int_or_none,\n- unified_strdate,\n- url_or_none,\n-)\n-\n-\n-class Alsace20TVBaseIE(InfoExtractor):\n- def _extract_video(self, video_id, url=None):\n- info = self._download_json(\n- f'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key={video_id}&habillage=0&mode=html',\n- video_id) or {}\n- title = info.get('titre')\n-\n- formats = []\n- for res, fmt_url in (info.get('files') or {}).items():\n- formats.extend(\n- self._extract_smil_formats(fmt_url, video_id, fatal=False)\n- if '/smil:_' in fmt_url\n- else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))\n-\n- webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''\n- thumbnail = url_or_none(dict_get(info, ('image', 'preview')) or self._og_search_thumbnail(webpage))\n- upload_date = self._search_regex(r'/(\\d{6})_', thumbnail, 'upload_date', default=None)\n- upload_date = unified_strdate(f'20{upload_date[:2]}-{upload_date[2:4]}-{upload_date[4:]}') if upload_date else None\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'description': clean_html(get_element_by_class('wysiwyg', webpage)),\n- 'upload_date': upload_date,\n- 'thumbnail': thumbnail,\n- 'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),\n- 'view_count': int_or_none(info.get('nb_vues')),\n- }\n-\n-\n-class Alsace20TVIE(Alsace20TVBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?alsace20\\.tv/(?:[\\w-]+/)+[\\w-]+-(?P<id>[\\w]+)'\n- _TESTS = [{\n- 'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',\n- 'info_dict': {\n- 'id': 'lyNHCXpYJh',\n- 'ext': 'mp4',\n- 'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\n- 'upload_date': '20220203',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'duration': 1073,\n- 'view_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self._extract_video(video_id, url)\n-\n-\n-class Alsace20TVEmbedIE(Alsace20TVBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?alsace20\\.tv/emb/(?P<id>[\\w]+)'\n- _TESTS = [{\n- 'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',\n- # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',\n- 'info_dict': {\n- 'id': 'lyNHCXpYJh',\n- 'ext': 'mp4',\n- 'title': 'Votre JT du jeudi 3 fรฉvrier',\n- 'upload_date': '20220203',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'view_count': int,\n- },\n- 'params': {\n- 'format': 'bestvideo',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self._extract_video(video_id)\ndiff --git a/yt_dlp/extractor/anchorfm.py b/yt_dlp/extractor/anchorfm.py\ndeleted file mode 100644\nindex 652154a4a821..000000000000\n--- a/yt_dlp/extractor/anchorfm.py\n+++ /dev/null\n@@ -1,98 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- float_or_none,\n- int_or_none,\n- str_or_none,\n- traverse_obj,\n- unified_timestamp,\n-)\n-\n-\n-class AnchorFMEpisodeIE(InfoExtractor):\n- _VALID_URL = r'https?://anchor\\.fm/(?P<channel_name>\\w+)/(?:embed/)?episodes/[\\w-]+-(?P<episode_id>\\w+)'\n- _EMBED_REGEX = [rf'<iframe[^>]+\\bsrc=[\\'\"](?P<url>{_VALID_URL})']\n- _TESTS = [{\n- 'url': 'https://anchor.fm/lovelyti/episodes/Chrisean-Rock-takes-to-twitter-to-announce-shes-pregnant--Blueface-denies-he-is-the-father-e1tpt3d',\n- 'info_dict': {\n- 'id': 'e1tpt3d',\n- 'ext': 'mp3',\n- 'title': ' Chrisean Rock takes to twitter to announce she\\'s pregnant, Blueface denies he is the father!',\n- 'description': 'md5:207d167de3e28ceb4ddc1ebf5a30044c',\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_nologo/1034827/1034827-1658438968460-5f3bfdf3601e8.jpg',\n- 'duration': 624.718,\n- 'uploader': 'Lovelyti ',\n- 'uploader_id': '991541',\n- 'channel': 'lovelyti',\n- 'modified_date': '20230121',\n- 'modified_timestamp': 1674285178,\n- 'release_date': '20230121',\n- 'release_timestamp': 1674285179,\n- 'episode_id': 'e1tpt3d',\n- },\n- }, {\n- # embed url\n- 'url': 'https://anchor.fm/apakatatempo/embed/episodes/S2E75-Perang-Bintang-di-Balik-Kasus-Ferdy-Sambo-dan-Ismail-Bolong-e1shjqd',\n- 'info_dict': {\n- 'id': 'e1shjqd',\n- 'ext': 'mp3',\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\n- 'duration': 1042.008,\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\n- 'release_date': '20221221',\n- 'release_timestamp': 1671595916,\n- 'modified_date': '20221221',\n- 'modified_timestamp': 1671590834,\n- 'channel': 'apakatatempo',\n- 'uploader': 'Podcast Tempo',\n- 'uploader_id': '2585461',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- 'episode_id': 'e1shjqd',\n- },\n- }]\n-\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://podcast.tempo.co/podcast/192/perang-bintang-di-balik-kasus-ferdy-sambo-dan-ismail-bolong',\n- 'info_dict': {\n- 'id': 'e1shjqd',\n- 'ext': 'mp3',\n- 'release_date': '20221221',\n- 'duration': 1042.008,\n- 'season': 'Season 2',\n- 'modified_timestamp': 1671590834,\n- 'uploader_id': '2585461',\n- 'modified_date': '20221221',\n- 'description': 'md5:9e95ad9293bf00178bf8d33e9cb92c41',\n- 'season_number': 2,\n- 'title': 'S2E75 Perang Bintang di Balik Kasus Ferdy Sambo dan Ismail Bolong',\n- 'release_timestamp': 1671595916,\n- 'episode_id': 'e1shjqd',\n- 'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',\n- 'uploader': 'Podcast Tempo',\n- 'channel': 'apakatatempo',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- channel_name, episode_id = self._match_valid_url(url).group('channel_name', 'episode_id')\n- api_data = self._download_json(f'https://anchor.fm/api/v3/episodes/{episode_id}', episode_id)\n-\n- return {\n- 'id': episode_id,\n- 'title': traverse_obj(api_data, ('episode', 'title')),\n- 'url': traverse_obj(api_data, ('episode', 'episodeEnclosureUrl'), ('episodeAudios', 0, 'url')),\n- 'ext': 'mp3',\n- 'vcodec': 'none',\n- 'thumbnail': traverse_obj(api_data, ('episode', 'episodeImage')),\n- 'description': clean_html(traverse_obj(api_data, ('episode', ('description', 'descriptionPreview')), get_all=False)),\n- 'duration': float_or_none(traverse_obj(api_data, ('episode', 'duration')), 1000),\n- 'modified_timestamp': unified_timestamp(traverse_obj(api_data, ('episode', 'modified'))),\n- 'release_timestamp': int_or_none(traverse_obj(api_data, ('episode', 'publishOnUnixTimestamp'))),\n- 'episode_id': episode_id,\n- 'uploader': traverse_obj(api_data, ('creator', 'name')),\n- 'uploader_id': str_or_none(traverse_obj(api_data, ('creator', 'userId'))),\n- 'season_number': int_or_none(traverse_obj(api_data, ('episode', 'podcastSeasonNumber'))),\n- 'channel': channel_name or traverse_obj(api_data, ('creator', 'vanitySlug')),\n- }\ndiff --git a/yt_dlp/extractor/appletrailers.py b/yt_dlp/extractor/appletrailers.py\ndeleted file mode 100644\nindex 0a600f6df91a..000000000000\n--- a/yt_dlp/extractor/appletrailers.py\n+++ /dev/null\n@@ -1,277 +0,0 @@\n-import json\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_duration,\n- unified_strdate,\n-)\n-\n-\n-class AppleTrailersIE(InfoExtractor):\n- IE_NAME = 'appletrailers'\n- _VALID_URL = r'https?://(?:www\\.|movie)?trailers\\.apple\\.com/(?:trailers|ca)/(?P<company>[^/]+)/(?P<movie>[^/]+)'\n- _TESTS = [{\n- 'url': 'http://trailers.apple.com/trailers/wb/manofsteel/',\n- 'info_dict': {\n- 'id': '5111',\n- 'title': 'Man of Steel',\n- },\n- 'playlist': [\n- {\n- 'md5': 'd97a8e575432dbcb81b7c3acb741f8a8',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer4',\n- 'ext': 'mov',\n- 'duration': 111,\n- 'title': 'Trailer 4',\n- 'upload_date': '20130523',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': 'b8017b7131b721fb4e8d6f49e1df908c',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer3',\n- 'ext': 'mov',\n- 'duration': 182,\n- 'title': 'Trailer 3',\n- 'upload_date': '20130417',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': 'd0f1e1150989b9924679b441f3404d48',\n- 'info_dict': {\n- 'id': 'manofsteel-trailer',\n- 'ext': 'mov',\n- 'duration': 148,\n- 'title': 'Trailer',\n- 'upload_date': '20121212',\n- 'uploader_id': 'wb',\n- },\n- },\n- {\n- 'md5': '5fe08795b943eb2e757fa95cb6def1cb',\n- 'info_dict': {\n- 'id': 'manofsteel-teaser',\n- 'ext': 'mov',\n- 'duration': 93,\n- 'title': 'Teaser',\n- 'upload_date': '20120721',\n- 'uploader_id': 'wb',\n- },\n- },\n- ],\n- }, {\n- 'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',\n- 'info_dict': {\n- 'id': '4489',\n- 'title': 'Blackthorn',\n- },\n- 'playlist_mincount': 2,\n- 'expected_warnings': ['Unable to download JSON metadata'],\n- }, {\n- # json data only available from http://trailers.apple.com/trailers/feeds/data/15881.json\n- 'url': 'http://trailers.apple.com/trailers/fox/kungfupanda3/',\n- 'info_dict': {\n- 'id': '15881',\n- 'title': 'Kung Fu Panda 3',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- 'url': 'http://trailers.apple.com/ca/metropole/autrui/',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://movietrailers.apple.com/trailers/focus_features/kuboandthetwostrings/',\n- 'only_matching': True,\n- }]\n-\n- _JSON_RE = r'iTunes.playURL\\((.*?)\\);'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- movie = mobj.group('movie')\n- uploader_id = mobj.group('company')\n-\n- webpage = self._download_webpage(url, movie)\n- film_id = self._search_regex(r\"FilmId\\s*=\\s*'(\\d+)'\", webpage, 'film id')\n- film_data = self._download_json(\n- f'http://trailers.apple.com/trailers/feeds/data/{film_id}.json',\n- film_id, fatal=False)\n-\n- if film_data:\n- entries = []\n- for clip in film_data.get('clips', []):\n- clip_title = clip['title']\n-\n- formats = []\n- for version, version_data in clip.get('versions', {}).items():\n- for size, size_data in version_data.get('sizes', {}).items():\n- src = size_data.get('src')\n- if not src:\n- continue\n- formats.append({\n- 'format_id': f'{version}-{size}',\n- 'url': re.sub(r'_(\\d+p\\.mov)', r'_h\\1', src),\n- 'width': int_or_none(size_data.get('width')),\n- 'height': int_or_none(size_data.get('height')),\n- 'language': version[:2],\n- })\n-\n- entries.append({\n- 'id': movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', clip_title).lower(),\n- 'formats': formats,\n- 'title': clip_title,\n- 'thumbnail': clip.get('screen') or clip.get('thumb'),\n- 'duration': parse_duration(clip.get('runtime') or clip.get('faded')),\n- 'upload_date': unified_strdate(clip.get('posted')),\n- 'uploader_id': uploader_id,\n- })\n-\n- page_data = film_data.get('page', {})\n- return self.playlist_result(entries, film_id, page_data.get('movie_title'))\n-\n- playlist_url = urllib.parse.urljoin(url, 'includes/playlists/itunes.inc')\n-\n- def fix_html(s):\n- s = re.sub(r'(?s)<script[^<]*?>.*?</script>', '', s)\n- s = re.sub(r'<img ([^<]*?)/?>', r'<img \\1/>', s)\n- # The ' in the onClick attributes are not escaped, it couldn't be parsed\n- # like: http://trailers.apple.com/trailers/wb/gravity/\n-\n- def _clean_json(m):\n- return 'iTunes.playURL({});'.format(m.group(1).replace('\\'', '''))\n- s = re.sub(self._JSON_RE, _clean_json, s)\n- return f'<html>{s}</html>'\n- doc = self._download_xml(playlist_url, movie, transform_source=fix_html)\n-\n- playlist = []\n- for li in doc.findall('./div/ul/li'):\n- on_click = li.find('.//a').attrib['onClick']\n- trailer_info_json = self._search_regex(self._JSON_RE,\n- on_click, 'trailer info')\n- trailer_info = json.loads(trailer_info_json)\n- first_url = trailer_info.get('url')\n- if not first_url:\n- continue\n- title = trailer_info['title']\n- video_id = movie + '-' + re.sub(r'[^a-zA-Z0-9]', '', title).lower()\n- thumbnail = li.find('.//img').attrib['src']\n- upload_date = trailer_info['posted'].replace('-', '')\n-\n- runtime = trailer_info['runtime']\n- m = re.search(r'(?P<minutes>[0-9]+):(?P<seconds>[0-9]{1,2})', runtime)\n- duration = None\n- if m:\n- duration = 60 * int(m.group('minutes')) + int(m.group('seconds'))\n-\n- trailer_id = first_url.split('/')[-1].rpartition('_')[0].lower()\n- settings_json_url = urllib.parse.urljoin(url, f'includes/settings/{trailer_id}.json')\n- settings = self._download_json(settings_json_url, trailer_id, 'Downloading settings json')\n-\n- formats = []\n- for fmt in settings['metadata']['sizes']:\n- # The src is a file pointing to the real video file\n- format_url = re.sub(r'_(\\d*p\\.mov)', r'_h\\1', fmt['src'])\n- formats.append({\n- 'url': format_url,\n- 'format': fmt['type'],\n- 'width': int_or_none(fmt['width']),\n- 'height': int_or_none(fmt['height']),\n- })\n-\n- playlist.append({\n- '_type': 'video',\n- 'id': video_id,\n- 'formats': formats,\n- 'title': title,\n- 'duration': duration,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- 'uploader_id': uploader_id,\n- 'http_headers': {\n- 'User-Agent': 'QuickTime compatible (yt-dlp)',\n- },\n- })\n-\n- return {\n- '_type': 'playlist',\n- 'id': movie,\n- 'entries': playlist,\n- }\n-\n-\n-class AppleTrailersSectionIE(InfoExtractor):\n- IE_NAME = 'appletrailers:section'\n- _SECTIONS = {\n- 'justadded': {\n- 'feed_path': 'just_added',\n- 'title': 'Just Added',\n- },\n- 'exclusive': {\n- 'feed_path': 'exclusive',\n- 'title': 'Exclusive',\n- },\n- 'justhd': {\n- 'feed_path': 'just_hd',\n- 'title': 'Just HD',\n- },\n- 'mostpopular': {\n- 'feed_path': 'most_pop',\n- 'title': 'Most Popular',\n- },\n- 'moviestudios': {\n- 'feed_path': 'studios',\n- 'title': 'Movie Studios',\n- },\n- }\n- _VALID_URL = r'https?://(?:www\\.)?trailers\\.apple\\.com/#section=(?P<id>{})'.format('|'.join(_SECTIONS))\n- _TESTS = [{\n- 'url': 'http://trailers.apple.com/#section=justadded',\n- 'info_dict': {\n- 'title': 'Just Added',\n- 'id': 'justadded',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=exclusive',\n- 'info_dict': {\n- 'title': 'Exclusive',\n- 'id': 'exclusive',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=justhd',\n- 'info_dict': {\n- 'title': 'Just HD',\n- 'id': 'justhd',\n- },\n- 'playlist_mincount': 80,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=mostpopular',\n- 'info_dict': {\n- 'title': 'Most Popular',\n- 'id': 'mostpopular',\n- },\n- 'playlist_mincount': 30,\n- }, {\n- 'url': 'http://trailers.apple.com/#section=moviestudios',\n- 'info_dict': {\n- 'title': 'Movie Studios',\n- 'id': 'moviestudios',\n- },\n- 'playlist_mincount': 80,\n- }]\n-\n- def _real_extract(self, url):\n- section = self._match_id(url)\n- section_data = self._download_json(\n- 'http://trailers.apple.com/trailers/home/feeds/{}.json'.format(self._SECTIONS[section]['feed_path']),\n- section)\n- entries = [\n- self.url_result('http://trailers.apple.com' + e['location'])\n- for e in section_data]\n- return self.playlist_result(entries, section, self._SECTIONS[section]['title'])\ndiff --git a/yt_dlp/extractor/atvat.py b/yt_dlp/extractor/atvat.py\ndeleted file mode 100644\nindex b05eccf182ba..000000000000\n--- a/yt_dlp/extractor/atvat.py\n+++ /dev/null\n@@ -1,107 +0,0 @@\n-import datetime as dt\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- float_or_none,\n- jwt_encode,\n- try_get,\n-)\n-\n-\n-class ATVAtIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?atv\\.at/tv/(?:[^/]+/){2,3}(?P<id>.*)'\n-\n- _TESTS = [{\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/bauer-sucht-frau/bauer-sucht-frau-staffel-18-folge-3-die-hofwochen',\n- 'md5': '3c3b4aaca9f63e32b35e04a9c2515903',\n- 'info_dict': {\n- 'id': 'v-ce9cgn1e70n5-1',\n- 'ext': 'mp4',\n- 'title': 'Bauer sucht Frau - Staffel 18 Folge 3 - Die Hofwochen',\n- },\n- }, {\n- 'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/episode-01/bauer-sucht-frau-staffel-18-vorstellungsfolge-1',\n- 'only_matching': True,\n- }]\n-\n- # extracted from bootstrap.js function (search for e.encryption_key and use your browser's debugger)\n- _ACCESS_ID = 'x_atv'\n- _ENCRYPTION_KEY = 'Hohnaekeishoogh2omaeghooquooshia'\n-\n- def _extract_video_info(self, url, content, video):\n- clip_id = content.get('splitId', content['id'])\n- formats = []\n- clip_urls = video['urls']\n- for protocol, variant in clip_urls.items():\n- source_url = try_get(variant, lambda x: x['clear']['url'])\n- if not source_url:\n- continue\n- if protocol == 'dash':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id=protocol, fatal=False))\n- elif protocol == 'hls':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id=protocol, fatal=False))\n- else:\n- formats.append({\n- 'url': source_url,\n- 'format_id': protocol,\n- })\n-\n- return {\n- 'id': clip_id,\n- 'title': content.get('title'),\n- 'duration': float_or_none(content.get('duration')),\n- 'series': content.get('tvShowTitle'),\n- 'formats': formats,\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- json_data = self._parse_json(\n- self._search_regex(r'<script id=\"state\" type=\"text/plain\">(.*)</script>', webpage, 'json_data'),\n- video_id=video_id)\n-\n- video_title = json_data['views']['default']['page']['title']\n- content_resource = json_data['views']['default']['page']['contentResource']\n- content_id = content_resource[0]['id']\n- content_ids = [{'id': id_, 'subclip_start': content['start'], 'subclip_end': content['end']}\n- for id_, content in enumerate(content_resource)]\n-\n- time_of_request = dt.datetime.now()\n- not_before = time_of_request - dt.timedelta(minutes=5)\n- expire = time_of_request + dt.timedelta(minutes=5)\n- payload = {\n- 'content_ids': {\n- content_id: content_ids,\n- },\n- 'secure_delivery': True,\n- 'iat': int(time_of_request.timestamp()),\n- 'nbf': int(not_before.timestamp()),\n- 'exp': int(expire.timestamp()),\n- }\n- videos = self._download_json(\n- 'https://vas-v4.p7s1video.net/4.0/getsources',\n- content_id, 'Downloading videos JSON', query={\n- 'token': jwt_encode(payload, self._ENCRYPTION_KEY, headers={'kid': self._ACCESS_ID}),\n- })\n-\n- video_id, videos_data = next(iter(videos['data'].items()))\n- error_msg = try_get(videos_data, lambda x: x['error']['title'])\n- if error_msg == 'Geo check failed':\n- self.raise_geo_restricted(error_msg)\n- elif error_msg:\n- raise ExtractorError(error_msg)\n- entries = [\n- self._extract_video_info(url, content_resource[video['id']], video)\n- for video in videos_data]\n-\n- return {\n- '_type': 'multi_video',\n- 'id': video_id,\n- 'title': video_title,\n- 'entries': entries,\n- }\ndiff --git a/yt_dlp/extractor/awaan.py b/yt_dlp/extractor/awaan.py\ndeleted file mode 100644\nindex 4066a5a83f2a..000000000000\n--- a/yt_dlp/extractor/awaan.py\n+++ /dev/null\n@@ -1,181 +0,0 @@\n-import base64\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- format_field,\n- int_or_none,\n- parse_iso8601,\n- smuggle_url,\n- unsmuggle_url,\n- urlencode_postdata,\n-)\n-\n-\n-class AWAANIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?show/(?P<show_id>\\d+)/[^/]+(?:/(?P<id>\\d+)/(?P<season_id>\\d+))?'\n-\n- def _real_extract(self, url):\n- show_id, video_id, season_id = self._match_valid_url(url).groups()\n- if video_id and int(video_id) > 0:\n- return self.url_result(\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo')\n- elif season_id and int(season_id) > 0:\n- return self.url_result(smuggle_url(\n- f'http://awaan.ae/program/season/{season_id}',\n- {'show_id': show_id}), 'AWAANSeason')\n- else:\n- return self.url_result(\n- f'http://awaan.ae/program/{show_id}', 'AWAANSeason')\n-\n-\n-class AWAANBaseIE(InfoExtractor):\n- def _parse_video_data(self, video_data, video_id, is_live):\n- title = video_data.get('title_en') or video_data['title_ar']\n- img = video_data.get('img')\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': video_data.get('description_en') or video_data.get('description_ar'),\n- 'thumbnail': format_field(img, None, 'http://admin.mangomolo.com/analytics/%s'),\n- 'duration': int_or_none(video_data.get('duration')),\n- 'timestamp': parse_iso8601(video_data.get('create_time'), ' '),\n- 'is_live': is_live,\n- 'uploader_id': video_data.get('user_id'),\n- }\n-\n-\n-class AWAANVideoIE(AWAANBaseIE):\n- IE_NAME = 'awaan:video'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?(?:video(?:/[^/]+)?|media|catchup/[^/]+/[^/]+)/(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'http://www.dcndigital.ae/#/video/%D8%B1%D8%AD%D9%84%D8%A9-%D8%A7%D9%84%D8%B9%D9%85%D8%B1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/17375',\n- 'md5': '5f61c33bfc7794315c671a62d43116aa',\n- 'info_dict':\n- {\n- 'id': '17375',\n- 'ext': 'mp4',\n- 'title': 'ุฑุญูุฉ ุงูุนู
ุฑ : ุงูุญููุฉ 1',\n- 'description': 'md5:0156e935d870acb8ef0a66d24070c6d6',\n- 'duration': 2041,\n- 'timestamp': 1227504126,\n- 'upload_date': '20081124',\n- 'uploader_id': '71',\n- },\n- }, {\n- 'url': 'http://awaan.ae/video/26723981/%D8%AF%D8%A7%D8%B1-%D8%A7%D9%84%D8%B3%D9%84%D8%A7%D9%85:-%D8%AE%D9%8A%D8%B1-%D8%AF%D9%88%D8%B1-%D8%A7%D9%84%D8%A3%D9%86%D8%B5%D8%A7%D8%B1',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video_data = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/video?id={video_id}',\n- video_id, headers={'Origin': 'http://awaan.ae'})\n- info = self._parse_video_data(video_data, video_id, False)\n-\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' + urllib.parse.urlencode({\n- 'id': video_data['id'],\n- 'user_id': video_data['user_id'],\n- 'signature': video_data['signature'],\n- 'countries': 'Q0M=',\n- 'filter': 'DENY',\n- })\n- info.update({\n- '_type': 'url_transparent',\n- 'url': embed_url,\n- 'ie_key': 'MangomoloVideo',\n- })\n- return info\n-\n-\n-class AWAANLiveIE(AWAANBaseIE):\n- IE_NAME = 'awaan:live'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?live/(?P<id>\\d+)'\n- _TEST = {\n- 'url': 'http://awaan.ae/live/6/dubai-tv',\n- 'info_dict': {\n- 'id': '6',\n- 'ext': 'mp4',\n- 'title': 're:Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- 'upload_date': '20150107',\n- 'timestamp': 1420588800,\n- 'uploader_id': '71',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- channel_id = self._match_id(url)\n-\n- channel_data = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id={channel_id}',\n- channel_id, headers={'Origin': 'http://awaan.ae'})\n- info = self._parse_video_data(channel_data, channel_id, True)\n-\n- embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' + urllib.parse.urlencode({\n- 'id': base64.b64encode(channel_data['user_id'].encode()).decode(),\n- 'channelid': base64.b64encode(channel_data['id'].encode()).decode(),\n- 'signature': channel_data['signature'],\n- 'countries': 'Q0M=',\n- 'filter': 'DENY',\n- })\n- info.update({\n- '_type': 'url_transparent',\n- 'url': embed_url,\n- 'ie_key': 'MangomoloLive',\n- })\n- return info\n-\n-\n-class AWAANSeasonIE(InfoExtractor):\n- IE_NAME = 'awaan:season'\n- _VALID_URL = r'https?://(?:www\\.)?(?:awaan|dcndigital)\\.ae/(?:#/)?program/(?:(?P<show_id>\\d+)|season/(?P<season_id>\\d+))'\n- _TEST = {\n- 'url': 'http://dcndigital.ae/#/program/205024/%D9%85%D8%AD%D8%A7%D8%B6%D8%B1%D8%A7%D8%AA-%D8%A7%D9%84%D8%B4%D9%8A%D8%AE-%D8%A7%D9%84%D8%B4%D8%B9%D8%B1%D8%A7%D9%88%D9%8A',\n- 'info_dict':\n- {\n- 'id': '7910',\n- 'title': 'ู
ุญุงุถุฑุงุช ุงูุดูุฎ ุงูุดุนุฑุงูู',\n- },\n- 'playlist_mincount': 27,\n- }\n-\n- def _real_extract(self, url):\n- url, smuggled_data = unsmuggle_url(url, {})\n- show_id, season_id = self._match_valid_url(url).groups()\n-\n- data = {}\n- if season_id:\n- data['season'] = season_id\n- show_id = smuggled_data.get('show_id')\n- if show_id is None:\n- season = self._download_json(\n- f'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id={season_id}',\n- season_id, headers={'Origin': 'http://awaan.ae'})\n- show_id = season['id']\n- data['show_id'] = show_id\n- show = self._download_json(\n- 'http://admin.mangomolo.com/analytics/index.php/plus/show',\n- show_id, data=urlencode_postdata(data), headers={\n- 'Origin': 'http://awaan.ae',\n- 'Content-Type': 'application/x-www-form-urlencoded',\n- })\n- if not season_id:\n- season_id = show['default_season']\n- for season in show['seasons']:\n- if season['id'] == season_id:\n- title = season.get('title_en') or season['title_ar']\n-\n- entries = []\n- for video in show['videos']:\n- video_id = str(video['id'])\n- entries.append(self.url_result(\n- f'http://awaan.ae/media/{video_id}', 'AWAANVideo', video_id))\n-\n- return self.playlist_result(entries, season_id, title)\ndiff --git a/yt_dlp/extractor/axs.py b/yt_dlp/extractor/axs.py\ndeleted file mode 100644\nindex 7e9166771239..000000000000\n--- a/yt_dlp/extractor/axs.py\n+++ /dev/null\n@@ -1,89 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- js_to_json,\n- parse_iso8601,\n- traverse_obj,\n- url_or_none,\n-)\n-\n-\n-class AxsIE(InfoExtractor):\n- IE_NAME = 'axs.tv'\n- _VALID_URL = r'https?://(?:www\\.)?axs\\.tv/(?:channel/(?:[^/?#]+/)+)?video/(?P<id>[^/?#]+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.axs.tv/video/5f4dc776b70e4f1c194f22ef/',\n- 'md5': '8d97736ae8e50c64df528e5e676778cf',\n- 'info_dict': {\n- 'id': '5f4dc776b70e4f1c194f22ef',\n- 'title': 'Small Town',\n- 'ext': 'mp4',\n- 'description': 'md5:e314d28bfaa227a4d7ec965fae19997f',\n- 'upload_date': '20230602',\n- 'timestamp': 1685729564,\n- 'duration': 1284.216,\n- 'series': 'Rock & Roll Road Trip with Sammy Hagar',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- 'episode': '3',\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4e9d330a0c3b295a7e8394',\n- },\n- }, {\n- 'url': 'https://www.axs.tv/channel/rock-star-interview/video/daryl-hall',\n- 'md5': '300ae795cd8f9984652c0949734ffbdc',\n- 'info_dict': {\n- 'id': '5f488148b70e4f392572977c',\n- 'display_id': 'daryl-hall',\n- 'title': 'Daryl Hall',\n- 'ext': 'mp4',\n- 'description': 'md5:e54ecaa0f4b5683fc9259e9e4b196628',\n- 'upload_date': '20230214',\n- 'timestamp': 1676403615,\n- 'duration': 2570.668,\n- 'series': 'The Big Interview with Dan Rather',\n- 'season': 'Season 3',\n- 'season_number': 3,\n- 'episode': '5',\n- 'thumbnail': 'https://images.dotstudiopro.com/5f4d1901f340b50d937cec32',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- webpage_json_data = self._search_json(\n- r'mountObj\\s*=', webpage, 'video ID data', display_id,\n- transform_source=js_to_json)\n- video_id = webpage_json_data['video_id']\n- company_id = webpage_json_data['company_id']\n-\n- meta = self._download_json(\n- f'https://api.myspotlight.tv/dotplayer/video/{company_id}/{video_id}',\n- video_id, query={'device_type': 'desktop_web'})['video']\n-\n- formats = self._extract_m3u8_formats(\n- meta['video_m3u8'], video_id, 'mp4', m3u8_id='hls')\n-\n- subtitles = {}\n- for cc in traverse_obj(meta, ('closeCaption', lambda _, v: url_or_none(v['srtPath']))):\n- subtitles.setdefault(cc.get('srtShortLang') or 'en', []).append(\n- {'ext': cc.get('srtExt'), 'url': cc['srtPath']})\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'formats': formats,\n- **traverse_obj(meta, {\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'series': ('seriestitle', {str}),\n- 'season_number': ('season', {int}),\n- 'episode': ('episode', {str}),\n- 'duration': ('duration', {float_or_none}),\n- 'timestamp': ('updated_at', {parse_iso8601}),\n- 'thumbnail': ('thumb', {url_or_none}),\n- }),\n- 'subtitles': subtitles,\n- }\ndiff --git a/yt_dlp/extractor/beatbump.py b/yt_dlp/extractor/beatbump.py\ndeleted file mode 100644\nindex 777a1b3268df..000000000000\n--- a/yt_dlp/extractor/beatbump.py\n+++ /dev/null\n@@ -1,111 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE, YoutubeTabIE\n-\n-\n-class BeatBumpVideoIE(InfoExtractor):\n- _VALID_URL = r'https?://beatbump\\.(?:ml|io)/listen\\?id=(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://beatbump.ml/listen?id=MgNrAu2pzNs',\n- 'md5': '5ff3fff41d3935b9810a9731e485fe66',\n- 'info_dict': {\n- 'id': 'MgNrAu2pzNs',\n- 'ext': 'mp4',\n- 'artist': 'Stephen',\n- 'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',\n- 'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',\n- 'upload_date': '20190312',\n- 'categories': ['Music'],\n- 'playable_in_embed': True,\n- 'duration': 169,\n- 'like_count': int,\n- 'alt_title': 'Voyeur Girl',\n- 'view_count': int,\n- 'track': 'Voyeur Girl',\n- 'uploader': 'Stephen',\n- 'title': 'Voyeur Girl',\n- 'channel_follower_count': int,\n- 'age_limit': 0,\n- 'availability': 'public',\n- 'live_status': 'not_live',\n- 'album': 'it\\'s too much love to know my dear',\n- 'channel': 'Stephen',\n- 'comment_count': int,\n- 'description': 'md5:7ae382a65843d6df2685993e90a8628f',\n- 'tags': 'count:11',\n- 'creator': 'Stephen',\n- 'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',\n- 'channel_is_verified': True,\n- 'heatmap': 'count:100',\n- },\n- }, {\n- 'url': 'https://beatbump.io/listen?id=LDGZAprNGWo',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- id_ = self._match_id(url)\n- return self.url_result(f'https://music.youtube.com/watch?v={id_}', YoutubeIE, id_)\n-\n-\n-class BeatBumpPlaylistIE(InfoExtractor):\n- _VALID_URL = r'https?://beatbump\\.(?:ml|io)/(?:release\\?id=|artist/|playlist/)(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://beatbump.ml/release?id=MPREb_gTAcphH99wE',\n- 'playlist_count': 50,\n- 'info_dict': {\n- 'id': 'OLAK5uy_l1m0thk3g31NmIIz_vMIbWtyv7eZixlH0',\n- 'availability': 'unlisted',\n- 'view_count': int,\n- 'title': 'Album - Royalty Free Music Library V2 (50 Songs)',\n- 'description': '',\n- 'tags': [],\n- 'modified_date': '20231110',\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.ml/artist/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'playlist_mincount': 1,\n- 'params': {'flatplaylist': True},\n- 'info_dict': {\n- 'id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_id': '@NoCopyrightSounds',\n- 'channel_follower_count': int,\n- 'title': 'NoCopyrightSounds',\n- 'uploader': 'NoCopyrightSounds',\n- 'description': 'md5:cd4fd53d81d363d05eee6c1b478b491a',\n- 'channel': 'NoCopyrightSounds',\n- 'tags': 'count:65',\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'channel_is_verified': True,\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.ml/playlist/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\n- 'playlist_mincount': 1,\n- 'params': {'flatplaylist': True},\n- 'info_dict': {\n- 'id': 'PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',\n- 'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',\n- 'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',\n- 'view_count': int,\n- 'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',\n- 'uploader_id': '@NoCopyrightSounds',\n- 'title': 'NCS : All Releases ๐ฟ',\n- 'uploader': 'NoCopyrightSounds',\n- 'availability': 'public',\n- 'channel': 'NoCopyrightSounds',\n- 'tags': [],\n- 'modified_date': '20231112',\n- 'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',\n- },\n- 'expected_warnings': ['YouTube Music is not directly supported'],\n- }, {\n- 'url': 'https://beatbump.io/playlist/VLPLFCHGavqRG-q_2ZhmgU2XB2--ZY6irT1c',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- id_ = self._match_id(url)\n- return self.url_result(f'https://music.youtube.com/browse/{id_}', YoutubeTabIE, id_)\ndiff --git a/yt_dlp/extractor/bigflix.py b/yt_dlp/extractor/bigflix.py\ndeleted file mode 100644\nindex 9c55bb9682ef..000000000000\n--- a/yt_dlp/extractor/bigflix.py\n+++ /dev/null\n@@ -1,71 +0,0 @@\n-import base64\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-\n-\n-class BigflixIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?bigflix\\.com/.+/(?P<id>[0-9]+)'\n- _TESTS = [{\n- # 2 formats\n- 'url': 'http://www.bigflix.com/Tamil-movies/Drama-movies/Madarasapatinam/16070',\n- 'info_dict': {\n- 'id': '16070',\n- 'ext': 'mp4',\n- 'title': 'Madarasapatinam',\n- 'description': 'md5:9f0470b26a4ba8e824c823b5d95c2f6b',\n- 'formats': 'mincount:2',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # multiple formats\n- 'url': 'http://www.bigflix.com/Malayalam-movies/Drama-movies/Indian-Rupee/15967',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(\n- r'<div[^>]+class=[\"\\']pagetitle[\"\\'][^>]*>(.+?)</div>',\n- webpage, 'title')\n-\n- def decode_url(quoted_b64_url):\n- return base64.b64decode(urllib.parse.unquote(\n- quoted_b64_url)).decode('utf-8')\n-\n- formats = []\n- for height, encoded_url in re.findall(\n- r'ContentURL_(\\d{3,4})[pP][^=]+=([^&]+)', webpage):\n- video_url = decode_url(encoded_url)\n- f = {\n- 'url': video_url,\n- 'format_id': f'{height}p',\n- 'height': int(height),\n- }\n- if video_url.startswith('rtmp'):\n- f['ext'] = 'flv'\n- formats.append(f)\n-\n- file_url = self._search_regex(\n- r'file=([^&]+)', webpage, 'video url', default=None)\n- if file_url:\n- video_url = decode_url(file_url)\n- if all(f['url'] != video_url for f in formats):\n- formats.append({\n- 'url': decode_url(file_url),\n- })\n-\n- description = self._html_search_meta('description', webpage)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/bokecc.py b/yt_dlp/extractor/bokecc.py\ndeleted file mode 100644\nindex 42047aced12a..000000000000\n--- a/yt_dlp/extractor/bokecc.py\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import ExtractorError\n-\n-\n-class BokeCCBaseIE(InfoExtractor):\n- def _extract_bokecc_formats(self, webpage, video_id, format_id=None):\n- player_params_str = self._html_search_regex(\n- r'<(?:script|embed)[^>]+src=(?P<q>[\"\\'])(?:https?:)?//p\\.bokecc\\.com/(?:player|flash/player\\.swf)\\?(?P<query>.+?)(?P=q)',\n- webpage, 'player params', group='query')\n-\n- player_params = urllib.parse.parse_qs(player_params_str)\n-\n- info_xml = self._download_xml(\n- 'http://p.bokecc.com/servlet/playinfo?uid={}&vid={}&m=1'.format(\n- player_params['siteid'][0], player_params['vid'][0]), video_id)\n-\n- return [{\n- 'format_id': format_id,\n- 'url': quality.find('./copy').attrib['playurl'],\n- 'quality': int(quality.attrib['value']),\n- } for quality in info_xml.findall('./video/quality')]\n-\n-\n-class BokeCCIE(BokeCCBaseIE):\n- IE_DESC = 'CC่ง้ข'\n- _VALID_URL = r'https?://union\\.bokecc\\.com/playvideo\\.bo\\?(?P<query>.*)'\n-\n- _TESTS = [{\n- 'url': 'http://union.bokecc.com/playvideo.bo?vid=E0ABAE9D4F509B189C33DC5901307461&uid=FE644790DE9D154A',\n- 'info_dict': {\n- 'id': 'FE644790DE9D154A_E0ABAE9D4F509B189C33DC5901307461',\n- 'ext': 'flv',\n- 'title': 'BokeCC Video',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- qs = urllib.parse.parse_qs(self._match_valid_url(url).group('query'))\n- if not qs.get('vid') or not qs.get('uid'):\n- raise ExtractorError('Invalid URL', expected=True)\n-\n- video_id = '{}_{}'.format(qs['uid'][0], qs['vid'][0])\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- return {\n- 'id': video_id,\n- 'title': 'BokeCC Video', # no title provided in the webpage\n- 'formats': self._extract_bokecc_formats(webpage, video_id),\n- }\ndiff --git a/yt_dlp/extractor/caffeinetv.py b/yt_dlp/extractor/caffeinetv.py\ndeleted file mode 100644\nindex ea5134d2f398..000000000000\n--- a/yt_dlp/extractor/caffeinetv.py\n+++ /dev/null\n@@ -1,74 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- int_or_none,\n- parse_iso8601,\n- traverse_obj,\n- urljoin,\n-)\n-\n-\n-class CaffeineTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?caffeine\\.tv/[^/?#]+/video/(?P<id>[\\da-f-]+)'\n- _TESTS = [{\n- 'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',\n- 'info_dict': {\n- 'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',\n- 'ext': 'mp4',\n- 'title': 'GOOOOD MORNINNNNN #highlights',\n- 'timestamp': 1654702180,\n- 'upload_date': '20220608',\n- 'uploader': 'RahJON Wicc',\n- 'uploader_id': 'TsuSurf',\n- 'duration': 3145,\n- 'age_limit': 17,\n- 'thumbnail': 'https://www.caffeine.tv/broadcasts/776b6f84-9cd5-42e3-af1d-4a776eeed697/replay/lobby.jpg',\n- 'comment_count': int,\n- 'view_count': int,\n- 'like_count': int,\n- 'tags': ['highlights', 'battlerap'],\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- json_data = self._download_json(\n- f'https://api.caffeine.tv/social/public/activity/{video_id}', video_id)\n- broadcast_info = traverse_obj(json_data, ('broadcast_info', {dict})) or {}\n-\n- video_url = broadcast_info['video_url']\n- ext = determine_ext(video_url)\n- if ext == 'm3u8':\n- formats = self._extract_m3u8_formats(video_url, video_id, 'mp4')\n- else:\n- formats = [{'url': video_url}]\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- **traverse_obj(json_data, {\n- 'like_count': ('like_count', {int_or_none}),\n- 'view_count': ('view_count', {int_or_none}),\n- 'comment_count': ('comment_count', {int_or_none}),\n- 'tags': ('tags', ..., {str}, filter),\n- 'uploader': ('user', 'name', {str}),\n- 'uploader_id': (((None, 'user'), 'username'), {str}, any),\n- 'is_live': ('is_live', {bool}),\n- }),\n- **traverse_obj(broadcast_info, {\n- 'title': ('broadcast_title', {str}),\n- 'duration': ('content_duration', {int_or_none}),\n- 'timestamp': ('broadcast_start_time', {parse_iso8601}),\n- 'thumbnail': ('preview_image_path', {urljoin(url)}),\n- }),\n- 'age_limit': {\n- # assume Apple Store ratings: https://en.wikipedia.org/wiki/Mobile_software_content_rating_system\n- 'FOUR_PLUS': 0,\n- 'NINE_PLUS': 9,\n- 'TWELVE_PLUS': 12,\n- 'SEVENTEEN_PLUS': 17,\n- }.get(broadcast_info.get('content_rating'), 17),\n- }\ndiff --git a/yt_dlp/extractor/callin.py b/yt_dlp/extractor/callin.py\ndeleted file mode 100644\nindex ee2e56f8e0ca..000000000000\n--- a/yt_dlp/extractor/callin.py\n+++ /dev/null\n@@ -1,155 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import float_or_none, int_or_none, make_archive_id, traverse_obj\n-\n-\n-class CallinIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?callin\\.com/episode/(?P<id>[-a-zA-Z]+)'\n- _TESTS = [{\n- 'url': 'https://www.callin.com/episode/the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\n- 'info_dict': {\n- 'id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\n- 'title': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\n- 'ext': 'ts',\n- 'display_id': 'the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',\n- 'thumbnail': 're:https://.+\\\\.png',\n- 'description': 'First episode',\n- 'uploader': 'Wesley Yang',\n- 'timestamp': 1639404128.65,\n- 'upload_date': '20211213',\n- 'uploader_id': 'wesyang',\n- 'uploader_url': 'http://wesleyyang.substack.com',\n- 'channel': 'Conversations in Year Zero',\n- 'channel_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\n- 'channel_url': 'https://callin.com/show/conversations-in-year-zero-oJNllRFSfx',\n- 'duration': 9951.936,\n- 'view_count': int,\n- 'categories': ['News & Politics', 'History', 'Technology'],\n- 'cast': ['Wesley Yang', 'KC Johnson', 'Gabi Abramovich'],\n- 'series': 'Conversations in Year Zero',\n- 'series_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',\n- 'episode': 'The Title IX Regime and the Long March Through and Beyond the Institutions',\n- 'episode_number': 1,\n- 'episode_id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',\n- },\n- }, {\n- 'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\n- 'md5': '14ede27ee2c957b7e4db93140fc0745c',\n- 'info_dict': {\n- 'id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\n- 'ext': 'ts',\n- 'title': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\n- 'description': 'Or, why the government doesnโt like SpaceX',\n- 'channel': 'The Pull Request',\n- 'channel_url': 'https://callin.com/show/the-pull-request-ucnDJmEKAa',\n- 'duration': 3182.472,\n- 'series_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\n- 'uploader_url': 'http://thepullrequest.com',\n- 'upload_date': '20220902',\n- 'episode': 'FCC Commissioner Brendan Carr on Elonโs Starlink',\n- 'display_id': 'fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',\n- 'series': 'The Pull Request',\n- 'channel_id': '7e9c23156e4aecfdcaef46bfb2ed7ca268509622ec006c0f0f25d90e34496638',\n- 'view_count': int,\n- 'uploader': 'Antonio Garcรญa Martรญnez',\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/1ade9142625344045dc17cf523469ced1d93610762f4c886d06aa190a2f979e8.png',\n- 'episode_id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',\n- 'timestamp': 1662100688.005,\n- },\n- }, {\n- 'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',\n- 'md5': '16f704ddbf82a27e3930533b12062f07',\n- 'info_dict': {\n- 'id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\n- 'ext': 'ts',\n- 'title': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\n- 'description': 'Letโs talk todays episode about the primary election shake up in NYC and the elites melting down over student debt cancelation.',\n- 'channel': 'The DEBRIEF With Briahna Joy Gray',\n- 'channel_url': 'https://callin.com/show/the-debrief-with-briahna-joy-gray-siiFDzGegm',\n- 'duration': 10043.16,\n- 'series_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\n- 'uploader_url': 'http://patreon.com/badfaithpodcast',\n- 'upload_date': '20220826',\n- 'episode': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',\n- 'display_id': 'episode-',\n- 'series': 'The DEBRIEF With Briahna Joy Gray',\n- 'channel_id': '61cea58444465fd26674069703bd8322993bc9e5b4f1a6d0872690554a046ff7',\n- 'view_count': int,\n- 'uploader': 'Briahna Gray',\n- 'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/461ea0d86172cb6aff7d6c80fd49259cf5e64bdf737a4650f8bc24cf392ca218.png',\n- 'episode_id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',\n- 'timestamp': 1661476708.282,\n- },\n- }]\n-\n- def try_get_user_name(self, d):\n- names = [d.get(n) for n in ('first', 'last')]\n- if None in names:\n- return next((n for n in names if n), default=None)\n- return ' '.join(names)\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- next_data = self._search_nextjs_data(webpage, display_id)\n- episode = next_data['props']['pageProps']['episode']\n-\n- video_id = episode['id']\n- title = episode.get('title') or self._generic_title('', webpage)\n- url = episode['m3u8']\n- formats = self._extract_m3u8_formats(url, display_id, ext='ts')\n-\n- show = traverse_obj(episode, ('show', 'title'))\n- show_id = traverse_obj(episode, ('show', 'id'))\n-\n- show_json = None\n- app_slug = (self._html_search_regex(\n- '<script\\\\s+src=[\"\\']/_next/static/([-_a-zA-Z0-9]+)/_',\n- webpage, 'app slug', fatal=False) or next_data.get('buildId'))\n- show_slug = traverse_obj(episode, ('show', 'linkObj', 'resourceUrl'))\n- if app_slug and show_slug and '/' in show_slug:\n- show_slug = show_slug.rsplit('/', 1)[1]\n- show_json_url = f'https://www.callin.com/_next/data/{app_slug}/show/{show_slug}.json'\n- show_json = self._download_json(show_json_url, display_id, fatal=False)\n-\n- host = (traverse_obj(show_json, ('pageProps', 'show', 'hosts', 0))\n- or traverse_obj(episode, ('speakers', 0)))\n-\n- host_nick = traverse_obj(host, ('linkObj', 'resourceUrl'))\n- host_nick = host_nick.rsplit('/', 1)[1] if (host_nick and '/' in host_nick) else None\n-\n- cast = list(filter(None, [\n- self.try_get_user_name(u) for u in\n- traverse_obj(episode, (('speakers', 'callerTags'), ...)) or []\n- ]))\n-\n- episode_list = traverse_obj(show_json, ('pageProps', 'show', 'episodes')) or []\n- episode_number = next(\n- (len(episode_list) - i for i, e in enumerate(episode_list) if e.get('id') == video_id),\n- None)\n-\n- return {\n- 'id': video_id,\n- '_old_archive_ids': [make_archive_id(self, display_id.rsplit('-', 1)[-1])],\n- 'display_id': display_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnail': traverse_obj(episode, ('show', 'photo')),\n- 'description': episode.get('description'),\n- 'uploader': self.try_get_user_name(host) if host else None,\n- 'timestamp': episode.get('publishedAt'),\n- 'uploader_id': host_nick,\n- 'uploader_url': traverse_obj(show_json, ('pageProps', 'show', 'url')),\n- 'channel': show,\n- 'channel_id': show_id,\n- 'channel_url': traverse_obj(episode, ('show', 'linkObj', 'resourceUrl')),\n- 'duration': float_or_none(episode.get('runtime')),\n- 'view_count': int_or_none(episode.get('plays')),\n- 'categories': traverse_obj(episode, ('show', 'categorizations', ..., 'name')),\n- 'cast': cast if cast else None,\n- 'series': show,\n- 'series_id': show_id,\n- 'episode': title,\n- 'episode_number': episode_number,\n- 'episode_id': video_id,\n- }\ndiff --git a/yt_dlp/extractor/camdemy.py b/yt_dlp/extractor/camdemy.py\ndeleted file mode 100644\nindex 34dc095af86b..000000000000\n--- a/yt_dlp/extractor/camdemy.py\n+++ /dev/null\n@@ -1,155 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- parse_duration,\n- str_to_int,\n- unified_strdate,\n-)\n-\n-\n-class CamdemyIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?camdemy\\.com/media/(?P<id>\\d+)'\n- _TESTS = [{\n- # single file\n- 'url': 'http://www.camdemy.com/media/5181/',\n- 'md5': '5a5562b6a98b37873119102e052e311b',\n- 'info_dict': {\n- 'id': '5181',\n- 'ext': 'mp4',\n- 'title': 'Ch1-1 Introduction, Signals (02-23-2012)',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'creator': 'ss11spring',\n- 'duration': 1591,\n- 'upload_date': '20130114',\n- 'view_count': int,\n- },\n- }, {\n- # With non-empty description\n- # webpage returns \"No permission or not login\"\n- 'url': 'http://www.camdemy.com/media/13885',\n- 'md5': '4576a3bb2581f86c61044822adbd1249',\n- 'info_dict': {\n- 'id': '13885',\n- 'ext': 'mp4',\n- 'title': 'EverCam + Camdemy QuickStart',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',\n- 'creator': 'evercam',\n- 'duration': 318,\n- },\n- }, {\n- # External source (YouTube)\n- 'url': 'http://www.camdemy.com/media/14842',\n- 'info_dict': {\n- 'id': '2vsYQzNIsJo',\n- 'ext': 'mp4',\n- 'title': 'Excel 2013 Tutorial - How to add Password Protection',\n- 'description': 'Excel 2013 Tutorial for Beginners - How to add Password Protection',\n- 'upload_date': '20130211',\n- 'uploader': 'Hun Kim',\n- 'uploader_id': 'hunkimtutorials',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- src_from = self._html_search_regex(\n- r\"class=['\\\"]srcFrom['\\\"][^>]*>Sources?(?:\\s+from)?\\s*:\\s*<a[^>]+(?:href|title)=(['\\\"])(?P<url>(?:(?!\\1).)+)\\1\",\n- webpage, 'external source', default=None, group='url')\n- if src_from:\n- return self.url_result(src_from)\n-\n- oembed_obj = self._download_json(\n- 'http://www.camdemy.com/oembed/?format=json&url=' + url, video_id)\n-\n- title = oembed_obj['title']\n- thumb_url = oembed_obj['thumbnail_url']\n- video_folder = urllib.parse.urljoin(thumb_url, 'video/')\n- file_list_doc = self._download_xml(\n- urllib.parse.urljoin(video_folder, 'fileList.xml'),\n- video_id, 'Downloading filelist XML')\n- file_name = file_list_doc.find('./video/item/fileName').text\n- video_url = urllib.parse.urljoin(video_folder, file_name)\n-\n- # Some URLs return \"No permission or not login\" in a webpage despite being\n- # freely available via oembed JSON URL (e.g. http://www.camdemy.com/media/13885)\n- upload_date = unified_strdate(self._search_regex(\n- r'>published on ([^<]+)<', webpage,\n- 'upload date', default=None))\n- view_count = str_to_int(self._search_regex(\n- r'role=[\"\\']viewCnt[\"\\'][^>]*>([\\d,.]+) views',\n- webpage, 'view count', default=None))\n- description = self._html_search_meta(\n- 'description', webpage, default=None) or clean_html(\n- oembed_obj.get('description'))\n-\n- return {\n- 'id': video_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumb_url,\n- 'description': description,\n- 'creator': oembed_obj.get('author_name'),\n- 'duration': parse_duration(oembed_obj.get('duration')),\n- 'upload_date': upload_date,\n- 'view_count': view_count,\n- }\n-\n-\n-class CamdemyFolderIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?camdemy\\.com/folder/(?P<id>\\d+)'\n- _TESTS = [{\n- # links with trailing slash\n- 'url': 'http://www.camdemy.com/folder/450',\n- 'info_dict': {\n- 'id': '450',\n- 'title': 'ไฟก่่็ณป็ตฑ 2012 & 2011 (Signals and Systems)',\n- },\n- 'playlist_mincount': 145,\n- }, {\n- # links without trailing slash\n- # and multi-page\n- 'url': 'http://www.camdemy.com/folder/853',\n- 'info_dict': {\n- 'id': '853',\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\n- },\n- 'playlist_mincount': 20,\n- }, {\n- # with displayMode parameter. For testing the codes to add parameters\n- 'url': 'http://www.camdemy.com/folder/853/?displayMode=defaultOrderByOrg',\n- 'info_dict': {\n- 'id': '853',\n- 'title': '็งๅญธ่จ็ฎ - ไฝฟ็จ Matlab',\n- },\n- 'playlist_mincount': 20,\n- }]\n-\n- def _real_extract(self, url):\n- folder_id = self._match_id(url)\n-\n- # Add displayMode=list so that all links are displayed in a single page\n- parsed_url = list(urllib.parse.urlparse(url))\n- query = dict(urllib.parse.parse_qsl(parsed_url[4]))\n- query.update({'displayMode': 'list'})\n- parsed_url[4] = urllib.parse.urlencode(query)\n- final_url = urllib.parse.urlunparse(parsed_url)\n-\n- page = self._download_webpage(final_url, folder_id)\n- matches = re.findall(r\"href='(/media/\\d+/?)'\", page)\n-\n- entries = [self.url_result('http://www.camdemy.com' + media_path)\n- for media_path in matches]\n-\n- folder_title = self._html_search_meta('keywords', page)\n-\n- return self.playlist_result(entries, folder_id, folder_title)\ndiff --git a/yt_dlp/extractor/clippit.py b/yt_dlp/extractor/clippit.py\ndeleted file mode 100644\nindex 393f21730809..000000000000\n--- a/yt_dlp/extractor/clippit.py\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_iso8601,\n- qualities,\n-)\n-\n-\n-class ClippitIE(InfoExtractor):\n-\n- _VALID_URL = r'https?://(?:www\\.)?clippituser\\.tv/c/(?P<id>[a-z]+)'\n- _TEST = {\n- 'url': 'https://www.clippituser.tv/c/evmgm',\n- 'md5': '963ae7a59a2ec4572ab8bf2f2d2c5f09',\n- 'info_dict': {\n- 'id': 'evmgm',\n- 'ext': 'mp4',\n- 'title': 'Bye bye Brutus. #BattleBots - Clippit',\n- 'uploader': 'lizllove',\n- 'uploader_url': 'https://www.clippituser.tv/p/lizllove',\n- 'timestamp': 1472183818,\n- 'upload_date': '20160826',\n- 'description': 'BattleBots | ABC',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(r'<title.*>(.+?)</title>', webpage, 'title')\n-\n- FORMATS = ('sd', 'hd')\n- quality = qualities(FORMATS)\n- formats = []\n- for format_id in FORMATS:\n- url = self._html_search_regex(rf'data-{format_id}-file=\"(.+?)\"',\n- webpage, 'url', fatal=False)\n- if not url:\n- continue\n- match = re.search(r'/(?P<height>\\d+)\\.mp4', url)\n- formats.append({\n- 'url': url,\n- 'format_id': format_id,\n- 'quality': quality(format_id),\n- 'height': int(match.group('height')) if match else None,\n- })\n-\n- uploader = self._html_search_regex(r'class=\"username\".*>\\s+(.+?)\\n',\n- webpage, 'uploader', fatal=False)\n- uploader_url = ('https://www.clippituser.tv/p/' + uploader\n- if uploader else None)\n-\n- timestamp = self._html_search_regex(r'datetime=\"(.+?)\"',\n- webpage, 'date', fatal=False)\n- thumbnail = self._html_search_regex(r'data-image=\"(.+?)\"',\n- webpage, 'thumbnail', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'uploader': uploader,\n- 'uploader_url': uploader_url,\n- 'timestamp': parse_iso8601(timestamp),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': thumbnail,\n- }\ndiff --git a/yt_dlp/extractor/contv.py b/yt_dlp/extractor/contv.py\ndeleted file mode 100644\nindex 63d760a39ba8..000000000000\n--- a/yt_dlp/extractor/contv.py\n+++ /dev/null\n@@ -1,113 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n-)\n-\n-\n-class CONtvIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?contv\\.com/details-movie/(?P<id>[^/]+)'\n- _TESTS = [{\n- 'url': 'https://www.contv.com/details-movie/CEG10022949/days-of-thrills-&-laughter',\n- 'info_dict': {\n- 'id': 'CEG10022949',\n- 'ext': 'mp4',\n- 'title': 'Days Of Thrills & Laughter',\n- 'description': 'md5:5d6b3d0b1829bb93eb72898c734802eb',\n- 'upload_date': '20180703',\n- 'timestamp': 1530634789.61,\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://www.contv.com/details-movie/CLIP-show_fotld_bts/fight-of-the-living-dead:-behind-the-scenes-bites',\n- 'info_dict': {\n- 'id': 'CLIP-show_fotld_bts',\n- 'title': 'Fight of the Living Dead: Behind the Scenes Bites',\n- },\n- 'playlist_mincount': 7,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- details = self._download_json(\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/details/' + video_id,\n- video_id, query={'device': 'web'})\n-\n- if details.get('type') == 'episodic':\n- seasons = self._download_json(\n- 'http://metax.contv.live.junctiontv.net/metax/2.5/seriesfeed/json/' + video_id,\n- video_id)\n- entries = []\n- for season in seasons:\n- for episode in season.get('episodes', []):\n- episode_id = episode.get('id')\n- if not episode_id:\n- continue\n- entries.append(self.url_result(\n- 'https://www.contv.com/details-movie/' + episode_id,\n- CONtvIE.ie_key(), episode_id))\n- return self.playlist_result(entries, video_id, details.get('title'))\n-\n- m_details = details['details']\n- title = details['title']\n-\n- formats = []\n-\n- media_hls_url = m_details.get('media_hls_url')\n- if media_hls_url:\n- formats.extend(self._extract_m3u8_formats(\n- media_hls_url, video_id, 'mp4',\n- m3u8_id='hls', fatal=False))\n-\n- media_mp4_url = m_details.get('media_mp4_url')\n- if media_mp4_url:\n- formats.append({\n- 'format_id': 'http',\n- 'url': media_mp4_url,\n- })\n-\n- subtitles = {}\n- captions = m_details.get('captions') or {}\n- for caption_url in captions.values():\n- subtitles.setdefault('en', []).append({\n- 'url': caption_url,\n- })\n-\n- thumbnails = []\n- for image in m_details.get('images', []):\n- image_url = image.get('url')\n- if not image_url:\n- continue\n- thumbnails.append({\n- 'url': image_url,\n- 'width': int_or_none(image.get('width')),\n- 'height': int_or_none(image.get('height')),\n- })\n-\n- description = None\n- for p in ('large_', 'medium_', 'small_', ''):\n- d = m_details.get(p + 'description')\n- if d:\n- description = d\n- break\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- 'description': description,\n- 'timestamp': float_or_none(details.get('metax_added_on'), 1000),\n- 'subtitles': subtitles,\n- 'duration': float_or_none(m_details.get('duration'), 1000),\n- 'view_count': int_or_none(details.get('num_watched')),\n- 'like_count': int_or_none(details.get('num_fav')),\n- 'categories': details.get('category'),\n- 'tags': details.get('tags'),\n- 'season_number': int_or_none(details.get('season')),\n- 'episode_number': int_or_none(details.get('episode')),\n- 'release_year': int_or_none(details.get('pub_year')),\n- }\ndiff --git a/yt_dlp/extractor/drooble.py b/yt_dlp/extractor/drooble.py\ndeleted file mode 100644\nindex 16e9a6194140..000000000000\n--- a/yt_dlp/extractor/drooble.py\n+++ /dev/null\n@@ -1,113 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- try_get,\n-)\n-\n-\n-class DroobleIE(InfoExtractor):\n- _VALID_URL = r'''(?x)https?://drooble\\.com/(?:\n- (?:(?P<user>[^/]+)/)?(?P<kind>song|videos|music/albums)/(?P<id>\\d+)|\n- (?P<user_2>[^/]+)/(?P<kind_2>videos|music))\n- '''\n- _TESTS = [{\n- 'url': 'https://drooble.com/song/2858030',\n- 'md5': '5ffda90f61c7c318dc0c3df4179eb064',\n- 'info_dict': {\n- 'id': '2858030',\n- 'ext': 'mp3',\n- 'title': 'Skankocillin',\n- 'upload_date': '20200801',\n- 'timestamp': 1596241390,\n- 'uploader_id': '95894',\n- 'uploader': 'Bluebeat Shelter',\n- },\n- }, {\n- 'url': 'https://drooble.com/karl340758/videos/2859183',\n- 'info_dict': {\n- 'id': 'J6QCQY_I5Tk',\n- 'ext': 'mp4',\n- 'title': 'Skankocillin',\n- 'uploader_id': 'UCrSRoI5vVyeYihtWEYua7rg',\n- 'description': 'md5:ffc0bd8ba383db5341a86a6cd7d9bcca',\n- 'upload_date': '20200731',\n- 'uploader': 'Bluebeat Shelter',\n- },\n- }, {\n- 'url': 'https://drooble.com/karl340758/music/albums/2858031',\n- 'info_dict': {\n- 'id': '2858031',\n- },\n- 'playlist_mincount': 8,\n- }, {\n- 'url': 'https://drooble.com/karl340758/music',\n- 'info_dict': {\n- 'id': 'karl340758',\n- },\n- 'playlist_mincount': 8,\n- }, {\n- 'url': 'https://drooble.com/karl340758/videos',\n- 'info_dict': {\n- 'id': 'karl340758',\n- },\n- 'playlist_mincount': 8,\n- }]\n-\n- def _call_api(self, method, video_id, data=None):\n- response = self._download_json(\n- f'https://drooble.com/api/dt/{method}', video_id, data=json.dumps(data).encode())\n- if not response[0]:\n- raise ExtractorError('Unable to download JSON metadata')\n- return response[1]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- user = mobj.group('user') or mobj.group('user_2')\n- kind = mobj.group('kind') or mobj.group('kind_2')\n- display_id = mobj.group('id') or user\n-\n- if mobj.group('kind_2') == 'videos':\n- data = {'from_user': display_id, 'album': -1, 'limit': 18, 'offset': 0, 'order': 'new2old', 'type': 'video'}\n- elif kind in ('music/albums', 'music'):\n- data = {'user': user, 'public_only': True, 'individual_limit': {'singles': 1, 'albums': 1, 'playlists': 1}}\n- else:\n- data = {'url_slug': display_id, 'children': 10, 'order': 'old2new'}\n-\n- method = 'getMusicOverview' if kind in ('music/albums', 'music') else 'getElements'\n- json_data = self._call_api(method, display_id, data=data)\n- if kind in ('music/albums', 'music'):\n- json_data = json_data['singles']['list']\n-\n- entites = []\n- for media in json_data:\n- url = media.get('external_media_url') or media.get('link')\n- if url.startswith('https://www.youtube.com'):\n- entites.append({\n- '_type': 'url',\n- 'url': url,\n- 'ie_key': 'Youtube',\n- })\n- continue\n- is_audio = (media.get('type') or '').lower() == 'audio'\n- entites.append({\n- 'url': url,\n- 'id': media['id'],\n- 'title': media['title'],\n- 'duration': int_or_none(media.get('duration')),\n- 'timestamp': int_or_none(media.get('timestamp')),\n- 'album': try_get(media, lambda x: x['album']['title']),\n- 'uploader': try_get(media, lambda x: x['creator']['display_name']),\n- 'uploader_id': try_get(media, lambda x: x['creator']['id']),\n- 'thumbnail': media.get('image_comment'),\n- 'like_count': int_or_none(media.get('likes')),\n- 'vcodec': 'none' if is_audio else None,\n- 'ext': 'mp3' if is_audio else None,\n- })\n-\n- if len(entites) > 1:\n- return self.playlist_result(entites, display_id)\n-\n- return entites[0]\ndiff --git a/yt_dlp/extractor/duboku.py b/yt_dlp/extractor/duboku.py\ndeleted file mode 100644\nindex 68c3f05731f7..000000000000\n--- a/yt_dlp/extractor/duboku.py\n+++ /dev/null\n@@ -1,246 +0,0 @@\n-import base64\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- extract_attributes,\n- get_elements_by_class,\n- int_or_none,\n- js_to_json,\n- smuggle_url,\n- unescapeHTML,\n-)\n-\n-\n-def _get_elements_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\n- \"\"\"Return the content of the tag with the specified attribute in the passed HTML document\"\"\"\n-\n- if tag is None:\n- tag = '[a-zA-Z0-9:._-]+'\n- if attribute is None:\n- attribute = ''\n- else:\n- attribute = rf'\\s+(?P<attribute>{re.escape(attribute)})'\n- if value is None:\n- value = ''\n- else:\n- value = re.escape(value) if escape_value else value\n- value = f'=[\\'\"]?(?P<value>{value})[\\'\"]?'\n-\n- retlist = []\n- for m in re.finditer(rf'''(?xs)\n- <(?P<tag>{tag})\n- (?:\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\"[^\"]*\"|='[^']*'|))*?\n- {attribute}{value}\n- (?:\\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|=\"[^\"]*\"|='[^']*'|))*?\n- \\s*>\n- (?P<content>.*?)\n- </\\1>\n- ''', html):\n- retlist.append(m)\n-\n- return retlist\n-\n-\n-def _get_element_by_tag_and_attrib(html, tag=None, attribute=None, value=None, escape_value=True):\n- retval = _get_elements_by_tag_and_attrib(html, tag, attribute, value, escape_value)\n- return retval[0] if retval else None\n-\n-\n-class DubokuIE(InfoExtractor):\n- IE_NAME = 'duboku'\n- IE_DESC = 'www.duboku.io'\n-\n- _VALID_URL = r'(?:https?://[^/]+\\.duboku\\.io/vodplay/)(?P<id>[0-9]+-[0-9-]+)\\.html.*'\n- _TESTS = [{\n- 'url': 'https://w.duboku.io/vodplay/1575-1-1.html',\n- 'info_dict': {\n- 'id': '1575-1-1',\n- 'ext': 'mp4',\n- 'series': '็ฝ่ฒๆๅ
',\n- 'title': 'contains:็ฝ่ฒๆๅ
',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'season': 'Season 1',\n- 'episode_id': '1',\n- 'season_id': '1',\n- 'episode': 'Episode 1',\n- },\n- 'params': {\n- 'skip_download': 'm3u8 download',\n- },\n- }, {\n- 'url': 'https://w.duboku.io/vodplay/1588-1-1.html',\n- 'info_dict': {\n- 'id': '1588-1-1',\n- 'ext': 'mp4',\n- 'series': 'ไบฒ็ฑ็่ชๅทฑ',\n- 'title': 'contains:็ฌฌ1้',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'season': 'Season 1',\n- 'episode_id': '1',\n- 'season_id': '1',\n- },\n- 'params': {\n- 'skip_download': 'm3u8 download',\n- },\n- }]\n-\n- _PLAYER_DATA_PATTERN = r'player_data\\s*=\\s*(\\{\\s*(.*)})\\s*;?\\s*</script'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- temp = video_id.split('-')\n- series_id = temp[0]\n- season_id = temp[1]\n- episode_id = temp[2]\n-\n- webpage_url = f'https://w.duboku.io/vodplay/{video_id}.html'\n- webpage_html = self._download_webpage(webpage_url, video_id)\n-\n- # extract video url\n-\n- player_data = self._search_regex(\n- self._PLAYER_DATA_PATTERN, webpage_html, 'player_data')\n- player_data = self._parse_json(player_data, video_id, js_to_json)\n-\n- # extract title\n-\n- temp = get_elements_by_class('title', webpage_html)\n- series_title = None\n- title = None\n- for html in temp:\n- mobj = re.search(r'<a\\s+.*>(.*)</a>', html)\n- if mobj:\n- href = extract_attributes(mobj.group(0)).get('href')\n- if href:\n- mobj1 = re.search(r'/(\\d+)\\.html', href)\n- if mobj1 and mobj1.group(1) == series_id:\n- series_title = clean_html(mobj.group(0))\n- series_title = re.sub(r'[\\s\\r\\n\\t]+', ' ', series_title)\n- title = clean_html(html)\n- title = re.sub(r'[\\s\\r\\n\\t]+', ' ', title)\n- break\n-\n- data_url = player_data.get('url')\n- if not data_url:\n- raise ExtractorError('Cannot find url in player_data')\n- player_encrypt = player_data.get('encrypt')\n- if player_encrypt == 1:\n- data_url = urllib.parse.unquote(data_url)\n- elif player_encrypt == 2:\n- data_url = urllib.parse.unquote(base64.b64decode(data_url).decode('ascii'))\n-\n- # if it is an embedded iframe, maybe it's an external source\n- headers = {'Referer': webpage_url}\n- if player_data.get('from') == 'iframe':\n- # use _type url_transparent to retain the meaningful details\n- # of the video.\n- return {\n- '_type': 'url_transparent',\n- 'url': smuggle_url(data_url, {'referer': webpage_url}),\n- 'id': video_id,\n- 'title': title,\n- 'series': series_title,\n- 'season_number': int_or_none(season_id),\n- 'season_id': season_id,\n- 'episode_number': int_or_none(episode_id),\n- 'episode_id': episode_id,\n- }\n-\n- formats = self._extract_m3u8_formats(data_url, video_id, 'mp4', headers=headers)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'series': series_title,\n- 'season_number': int_or_none(season_id),\n- 'season_id': season_id,\n- 'episode_number': int_or_none(episode_id),\n- 'episode_id': episode_id,\n- 'formats': formats,\n- 'http_headers': headers,\n- }\n-\n-\n-class DubokuPlaylistIE(InfoExtractor):\n- IE_NAME = 'duboku:list'\n- IE_DESC = 'www.duboku.io entire series'\n-\n- _VALID_URL = r'(?:https?://[^/]+\\.duboku\\.io/voddetail/)(?P<id>[0-9]+)\\.html.*'\n- _TESTS = [{\n- 'url': 'https://w.duboku.io/voddetail/1575.html',\n- 'info_dict': {\n- 'id': 'startswith:1575',\n- 'title': '็ฝ่ฒๆๅ
',\n- },\n- 'playlist_count': 12,\n- }, {\n- 'url': 'https://w.duboku.io/voddetail/1554.html',\n- 'info_dict': {\n- 'id': 'startswith:1554',\n- 'title': 'ไปฅๅฎถไบบไนๅ',\n- },\n- 'playlist_mincount': 30,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- if mobj is None:\n- raise ExtractorError(f'Invalid URL: {url}')\n- series_id = mobj.group('id')\n- fragment = urllib.parse.urlparse(url).fragment\n-\n- webpage_url = f'https://w.duboku.io/voddetail/{series_id}.html'\n- webpage_html = self._download_webpage(webpage_url, series_id)\n-\n- # extract title\n-\n- title = _get_element_by_tag_and_attrib(webpage_html, 'h1', 'class', 'title')\n- title = unescapeHTML(title.group('content')) if title else None\n- if not title:\n- title = self._html_search_meta('keywords', webpage_html)\n- if not title:\n- title = _get_element_by_tag_and_attrib(webpage_html, 'title')\n- title = unescapeHTML(title.group('content')) if title else None\n-\n- # extract playlists\n-\n- playlists = {}\n- for div in _get_elements_by_tag_and_attrib(\n- webpage_html, attribute='id', value='playlist\\\\d+', escape_value=False):\n- playlist_id = div.group('value')\n- playlist = []\n- for a in _get_elements_by_tag_and_attrib(\n- div.group('content'), 'a', 'href', value='[^\\'\"]+?', escape_value=False):\n- playlist.append({\n- 'href': unescapeHTML(a.group('value')),\n- 'title': unescapeHTML(a.group('content')),\n- })\n- playlists[playlist_id] = playlist\n-\n- # select the specified playlist if url fragment exists\n- playlist = None\n- playlist_id = None\n- if fragment:\n- playlist = playlists.get(fragment)\n- playlist_id = fragment\n- else:\n- first = next(iter(playlists.items()), None)\n- if first:\n- (playlist_id, playlist) = first\n- if not playlist:\n- raise ExtractorError(\n- f'Cannot find {fragment}' if fragment else 'Cannot extract playlist')\n-\n- # return url results\n- return self.playlist_result([\n- self.url_result(\n- urllib.parse.urljoin('https://w.duboku.io', x['href']),\n- ie=DubokuIE.ie_key(), video_title=x.get('title'))\n- for x in playlist], series_id + '#' + playlist_id, title)\ndiff --git a/yt_dlp/extractor/eighttracks.py b/yt_dlp/extractor/eighttracks.py\ndeleted file mode 100644\nindex 3ac4c56ae0fd..000000000000\n--- a/yt_dlp/extractor/eighttracks.py\n+++ /dev/null\n@@ -1,158 +0,0 @@\n-import json\n-import random\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n-)\n-\n-\n-class EightTracksIE(InfoExtractor):\n- IE_NAME = '8tracks'\n- _VALID_URL = r'https?://8tracks\\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'\n- _TEST = {\n- 'name': 'EightTracks',\n- 'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',\n- 'info_dict': {\n- 'id': '1336550',\n- 'display_id': 'youtube-dl-test-tracks-a',\n- 'description': \"test chars: \\\"'/\\\\รคโญ\",\n- 'title': \"youtube-dl test tracks \\\"'/\\\\รคโญ<>\",\n- },\n- 'playlist': [\n- {\n- 'md5': '96ce57f24389fc8734ce47f4c1abcc55',\n- 'info_dict': {\n- 'id': '11885610',\n- 'ext': 'm4a',\n- 'title': \"youtue-dl project<>\\\"' - youtube-dl test track 1 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '4ab26f05c1f7291ea460a3920be8021f',\n- 'info_dict': {\n- 'id': '11885608',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project - youtube-dl test track 2 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'd30b5b5f74217410f4689605c35d1fd7',\n- 'info_dict': {\n- 'id': '11885679',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project as well - youtube-dl test track 3 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '4eb0a669317cd725f6bbd336a29f923a',\n- 'info_dict': {\n- 'id': '11885680',\n- 'ext': 'm4a',\n- 'title': \"youtube-dl project as well - youtube-dl test track 4 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '1893e872e263a2705558d1d319ad19e8',\n- 'info_dict': {\n- 'id': '11885682',\n- 'ext': 'm4a',\n- 'title': \"PH - youtube-dl test track 5 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'b673c46f47a216ab1741ae8836af5899',\n- 'info_dict': {\n- 'id': '11885683',\n- 'ext': 'm4a',\n- 'title': \"PH - youtube-dl test track 6 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': '1d74534e95df54986da7f5abf7d842b7',\n- 'info_dict': {\n- 'id': '11885684',\n- 'ext': 'm4a',\n- 'title': \"phihag - youtube-dl test track 7 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- {\n- 'md5': 'f081f47af8f6ae782ed131d38b9cd1c0',\n- 'info_dict': {\n- 'id': '11885685',\n- 'ext': 'm4a',\n- 'title': \"phihag - youtube-dl test track 8 \\\"'/\\\\\\u00e4\\u21ad\",\n- 'uploader_id': 'ytdl',\n- },\n- },\n- ],\n- }\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, playlist_id)\n-\n- data = self._parse_json(\n- self._search_regex(\n- r'(?s)PAGE\\.mix\\s*=\\s*({.+?});\\n', webpage, 'trax information'),\n- playlist_id)\n-\n- session = str(random.randint(0, 1000000000))\n- mix_id = data['id']\n- track_count = data['tracks_count']\n- duration = data['duration']\n- avg_song_duration = float(duration) / track_count\n- # duration is sometimes negative, use predefined avg duration\n- if avg_song_duration <= 0:\n- avg_song_duration = 300\n- first_url = f'http://8tracks.com/sets/{session}/play?player=sm&mix_id={mix_id}&format=jsonh'\n- next_url = first_url\n- entries = []\n-\n- for i in range(track_count):\n- api_json = None\n- download_tries = 0\n-\n- while api_json is None:\n- try:\n- api_json = self._download_webpage(\n- next_url, playlist_id,\n- note='Downloading song information %d/%d' % (i + 1, track_count),\n- errnote='Failed to download song information')\n- except ExtractorError:\n- if download_tries > 3:\n- raise\n- else:\n- download_tries += 1\n- self._sleep(avg_song_duration, playlist_id)\n-\n- api_data = json.loads(api_json)\n- track_data = api_data['set']['track']\n- info = {\n- 'id': str(track_data['id']),\n- 'url': track_data['track_file_stream_url'],\n- 'title': track_data['performer'] + ' - ' + track_data['name'],\n- 'raw_title': track_data['name'],\n- 'uploader_id': data['user']['login'],\n- 'ext': 'm4a',\n- }\n- entries.append(info)\n-\n- next_url = 'http://8tracks.com/sets/{}/next?player=sm&mix_id={}&format=jsonh&track_id={}'.format(\n- session, mix_id, track_data['id'])\n- return {\n- '_type': 'playlist',\n- 'entries': entries,\n- 'id': str(mix_id),\n- 'display_id': playlist_id,\n- 'title': data.get('name'),\n- 'description': data.get('description'),\n- }\ndiff --git a/yt_dlp/extractor/eitb.py b/yt_dlp/extractor/eitb.py\ndeleted file mode 100644\nindex 18b802eb1550..000000000000\n--- a/yt_dlp/extractor/eitb.py\n+++ /dev/null\n@@ -1,81 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking import Request\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- parse_iso8601,\n-)\n-\n-\n-class EitbIE(InfoExtractor):\n- IE_NAME = 'eitb.tv'\n- _VALID_URL = r'https?://(?:www\\.)?eitb\\.tv/(?:eu/bideoa|es/video)/[^/]+/\\d+/(?P<id>\\d+)'\n-\n- _TEST = {\n- 'url': 'http://www.eitb.tv/es/video/60-minutos-60-minutos-2013-2014/4104995148001/4090227752001/lasa-y-zabala-30-anos/',\n- 'md5': 'edf4436247185adee3ea18ce64c47998',\n- 'info_dict': {\n- 'id': '4090227752001',\n- 'ext': 'mp4',\n- 'title': '60 minutos (Lasa y Zabala, 30 aรฑos)',\n- 'description': 'Programa de reportajes de actualidad.',\n- 'duration': 3996.76,\n- 'timestamp': 1381789200,\n- 'upload_date': '20131014',\n- 'tags': list,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video = self._download_json(\n- f'http://mam.eitb.eus/mam/REST/ServiceMultiweb/Video/MULTIWEBTV/{video_id}/',\n- video_id, 'Downloading video JSON')\n-\n- media = video['web_media'][0]\n-\n- formats = []\n- for rendition in media['RENDITIONS']:\n- video_url = rendition.get('PMD_URL')\n- if not video_url:\n- continue\n- tbr = float_or_none(rendition.get('ENCODING_RATE'), 1000)\n- formats.append({\n- 'url': rendition['PMD_URL'],\n- 'format_id': join_nonempty('http', int_or_none(tbr)),\n- 'width': int_or_none(rendition.get('FRAME_WIDTH')),\n- 'height': int_or_none(rendition.get('FRAME_HEIGHT')),\n- 'tbr': tbr,\n- })\n-\n- hls_url = media.get('HLS_SURL')\n- if hls_url:\n- request = Request(\n- 'http://mam.eitb.eus/mam/REST/ServiceMultiweb/DomainRestrictedSecurity/TokenAuth/',\n- headers={'Referer': url})\n- token_data = self._download_json(\n- request, video_id, 'Downloading auth token', fatal=False)\n- if token_data:\n- token = token_data.get('token')\n- if token:\n- formats.extend(self._extract_m3u8_formats(\n- f'{hls_url}?hdnts={token}', video_id, m3u8_id='hls', fatal=False))\n-\n- hds_url = media.get('HDS_SURL')\n- if hds_url:\n- formats.extend(self._extract_f4m_formats(\n- '{}?hdcore=3.7.0'.format(hds_url.replace('euskalsvod', 'euskalvod')),\n- video_id, f4m_id='hds', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'title': media.get('NAME_ES') or media.get('name') or media['NAME_EU'],\n- 'description': media.get('SHORT_DESC_ES') or video.get('desc_group') or media.get('SHORT_DESC_EU'),\n- 'thumbnail': media.get('STILL_URL') or media.get('THUMBNAIL_URL'),\n- 'duration': float_or_none(media.get('LENGTH'), 1000),\n- 'timestamp': parse_iso8601(media.get('BROADCST_DATE'), ' '),\n- 'tags': media.get('TAGS'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/eyedotv.py b/yt_dlp/extractor/eyedotv.py\ndeleted file mode 100644\nindex b8c67ce4ccb7..000000000000\n--- a/yt_dlp/extractor/eyedotv.py\n+++ /dev/null\n@@ -1,61 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n- xpath_text,\n-)\n-\n-\n-class EyedoTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?eyedo\\.tv/[^/]+/(?:#!/)?Live/Detail/(?P<id>[0-9]+)'\n- _TEST = {\n- 'url': 'https://www.eyedo.tv/en-US/#!/Live/Detail/16301',\n- 'md5': 'ba14f17995cdfc20c36ba40e21bf73f7',\n- 'info_dict': {\n- 'id': '16301',\n- 'ext': 'mp4',\n- 'title': 'Journรฉe du conseil scientifique de l\\'Afnic 2015',\n- 'description': 'md5:4abe07293b2f73efc6e1c37028d58c98',\n- 'uploader': 'Afnic Live',\n- 'uploader_id': '8023',\n- },\n- }\n- _ROOT_URL = 'http://live.eyedo.net:1935/'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- video_data = self._download_xml(f'http://eyedo.tv/api/live/GetLive/{video_id}', video_id)\n-\n- def _add_ns(path):\n- return self._xpath_ns(path, 'http://schemas.datacontract.org/2004/07/EyeDo.Core.Implementation.Web.ViewModels.Api')\n-\n- title = xpath_text(video_data, _add_ns('Titre'), 'title', True)\n- state_live_code = xpath_text(video_data, _add_ns('StateLiveCode'), 'title', True)\n- if state_live_code == 'avenir':\n- raise ExtractorError(\n- f'{self.IE_NAME} said: We\\'re sorry, but this video is not yet available.',\n- expected=True)\n-\n- is_live = state_live_code == 'live'\n- m3u8_url = None\n- # http://eyedo.tv/Content/Html5/Scripts/html5view.js\n- if is_live:\n- if xpath_text(video_data, 'Cdn') == 'true':\n- m3u8_url = f'http://rrr.sz.xlcdn.com/?account=eyedo&file=A{video_id}&type=live&service=wowza&protocol=http&output=playlist.m3u8'\n- else:\n- m3u8_url = self._ROOT_URL + f'w/{video_id}/eyedo_720p/playlist.m3u8'\n- else:\n- m3u8_url = self._ROOT_URL + f'replay-w/{video_id}/mp4:{video_id}.mp4/playlist.m3u8'\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native'),\n- 'description': xpath_text(video_data, _add_ns('Description')),\n- 'duration': parse_duration(xpath_text(video_data, _add_ns('Duration'))),\n- 'uploader': xpath_text(video_data, _add_ns('Createur')),\n- 'uploader_id': xpath_text(video_data, _add_ns('CreateurId')),\n- 'chapter': xpath_text(video_data, _add_ns('ChapitreTitre')),\n- 'chapter_id': xpath_text(video_data, _add_ns('ChapitreId')),\n- }\ndiff --git a/yt_dlp/extractor/footyroom.py b/yt_dlp/extractor/footyroom.py\nindex 797e894d679c..c814af24c8f0 100644\n--- a/yt_dlp/extractor/footyroom.py\n+++ b/yt_dlp/extractor/footyroom.py\n@@ -12,14 +12,6 @@ class FootyRoomIE(InfoExtractor):\n },\n 'playlist_count': 2,\n 'add_ie': [StreamableIE.ie_key()],\n- }, {\n- 'url': 'http://footyroom.com/matches/75817984/georgia-vs-germany/review',\n- 'info_dict': {\n- 'id': '75817984',\n- 'title': 'VIDEO Georgia 0 - 2 Germany',\n- },\n- 'playlist_count': 1,\n- 'add_ie': ['Playwire'],\n }]\n \n def _real_extract(self, url):\n@@ -38,13 +30,6 @@ def _real_extract(self, url):\n payload = video.get('payload')\n if not payload:\n continue\n- playwire_url = self._html_search_regex(\n- r'data-config=\"([^\"]+)\"', payload,\n- 'playwire url', default=None)\n- if playwire_url:\n- entries.append(self.url_result(self._proto_relative_url(\n- playwire_url, 'http:'), 'Playwire'))\n-\n streamable_url = StreamableIE._extract_url(payload)\n if streamable_url:\n entries.append(self.url_result(\ndiff --git a/yt_dlp/extractor/franceinter.py b/yt_dlp/extractor/franceinter.py\ndeleted file mode 100644\nindex 779249b8430a..000000000000\n--- a/yt_dlp/extractor/franceinter.py\n+++ /dev/null\n@@ -1,56 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import month_by_name\n-\n-\n-class FranceInterIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?franceinter\\.fr/emissions/(?P<id>[^?#]+)'\n-\n- _TEST = {\n- 'url': 'https://www.franceinter.fr/emissions/affaires-sensibles/affaires-sensibles-07-septembre-2016',\n- 'md5': '9e54d7bdb6fdc02a841007f8a975c094',\n- 'info_dict': {\n- 'id': 'affaires-sensibles/affaires-sensibles-07-septembre-2016',\n- 'ext': 'mp3',\n- 'title': 'Affaire Cahuzac : le contentieux du compte en Suisse',\n- 'description': 'md5:401969c5d318c061f86bda1fa359292b',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20160907',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(url, video_id)\n-\n- video_url = self._search_regex(\n- r'(?s)<div[^>]+class=[\"\\']page-diffusion[\"\\'][^>]*>.*?<button[^>]+data-url=([\"\\'])(?P<url>(?:(?!\\1).)+)\\1',\n- webpage, 'video url', group='url')\n-\n- title = self._og_search_title(webpage)\n- description = self._og_search_description(webpage)\n- thumbnail = self._html_search_meta(['og:image', 'twitter:image'], webpage)\n-\n- upload_date_str = self._search_regex(\n- r'class=[\"\\']\\s*cover-emission-period\\s*[\"\\'][^>]*>[^<]+\\s+(\\d{1,2}\\s+[^\\s]+\\s+\\d{4})<',\n- webpage, 'upload date', fatal=False)\n- if upload_date_str:\n- upload_date_list = upload_date_str.split()\n- upload_date_list.reverse()\n- upload_date_list[1] = '%02d' % (month_by_name(upload_date_list[1], lang='fr') or 0)\n- upload_date_list[2] = '%02d' % int(upload_date_list[2])\n- upload_date = ''.join(upload_date_list)\n- else:\n- upload_date = None\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- 'formats': [{\n- 'url': video_url,\n- 'vcodec': 'none',\n- }],\n- }\ndiff --git a/yt_dlp/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py\ndeleted file mode 100644\nindex 3319b126811a..000000000000\n--- a/yt_dlp/extractor/fujitv.py\n+++ /dev/null\n@@ -1,73 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-\n-\n-class FujiTVFODPlus7IE(InfoExtractor):\n- _VALID_URL = r'https?://fod\\.fujitv\\.co\\.jp/title/(?P<sid>[0-9a-z]{4})/(?P<id>[0-9a-z]+)'\n- _BASE_URL = 'https://i.fod.fujitv.co.jp/'\n- _BITRATE_MAP = {\n- 300: (320, 180),\n- 800: (640, 360),\n- 1200: (1280, 720),\n- 2000: (1280, 720),\n- 4000: (1920, 1080),\n- }\n-\n- _TESTS = [{\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40110076',\n- 'info_dict': {\n- 'id': '5d40110076',\n- 'ext': 'ts',\n- 'title': '#1318 ใใพใๅญใใพใผใใใฎๆด้คจใ่ฆใใใฎๅทป',\n- 'series': 'ใกใณใพใๅญใกใใ',\n- 'series_id': '5d40',\n- 'description': 'md5:b3f51dbfdda162ac4f789e0ff4d65750',\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40110076_a.jpg',\n- },\n- }, {\n- 'url': 'https://fod.fujitv.co.jp/title/5d40/5d40810083',\n- 'info_dict': {\n- 'id': '5d40810083',\n- 'ext': 'ts',\n- 'title': '#1324 ใใพใๅญใจใชใใฎๅญใใฎๅทป๏ผใ็ตๆ๏ผ2ๆใใ ใใซใใชใไผใใฎๅทป',\n- 'description': 'md5:3972d900b896adc8ab1849e310507efa',\n- 'series': 'ใกใณใพใๅญใกใใ',\n- 'series_id': '5d40',\n- 'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40810083_a.jpg'},\n- 'skip': 'Video available only in one week',\n- }]\n-\n- def _real_extract(self, url):\n- series_id, video_id = self._match_valid_url(url).groups()\n- self._request_webpage(HEADRequest(url), video_id)\n- json_info = {}\n- token = self._get_cookies(url).get('CT')\n- if token:\n- json_info = self._download_json(\n- f'https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id={video_id}&is_premium=false',\n- video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)\n- else:\n- self.report_warning(f'The token cookie is needed to extract video metadata. {self._login_hint(\"cookies\")}')\n- formats, subtitles = [], {}\n- src_json = self._download_json(f'{self._BASE_URL}abrjson_v2/tv_android/{video_id}', video_id)\n- for src in src_json['video_selector']:\n- if not src.get('url'):\n- continue\n- fmt, subs = self._extract_m3u8_formats_and_subtitles(src['url'], video_id, 'ts')\n- for f in fmt:\n- f.update(dict(zip(('height', 'width'),\n- self._BITRATE_MAP.get(f.get('tbr'), ()), strict=False)))\n- formats.extend(fmt)\n- subtitles = self._merge_subtitles(subtitles, subs)\n-\n- return {\n- 'id': video_id,\n- 'title': json_info.get('ep_title'),\n- 'series': json_info.get('lu_title'),\n- 'series_id': series_id,\n- 'description': json_info.get('ep_description'),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': f'{self._BASE_URL}img/program/{series_id}/episode/{video_id}_a.jpg',\n- '_format_sort_fields': ('tbr', ),\n- }\ndiff --git a/yt_dlp/extractor/gab.py b/yt_dlp/extractor/gab.py\nindex 024628e1ca0b..2684073301c3 100644\n--- a/yt_dlp/extractor/gab.py\n+++ b/yt_dlp/extractor/gab.py\n@@ -1,70 +1,13 @@\n-import re\n-\n from .common import InfoExtractor\n from ..utils import (\n clean_html,\n int_or_none,\n parse_codecs,\n parse_duration,\n- str_to_int,\n unified_timestamp,\n )\n \n \n-class GabTVIE(InfoExtractor):\n- _VALID_URL = r'https?://tv\\.gab\\.com/channel/[^/]+/view/(?P<id>[a-z0-9-]+)'\n- _TESTS = [{\n- 'url': 'https://tv.gab.com/channel/wurzelroot/view/why-was-america-in-afghanistan-61217eacea5665de450d0488',\n- 'info_dict': {\n- 'id': '61217eacea5665de450d0488',\n- 'ext': 'mp4',\n- 'title': 'WHY WAS AMERICA IN AFGHANISTAN - AMERICA FIRST AGAINST AMERICAN OLIGARCHY',\n- 'uploader': 'Wurzelroot',\n- 'uploader_id': '608fb0a85738fd1974984f7d',\n- 'thumbnail': 'https://tv.gab.com/image/61217eacea5665de450d0488',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url).split('-')[-1]\n- webpage = self._download_webpage(url, video_id)\n- channel_id = self._search_regex(r'data-channel-id=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'channel_id')\n- channel_name = self._search_regex(r'data-channel-name=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'channel_name')\n- title = self._search_regex(r'data-episode-title=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'title')\n- view_key = self._search_regex(r'data-view-key=\\\"(?P<channel_id>[^\\\"]+)', webpage, 'view_key')\n- description = clean_html(\n- self._html_search_regex(self._meta_regex('description'), webpage, 'description', group='content')) or None\n- available_resolutions = re.findall(\n- rf'<a\\ data-episode-id=\\\"{video_id}\\\"\\ data-resolution=\\\"(?P<resolution>[^\\\"]+)', webpage)\n-\n- formats = []\n- for resolution in available_resolutions:\n- frmt = {\n- 'url': f'https://tv.gab.com/media/{video_id}?viewKey={view_key}&r={resolution}',\n- 'format_id': resolution,\n- 'vcodec': 'h264',\n- 'acodec': 'aac',\n- 'ext': 'mp4',\n- }\n- if 'audio-' in resolution:\n- frmt['abr'] = str_to_int(resolution.replace('audio-', ''))\n- frmt['height'] = 144\n- frmt['quality'] = -10\n- else:\n- frmt['height'] = str_to_int(resolution.replace('p', ''))\n- formats.append(frmt)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'description': description,\n- 'uploader': channel_name,\n- 'uploader_id': channel_id,\n- 'thumbnail': f'https://tv.gab.com/image/{video_id}',\n- }\n-\n-\n class GabIE(InfoExtractor):\n _VALID_URL = r'https?://(?:www\\.)?gab\\.com/[^/]+/posts/(?P<id>\\d+)'\n _TESTS = [{\ndiff --git a/yt_dlp/extractor/googlepodcasts.py b/yt_dlp/extractor/googlepodcasts.py\ndeleted file mode 100644\nindex 8d1cc4fa119a..000000000000\n--- a/yt_dlp/extractor/googlepodcasts.py\n+++ /dev/null\n@@ -1,84 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_podcast_url,\n- int_or_none,\n- try_get,\n- urlencode_postdata,\n-)\n-\n-\n-class GooglePodcastsBaseIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://podcasts\\.google\\.com/feed/'\n-\n- def _batch_execute(self, func_id, video_id, params):\n- return json.loads(self._download_json(\n- 'https://podcasts.google.com/_/PodcastsUi/data/batchexecute',\n- video_id, data=urlencode_postdata({\n- 'f.req': json.dumps([[[func_id, json.dumps(params), None, '1']]]),\n- }), transform_source=lambda x: self._search_regex(r'(?s)(\\[.+\\])', x, 'data'))[0][2])\n-\n- def _extract_episode(self, episode):\n- return {\n- 'id': episode[4][3],\n- 'title': episode[8],\n- 'url': clean_podcast_url(episode[13]),\n- 'thumbnail': episode[2],\n- 'description': episode[9],\n- 'creator': try_get(episode, lambda x: x[14]),\n- 'timestamp': int_or_none(episode[11]),\n- 'duration': int_or_none(episode[12]),\n- 'series': episode[1],\n- }\n-\n-\n-class GooglePodcastsIE(GooglePodcastsBaseIE):\n- IE_NAME = 'google:podcasts'\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<feed_url>[^/]+)/episode/(?P<id>[^/?&#]+)'\n- _TEST = {\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA/episode/MzBlNWRlN2UtOWE4Yy00ODcwLTk2M2MtM2JlMmUyNmViOTRh',\n- 'md5': 'fa56b2ee8bd0703e27e42d4b104c4766',\n- 'info_dict': {\n- 'id': '30e5de7e-9a8c-4870-963c-3be2e26eb94a',\n- 'ext': 'mp3',\n- 'title': 'WWDTM New Year 2021',\n- 'description': 'We say goodbye to 2020 with Christine Baranksi, Doug Jones, Jonna Mendez, and Kellee Edwards.',\n- 'upload_date': '20210102',\n- 'timestamp': 1609606800,\n- 'duration': 2901,\n- 'series': \"Wait Wait... Don't Tell Me!\",\n- },\n- }\n-\n- def _real_extract(self, url):\n- b64_feed_url, b64_guid = self._match_valid_url(url).groups()\n- episode = self._batch_execute(\n- 'oNjqVe', b64_guid, [b64_feed_url, b64_guid])[1]\n- return self._extract_episode(episode)\n-\n-\n-class GooglePodcastsFeedIE(GooglePodcastsBaseIE):\n- IE_NAME = 'google:podcasts:feed'\n- _VALID_URL = GooglePodcastsBaseIE._VALID_URL_BASE + r'(?P<id>[^/?&#]+)/?(?:[?#&]|$)'\n- _TEST = {\n- 'url': 'https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzM0NDA5ODUzOS9wb2RjYXN0LnhtbA',\n- 'info_dict': {\n- 'title': \"Wait Wait... Don't Tell Me!\",\n- 'description': \"NPR's weekly current events quiz. Have a laugh and test your news knowledge while figuring out what's real and what we've made up.\",\n- },\n- 'playlist_mincount': 20,\n- }\n-\n- def _real_extract(self, url):\n- b64_feed_url = self._match_id(url)\n- data = self._batch_execute('ncqJEe', b64_feed_url, [b64_feed_url])\n-\n- entries = []\n- for episode in (try_get(data, lambda x: x[1][0]) or []):\n- entries.append(self._extract_episode(episode))\n-\n- feed = try_get(data, lambda x: x[3]) or []\n- return self.playlist_result(\n- entries, playlist_title=try_get(feed, lambda x: x[0]),\n- playlist_description=try_get(feed, lambda x: x[2]))\ndiff --git a/yt_dlp/extractor/goshgay.py b/yt_dlp/extractor/goshgay.py\ndeleted file mode 100644\nindex 7bcac9bdeaa0..000000000000\n--- a/yt_dlp/extractor/goshgay.py\n+++ /dev/null\n@@ -1,47 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_duration,\n-)\n-\n-\n-class GoshgayIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?goshgay\\.com/video(?P<id>\\d+?)($|/)'\n- _TEST = {\n- 'url': 'http://www.goshgay.com/video299069/diesel_sfw_xxx_video',\n- 'md5': '4b6db9a0a333142eb9f15913142b0ed1',\n- 'info_dict': {\n- 'id': '299069',\n- 'ext': 'flv',\n- 'title': 'DIESEL SFW XXX Video',\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- 'duration': 80,\n- 'age_limit': 18,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = self._html_search_regex(\n- r'<h2>(.*?)<', webpage, 'title')\n- duration = parse_duration(self._html_search_regex(\n- r'<span class=\"duration\">\\s*-?\\s*(.*?)</span>',\n- webpage, 'duration', fatal=False))\n-\n- flashvars = urllib.parse.parse_qs(self._html_search_regex(\n- r'<embed.+?id=\"flash-player-embed\".+?flashvars=\"([^\"]+)\"',\n- webpage, 'flashvars'))\n- thumbnail = flashvars.get('url_bigthumb', [None])[0]\n- video_url = flashvars['flv_url'][0]\n-\n- return {\n- 'id': video_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- 'age_limit': 18,\n- }\ndiff --git a/yt_dlp/extractor/gputechconf.py b/yt_dlp/extractor/gputechconf.py\ndeleted file mode 100644\nindex f31791a718b9..000000000000\n--- a/yt_dlp/extractor/gputechconf.py\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class GPUTechConfIE(InfoExtractor):\n- _VALID_URL = r'https?://on-demand\\.gputechconf\\.com/gtc/2015/video/S(?P<id>\\d+)\\.html'\n- _TEST = {\n- 'url': 'http://on-demand.gputechconf.com/gtc/2015/video/S5156.html',\n- 'md5': 'a8862a00a0fd65b8b43acc5b8e33f798',\n- 'info_dict': {\n- 'id': '5156',\n- 'ext': 'mp4',\n- 'title': 'Coordinating More Than 3 Million CUDA Threads for Social Network Analysis',\n- 'duration': 1219,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- root_path = self._search_regex(\n- r'var\\s+rootPath\\s*=\\s*\"([^\"]+)', webpage, 'root path',\n- default='http://evt.dispeak.com/nvidia/events/gtc15/')\n- xml_file_id = self._search_regex(\n- r'var\\s+xmlFileId\\s*=\\s*\"([^\"]+)', webpage, 'xml file id')\n-\n- return {\n- '_type': 'url_transparent',\n- 'id': video_id,\n- 'url': f'{root_path}xml/{xml_file_id}.xml',\n- 'ie_key': 'DigitallySpeaking',\n- }\ndiff --git a/yt_dlp/extractor/hketv.py b/yt_dlp/extractor/hketv.py\ndeleted file mode 100644\nindex 3998abc121cd..000000000000\n--- a/yt_dlp/extractor/hketv.py\n+++ /dev/null\n@@ -1,183 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- int_or_none,\n- merge_dicts,\n- parse_count,\n- str_or_none,\n- try_get,\n- unified_strdate,\n- urlencode_postdata,\n- urljoin,\n-)\n-\n-\n-class HKETVIE(InfoExtractor):\n- IE_NAME = 'hketv'\n- IE_DESC = '้ฆๆธฏๆ่ฒๅฑๆ่ฒ้ป่ฆ (HKETV) Educational Television, Hong Kong Educational Bureau'\n- _GEO_BYPASS = False\n- _GEO_COUNTRIES = ['HK']\n- _VALID_URL = r'https?://(?:www\\.)?hkedcity\\.net/etv/resource/(?P<id>[0-9]+)'\n- _TESTS = [{\n- 'url': 'https://www.hkedcity.net/etv/resource/2932360618',\n- 'md5': 'f193712f5f7abb208ddef3c5ea6ed0b7',\n- 'info_dict': {\n- 'id': '2932360618',\n- 'ext': 'mp4',\n- 'title': 'ๅ้ฑไธ็(ๅ
ฑไบซ้ฑ่ฎๆจ) (ไธญใ่ฑๆๅญๅนๅฏไพ้ธๆ)',\n- 'description': 'md5:d5286d05219ef50e0613311cbe96e560',\n- 'upload_date': '20181024',\n- 'duration': 900,\n- 'subtitles': 'count:2',\n- },\n- 'skip': 'Geo restricted to HK',\n- }, {\n- 'url': 'https://www.hkedcity.net/etv/resource/972641418',\n- 'md5': '1ed494c1c6cf7866a8290edad9b07dc9',\n- 'info_dict': {\n- 'id': '972641418',\n- 'ext': 'mp4',\n- 'title': '่กฃๅ ๆฅๆฅ (ๅคฉไฝฟ็ณปๅไนไธ)',\n- 'description': 'md5:10bb3d659421e74f58e5db5691627b0f',\n- 'upload_date': '20070109',\n- 'duration': 907,\n- 'subtitles': {},\n- },\n- 'skip': 'Geo restricted to HK',\n- }]\n-\n- _CC_LANGS = {\n- 'ไธญๆ๏ผ็น้ซไธญๆ๏ผ': 'zh-Hant',\n- 'ไธญๆ๏ผ็ฎไฝไธญๆ๏ผ': 'zh-Hans',\n- 'English': 'en',\n- 'Bahasa Indonesia': 'id',\n- '\\u0939\\u093f\\u0928\\u094d\\u0926\\u0940': 'hi',\n- '\\u0928\\u0947\\u092a\\u093e\\u0932\\u0940': 'ne',\n- 'Tagalog': 'tl',\n- '\\u0e44\\u0e17\\u0e22': 'th',\n- '\\u0627\\u0631\\u062f\\u0648': 'ur',\n- }\n- _FORMAT_HEIGHTS = {\n- 'SD': 360,\n- 'HD': 720,\n- }\n- _APPS_BASE_URL = 'https://apps.hkedcity.net'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- title = (\n- self._html_search_meta(\n- ('ed_title', 'search.ed_title'), webpage, default=None)\n- or self._search_regex(\n- r'data-favorite_title_(?:eng|chi)=([\"\\'])(?P<id>(?:(?!\\1).)+)\\1',\n- webpage, 'title', default=None, group='url')\n- or self._html_search_regex(\n- r'<h1>([^<]+)</h1>', webpage, 'title', default=None)\n- or self._og_search_title(webpage)\n- )\n-\n- file_id = self._search_regex(\n- r'post_var\\[[\"\\']file_id[\"\\']\\s*\\]\\s*=\\s*(.+?);',\n- webpage, 'file ID')\n- curr_url = self._search_regex(\n- r'post_var\\[[\"\\']curr_url[\"\\']\\s*\\]\\s*=\\s*\"(.+?)\";',\n- webpage, 'curr URL')\n- data = {\n- 'action': 'get_info',\n- 'curr_url': curr_url,\n- 'file_id': file_id,\n- 'video_url': file_id,\n- }\n-\n- response = self._download_json(\n- self._APPS_BASE_URL + '/media/play/handler.php', video_id,\n- data=urlencode_postdata(data),\n- headers=merge_dicts({\n- 'Content-Type': 'application/x-www-form-urlencoded'},\n- self.geo_verification_headers()))\n-\n- result = response['result']\n-\n- if not response.get('success') or not response.get('access'):\n- error = clean_html(response.get('access_err_msg'))\n- if 'Video streaming is not available in your country' in error:\n- self.raise_geo_restricted(\n- msg=error, countries=self._GEO_COUNTRIES)\n- else:\n- raise ExtractorError(error, expected=True)\n-\n- formats = []\n-\n- width = int_or_none(result.get('width'))\n- height = int_or_none(result.get('height'))\n-\n- playlist0 = result['playlist'][0]\n- for fmt in playlist0['sources']:\n- file_url = urljoin(self._APPS_BASE_URL, fmt.get('file'))\n- if not file_url:\n- continue\n- # If we ever wanted to provide the final resolved URL that\n- # does not require cookies, albeit with a shorter lifespan:\n- # urlh = self._downloader.urlopen(file_url)\n- # resolved_url = urlh.url\n- label = fmt.get('label')\n- h = self._FORMAT_HEIGHTS.get(label)\n- w = h * width // height if h and width and height else None\n- formats.append({\n- 'format_id': label,\n- 'ext': fmt.get('type'),\n- 'url': file_url,\n- 'width': w,\n- 'height': h,\n- })\n-\n- subtitles = {}\n- tracks = try_get(playlist0, lambda x: x['tracks'], list) or []\n- for track in tracks:\n- if not isinstance(track, dict):\n- continue\n- track_kind = str_or_none(track.get('kind'))\n- if not track_kind or not isinstance(track_kind, str):\n- continue\n- if track_kind.lower() not in ('captions', 'subtitles'):\n- continue\n- track_url = urljoin(self._APPS_BASE_URL, track.get('file'))\n- if not track_url:\n- continue\n- track_label = track.get('label')\n- subtitles.setdefault(self._CC_LANGS.get(\n- track_label, track_label), []).append({\n- 'url': self._proto_relative_url(track_url),\n- 'ext': 'srt',\n- })\n-\n- # Likes\n- emotion = self._download_json(\n- 'https://emocounter.hkedcity.net/handler.php', video_id,\n- data=urlencode_postdata({\n- 'action': 'get_emotion',\n- 'data[bucket_id]': 'etv',\n- 'data[identifier]': video_id,\n- }),\n- headers={'Content-Type': 'application/x-www-form-urlencoded'},\n- fatal=False) or {}\n- like_count = int_or_none(try_get(\n- emotion, lambda x: x['data']['emotion_data'][0]['count']))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': self._html_search_meta(\n- 'description', webpage, fatal=False),\n- 'upload_date': unified_strdate(self._html_search_meta(\n- 'ed_date', webpage, fatal=False), day_first=False),\n- 'duration': int_or_none(result.get('length')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': urljoin(self._APPS_BASE_URL, result.get('image')),\n- 'view_count': parse_count(result.get('view_count')),\n- 'like_count': like_count,\n- }\ndiff --git a/yt_dlp/extractor/idolplus.py b/yt_dlp/extractor/idolplus.py\ndeleted file mode 100644\nindex 3c905b071234..000000000000\n--- a/yt_dlp/extractor/idolplus.py\n+++ /dev/null\n@@ -1,115 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import traverse_obj, try_call, url_or_none\n-\n-\n-class IdolPlusIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?idolplus\\.com/z[us]/(?:concert/|contents/?\\?(?:[^#]+&)?albumId=)(?P<id>\\w+)'\n- _TESTS = [{\n- 'url': 'https://idolplus.com/zs/contents?albumId=M012077298PPV00',\n- 'md5': '2ace3f4661c943a2f7e79f0b88cea1e7',\n- 'info_dict': {\n- 'id': 'M012077298PPV00',\n- 'ext': 'mp4',\n- 'title': '[MultiCam] Aegyo on Top of Aegyo (IZ*ONE EATING TRIP)',\n- 'release_date': '20200707',\n- 'formats': 'count:65',\n- },\n- 'params': {'format': '532-KIM_MINJU'},\n- }, {\n- 'url': 'https://idolplus.com/zs/contents?albumId=M01232H058PPV00&catId=E9TX5',\n- 'info_dict': {\n- 'id': 'M01232H058PPV00',\n- 'ext': 'mp4',\n- 'title': 'YENA (CIRCLE CHART MUSIC AWARDS 2022 RED CARPET)',\n- 'release_date': '20230218',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }, {\n- # live stream\n- 'url': 'https://idolplus.com/zu/contents?albumId=M012323174PPV00',\n- 'info_dict': {\n- 'id': 'M012323174PPV00',\n- 'ext': 'mp4',\n- 'title': 'Hanteo Music Awards 2022 DAY2',\n- 'release_date': '20230211',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }, {\n- 'url': 'https://idolplus.com/zs/concert/M012323039PPV00',\n- 'info_dict': {\n- 'id': 'M012323039PPV00',\n- 'ext': 'mp4',\n- 'title': 'CIRCLE CHART MUSIC AWARDS 2022',\n- 'release_date': '20230218',\n- 'formats': 'count:5',\n- },\n- 'params': {'skip_download': 'm3u8'},\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_list = traverse_obj(self._download_json(\n- 'https://idolplus.com/api/zs/viewdata/ruleset/build', video_id,\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\n- 'rulesetId': 'contents',\n- 'albumId': video_id,\n- 'distribute': 'PRD',\n- 'loggedIn': 'false',\n- 'region': 'zs',\n- 'countryGroup': '00010',\n- 'lang': 'en',\n- 'saId': '999999999998',\n- }), ('data', 'viewData', ...))\n-\n- player_data = {}\n- while data_list:\n- player_data = data_list.pop()\n- if traverse_obj(player_data, 'type') == 'player':\n- break\n- elif traverse_obj(player_data, ('dataList', ...)):\n- data_list += player_data['dataList']\n-\n- formats = self._extract_m3u8_formats(traverse_obj(player_data, (\n- 'vodPlayerList', 'vodProfile', 0, 'vodServer', 0, 'video_url', {url_or_none})), video_id)\n-\n- subtitles = {}\n- for caption in traverse_obj(player_data, ('vodPlayerList', 'caption')) or []:\n- subtitles.setdefault(caption.get('lang') or 'und', []).append({\n- 'url': caption.get('smi_url'),\n- 'ext': 'vtt',\n- })\n-\n- # Add member multicams as alternative formats\n- if (traverse_obj(player_data, ('detail', 'has_cuesheet')) == 'Y'\n- and traverse_obj(player_data, ('detail', 'is_omni_member')) == 'Y'):\n- cuesheet = traverse_obj(self._download_json(\n- 'https://idolplus.com/gapi/contents/v1.0/content/cuesheet', video_id,\n- 'Downloading JSON metadata for member multicams',\n- headers={'App_type': 'web', 'Country_Code': 'KR'}, query={\n- 'ALBUM_ID': video_id,\n- 'COUNTRY_GRP': '00010',\n- 'LANG': 'en',\n- 'SA_ID': '999999999998',\n- 'COUNTRY_CODE': 'KR',\n- }), ('data', 'cuesheet_item', 0))\n-\n- for member in traverse_obj(cuesheet, ('members', ...)):\n- index = try_call(lambda: int(member['omni_view_index']) - 1)\n- member_video_url = traverse_obj(cuesheet, ('omni_view', index, 'cdn_url', 0, 'url', {url_or_none}))\n- if not member_video_url:\n- continue\n- member_formats = self._extract_m3u8_formats(\n- member_video_url, video_id, note=f'Downloading m3u8 for multicam {member[\"name\"]}')\n- for mf in member_formats:\n- mf['format_id'] = f'{mf[\"format_id\"]}-{member[\"name\"].replace(\" \", \"_\")}'\n- formats.extend(member_formats)\n-\n- return {\n- 'id': video_id,\n- 'title': traverse_obj(player_data, ('detail', 'albumName')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'release_date': traverse_obj(player_data, ('detail', 'broadcastDate')),\n- }\ndiff --git a/yt_dlp/extractor/infoq.py b/yt_dlp/extractor/infoq.py\nindex 5274c9339fa8..533592229380 100644\n--- a/yt_dlp/extractor/infoq.py\n+++ b/yt_dlp/extractor/infoq.py\n@@ -1,7 +1,7 @@\n import base64\n import urllib.parse\n \n-from .bokecc import BokeCCBaseIE\n+from .common import InfoExtractor\n from ..utils import (\n ExtractorError,\n determine_ext,\n@@ -10,7 +10,7 @@\n )\n \n \n-class InfoQIE(BokeCCBaseIE):\n+class InfoQIE(InfoExtractor):\n _VALID_URL = r'https?://(?:www\\.)?infoq\\.com/(?:[^/]+/)+(?P<id>[^/]+)'\n \n _TESTS = [{\n@@ -117,14 +117,10 @@ def _real_extract(self, url):\n video_title = self._html_extract_title(webpage)\n video_description = self._html_search_meta('description', webpage, 'description')\n \n- if '/cn/' in url:\n- # for China videos, HTTP video URL exists but always fails with 403\n- formats = self._extract_bokecc_formats(webpage, video_id)\n- else:\n- formats = (\n- self._extract_rtmp_video(webpage)\n- + self._extract_http_video(webpage)\n- + self._extract_http_audio(webpage, video_id))\n+ formats = (\n+ self._extract_rtmp_video(webpage)\n+ + self._extract_http_video(webpage)\n+ + self._extract_http_audio(webpage, video_id))\n \n return {\n 'id': video_id,\ndiff --git a/yt_dlp/extractor/internetvideoarchive.py b/yt_dlp/extractor/internetvideoarchive.py\ndeleted file mode 100644\nindex 9d2574cb068d..000000000000\n--- a/yt_dlp/extractor/internetvideoarchive.py\n+++ /dev/null\n@@ -1,58 +0,0 @@\n-import json\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import parse_qs\n-\n-\n-class InternetVideoArchiveIE(InfoExtractor):\n- _VALID_URL = r'https?://video\\.internetvideoarchive\\.net/(?:player|flash/players)/.*?\\?.*?publishedid.*?'\n-\n- _TEST = {\n- 'url': 'http://video.internetvideoarchive.net/player/6/configuration.ashx?customerid=69249&publishedid=194487&reporttag=vdbetatitle&playerid=641&autolist=0&domain=www.videodetective.com&maxrate=high&minrate=low&socialplayer=false',\n- 'info_dict': {\n- 'id': '194487',\n- 'ext': 'mp4',\n- 'title': 'Kick-Ass 2',\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- @staticmethod\n- def _build_json_url(query):\n- return 'http://video.internetvideoarchive.net/player/6/configuration.ashx?' + query\n-\n- def _real_extract(self, url):\n- query = parse_qs(url)\n- video_id = query['publishedid'][0]\n- data = self._download_json(\n- 'https://video.internetvideoarchive.net/videojs7/videojs7.ivasettings.ashx',\n- video_id, data=json.dumps({\n- 'customerid': query['customerid'][0],\n- 'publishedid': video_id,\n- }).encode())\n- title = data['Title']\n- formats = self._extract_m3u8_formats(\n- data['VideoUrl'], video_id, 'mp4',\n- 'm3u8_native', m3u8_id='hls', fatal=False)\n- file_url = formats[0]['url']\n- if '.ism/' in file_url:\n- replace_url = lambda x: re.sub(r'\\.ism/[^?]+', '.ism/' + x, file_url)\n- formats.extend(self._extract_f4m_formats(\n- replace_url('.f4m'), video_id, f4m_id='hds', fatal=False))\n- formats.extend(self._extract_mpd_formats(\n- replace_url('.mpd'), video_id, mpd_id='dash', fatal=False))\n- formats.extend(self._extract_ism_formats(\n- replace_url('Manifest'), video_id, ism_id='mss', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnail': data.get('PosterUrl'),\n- 'description': data.get('Description'),\n- }\ndiff --git a/yt_dlp/extractor/izlesene.py b/yt_dlp/extractor/izlesene.py\ndeleted file mode 100644\nindex cf2a269c38f6..000000000000\n--- a/yt_dlp/extractor/izlesene.py\n+++ /dev/null\n@@ -1,111 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- float_or_none,\n- get_element_by_id,\n- int_or_none,\n- parse_iso8601,\n- str_to_int,\n-)\n-\n-\n-class IzleseneIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://(?:(?:www|m)\\.)?izlesene\\.com/\n- (?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)\n- '''\n- _TESTS = [\n- {\n- 'url': 'http://www.izlesene.com/video/sevincten-cildirtan-dogum-gunu-hediyesi/7599694',\n- 'md5': '4384f9f0ea65086734b881085ee05ac2',\n- 'info_dict': {\n- 'id': '7599694',\n- 'ext': 'mp4',\n- 'title': 'Sevinรงten รฤฑldฤฑrtan Doฤum Gรผnรผ Hediyesi',\n- 'description': 'md5:253753e2655dde93f59f74b572454f6d',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'uploader_id': 'pelikzzle',\n- 'timestamp': int,\n- 'upload_date': '20140702',\n- 'duration': 95.395,\n- 'age_limit': 0,\n- },\n- },\n- {\n- 'url': 'http://www.izlesene.com/video/tarkan-dortmund-2006-konseri/17997',\n- 'md5': '97f09b6872bffa284cb7fa4f6910cb72',\n- 'info_dict': {\n- 'id': '17997',\n- 'ext': 'mp4',\n- 'title': 'Tarkan Dortmund 2006 Konseri',\n- 'thumbnail': r're:^https://.*\\.jpg',\n- 'uploader_id': 'parlayankiz',\n- 'timestamp': int,\n- 'upload_date': '20061112',\n- 'duration': 253.666,\n- 'age_limit': 0,\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(f'http://www.izlesene.com/video/{video_id}', video_id)\n-\n- video = self._parse_json(\n- self._search_regex(\n- r'videoObj\\s*=\\s*({.+?})\\s*;\\s*\\n', webpage, 'streams'),\n- video_id)\n-\n- title = video.get('videoTitle') or self._og_search_title(webpage)\n-\n- formats = []\n- for stream in video['media']['level']:\n- source_url = stream.get('source')\n- if not source_url or not isinstance(source_url, str):\n- continue\n- ext = determine_ext(url, 'mp4')\n- quality = stream.get('value')\n- height = int_or_none(quality)\n- formats.append({\n- 'format_id': f'{quality}p' if quality else 'sd',\n- 'url': urllib.parse.unquote(source_url),\n- 'ext': ext,\n- 'height': height,\n- })\n-\n- description = self._og_search_description(webpage, default=None)\n- thumbnail = video.get('posterURL') or self._proto_relative_url(\n- self._og_search_thumbnail(webpage), scheme='http:')\n-\n- uploader = self._html_search_regex(\n- r\"adduserUsername\\s*=\\s*'([^']+)';\",\n- webpage, 'uploader', fatal=False)\n- timestamp = parse_iso8601(self._html_search_meta(\n- 'uploadDate', webpage, 'upload date'))\n-\n- duration = float_or_none(video.get('duration') or self._html_search_regex(\n- r'videoduration[\"\\']?\\s*=\\s*([\"\\'])(?P<value>(?:(?!\\1).)+)\\1',\n- webpage, 'duration', fatal=False, group='value'), scale=1000)\n-\n- view_count = str_to_int(get_element_by_id('videoViewCount', webpage))\n- comment_count = self._html_search_regex(\n- r'comment_count\\s*=\\s*\\'([^\\']+)\\';',\n- webpage, 'comment_count', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'uploader_id': uploader,\n- 'timestamp': timestamp,\n- 'duration': duration,\n- 'view_count': int_or_none(view_count),\n- 'comment_count': int_or_none(comment_count),\n- 'age_limit': self._family_friendly_search(webpage),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/kinja.py b/yt_dlp/extractor/kinja.py\ndeleted file mode 100644\nindex 67c089104c65..000000000000\n--- a/yt_dlp/extractor/kinja.py\n+++ /dev/null\n@@ -1,206 +0,0 @@\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n- strip_or_none,\n- try_get,\n-)\n-\n-\n-class KinjaEmbedIE(InfoExtractor):\n- IE_NAME = 'kinja:embed'\n- _DOMAIN_REGEX = r'''(?:[^.]+\\.)?\n- (?:\n- avclub|\n- clickhole|\n- deadspin|\n- gizmodo|\n- jalopnik|\n- jezebel|\n- kinja|\n- kotaku|\n- lifehacker|\n- splinternews|\n- the(?:inventory|onion|root|takeout)\n- )\\.com'''\n- _COMMON_REGEX = r'''/\n- (?:\n- ajax/inset|\n- embed/video\n- )/iframe\\?.*?\\bid='''\n- _VALID_URL = rf'''(?x)https?://{_DOMAIN_REGEX}{_COMMON_REGEX}\n- (?P<type>\n- fb|\n- imgur|\n- instagram|\n- jwp(?:layer)?-video|\n- kinjavideo|\n- mcp|\n- megaphone|\n- soundcloud(?:-playlist)?|\n- tumblr-post|\n- twitch-stream|\n- twitter|\n- ustream-channel|\n- vimeo|\n- vine|\n- youtube-(?:list|video)\n- )-(?P<id>[^&]+)'''\n- _EMBED_REGEX = [rf'(?x)<iframe[^>]+?src=(?P<q>[\"\\'])(?P<url>(?:(?:https?:)?//{_DOMAIN_REGEX})?{_COMMON_REGEX}(?:(?!\\1).)+)\\1']\n- _TESTS = [{\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=fb-10103303356633621',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=kinjavideo-100313',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=megaphone-PPY1300931075',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-128574047',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-playlist-317413750',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=tumblr-post-160130699814-daydreams-at-midnight',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitch-stream-libratus_extra',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=twitter-1068875942473404422',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=ustream-channel-10414700',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vimeo-120153502',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=vine-5BlvV5qqPrD',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-list-BCQ3KyrPjgA/PLE6509247C270A72E',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://kinja.com/ajax/inset/iframe?id=youtube-video-00QyL0AgPAE',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'http://www.clickhole.com/video/dont-understand-bitcoin-man-will-mumble-explanatio-2537',\n- 'info_dict': {\n- 'id': '106351',\n- 'ext': 'mp4',\n- 'title': 'Donโt Understand Bitcoin? This Man Will Mumble An Explanation At You',\n- },\n- 'skip': 'Invalid URL',\n- }]\n- _JWPLATFORM_PROVIDER = ('cdn.jwplayer.com/v2/media/', 'JWPlatform')\n- _PROVIDER_MAP = {\n- 'fb': ('facebook.com/video.php?v=', 'Facebook'),\n- 'imgur': ('imgur.com/', 'Imgur'),\n- 'instagram': ('instagram.com/p/', 'Instagram'),\n- 'jwplayer-video': _JWPLATFORM_PROVIDER,\n- 'jwp-video': _JWPLATFORM_PROVIDER,\n- 'megaphone': ('player.megaphone.fm/', 'Generic'),\n- 'soundcloud': ('api.soundcloud.com/tracks/', 'Soundcloud'),\n- 'soundcloud-playlist': ('api.soundcloud.com/playlists/', 'SoundcloudPlaylist'),\n- 'tumblr-post': ('%s.tumblr.com/post/%s', 'Tumblr'),\n- 'twitch-stream': ('twitch.tv/', 'TwitchStream'),\n- 'twitter': ('twitter.com/i/cards/tfw/v1/', 'TwitterCard'),\n- 'ustream-channel': ('ustream.tv/embed/', 'Ustream'),\n- 'vimeo': ('vimeo.com/', 'Vimeo'),\n- 'vine': ('vine.co/v/', 'Vine'),\n- 'youtube-list': ('youtube.com/embed/%s?list=%s', 'YoutubePlaylist'),\n- 'youtube-video': ('youtube.com/embed/', 'Youtube'),\n- }\n-\n- def _real_extract(self, url):\n- video_type, video_id = self._match_valid_url(url).groups()\n-\n- provider = self._PROVIDER_MAP.get(video_type)\n- if provider:\n- video_id = urllib.parse.unquote(video_id)\n- if video_type == 'tumblr-post':\n- video_id, blog = video_id.split('-', 1)\n- result_url = provider[0] % (blog, video_id)\n- elif video_type == 'youtube-list':\n- video_id, playlist_id = video_id.split('/')\n- result_url = provider[0] % (video_id, playlist_id)\n- else:\n- result_url = provider[0] + video_id\n- return self.url_result('http://' + result_url, provider[1])\n-\n- if video_type == 'kinjavideo':\n- data = self._download_json(\n- 'https://kinja.com/api/core/video/views/videoById',\n- video_id, query={'videoId': video_id})['data']\n- title = data['title']\n-\n- formats = []\n- for k in ('signedPlaylist', 'streaming'):\n- m3u8_url = data.get(k + 'Url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- thumbnail = None\n- poster = data.get('poster') or {}\n- poster_id = poster.get('id')\n- if poster_id:\n- thumbnail = 'https://i.kinja-img.com/gawker-media/image/upload/{}.{}'.format(poster_id, poster.get('format') or 'jpg')\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': strip_or_none(data.get('description')),\n- 'formats': formats,\n- 'tags': data.get('tags'),\n- 'timestamp': int_or_none(try_get(\n- data, lambda x: x['postInfo']['publishTimeMillis']), 1000),\n- 'thumbnail': thumbnail,\n- 'uploader': data.get('network'),\n- }\n- else:\n- video_data = self._download_json(\n- 'https://api.vmh.univision.com/metadata/v1/content/' + video_id,\n- video_id)['videoMetadata']\n- iptc = video_data['photoVideoMetadataIPTC']\n- title = iptc['title']['en']\n- fmg = video_data.get('photoVideoMetadata_fmg') or {}\n- tvss_domain = fmg.get('tvssDomain') or 'https://auth.univision.com'\n- data = self._download_json(\n- tvss_domain + '/api/v3/video-auth/url-signature-tokens',\n- video_id, query={'mcpids': video_id})['data'][0]\n- formats = []\n-\n- rendition_url = data.get('renditionUrl')\n- if rendition_url:\n- formats = self._extract_m3u8_formats(\n- rendition_url, video_id, 'mp4',\n- 'm3u8_native', m3u8_id='hls', fatal=False)\n-\n- fallback_rendition_url = data.get('fallbackRenditionUrl')\n- if fallback_rendition_url:\n- formats.append({\n- 'format_id': 'fallback',\n- 'tbr': int_or_none(self._search_regex(\n- r'_(\\d+)\\.mp4', fallback_rendition_url,\n- 'bitrate', default=None)),\n- 'url': fallback_rendition_url,\n- })\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': try_get(iptc, lambda x: x['cloudinaryLink']['link'], str),\n- 'uploader': fmg.get('network'),\n- 'duration': int_or_none(iptc.get('fileDuration')),\n- 'formats': formats,\n- 'description': try_get(iptc, lambda x: x['description']['en'], str),\n- 'timestamp': parse_iso8601(iptc.get('dateReleased')),\n- }\ndiff --git a/yt_dlp/extractor/koo.py b/yt_dlp/extractor/koo.py\ndeleted file mode 100644\nindex 6ec5b59f9a1f..000000000000\n--- a/yt_dlp/extractor/koo.py\n+++ /dev/null\n@@ -1,115 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- clean_html,\n- try_get,\n-)\n-\n-\n-class KooIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://(?:www\\.)?kooapp\\.com/koo/[^/]+/(?P<id>[^/&#$?]+)'\n- _TESTS = [{ # Test for video in the comments\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/946c4189-bc2d-4524-b95b-43f641e2adde',\n- 'info_dict': {\n- 'id': '946c4189-bc2d-4524-b95b-43f641e2adde',\n- 'ext': 'mp4',\n- 'title': 'test for video in comment',\n- 'description': 'md5:daa77dc214add4da8b6ea7d2226776e7',\n- 'timestamp': 1632215195,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 7000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for koo with long title\n- 'url': 'https://www.kooapp.com/koo/laxman_kumarDBFEC/33decbf7-5e1e-4bb8-bfd7-04744a064361',\n- 'info_dict': {\n- 'id': '33decbf7-5e1e-4bb8-bfd7-04744a064361',\n- 'ext': 'mp4',\n- 'title': 'md5:47a71c2337295330c5a19a8af1bbf450',\n- 'description': 'md5:06a6a84e9321499486dab541693d8425',\n- 'timestamp': 1632106884,\n- 'uploader_id': 'laxman_kumarDBFEC',\n- 'uploader': 'Laxman Kumar ๐ฎ๐ณ',\n- 'duration': 46000,\n- 'upload_date': '20210920',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for audio\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\n- 'info_dict': {\n- 'id': 'a2a9c88e-ce4b-4d2d-952f-d06361c5b602',\n- 'ext': 'mp4',\n- 'title': 'Test for audio',\n- 'description': 'md5:ecb9a2b6a5d34b736cecb53788cb11e8',\n- 'timestamp': 1632211634,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 214000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for video\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\n- 'info_dict': {\n- 'id': 'a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',\n- 'ext': 'mp4',\n- 'title': 'Test for video',\n- 'description': 'md5:7afc4eb839074ddeb2beea5dd6fe9500',\n- 'timestamp': 1632211468,\n- 'uploader_id': 'ytdlpTestAccount',\n- 'uploader': 'yt-dlpTestAccount',\n- 'duration': 14000,\n- 'upload_date': '20210921',\n- },\n- 'params': {'skip_download': True},\n- }, { # Test for link\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/01bf5b94-81a5-4d8e-a387-5f732022e15a',\n- 'skip': 'No video/audio found at the provided url.',\n- 'info_dict': {\n- 'id': '01bf5b94-81a5-4d8e-a387-5f732022e15a',\n- 'title': 'Test for link',\n- 'ext': 'none',\n- },\n- }, { # Test for images\n- 'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\n- 'skip': 'No video/audio found at the provided url.',\n- 'info_dict': {\n- 'id': 'dc05d9cd-a61d-45fd-bb07-e8019d8ca8cb',\n- 'title': 'Test for images',\n- 'ext': 'none',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.kooapp.com/apiV1/ku/{video_id}?limit=20&offset=0&showSimilarKoos=true', video_id)['parentContent']\n- item_json = next(content['items'][0] for content in data_json\n- if try_get(content, lambda x: x['items'][0]['id']) == video_id)\n- media_json = item_json['mediaMap']\n- formats = []\n-\n- mp4_url = media_json.get('videoMp4')\n- video_m3u8_url = media_json.get('videoHls')\n- if mp4_url:\n- formats.append({\n- 'url': mp4_url,\n- 'ext': 'mp4',\n- })\n- if video_m3u8_url:\n- formats.extend(self._extract_m3u8_formats(video_m3u8_url, video_id, fatal=False, ext='mp4'))\n- if not formats:\n- self.raise_no_formats('No video/audio found at the provided url.', expected=True)\n-\n- return {\n- 'id': video_id,\n- 'title': clean_html(item_json.get('title')),\n- 'description': f'{clean_html(item_json.get(\"title\"))}\\n\\n{clean_html(item_json.get(\"enTransliteration\"))}',\n- 'timestamp': item_json.get('createdAt'),\n- 'uploader_id': item_json.get('handle'),\n- 'uploader': item_json.get('name'),\n- 'duration': media_json.get('duration'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/leeco.py b/yt_dlp/extractor/leeco.py\nindex 58baa3fea796..efec5d738268 100644\n--- a/yt_dlp/extractor/leeco.py\n+++ b/yt_dlp/extractor/leeco.py\n@@ -1,9 +1,6 @@\n-import base64\n import datetime as dt\n-import hashlib\n import re\n import time\n-import urllib.parse\n \n from .common import InfoExtractor\n from ..compat import compat_ord\n@@ -14,8 +11,6 @@\n int_or_none,\n orderedSet,\n parse_iso8601,\n- str_or_none,\n- url_basename,\n urshift,\n )\n \n@@ -248,114 +243,3 @@ def _real_extract(self, url):\n \n return self.playlist_result(entries, playlist_id, playlist_title=title,\n playlist_description=description)\n-\n-\n-class LetvCloudIE(InfoExtractor):\n- # Most of *.letv.com is changed to *.le.com on 2016/01/02\n- # but yuntv.letv.com is kept, so also keep the extractor name\n- IE_DESC = 'ไน่งไบ'\n- _VALID_URL = r'https?://yuntv\\.letv\\.com/bcloud.html\\?.+'\n-\n- _TESTS = [{\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=467623dedf',\n- 'md5': '26450599afd64c513bc77030ad15db44',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_467623dedf',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_467623dedf',\n- },\n- }, {\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=ec93197892&pu=2c7cd40209&auto_play=1&gpcflag=1&width=640&height=360',\n- 'md5': 'e03d9cc8d9c13191e1caf277e42dbd31',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_ec93197892',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_ec93197892',\n- },\n- }, {\n- 'url': 'http://yuntv.letv.com/bcloud.html?uu=p7jnfw5hw9&vu=187060b6fd',\n- 'md5': 'cb988699a776b22d4a41b9d43acfb3ac',\n- 'info_dict': {\n- 'id': 'p7jnfw5hw9_187060b6fd',\n- 'ext': 'mp4',\n- 'title': 'Video p7jnfw5hw9_187060b6fd',\n- },\n- }]\n-\n- @staticmethod\n- def sign_data(obj):\n- if obj['cf'] == 'flash':\n- salt = '2f9d6924b33a165a6d8b5d3d42f4f987'\n- items = ['cf', 'format', 'ran', 'uu', 'ver', 'vu']\n- elif obj['cf'] == 'html5':\n- salt = 'fbeh5player12c43eccf2bec3300344'\n- items = ['cf', 'ran', 'uu', 'bver', 'vu']\n- input_data = ''.join([item + obj[item] for item in items]) + salt\n- obj['sign'] = hashlib.md5(input_data.encode()).hexdigest()\n-\n- def _get_formats(self, cf, uu, vu, media_id):\n- def get_play_json(cf, timestamp):\n- data = {\n- 'cf': cf,\n- 'ver': '2.2',\n- 'bver': 'firefox44.0',\n- 'format': 'json',\n- 'uu': uu,\n- 'vu': vu,\n- 'ran': str(timestamp),\n- }\n- self.sign_data(data)\n- return self._download_json(\n- 'http://api.letvcloud.com/gpc.php?' + urllib.parse.urlencode(data),\n- media_id, f'Downloading playJson data for type {cf}')\n-\n- play_json = get_play_json(cf, time.time())\n- # The server time may be different from local time\n- if play_json.get('code') == 10071:\n- play_json = get_play_json(cf, play_json['timestamp'])\n-\n- if not play_json.get('data'):\n- if play_json.get('message'):\n- raise ExtractorError('Letv cloud said: {}'.format(play_json['message']), expected=True)\n- elif play_json.get('code'):\n- raise ExtractorError('Letv cloud returned error %d' % play_json['code'], expected=True)\n- else:\n- raise ExtractorError('Letv cloud returned an unknown error')\n-\n- def b64decode(s):\n- return base64.b64decode(s).decode('utf-8')\n-\n- formats = []\n- for media in play_json['data']['video_info']['media'].values():\n- play_url = media['play_url']\n- url = b64decode(play_url['main_url'])\n- decoded_url = b64decode(url_basename(url))\n- formats.append({\n- 'url': url,\n- 'ext': determine_ext(decoded_url),\n- 'format_id': str_or_none(play_url.get('vtype')),\n- 'format_note': str_or_none(play_url.get('definition')),\n- 'width': int_or_none(play_url.get('vwidth')),\n- 'height': int_or_none(play_url.get('vheight')),\n- })\n-\n- return formats\n-\n- def _real_extract(self, url):\n- uu_mobj = re.search(r'uu=([\\w]+)', url)\n- vu_mobj = re.search(r'vu=([\\w]+)', url)\n-\n- if not uu_mobj or not vu_mobj:\n- raise ExtractorError(f'Invalid URL: {url}', expected=True)\n-\n- uu = uu_mobj.group(1)\n- vu = vu_mobj.group(1)\n- media_id = uu + '_' + vu\n-\n- formats = self._get_formats('flash', uu, vu, media_id) + self._get_formats('html5', uu, vu, media_id)\n-\n- return {\n- 'id': media_id,\n- 'title': f'Video {media_id}',\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/livestream.py b/yt_dlp/extractor/livestream.py\ndeleted file mode 100644\nindex 7f7947ee7bfe..000000000000\n--- a/yt_dlp/extractor/livestream.py\n+++ /dev/null\n@@ -1,386 +0,0 @@\n-import itertools\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_ext,\n- find_xpath_attr,\n- float_or_none,\n- int_or_none,\n- orderedSet,\n- parse_iso8601,\n- traverse_obj,\n- update_url_query,\n- xpath_attr,\n- xpath_text,\n- xpath_with_ns,\n-)\n-\n-\n-class LivestreamIE(InfoExtractor):\n- IE_NAME = 'livestream'\n- _VALID_URL = r'''(?x)\n- https?://(?:new\\.)?livestream\\.com/\n- (?:accounts/(?P<account_id>\\d+)|(?P<account_name>[^/]+))\n- (?:/events/(?P<event_id>\\d+)|/(?P<event_name>[^/]+))?\n- (?:/videos/(?P<id>\\d+))?\n- '''\n- _EMBED_REGEX = [r'<iframe[^>]+src=\"(?P<url>https?://(?:new\\.)?livestream\\.com/[^\"]+/player[^\"]+)\"']\n-\n- _TESTS = [{\n- 'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',\n- 'md5': '7876c5f5dc3e711b6b73acce4aac1527',\n- 'info_dict': {\n- 'id': '4719370',\n- 'ext': 'mp4',\n- 'title': 'Live from Webster Hall NYC',\n- 'timestamp': 1350008072,\n- 'upload_date': '20121012',\n- 'duration': 5968.0,\n- 'like_count': int,\n- 'view_count': int,\n- 'comment_count': int,\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- },\n- }, {\n- 'url': 'https://livestream.com/coheedandcambria/websterhall',\n- 'info_dict': {\n- 'id': '1585861',\n- 'title': 'Live From Webster Hall',\n- },\n- 'playlist_mincount': 1,\n- }, {\n- 'url': 'https://livestream.com/dayananda/events/7954027',\n- 'info_dict': {\n- 'title': 'Live from Mevo',\n- 'id': '7954027',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- 'url': 'https://livestream.com/accounts/82',\n- 'info_dict': {\n- 'id': '253978',\n- 'view_count': int,\n- 'title': 'trsr',\n- 'comment_count': int,\n- 'like_count': int,\n- 'upload_date': '20120306',\n- 'timestamp': 1331042383,\n- 'thumbnail': 'http://img.new.livestream.com/videos/0000000000000372/cacbeed6-fb68-4b5e-ad9c-e148124e68a9_640x427.jpg',\n- 'duration': 15.332,\n- 'ext': 'mp4',\n- },\n- }, {\n- 'url': 'https://new.livestream.com/accounts/362/events/3557232/videos/67864563/player?autoPlay=false&height=360&mute=false&width=640',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://livestream.com/bsww/concacafbeachsoccercampeonato2015',\n- 'only_matching': True,\n- }]\n- _API_URL_TEMPLATE = 'http://livestream.com/api/accounts/%s/events/%s'\n-\n- def _parse_smil_formats_and_subtitles(\n- self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):\n- base_ele = find_xpath_attr(\n- smil, self._xpath_ns('.//meta', namespace), 'name', 'httpBase')\n- base = base_ele.get('content') if base_ele is not None else 'http://livestreamvod-f.akamaihd.net/'\n-\n- formats = []\n- video_nodes = smil.findall(self._xpath_ns('.//video', namespace))\n-\n- for vn in video_nodes:\n- tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)\n- furl = (\n- update_url_query(urllib.parse.urljoin(base, vn.attrib['src']), {\n- 'v': '3.0.3',\n- 'fp': 'WIN% 14,0,0,145',\n- }))\n- if 'clipBegin' in vn.attrib:\n- furl += '&ssek=' + vn.attrib['clipBegin']\n- formats.append({\n- 'url': furl,\n- 'format_id': 'smil_%d' % tbr,\n- 'ext': 'flv',\n- 'tbr': tbr,\n- 'preference': -1000, # Strictly inferior than all other formats?\n- })\n- return formats, {}\n-\n- def _extract_video_info(self, video_data):\n- video_id = str(video_data['id'])\n-\n- FORMAT_KEYS = (\n- ('sd', 'progressive_url'),\n- ('hd', 'progressive_url_hd'),\n- )\n-\n- formats = []\n- for format_id, key in FORMAT_KEYS:\n- video_url = video_data.get(key)\n- if video_url:\n- ext = determine_ext(video_url)\n- if ext == 'm3u8':\n- continue\n- bitrate = int_or_none(self._search_regex(\n- rf'(\\d+)\\.{ext}', video_url, 'bitrate', default=None))\n- formats.append({\n- 'url': video_url,\n- 'format_id': format_id,\n- 'tbr': bitrate,\n- 'ext': ext,\n- })\n-\n- smil_url = video_data.get('smil_url')\n- if smil_url:\n- formats.extend(self._extract_smil_formats(smil_url, video_id, fatal=False))\n-\n- m3u8_url = video_data.get('m3u8_url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- f4m_url = video_data.get('f4m_url')\n- if f4m_url:\n- formats.extend(self._extract_f4m_formats(\n- f4m_url, video_id, f4m_id='hds', fatal=False))\n-\n- comments = [{\n- 'author_id': comment.get('author_id'),\n- 'author': comment.get('author', {}).get('full_name'),\n- 'id': comment.get('id'),\n- 'text': comment['text'],\n- 'timestamp': parse_iso8601(comment.get('created_at')),\n- } for comment in video_data.get('comments', {}).get('data', [])]\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'title': video_data['caption'],\n- 'description': video_data.get('description'),\n- 'thumbnail': video_data.get('thumbnail_url'),\n- 'duration': float_or_none(video_data.get('duration'), 1000),\n- 'timestamp': parse_iso8601(video_data.get('publish_at')),\n- 'like_count': video_data.get('likes', {}).get('total'),\n- 'comment_count': video_data.get('comments', {}).get('total'),\n- 'view_count': video_data.get('views'),\n- 'comments': comments,\n- }\n-\n- def _extract_stream_info(self, stream_info):\n- broadcast_id = str(stream_info['broadcast_id'])\n- is_live = stream_info.get('is_live')\n-\n- formats = []\n- smil_url = stream_info.get('play_url')\n- if smil_url:\n- formats.extend(self._extract_smil_formats(smil_url, broadcast_id))\n-\n- m3u8_url = stream_info.get('m3u8_url')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, broadcast_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- rtsp_url = stream_info.get('rtsp_url')\n- if rtsp_url:\n- formats.append({\n- 'url': rtsp_url,\n- 'format_id': 'rtsp',\n- })\n-\n- return {\n- 'id': broadcast_id,\n- 'formats': formats,\n- 'title': stream_info['stream_title'],\n- 'thumbnail': stream_info.get('thumbnail_url'),\n- 'is_live': is_live,\n- }\n-\n- def _generate_event_playlist(self, event_data):\n- event_id = str(event_data['id'])\n- account_id = str(event_data['owner_account_id'])\n- feed_root_url = self._API_URL_TEMPLATE % (account_id, event_id) + '/feed.json'\n-\n- stream_info = event_data.get('stream_info')\n- if stream_info:\n- return self._extract_stream_info(stream_info)\n-\n- last_video = None\n- for i in itertools.count(1):\n- if last_video is None:\n- info_url = feed_root_url\n- else:\n- info_url = f'{feed_root_url}?&id={last_video}&newer=-1&type=video'\n- videos_info = self._download_json(\n- info_url, event_id, f'Downloading page {i}')['data']\n- videos_info = [v['data'] for v in videos_info if v['type'] == 'video']\n- if not videos_info:\n- break\n- for v in videos_info:\n- v_id = str(v['id'])\n- yield self.url_result(\n- f'http://livestream.com/accounts/{account_id}/events/{event_id}/videos/{v_id}',\n- LivestreamIE, v_id, v.get('caption'))\n- last_video = videos_info[-1]['id']\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- event = mobj.group('event_id') or mobj.group('event_name')\n- account = mobj.group('account_id') or mobj.group('account_name')\n- api_url = f'http://livestream.com/api/accounts/{account}'\n-\n- if video_id:\n- video_data = self._download_json(\n- f'{api_url}/events/{event}/videos/{video_id}', video_id)\n- return self._extract_video_info(video_data)\n- elif event:\n- event_data = self._download_json(f'{api_url}/events/{event}', None)\n- return self.playlist_result(\n- self._generate_event_playlist(event_data), str(event_data['id']), event_data['full_name'])\n-\n- account_data = self._download_json(api_url, None)\n- items = traverse_obj(account_data, (('upcoming_events', 'past_events'), 'data', ...))\n- return self.playlist_result(\n- itertools.chain.from_iterable(map(self._generate_event_playlist, items)),\n- account_data.get('id'), account_data.get('full_name'))\n-\n-\n-# The original version of Livestream uses a different system\n-class LivestreamOriginalIE(InfoExtractor):\n- IE_NAME = 'livestream:original'\n- _VALID_URL = r'''(?x)https?://original\\.livestream\\.com/\n- (?P<user>[^/\\?#]+)(?:/(?P<type>video|folder)\n- (?:(?:\\?.*?Id=|/)(?P<id>.*?)(&|$))?)?\n- '''\n- _TESTS = [{\n- 'url': 'http://original.livestream.com/dealbook/video?clipId=pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\n- 'info_dict': {\n- 'id': 'pla_8aa4a3f1-ba15-46a4-893b-902210e138fb',\n- 'ext': 'mp4',\n- 'title': 'Spark 1 (BitCoin) with Cameron Winklevoss & Tyler Winklevoss of Winklevoss Capital',\n- 'duration': 771.301,\n- 'view_count': int,\n- },\n- }, {\n- 'url': 'https://original.livestream.com/newplay/folder?dirId=a07bf706-d0e4-4e75-a747-b021d84f2fd3',\n- 'info_dict': {\n- 'id': 'a07bf706-d0e4-4e75-a747-b021d84f2fd3',\n- },\n- 'playlist_mincount': 4,\n- }, {\n- # live stream\n- 'url': 'http://original.livestream.com/znsbahamas',\n- 'only_matching': True,\n- }]\n-\n- def _extract_video_info(self, user, video_id):\n- api_url = f'http://x{user}x.api.channel.livestream.com/2.0/clipdetails?extendedInfo=true&id={video_id}'\n- info = self._download_xml(api_url, video_id)\n-\n- item = info.find('channel').find('item')\n- title = xpath_text(item, 'title')\n- media_ns = {'media': 'http://search.yahoo.com/mrss'}\n- thumbnail_url = xpath_attr(\n- item, xpath_with_ns('media:thumbnail', media_ns), 'url')\n- duration = float_or_none(xpath_attr(\n- item, xpath_with_ns('media:content', media_ns), 'duration'))\n- ls_ns = {'ls': 'http://api.channel.livestream.com/2.0'}\n- view_count = int_or_none(xpath_text(\n- item, xpath_with_ns('ls:viewsCount', ls_ns)))\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': thumbnail_url,\n- 'duration': duration,\n- 'view_count': view_count,\n- }\n-\n- def _extract_video_formats(self, video_data, video_id):\n- formats = []\n-\n- progressive_url = video_data.get('progressiveUrl')\n- if progressive_url:\n- formats.append({\n- 'url': progressive_url,\n- 'format_id': 'http',\n- })\n-\n- m3u8_url = video_data.get('httpUrl')\n- if m3u8_url:\n- formats.extend(self._extract_m3u8_formats(\n- m3u8_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n-\n- rtsp_url = video_data.get('rtspUrl')\n- if rtsp_url:\n- formats.append({\n- 'url': rtsp_url,\n- 'format_id': 'rtsp',\n- })\n-\n- return formats\n-\n- def _extract_folder(self, url, folder_id):\n- webpage = self._download_webpage(url, folder_id)\n- paths = orderedSet(re.findall(\n- r'''(?x)(?:\n- <li\\s+class=\"folder\">\\s*<a\\s+href=\"|\n- <a\\s+href=\"(?=https?://livestre\\.am/)\n- )([^\"]+)\"''', webpage))\n-\n- entries = [{\n- '_type': 'url',\n- 'url': urllib.parse.urljoin(url, p),\n- } for p in paths]\n-\n- return self.playlist_result(entries, folder_id)\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- user = mobj.group('user')\n- url_type = mobj.group('type')\n- content_id = mobj.group('id')\n- if url_type == 'folder':\n- return self._extract_folder(url, content_id)\n- else:\n- # this url is used on mobile devices\n- stream_url = f'http://x{user}x.api.channel.livestream.com/3.0/getstream.json'\n- info = {}\n- if content_id:\n- stream_url += f'?id={content_id}'\n- info = self._extract_video_info(user, content_id)\n- else:\n- content_id = user\n- webpage = self._download_webpage(url, content_id)\n- info = {\n- 'title': self._og_search_title(webpage),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': self._search_regex(r'channelLogo\\.src\\s*=\\s*\"([^\"]+)\"', webpage, 'thumbnail', None),\n- }\n- video_data = self._download_json(stream_url, content_id)\n- is_live = video_data.get('isLive')\n- info.update({\n- 'id': content_id,\n- 'title': info['title'],\n- 'formats': self._extract_video_formats(video_data, content_id),\n- 'is_live': is_live,\n- })\n- return info\n-\n-\n-# The server doesn't support HEAD request, the generic extractor can't detect\n-# the redirection\n-class LivestreamShortenerIE(InfoExtractor):\n- IE_NAME = 'livestream:shortener'\n- IE_DESC = False # Do not list\n- _VALID_URL = r'https?://livestre\\.am/(?P<id>.+)'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- return self.url_result(self._og_search_url(webpage))\ndiff --git a/yt_dlp/extractor/lynda.py b/yt_dlp/extractor/lynda.py\ndeleted file mode 100644\nindex f7cf9261a85c..000000000000\n--- a/yt_dlp/extractor/lynda.py\n+++ /dev/null\n@@ -1,325 +0,0 @@\n-import itertools\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- urlencode_postdata,\n-)\n-\n-\n-class LyndaBaseIE(InfoExtractor):\n- _SIGNIN_URL = 'https://www.lynda.com/signin/lynda'\n- _PASSWORD_URL = 'https://www.lynda.com/signin/password'\n- _USER_URL = 'https://www.lynda.com/signin/user'\n- _ACCOUNT_CREDENTIALS_HINT = 'Use --username and --password options to provide lynda.com account credentials.'\n- _NETRC_MACHINE = 'lynda'\n-\n- @staticmethod\n- def _check_error(json_string, key_or_keys):\n- keys = [key_or_keys] if isinstance(key_or_keys, str) else key_or_keys\n- for key in keys:\n- error = json_string.get(key)\n- if error:\n- raise ExtractorError(f'Unable to login: {error}', expected=True)\n-\n- def _perform_login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):\n- action_url = self._search_regex(\n- r'<form[^>]+action=([\"\\'])(?P<url>.+?)\\1', form_html,\n- 'post url', default=fallback_action_url, group='url')\n-\n- if not action_url.startswith('http'):\n- action_url = urllib.parse.urljoin(self._SIGNIN_URL, action_url)\n-\n- form_data = self._hidden_inputs(form_html)\n- form_data.update(extra_form_data)\n-\n- response = self._download_json(\n- action_url, None, note,\n- data=urlencode_postdata(form_data),\n- headers={\n- 'Referer': referrer_url,\n- 'X-Requested-With': 'XMLHttpRequest',\n- }, expected_status=(418, 500))\n-\n- self._check_error(response, ('email', 'password', 'ErrorMessage'))\n-\n- return response, action_url\n-\n- def _perform_login(self, username, password):\n- # Step 1: download signin page\n- signin_page = self._download_webpage(\n- self._SIGNIN_URL, None, 'Downloading signin page')\n-\n- # Already logged in\n- if any(re.search(p, signin_page) for p in (\n- r'isLoggedIn\\s*:\\s*true', r'logout\\.aspx', r'>Log out<')):\n- return\n-\n- # Step 2: submit email\n- signin_form = self._search_regex(\n- r'(?s)(<form[^>]+data-form-name=[\"\\']signin[\"\\'][^>]*>.+?</form>)',\n- signin_page, 'signin form')\n- signin_page, signin_url = self._login_step(\n- signin_form, self._PASSWORD_URL, {'email': username},\n- 'Submitting email', self._SIGNIN_URL)\n-\n- # Step 3: submit password\n- password_form = signin_page['body']\n- self._login_step(\n- password_form, self._USER_URL, {'email': username, 'password': password},\n- 'Submitting password', signin_url)\n-\n-\n-class LyndaIE(LyndaBaseIE):\n- IE_NAME = 'lynda'\n- IE_DESC = 'lynda.com videos'\n- _VALID_URL = r'''(?x)\n- https?://\n- (?:www\\.)?(?:lynda\\.com|educourse\\.ga)/\n- (?:\n- (?:[^/]+/){2,3}(?P<course_id>\\d+)|\n- player/embed\n- )/\n- (?P<id>\\d+)\n- '''\n-\n- _TIMECODE_REGEX = r'\\[(?P<timecode>\\d+:\\d+:\\d+[\\.,]\\d+)\\]'\n-\n- _TESTS = [{\n- 'url': 'https://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\n- # md5 is unstable\n- 'info_dict': {\n- 'id': '114408',\n- 'ext': 'mp4',\n- 'title': 'Using the exercise files',\n- 'duration': 68,\n- },\n- }, {\n- 'url': 'https://www.lynda.com/player/embed/133770?tr=foo=1;bar=g;fizz=rt&fs=0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://educourse.ga/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Willkommen-Grundlagen-guten-Gestaltung/393570/393572-4.html',\n- 'only_matching': True,\n- }, {\n- # Status=\"NotFound\", Message=\"Transcript not found\"\n- 'url': 'https://www.lynda.com/ASP-NET-tutorials/What-you-should-know/5034180/2811512-4.html',\n- 'only_matching': True,\n- }]\n-\n- def _raise_unavailable(self, video_id):\n- self.raise_login_required(\n- f'Video {video_id} is only available for members')\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- course_id = mobj.group('course_id')\n-\n- query = {\n- 'videoId': video_id,\n- 'type': 'video',\n- }\n-\n- video = self._download_json(\n- 'https://www.lynda.com/ajax/player', video_id,\n- 'Downloading video JSON', fatal=False, query=query)\n-\n- # Fallback scenario\n- if not video:\n- query['courseId'] = course_id\n-\n- play = self._download_json(\n- f'https://www.lynda.com/ajax/course/{course_id}/{video_id}/play', video_id, 'Downloading play JSON')\n-\n- if not play:\n- self._raise_unavailable(video_id)\n-\n- formats = []\n- for formats_dict in play:\n- urls = formats_dict.get('urls')\n- if not isinstance(urls, dict):\n- continue\n- cdn = formats_dict.get('name')\n- for format_id, format_url in urls.items():\n- if not format_url:\n- continue\n- formats.append({\n- 'url': format_url,\n- 'format_id': f'{cdn}-{format_id}' if cdn else format_id,\n- 'height': int_or_none(format_id),\n- })\n-\n- conviva = self._download_json(\n- 'https://www.lynda.com/ajax/player/conviva', video_id,\n- 'Downloading conviva JSON', query=query)\n-\n- return {\n- 'id': video_id,\n- 'title': conviva['VideoTitle'],\n- 'description': conviva.get('VideoDescription'),\n- 'release_year': int_or_none(conviva.get('ReleaseYear')),\n- 'duration': int_or_none(conviva.get('Duration')),\n- 'creator': conviva.get('Author'),\n- 'formats': formats,\n- }\n-\n- if 'Status' in video:\n- raise ExtractorError(\n- 'lynda returned error: {}'.format(video['Message']), expected=True)\n-\n- if video.get('HasAccess') is False:\n- self._raise_unavailable(video_id)\n-\n- video_id = str(video.get('ID') or video_id)\n- duration = int_or_none(video.get('DurationInSeconds'))\n- title = video['Title']\n-\n- formats = []\n-\n- fmts = video.get('Formats')\n- if fmts:\n- formats.extend([{\n- 'url': f['Url'],\n- 'ext': f.get('Extension'),\n- 'width': int_or_none(f.get('Width')),\n- 'height': int_or_none(f.get('Height')),\n- 'filesize': int_or_none(f.get('FileSize')),\n- 'format_id': str(f.get('Resolution')) if f.get('Resolution') else None,\n- } for f in fmts if f.get('Url')])\n-\n- prioritized_streams = video.get('PrioritizedStreams')\n- if prioritized_streams:\n- for prioritized_stream_id, prioritized_stream in prioritized_streams.items():\n- formats.extend([{\n- 'url': video_url,\n- 'height': int_or_none(format_id),\n- 'format_id': f'{prioritized_stream_id}-{format_id}',\n- } for format_id, video_url in prioritized_stream.items()])\n-\n- self._check_formats(formats, video_id)\n-\n- subtitles = self.extract_subtitles(video_id)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'duration': duration,\n- 'subtitles': subtitles,\n- 'formats': formats,\n- }\n-\n- def _fix_subtitles(self, subs):\n- srt = ''\n- seq_counter = 0\n- for seq_current, seq_next in itertools.pairwise(subs):\n- m_current = re.match(self._TIMECODE_REGEX, seq_current['Timecode'])\n- if m_current is None:\n- continue\n- m_next = re.match(self._TIMECODE_REGEX, seq_next['Timecode'])\n- if m_next is None:\n- continue\n- appear_time = m_current.group('timecode')\n- disappear_time = m_next.group('timecode')\n- text = seq_current['Caption'].strip()\n- if text:\n- seq_counter += 1\n- srt += f'{seq_counter}\\r\\n{appear_time} --> {disappear_time}\\r\\n{text}\\r\\n\\r\\n'\n- if srt:\n- return srt\n-\n- def _get_subtitles(self, video_id):\n- url = f'https://www.lynda.com/ajax/player?videoId={video_id}&type=transcript'\n- subs = self._download_webpage(\n- url, video_id, 'Downloading subtitles JSON', fatal=False)\n- if not subs or 'Status=\"NotFound\"' in subs:\n- return {}\n- subs = self._parse_json(subs, video_id, fatal=False)\n- if not subs:\n- return {}\n- fixed_subs = self._fix_subtitles(subs)\n- if fixed_subs:\n- return {'en': [{'ext': 'srt', 'data': fixed_subs}]}\n- return {}\n-\n-\n-class LyndaCourseIE(LyndaBaseIE):\n- IE_NAME = 'lynda:course'\n- IE_DESC = 'lynda.com online courses'\n-\n- # Course link equals to welcome/introduction video link of same course\n- # We will recognize it as course link\n- _VALID_URL = r'https?://(?:www|m)\\.(?:lynda\\.com|educourse\\.ga)/(?P<coursepath>(?:[^/]+/){2,3}(?P<courseid>\\d+))-2\\.html'\n-\n- _TESTS = [{\n- 'url': 'https://www.lynda.com/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- course_path = mobj.group('coursepath')\n- course_id = mobj.group('courseid')\n-\n- item_template = f'https://www.lynda.com/{course_path}/%s-4.html'\n-\n- course = self._download_json(\n- f'https://www.lynda.com/ajax/player?courseId={course_id}&type=course',\n- course_id, 'Downloading course JSON', fatal=False)\n-\n- if not course:\n- webpage = self._download_webpage(url, course_id)\n- entries = [\n- self.url_result(\n- item_template % video_id, ie=LyndaIE.ie_key(),\n- video_id=video_id)\n- for video_id in re.findall(\n- r'data-video-id=[\"\\'](\\d+)', webpage)]\n- return self.playlist_result(\n- entries, course_id,\n- self._og_search_title(webpage, fatal=False),\n- self._og_search_description(webpage))\n-\n- if course.get('Status') == 'NotFound':\n- raise ExtractorError(\n- f'Course {course_id} does not exist', expected=True)\n-\n- unaccessible_videos = 0\n- entries = []\n-\n- # Might want to extract videos right here from video['Formats'] as it seems 'Formats' is not provided\n- # by single video API anymore\n-\n- for chapter in course['Chapters']:\n- for video in chapter.get('Videos', []):\n- if video.get('HasAccess') is False:\n- unaccessible_videos += 1\n- continue\n- video_id = video.get('ID')\n- if video_id:\n- entries.append({\n- '_type': 'url_transparent',\n- 'url': item_template % video_id,\n- 'ie_key': LyndaIE.ie_key(),\n- 'chapter': chapter.get('Title'),\n- 'chapter_number': int_or_none(chapter.get('ChapterIndex')),\n- 'chapter_id': str(chapter.get('ID')),\n- })\n-\n- if unaccessible_videos > 0:\n- self.report_warning(\n- f'{unaccessible_videos} videos are only available for members (or paid members) '\n- f'and will not be downloaded. {self._ACCOUNT_CREDENTIALS_HINT}')\n-\n- course_title = course.get('Title')\n- course_description = course.get('Description')\n-\n- return self.playlist_result(entries, course_id, course_title, course_description)\ndiff --git a/yt_dlp/extractor/microsoftstream.py b/yt_dlp/extractor/microsoftstream.py\ndeleted file mode 100644\nindex b1388108383c..000000000000\n--- a/yt_dlp/extractor/microsoftstream.py\n+++ /dev/null\n@@ -1,121 +0,0 @@\n-import base64\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- merge_dicts,\n- parse_duration,\n- parse_iso8601,\n- parse_resolution,\n- try_get,\n- url_basename,\n-)\n-\n-\n-class MicrosoftStreamIE(InfoExtractor):\n- IE_NAME = 'microsoftstream'\n- IE_DESC = 'Microsoft Stream'\n- _VALID_URL = r'https?://(?:web|www|msit)\\.microsoftstream\\.com/video/(?P<id>[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12})'\n-\n- _TESTS = [{\n- 'url': 'https://web.microsoftstream.com/video/6e51d928-4f46-4f1c-b141-369925e37b62?list=user&userId=f5491e02-e8fe-4e34-b67c-ec2e79a6ecc0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://msit.microsoftstream.com/video/b60f5987-aabd-4e1c-a42f-c559d138f2ca',\n- 'only_matching': True,\n- }]\n-\n- def _get_all_subtitles(self, api_url, video_id, headers):\n- subtitles = {}\n- automatic_captions = {}\n- text_tracks = self._download_json(\n- f'{api_url}/videos/{video_id}/texttracks', video_id,\n- note='Downloading subtitles JSON', fatal=False, headers=headers,\n- query={'api-version': '1.4-private'}).get('value') or []\n- for track in text_tracks:\n- if not track.get('language') or not track.get('url'):\n- continue\n- sub_dict = automatic_captions if track.get('autoGenerated') else subtitles\n- sub_dict.setdefault(track['language'], []).append({\n- 'ext': 'vtt',\n- 'url': track.get('url'),\n- })\n- return {\n- 'subtitles': subtitles,\n- 'automatic_captions': automatic_captions,\n- }\n-\n- def extract_all_subtitles(self, *args, **kwargs):\n- if (self.get_param('writesubtitles', False)\n- or self.get_param('writeautomaticsub', False)\n- or self.get_param('listsubtitles')):\n- return self._get_all_subtitles(*args, **kwargs)\n- return {}\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- if '<title>Microsoft Stream</title>' not in webpage:\n- self.raise_login_required(method='cookies')\n-\n- access_token = self._html_search_regex(r'\"AccessToken\":\"(.+?)\"', webpage, 'access token')\n- api_url = self._html_search_regex(r'\"ApiGatewayUri\":\"(.+?)\"', webpage, 'api url')\n-\n- headers = {'Authorization': f'Bearer {access_token}'}\n-\n- video_data = self._download_json(\n- f'{api_url}/videos/{video_id}', video_id,\n- headers=headers, query={\n- '$expand': 'creator,tokens,status,liveEvent,extensions',\n- 'api-version': '1.4-private',\n- })\n- video_id = video_data.get('id') or video_id\n- language = video_data.get('language')\n-\n- thumbnails = []\n- for thumbnail_id in ('extraSmall', 'small', 'medium', 'large'):\n- thumbnail_url = try_get(video_data, lambda x: x['posterImage'][thumbnail_id]['url'], str)\n- if not thumbnail_url:\n- continue\n- thumb = {\n- 'id': thumbnail_id,\n- 'url': thumbnail_url,\n- }\n- thumb_name = url_basename(thumbnail_url)\n- thumb_name = str(base64.b64decode(thumb_name + '=' * (-len(thumb_name) % 4)))\n- thumb.update(parse_resolution(thumb_name))\n- thumbnails.append(thumb)\n-\n- formats = []\n- for playlist in video_data['playbackUrls']:\n- if playlist['mimeType'] == 'application/vnd.apple.mpegurl':\n- formats.extend(self._extract_m3u8_formats(\n- playlist['playbackUrl'], video_id,\n- ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls',\n- fatal=False, headers=headers))\n- elif playlist['mimeType'] == 'application/dash+xml':\n- formats.extend(self._extract_mpd_formats(\n- playlist['playbackUrl'], video_id, mpd_id='dash',\n- fatal=False, headers=headers))\n- elif playlist['mimeType'] == 'application/vnd.ms-sstr+xml':\n- formats.extend(self._extract_ism_formats(\n- playlist['playbackUrl'], video_id, ism_id='mss',\n- fatal=False, headers=headers))\n- formats = [merge_dicts(f, {'language': language}) for f in formats]\n-\n- return {\n- 'id': video_id,\n- 'title': video_data['name'],\n- 'description': video_data.get('description'),\n- 'uploader': try_get(video_data, lambda x: x['creator']['name'], str),\n- 'uploader_id': try_get(video_data, (lambda x: x['creator']['mail'],\n- lambda x: x['creator']['id']), str),\n- 'thumbnails': thumbnails,\n- **self.extract_all_subtitles(api_url, video_id, headers),\n- 'timestamp': parse_iso8601(video_data.get('created')),\n- 'duration': parse_duration(try_get(video_data, lambda x: x['media']['duration'])),\n- 'webpage_url': f'https://web.microsoftstream.com/video/{video_id}',\n- 'view_count': try_get(video_data, lambda x: x['metrics']['views'], int),\n- 'like_count': try_get(video_data, lambda x: x['metrics']['likes'], int),\n- 'comment_count': try_get(video_data, lambda x: x['metrics']['comments'], int),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/minoto.py b/yt_dlp/extractor/minoto.py\ndeleted file mode 100644\nindex 69832560d055..000000000000\n--- a/yt_dlp/extractor/minoto.py\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_codecs,\n-)\n-\n-\n-class MinotoIE(InfoExtractor):\n- _VALID_URL = r'(?:minoto:|https?://(?:play|iframe|embed)\\.minoto-video\\.com/(?P<player_id>[0-9]+)/)(?P<id>[a-zA-Z0-9]+)'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- player_id = mobj.group('player_id') or '1'\n- video_id = mobj.group('id')\n- video_data = self._download_json(f'http://play.minoto-video.com/{player_id}/{video_id}.js', video_id)\n- video_metadata = video_data['video-metadata']\n- formats = []\n- for fmt in video_data['video-files']:\n- fmt_url = fmt.get('url')\n- if not fmt_url:\n- continue\n- container = fmt.get('container')\n- if container == 'hls':\n- formats.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- else:\n- fmt_profile = fmt.get('profile') or {}\n- formats.append({\n- 'format_id': fmt_profile.get('name-short'),\n- 'format_note': fmt_profile.get('name'),\n- 'url': fmt_url,\n- 'container': container,\n- 'tbr': int_or_none(fmt.get('bitrate')),\n- 'filesize': int_or_none(fmt.get('filesize')),\n- 'width': int_or_none(fmt.get('width')),\n- 'height': int_or_none(fmt.get('height')),\n- **parse_codecs(fmt.get('codecs')),\n- })\n-\n- return {\n- 'id': video_id,\n- 'title': video_metadata['title'],\n- 'description': video_metadata.get('description'),\n- 'thumbnail': video_metadata.get('video-poster', {}).get('url'),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/mojvideo.py b/yt_dlp/extractor/mojvideo.py\ndeleted file mode 100644\nindex 6bc362a53cb3..000000000000\n--- a/yt_dlp/extractor/mojvideo.py\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n-)\n-\n-\n-class MojvideoIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?mojvideo\\.com/video-(?P<display_id>[^/]+)/(?P<id>[a-f0-9]+)'\n- _TEST = {\n- 'url': 'http://www.mojvideo.com/video-v-avtu-pred-mano-rdecelaska-alfi-nipic/3d1ed4497707730b2906',\n- 'md5': 'f7fd662cc8ce2be107b0d4f2c0483ae7',\n- 'info_dict': {\n- 'id': '3d1ed4497707730b2906',\n- 'display_id': 'v-avtu-pred-mano-rdecelaska-alfi-nipic',\n- 'ext': 'mp4',\n- 'title': 'V avtu pred mano rdeฤelaska - Alfi Nipiฤ',\n- 'thumbnail': r're:^http://.*\\.jpg$',\n- 'duration': 242,\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n- display_id = mobj.group('display_id')\n-\n- # XML is malformed\n- playerapi = self._download_webpage(\n- f'http://www.mojvideo.com/playerapi.php?v={video_id}&t=1', display_id)\n-\n- if '<error>true</error>' in playerapi:\n- error_desc = self._html_search_regex(\n- r'<errordesc>([^<]*)</errordesc>', playerapi, 'error description', fatal=False)\n- raise ExtractorError(f'{self.IE_NAME} said: {error_desc}', expected=True)\n-\n- title = self._html_extract_title(playerapi)\n- video_url = self._html_search_regex(\n- r'<file>([^<]+)</file>', playerapi, 'video URL')\n- thumbnail = self._html_search_regex(\n- r'<preview>([^<]+)</preview>', playerapi, 'thumbnail', fatal=False)\n- duration = parse_duration(self._html_search_regex(\n- r'<duration>([^<]+)</duration>', playerapi, 'duration', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'url': video_url,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- }\ndiff --git a/yt_dlp/extractor/motherless.py b/yt_dlp/extractor/motherless.py\ndeleted file mode 100644\nindex e236ec3db8d5..000000000000\n--- a/yt_dlp/extractor/motherless.py\n+++ /dev/null\n@@ -1,289 +0,0 @@\n-import datetime as dt\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- OnDemandPagedList,\n- remove_end,\n- str_to_int,\n- unified_strdate,\n-)\n-\n-\n-class MotherlessIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/(?:g/[a-z0-9_]+/|G[VIG]?[A-F0-9]+/)?(?P<id>[A-F0-9]+)'\n- _TESTS = [{\n- 'url': 'http://motherless.com/EE97006',\n- 'md5': 'cb5e7438f7a3c4e886b7bccc1292a3bc',\n- 'info_dict': {\n- 'id': 'EE97006',\n- 'ext': 'mp4',\n- 'title': 'Dogging blond Brit getting glazed (comp)',\n- 'categories': ['UK', 'slag', 'whore', 'dogging', 'cunt', 'cumhound', 'big tits', 'Pearl Necklace'],\n- 'upload_date': '20230519',\n- 'uploader_id': 'deathbird',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'comment_count': int,\n- 'view_count': int,\n- 'like_count': int,\n- },\n- 'params': {\n- # Incomplete cert chains\n- 'nocheckcertificate': True,\n- },\n- }, {\n- 'url': 'http://motherless.com/532291B',\n- 'md5': 'bc59a6b47d1f958e61fbd38a4d31b131',\n- 'info_dict': {\n- 'id': '532291B',\n- 'ext': 'mp4',\n- 'title': 'Amazing girl playing the omegle game, PERFECT!',\n- 'categories': ['Amateur', 'webcam', 'omegle', 'pink', 'young', 'masturbate', 'teen',\n- 'game', 'hairy'],\n- 'upload_date': '20140622',\n- 'uploader_id': 'Sulivana7x',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- },\n- 'skip': '404',\n- }, {\n- 'url': 'http://motherless.com/g/cosplay/633979F',\n- 'expected_exception': 'ExtractorError',\n- }, {\n- 'url': 'http://motherless.com/8B4BBC1',\n- 'info_dict': {\n- 'id': '8B4BBC1',\n- 'ext': 'mp4',\n- 'title': 'VIDEO00441.mp4',\n- 'categories': [],\n- 'upload_date': '20160214',\n- 'uploader_id': 'NMWildGirl',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'like_count': int,\n- 'comment_count': int,\n- 'view_count': int,\n- },\n- 'params': {\n- 'nocheckcertificate': True,\n- },\n- }, {\n- # see https://motherless.com/videos/recent for recent videos with\n- # uploaded date in \"ago\" format\n- 'url': 'https://motherless.com/3C3E2CF',\n- 'info_dict': {\n- 'id': '3C3E2CF',\n- 'ext': 'mp4',\n- 'title': 'a/ Hot Teens',\n- 'categories': list,\n- 'upload_date': '20210104',\n- 'uploader_id': 'anonymous',\n- 'thumbnail': r're:https?://.*\\.jpg',\n- 'age_limit': 18,\n- 'like_count': int,\n- 'comment_count': int,\n- 'view_count': int,\n- },\n- 'params': {\n- 'nocheckcertificate': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- if any(p in webpage for p in (\n- '<title>404 - MOTHERLESS.COM<',\n- \">The page you're looking for cannot be found.<\",\n- '<div class=\"error-page',\n- )):\n- raise ExtractorError(f'Video {video_id} does not exist', expected=True)\n-\n- if '>The content you are trying to view is for friends only.' in webpage:\n- raise ExtractorError(f'Video {video_id} is for friends only', expected=True)\n-\n- title = self._html_search_regex(\n- (r'(?s)<div[^>]+\\bclass=[\"\\']media-meta-title[^>]+>(.+?)</div>',\n- r'id=\"view-upload-title\">\\s+([^<]+)<'), webpage, 'title')\n- video_url = (self._html_search_regex(\n- (r'setup\\(\\{\\s*[\"\\']file[\"\\']\\s*:\\s*([\"\\'])(?P<url>(?:(?!\\1).)+)\\1',\n- r'fileurl\\s*=\\s*([\"\\'])(?P<url>(?:(?!\\1).)+)\\1'),\n- webpage, 'video URL', default=None, group='url')\n- or f'http://cdn4.videos.motherlessmedia.com/videos/{video_id}.mp4?fs=opencloud')\n- age_limit = self._rta_search(webpage)\n- view_count = str_to_int(self._html_search_regex(\n- (r'>([\\d,.]+)\\s+Views<', r'<strong>Views</strong>\\s+([^<]+)<'),\n- webpage, 'view count', fatal=False))\n- like_count = str_to_int(self._html_search_regex(\n- (r'>([\\d,.]+)\\s+Favorites<',\n- r'<strong>Favorited</strong>\\s+([^<]+)<'),\n- webpage, 'like count', fatal=False))\n-\n- upload_date = unified_strdate(self._search_regex(\n- r'class=[\"\\']count[^>]+>(\\d+\\s+[a-zA-Z]{3}\\s+\\d{4})<', webpage,\n- 'upload date', default=None))\n- if not upload_date:\n- uploaded_ago = self._search_regex(\n- r'>\\s*(\\d+[hd])\\s+[aA]go\\b', webpage, 'uploaded ago',\n- default=None)\n- if uploaded_ago:\n- delta = int(uploaded_ago[:-1])\n- _AGO_UNITS = {\n- 'h': 'hours',\n- 'd': 'days',\n- }\n- kwargs = {_AGO_UNITS.get(uploaded_ago[-1]): delta}\n- upload_date = (dt.datetime.now(dt.timezone.utc) - dt.timedelta(**kwargs)).strftime('%Y%m%d')\n-\n- comment_count = len(re.findall(r'''class\\s*=\\s*['\"]media-comment-contents\\b''', webpage))\n- uploader_id = self._html_search_regex(\n- (r'''<span\\b[^>]+\\bclass\\s*=\\s*[\"']username\\b[^>]*>([^<]+)</span>''',\n- r'''(?s)['\"](?:media-meta-member|thumb-member-username)\\b[^>]+>\\s*<a\\b[^>]+\\bhref\\s*=\\s*['\"]/m/([^\"']+)'''),\n- webpage, 'uploader_id', fatal=False)\n- categories = self._html_search_meta('keywords', webpage, default='')\n- categories = [cat.strip() for cat in categories.split(',') if cat.strip()]\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'upload_date': upload_date,\n- 'uploader_id': uploader_id,\n- 'thumbnail': self._og_search_thumbnail(webpage),\n- 'categories': categories,\n- 'view_count': view_count,\n- 'like_count': like_count,\n- 'comment_count': comment_count,\n- 'age_limit': age_limit,\n- 'url': video_url,\n- }\n-\n-\n-class MotherlessPaginatedIE(InfoExtractor):\n- _EXTRA_QUERY = {}\n- _PAGE_SIZE = 60\n-\n- def _correct_path(self, url, item_id):\n- raise NotImplementedError('This method must be implemented by subclasses')\n-\n- def _correct_title(self, title, /):\n- return title.partition(' - Videos')[0] if title else None\n-\n- def _extract_entries(self, webpage, base):\n- for mobj in re.finditer(r'href=\"[^\"]*(?P<href>/[A-F0-9]+)\"\\s+title=\"(?P<title>[^\"]+)',\n- webpage):\n- video_url = urllib.parse.urljoin(base, mobj.group('href'))\n- video_id = MotherlessIE.get_temp_id(video_url)\n-\n- if video_id:\n- yield self.url_result(video_url, MotherlessIE, video_id, mobj.group('title'))\n-\n- def _real_extract(self, url):\n- item_id = self._match_id(url)\n- real_url = self._correct_path(url, item_id)\n- webpage = self._download_webpage(real_url, item_id, 'Downloading page 1')\n-\n- def get_page(idx):\n- page = idx + 1\n- current_page = webpage if not idx else self._download_webpage(\n- real_url, item_id, note=f'Downloading page {page}', query={'page': page, **self._EXTRA_QUERY})\n- yield from self._extract_entries(current_page, real_url)\n-\n- return self.playlist_result(\n- OnDemandPagedList(get_page, self._PAGE_SIZE), item_id,\n- self._correct_title(self._html_extract_title(webpage)))\n-\n-\n-class MotherlessGroupIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/g[vifm]?/(?P<id>[a-z0-9_]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'http://motherless.com/gv/movie_scenes',\n- 'info_dict': {\n- 'id': 'movie_scenes',\n- 'title': 'Movie Scenes',\n- },\n- 'playlist_mincount': 540,\n- }, {\n- 'url': 'http://motherless.com/g/sex_must_be_funny',\n- 'info_dict': {\n- 'id': 'sex_must_be_funny',\n- 'title': 'Sex must be funny',\n- },\n- 'playlist_count': 0,\n- }, {\n- 'url': 'https://motherless.com/gv/beautiful_cock',\n- 'info_dict': {\n- 'id': 'beautiful_cock',\n- 'title': 'Beautiful Cock',\n- },\n- 'playlist_mincount': 371,\n- }]\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/gv/{item_id}')\n-\n-\n-class MotherlessGalleryIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/G[VIG]?(?P<id>[A-F0-9]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://motherless.com/GV338999F',\n- 'info_dict': {\n- 'id': '338999F',\n- 'title': 'Random',\n- },\n- 'playlist_mincount': 100,\n- }, {\n- 'url': 'https://motherless.com/GVABD6213',\n- 'info_dict': {\n- 'id': 'ABD6213',\n- 'title': 'Cuties',\n- },\n- 'playlist_mincount': 1,\n- }, {\n- 'url': 'https://motherless.com/GVBCF7622',\n- 'info_dict': {\n- 'id': 'BCF7622',\n- 'title': 'Vintage',\n- },\n- 'playlist_count': 0,\n- }, {\n- 'url': 'https://motherless.com/G035DE2F',\n- 'info_dict': {\n- 'id': '035DE2F',\n- 'title': 'General',\n- },\n- 'playlist_mincount': 234,\n- }]\n-\n- def _correct_title(self, title, /):\n- return remove_end(title, ' | MOTHERLESS.COM โข')\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/GV{item_id}')\n-\n-\n-class MotherlessUploaderIE(MotherlessPaginatedIE):\n- _VALID_URL = r'https?://(?:www\\.)?motherless\\.com/u/(?P<id>\\w+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://motherless.com/u/Mrgo4hrs2023',\n- 'info_dict': {\n- 'id': 'Mrgo4hrs2023',\n- 'title': \"Mrgo4hrs2023's Uploads\",\n- },\n- 'playlist_mincount': 32,\n- }, {\n- 'url': 'https://motherless.com/u/Happy_couple?t=v',\n- 'info_dict': {\n- 'id': 'Happy_couple',\n- 'title': \"Happy_couple's Uploads\",\n- },\n- 'playlist_mincount': 8,\n- }]\n-\n- _EXTRA_QUERY = {'t': 'v'}\n-\n- def _correct_path(self, url, item_id):\n- return urllib.parse.urljoin(url, f'/u/{item_id}?t=v')\ndiff --git a/yt_dlp/extractor/moview.py b/yt_dlp/extractor/moview.py\ndeleted file mode 100644\nindex 560154e1a1e2..000000000000\n--- a/yt_dlp/extractor/moview.py\n+++ /dev/null\n@@ -1,43 +0,0 @@\n-from .jixie import JixieBaseIE\n-\n-\n-class MoviewPlayIE(JixieBaseIE):\n- _VALID_URL = r'https?://www\\.moview\\.id/play/\\d+/(?P<id>[\\w-]+)'\n- _TESTS = [\n- {\n- # drm hls, only use direct link\n- 'url': 'https://www.moview.id/play/174/Candy-Monster',\n- 'info_dict': {\n- 'id': '146182',\n- 'ext': 'mp4',\n- 'display_id': 'Candy-Monster',\n- 'uploader_id': 'Mo165qXUUf',\n- 'duration': 528.2,\n- 'title': 'Candy Monster',\n- 'description': 'Mengapa Candy Monster ingin mengambil permen Chloe?',\n- 'thumbnail': 'https://video.jixie.media/1034/146182/146182_1280x720.jpg',\n- },\n- }, {\n- # non-drm hls\n- 'url': 'https://www.moview.id/play/75/Paris-Van-Java-Episode-16',\n- 'info_dict': {\n- 'id': '28210',\n- 'ext': 'mp4',\n- 'duration': 2595.666667,\n- 'display_id': 'Paris-Van-Java-Episode-16',\n- 'uploader_id': 'Mo165qXUUf',\n- 'thumbnail': 'https://video.jixie.media/1003/28210/28210_1280x720.jpg',\n- 'description': 'md5:2a5e18d98eef9b39d7895029cac96c63',\n- 'title': 'Paris Van Java Episode 16',\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- video_id = self._search_regex(\n- r'video_id\\s*=\\s*\"(?P<video_id>[^\"]+)', webpage, 'video_id')\n-\n- return self._extract_data_from_jixie_id(display_id, video_id, webpage)\ndiff --git a/yt_dlp/extractor/moviezine.py b/yt_dlp/extractor/moviezine.py\ndeleted file mode 100644\nindex 331a56234bce..000000000000\n--- a/yt_dlp/extractor/moviezine.py\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class MoviezineIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?moviezine\\.se/video/(?P<id>[^?#]+)'\n-\n- _TEST = {\n- 'url': 'http://www.moviezine.se/video/205866',\n- 'info_dict': {\n- 'id': '205866',\n- 'ext': 'mp4',\n- 'title': 'Oculus - Trailer 1',\n- 'description': 'md5:40cc6790fc81d931850ca9249b40e8a4',\n- 'thumbnail': r're:http://.*\\.jpg',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n-\n- webpage = self._download_webpage(url, video_id)\n- jsplayer = self._download_webpage(f'http://www.moviezine.se/api/player.js?video={video_id}', video_id, 'Downloading js api player')\n-\n- formats = [{\n- 'format_id': 'sd',\n- 'url': self._html_search_regex(r'file: \"(.+?)\",', jsplayer, 'file'),\n- 'quality': 0,\n- 'ext': 'mp4',\n- }]\n-\n- return {\n- 'id': video_id,\n- 'title': self._search_regex(r'title: \"(.+?)\",', jsplayer, 'title'),\n- 'thumbnail': self._search_regex(r'image: \"(.+?)\",', jsplayer, 'image'),\n- 'formats': formats,\n- 'description': self._og_search_description(webpage),\n- }\ndiff --git a/yt_dlp/extractor/musicdex.py b/yt_dlp/extractor/musicdex.py\ndeleted file mode 100644\nindex 5ca390ef9af5..000000000000\n--- a/yt_dlp/extractor/musicdex.py\n+++ /dev/null\n@@ -1,174 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- date_from_str,\n- format_field,\n- try_get,\n- unified_strdate,\n-)\n-\n-\n-class MusicdexBaseIE(InfoExtractor):\n- def _return_info(self, track_json, album_json, video_id):\n- return {\n- 'id': str(video_id),\n- 'title': track_json.get('name'),\n- 'track': track_json.get('name'),\n- 'description': track_json.get('description'),\n- 'track_number': track_json.get('number'),\n- 'url': format_field(track_json, 'url', 'https://www.musicdex.org/%s'),\n- 'duration': track_json.get('duration'),\n- 'genres': [genre.get('name') for genre in track_json.get('genres') or []],\n- 'like_count': track_json.get('likes_count'),\n- 'view_count': track_json.get('plays'),\n- 'artists': [artist.get('name') for artist in track_json.get('artists') or []],\n- 'album_artists': [artist.get('name') for artist in album_json.get('artists') or []],\n- 'thumbnail': format_field(album_json, 'image', 'https://www.musicdex.org/%s'),\n- 'album': album_json.get('name'),\n- 'release_year': try_get(album_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\n- 'extractor_key': MusicdexSongIE.ie_key(),\n- 'extractor': 'MusicdexSong',\n- }\n-\n-\n-class MusicdexSongIE(MusicdexBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/track/(?P<id>\\d+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/track/306/dual-existence',\n- 'info_dict': {\n- 'id': '306',\n- 'ext': 'mp3',\n- 'title': 'dual existence',\n- 'description': '#NIPPONSEI @ IRC.RIZON.NET',\n- 'track': 'dual existence',\n- 'track_number': 1,\n- 'duration': 266000,\n- 'genres': ['Anime'],\n- 'like_count': int,\n- 'view_count': int,\n- 'artists': ['fripSide'],\n- 'album_artists': ['fripSide'],\n- 'thumbnail': 'https://www.musicdex.org/storage/album/9iDIam1DHTVqUG4UclFIEq1WAFGXfPW4y0TtZa91.png',\n- 'album': 'To Aru Kagaku no Railgun T OP2 Single - dual existence',\n- 'release_year': 2020,\n- },\n- 'params': {'skip_download': True},\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.musicdex.org/secure/tracks/{video_id}?defaultRelations=true', video_id)['track']\n- return self._return_info(data_json, data_json.get('album') or {}, video_id)\n-\n-\n-class MusicdexAlbumIE(MusicdexBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/album/(?P<id>\\d+)'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/album/56/tenmon-and-eiichiro-yanagi-minori/ef-a-tale-of-memories-original-soundtrack-2-fortissimo',\n- 'playlist_mincount': 28,\n- 'info_dict': {\n- 'id': '56',\n- 'genres': ['OST'],\n- 'view_count': int,\n- 'artists': ['TENMON & Eiichiro Yanagi / minori'],\n- 'title': 'ef - a tale of memories Original Soundtrack 2 ~fortissimo~',\n- 'release_year': 2008,\n- 'thumbnail': 'https://www.musicdex.org/storage/album/2rSHkyYBYfB7sbvElpEyTMcUn6toY7AohOgJuDlE.jpg',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(\n- f'https://www.musicdex.org/secure/albums/{playlist_id}?defaultRelations=true', playlist_id)['album']\n- entries = [self._return_info(track, data_json, track['id'])\n- for track in data_json.get('tracks') or [] if track.get('id')]\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'description': data_json.get('description'),\n- 'genres': [genre.get('name') for genre in data_json.get('genres') or []],\n- 'view_count': data_json.get('plays'),\n- 'artists': [artist.get('name') for artist in data_json.get('artists') or []],\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\n- 'release_year': try_get(data_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),\n- 'entries': entries,\n- }\n-\n-\n-class MusicdexPageIE(MusicdexBaseIE): # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor\n- def _entries(self, playlist_id):\n- next_page_url = self._API_URL % playlist_id\n- while next_page_url:\n- data_json = self._download_json(next_page_url, playlist_id)['pagination']\n- yield from data_json.get('data') or []\n- next_page_url = data_json.get('next_page_url')\n-\n-\n-class MusicdexArtistIE(MusicdexPageIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/artist/(?P<id>\\d+)'\n- _API_URL = 'https://www.musicdex.org/secure/artists/%s/albums?page=1'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/artist/11/fripside',\n- 'playlist_mincount': 28,\n- 'info_dict': {\n- 'id': '11',\n- 'view_count': int,\n- 'title': 'fripSide',\n- 'thumbnail': 'https://www.musicdex.org/storage/artist/ZmOz0lN2vsweegB660em3xWffCjLPmTQHqJls5Xx.jpg',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{playlist_id}', playlist_id)['artist']\n- entries = []\n- for album in self._entries(playlist_id):\n- entries.extend(self._return_info(track, album, track['id']) for track in album.get('tracks') or [] if track.get('id'))\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'view_count': data_json.get('plays'),\n- 'thumbnail': format_field(data_json, 'image_small', 'https://www.musicdex.org/%s'),\n- 'entries': entries,\n- }\n-\n-\n-class MusicdexPlaylistIE(MusicdexPageIE):\n- _VALID_URL = r'https?://(?:www\\.)?musicdex\\.org/playlist/(?P<id>\\d+)'\n- _API_URL = 'https://www.musicdex.org/secure/playlists/%s/tracks?perPage=10000&page=1'\n-\n- _TESTS = [{\n- 'url': 'https://www.musicdex.org/playlist/9/test',\n- 'playlist_mincount': 73,\n- 'info_dict': {\n- 'id': '9',\n- 'view_count': int,\n- 'title': 'Test',\n- 'thumbnail': 'https://www.musicdex.org/storage/album/jXATI79f0IbQ2sgsKYOYRCW3zRwF3XsfHhzITCuJ.jpg',\n- 'description': 'Test 123 123 21312 32121321321321312',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{playlist_id}', playlist_id)['playlist']\n- entries = [self._return_info(track, track.get('album') or {}, track['id'])\n- for track in self._entries(playlist_id) or [] if track.get('id')]\n-\n- return {\n- '_type': 'playlist',\n- 'id': playlist_id,\n- 'title': data_json.get('name'),\n- 'description': data_json.get('description'),\n- 'view_count': data_json.get('plays'),\n- 'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),\n- 'entries': entries,\n- }\ndiff --git a/yt_dlp/extractor/nationalgeographic.py b/yt_dlp/extractor/nationalgeographic.py\nindex 43f84a95276a..d06680ccff1f 100644\n--- a/yt_dlp/extractor/nationalgeographic.py\n+++ b/yt_dlp/extractor/nationalgeographic.py\n@@ -1,64 +1,4 @@\n-from .common import InfoExtractor\n from .fox import FOXIE\n-from ..utils import (\n- smuggle_url,\n- url_basename,\n-)\n-\n-\n-class NationalGeographicVideoIE(InfoExtractor):\n- IE_NAME = 'natgeo:video'\n- _VALID_URL = r'https?://video\\.nationalgeographic\\.com/.*?'\n-\n- _TESTS = [\n- {\n- 'url': 'http://video.nationalgeographic.com/video/news/150210-news-crab-mating-vin?source=featuredvideo',\n- 'md5': '730855d559abbad6b42c2be1fa584917',\n- 'info_dict': {\n- 'id': '0000014b-70a1-dd8c-af7f-f7b559330001',\n- 'ext': 'mp4',\n- 'title': 'Mating Crabs Busted by Sharks',\n- 'description': 'md5:16f25aeffdeba55aaa8ec37e093ad8b3',\n- 'timestamp': 1423523799,\n- 'upload_date': '20150209',\n- 'uploader': 'NAGS',\n- },\n- 'add_ie': ['ThePlatform'],\n- 'skip': 'Redirects to main page',\n- },\n- {\n- 'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws',\n- 'md5': '6a3105eb448c070503b3105fb9b320b5',\n- 'info_dict': {\n- 'id': 'ngc-I0IauNSWznb_UV008GxSbwY35BZvgi2e',\n- 'ext': 'mp4',\n- 'title': 'The Real Jaws',\n- 'description': 'md5:8d3e09d9d53a85cd397b4b21b2c77be6',\n- 'timestamp': 1433772632,\n- 'upload_date': '20150608',\n- 'uploader': 'NAGS',\n- },\n- 'add_ie': ['ThePlatform'],\n- 'skip': 'Redirects to main page',\n- },\n- ]\n-\n- def _real_extract(self, url):\n- name = url_basename(url)\n-\n- webpage = self._download_webpage(url, name)\n- guid = self._search_regex(\n- r'id=\"(?:videoPlayer|player-container)\"[^>]+data-guid=\"([^\"]+)\"',\n- webpage, 'guid')\n-\n- return {\n- '_type': 'url_transparent',\n- 'ie_key': 'ThePlatform',\n- 'url': smuggle_url(\n- f'http://link.theplatform.com/s/ngs/media/guid/2423130747/{guid}?mbr=true',\n- {'force_smil_url': True}),\n- 'id': guid,\n- }\n \n \n class NationalGeographicTVIE(FOXIE): # XXX: Do not subclass from concrete IE\ndiff --git a/yt_dlp/extractor/naver.py b/yt_dlp/extractor/naver.py\nindex fa7b56ca75db..ffb4da2622f3 100644\n--- a/yt_dlp/extractor/naver.py\n+++ b/yt_dlp/extractor/naver.py\n@@ -13,11 +13,9 @@\n dict_get,\n int_or_none,\n join_nonempty,\n- merge_dicts,\n parse_iso8601,\n traverse_obj,\n try_get,\n- unified_timestamp,\n update_url_query,\n url_or_none,\n )\n@@ -284,142 +282,3 @@ def _real_extract(self, url):\n }), get_all=False),\n 'is_live': True,\n }\n-\n-\n-class NaverNowIE(NaverBaseIE):\n- IE_NAME = 'navernow'\n- _VALID_URL = r'https?://now\\.naver\\.com/s/now\\.(?P<id>\\w+)'\n- _API_URL = 'https://apis.naver.com/now_web/oldnow_web/v4'\n- _TESTS = [{\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay=',\n- 'md5': 'e05854162c21c221481de16b2944a0bc',\n- 'info_dict': {\n- 'id': '4759-26331132',\n- 'title': '์์ดํคX๋
ธ์ \\r\\n๐๊ฝ๋ฅ๊ฝ๋ฅ๐(1)',\n- 'ext': 'mp4',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'timestamp': 1650369600,\n- 'upload_date': '20220419',\n- 'uploader_id': 'now',\n- 'view_count': int,\n- 'uploader_url': 'https://now.naver.com/show/4759',\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'params': {\n- 'noplaylist': True,\n- },\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\n- 'md5': '9f6118e398aa0f22b2152f554ea7851b',\n- 'info_dict': {\n- 'id': '4759-26601461',\n- 'title': '์์ดํค: ๋ ๋ฆฌ์ ํํ
ํ๋ค๋ ธ์ด,,, ์งํฌ ํญ๋ฐํ๋ ๋
ธ์ ์ฌ๋ณด๐พ [์์ดํค์ ๋ฐ์ฆ์
]ใ
ฃ๋ค์ด๋ฒ NOW.',\n- 'ext': 'mp4',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20220504',\n- 'timestamp': 1651648311,\n- 'uploader_id': 'now',\n- 'view_count': int,\n- 'uploader_url': 'https://now.naver.com/show/4759',\n- 'uploader': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'params': {\n- 'noplaylist': True,\n- },\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',\n- 'info_dict': {\n- 'id': '4759',\n- 'title': '์์ดํค์ ๋ฐ์ฆ์
',\n- },\n- 'playlist_mincount': 101,\n- }, {\n- 'url': 'https://now.naver.com/s/now.kihyunplay?shareReplayId=30573291#replay',\n- 'only_matching': True,\n- }]\n-\n- def _extract_replay(self, show_id, replay_id):\n- vod_info = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}', replay_id)\n- in_key = self._download_json(f'{self._API_URL}/shows/now.{show_id}/vod/{replay_id}/inkey', replay_id)['inKey']\n- return merge_dicts({\n- 'id': f'{show_id}-{replay_id}',\n- 'title': traverse_obj(vod_info, ('episode', 'title')),\n- 'timestamp': unified_timestamp(traverse_obj(vod_info, ('episode', 'start_time'))),\n- 'thumbnail': vod_info.get('thumbnail_image_url'),\n- }, self._extract_video_info(replay_id, vod_info['video_id'], in_key))\n-\n- def _extract_show_replays(self, show_id):\n- page_size = 15\n- page = 1\n- while True:\n- show_vod_info = self._download_json(\n- f'{self._API_URL}/vod-shows/now.{show_id}', show_id,\n- query={'page': page, 'page_size': page_size},\n- note=f'Downloading JSON vod list for show {show_id} - page {page}',\n- )['response']['result']\n- for v in show_vod_info.get('vod_list') or []:\n- yield self._extract_replay(show_id, v['id'])\n-\n- if len(show_vod_info.get('vod_list') or []) < page_size:\n- break\n- page += 1\n-\n- def _extract_show_highlights(self, show_id, highlight_id=None):\n- page_size = 10\n- page = 1\n- while True:\n- highlights_videos = self._download_json(\n- f'{self._API_URL}/shows/now.{show_id}/highlights/videos/', show_id,\n- query={'page': page, 'page_size': page_size},\n- note=f'Downloading JSON highlights for show {show_id} - page {page}')\n-\n- for highlight in highlights_videos.get('results') or []:\n- if highlight_id and highlight.get('clip_no') != int(highlight_id):\n- continue\n- yield merge_dicts({\n- 'id': f'{show_id}-{highlight[\"clip_no\"]}',\n- 'title': highlight.get('title'),\n- 'timestamp': unified_timestamp(highlight.get('regdate')),\n- 'thumbnail': highlight.get('thumbnail_url'),\n- }, self._extract_video_info(highlight['clip_no'], highlight['video_id'], highlight['video_inkey']))\n-\n- if len(highlights_videos.get('results') or []) < page_size:\n- break\n- page += 1\n-\n- def _extract_highlight(self, show_id, highlight_id):\n- try:\n- return next(self._extract_show_highlights(show_id, highlight_id))\n- except StopIteration:\n- raise ExtractorError(f'Unable to find highlight {highlight_id} for show {show_id}')\n-\n- def _real_extract(self, url):\n- show_id = self._match_id(url)\n- qs = urllib.parse.parse_qs(urllib.parse.urlparse(url).query)\n-\n- if not self._yes_playlist(show_id, qs.get('shareHightlight')):\n- return self._extract_highlight(show_id, qs['shareHightlight'][0])\n- elif not self._yes_playlist(show_id, qs.get('shareReplayId')):\n- return self._extract_replay(show_id, qs['shareReplayId'][0])\n-\n- show_info = self._download_json(\n- f'{self._API_URL}/shows/now.{show_id}/', show_id,\n- note=f'Downloading JSON vod list for show {show_id}')\n-\n- return self.playlist_result(\n- itertools.chain(self._extract_show_replays(show_id), self._extract_show_highlights(show_id)),\n- show_id, show_info.get('title'))\ndiff --git a/yt_dlp/extractor/nerdcubed.py b/yt_dlp/extractor/nerdcubed.py\ndeleted file mode 100644\nindex 5f5607a20b25..000000000000\n--- a/yt_dlp/extractor/nerdcubed.py\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import parse_iso8601, url_or_none\n-from ..utils.traversal import traverse_obj\n-\n-\n-class NerdCubedFeedIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?nerdcubed\\.co\\.uk/?(?:$|[#?])'\n- _TEST = {\n- 'url': 'http://www.nerdcubed.co.uk/',\n- 'info_dict': {\n- 'id': 'nerdcubed-feed',\n- 'title': 'nerdcubed.co.uk feed',\n- },\n- 'playlist_mincount': 5500,\n- }\n-\n- def _extract_video(self, feed_entry):\n- return self.url_result(\n- f'https://www.youtube.com/watch?v={feed_entry[\"id\"]}', YoutubeIE,\n- **traverse_obj(feed_entry, {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'timestamp': ('publishedAt', {parse_iso8601}),\n- 'channel': ('source', 'name', {str}),\n- 'channel_id': ('source', 'id', {str}),\n- 'channel_url': ('source', 'url', {str}),\n- 'thumbnail': ('thumbnail', 'source', {url_or_none}),\n- }), url_transparent=True)\n-\n- def _real_extract(self, url):\n- video_id = 'nerdcubed-feed'\n- feed = self._download_json('https://www.nerdcubed.co.uk/_/cdn/videos.json', video_id)\n-\n- return self.playlist_result(\n- map(self._extract_video, traverse_obj(feed, ('videos', lambda _, v: v['id']))),\n- video_id, 'nerdcubed.co.uk feed')\ndiff --git a/yt_dlp/extractor/netverse.py b/yt_dlp/extractor/netverse.py\ndeleted file mode 100644\nindex 2ddec5c0ae17..000000000000\n--- a/yt_dlp/extractor/netverse.py\n+++ /dev/null\n@@ -1,281 +0,0 @@\n-import itertools\n-\n-from .common import InfoExtractor, SearchInfoExtractor\n-from .dailymotion import DailymotionIE\n-from ..utils import smuggle_url, traverse_obj\n-\n-\n-class NetverseBaseIE(InfoExtractor):\n- _ENDPOINTS = {\n- 'watch': 'watchvideo',\n- 'video': 'watchvideo',\n- 'webseries': 'webseries',\n- 'season': 'webseason_videos',\n- }\n-\n- def _call_api(self, slug, endpoint, query={}, season_id='', display_id=None):\n- return self._download_json(\n- f'https://api.netverse.id/medias/api/v2/{self._ENDPOINTS[endpoint]}/{slug}/{season_id}',\n- display_id or slug, query=query)\n-\n- def _get_comments(self, video_id):\n- last_page_number = None\n- for i in itertools.count(1):\n- comment_data = self._download_json(\n- f'https://api.netverse.id/mediadetails/api/v3/videos/comments/{video_id}',\n- video_id, data=b'', fatal=False, query={'page': i},\n- note=f'Downloading JSON comment metadata page {i}') or {}\n- yield from traverse_obj(comment_data, ('response', 'comments', 'data', ..., {\n- 'id': '_id',\n- 'text': 'comment',\n- 'author_id': 'customer_id',\n- 'author': ('customer', 'name'),\n- 'author_thumbnail': ('customer', 'profile_picture'),\n- }))\n-\n- if not last_page_number:\n- last_page_number = traverse_obj(comment_data, ('response', 'comments', 'last_page'))\n- if i >= (last_page_number or 0):\n- break\n-\n-\n-class NetverseIE(NetverseBaseIE):\n- _VALID_URL = r'https?://(?:\\w+\\.)?netverse\\.id/(?P<type>watch|video)/(?P<display_id>[^/?#&]+)'\n- _TESTS = [{\n- # Watch video\n- 'url': 'https://www.netverse.id/watch/waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\n- 'info_dict': {\n- 'id': 'k4yhqUwINAGtmHx3NkL',\n- 'title': 'Waktu Indonesia Bercanda - Edisi Spesial Lebaran 2016',\n- 'ext': 'mp4',\n- 'season': 'Season 2016',\n- 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 22,\n- 'episode': 'Episode 22',\n- 'uploader_id': 'x2ir3vq',\n- 'age_limit': 0,\n- 'tags': [],\n- 'view_count': int,\n- 'display_id': 'waktu-indonesia-bercanda-edisi-spesial-lebaran-2016',\n- 'duration': 2990,\n- 'upload_date': '20210722',\n- 'timestamp': 1626919804,\n- 'like_count': int,\n- 'uploader': 'Net Prime',\n- },\n- }, {\n- # series\n- 'url': 'https://www.netverse.id/watch/jadoo-seorang-model',\n- 'info_dict': {\n- 'id': 'x88izwc',\n- 'title': 'Jadoo Seorang Model',\n- 'ext': 'mp4',\n- 'season': 'Season 2',\n- 'description': 'md5:8a74f70812cca267e19ee0635f0af835',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 2,\n- 'episode': 'Episode 2',\n- 'view_count': int,\n- 'like_count': int,\n- 'display_id': 'jadoo-seorang-model',\n- 'uploader_id': 'x2ir3vq',\n- 'duration': 635,\n- 'timestamp': 1646372927,\n- 'tags': ['PG069497-hellojadooseason2eps2'],\n- 'upload_date': '20220304',\n- 'uploader': 'Net Prime',\n- 'age_limit': 0,\n- },\n- 'skip': 'video get Geo-blocked for some country',\n- }, {\n- # non www host\n- 'url': 'https://netverse.id/watch/tetangga-baru',\n- 'info_dict': {\n- 'id': 'k4CNGz7V0HJ7vfwZbXy',\n- 'ext': 'mp4',\n- 'title': 'Tetangga Baru',\n- 'season': 'Season 1',\n- 'description': 'md5:23fcf70e97d461d3029d25d59b2ccfb9',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'timestamp': 1624538169,\n- 'view_count': int,\n- 'upload_date': '20210624',\n- 'age_limit': 0,\n- 'uploader_id': 'x2ir3vq',\n- 'like_count': int,\n- 'uploader': 'Net Prime',\n- 'tags': ['PG008534', 'tetangga', 'Baru'],\n- 'display_id': 'tetangga-baru',\n- 'duration': 1406,\n- },\n- }, {\n- # /video url\n- 'url': 'https://www.netverse.id/video/pg067482-hellojadoo-season1',\n- 'title': 'Namaku Choi Jadoo',\n- 'info_dict': {\n- 'id': 'x887jzz',\n- 'ext': 'mp4',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'season': 'Season 1',\n- 'episode_number': 1,\n- 'description': 'md5:d4f627b3e7a3f9acdc55f6cdd5ea41d5',\n- 'title': 'Namaku Choi Jadoo',\n- 'episode': 'Episode 1',\n- 'age_limit': 0,\n- 'like_count': int,\n- 'view_count': int,\n- 'tags': ['PG067482', 'PG067482-HelloJadoo-season1'],\n- 'duration': 780,\n- 'display_id': 'pg067482-hellojadoo-season1',\n- 'uploader_id': 'x2ir3vq',\n- 'uploader': 'Net Prime',\n- 'timestamp': 1645764984,\n- 'upload_date': '20220225',\n- },\n- 'skip': 'This video get Geo-blocked for some country',\n- }, {\n- # video with comments\n- 'url': 'https://netverse.id/video/episode-1-season-2016-ok-food',\n- 'info_dict': {\n- 'id': 'k6hetBPiQMljSxxvAy7',\n- 'ext': 'mp4',\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'display_id': 'episode-1-season-2016-ok-food',\n- 'like_count': int,\n- 'description': '',\n- 'duration': 1471,\n- 'age_limit': 0,\n- 'timestamp': 1642405848,\n- 'episode_number': 1,\n- 'season': 'Season 2016',\n- 'uploader_id': 'x2ir3vq',\n- 'title': 'Episode 1 - Season 2016 - Ok Food',\n- 'upload_date': '20220117',\n- 'tags': [],\n- 'view_count': int,\n- 'episode': 'Episode 1',\n- 'uploader': 'Net Prime',\n- 'comment_count': int,\n- },\n- 'params': {\n- 'getcomments': True,\n- },\n- }, {\n- # video with multiple page comment\n- 'url': 'https://netverse.id/video/match-island-eps-1-fix',\n- 'info_dict': {\n- 'id': 'x8aznjc',\n- 'ext': 'mp4',\n- 'like_count': int,\n- 'tags': ['Match-Island', 'Pd00111'],\n- 'display_id': 'match-island-eps-1-fix',\n- 'view_count': int,\n- 'episode': 'Episode 1',\n- 'uploader': 'Net Prime',\n- 'duration': 4070,\n- 'timestamp': 1653068165,\n- 'description': 'md5:e9cf3b480ad18e9c33b999e3494f223f',\n- 'age_limit': 0,\n- 'title': 'Welcome To Match Island',\n- 'upload_date': '20220520',\n- 'episode_number': 1,\n- 'thumbnail': r're:https?://s\\d+\\.dmcdn\\.net/v/[^/]+/x1080',\n- 'uploader_id': 'x2ir3vq',\n- 'season': 'Season 1',\n- 'comment_count': int,\n- },\n- 'params': {\n- 'getcomments': True,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\n- program_json = self._call_api(display_id, sites_type)\n- videos = program_json['response']['videos']\n-\n- return {\n- '_type': 'url_transparent',\n- 'ie_key': DailymotionIE.ie_key(),\n- 'url': smuggle_url(videos['dailymotion_url'], {'query': {'embedder': 'https://www.netverse.id'}}),\n- 'display_id': display_id,\n- 'title': videos.get('title'),\n- 'season': videos.get('season_name'),\n- 'thumbnail': traverse_obj(videos, ('program_detail', 'thumbnail_image')),\n- 'description': traverse_obj(videos, ('program_detail', 'description')),\n- 'episode_number': videos.get('episode_order'),\n- '__post_extractor': self.extract_comments(display_id),\n- }\n-\n-\n-class NetversePlaylistIE(NetverseBaseIE):\n- _VALID_URL = r'https?://(?:\\w+\\.)?netverse\\.id/(?P<type>webseries)/(?P<display_id>[^/?#&]+)'\n- _TESTS = [{\n- # multiple season\n- 'url': 'https://netverse.id/webseries/tetangga-masa-gitu',\n- 'info_dict': {\n- 'id': 'tetangga-masa-gitu',\n- 'title': 'Tetangga Masa Gitu',\n- },\n- 'playlist_count': 519,\n- }, {\n- # single season\n- 'url': 'https://netverse.id/webseries/kelas-internasional',\n- 'info_dict': {\n- 'id': 'kelas-internasional',\n- 'title': 'Kelas Internasional',\n- },\n- 'playlist_count': 203,\n- }]\n-\n- def parse_playlist(self, json_data, playlist_id):\n- slug_sample = traverse_obj(json_data, ('related', 'data', ..., 'slug'))[0]\n- for season in traverse_obj(json_data, ('seasons', ..., 'id')):\n- playlist_json = self._call_api(\n- slug_sample, 'season', display_id=playlist_id, season_id=season)\n-\n- for current_page in range(playlist_json['response']['season_list']['last_page']):\n- playlist_json = self._call_api(slug_sample, 'season', query={'page': current_page + 1},\n- season_id=season, display_id=playlist_id)\n- for slug in traverse_obj(playlist_json, ('response', ..., 'data', ..., 'slug')):\n- yield self.url_result(f'https://www.netverse.id/video/{slug}', NetverseIE)\n-\n- def _real_extract(self, url):\n- playlist_id, sites_type = self._match_valid_url(url).group('display_id', 'type')\n- playlist_data = self._call_api(playlist_id, sites_type)\n-\n- return self.playlist_result(\n- self.parse_playlist(playlist_data['response'], playlist_id),\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'slug')),\n- traverse_obj(playlist_data, ('response', 'webseries_info', 'title')))\n-\n-\n-class NetverseSearchIE(SearchInfoExtractor):\n- _SEARCH_KEY = 'netsearch'\n-\n- _TESTS = [{\n- 'url': 'netsearch10:tetangga',\n- 'info_dict': {\n- 'id': 'tetangga',\n- 'title': 'tetangga',\n- },\n- 'playlist_count': 10,\n- }]\n-\n- def _search_results(self, query):\n- last_page = None\n- for i in itertools.count(1):\n- search_data = self._download_json(\n- 'https://api.netverse.id/search/elastic/search', query,\n- query={'q': query, 'page': i}, note=f'Downloading page {i}')\n-\n- videos = traverse_obj(search_data, ('response', 'data', ...))\n- for video in videos:\n- yield self.url_result(f'https://netverse.id/video/{video[\"slug\"]}', NetverseIE)\n-\n- last_page = last_page or traverse_obj(search_data, ('response', 'lastpage'))\n- if not videos or i >= (last_page or 0):\n- break\ndiff --git a/yt_dlp/extractor/nuum.py b/yt_dlp/extractor/nuum.py\ndeleted file mode 100644\nindex 697fc6b32e1c..000000000000\n--- a/yt_dlp/extractor/nuum.py\n+++ /dev/null\n@@ -1,201 +0,0 @@\n-import functools\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- OnDemandPagedList,\n- UserNotLive,\n- filter_dict,\n- int_or_none,\n- parse_iso8601,\n- str_or_none,\n- url_or_none,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class NuumBaseIE(InfoExtractor):\n- def _call_api(self, path, video_id, description, query={}):\n- response = self._download_json(\n- f'https://nuum.ru/api/v2/{path}', video_id, query=query,\n- note=f'Downloading {description} metadata',\n- errnote=f'Unable to download {description} metadata')\n- if error := response.get('error'):\n- raise ExtractorError(f'API returned error: {error!r}')\n- return response['result']\n-\n- def _get_channel_info(self, channel_name):\n- return self._call_api(\n- 'broadcasts/public', video_id=channel_name, description='channel',\n- query={\n- 'with_extra': 'true',\n- 'channel_name': channel_name,\n- 'with_deleted': 'true',\n- })\n-\n- def _parse_video_data(self, container, extract_formats=True):\n- stream = traverse_obj(container, ('media_container_streams', 0, {dict})) or {}\n- media = traverse_obj(stream, ('stream_media', 0, {dict})) or {}\n- media_url = traverse_obj(media, (\n- 'media_meta', ('media_archive_url', 'media_url'), {url_or_none}), get_all=False)\n-\n- video_id = str(container['media_container_id'])\n- is_live = media.get('media_status') == 'RUNNING'\n-\n- formats, subtitles = None, None\n- headers = {'Referer': 'https://nuum.ru/'}\n- if extract_formats:\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- media_url, video_id, 'mp4', live=is_live, headers=headers)\n-\n- return filter_dict({\n- 'id': video_id,\n- 'is_live': is_live,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'http_headers': headers,\n- **traverse_obj(container, {\n- 'title': ('media_container_name', {str}),\n- 'description': ('media_container_description', {str}),\n- 'timestamp': ('created_at', {parse_iso8601}),\n- 'channel': ('media_container_channel', 'channel_name', {str}),\n- 'channel_id': ('media_container_channel', 'channel_id', {str_or_none}),\n- }),\n- **traverse_obj(stream, {\n- 'view_count': ('stream_total_viewers', {int_or_none}),\n- 'concurrent_view_count': ('stream_current_viewers', {int_or_none}),\n- }),\n- **traverse_obj(media, {\n- 'duration': ('media_duration', {int_or_none}),\n- 'thumbnail': ('media_meta', ('media_preview_archive_url', 'media_preview_url'), {url_or_none}),\n- }, get_all=False),\n- })\n-\n-\n-class NuumMediaIE(NuumBaseIE):\n- IE_NAME = 'nuum:media'\n- _VALID_URL = r'https?://nuum\\.ru/(?:streams|videos|clips)/(?P<id>[\\d]+)'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/streams/1592713-7-days-to-die',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://nuum.ru/videos/1567547-toxi-hurtz',\n- 'md5': 'ce28837a5bbffe6952d7bfd3d39811b0',\n- 'info_dict': {\n- 'id': '1567547',\n- 'ext': 'mp4',\n- 'title': 'Toxi$ - Hurtz',\n- 'description': '',\n- 'timestamp': 1702631651,\n- 'upload_date': '20231215',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'view_count': int,\n- 'concurrent_view_count': int,\n- 'channel_id': '6911',\n- 'channel': 'toxis',\n- 'duration': 116,\n- },\n- }, {\n- 'url': 'https://nuum.ru/clips/1552564-pro-misu',\n- 'md5': 'b248ae1565b1e55433188f11beeb0ca1',\n- 'info_dict': {\n- 'id': '1552564',\n- 'ext': 'mp4',\n- 'title': 'ะัะพ ะะธัั ๐',\n- 'timestamp': 1701971828,\n- 'upload_date': '20231207',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'view_count': int,\n- 'concurrent_view_count': int,\n- 'channel_id': '3320',\n- 'channel': 'Misalelik',\n- 'duration': 41,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- video_data = self._call_api(f'media-containers/{video_id}', video_id, 'media')\n-\n- return self._parse_video_data(video_data)\n-\n-\n-class NuumLiveIE(NuumBaseIE):\n- IE_NAME = 'nuum:live'\n- _VALID_URL = r'https?://nuum\\.ru/channel/(?P<id>[^/#?]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/channel/mts_live',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- channel = self._match_id(url)\n- channel_info = self._get_channel_info(channel)\n- if traverse_obj(channel_info, ('channel', 'channel_is_live')) is False:\n- raise UserNotLive(video_id=channel)\n-\n- info = self._parse_video_data(channel_info['media_container'])\n- return {\n- 'webpage_url': f'https://nuum.ru/streams/{info[\"id\"]}',\n- 'extractor_key': NuumMediaIE.ie_key(),\n- 'extractor': NuumMediaIE.IE_NAME,\n- **info,\n- }\n-\n-\n-class NuumTabIE(NuumBaseIE):\n- IE_NAME = 'nuum:tab'\n- _VALID_URL = r'https?://nuum\\.ru/channel/(?P<id>[^/#?]+)/(?P<type>streams|videos|clips)'\n- _TESTS = [{\n- 'url': 'https://nuum.ru/channel/dankon_/clips',\n- 'info_dict': {\n- 'id': 'dankon__clips',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 29,\n- }, {\n- 'url': 'https://nuum.ru/channel/dankon_/videos',\n- 'info_dict': {\n- 'id': 'dankon__videos',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 2,\n- }, {\n- 'url': 'https://nuum.ru/channel/dankon_/streams',\n- 'info_dict': {\n- 'id': 'dankon__streams',\n- 'title': 'Dankon_',\n- },\n- 'playlist_mincount': 1,\n- }]\n-\n- _PAGE_SIZE = 50\n-\n- def _fetch_page(self, channel_id, tab_type, tab_id, page):\n- CONTAINER_TYPES = {\n- 'clips': ['SHORT_VIDEO', 'REVIEW_VIDEO'],\n- 'videos': ['LONG_VIDEO'],\n- 'streams': ['SINGLE'],\n- }\n-\n- media_containers = self._call_api(\n- 'media-containers', video_id=tab_id, description=f'{tab_type} tab page {page + 1}',\n- query={\n- 'limit': self._PAGE_SIZE,\n- 'offset': page * self._PAGE_SIZE,\n- 'channel_id': channel_id,\n- 'media_container_status': 'STOPPED',\n- 'media_container_type': CONTAINER_TYPES[tab_type],\n- })\n- for container in traverse_obj(media_containers, (..., {dict})):\n- metadata = self._parse_video_data(container, extract_formats=False)\n- yield self.url_result(f'https://nuum.ru/videos/{metadata[\"id\"]}', NuumMediaIE, **metadata)\n-\n- def _real_extract(self, url):\n- channel_name, tab_type = self._match_valid_url(url).group('id', 'type')\n- tab_id = f'{channel_name}_{tab_type}'\n- channel_data = self._get_channel_info(channel_name)['channel']\n-\n- return self.playlist_result(OnDemandPagedList(functools.partial(\n- self._fetch_page, channel_data['channel_id'], tab_type, tab_id), self._PAGE_SIZE),\n- playlist_id=tab_id, playlist_title=channel_data.get('channel_name'))\ndiff --git a/yt_dlp/extractor/onionstudios.py b/yt_dlp/extractor/onionstudios.py\ndeleted file mode 100644\nindex 7e30b2d33dcc..000000000000\n--- a/yt_dlp/extractor/onionstudios.py\n+++ /dev/null\n@@ -1,41 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import js_to_json\n-\n-\n-class OnionStudiosIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?onionstudios\\.com/(?:video(?:s/[^/]+-|/)|embed\\?.*\\bid=)(?P<id>\\d+)(?!-)'\n- _EMBED_REGEX = [r'(?s)<(?:iframe|bulbs-video)[^>]+?src=([\"\\'])(?P<url>(?:https?:)?//(?:www\\.)?onionstudios\\.com/(?:embed.+?|video/\\d+\\.json))\\1']\n-\n- _TESTS = [{\n- 'url': 'http://www.onionstudios.com/videos/hannibal-charges-forward-stops-for-a-cocktail-2937',\n- 'md5': '5a118d466d62b5cd03647cf2c593977f',\n- 'info_dict': {\n- 'id': '3459881',\n- 'ext': 'mp4',\n- 'title': 'Hannibal charges forward, stops for a cocktail',\n- 'description': 'md5:545299bda6abf87e5ec666548c6a9448',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'uploader': 'a.v. club',\n- 'upload_date': '20150619',\n- 'timestamp': 1434728546,\n- },\n- }, {\n- 'url': 'http://www.onionstudios.com/embed?id=2855&autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.onionstudios.com/video/6139.json',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- webpage = self._download_webpage(\n- 'http://onionstudios.com/embed/dc94dc2899fe644c0e7241fa04c1b732.js',\n- video_id)\n- mcp_id = str(self._parse_json(self._search_regex(\n- r'window\\.mcpMapping\\s*=\\s*({.+?});', webpage,\n- 'MCP Mapping'), video_id, js_to_json)[video_id]['mcp_id'])\n- return self.url_result(\n- 'http://kinja.com/ajax/inset/iframe?id=mcp-' + mcp_id,\n- 'KinjaEmbed', mcp_id)\ndiff --git a/yt_dlp/extractor/ora.py b/yt_dlp/extractor/ora.py\ndeleted file mode 100644\nindex c6ba4b0d3ea4..000000000000\n--- a/yt_dlp/extractor/ora.py\n+++ /dev/null\n@@ -1,72 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- get_element_by_attribute,\n- qualities,\n- unescapeHTML,\n-)\n-\n-\n-class OraTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?(?:ora\\.tv|unsafespeech\\.com)/([^/]+/)*(?P<id>[^/\\?#]+)'\n- _TESTS = [{\n- 'url': 'https://www.ora.tv/larrykingnow/2015/12/16/vine-youtube-stars-zach-king-king-bach-on-their-viral-videos-0_36jupg6090pq',\n- 'md5': 'fa33717591c631ec93b04b0e330df786',\n- 'info_dict': {\n- 'id': '50178',\n- 'ext': 'mp4',\n- 'title': 'Vine & YouTube Stars Zach King & King Bach On Their Viral Videos!',\n- 'description': 'md5:ebbc5b1424dd5dba7be7538148287ac1',\n- },\n- }, {\n- 'url': 'http://www.unsafespeech.com/video/2016/5/10/student-self-censorship-and-the-thought-police-on-university-campuses-0_6622bnkppw4d',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- video_data = self._search_regex(\n- r'\"(?:video|current)\"\\s*:\\s*({[^}]+?})', webpage, 'current video')\n- m3u8_url = self._search_regex(\n- r'hls_stream\"?\\s*:\\s*\"([^\"]+)', video_data, 'm3u8 url', None)\n- if m3u8_url:\n- formats = self._extract_m3u8_formats(\n- m3u8_url, display_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False)\n- # similar to GameSpotIE\n- m3u8_path = urllib.parse.urlparse(m3u8_url).path\n- QUALITIES_RE = r'((,[a-z]+\\d+)+,?)'\n- available_qualities = self._search_regex(\n- QUALITIES_RE, m3u8_path, 'qualities').strip(',').split(',')\n- http_path = m3u8_path[1:].split('/', 1)[1]\n- http_template = re.sub(QUALITIES_RE, r'%s', http_path)\n- http_template = http_template.replace('.csmil/master.m3u8', '')\n- http_template = urllib.parse.urljoin(\n- 'http://videocdn-pmd.ora.tv/', http_template)\n- preference = qualities(\n- ['mobile400', 'basic400', 'basic600', 'sd900', 'sd1200', 'sd1500', 'hd720', 'hd1080'])\n- for q in available_qualities:\n- formats.append({\n- 'url': http_template % q,\n- 'format_id': q,\n- 'quality': preference(q),\n- })\n- else:\n- return self.url_result(self._search_regex(\n- r'\"youtube_id\"\\s*:\\s*\"([^\"]+)', webpage, 'youtube id'), 'Youtube')\n-\n- return {\n- 'id': self._search_regex(\n- r'\"id\"\\s*:\\s*(\\d+)', video_data, 'video id', default=display_id),\n- 'display_id': display_id,\n- 'title': unescapeHTML(self._og_search_title(webpage)),\n- 'description': get_element_by_attribute(\n- 'class', 'video_txt_decription', webpage),\n- 'thumbnail': self._proto_relative_url(self._search_regex(\n- r'\"thumb\"\\s*:\\s*\"([^\"]+)', video_data, 'thumbnail', None)),\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/piramidetv.py b/yt_dlp/extractor/piramidetv.py\ndeleted file mode 100644\nindex 29afa9b4673e..000000000000\n--- a/yt_dlp/extractor/piramidetv.py\n+++ /dev/null\n@@ -1,99 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import parse_iso8601, smuggle_url, unsmuggle_url, url_or_none\n-from ..utils.traversal import traverse_obj\n-\n-\n-class PiramideTVIE(InfoExtractor):\n- _VALID_URL = r'https?://piramide\\.tv/video/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://piramide.tv/video/wWtBAORdJUTh',\n- 'info_dict': {\n- 'id': 'wWtBAORdJUTh',\n- 'ext': 'mp4',\n- 'title': 'md5:79f9c8183ea6a35c836923142cf0abcc',\n- 'description': '',\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/W86PgQDn/thumbnails/B9gpIxkH.jpg',\n- 'channel': 'Leรณn Picarรณn',\n- 'channel_id': 'leonpicaron',\n- 'timestamp': 1696460362,\n- 'upload_date': '20231004',\n- },\n- }, {\n- 'url': 'https://piramide.tv/video/wcYn6li79NgN',\n- 'info_dict': {\n- 'id': 'wcYn6li79NgN',\n- 'ext': 'mp4',\n- 'title': 'ACEPTO TENER UN BEBE CON MI NOVIA\\u2026? | Parte 1',\n- 'description': '',\n- 'channel': 'ARTA GAME',\n- 'channel_id': 'arta_game',\n- 'thumbnail': 'https://cdn.jwplayer.com/v2/media/cnEdGp5X/thumbnails/rHAaWfP7.jpg',\n- 'timestamp': 1703434976,\n- 'upload_date': '20231224',\n- },\n- }]\n-\n- def _extract_video(self, video_id):\n- video_data = self._download_json(\n- f'https://hermes.piramide.tv/video/data/{video_id}', video_id, fatal=False)\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- f'https://cdn.piramide.tv/video/{video_id}/manifest.m3u8', video_id, fatal=False)\n- next_video = traverse_obj(video_data, ('video', 'next_video', 'id', {str}))\n- return next_video, {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- **traverse_obj(video_data, ('video', {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'thumbnail': ('media', 'thumbnail', {url_or_none}),\n- 'channel': ('channel', 'name', {str}),\n- 'channel_id': ('channel', 'id', {str}),\n- 'timestamp': ('date', {parse_iso8601}),\n- })),\n- }\n-\n- def _entries(self, video_id):\n- visited = set()\n- while True:\n- visited.add(video_id)\n- next_video, info = self._extract_video(video_id)\n- yield info\n- if not next_video or next_video in visited:\n- break\n- video_id = next_video\n-\n- def _real_extract(self, url):\n- url, smuggled_data = unsmuggle_url(url, {})\n- video_id = self._match_id(url)\n- if self._yes_playlist(video_id, video_id, smuggled_data):\n- return self.playlist_result(self._entries(video_id), video_id)\n- return self._extract_video(video_id)[1]\n-\n-\n-class PiramideTVChannelIE(InfoExtractor):\n- _VALID_URL = r'https?://piramide\\.tv/channel/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://piramide.tv/channel/thekalo',\n- 'playlist_mincount': 10,\n- 'info_dict': {\n- 'id': 'thekalo',\n- },\n- }]\n-\n- def _entries(self, channel_name):\n- videos = self._download_json(\n- f'https://hermes.piramide.tv/channel/list/{channel_name}/date/100000', channel_name)\n- for video in traverse_obj(videos, ('videos', lambda _, v: v['id'])):\n- yield self.url_result(smuggle_url(\n- f'https://piramide.tv/video/{video[\"id\"]}', {'force_noplaylist': True}),\n- **traverse_obj(video, {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- }))\n-\n- def _real_extract(self, url):\n- channel_name = self._match_id(url)\n- return self.playlist_result(self._entries(channel_name), channel_name)\ndiff --git a/yt_dlp/extractor/planetmarathi.py b/yt_dlp/extractor/planetmarathi.py\ndeleted file mode 100644\nindex 94861836a3b0..000000000000\n--- a/yt_dlp/extractor/planetmarathi.py\n+++ /dev/null\n@@ -1,72 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- try_get,\n- unified_strdate,\n-)\n-\n-\n-class PlanetMarathiIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?planetmarathi\\.com/titles/(?P<id>[^/#&?$]+)'\n- _TESTS = [{\n- 'url': 'https://www.planetmarathi.com/titles/ek-unad-divas',\n- 'playlist_mincount': 2,\n- 'info_dict': {\n- 'id': 'ek-unad-divas',\n- },\n- 'playlist': [{\n- 'info_dict': {\n- 'id': 'ASSETS-MOVIE-ASSET-01_ek-unad-divas',\n- 'ext': 'mp4',\n- 'title': 'ek unad divas',\n- 'alt_title': 'เคเคฟเคคเฅเคฐเคชเค',\n- 'description': 'md5:41c7ed6b041c2fea9820a3f3125bd881',\n- 'episode_number': 1,\n- 'duration': 5539,\n- 'upload_date': '20210829',\n- },\n- }], # Trailer skipped\n- }, {\n- 'url': 'https://www.planetmarathi.com/titles/baap-beep-baap-season-1',\n- 'playlist_mincount': 10,\n- 'info_dict': {\n- 'id': 'baap-beep-baap-season-1',\n- },\n- 'playlist': [{\n- 'info_dict': {\n- 'id': 'ASSETS-CHARACTER-PROFILE-SEASON-01-ASSET-01_baap-beep-baap-season-1',\n- 'ext': 'mp4',\n- 'title': 'Manohar Kanhere',\n- 'alt_title': 'เคฎเคจเฅเคนเคฐ เคเคพเคจเฅเคนเฅเคฐเฅ',\n- 'description': 'md5:285ed45d5c0ab5522cac9a043354ebc6',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'duration': 29,\n- 'upload_date': '20210829',\n- },\n- }], # Trailers, Episodes, other Character profiles skipped\n- }]\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n- entries = []\n- json_data = self._download_json(\n- f'https://www.planetmarathi.com/api/v1/titles/{playlist_id}/assets', playlist_id)['assets']\n- for asset in json_data:\n- asset_title = asset['mediaAssetName']['en']\n- if asset_title == 'Movie':\n- asset_title = playlist_id.replace('-', ' ')\n- asset_id = f'{asset[\"sk\"]}_{playlist_id}'.replace('#', '-')\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(asset['mediaAssetURL'], asset_id)\n- entries.append({\n- 'id': asset_id,\n- 'title': asset_title,\n- 'alt_title': try_get(asset, lambda x: x['mediaAssetName']['mr']),\n- 'description': try_get(asset, lambda x: x['mediaAssetDescription']['en']),\n- 'season_number': asset.get('mediaAssetSeason'),\n- 'episode_number': asset.get('mediaAssetIndexForAssetType'),\n- 'duration': asset.get('mediaAssetDurationInSeconds'),\n- 'upload_date': unified_strdate(asset.get('created')),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- })\n- return self.playlist_result(entries, playlist_id=playlist_id)\ndiff --git a/yt_dlp/extractor/playplustv.py b/yt_dlp/extractor/playplustv.py\ndeleted file mode 100644\nindex a4439c8bc53a..000000000000\n--- a/yt_dlp/extractor/playplustv.py\n+++ /dev/null\n@@ -1,100 +0,0 @@\n-import json\n-\n-from .common import InfoExtractor\n-from ..networking import PUTRequest\n-from ..networking.exceptions import HTTPError\n-from ..utils import ExtractorError, clean_html, int_or_none\n-\n-\n-class PlayPlusTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?playplus\\.(?:com|tv)/VOD/(?P<project_id>[0-9]+)/(?P<id>[0-9a-f]{32})'\n- _TEST = {\n- 'url': 'https://www.playplus.tv/VOD/7572/db8d274a5163424e967f35a30ddafb8e',\n- 'md5': 'd078cb89d7ab6b9df37ce23c647aef72',\n- 'info_dict': {\n- 'id': 'db8d274a5163424e967f35a30ddafb8e',\n- 'ext': 'mp4',\n- 'title': 'Capรญtulo 179 - Final',\n- 'description': 'md5:01085d62d8033a1e34121d3c3cabc838',\n- 'timestamp': 1529992740,\n- 'upload_date': '20180626',\n- },\n- 'skip': 'Requires account credential',\n- }\n- _NETRC_MACHINE = 'playplustv'\n- _GEO_COUNTRIES = ['BR']\n- _token = None\n- _profile_id = None\n-\n- def _call_api(self, resource, video_id=None, query=None):\n- return self._download_json('https://api.playplus.tv/api/media/v2/get' + resource, video_id, headers={\n- 'Authorization': 'Bearer ' + self._token,\n- }, query=query)\n-\n- def _perform_login(self, username, password):\n- req = PUTRequest(\n- 'https://api.playplus.tv/api/web/login', json.dumps({\n- 'email': username,\n- 'password': password,\n- }).encode(), {\n- 'Content-Type': 'application/json; charset=utf-8',\n- })\n-\n- try:\n- self._token = self._download_json(req, None)['token']\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError) and e.cause.status == 401:\n- raise ExtractorError(self._parse_json(\n- e.cause.response.read(), None)['errorMessage'], expected=True)\n- raise\n-\n- self._profile = self._call_api('Profiles')['list'][0]['_id']\n-\n- def _real_initialize(self):\n- if not self._token:\n- self.raise_login_required(method='password')\n-\n- def _real_extract(self, url):\n- project_id, media_id = self._match_valid_url(url).groups()\n- media = self._call_api(\n- 'Media', media_id, {\n- 'profileId': self._profile,\n- 'projectId': project_id,\n- 'mediaId': media_id,\n- })['obj']\n- title = media['title']\n-\n- formats = []\n- for f in media.get('files', []):\n- f_url = f.get('url')\n- if not f_url:\n- continue\n- file_info = f.get('fileInfo') or {}\n- formats.append({\n- 'url': f_url,\n- 'width': int_or_none(file_info.get('width')),\n- 'height': int_or_none(file_info.get('height')),\n- })\n-\n- thumbnails = []\n- for thumb in media.get('thumbs', []):\n- thumb_url = thumb.get('url')\n- if not thumb_url:\n- continue\n- thumbnails.append({\n- 'url': thumb_url,\n- 'width': int_or_none(thumb.get('width')),\n- 'height': int_or_none(thumb.get('height')),\n- })\n-\n- return {\n- 'id': media_id,\n- 'title': title,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- 'description': clean_html(media.get('description')) or media.get('shortDescription'),\n- 'timestamp': int_or_none(media.get('publishDate'), 1000),\n- 'view_count': int_or_none(media.get('numberOfViews')),\n- 'comment_count': int_or_none(media.get('numberOfComments')),\n- 'tags': media.get('tags'),\n- }\ndiff --git a/yt_dlp/extractor/playwire.py b/yt_dlp/extractor/playwire.py\ndeleted file mode 100644\nindex 2323bd0cf901..000000000000\n--- a/yt_dlp/extractor/playwire.py\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- dict_get,\n- float_or_none,\n-)\n-\n-\n-class PlaywireIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:config|cdn)\\.playwire\\.com(?:/v2)?/(?P<publisher_id>\\d+)/(?:videos/v2|embed|config)/(?P<id>\\d+)'\n- _EMBED_REGEX = [r'<script[^>]+data-config=([\"\\'])(?P<url>(?:https?:)?//config\\.playwire\\.com/.+?)\\1']\n-\n- _TESTS = [{\n- 'url': 'http://config.playwire.com/14907/videos/v2/3353705/player.json',\n- 'md5': 'e6398701e3595888125729eaa2329ed9',\n- 'info_dict': {\n- 'id': '3353705',\n- 'ext': 'mp4',\n- 'title': 'S04_RM_UCL_Rus',\n- 'thumbnail': r're:^https?://.*\\.png$',\n- 'duration': 145.94,\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- # m3u8 in f4m\n- 'url': 'http://config.playwire.com/21772/videos/v2/4840492/zeus.json',\n- 'info_dict': {\n- 'id': '4840492',\n- 'ext': 'mp4',\n- 'title': 'ITV EL SHOW FULL',\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- # Multiple resolutions while bitrates missing\n- 'url': 'http://cdn.playwire.com/11625/embed/85228.html',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://config.playwire.com/12421/videos/v2/3389892/zeus.json',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cdn.playwire.com/v2/12342/config/1532636.json',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.cinemablend.com/new/First-Joe-Dirt-2-Trailer-Teaser-Stupid-Greatness-70874.html',\n- 'info_dict': {\n- 'id': '3519514',\n- 'ext': 'mp4',\n- 'title': 'Joe Dirt 2 Beautiful Loser Teaser Trailer',\n- },\n- 'skip': 'Site no longer embeds Playwire',\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- publisher_id, video_id = mobj.group('publisher_id'), mobj.group('id')\n-\n- player = self._download_json(\n- f'http://config.playwire.com/{publisher_id}/videos/v2/{video_id}/zeus.json',\n- video_id)\n-\n- title = player['settings']['title']\n- duration = float_or_none(player.get('duration'), 1000)\n-\n- content = player['content']\n- thumbnail = content.get('poster')\n- src = content['media']['f4m']\n-\n- formats = self._extract_f4m_formats(src, video_id, m3u8_id='hls')\n- for a_format in formats:\n- if not dict_get(a_format, ['tbr', 'width', 'height']):\n- a_format['quality'] = 1 if '-hd.' in a_format['url'] else 0\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'thumbnail': thumbnail,\n- 'duration': duration,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/plvideo.py b/yt_dlp/extractor/plvideo.py\ndeleted file mode 100644\nindex 27009ca4cd83..000000000000\n--- a/yt_dlp/extractor/plvideo.py\n+++ /dev/null\n@@ -1,130 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- parse_iso8601,\n- parse_resolution,\n- url_or_none,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class PlVideoIE(InfoExtractor):\n- IE_DESC = 'ะะปะฐััะพัะผะฐ'\n- _VALID_URL = r'https?://(?:www\\.)?plvideo\\.ru/(?:watch\\?(?:[^#]+&)?v=|shorts/)(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://plvideo.ru/watch?v=Y5JzUzkcQTMK',\n- 'md5': 'fe8e18aca892b3b31f3bf492169f8a26',\n- 'info_dict': {\n- 'id': 'Y5JzUzkcQTMK',\n- 'ext': 'mp4',\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-images/v/cover/37/dd/37dd00a4c96c77436ab737e85947abd7/original663a4a3bb713e5.33151959.jpg',\n- 'title': 'Presidente de Cuba llega a Moscรบ en una visita de trabajo',\n- 'channel': 'RT en Espaรฑol',\n- 'channel_id': 'ZH4EKqunVDvo',\n- 'media_type': 'video',\n- 'comment_count': int,\n- 'tags': ['rusia', 'cuba', 'russia', 'miguel dรญaz-canel'],\n- 'description': 'md5:a1a395d900d77a86542a91ee0826c115',\n- 'release_timestamp': 1715096124,\n- 'channel_is_verified': True,\n- 'like_count': int,\n- 'timestamp': 1715095911,\n- 'duration': 44320,\n- 'view_count': int,\n- 'dislike_count': int,\n- 'upload_date': '20240507',\n- 'modified_date': '20240701',\n- 'channel_follower_count': int,\n- 'modified_timestamp': 1719824073,\n- },\n- }, {\n- 'url': 'https://plvideo.ru/shorts/S3Uo9c-VLwFX',\n- 'md5': '7d8fa2279406c69d2fd2a6fc548a9805',\n- 'info_dict': {\n- 'id': 'S3Uo9c-VLwFX',\n- 'ext': 'mp4',\n- 'channel': 'Romaatom',\n- 'tags': 'count:22',\n- 'dislike_count': int,\n- 'upload_date': '20241130',\n- 'description': 'md5:452e6de219bf2f32bb95806c51c3b364',\n- 'duration': 58433,\n- 'modified_date': '20241130',\n- 'thumbnail': 'https://img.plvideo.ru/images/fp-2024-11-cover/S3Uo9c-VLwFX/f9318999-a941-482b-b700-2102a7049366.jpg',\n- 'media_type': 'shorts',\n- 'like_count': int,\n- 'modified_timestamp': 1732961458,\n- 'channel_is_verified': True,\n- 'channel_id': 'erJyyTIbmUd1',\n- 'timestamp': 1732961355,\n- 'comment_count': int,\n- 'title': 'ะะตะปะพััะพะฒ ะพัะผะตะฝะธะป ะฟัะธะบะฐะทั ะพ ะบะฐะดัะพะฒะพะผ ัะตะทะตัะฒะต ะฝะฐ ะณัะฐะถะดะฐะฝัะบะพะน ัะปัะถะฑะต',\n- 'channel_follower_count': int,\n- 'view_count': int,\n- 'release_timestamp': 1732961458,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- video_data = self._download_json(\n- f'https://api.g1.plvideo.ru/v1/videos/{video_id}?Aud=18', video_id)\n-\n- is_live = False\n- formats = []\n- subtitles = {}\n- automatic_captions = {}\n- for quality, data in traverse_obj(video_data, ('item', 'profiles', {dict.items}, lambda _, v: url_or_none(v[1]['hls']))):\n- formats.append({\n- 'format_id': quality,\n- 'ext': 'mp4',\n- 'protocol': 'm3u8_native',\n- **traverse_obj(data, {\n- 'url': 'hls',\n- 'fps': ('fps', {float_or_none}),\n- 'aspect_ratio': ('aspectRatio', {float_or_none}),\n- }),\n- **parse_resolution(quality),\n- })\n- if livestream_url := traverse_obj(video_data, ('item', 'livestream', 'url', {url_or_none})):\n- is_live = True\n- formats.extend(self._extract_m3u8_formats(livestream_url, video_id, 'mp4', live=True))\n- for lang, url in traverse_obj(video_data, ('item', 'subtitles', {dict.items}, lambda _, v: url_or_none(v[1]))):\n- if lang.endswith('-auto'):\n- automatic_captions.setdefault(lang[:-5], []).append({\n- 'url': url,\n- })\n- else:\n- subtitles.setdefault(lang, []).append({\n- 'url': url,\n- })\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'automatic_captions': automatic_captions,\n- 'is_live': is_live,\n- **traverse_obj(video_data, ('item', {\n- 'id': ('id', {str}),\n- 'title': ('title', {str}),\n- 'description': ('description', {str}),\n- 'thumbnail': ('cover', 'paths', 'original', 'src', {url_or_none}),\n- 'duration': ('uploadFile', 'videoDuration', {int_or_none}),\n- 'channel': ('channel', 'name', {str}),\n- 'channel_id': ('channel', 'id', {str}),\n- 'channel_follower_count': ('channel', 'stats', 'subscribers', {int_or_none}),\n- 'channel_is_verified': ('channel', 'verified', {bool}),\n- 'tags': ('tags', ..., {str}),\n- 'timestamp': ('createdAt', {parse_iso8601}),\n- 'release_timestamp': ('publishedAt', {parse_iso8601}),\n- 'modified_timestamp': ('updatedAt', {parse_iso8601}),\n- 'view_count': ('stats', 'viewTotalCount', {int_or_none}),\n- 'like_count': ('stats', 'likeCount', {int_or_none}),\n- 'dislike_count': ('stats', 'dislikeCount', {int_or_none}),\n- 'comment_count': ('stats', 'commentCount', {int_or_none}),\n- 'media_type': ('type', {str}),\n- })),\n- }\ndiff --git a/yt_dlp/extractor/prosiebensat1.py b/yt_dlp/extractor/prosiebensat1.py\ndeleted file mode 100644\nindex e8a47120513b..000000000000\n--- a/yt_dlp/extractor/prosiebensat1.py\n+++ /dev/null\n@@ -1,496 +0,0 @@\n-import hashlib\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- determine_ext,\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- merge_dicts,\n- unified_strdate,\n-)\n-\n-\n-class ProSiebenSat1BaseIE(InfoExtractor):\n- _GEO_BYPASS = False\n- _ACCESS_ID = None\n- _SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'\n- _V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'\n-\n- def _extract_video_info(self, url, clip_id):\n- client_location = url\n-\n- video = self._download_json(\n- 'http://vas.sim-technik.de/vas/live/v2/videos',\n- clip_id, 'Downloading videos JSON', query={\n- 'access_token': self._TOKEN,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- 'ids': clip_id,\n- })[0]\n-\n- if not self.get_param('allow_unplayable_formats') and video.get('is_protected') is True:\n- self.report_drm(clip_id)\n-\n- formats = []\n- if self._ACCESS_ID:\n- raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID\n- protocols = self._download_json(\n- self._V4_BASE_URL + 'protocols', clip_id,\n- 'Downloading protocols JSON',\n- headers=self.geo_verification_headers(), query={\n- 'access_id': self._ACCESS_ID,\n- 'client_token': hashlib.sha1((raw_ct).encode()).hexdigest(),\n- 'video_id': clip_id,\n- }, fatal=False, expected_status=(403,)) or {}\n- error = protocols.get('error') or {}\n- if error.get('title') == 'Geo check failed':\n- self.raise_geo_restricted(countries=['AT', 'CH', 'DE'])\n- server_token = protocols.get('server_token')\n- if server_token:\n- urls = (self._download_json(\n- self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={\n- 'access_id': self._ACCESS_ID,\n- 'client_token': hashlib.sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),\n- 'protocols': self._SUPPORTED_PROTOCOLS,\n- 'server_token': server_token,\n- 'video_id': clip_id,\n- }, fatal=False) or {}).get('urls') or {}\n- for protocol, variant in urls.items():\n- source_url = variant.get('clear', {}).get('url')\n- if not source_url:\n- continue\n- if protocol == 'dash':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id=protocol, fatal=False))\n- elif protocol == 'hls':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id=protocol, fatal=False))\n- else:\n- formats.append({\n- 'url': source_url,\n- 'format_id': protocol,\n- })\n- if not formats:\n- source_ids = [str(source['id']) for source in video['sources']]\n-\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\n-\n- sources = self._download_json(\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources',\n- clip_id, 'Downloading sources JSON', query={\n- 'access_token': self._TOKEN,\n- 'client_id': client_id,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- })\n- server_id = sources['server_id']\n-\n- def fix_bitrate(bitrate):\n- bitrate = int_or_none(bitrate)\n- if not bitrate:\n- return None\n- return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate\n-\n- for source_id in source_ids:\n- client_id = self._SALT[:2] + hashlib.sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()\n- urls = self._download_json(\n- f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources/url',\n- clip_id, 'Downloading urls JSON', fatal=False, query={\n- 'access_token': self._TOKEN,\n- 'client_id': client_id,\n- 'client_location': client_location,\n- 'client_name': self._CLIENT_NAME,\n- 'server_id': server_id,\n- 'source_ids': source_id,\n- })\n- if not urls:\n- continue\n- if urls.get('status_code') != 0:\n- raise ExtractorError('This video is unavailable', expected=True)\n- urls_sources = urls['sources']\n- if isinstance(urls_sources, dict):\n- urls_sources = urls_sources.values()\n- for source in urls_sources:\n- source_url = source.get('url')\n- if not source_url:\n- continue\n- protocol = source.get('protocol')\n- mimetype = source.get('mimetype')\n- if mimetype == 'application/f4m+xml' or 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m':\n- formats.extend(self._extract_f4m_formats(\n- source_url, clip_id, f4m_id='hds', fatal=False))\n- elif mimetype == 'application/x-mpegURL':\n- formats.extend(self._extract_m3u8_formats(\n- source_url, clip_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n- elif mimetype == 'application/dash+xml':\n- formats.extend(self._extract_mpd_formats(\n- source_url, clip_id, mpd_id='dash', fatal=False))\n- else:\n- tbr = fix_bitrate(source['bitrate'])\n- if protocol in ('rtmp', 'rtmpe'):\n- mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source_url)\n- if not mobj:\n- continue\n- path = mobj.group('path')\n- mp4colon_index = path.rfind('mp4:')\n- app = path[:mp4colon_index]\n- play_path = path[mp4colon_index:]\n- formats.append({\n- 'url': '{}/{}'.format(mobj.group('url'), app),\n- 'app': app,\n- 'play_path': play_path,\n- 'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',\n- 'page_url': 'http://www.prosieben.de',\n- 'tbr': tbr,\n- 'ext': 'flv',\n- 'format_id': join_nonempty('rtmp', tbr),\n- })\n- else:\n- formats.append({\n- 'url': source_url,\n- 'tbr': tbr,\n- 'format_id': join_nonempty('http', tbr),\n- })\n-\n- return {\n- 'duration': float_or_none(video.get('duration')),\n- 'formats': formats,\n- }\n-\n-\n-class ProSiebenSat1IE(ProSiebenSat1BaseIE):\n- IE_NAME = 'prosiebensat1'\n- IE_DESC = 'ProSiebenSat.1 Digital'\n- _VALID_URL = r'''(?x)\n- https?://\n- (?:www\\.)?\n- (?:\n- (?:beta\\.)?\n- (?:\n- prosieben(?:maxx)?|sixx|sat1(?:gold)?|kabeleins(?:doku)?|the-voice-of-germany|advopedia\n- )\\.(?:de|at|ch)|\n- ran\\.de|fem\\.com|advopedia\\.de|galileo\\.tv/video\n- )\n- /(?P<id>.+)\n- '''\n-\n- _TESTS = [\n- {\n- # Tests changes introduced in https://github.com/ytdl-org/youtube-dl/pull/6242\n- # in response to fixing https://github.com/ytdl-org/youtube-dl/issues/6215:\n- # - malformed f4m manifest support\n- # - proper handling of URLs starting with `https?://` in 2.0 manifests\n- # - recursive child f4m manifests extraction\n- 'url': 'http://www.prosieben.de/tv/circus-halligalli/videos/218-staffel-2-episode-18-jahresrueckblick-ganze-folge',\n- 'info_dict': {\n- 'id': '2104602',\n- 'ext': 'mp4',\n- 'title': 'CIRCUS HALLIGALLI - Episode 18 - Staffel 2',\n- 'description': 'md5:8733c81b702ea472e069bc48bb658fc1',\n- 'upload_date': '20131231',\n- 'duration': 5845.04,\n- 'series': 'CIRCUS HALLIGALLI',\n- 'season_number': 2,\n- 'episode': 'Episode 18 - Staffel 2',\n- 'episode_number': 18,\n- },\n- },\n- {\n- 'url': 'http://www.prosieben.de/videokatalog/Gesellschaft/Leben/Trends/video-Lady-Umstyling-f%C3%BCr-Audrina-Rebekka-Audrina-Fergen-billig-aussehen-Battal-Modica-700544.html',\n- 'info_dict': {\n- 'id': '2570327',\n- 'ext': 'mp4',\n- 'title': 'Lady-Umstyling fรผr Audrina',\n- 'description': 'md5:4c16d0c17a3461a0d43ea4084e96319d',\n- 'upload_date': '20131014',\n- 'duration': 606.76,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'Seems to be broken',\n- },\n- {\n- 'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge',\n- 'info_dict': {\n- 'id': '2429369',\n- 'ext': 'mp4',\n- 'title': 'Countdown fรผr die Autowerkstatt',\n- 'description': 'md5:809fc051a457b5d8666013bc40698817',\n- 'upload_date': '20140223',\n- 'duration': 2595.04,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.sixx.de/stars-style/video/sexy-laufen-in-ugg-boots-clip',\n- 'info_dict': {\n- 'id': '2904997',\n- 'ext': 'mp4',\n- 'title': 'Sexy laufen in Ugg Boots',\n- 'description': 'md5:edf42b8bd5bc4e5da4db4222c5acb7d6',\n- 'upload_date': '20140122',\n- 'duration': 245.32,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.sat1.de/film/der-ruecktritt/video/im-interview-kai-wiesinger-clip',\n- 'info_dict': {\n- 'id': '2906572',\n- 'ext': 'mp4',\n- 'title': 'Im Interview: Kai Wiesinger',\n- 'description': 'md5:e4e5370652ec63b95023e914190b4eb9',\n- 'upload_date': '20140203',\n- 'duration': 522.56,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.kabeleins.de/tv/rosins-restaurants/videos/jagd-auf-fertigkost-im-elsthal-teil-2-ganze-folge',\n- 'info_dict': {\n- 'id': '2992323',\n- 'ext': 'mp4',\n- 'title': 'Jagd auf Fertigkost im Elsthal - Teil 2',\n- 'description': 'md5:2669cde3febe9bce13904f701e774eb6',\n- 'upload_date': '20141014',\n- 'duration': 2410.44,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.ran.de/fussball/bundesliga/video/schalke-toennies-moechte-raul-zurueck-ganze-folge',\n- 'info_dict': {\n- 'id': '3004256',\n- 'ext': 'mp4',\n- 'title': 'Schalke: Tรถnnies mรถchte Raul zurรผck',\n- 'description': 'md5:4b5b271d9bcde223b54390754c8ece3f',\n- 'upload_date': '20140226',\n- 'duration': 228.96,\n- },\n- 'params': {\n- # rtmp download\n- 'skip_download': True,\n- },\n- 'skip': 'This video is unavailable',\n- },\n- {\n- 'url': 'http://www.the-voice-of-germany.de/video/31-andreas-kuemmert-rocket-man-clip',\n- 'info_dict': {\n- 'id': '2572814',\n- 'ext': 'mp4',\n- 'title': 'The Voice of Germany - Andreas Kรผmmert: Rocket Man',\n- 'description': 'md5:6ddb02b0781c6adf778afea606652e38',\n- 'timestamp': 1382041620,\n- 'upload_date': '20131017',\n- 'duration': 469.88,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- },\n- {\n- 'url': 'http://www.fem.com/videos/beauty-lifestyle/kurztrips-zum-valentinstag',\n- 'info_dict': {\n- 'id': '2156342',\n- 'ext': 'mp4',\n- 'title': 'Kurztrips zum Valentinstag',\n- 'description': 'Romantischer Kurztrip zum Valentinstag? Nina Heinemann verrรคt, was sich hier wirklich lohnt.',\n- 'duration': 307.24,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- },\n- {\n- 'url': 'http://www.prosieben.de/tv/joko-gegen-klaas/videos/playlists/episode-8-ganze-folge-playlist',\n- 'info_dict': {\n- 'id': '439664',\n- 'title': 'Episode 8 - Ganze Folge - Playlist',\n- 'description': 'md5:63b8963e71f481782aeea877658dec84',\n- },\n- 'playlist_count': 2,\n- 'skip': 'This video is unavailable',\n- },\n- {\n- # title in <h2 class=\"subtitle\">\n- 'url': 'http://www.prosieben.de/stars/oscar-award/videos/jetzt-erst-enthuellt-das-geheimnis-von-emma-stones-oscar-robe-clip',\n- 'info_dict': {\n- 'id': '4895826',\n- 'ext': 'mp4',\n- 'title': 'Jetzt erst enthรผllt: Das Geheimnis von Emma Stones Oscar-Robe',\n- 'description': 'md5:e5ace2bc43fadf7b63adc6187e9450b9',\n- 'upload_date': '20170302',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'geo restricted to Germany',\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'http://www.kabeleinsdoku.de/tv/mayday-alarm-im-cockpit/video/102-notlandung-im-hudson-river-ganze-folge',\n- 'only_matching': True,\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/video/11-staffel-1-episode-1-partner-wider-willen-ganze-folge',\n- 'only_matching': True,\n- },\n- {\n- # geo restricted to Germany\n- 'url': 'https://www.galileo.tv/video/diese-emojis-werden-oft-missverstanden',\n- 'only_matching': True,\n- },\n- {\n- 'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',\n- 'only_matching': True,\n- },\n- {\n- 'url': 'http://www.advopedia.de/videos/lenssen-klaert-auf/lenssen-klaert-auf-folge-8-staffel-3-feiertage-und-freie-tage',\n- 'only_matching': True,\n- },\n- ]\n-\n- _TOKEN = 'prosieben'\n- _SALT = '01!8d8F_)r9]4s[qeuXfP%'\n- _CLIENT_NAME = 'kolibri-2.0.19-splec4'\n-\n- _ACCESS_ID = 'x_prosiebenmaxx-de'\n- _ENCRYPTION_KEY = 'Eeyeey9oquahthainoofashoyoikosag'\n- _IV = 'Aeluchoc6aevechuipiexeeboowedaok'\n-\n- _CLIPID_REGEXES = [\n- r'\"clip_id\"\\s*:\\s+\"(\\d+)\"',\n- r'clipid: \"(\\d+)\"',\n- r'clip[iI]d=(\\d+)',\n- r'clip[iI][dD]\\s*=\\s*[\"\\'](\\d+)',\n- r\"'itemImageUrl'\\s*:\\s*'/dynamic/thumbnails/full/\\d+/(\\d+)\",\n- r'proMamsId"\\s*:\\s*"(\\d+)',\n- r'proMamsId\"\\s*:\\s*\"(\\d+)',\n- ]\n- _TITLE_REGEXES = [\n- r'<h2 class=\"subtitle\" itemprop=\"name\">\\s*(.+?)</h2>',\n- r'<header class=\"clearfix\">\\s*<h3>(.+?)</h3>',\n- r'<!-- start video -->\\s*<h1>(.+?)</h1>',\n- r'<h1 class=\"att-name\">\\s*(.+?)</h1>',\n- r'<header class=\"module_header\">\\s*<h2>([^<]+)</h2>\\s*</header>',\n- r'<h2 class=\"video-title\" itemprop=\"name\">\\s*(.+?)</h2>',\n- r'<div[^>]+id=\"veeseoTitle\"[^>]*>(.+?)</div>',\n- r'<h2[^>]+class=\"subtitle\"[^>]*>([^<]+)</h2>',\n- ]\n- _DESCRIPTION_REGEXES = [\n- r'<p itemprop=\"description\">\\s*(.+?)</p>',\n- r'<div class=\"videoDecription\">\\s*<p><strong>Beschreibung</strong>: (.+?)</p>',\n- r'<div class=\"g-plusone\" data-size=\"medium\"></div>\\s*</div>\\s*</header>\\s*(.+?)\\s*<footer>',\n- r'<p class=\"att-description\">\\s*(.+?)\\s*</p>',\n- r'<p class=\"video-description\" itemprop=\"description\">\\s*(.+?)</p>',\n- r'<div[^>]+id=\"veeseoDescription\"[^>]*>(.+?)</div>',\n- ]\n- _UPLOAD_DATE_REGEXES = [\n- r'<span>\\s*(\\d{2}\\.\\d{2}\\.\\d{4} \\d{2}:\\d{2}) \\|\\s*<span itemprop=\"duration\"',\n- r'<footer>\\s*(\\d{2}\\.\\d{2}\\.\\d{4}) \\d{2}:\\d{2} Uhr',\n- r'<span style=\"padding-left: 4px;line-height:20px; color:#404040\">(\\d{2}\\.\\d{2}\\.\\d{4})</span>',\n- r'(\\d{2}\\.\\d{2}\\.\\d{4}) \\| \\d{2}:\\d{2} Min<br/>',\n- ]\n- _PAGE_TYPE_REGEXES = [\n- r'<meta name=\"page_type\" content=\"([^\"]+)\">',\n- r\"'itemType'\\s*:\\s*'([^']*)'\",\n- ]\n- _PLAYLIST_ID_REGEXES = [\n- r'content[iI]d=(\\d+)',\n- r\"'itemId'\\s*:\\s*'([^']*)'\",\n- ]\n- _PLAYLIST_CLIP_REGEXES = [\n- r'(?s)data-qvt=.+?<a href=\"([^\"]+)\"',\n- ]\n-\n- def _extract_clip(self, url, webpage):\n- clip_id = self._html_search_regex(\n- self._CLIPID_REGEXES, webpage, 'clip id')\n- title = self._html_search_regex(\n- self._TITLE_REGEXES, webpage, 'title',\n- default=None) or self._og_search_title(webpage)\n- info = self._extract_video_info(url, clip_id)\n- description = self._html_search_regex(\n- self._DESCRIPTION_REGEXES, webpage, 'description', default=None)\n- if description is None:\n- description = self._og_search_description(webpage)\n- thumbnail = self._og_search_thumbnail(webpage)\n- upload_date = unified_strdate(\n- self._html_search_meta('og:published_time', webpage,\n- 'upload date', default=None)\n- or self._html_search_regex(self._UPLOAD_DATE_REGEXES,\n- webpage, 'upload date', default=None))\n-\n- json_ld = self._search_json_ld(webpage, clip_id, default={})\n-\n- return merge_dicts(info, {\n- 'id': clip_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'upload_date': upload_date,\n- }, json_ld)\n-\n- def _extract_playlist(self, url, webpage):\n- playlist_id = self._html_search_regex(\n- self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')\n- playlist = self._parse_json(\n- self._search_regex(\n- r'var\\s+contentResources\\s*=\\s*(\\[.+?\\]);\\s*</script',\n- webpage, 'playlist'),\n- playlist_id)\n- entries = []\n- for item in playlist:\n- clip_id = item.get('id') or item.get('upc')\n- if not clip_id:\n- continue\n- info = self._extract_video_info(url, clip_id)\n- info.update({\n- 'id': clip_id,\n- 'title': item.get('title') or item.get('teaser', {}).get('headline'),\n- 'description': item.get('teaser', {}).get('description'),\n- 'thumbnail': item.get('poster'),\n- 'duration': float_or_none(item.get('duration')),\n- 'series': item.get('tvShowTitle'),\n- 'uploader': item.get('broadcastPublisher'),\n- })\n- entries.append(info)\n- return self.playlist_result(entries, playlist_id)\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- page_type = self._search_regex(\n- self._PAGE_TYPE_REGEXES, webpage,\n- 'page type', default='clip').lower()\n- if page_type == 'clip':\n- return self._extract_clip(url, webpage)\n- elif page_type == 'playlist':\n- return self._extract_playlist(url, webpage)\n- else:\n- raise ExtractorError(\n- f'Unsupported page type {page_type}', expected=True)\ndiff --git a/yt_dlp/extractor/puls4.py b/yt_dlp/extractor/puls4.py\ndeleted file mode 100644\nindex b43f0352b9fd..000000000000\n--- a/yt_dlp/extractor/puls4.py\n+++ /dev/null\n@@ -1,50 +0,0 @@\n-from .prosiebensat1 import ProSiebenSat1BaseIE\n-from ..utils import parse_duration, unified_strdate\n-\n-\n-class Puls4IE(ProSiebenSat1BaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?puls4\\.com/(?P<id>[^?#&]+)'\n- _TESTS = [{\n- 'url': 'http://www.puls4.com/2-minuten-2-millionen/staffel-3/videos/2min2miotalk/Tobias-Homberger-von-myclubs-im-2min2miotalk-118118',\n- 'md5': 'fd3c6b0903ac72c9d004f04bc6bb3e03',\n- 'info_dict': {\n- 'id': '118118',\n- 'ext': 'flv',\n- 'title': 'Tobias Homberger von myclubs im #2min2miotalk',\n- 'description': 'md5:f9def7c5e8745d6026d8885487d91955',\n- 'upload_date': '20160830',\n- 'uploader': 'PULS_4',\n- },\n- }, {\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident.-Norbert-Hofer',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.puls4.com/pro-und-contra/wer-wird-prasident/Ganze-Folgen/Wer-wird-Praesident-Analyse-des-Interviews-mit-Norbert-Hofer-416598',\n- 'only_matching': True,\n- }]\n- _TOKEN = 'puls4'\n- _SALT = '01!kaNgaiNgah1Ie4AeSha'\n- _CLIENT_NAME = ''\n-\n- def _real_extract(self, url):\n- path = self._match_id(url)\n- content_path = self._download_json(\n- 'http://www.puls4.com/api/json-fe/page/' + path, path)['content'][0]['url']\n- media = self._download_json(\n- 'http://www.puls4.com' + content_path,\n- content_path)['mediaCurrent']\n- player_content = media['playerContent']\n- info = self._extract_video_info(url, player_content['id'])\n- info.update({\n- 'id': str(media['objectId']),\n- 'title': player_content['title'],\n- 'description': media.get('description'),\n- 'thumbnail': media.get('previewLink'),\n- 'upload_date': unified_strdate(media.get('date')),\n- 'duration': parse_duration(player_content.get('duration')),\n- 'episode': player_content.get('episodePartName'),\n- 'show': media.get('channel'),\n- 'season_id': player_content.get('seasonId'),\n- 'uploader': player_content.get('sourceCompany'),\n- })\n- return info\ndiff --git a/yt_dlp/extractor/radiocomercial.py b/yt_dlp/extractor/radiocomercial.py\ndeleted file mode 100644\nindex 7e4609a62d37..000000000000\n--- a/yt_dlp/extractor/radiocomercial.py\n+++ /dev/null\n@@ -1,154 +0,0 @@\n-import itertools\n-\n-from .common import InfoExtractor\n-from ..networking.exceptions import HTTPError\n-from ..utils import (\n- ExtractorError,\n- extract_attributes,\n- get_element_by_class,\n- get_element_html_by_class,\n- get_element_text_and_html_by_tag,\n- get_elements_html_by_class,\n- int_or_none,\n- join_nonempty,\n- try_call,\n- unified_strdate,\n- update_url,\n- urljoin,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class RadioComercialIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?radiocomercial\\.pt/podcasts/[^/?#]+/t?(?P<season>\\d+)/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao/t6/taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas#page-content-wrapper',\n- 'md5': '5f4fe8e485b29d2e8fd495605bc2c7e4',\n- 'info_dict': {\n- 'id': 'taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas',\n- 'ext': 'mp3',\n- 'title': 'Taylor Swift entranhando-se que nem uma espada no ventre dos fรฃs.',\n- 'release_date': '20231025',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 6',\n- 'season_number': 6,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3/convenca-me-num-minuto-que-os-lobisomens-existem',\n- 'md5': '47e96c273aef96a8eb160cd6cf46d782',\n- 'info_dict': {\n- 'id': 'convenca-me-num-minuto-que-os-lobisomens-existem',\n- 'ext': 'mp3',\n- 'title': 'Convenรงa-me num minuto que os lobisomens existem',\n- 'release_date': '20231026',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 3',\n- 'season_number': 3,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/inacreditavel-by-ines-castel-branco/t2/o-desastre-de-aviao',\n- 'md5': '69be64255420fec23b7259955d771e54',\n- 'info_dict': {\n- 'id': 'o-desastre-de-aviao',\n- 'ext': 'mp3',\n- 'title': 'O desastre de aviรฃo',\n- 'description': 'md5:8a82beeb372641614772baab7246245f',\n- 'release_date': '20231101',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 2',\n- 'season_number': 2,\n- },\n- 'params': {\n- # inconsistant md5\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/2023/t-n-t-29-de-outubro',\n- 'md5': '91d32d4d4b1407272068b102730fc9fa',\n- 'info_dict': {\n- 'id': 't-n-t-29-de-outubro',\n- 'ext': 'mp3',\n- 'title': 'T.N.T 29 de outubro',\n- 'release_date': '20231029',\n- 'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',\n- 'season': 'Season 2023',\n- 'season_number': 2023,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id, season = self._match_valid_url(url).group('id', 'season')\n- webpage = self._download_webpage(url, video_id)\n- return {\n- 'id': video_id,\n- 'title': self._html_extract_title(webpage),\n- 'description': self._og_search_description(webpage, default=None),\n- 'release_date': unified_strdate(get_element_by_class(\n- 'date', get_element_html_by_class('descriptions', webpage) or '')),\n- 'thumbnail': self._og_search_thumbnail(webpage),\n- 'season_number': int_or_none(season),\n- 'url': extract_attributes(get_element_html_by_class('audiofile', webpage) or '').get('href'),\n- }\n-\n-\n-class RadioComercialPlaylistIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?radiocomercial\\.pt/podcasts/(?P<id>[\\w-]+)(?:/t?(?P<season>\\d+))?/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3',\n- 'info_dict': {\n- 'id': 'convenca-me-num-minuto_t3',\n- 'title': 'Convenรงa-me num Minuto - Temporada 3',\n- },\n- 'playlist_mincount': 32,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao',\n- 'info_dict': {\n- 'id': 'o-homem-que-mordeu-o-cao',\n- 'title': 'O Homem Que Mordeu o Cรฃo',\n- },\n- 'playlist_mincount': 19,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/as-minhas-coisas-favoritas',\n- 'info_dict': {\n- 'id': 'as-minhas-coisas-favoritas',\n- 'title': 'As Minhas Coisas Favoritas',\n- },\n- 'playlist_mincount': 131,\n- }, {\n- 'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/t2023',\n- 'info_dict': {\n- 'id': 'tnt-todos-no-top_t2023',\n- 'title': 'TNT - Todos No Top - Temporada 2023',\n- },\n- 'playlist_mincount': 39,\n- }]\n-\n- def _entries(self, url, playlist_id):\n- for page in itertools.count(1):\n- try:\n- webpage = self._download_webpage(\n- f'{url}/{page}', playlist_id, f'Downloading page {page}')\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError) and e.cause.status == 404:\n- break\n- raise\n-\n- episodes = get_elements_html_by_class('tm-ouvir-podcast', webpage)\n- if not episodes:\n- break\n- for url_path in traverse_obj(episodes, (..., {extract_attributes}, 'href')):\n- episode_url = urljoin(url, url_path)\n- if RadioComercialIE.suitable(episode_url):\n- yield episode_url\n-\n- def _real_extract(self, url):\n- podcast, season = self._match_valid_url(url).group('id', 'season')\n- playlist_id = join_nonempty(podcast, season, delim='_t')\n- url = update_url(url, query=None, fragment=None)\n- webpage = self._download_webpage(url, playlist_id)\n-\n- name = try_call(lambda: get_element_text_and_html_by_tag('h1', webpage)[0])\n- title = name if name == season else join_nonempty(name, season, delim=' - Temporada ')\n-\n- return self.playlist_from_matches(\n- self._entries(url, playlist_id), playlist_id, title, ie=RadioComercialIE)\ndiff --git a/yt_dlp/extractor/redge.py b/yt_dlp/extractor/redge.py\ndeleted file mode 100644\nindex 5ae09a096bd1..000000000000\n--- a/yt_dlp/extractor/redge.py\n+++ /dev/null\n@@ -1,134 +0,0 @@\n-\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- join_nonempty,\n- parse_qs,\n- update_url_query,\n-)\n-from ..utils.traversal import traverse_obj\n-\n-\n-class RedCDNLivxIE(InfoExtractor):\n- _VALID_URL = r'https?://[^.]+\\.(?:dcs\\.redcdn|atmcdn)\\.pl/(?:live(?:dash|hls|ss)|nvr)/o2/(?P<tenant>[^/?#]+)/(?P<id>[^?#]+)\\.livx'\n- IE_NAME = 'redcdnlivx'\n-\n- _TESTS = [{\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/senat/ENC02/channel.livx?indexMode=true&startTime=638272860000&stopTime=638292544000',\n- 'info_dict': {\n- 'id': 'ENC02-638272860000-638292544000',\n- 'ext': 'mp4',\n- 'title': 'ENC02',\n- 'duration': 19683.982,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://r.dcs.redcdn.pl/livedash/o2/sejm/ENC18/live.livx?indexMode=true&startTime=722333096000&stopTime=722335562000',\n- 'info_dict': {\n- 'id': 'ENC18-722333096000-722335562000',\n- 'ext': 'mp4',\n- 'title': 'ENC18',\n- 'duration': 2463.995,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://r.dcs.redcdn.pl/livehls/o2/sportevolution/live/triathlon2018/warsaw.livx/playlist.m3u8?startTime=550305000000&stopTime=550327620000',\n- 'info_dict': {\n- 'id': 'triathlon2018-warsaw-550305000000-550327620000',\n- 'ext': 'mp4',\n- 'title': 'triathlon2018/warsaw',\n- 'duration': 22619.98,\n- 'live_status': 'was_live',\n- },\n- }, {\n- 'url': 'https://n-25-12.dcs.redcdn.pl/nvr/o2/sejm/Migacz-ENC01/1.livx?startTime=722347200000&stopTime=722367345000',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://redir.atmcdn.pl/nvr/o2/sejm/ENC08/1.livx?startTime=503831270000&stopTime=503840040000',\n- 'only_matching': True,\n- }]\n-\n- '''\n- Known methods (first in url path):\n- - `livedash` - DASH MPD\n- - `livehls` - HTTP Live Streaming\n- - `livess` - IIS Smooth Streaming\n- - `nvr` - CCTV mode, directly returns a file, typically flv, avc1, aac\n- - `sc` - shoutcast/icecast (audio streams, like radio)\n- '''\n-\n- def _real_extract(self, url):\n- tenant, path = self._match_valid_url(url).group('tenant', 'id')\n- qs = parse_qs(url)\n- start_time = traverse_obj(qs, ('startTime', 0, {int_or_none}))\n- stop_time = traverse_obj(qs, ('stopTime', 0, {int_or_none}))\n-\n- def livx_mode(mode):\n- suffix = ''\n- if mode == 'livess':\n- suffix = '/manifest'\n- elif mode == 'livehls':\n- suffix = '/playlist.m3u8'\n- file_qs = {}\n- if start_time:\n- file_qs['startTime'] = start_time\n- if stop_time:\n- file_qs['stopTime'] = stop_time\n- if mode == 'nvr':\n- file_qs['nolimit'] = 1\n- elif mode != 'sc':\n- file_qs['indexMode'] = 'true'\n- return update_url_query(f'https://r.dcs.redcdn.pl/{mode}/o2/{tenant}/{path}.livx{suffix}', file_qs)\n-\n- # no id or title for a transmission. making ones up.\n- title = path \\\n- .replace('/live', '').replace('live/', '') \\\n- .replace('/channel', '').replace('channel/', '') \\\n- .strip('/')\n- video_id = join_nonempty(title.replace('/', '-'), start_time, stop_time)\n-\n- formats = []\n- # downloading the manifest separately here instead of _extract_ism_formats to also get some stream metadata\n- ism_res = self._download_xml_handle(\n- livx_mode('livess'), video_id,\n- note='Downloading ISM manifest',\n- errnote='Failed to download ISM manifest',\n- fatal=False)\n- ism_doc = None\n- if ism_res is not False:\n- ism_doc, ism_urlh = ism_res\n- formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss')\n-\n- nvr_urlh = self._request_webpage(\n- HEADRequest(livx_mode('nvr')), video_id, 'Follow flv file redirect', fatal=False,\n- expected_status=lambda _: True)\n- if nvr_urlh and nvr_urlh.status == 200:\n- formats.append({\n- 'url': nvr_urlh.url,\n- 'ext': 'flv',\n- 'format_id': 'direct-0',\n- 'preference': -1, # might be slow\n- })\n- formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False))\n- formats.extend(self._extract_m3u8_formats(\n- livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False))\n-\n- time_scale = traverse_obj(ism_doc, ('@TimeScale', {int_or_none})) or 10000000\n- duration = traverse_obj(\n- ism_doc, ('@Duration', {float_or_none(scale=time_scale)})) or None\n-\n- live_status = None\n- if traverse_obj(ism_doc, '@IsLive') == 'TRUE':\n- live_status = 'is_live'\n- elif duration:\n- live_status = 'was_live'\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'formats': formats,\n- 'duration': duration,\n- 'live_status': live_status,\n- }\ndiff --git a/yt_dlp/extractor/rheinmaintv.py b/yt_dlp/extractor/rheinmaintv.py\ndeleted file mode 100644\nindex c3b352dedea8..000000000000\n--- a/yt_dlp/extractor/rheinmaintv.py\n+++ /dev/null\n@@ -1,94 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import extract_attributes, merge_dicts, remove_end\n-\n-\n-class RheinMainTVIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?rheinmaintv\\.de/sendungen/(?:[\\w-]+/)*(?P<video_id>(?P<display_id>[\\w-]+)/vom-\\d{2}\\.\\d{2}\\.\\d{4}(?:/\\d+)?)'\n- _TESTS = [{\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/auf-dem-weg-zur-deutschen-meisterschaft/vom-07.11.2022/',\n- 'info_dict': {\n- 'id': 'auf-dem-weg-zur-deutschen-meisterschaft-vom-07.11.2022',\n- 'ext': 'ismv', # ismv+isma will be merged into mp4\n- 'alt_title': 'Auf dem Weg zur Deutschen Meisterschaft',\n- 'title': 'Auf dem Weg zur Deutschen Meisterschaft',\n- 'upload_date': '20221108',\n- 'view_count': int,\n- 'display_id': 'auf-dem-weg-zur-deutschen-meisterschaft',\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'description': 'md5:48c59b74192bc819a9b34af1d5ed1eb9',\n- 'timestamp': 1667933057,\n- 'duration': 243.0,\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\n- 'info_dict': {\n- 'id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften-vom-14.11.2022',\n- 'ext': 'ismv',\n- 'title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\n- 'timestamp': 1668526214,\n- 'display_id': 'formationsgemeinschaft-rhein-main-bei-den-deutschen-meisterschaften',\n- 'alt_title': 'Formationsgemeinschaft Rhein-Main bei den Deutschen Meisterschaften',\n- 'view_count': int,\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'duration': 345.0,\n- 'description': 'md5:9370ba29526984006c2cba1372e5c5a0',\n- 'upload_date': '20221115',\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/casino-mainz-bei-den-deutschen-meisterschaften/vom-14.11.2022/',\n- 'info_dict': {\n- 'id': 'casino-mainz-bei-den-deutschen-meisterschaften-vom-14.11.2022',\n- 'ext': 'ismv',\n- 'title': 'Casino Mainz bei den Deutschen Meisterschaften',\n- 'view_count': int,\n- 'timestamp': 1668527402,\n- 'alt_title': 'Casino Mainz bei den Deutschen Meisterschaften',\n- 'upload_date': '20221115',\n- 'display_id': 'casino-mainz-bei-den-deutschen-meisterschaften',\n- 'duration': 348.0,\n- 'thumbnail': r're:^https://.+\\.jpg',\n- 'description': 'md5:70fc1660eeba96da17199e5bdff4c0aa',\n- },\n- 'params': {'skip_download': 'ism'},\n- }, {\n- 'url': 'https://www.rheinmaintv.de/sendungen/beitrag-video/bricks4kids/vom-22.06.2022/',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- display_id = mobj.group('display_id')\n- video_id = mobj.group('video_id').replace('/', '-')\n- webpage = self._download_webpage(url, video_id)\n-\n- source, img = self._search_regex(r'(?s)(?P<source><source[^>]*>)(?P<img><img[^>]*>)',\n- webpage, 'video', group=('source', 'img'))\n- source = extract_attributes(source)\n- img = extract_attributes(img)\n-\n- raw_json_ld = list(self._yield_json_ld(webpage, video_id))\n- json_ld = self._json_ld(raw_json_ld, video_id)\n- json_ld.pop('url', None)\n-\n- ism_manifest_url = (\n- source.get('src')\n- or next(json_ld.get('embedUrl') for json_ld in raw_json_ld if json_ld.get('@type') == 'VideoObject')\n- )\n- formats, subtitles = self._extract_ism_formats_and_subtitles(ism_manifest_url, video_id)\n-\n- return merge_dicts({\n- 'id': video_id,\n- 'display_id': display_id,\n- 'title':\n- self._html_search_regex(r'<h1><span class=\"title\">([^<]*)</span>',\n- webpage, 'headline', default=None)\n- or img.get('title') or json_ld.get('title') or self._og_search_title(webpage)\n- or remove_end(self._html_extract_title(webpage), ' -'),\n- 'alt_title': img.get('alt'),\n- 'description': json_ld.get('description') or self._og_search_description(webpage),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnails': [{'url': img['src']}] if 'src' in img else json_ld.get('thumbnails'),\n- }, json_ld)\ndiff --git a/yt_dlp/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py\ndeleted file mode 100644\nindex e7b1e22978f9..000000000000\n--- a/yt_dlp/extractor/rmcdecouverte.py\n+++ /dev/null\n@@ -1,69 +0,0 @@\n-import urllib.parse\n-\n-from .brightcove import BrightcoveLegacyIE\n-from .common import InfoExtractor\n-from ..utils import smuggle_url\n-\n-\n-class RMCDecouverteIE(InfoExtractor):\n- _VALID_URL = r'https?://rmcdecouverte\\.bfmtv\\.com/(?:[^?#]*_(?P<id>\\d+)|mediaplayer-direct)/?(?:[#?]|$)'\n-\n- _TESTS = [{\n- 'url': 'https://rmcdecouverte.bfmtv.com/vestiges-de-guerre_22240/les-bunkers-secrets-domaha-beach_25303/',\n- 'info_dict': {\n- 'id': '6250879771001',\n- 'ext': 'mp4',\n- 'title': 'LES BUNKERS SECRETS DยดOMAHA BEACH',\n- 'uploader_id': '1969646226001',\n- 'description': 'md5:aed573ca24abde62a148e0eba909657d',\n- 'timestamp': 1619622984,\n- 'upload_date': '20210428',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'https://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/',\n- 'info_dict': {\n- 'id': '5983675500001',\n- 'ext': 'mp4',\n- 'title': 'CORVETTE',\n- 'description': 'md5:c1e8295521e45ffebf635d6a7658f506',\n- 'uploader_id': '1969646226001',\n- 'upload_date': '20181226',\n- 'timestamp': 1545861635,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'only available for a week',\n- }, {\n- 'url': 'https://rmcdecouverte.bfmtv.com/avions-furtifs-la-technologie-de-lextreme_10598',\n- 'only_matching': True,\n- }, {\n- # The website accepts any URL as long as it has _\\d+ at the end\n- 'url': 'https://rmcdecouverte.bfmtv.com/any/thing/can/go/here/_10598',\n- 'only_matching': True,\n- }, {\n- # live, geo restricted, bypassable\n- 'url': 'https://rmcdecouverte.bfmtv.com/mediaplayer-direct/',\n- 'only_matching': True,\n- }]\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- display_id = mobj.group('id') or 'direct'\n- webpage = self._download_webpage(url, display_id)\n- brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)\n- if brightcove_legacy_url:\n- brightcove_id = urllib.parse.parse_qs(urllib.parse.urlparse(\n- brightcove_legacy_url).query)['@videoPlayer'][0]\n- else:\n- brightcove_id = self._search_regex(\n- r'data-video-id=[\"\\'](\\d+)', webpage, 'brightcove id')\n- return self.url_result(\n- smuggle_url(\n- self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,\n- {'geo_countries': ['FR']}),\n- 'BrightcoveNew', brightcove_id)\ndiff --git a/yt_dlp/extractor/sejmpl.py b/yt_dlp/extractor/sejmpl.py\nindex eb433d2ac321..6f3b79622cf4 100644\n--- a/yt_dlp/extractor/sejmpl.py\n+++ b/yt_dlp/extractor/sejmpl.py\n@@ -1,7 +1,6 @@\n import datetime as dt\n \n from .common import InfoExtractor\n-from .redge import RedCDNLivxIE\n from ..utils import (\n clean_html,\n join_nonempty,\n@@ -27,6 +26,7 @@ def rfc3339_to_atende(date):\n \n \n class SejmIE(InfoExtractor):\n+ _WORKING = False\n _VALID_URL = (\n r'https?://(?:www\\.)?sejm\\.gov\\.pl/[Ss]ejm(?P<term>\\d+)\\.nsf/transmisje(?:_arch)?\\.xsp(?:\\?[^#]*)?#(?P<id>[\\dA-F]+)',\n r'https?://(?:www\\.)?sejm\\.gov\\.pl/[Ss]ejm(?P<term>\\d+)\\.nsf/transmisje(?:_arch)?\\.xsp\\?(?:[^#]+&)?unid=(?P<id>[\\dA-F]+)',\n@@ -185,7 +185,7 @@ def add_entry(file, legacy_file=False):\n entries.append({\n **common_info,\n '_type': 'url_transparent',\n- 'ie_key': RedCDNLivxIE.ie_key(),\n+ 'ie_key': 'redcdnlivx',\n 'id': stream_id,\n 'title': join_nonempty(title, stream_id, delim=' - '),\n })\ndiff --git a/yt_dlp/extractor/sendtonews.py b/yt_dlp/extractor/sendtonews.py\ndeleted file mode 100644\nindex ecf4b27d7a76..000000000000\n--- a/yt_dlp/extractor/sendtonews.py\n+++ /dev/null\n@@ -1,105 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- determine_protocol,\n- float_or_none,\n- int_or_none,\n- parse_iso8601,\n- unescapeHTML,\n- update_url_query,\n-)\n-\n-\n-class SendtoNewsIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://embed\\.sendtonews\\.com/player2/embedplayer\\.php\\?.*\\bSC=(?P<id>[0-9A-Za-z-]+)'\n-\n- _TEST = {\n- # From http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/\n- 'url': 'http://embed.sendtonews.com/player2/embedplayer.php?SC=GxfCe0Zo7D-175909-5588&type=single&autoplay=on&sound=YES',\n- 'info_dict': {\n- 'id': 'GxfCe0Zo7D-175909-5588',\n- },\n- 'playlist_count': 8,\n- # test the first video only to prevent lengthy tests\n- 'playlist': [{\n- 'info_dict': {\n- 'id': '240385',\n- 'ext': 'mp4',\n- 'title': 'Indians introduce Encarnacion',\n- 'description': 'Indians president of baseball operations Chris Antonetti and Edwin Encarnacion discuss the slugger\\'s three-year contract with Cleveland',\n- 'duration': 137.898,\n- 'thumbnail': r're:https?://.*\\.jpg$',\n- 'upload_date': '20170105',\n- 'timestamp': 1483649762,\n- },\n- }],\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- _URL_TEMPLATE = '//embed.sendtonews.com/player2/embedplayer.php?SC=%s'\n-\n- @classmethod\n- def _extract_embed_urls(cls, url, webpage):\n- mobj = re.search(r'''(?x)<script[^>]+src=([\\'\"])\n- (?:https?:)?//embed\\.sendtonews\\.com/player/responsiveembed\\.php\\?\n- .*\\bSC=(?P<SC>[0-9a-zA-Z-]+).*\n- \\1>''', webpage)\n- if mobj:\n- sc = mobj.group('SC')\n- yield cls._URL_TEMPLATE % sc\n-\n- def _real_extract(self, url):\n- playlist_id = self._match_id(url)\n-\n- data_url = update_url_query(\n- url.replace('embedplayer.php', 'data_read.php'),\n- {'cmd': 'loadInitial'})\n- playlist_data = self._download_json(data_url, playlist_id)\n-\n- entries = []\n- for video in playlist_data['playlistData'][0]:\n- info_dict = self._parse_jwplayer_data(\n- video['jwconfiguration'],\n- require_title=False, m3u8_id='hls', rtmp_params={'no_resume': True})\n-\n- for f in info_dict['formats']:\n- if f.get('tbr'):\n- continue\n- tbr = int_or_none(self._search_regex(\n- r'/(\\d+)k/', f['url'], 'bitrate', default=None))\n- if not tbr:\n- continue\n- f.update({\n- 'format_id': f'{determine_protocol(f)}-{tbr}',\n- 'tbr': tbr,\n- })\n-\n- thumbnails = []\n- if video.get('thumbnailUrl'):\n- thumbnails.append({\n- 'id': 'normal',\n- 'url': video['thumbnailUrl'],\n- })\n- if video.get('smThumbnailUrl'):\n- thumbnails.append({\n- 'id': 'small',\n- 'url': video['smThumbnailUrl'],\n- })\n- info_dict.update({\n- 'title': video['S_headLine'].strip(),\n- 'description': unescapeHTML(video.get('S_fullStory')),\n- 'thumbnails': thumbnails,\n- 'duration': float_or_none(video.get('SM_length')),\n- 'timestamp': parse_iso8601(video.get('S_sysDate'), delimiter=' '),\n- # 'tbr' was explicitly set to be preferred over 'height' originally,\n- # So this is being kept unless someone can confirm this is unnecessary\n- '_format_sort_fields': ('tbr', 'res'),\n- })\n- entries.append(info_dict)\n-\n- return self.playlist_result(entries, playlist_id)\ndiff --git a/yt_dlp/extractor/sharevideos.py b/yt_dlp/extractor/sharevideos.py\ndeleted file mode 100644\nindex 3132c7a82b16..000000000000\n--- a/yt_dlp/extractor/sharevideos.py\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class ShareVideosEmbedIE(InfoExtractor):\n- _VALID_URL = False\n- _EMBED_REGEX = [r'<iframe[^>]+?\\bsrc\\s*=\\s*([\"\\'])(?P<url>(?:https?:)?//embed\\.share-videos\\.se/auto/embed/\\d+\\?.*?\\buid=\\d+.*?)\\1']\ndiff --git a/yt_dlp/extractor/snotr.py b/yt_dlp/extractor/snotr.py\ndeleted file mode 100644\nindex 859e5e8376b6..000000000000\n--- a/yt_dlp/extractor/snotr.py\n+++ /dev/null\n@@ -1,68 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- parse_duration,\n- parse_filesize,\n- str_to_int,\n-)\n-\n-\n-class SnotrIE(InfoExtractor):\n- _VALID_URL = r'http?://(?:www\\.)?snotr\\.com/video/(?P<id>\\d+)/([\\w]+)'\n- _TESTS = [{\n- 'url': 'http://www.snotr.com/video/13708/Drone_flying_through_fireworks',\n- 'info_dict': {\n- 'id': '13708',\n- 'ext': 'mp4',\n- 'title': 'Drone flying through fireworks!',\n- 'duration': 248,\n- 'filesize_approx': 40700000,\n- 'description': 'A drone flying through Fourth of July Fireworks',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- 'expected_warnings': ['description'],\n- }, {\n- 'url': 'http://www.snotr.com/video/530/David_Letteman_-_George_W_Bush_Top_10',\n- 'info_dict': {\n- 'id': '530',\n- 'ext': 'mp4',\n- 'title': 'David Letteman - George W. Bush Top 10',\n- 'duration': 126,\n- 'filesize_approx': 8500000,\n- 'description': 'The top 10 George W. Bush moments, brought to you by David Letterman!',\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id')\n-\n- webpage = self._download_webpage(url, video_id)\n- title = self._og_search_title(webpage)\n-\n- description = self._og_search_description(webpage)\n- info_dict = self._parse_html5_media_entries(\n- url, webpage, video_id, m3u8_entry_protocol='m3u8_native')[0]\n-\n- view_count = str_to_int(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Views:</strong>\\s*<span[^>]*>([\\d,\\.]+)',\n- webpage, 'view count', fatal=False))\n-\n- duration = parse_duration(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Length:</strong>\\s*<span[^>]*>([\\d:]+)',\n- webpage, 'duration', fatal=False))\n-\n- filesize_approx = parse_filesize(self._html_search_regex(\n- r'<p[^>]*>\\s*<strong[^>]*>Filesize:</strong>\\s*<span[^>]*>([^<]+)',\n- webpage, 'filesize', fatal=False))\n-\n- info_dict.update({\n- 'id': video_id,\n- 'description': description,\n- 'title': title,\n- 'view_count': view_count,\n- 'duration': duration,\n- 'filesize_approx': filesize_approx,\n- })\n-\n- return info_dict\ndiff --git a/yt_dlp/extractor/springboardplatform.py b/yt_dlp/extractor/springboardplatform.py\ndeleted file mode 100644\nindex 9a37dd6752d7..000000000000\n--- a/yt_dlp/extractor/springboardplatform.py\n+++ /dev/null\n@@ -1,122 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- unescapeHTML,\n- unified_timestamp,\n- xpath_attr,\n- xpath_element,\n- xpath_text,\n-)\n-\n-\n-class SpringboardPlatformIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://\n- cms\\.springboardplatform\\.com/\n- (?:\n- (?:previews|embed_iframe)/(?P<index>\\d+)/video/(?P<id>\\d+)|\n- xml_feeds_advanced/index/(?P<index_2>\\d+)/rss3/(?P<id_2>\\d+)\n- )\n- '''\n- _EMBED_REGEX = [r'<iframe\\b[^>]+\\bsrc=([\"\\'])(?P<url>(?:https?:)?//cms\\.springboardplatform\\.com/embed_iframe/\\d+/video/\\d+.*?)\\1']\n- _TESTS = [{\n- 'url': 'http://cms.springboardplatform.com/previews/159/video/981017/0/0/1',\n- 'md5': '5c3cb7b5c55740d482561099e920f192',\n- 'info_dict': {\n- 'id': '981017',\n- 'ext': 'mp4',\n- 'title': 'Redman \"BUD like YOU\" \"Usher Good Kisser\" REMIX',\n- 'description': 'Redman \"BUD like YOU\" \"Usher Good Kisser\" REMIX',\n- 'thumbnail': r're:https?://.+\\.jpg',\n- 'timestamp': 1409132328,\n- 'upload_date': '20140827',\n- 'duration': 193,\n- },\n- 'skip': 'Invalid URL',\n- }, {\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/159/video/981017/rab007/rapbasement.com/1/1',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cms.springboardplatform.com/embed_iframe/20/video/1731611/ki055/kidzworld.com/10',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://cms.springboardplatform.com/xml_feeds_advanced/index/159/rss3/981017/0/0/1/',\n- 'only_matching': True,\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.kidzworld.com/article/30935-trolls-the-beat-goes-on-interview-skylar-astin-and-amanda-leighton',\n- 'info_dict': {\n- 'id': '1731611',\n- 'ext': 'mp4',\n- 'title': 'Official Trailer | TROLLS: THE BEAT GOES ON!',\n- },\n- 'skip': 'Invalid URL',\n- }]\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('id') or mobj.group('id_2')\n- index = mobj.group('index') or mobj.group('index_2')\n-\n- video = self._download_xml(\n- f'http://cms.springboardplatform.com/xml_feeds_advanced/index/{index}/rss3/{video_id}', video_id)\n-\n- item = xpath_element(video, './/item', 'item', fatal=True)\n-\n- content = xpath_element(\n- item, './{http://search.yahoo.com/mrss/}content', 'content',\n- fatal=True)\n- title = unescapeHTML(xpath_text(item, './title', 'title', fatal=True))\n-\n- video_url = content.attrib['url']\n-\n- if 'error_video.mp4' in video_url:\n- raise ExtractorError(\n- f'Video {video_id} no longer exists', expected=True)\n-\n- duration = int_or_none(content.get('duration'))\n- tbr = int_or_none(content.get('bitrate'))\n- filesize = int_or_none(content.get('fileSize'))\n- width = int_or_none(content.get('width'))\n- height = int_or_none(content.get('height'))\n-\n- description = unescapeHTML(xpath_text(\n- item, './description', 'description'))\n- thumbnail = xpath_attr(\n- item, './{http://search.yahoo.com/mrss/}thumbnail', 'url',\n- 'thumbnail')\n-\n- timestamp = unified_timestamp(xpath_text(\n- item, './{http://cms.springboardplatform.com/namespaces.html}created',\n- 'timestamp'))\n-\n- formats = [{\n- 'url': video_url,\n- 'format_id': 'http',\n- 'tbr': tbr,\n- 'filesize': filesize,\n- 'width': width,\n- 'height': height,\n- }]\n-\n- m3u8_format = formats[0].copy()\n- m3u8_format.update({\n- 'url': re.sub(r'(https?://)cdn\\.', r'\\1hls.', video_url) + '.m3u8',\n- 'ext': 'mp4',\n- 'format_id': 'hls',\n- 'protocol': 'm3u8_native',\n- })\n- formats.append(m3u8_format)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'thumbnail': thumbnail,\n- 'timestamp': timestamp,\n- 'duration': duration,\n- 'formats': formats,\n- }\ndiff --git a/yt_dlp/extractor/stanfordoc.py b/yt_dlp/extractor/stanfordoc.py\ndeleted file mode 100644\nindex ab41091cff41..000000000000\n--- a/yt_dlp/extractor/stanfordoc.py\n+++ /dev/null\n@@ -1,89 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- orderedSet,\n- unescapeHTML,\n-)\n-\n-\n-class StanfordOpenClassroomIE(InfoExtractor):\n- IE_NAME = 'stanfordoc'\n- IE_DESC = 'Stanford Open ClassRoom'\n- _VALID_URL = r'https?://openclassroom\\.stanford\\.edu(?P<path>/?|(/MainFolder/(?:HomePage|CoursePage|VideoPage)\\.php([?]course=(?P<course>[^&]+)(&video=(?P<video>[^&]+))?(&.*)?)?))$'\n- _TEST = {\n- 'url': 'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100',\n- 'md5': '544a9468546059d4e80d76265b0443b8',\n- 'info_dict': {\n- 'id': 'PracticalUnix_intro-environment',\n- 'ext': 'mp4',\n- 'title': 'Intro Environment',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n-\n- if mobj.group('course') and mobj.group('video'): # A specific video\n- course = mobj.group('course')\n- video = mobj.group('video')\n- info = {\n- 'id': course + '_' + video,\n- 'uploader': None,\n- 'upload_date': None,\n- }\n-\n- base_url = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'\n- xml_url = base_url + video + '.xml'\n- mdoc = self._download_xml(xml_url, info['id'])\n- try:\n- info['title'] = mdoc.findall('./title')[0].text\n- info['url'] = base_url + mdoc.findall('./videoFile')[0].text\n- except IndexError:\n- raise ExtractorError('Invalid metadata XML file')\n- return info\n- elif mobj.group('course'): # A course page\n- course = mobj.group('course')\n- info = {\n- 'id': course,\n- '_type': 'playlist',\n- 'uploader': None,\n- 'upload_date': None,\n- }\n-\n- coursepage = self._download_webpage(\n- url, info['id'],\n- note='Downloading course info page',\n- errnote='Unable to download course info page')\n-\n- info['title'] = self._html_search_regex(\n- r'<h1>([^<]+)</h1>', coursepage, 'title', default=info['id'])\n-\n- info['description'] = self._html_search_regex(\n- r'(?s)<description>([^<]+)</description>',\n- coursepage, 'description', fatal=False)\n-\n- links = orderedSet(re.findall(r'<a href=\"(VideoPage\\.php\\?[^\"]+)\">', coursepage))\n- info['entries'] = [self.url_result(\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\n- ) for l in links]\n- return info\n- else: # Root page\n- info = {\n- 'id': 'Stanford OpenClassroom',\n- '_type': 'playlist',\n- 'uploader': None,\n- 'upload_date': None,\n- }\n- info['title'] = info['id']\n-\n- root_url = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'\n- rootpage = self._download_webpage(root_url, info['id'],\n- errnote='Unable to download course info page')\n-\n- links = orderedSet(re.findall(r'<a href=\"(CoursePage\\.php\\?[^\"]+)\">', rootpage))\n- info['entries'] = [self.url_result(\n- f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',\n- ) for l in links]\n- return info\ndiff --git a/yt_dlp/extractor/stitcher.py b/yt_dlp/extractor/stitcher.py\ndeleted file mode 100644\nindex 09ebabb289d5..000000000000\n--- a/yt_dlp/extractor/stitcher.py\n+++ /dev/null\n@@ -1,141 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- clean_html,\n- clean_podcast_url,\n- int_or_none,\n- str_or_none,\n- try_get,\n- url_or_none,\n-)\n-\n-\n-class StitcherBaseIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://(?:www\\.)?stitcher\\.com/(?:podcast|show)/'\n-\n- def _call_api(self, path, video_id, query):\n- resp = self._download_json(\n- 'https://api.prod.stitcher.com/' + path,\n- video_id, query=query)\n- error_massage = try_get(resp, lambda x: x['errors'][0]['message'])\n- if error_massage:\n- raise ExtractorError(error_massage, expected=True)\n- return resp['data']\n-\n- def _extract_description(self, data):\n- return clean_html(data.get('html_description') or data.get('description'))\n-\n- def _extract_audio_url(self, episode):\n- return url_or_none(episode.get('audio_url') or episode.get('guid'))\n-\n- def _extract_show_info(self, show):\n- return {\n- 'thumbnail': show.get('image_base_url'),\n- 'series': show.get('title'),\n- }\n-\n- def _extract_episode(self, episode, audio_url, show_info):\n- info = {\n- 'id': str(episode['id']),\n- 'display_id': episode.get('slug'),\n- 'title': episode['title'].strip(),\n- 'description': self._extract_description(episode),\n- 'duration': int_or_none(episode.get('duration')),\n- 'url': clean_podcast_url(audio_url),\n- 'vcodec': 'none',\n- 'timestamp': int_or_none(episode.get('date_published')),\n- 'season_number': int_or_none(episode.get('season')),\n- 'season_id': str_or_none(episode.get('season_id')),\n- }\n- info.update(show_info)\n- return info\n-\n-\n-class StitcherIE(StitcherBaseIE):\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?:[^/]+/)+e(?:pisode)?/(?:[^/#?&]+-)?(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines/e/40789481?autoplay=true',\n- 'md5': 'e9635098e0da10b21a0e2b85585530f6',\n- 'info_dict': {\n- 'id': '40789481',\n- 'ext': 'mp3',\n- 'title': 'Machine Learning Mastery and Cancer Clusters',\n- 'description': 'md5:547adb4081864be114ae3831b4c2b42f',\n- 'duration': 1604,\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'upload_date': '20151008',\n- 'timestamp': 1444285800,\n- 'series': 'Talking Machines',\n- },\n- }, {\n- 'url': 'http://www.stitcher.com/podcast/panoply/vulture-tv/e/the-rare-hourlong-comedy-plus-40846275?autoplay=true',\n- 'info_dict': {\n- 'id': '40846275',\n- 'display_id': 'the-rare-hourlong-comedy-plus',\n- 'ext': 'mp3',\n- 'title': \"The CW's 'Crazy Ex-Girlfriend'\",\n- 'description': 'md5:04f1e2f98eb3f5cbb094cea0f9e19b17',\n- 'duration': 2235,\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Page Not Found',\n- }, {\n- # escaped title\n- 'url': 'http://www.stitcher.com/podcast/marketplace-on-stitcher/e/40910226?autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://www.stitcher.com/podcast/panoply/getting-in/e/episode-2a-how-many-extracurriculars-should-i-have-40876278?autoplay=true',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.stitcher.com/show/threedom/episode/circles-on-a-stick-200212584',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- audio_id = self._match_id(url)\n- data = self._call_api(\n- 'shows/episodes', audio_id, {'episode_ids': audio_id})\n- episode = data['episodes'][0]\n- audio_url = self._extract_audio_url(episode)\n- if not audio_url:\n- self.raise_login_required()\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\n- return self._extract_episode(\n- episode, audio_url, self._extract_show_info(show))\n-\n-\n-class StitcherShowIE(StitcherBaseIE):\n- _VALID_URL = StitcherBaseIE._VALID_URL_BASE + r'(?P<id>[^/#?&]+)/?(?:[?#&]|$)'\n- _TESTS = [{\n- 'url': 'http://www.stitcher.com/podcast/the-talking-machines',\n- 'info_dict': {\n- 'id': 'the-talking-machines',\n- 'title': 'Talking Machines',\n- 'description': 'md5:831f0995e40f26c10231af39cf1ebf0b',\n- },\n- 'playlist_mincount': 106,\n- }, {\n- 'url': 'https://www.stitcher.com/show/the-talking-machines',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- show_slug = self._match_id(url)\n- data = self._call_api(\n- f'search/show/{show_slug}/allEpisodes', show_slug, {'count': 10000})\n- show = try_get(data, lambda x: x['shows'][0], dict) or {}\n- show_info = self._extract_show_info(show)\n-\n- entries = []\n- for episode in (data.get('episodes') or []):\n- audio_url = self._extract_audio_url(episode)\n- if not audio_url:\n- continue\n- entries.append(self._extract_episode(episode, audio_url, show_info))\n-\n- return self.playlist_result(\n- entries, show_slug, show.get('title'),\n- self._extract_description(show))\ndiff --git a/yt_dlp/extractor/stretchinternet.py b/yt_dlp/extractor/stretchinternet.py\ndeleted file mode 100644\nindex 232837d8d522..000000000000\n--- a/yt_dlp/extractor/stretchinternet.py\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class StretchInternetIE(InfoExtractor):\n- _VALID_URL = r'https?://portal\\.stretchinternet\\.com/[^/]+/(?:portal|full)\\.htm\\?.*?\\beventId=(?P<id>\\d+)'\n- _TEST = {\n- 'url': 'https://portal.stretchinternet.com/umary/portal.htm?eventId=573272&streamType=video',\n- 'info_dict': {\n- 'id': '573272',\n- 'ext': 'mp4',\n- 'title': 'UNIVERSITY OF MARY WRESTLING VS UPPER IOWA',\n- # 'timestamp': 1575668361,\n- # 'upload_date': '20191206',\n- 'uploader_id': '99997',\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- media_url = self._download_json(\n- 'https://core.stretchlive.com/trinity/event/tcg/' + video_id,\n- video_id)[0]['media'][0]['url']\n- event = self._download_json(\n- 'https://neo-client.stretchinternet.com/portal-ws/getEvent.json',\n- video_id, query={'eventID': video_id, 'token': 'asdf'})['event']\n-\n- return {\n- 'id': video_id,\n- 'title': event['title'],\n- # TODO: parse US timezone abbreviations\n- # 'timestamp': event.get('dateTimeString'),\n- 'url': 'https://' + media_url,\n- 'uploader_id': event.get('ownerID'),\n- }\ndiff --git a/yt_dlp/extractor/swearnet.py b/yt_dlp/extractor/swearnet.py\ndeleted file mode 100644\nindex 2d6fb3eb4760..000000000000\n--- a/yt_dlp/extractor/swearnet.py\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-from .vidyard import VidyardBaseIE\n-from ..utils import ExtractorError, int_or_none, make_archive_id\n-\n-\n-class SwearnetEpisodeIE(VidyardBaseIE):\n- _VALID_URL = r'https?://www\\.swearnet\\.com/shows/(?P<id>[\\w-]+)/seasons/(?P<season_num>\\d+)/episodes/(?P<episode_num>\\d+)'\n- _TESTS = [{\n- 'url': 'https://www.swearnet.com/shows/gettin-learnt-with-ricky/seasons/1/episodes/1',\n- 'info_dict': {\n- 'id': 'wicK2EOzjOdxkUXGDIgcPw',\n- 'display_id': '232819',\n- 'ext': 'mp4',\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'duration': 719,\n- 'description': r're:Are you drunk and high and craving a grilled cheese sandwich.+',\n- 'season': 'Season 1',\n- 'title': 'Episode 1 - Grilled Cheese Sammich',\n- 'season_number': 1,\n- 'thumbnail': 'https://cdn.vidyard.com/thumbnails/custom/0dd74f9b-388a-452e-b570-b407fb64435b_small.jpg',\n- 'tags': ['Getting Learnt with Ricky', 'drunk', 'grilled cheese', 'high'],\n- '_old_archive_ids': ['swearnetepisode 232819'],\n- },\n- }]\n-\n- def _real_extract(self, url):\n- slug, season_number, episode_number = self._match_valid_url(url).group('id', 'season_num', 'episode_num')\n- webpage = self._download_webpage(url, slug)\n-\n- try:\n- external_id = self._search_regex(r'externalid\\s*=\\s*\"([^\"]+)', webpage, 'externalid')\n- except ExtractorError:\n- if 'Upgrade Now' in webpage:\n- self.raise_login_required()\n- raise\n-\n- info = self._process_video_json(self._fetch_video_json(external_id)['chapters'][0], external_id)\n- if info.get('display_id'):\n- info['_old_archive_ids'] = [make_archive_id(self, info['display_id'])]\n-\n- return {\n- **info,\n- 'season_number': int_or_none(season_number),\n- 'episode_number': int_or_none(episode_number),\n- }\ndiff --git a/yt_dlp/extractor/syvdk.py b/yt_dlp/extractor/syvdk.py\ndeleted file mode 100644\nindex ec166831cde3..000000000000\n--- a/yt_dlp/extractor/syvdk.py\n+++ /dev/null\n@@ -1,33 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import traverse_obj\n-\n-\n-class SYVDKIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?24syv\\.dk/episode/(?P<id>[\\w-]+)'\n-\n- _TESTS = [{\n- 'url': 'https://24syv.dk/episode/isabella-arendt-stiller-op-for-de-konservative-2',\n- 'md5': '429ce5a423dd4b1e1d0bf3a569558089',\n- 'info_dict': {\n- 'id': '12215',\n- 'display_id': 'isabella-arendt-stiller-op-for-de-konservative-2',\n- 'ext': 'mp3',\n- 'title': 'Isabella Arendt stiller op for De Konservative',\n- 'description': 'md5:f5fa6a431813bf37284f3412ad7c6c06',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- info_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['episodeDetails'][0]\n-\n- return {\n- 'id': str(info_data['id']),\n- 'vcodec': 'none',\n- 'ext': 'mp3',\n- 'url': info_data['details']['enclosure'],\n- 'display_id': video_id,\n- 'title': traverse_obj(info_data, ('title', 'rendered')),\n- 'description': traverse_obj(info_data, ('details', 'post_title')),\n- }\ndiff --git a/yt_dlp/extractor/tempo.py b/yt_dlp/extractor/tempo.py\ndeleted file mode 100644\nindex 4cd16f240d6d..000000000000\n--- a/yt_dlp/extractor/tempo.py\n+++ /dev/null\n@@ -1,114 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n- traverse_obj,\n- try_call,\n-)\n-\n-\n-class IVXPlayerIE(InfoExtractor):\n- _VALID_URL = r'ivxplayer:(?P<video_id>\\d+):(?P<player_key>\\w+)'\n- _TESTS = [{\n- 'url': 'ivxplayer:2366065:4a89dfe6bc8f002596b1dfbd600730b1',\n- 'info_dict': {\n- 'id': '2366065',\n- 'ext': 'mp4',\n- 'duration': 112,\n- 'upload_date': '20221204',\n- 'title': 'Film Indonesia di Disney Content Showcase Asia Pacific 2022',\n- 'timestamp': 1670151746,\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2366065?width=300',\n- },\n- }]\n- _WEBPAGE_TESTS = [{\n- 'url': 'https://www.cantika.com/video/31737/film-indonesia-di-disney-content-showcase-asia-pacific-2022',\n- 'info_dict': {\n- 'id': '2374200',\n- 'ext': 'mp4',\n- 'duration': 110,\n- 'title': 'Serial Indonesia di Disney Content Showcase Asia Pacific 2022',\n- 'timestamp': 1670639416,\n- 'upload_date': '20221210',\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2374200?width=300',\n- },\n- }, {\n- 'url': 'https://www.gooto.com/video/11437/wuling-suv-ramai-dikunjungi-di-giias-2018',\n- 'info_dict': {\n- 'id': '892109',\n- 'ext': 'mp4',\n- 'title': 'Wuling SUV Ramai Dikunjungi di GIIAS 2018',\n- 'upload_date': '20180811',\n- 'description': 'md5:6d901483d0aacc664aecb4489719aafa',\n- 'duration': 75,\n- 'timestamp': 1534011263,\n- 'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/892109?width=300',\n- },\n- }]\n-\n- @classmethod\n- def _extract_embed_urls(cls, url, webpage):\n- # more info at https://player.ivideosmart.com/ivsplayer/v4/dist/js/loader.js\n- mobj = re.search(\n- r'<ivs-player\\s*[^>]+data-ivs-key\\s*=\\s*\"(?P<player_key>[\\w]+)\\s*[^>]+\\bdata-ivs-vid=\"(?P<video_id>[\\w-]+)',\n- webpage)\n- if mobj:\n- yield f'ivxplayer:{mobj.group(\"video_id\")}:{mobj.group(\"player_key\")}'\n- raise cls.StopExtraction\n-\n- def _real_extract(self, url):\n- video_id, player_key = self._match_valid_url(url).group('video_id', 'player_key')\n- json_data = self._download_json(\n- f'https://ivxplayer.ivideosmart.com/prod/video/{video_id}?key={player_key}', video_id)\n-\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- json_data['player']['video_url'], video_id)\n-\n- return {\n- 'id': str(json_data['ivx']['id']),\n- 'title': traverse_obj(json_data, ('ivx', 'name')),\n- 'description': traverse_obj(json_data, ('ivx', 'description')),\n- 'duration': int_or_none(traverse_obj(json_data, ('ivx', 'duration'))),\n- 'timestamp': parse_iso8601(traverse_obj(json_data, ('ivx', 'published_at'))),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'thumbnail': traverse_obj(json_data, ('ivx', 'thumbnail_url')),\n- }\n-\n-\n-class TempoIE(InfoExtractor):\n- _VALID_URL = r'https?://video\\.tempo\\.co/\\w+/\\d+/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://video.tempo.co/read/30058/anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\n- 'info_dict': {\n- 'id': '2144275',\n- 'display_id': 'anies-baswedan-ajukan-banding-putusan-ptun-batalkan-ump-dki',\n- 'ext': 'mp4',\n- 'title': 'Anies Baswedan Ajukan Banding Putusan PTUN Batalkan UMP DKI',\n- 'duration': 85,\n- 'description': 'md5:a6822b7c4c874fa7e5bd63e96a387b66',\n- 'thumbnail': 'https://statik.tempo.co/data/2022/07/27/id_1128287/1128287_720.jpg',\n- 'timestamp': 1658907970,\n- 'upload_date': '20220727',\n- 'tags': ['Anies Baswedan', ' PTUN', ' PTUN | Pengadilan Tata Usaha Negara', ' PTUN Batalkan UMP DKI', ' UMP DKI'],\n- },\n- }]\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- _, video_id, player_key = next(IVXPlayerIE._extract_embed_urls(url, webpage)).split(':')\n-\n- json_ld_data = self._search_json_ld(webpage, display_id)\n-\n- return self.url_result(\n- f'ivxplayer:{video_id}:{player_key}', display_id=display_id,\n- thumbnail=self._html_search_meta('twitter:image:src', webpage) or self._og_search_thumbnail(webpage),\n- tags=try_call(lambda: self._html_search_meta('keywords', webpage).split(',')),\n- description=(json_ld_data.get('description')\n- or self._html_search_meta(('description', 'twitter:description'), webpage)\n- or self._og_search_description(webpage)),\n- url_transparent=True)\ndiff --git a/yt_dlp/extractor/theholetv.py b/yt_dlp/extractor/theholetv.py\ndeleted file mode 100644\nindex a3a7024288eb..000000000000\n--- a/yt_dlp/extractor/theholetv.py\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import extract_attributes, remove_end\n-\n-\n-class TheHoleTvIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?the-hole\\.tv/episodes/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://the-hole.tv/episodes/gromkii-vopros-sergey-orlov',\n- 'md5': 'fea6682f47786f3ae5a6cbd635ec4bf9',\n- 'info_dict': {\n- 'id': 'gromkii-vopros-sergey-orlov',\n- 'ext': 'mp4',\n- 'title': 'ะกะตัะณะตะน ะัะปะพะฒ โ ะัะพะผะบะธะน ะฒะพะฟัะพั',\n- 'thumbnail': 'https://assets-cdn.the-hole.tv/images/t8gan4n6zn627e7wni11b2uemqts',\n- 'description': 'md5:45741a9202331f995d9fb76996759379',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- player_attrs = extract_attributes(self._search_regex(\n- r'(<div[^>]*\\bdata-controller=\"player\"[^>]*>)', webpage, 'video player'))\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(\n- player_attrs['data-player-source-value'], video_id, 'mp4')\n-\n- return {\n- 'id': video_id,\n- 'title': remove_end(self._html_extract_title(webpage), ' โ The Hole'),\n- 'description': self._og_search_description(webpage),\n- 'thumbnail': player_attrs.get('data-player-poster-value'),\n- 'formats': formats,\n- 'subtitles': subtitles,\n- }\ndiff --git a/yt_dlp/extractor/traileraddict.py b/yt_dlp/extractor/traileraddict.py\ndeleted file mode 100644\nindex 81c9365585c0..000000000000\n--- a/yt_dlp/extractor/traileraddict.py\n+++ /dev/null\n@@ -1,61 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-\n-\n-class TrailerAddictIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'(?:https?://)?(?:www\\.)?traileraddict\\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'\n- _TEST = {\n- 'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',\n- 'md5': '41365557f3c8c397d091da510e73ceb4',\n- 'info_dict': {\n- 'id': '76184',\n- 'ext': 'mp4',\n- 'title': 'Prince Avalanche Trailer',\n- 'description': 'Trailer for Prince Avalanche.\\n\\nTwo highway road workers spend the summer of 1988 away from their city lives. The isolated landscape becomes a place of misadventure as the men find themselves at odds with each other and the women they left behind.',\n- },\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- name = mobj.group('movie') + '/' + mobj.group('trailer_name')\n- webpage = self._download_webpage(url, name)\n-\n- title = self._html_extract_title(webpage, 'video title').replace(' - Trailer Addict', '')\n- view_count_str = self._search_regex(\n- r'<span class=\"views_n\">([0-9,.]+)</span>',\n- webpage, 'view count', fatal=False)\n- view_count = (\n- None if view_count_str is None\n- else int(view_count_str.replace(',', '')))\n- video_id = self._search_regex(\n- r'<param\\s+name=\"movie\"\\s+value=\"/emb/([0-9]+)\"\\s*/>',\n- webpage, 'video id')\n-\n- # Presence of (no)watchplus function indicates HD quality is available\n- if re.search(r'function (no)?watchplus()', webpage):\n- fvar = 'fvarhd'\n- else:\n- fvar = 'fvar'\n-\n- info_url = f'http://www.traileraddict.com/{fvar}.php?tid={video_id!s}'\n- info_webpage = self._download_webpage(info_url, video_id, 'Downloading the info webpage')\n-\n- final_url = self._search_regex(r'&fileurl=(.+)',\n- info_webpage, 'Download url').replace('%3F', '?')\n- thumbnail_url = self._search_regex(r'&image=(.+?)&',\n- info_webpage, 'thumbnail url')\n-\n- description = self._html_search_regex(\n- r'(?s)<div class=\"synopsis\">.*?<div class=\"movie_label_info\"[^>]*>(.*?)</div>',\n- webpage, 'description', fatal=False)\n-\n- return {\n- 'id': video_id,\n- 'url': final_url,\n- 'title': title,\n- 'thumbnail': thumbnail_url,\n- 'description': description,\n- 'view_count': view_count,\n- }\ndiff --git a/yt_dlp/extractor/triller.py b/yt_dlp/extractor/triller.py\ndeleted file mode 100644\nindex 3bdeedd43e00..000000000000\n--- a/yt_dlp/extractor/triller.py\n+++ /dev/null\n@@ -1,329 +0,0 @@\n-import itertools\n-import json\n-import re\n-\n-from .common import InfoExtractor\n-from ..networking import HEADRequest\n-from ..utils import (\n- ExtractorError,\n- UnsupportedError,\n- determine_ext,\n- int_or_none,\n- parse_resolution,\n- str_or_none,\n- traverse_obj,\n- unified_timestamp,\n- url_basename,\n- url_or_none,\n- urljoin,\n-)\n-\n-\n-class TrillerBaseIE(InfoExtractor):\n- _NETRC_MACHINE = 'triller'\n- _API_BASE_URL = 'https://social.triller.co/v1.5'\n- _API_HEADERS = {'Origin': 'https://triller.co'}\n-\n- def _perform_login(self, username, password):\n- if self._API_HEADERS.get('Authorization'):\n- return\n-\n- headers = {**self._API_HEADERS, 'Content-Type': 'application/json'}\n- user_check = traverse_obj(self._download_json(\n- f'{self._API_BASE_URL}/api/user/is-valid-username', None, note='Checking username',\n- fatal=False, expected_status=400, headers=headers,\n- data=json.dumps({'username': username}, separators=(',', ':')).encode()), 'status')\n-\n- if user_check: # endpoint returns `\"status\":false` if username exists\n- raise ExtractorError('Unable to login: Invalid username', expected=True)\n-\n- login = self._download_json(\n- f'{self._API_BASE_URL}/user/auth', None, note='Logging in', fatal=False,\n- expected_status=400, headers=headers, data=json.dumps({\n- 'username': username,\n- 'password': password,\n- }, separators=(',', ':')).encode()) or {}\n-\n- if not login.get('auth_token'):\n- if login.get('error') == 1008:\n- raise ExtractorError('Unable to login: Incorrect password', expected=True)\n- raise ExtractorError('Unable to login')\n-\n- self._API_HEADERS['Authorization'] = f'Bearer {login[\"auth_token\"]}'\n-\n- def _get_comments(self, video_id, limit=15):\n- comment_info = self._download_json(\n- f'{self._API_BASE_URL}/api/videos/{video_id}/comments_v2',\n- video_id, fatal=False, note='Downloading comments API JSON',\n- headers=self._API_HEADERS, query={'limit': limit}) or {}\n- if not comment_info.get('comments'):\n- return\n- yield from traverse_obj(comment_info, ('comments', ..., {\n- 'id': ('id', {str_or_none}),\n- 'text': 'body',\n- 'author': ('author', 'username'),\n- 'author_id': ('author', 'user_id'),\n- 'timestamp': ('timestamp', {unified_timestamp}),\n- }))\n-\n- def _parse_video_info(self, video_info, username, user_id, display_id=None):\n- video_id = str(video_info['id'])\n- display_id = display_id or video_info.get('video_uuid')\n-\n- if traverse_obj(video_info, (\n- None, ('transcoded_url', 'video_url', 'stream_url', 'audio_url'),\n- {lambda x: re.search(r'/copyright/', x)}), get_all=False):\n- self.raise_no_formats('This video has been removed due to licensing restrictions', expected=True)\n-\n- def format_info(url):\n- return {\n- 'url': url,\n- 'ext': determine_ext(url),\n- 'format_id': url_basename(url).split('.')[0],\n- }\n-\n- formats = []\n-\n- if determine_ext(video_info.get('transcoded_url')) == 'm3u8':\n- formats.extend(self._extract_m3u8_formats(\n- video_info['transcoded_url'], video_id, 'mp4', m3u8_id='hls', fatal=False))\n-\n- for video in traverse_obj(video_info, ('video_set', lambda _, v: url_or_none(v['url']))):\n- formats.append({\n- **format_info(video['url']),\n- **parse_resolution(video.get('resolution')),\n- 'vcodec': video.get('codec'),\n- 'vbr': int_or_none(video.get('bitrate'), 1000),\n- })\n-\n- video_url = traverse_obj(video_info, 'video_url', 'stream_url', expected_type=url_or_none)\n- if video_url:\n- formats.append({\n- **format_info(video_url),\n- 'vcodec': 'h264',\n- **traverse_obj(video_info, {\n- 'width': 'width',\n- 'height': 'height',\n- 'filesize': 'filesize',\n- }, expected_type=int_or_none),\n- })\n-\n- audio_url = url_or_none(video_info.get('audio_url'))\n- if audio_url:\n- formats.append(format_info(audio_url))\n-\n- comment_count = traverse_obj(video_info, ('comment_count', {int_or_none}))\n-\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'uploader': username,\n- 'uploader_id': user_id or traverse_obj(video_info, ('user', 'user_id', {str_or_none})),\n- 'webpage_url': urljoin(f'https://triller.co/@{username}/video/', display_id),\n- 'uploader_url': f'https://triller.co/@{username}',\n- 'extractor_key': TrillerIE.ie_key(),\n- 'extractor': TrillerIE.IE_NAME,\n- 'formats': formats,\n- 'comment_count': comment_count,\n- '__post_extractor': self.extract_comments(video_id, comment_count),\n- **traverse_obj(video_info, {\n- 'title': ('description', {lambda x: x.replace('\\r\\n', ' ')}),\n- 'description': 'description',\n- 'creator': ((('user'), ('users', lambda _, v: str(v['user_id']) == user_id)), 'name'),\n- 'thumbnail': ('thumbnail_url', {url_or_none}),\n- 'timestamp': ('timestamp', {unified_timestamp}),\n- 'duration': ('duration', {int_or_none}),\n- 'view_count': ('play_count', {int_or_none}),\n- 'like_count': ('likes_count', {int_or_none}),\n- 'artist': 'song_artist',\n- 'track': 'song_title',\n- }, get_all=False),\n- }\n-\n-\n-class TrillerIE(TrillerBaseIE):\n- _VALID_URL = r'''(?x)\n- https?://(?:www\\.)?triller\\.co/\n- @(?P<username>[\\w.]+)/video/(?P<id>[\\da-f]{8}-(?:[\\da-f]{4}-){3}[\\da-f]{12})\n- '''\n- _TESTS = [{\n- 'url': 'https://triller.co/@theestallion/video/2358fcd7-3df2-4c77-84c8-1d091610a6cf',\n- 'md5': '228662d783923b60d78395fedddc0a20',\n- 'info_dict': {\n- 'id': '71595734',\n- 'ext': 'mp4',\n- 'title': 'md5:9a2bf9435c5c4292678996a464669416',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:9a2bf9435c5c4292678996a464669416',\n- 'uploader': 'theestallion',\n- 'uploader_id': '18992236',\n- 'creator': 'Megan Thee Stallion',\n- 'timestamp': 1660598222,\n- 'upload_date': '20220815',\n- 'duration': 47,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Megan Thee Stallion',\n- 'track': 'Her',\n- 'uploader_url': 'https://triller.co/@theestallion',\n- 'comment_count': int,\n- },\n- 'skip': 'This video has been removed due to licensing restrictions',\n- }, {\n- 'url': 'https://triller.co/@charlidamelio/video/46c6fcfa-aa9e-4503-a50c-68444f44cddc',\n- 'md5': '874055f462af5b0699b9dbb527a505a0',\n- 'info_dict': {\n- 'id': '71621339',\n- 'ext': 'mp4',\n- 'title': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\n- 'display_id': '46c6fcfa-aa9e-4503-a50c-68444f44cddc',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:4c91ea82760fe0fffb71b8c3aa7295fc',\n- 'uploader': 'charlidamelio',\n- 'uploader_id': '1875551',\n- 'creator': 'charli damelio',\n- 'timestamp': 1660773354,\n- 'upload_date': '20220817',\n- 'duration': 16,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Dixie',\n- 'track': 'Someone to Blame',\n- 'uploader_url': 'https://triller.co/@charlidamelio',\n- 'comment_count': int,\n- },\n- }, {\n- 'url': 'https://triller.co/@theestallion/video/07f35f38-1f51-48e2-8c5f-f7a8e829988f',\n- 'md5': 'af7b3553e4b8bfca507636471ee2eb41',\n- 'info_dict': {\n- 'id': '71837829',\n- 'ext': 'mp4',\n- 'title': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio #womeninhiphop',\n- 'display_id': '07f35f38-1f51-48e2-8c5f-f7a8e829988f',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'UNGRATEFUL VIDEO OUT NOW ๐๐พ๐๐พ๐๐พ ๐๐ link my bio\\r\\n #womeninhiphop',\n- 'uploader': 'theestallion',\n- 'uploader_id': '18992236',\n- 'creator': 'Megan Thee Stallion',\n- 'timestamp': 1662486178,\n- 'upload_date': '20220906',\n- 'duration': 30,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Unknown',\n- 'track': 'Unknown',\n- 'uploader_url': 'https://triller.co/@theestallion',\n- 'comment_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- username, display_id = self._match_valid_url(url).group('username', 'id')\n-\n- video_info = self._download_json(\n- f'{self._API_BASE_URL}/api/videos/{display_id}', display_id,\n- headers=self._API_HEADERS)['videos'][0]\n-\n- return self._parse_video_info(video_info, username, None, display_id)\n-\n-\n-class TrillerUserIE(TrillerBaseIE):\n- _VALID_URL = r'https?://(?:www\\.)?triller\\.co/@(?P<id>[\\w.]+)/?(?:$|[#?])'\n- _TESTS = [{\n- 'url': 'https://triller.co/@theestallion',\n- 'playlist_mincount': 12,\n- 'info_dict': {\n- 'id': '18992236',\n- 'title': 'theestallion',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- },\n- }, {\n- 'url': 'https://triller.co/@charlidamelio',\n- 'playlist_mincount': 150,\n- 'info_dict': {\n- 'id': '1875551',\n- 'title': 'charlidamelio',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- },\n- }]\n-\n- def _real_initialize(self):\n- if not self._API_HEADERS.get('Authorization'):\n- guest = self._download_json(\n- f'{self._API_BASE_URL}/user/create_guest', None,\n- note='Creating guest session', data=b'', headers=self._API_HEADERS, query={\n- 'platform': 'Web',\n- 'app_version': '',\n- })\n- if not guest.get('auth_token'):\n- raise ExtractorError('Unable to fetch required auth token for user extraction')\n-\n- self._API_HEADERS['Authorization'] = f'Bearer {guest[\"auth_token\"]}'\n-\n- def _entries(self, username, user_id, limit=6):\n- query = {'limit': limit}\n- for page in itertools.count(1):\n- videos = self._download_json(\n- f'{self._API_BASE_URL}/api/users/{user_id}/videos',\n- username, note=f'Downloading user video list page {page}',\n- headers=self._API_HEADERS, query=query)\n-\n- for video in traverse_obj(videos, ('videos', ...)):\n- yield self._parse_video_info(video, username, user_id)\n-\n- query['before_time'] = traverse_obj(videos, ('videos', -1, 'timestamp'))\n- if not query['before_time']:\n- break\n-\n- def _real_extract(self, url):\n- username = self._match_id(url)\n-\n- user_info = traverse_obj(self._download_json(\n- f'{self._API_BASE_URL}/api/users/by_username/{username}',\n- username, note='Downloading user info', headers=self._API_HEADERS), ('user', {dict})) or {}\n-\n- if user_info.get('private') and user_info.get('followed_by_me') not in (True, 'true'):\n- raise ExtractorError('This user profile is private', expected=True)\n- elif traverse_obj(user_info, (('blocked_by_user', 'blocking_user'), {bool}), get_all=False):\n- raise ExtractorError('The author of the video is blocked', expected=True)\n-\n- user_id = str_or_none(user_info.get('user_id'))\n- if not user_id:\n- raise ExtractorError('Unable to extract user ID')\n-\n- return self.playlist_result(\n- self._entries(username, user_id), user_id, username, thumbnail=user_info.get('avatar_url'))\n-\n-\n-class TrillerShortIE(InfoExtractor):\n- _VALID_URL = r'https?://v\\.triller\\.co/(?P<id>\\w+)'\n- _TESTS = [{\n- 'url': 'https://v.triller.co/WWZNWk',\n- 'md5': '5eb8dc2c971bd8cd794ec9e8d5e9d101',\n- 'info_dict': {\n- 'id': '66210052',\n- 'ext': 'mp4',\n- 'title': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\n- 'display_id': 'f4480e1f-fb4e-45b9-a44c-9e6c679ce7eb',\n- 'thumbnail': r're:^https://uploads\\.cdn\\.triller\\.co/.+\\.jpg$',\n- 'description': 'md5:2dfc89d154cd91a4a18cd9582ba03e16',\n- 'uploader': 'statefairent',\n- 'uploader_id': '487545193',\n- 'creator': 'Officialย Summerย Fairย ofย LA',\n- 'timestamp': 1629655457,\n- 'upload_date': '20210822',\n- 'duration': 19,\n- 'view_count': int,\n- 'like_count': int,\n- 'artist': 'Unknown',\n- 'track': 'Unknown',\n- 'uploader_url': 'https://triller.co/@statefairent',\n- 'comment_count': int,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- real_url = self._request_webpage(HEADRequest(url), self._match_id(url)).url\n- if self.suitable(real_url): # Prevent infinite loop in case redirect fails\n- raise UnsupportedError(real_url)\n- return self.url_result(real_url)\ndiff --git a/yt_dlp/extractor/tvplayer.py b/yt_dlp/extractor/tvplayer.py\ndeleted file mode 100644\nindex 7c47bc78e313..000000000000\n--- a/yt_dlp/extractor/tvplayer.py\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-from .common import InfoExtractor\n-from ..networking.exceptions import HTTPError\n-from ..utils import (\n- ExtractorError,\n- extract_attributes,\n- try_get,\n- urlencode_postdata,\n-)\n-\n-\n-class TVPlayerIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?tvplayer\\.com/watch/(?P<id>[^/?#]+)'\n- _TEST = {\n- 'url': 'http://tvplayer.com/watch/bbcone',\n- 'info_dict': {\n- 'id': '89',\n- 'ext': 'mp4',\n- 'title': r're:^BBC One [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- webpage = self._download_webpage(url, display_id)\n-\n- current_channel = extract_attributes(self._search_regex(\n- r'(<div[^>]+class=\"[^\"]*current-channel[^\"]*\"[^>]*>)',\n- webpage, 'channel element'))\n- title = current_channel['data-name']\n-\n- resource_id = current_channel['data-id']\n-\n- token = self._search_regex(\n- r'data-token=([\"\\'])(?P<token>(?!\\1).+)\\1', webpage,\n- 'token', group='token')\n-\n- context = self._download_json(\n- 'https://tvplayer.com/watch/context', display_id,\n- 'Downloading JSON context', query={\n- 'resource': resource_id,\n- 'gen': token,\n- })\n-\n- validate = context['validate']\n- platform = try_get(\n- context, lambda x: x['platform']['key'], str) or 'firefox'\n-\n- try:\n- response = self._download_json(\n- 'http://api.tvplayer.com/api/v2/stream/live',\n- display_id, 'Downloading JSON stream', headers={\n- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',\n- }, data=urlencode_postdata({\n- 'id': resource_id,\n- 'service': 1,\n- 'platform': platform,\n- 'validate': validate,\n- }))['tvplayer']['response']\n- except ExtractorError as e:\n- if isinstance(e.cause, HTTPError):\n- response = self._parse_json(\n- e.cause.response.read().decode(), resource_id)['tvplayer']['response']\n- raise ExtractorError(\n- '{} said: {}'.format(self.IE_NAME, response['error']), expected=True)\n- raise\n-\n- formats = self._extract_m3u8_formats(response['stream'], display_id, 'mp4')\n-\n- return {\n- 'id': resource_id,\n- 'display_id': display_id,\n- 'title': title,\n- 'formats': formats,\n- 'is_live': True,\n- }\ndiff --git a/yt_dlp/extractor/ufctv.py b/yt_dlp/extractor/ufctv.py\nindex 2c1c5e0ff15e..13b256cd3fb9 100644\n--- a/yt_dlp/extractor/ufctv.py\n+++ b/yt_dlp/extractor/ufctv.py\n@@ -5,9 +5,3 @@ class UFCTVIE(ImgGamingBaseIE):\n _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\.)?(?:ufc\\.tv|(?:ufc)?fightpass\\.com)|ufcfightpass\\.img(?:dge|gaming)\\.com'\n _NETRC_MACHINE = 'ufctv'\n _REALM = 'ufc'\n-\n-\n-class UFCArabiaIE(ImgGamingBaseIE):\n- _VALID_URL = ImgGamingBaseIE._VALID_URL_TEMPL % r'(?:(?:app|www)\\.)?ufcarabia\\.(?:ae|com)'\n- _NETRC_MACHINE = 'ufcarabia'\n- _REALM = 'admufc'\ndiff --git a/yt_dlp/extractor/uktvplay.py b/yt_dlp/extractor/uktvplay.py\ndeleted file mode 100644\nindex 9abe3436f2e2..000000000000\n--- a/yt_dlp/extractor/uktvplay.py\n+++ /dev/null\n@@ -1,36 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class UKTVPlayIE(InfoExtractor):\n- _VALID_URL = r'https?://uktvplay\\.(?:uktv\\.)?co\\.uk/(?:.+?\\?.*?\\bvideo=|([^/]+/)*)(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'https://uktvplay.uktv.co.uk/shows/world-at-war/c/200/watch-online/?video=2117008346001',\n- 'info_dict': {\n- 'id': '2117008346001',\n- 'ext': 'mp4',\n- 'title': 'Pincers',\n- 'description': 'Pincers',\n- 'uploader_id': '1242911124001',\n- 'upload_date': '20130124',\n- 'timestamp': 1359049267,\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- 'expected_warnings': ['Failed to download MPD manifest'],\n- }, {\n- 'url': 'https://uktvplay.uktv.co.uk/shows/africa/watch-online/5983349675001',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://uktvplay.co.uk/shows/hornby-a-model-world/series-1/episode-1/6276739790001?autoplaying=true',\n- 'only_matching': True,\n- }]\n- # BRIGHTCOVE_URL_TEMPLATE = 'https://players.brightcove.net/1242911124001/OrCyvJ2gyL_default/index.html?videoId=%s'\n- BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1242911124001/H1xnMOqP_default/index.html?videoId=%s'\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- return self.url_result(\n- self.BRIGHTCOVE_URL_TEMPLATE % video_id,\n- 'BrightcoveNew', video_id)\ndiff --git a/yt_dlp/extractor/unsupported.py b/yt_dlp/extractor/unsupported.py\nindex 1e6f8c56ed36..5d965ec3a271 100644\n--- a/yt_dlp/extractor/unsupported.py\n+++ b/yt_dlp/extractor/unsupported.py\n@@ -71,6 +71,8 @@ class KnownDRMIE(UnsupportedInfoExtractor):\n r'watch\\.telusoriginals\\.com',\n r'video\\.unext\\.jp',\n r'www\\.web\\.nhk',\n+ r'fod\\.fujitv\\.co\\.jp',\n+ r'zee5\\.com',\n )\n \n _TESTS = [{\n@@ -252,6 +254,14 @@ class KnownDRMIE(UnsupportedInfoExtractor):\n # https://github.com/yt-dlp/yt-dlp/issues/14620\n 'url': 'https://www.web.nhk/tv/an/72hours/pl/series-tep-W3W8WRN8M3/ep/QW8ZY6146V',\n 'only_matching': True,\n+ }, {\n+ # https://github.com/yt-dlp/yt-dlp/issues/7064\n+ # https://github.com/yt-dlp/yt-dlp/issues/10264\n+ 'url': 'https://fod.fujitv.co.jp/title/709f/709f130001/',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.zee5.com/',\n+ 'only_matching': True,\n }]\n \n def _real_extract(self, url):\n@@ -291,6 +301,8 @@ class KnownPiracyIE(UnsupportedInfoExtractor):\n r'einthusan\\.(?:tv|com|ca)',\n r'yourupload\\.com',\n r'xanimu\\.com',\n+ r'musicdex\\.org',\n+ r'duboku\\.io',\n )\n \n _TESTS = [{\ndiff --git a/yt_dlp/extractor/utreon.py b/yt_dlp/extractor/utreon.py\ndeleted file mode 100644\nindex fc44df97b0b3..000000000000\n--- a/yt_dlp/extractor/utreon.py\n+++ /dev/null\n@@ -1,98 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- dict_get,\n- int_or_none,\n- str_or_none,\n- try_get,\n- unified_strdate,\n- url_or_none,\n-)\n-\n-\n-class UtreonIE(InfoExtractor):\n- IE_NAME = 'playeur'\n- _VALID_URL = r'https?://(?:www\\.)?(?:utreon|playeur)\\.com/v/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- 'url': 'https://utreon.com/v/z_I7ikQbuDw',\n- 'info_dict': {\n- 'id': 'z_I7ikQbuDw',\n- 'ext': 'mp4',\n- 'title': 'Freedom Friday meditation - Rising in the wind',\n- 'description': 'md5:a9bf15a42434a062fe313b938343ad1b',\n- 'uploader': 'Heather Dawn Elemental Health',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 586,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/jerJw5EOOVU',\n- 'info_dict': {\n- 'id': 'jerJw5EOOVU',\n- 'ext': 'mp4',\n- 'title': 'When I\\'m alone, I love to reflect in peace, to make my dreams come true... [Quotes and Poems]',\n- 'description': 'md5:4026aa3a2c10169c3649926ac8ef62b6',\n- 'uploader': 'Frases e Poemas Quotes and Poems',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 60,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/C4ZxXhYBBmE',\n- 'info_dict': {\n- 'id': 'C4ZxXhYBBmE',\n- 'ext': 'mp4',\n- 'title': 'Bidenโs Capital Gains Tax Rate to Test Worldโs Highest',\n- 'description': 'md5:995aa9ad0733c0e5863ebdeff954f40e',\n- 'uploader': 'Nomad Capitalist',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210723',\n- 'duration': 884,\n- },\n- }, {\n- 'url': 'https://utreon.com/v/Y-stEH-FBm8',\n- 'info_dict': {\n- 'id': 'Y-stEH-FBm8',\n- 'ext': 'mp4',\n- 'title': 'Creeper-Chan Pranks Steve! ๐ [MINECRAFT ANIME]',\n- 'description': 'md5:7a48450b0d761b96dec194be0c5ecb5f',\n- 'uploader': 'Merryweather Comics',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'release_date': '20210718',\n- 'duration': 151,\n- },\n- }, {\n- 'url': 'https://playeur.com/v/Wzqp-UrxSeu',\n- 'info_dict': {\n- 'id': 'Wzqp-UrxSeu',\n- 'ext': 'mp4',\n- 'title': 'Update: Clockwork Basilisk Books on the Way!',\n- 'description': 'md5:d9756b0b1884c904655b0e170d17cea5',\n- 'uploader': 'Forgotten Weapons',\n- 'release_date': '20240208',\n- 'thumbnail': r're:^https?://.+\\.jpg',\n- 'duration': 262,\n- },\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- json_data = self._download_json(\n- 'https://api.playeur.com/v1/videos/' + video_id,\n- video_id)\n- videos_json = json_data['videos']\n- formats = [{\n- 'url': format_url,\n- 'format_id': format_key.split('_')[1],\n- 'height': int(format_key.split('_')[1][:-1]),\n- } for format_key, format_url in videos_json.items() if url_or_none(format_url)]\n- thumbnail = url_or_none(dict_get(json_data, ('cover_image_url', 'preview_image_url')))\n- return {\n- 'id': video_id,\n- 'title': json_data['title'],\n- 'formats': formats,\n- 'description': str_or_none(json_data.get('description')),\n- 'duration': int_or_none(json_data.get('duration')),\n- 'uploader': str_or_none(try_get(json_data, lambda x: x['channel']['title'])),\n- 'thumbnail': thumbnail,\n- 'release_date': unified_strdate(json_data.get('published_datetime')),\n- }\ndiff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\nindex 1eb25530f833..dcf48c4ccc2f 100644\n--- a/yt_dlp/extractor/vgtv.py\n+++ b/yt_dlp/extractor/vgtv.py\n@@ -1,7 +1,6 @@\n import re\n \n from .common import InfoExtractor\n-from .xstream import XstreamIE\n from ..utils import (\n ExtractorError,\n float_or_none,\n@@ -9,7 +8,8 @@\n )\n \n \n-class VGTVIE(XstreamIE): # XXX: Do not subclass from concrete IE\n+class VGTVIE(InfoExtractor):\n+ _WORKING = False\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\n _GEO_BYPASS = False\n \ndiff --git a/yt_dlp/extractor/videodetective.py b/yt_dlp/extractor/videodetective.py\ndeleted file mode 100644\nindex 7928a41c2153..000000000000\n--- a/yt_dlp/extractor/videodetective.py\n+++ /dev/null\n@@ -1,27 +0,0 @@\n-from .common import InfoExtractor\n-from .internetvideoarchive import InternetVideoArchiveIE\n-\n-\n-class VideoDetectiveIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:www\\.)?videodetective\\.com/[^/]+/[^/]+/(?P<id>\\d+)'\n-\n- _TEST = {\n- 'url': 'http://www.videodetective.com/movies/kick-ass-2/194487',\n- 'info_dict': {\n- 'id': '194487',\n- 'ext': 'mp4',\n- 'title': 'Kick-Ass 2',\n- 'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',\n- },\n- 'params': {\n- # m3u8 download\n- 'skip_download': True,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- query = 'customerid=69249&publishedid=' + video_id\n- return self.url_result(\n- InternetVideoArchiveIE._build_json_url(query),\n- ie=InternetVideoArchiveIE.ie_key())\ndiff --git a/yt_dlp/extractor/videofyme.py b/yt_dlp/extractor/videofyme.py\ndeleted file mode 100644\nindex 6cdda75b2f3b..000000000000\n--- a/yt_dlp/extractor/videofyme.py\n+++ /dev/null\n@@ -1,51 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_iso8601,\n-)\n-\n-\n-class VideofyMeIE(InfoExtractor):\n- _WORKING = False\n- _VALID_URL = r'https?://(?:www\\.videofy\\.me/.+?|p\\.videofy\\.me/v)/(?P<id>\\d+)(&|#|$)'\n- IE_NAME = 'videofy.me'\n-\n- _TEST = {\n- 'url': 'http://www.videofy.me/thisisvideofyme/1100701',\n- 'md5': 'c77d700bdc16ae2e9f3c26019bd96143',\n- 'info_dict': {\n- 'id': '1100701',\n- 'ext': 'mp4',\n- 'title': 'This is VideofyMe',\n- 'description': '',\n- 'upload_date': '20130326',\n- 'timestamp': 1364288959,\n- 'uploader': 'VideofyMe',\n- 'uploader_id': 'thisisvideofyme',\n- 'view_count': int,\n- 'like_count': int,\n- 'comment_count': int,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n-\n- config = self._download_json(f'http://vf-player-info-loader.herokuapp.com/{video_id}.json', video_id)['videoinfo']\n-\n- video = config.get('video')\n- blog = config.get('blog', {})\n-\n- return {\n- 'id': video_id,\n- 'title': video['title'],\n- 'url': video['sources']['source']['url'],\n- 'thumbnail': video.get('thumb'),\n- 'description': video.get('description'),\n- 'timestamp': parse_iso8601(video.get('date')),\n- 'uploader': blog.get('name'),\n- 'uploader_id': blog.get('identifier'),\n- 'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),\n- 'like_count': int_or_none(video.get('likes')),\n- 'comment_count': int_or_none(video.get('nrOfComments')),\n- }\ndiff --git a/yt_dlp/extractor/videoken.py b/yt_dlp/extractor/videoken.py\nindex dc1dcf12bd86..e4d14fe48855 100644\n--- a/yt_dlp/extractor/videoken.py\n+++ b/yt_dlp/extractor/videoken.py\n@@ -1,190 +1,15 @@\n-import base64\n-import functools\n-import math\n-import re\n-import time\n import urllib.parse\n \n from .common import InfoExtractor\n from .slideslive import SlidesLiveIE\n from ..utils import (\n- ExtractorError,\n- InAdvancePagedList,\n- int_or_none,\n remove_start,\n- traverse_obj,\n update_url_query,\n url_or_none,\n )\n \n \n-class VideoKenBaseIE(InfoExtractor):\n- _ORGANIZATIONS = {\n- 'videos.icts.res.in': 'icts',\n- 'videos.cncf.io': 'cncf',\n- 'videos.neurips.cc': 'neurips',\n- }\n- _BASE_URL_RE = rf'https?://(?P<host>{\"|\".join(map(re.escape, _ORGANIZATIONS))})/'\n-\n- _PAGE_SIZE = 12\n-\n- def _get_org_id_and_api_key(self, org, video_id):\n- details = self._download_json(\n- f'https://analytics.videoken.com/api/videolake/{org}/details', video_id,\n- note='Downloading organization ID and API key', headers={\n- 'Accept': 'application/json',\n- })\n- return details['id'], details['apikey']\n-\n- def _create_slideslive_url(self, video_url, video_id, referer):\n- if not video_url and not video_id:\n- return\n- elif not video_url or 'embed/sign-in' in video_url:\n- video_url = f'https://slideslive.com/embed/{remove_start(video_id, \"slideslive-\")}'\n- if url_or_none(referer):\n- return update_url_query(video_url, {\n- 'embed_parent_url': referer,\n- 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\n- })\n- return video_url\n-\n- def _extract_videos(self, videos, url):\n- for video in traverse_obj(videos, (('videos', 'results'), ...)):\n- video_id = traverse_obj(video, 'youtube_id', 'videoid')\n- if not video_id:\n- continue\n- ie_key = None\n- if traverse_obj(video, 'type', 'source') == 'youtube':\n- video_url = video_id\n- ie_key = 'Youtube'\n- else:\n- video_url = traverse_obj(video, 'embed_url', 'embeddableurl', expected_type=url_or_none)\n- if not video_url:\n- continue\n- elif urllib.parse.urlparse(video_url).hostname == 'slideslive.com':\n- ie_key = SlidesLiveIE\n- video_url = self._create_slideslive_url(video_url, video_id, url)\n- yield self.url_result(video_url, ie_key, video_id)\n-\n-\n-class VideoKenIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:(?:topic|category)/[^/#?]+/)?video/(?P<id>[\\w-]+)'\n- _TESTS = [{\n- # neurips -> videoken -> slideslive\n- 'url': 'https://videos.neurips.cc/video/slideslive-38922815',\n- 'info_dict': {\n- 'id': '38922815',\n- 'ext': 'mp4',\n- 'title': 'Efficient Processing of Deep Neural Network: from Algorithms to Hardware Architectures',\n- 'timestamp': 1630939331,\n- 'upload_date': '20210906',\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|png)',\n- 'thumbnails': 'count:330',\n- 'chapters': 'count:329',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\n- }, {\n- # neurips -> videoken -> slideslive -> youtube\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/video/slideslive-38923348',\n- 'info_dict': {\n- 'id': '2Xa_dt78rJE',\n- 'ext': 'mp4',\n- 'display_id': '38923348',\n- 'title': 'Machine Education',\n- 'description': 'Watch full version of this video at https://slideslive.com/38923348.',\n- 'channel': 'SlidesLive Videos - G2',\n- 'channel_id': 'UCOExahQQ588Da8Nft_Ltb9w',\n- 'channel_url': 'https://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\n- 'uploader': 'SlidesLive Videos - G2',\n- 'uploader_id': 'UCOExahQQ588Da8Nft_Ltb9w',\n- 'uploader_url': 'http://www.youtube.com/channel/UCOExahQQ588Da8Nft_Ltb9w',\n- 'duration': 2504,\n- 'timestamp': 1618922125,\n- 'upload_date': '20200131',\n- 'age_limit': 0,\n- 'channel_follower_count': int,\n- 'view_count': int,\n- 'availability': 'unlisted',\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'categories': ['People & Blogs'],\n- 'tags': [],\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|webp)',\n- 'thumbnails': 'count:78',\n- 'chapters': 'count:77',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- 'expected_warnings': ['Failed to download VideoKen API JSON'],\n- }, {\n- # icts -> videoken -> youtube\n- 'url': 'https://videos.icts.res.in/topic/random%20variable/video/zysIsojYdvc',\n- 'info_dict': {\n- 'id': 'zysIsojYdvc',\n- 'ext': 'mp4',\n- 'title': 'Small-worlds, complex networks and random graphs (Lecture 3) by Remco van der Hofstad',\n- 'description': 'md5:87433069d79719eeadc1962cc2ace00b',\n- 'channel': 'International Centre for Theoretical Sciences',\n- 'channel_id': 'UCO3xnVTHzB7l-nc8mABUJIQ',\n- 'channel_url': 'https://www.youtube.com/channel/UCO3xnVTHzB7l-nc8mABUJIQ',\n- 'uploader': 'International Centre for Theoretical Sciences',\n- 'uploader_id': 'ICTStalks',\n- 'uploader_url': 'http://www.youtube.com/user/ICTStalks',\n- 'duration': 3372,\n- 'upload_date': '20191004',\n- 'age_limit': 0,\n- 'live_status': 'not_live',\n- 'availability': 'public',\n- 'playable_in_embed': True,\n- 'channel_follower_count': int,\n- 'like_count': int,\n- 'view_count': int,\n- 'categories': ['Science & Technology'],\n- 'tags': [],\n- 'thumbnail': r're:^https?://.*\\.(?:jpg|webp)',\n- 'thumbnails': 'count:42',\n- 'chapters': 'count:20',\n- },\n- 'params': {\n- 'skip_download': 'm3u8',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/category/478/video/IL4nxbmUIX8',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://videos.cncf.io/topic/kubernetes/video/YAM2d7yTrrI',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://videos.icts.res.in/video/d7HuP_abpKU',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- hostname, video_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], video_id)\n- details = self._download_json(\n- 'https://analytics.videoken.com/api/videoinfo_private', video_id, query={\n- 'videoid': video_id,\n- 'org_id': org_id,\n- }, headers={'Accept': 'application/json'}, note='Downloading VideoKen API JSON',\n- errnote='Failed to download VideoKen API JSON', fatal=False)\n- if details:\n- return next(self._extract_videos({'videos': [details]}, url))\n- # fallback for API error 400 response\n- elif video_id.startswith('slideslive-'):\n- return self.url_result(\n- self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\n- elif re.match(r'^[\\w-]{11}$', video_id):\n- return self.url_result(video_id, 'Youtube', video_id)\n- else:\n- raise ExtractorError('Unable to extract without VideoKen API response')\n-\n-\n-class VideoKenPlayerIE(VideoKenBaseIE):\n+class VideoKenPlayerIE(InfoExtractor):\n _VALID_URL = r'https?://player\\.videoken\\.com/embed/slideslive-(?P<id>\\d+)'\n _TESTS = [{\n 'url': 'https://player.videoken.com/embed/slideslive-38968434',\n@@ -203,135 +28,19 @@ class VideoKenPlayerIE(VideoKenBaseIE):\n },\n }]\n \n+ def _create_slideslive_url(self, video_url, video_id, referer):\n+ if not video_url and not video_id:\n+ return\n+ elif not video_url or 'embed/sign-in' in video_url:\n+ video_url = f'https://slideslive.com/embed/{remove_start(video_id, \"slideslive-\")}'\n+ if url_or_none(referer):\n+ return update_url_query(video_url, {\n+ 'embed_parent_url': referer,\n+ 'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',\n+ })\n+ return video_url\n+\n def _real_extract(self, url):\n video_id = self._match_id(url)\n return self.url_result(\n self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)\n-\n-\n-class VideoKenPlaylistIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'(?:category/\\d+/)?playlist/(?P<id>\\d+)'\n- _TESTS = [{\n- 'url': 'https://videos.icts.res.in/category/1822/playlist/381',\n- 'playlist_mincount': 117,\n- 'info_dict': {\n- 'id': '381',\n- 'title': 'Cosmology - The Next Decade',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- hostname, playlist_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], playlist_id)\n- videos = self._download_json(\n- f'https://analytics.videoken.com/api/{org_id}/playlistitems/{playlist_id}/',\n- playlist_id, headers={'Accept': 'application/json'}, note='Downloading API JSON')\n- return self.playlist_result(self._extract_videos(videos, url), playlist_id, videos.get('title'))\n-\n-\n-class VideoKenCategoryIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'category/(?P<id>\\d+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://videos.icts.res.in/category/1822/',\n- 'playlist_mincount': 500,\n- 'info_dict': {\n- 'id': '1822',\n- 'title': 'Programs',\n- },\n- }, {\n- 'url': 'https://videos.neurips.cc/category/350/',\n- 'playlist_mincount': 34,\n- 'info_dict': {\n- 'id': '350',\n- 'title': 'NeurIPS 2018',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/category/479/',\n- 'playlist_mincount': 328,\n- 'info_dict': {\n- 'id': '479',\n- 'title': 'KubeCon + CloudNativeCon Europe\\'19',\n- },\n- }]\n-\n- def _get_category_page(self, category_id, org_id, page=1, note=None):\n- return self._download_json(\n- f'https://analytics.videoken.com/api/videolake/{org_id}/category_videos', category_id,\n- fatal=False, note=note if note else f'Downloading category page {page}',\n- query={\n- 'category_id': category_id,\n- 'page_number': page,\n- 'length': self._PAGE_SIZE,\n- }, headers={'Accept': 'application/json'}) or {}\n-\n- def _entries(self, category_id, org_id, url, page):\n- videos = self._get_category_page(category_id, org_id, page + 1)\n- yield from self._extract_videos(videos, url)\n-\n- def _real_extract(self, url):\n- hostname, category_id = self._match_valid_url(url).group('host', 'id')\n- org_id, _ = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], category_id)\n- category_info = self._get_category_page(category_id, org_id, note='Downloading category info')\n- category = category_info['category_name']\n- total_pages = math.ceil(int(category_info['recordsTotal']) / self._PAGE_SIZE)\n- return self.playlist_result(InAdvancePagedList(\n- functools.partial(self._entries, category_id, org_id, url),\n- total_pages, self._PAGE_SIZE), category_id, category)\n-\n-\n-class VideoKenTopicIE(VideoKenBaseIE):\n- _VALID_URL = VideoKenBaseIE._BASE_URL_RE + r'topic/(?P<id>[^/#?]+)/?(?:$|[?#])'\n- _TESTS = [{\n- 'url': 'https://videos.neurips.cc/topic/machine%20learning/',\n- 'playlist_mincount': 500,\n- 'info_dict': {\n- 'id': 'machine_learning',\n- 'title': 'machine learning',\n- },\n- }, {\n- 'url': 'https://videos.icts.res.in/topic/gravitational%20waves/',\n- 'playlist_mincount': 77,\n- 'info_dict': {\n- 'id': 'gravitational_waves',\n- 'title': 'gravitational waves',\n- },\n- }, {\n- 'url': 'https://videos.cncf.io/topic/prometheus/',\n- 'playlist_mincount': 134,\n- 'info_dict': {\n- 'id': 'prometheus',\n- 'title': 'prometheus',\n- },\n- }]\n-\n- def _get_topic_page(self, topic, org_id, search_id, api_key, page=1, note=None):\n- return self._download_json(\n- 'https://es.videoken.com/api/v1.0/get_results', topic, fatal=False, query={\n- 'orgid': org_id,\n- 'size': self._PAGE_SIZE,\n- 'query': topic,\n- 'page': page,\n- 'sort': 'upload_desc',\n- 'filter': 'all',\n- 'token': api_key,\n- 'is_topic': 'true',\n- 'category': '',\n- 'searchid': search_id,\n- }, headers={'Accept': 'application/json'},\n- note=note if note else f'Downloading topic page {page}') or {}\n-\n- def _entries(self, topic, org_id, search_id, api_key, url, page):\n- videos = self._get_topic_page(topic, org_id, search_id, api_key, page + 1)\n- yield from self._extract_videos(videos, url)\n-\n- def _real_extract(self, url):\n- hostname, topic_id = self._match_valid_url(url).group('host', 'id')\n- topic = urllib.parse.unquote(topic_id)\n- topic_id = topic.replace(' ', '_')\n- org_id, api_key = self._get_org_id_and_api_key(self._ORGANIZATIONS[hostname], topic)\n- search_id = base64.b64encode(f':{topic}:{int(time.time())}:transient'.encode()).decode()\n- total_pages = int_or_none(self._get_topic_page(\n- topic, org_id, search_id, api_key, note='Downloading topic info')['total_no_of_pages'])\n- return self.playlist_result(InAdvancePagedList(\n- functools.partial(self._entries, topic, org_id, search_id, api_key, url),\n- total_pages, self._PAGE_SIZE), topic_id, topic)\ndiff --git a/yt_dlp/extractor/videomore.py b/yt_dlp/extractor/videomore.py\ndeleted file mode 100644\nindex c41d3d984553..000000000000\n--- a/yt_dlp/extractor/videomore.py\n+++ /dev/null\n@@ -1,304 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- int_or_none,\n- parse_qs,\n-)\n-\n-\n-class VideomoreBaseIE(InfoExtractor):\n- _API_BASE_URL = 'https://more.tv/api/v3/web/'\n- _VALID_URL_BASE = r'https?://(?:videomore\\.ru|more\\.tv)/'\n-\n- def _download_page_data(self, display_id):\n- return self._download_json(\n- self._API_BASE_URL + 'PageData', display_id, query={\n- 'url': '/' + display_id,\n- })['attributes']['response']['data']\n-\n- def _track_url_result(self, track):\n- track_vod = track['trackVod']\n- video_url = track_vod.get('playerLink') or track_vod['link']\n- return self.url_result(\n- video_url, VideomoreIE.ie_key(), track_vod.get('hubId'))\n-\n-\n-class VideomoreIE(InfoExtractor):\n- IE_NAME = 'videomore'\n- _VALID_URL = r'''(?x)\n- videomore:(?P<sid>\\d+)$|\n- https?://\n- (?:\n- videomore\\.ru/\n- (?:\n- embed|\n- [^/]+/[^/]+\n- )/|\n- (?:\n- (?:player\\.)?videomore\\.ru|\n- siren\\.more\\.tv/player\n- )/[^/]*\\?.*?\\btrack_id=|\n- odysseus\\.more.tv/player/(?P<partner_id>\\d+)/\n- )\n- (?P<id>\\d+)\n- (?:[/?#&]|\\.(?:xml|json)|$)\n- '''\n- _EMBED_REGEX = [r'''(?x)\n- (?:\n- <iframe[^>]+src=([\\'\"])|\n- <object[^>]+data=([\"\\'])https?://videomore\\.ru/player\\.swf\\?.*config=\n- )(?P<url>https?://videomore\\.ru/[^?#\"']+/\\d+(?:\\.xml)?)\n- ''']\n- _TESTS = [{\n- 'url': 'http://videomore.ru/kino_v_detalayah/5_sezon/367617',\n- 'md5': '44455a346edc0d509ac5b5a5b531dc35',\n- 'info_dict': {\n- 'id': '367617',\n- 'ext': 'flv',\n- 'title': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
5 ัะตะทะพะฝ ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\n- 'series': 'ะะธะฝะพ ะฒ ะดะตัะฐะปัั
',\n- 'episode': 'ะ ะณะพัััั
ะะปะตะบัะตะน ะงัะผะฐะบะพะฒ ะธ ะฎะปะธั ะะพะฒะฐะปัััะบ',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2910,\n- 'view_count': int,\n- 'comment_count': int,\n- 'age_limit': 16,\n- },\n- 'skip': 'The video is not available for viewing.',\n- }, {\n- 'url': 'http://videomore.ru/embed/259974',\n- 'info_dict': {\n- 'id': '259974',\n- 'ext': 'mp4',\n- 'title': 'ะะพะปะพะดะตะถะบะฐ 2 ัะตะทะพะฝ 40 ัะตัะธั',\n- 'series': 'ะะพะปะพะดะตะถะบะฐ',\n- 'season': '2 ัะตะทะพะฝ',\n- 'episode': '40 ัะตัะธั',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2789,\n- 'view_count': int,\n- 'age_limit': 16,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo/341073',\n- 'info_dict': {\n- 'id': '341073',\n- 'ext': 'flv',\n- 'title': 'ะัะพะผะพ ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\n- 'episode': 'ะะพะผะฐะฝะดะฐ ะฟัะพะธะณัะฐะปะฐ ะธะท-ะทะฐ ะะฐะบะธะฝะฐ?',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 29,\n- 'age_limit': 16,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'The video is not available for viewing.',\n- }, {\n- 'url': 'http://videomore.ru/elki_3?track_id=364623',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/embed/364623',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/364623.xml',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/364623.json',\n- 'only_matching': True,\n- }, {\n- 'url': 'http://videomore.ru/video/tracks/158031/quotes/33248',\n- 'only_matching': True,\n- }, {\n- 'url': 'videomore:367617',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://player.videomore.ru/?partner_id=97&track_id=736234&autoplay=0&userToken=',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://odysseus.more.tv/player/1788/352317',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://siren.more.tv/player/config?track_id=352317&partner_id=1788&user_token=',\n- 'only_matching': True,\n- }]\n- _GEO_BYPASS = False\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- video_id = mobj.group('sid') or mobj.group('id')\n- partner_id = mobj.group('partner_id') or parse_qs(url).get('partner_id', [None])[0] or '97'\n-\n- item = self._download_json(\n- 'https://siren.more.tv/player/config', video_id, query={\n- 'partner_id': partner_id,\n- 'track_id': video_id,\n- })['data']['playlist']['items'][0]\n-\n- title = item.get('title')\n- series = item.get('project_name')\n- season = item.get('season_name')\n- episode = item.get('episode_name')\n- if not title:\n- title = []\n- for v in (series, season, episode):\n- if v:\n- title.append(v)\n- title = ' '.join(title)\n-\n- streams = item.get('streams') or []\n- for protocol in ('DASH', 'HLS'):\n- stream_url = item.get(protocol.lower() + '_url')\n- if stream_url:\n- streams.append({'protocol': protocol, 'url': stream_url})\n-\n- formats = []\n- for stream in streams:\n- stream_url = stream.get('url')\n- if not stream_url:\n- continue\n- protocol = stream.get('protocol')\n- if protocol == 'DASH':\n- formats.extend(self._extract_mpd_formats(\n- stream_url, video_id, mpd_id='dash', fatal=False))\n- elif protocol == 'HLS':\n- formats.extend(self._extract_m3u8_formats(\n- stream_url, video_id, 'mp4', 'm3u8_native',\n- m3u8_id='hls', fatal=False))\n- elif protocol == 'MSS':\n- formats.extend(self._extract_ism_formats(\n- stream_url, video_id, ism_id='mss', fatal=False))\n-\n- if not formats:\n- error = item.get('error')\n- if error:\n- if error in ('ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะฝะตะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ะฝะฐ ัะตััะธัะพัะธะธ ััะพะน ัััะฐะฝั', 'ะะฐะฝะฝะพะต ะฒะธะดะตะพ ะดะพัััะฟะฝะพ ะดะปั ะฟัะพัะผะพััะฐ ัะพะปัะบะพ ะฝะฐ ัะตััะธัะพัะธะธ ะ ะพััะธะธ'):\n- self.raise_geo_restricted(countries=['RU'], metadata_available=True)\n- self.raise_no_formats(error, expected=True)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'series': series,\n- 'season': season,\n- 'episode': episode,\n- 'thumbnail': item.get('thumbnail_url'),\n- 'duration': int_or_none(item.get('duration')),\n- 'view_count': int_or_none(item.get('views')),\n- 'age_limit': int_or_none(item.get('min_age')),\n- 'formats': formats,\n- }\n-\n-\n-class VideomoreVideoIE(VideomoreBaseIE):\n- IE_NAME = 'videomore:video'\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?P<id>(?:(?:[^/]+/){2})?[^/?#&]+)(?:/*|[?#&].*?)$'\n- _TESTS = [{\n- # single video with og:video:iframe\n- 'url': 'http://videomore.ru/elki_3',\n- 'info_dict': {\n- 'id': '364623',\n- 'ext': 'flv',\n- 'title': 'ะะปะบะธ 3',\n- 'description': '',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 5579,\n- 'age_limit': 6,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Requires logging in',\n- }, {\n- # season single series with og:video:iframe\n- 'url': 'http://videomore.ru/poslednii_ment/1_sezon/14_seriya',\n- 'info_dict': {\n- 'id': '352317',\n- 'ext': 'mp4',\n- 'title': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั 1 ัะตะทะพะฝ 14 ัะตัะธั',\n- 'series': 'ะะพัะปะตะดะฝะธะน ะผะตะฝั',\n- 'season': '1 ัะตะทะพะฝ',\n- 'episode': '14 ัะตัะธั',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 2464,\n- 'age_limit': 16,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- 'url': 'http://videomore.ru/sejchas_v_seti/serii_221-240/226_vypusk',\n- 'only_matching': True,\n- }, {\n- # single video without og:video:iframe\n- 'url': 'http://videomore.ru/marin_i_ego_druzya',\n- 'info_dict': {\n- 'id': '359073',\n- 'ext': 'flv',\n- 'title': '1 ัะตัะธั. ะะดัะฐะฒััะฒัะน, ะะบะฒะฐะฒะธะปะปั!',\n- 'description': 'md5:c6003179538b5d353e7bcd5b1372b2d7',\n- 'thumbnail': r're:^https?://.*\\.jpg',\n- 'duration': 754,\n- 'age_limit': 6,\n- 'view_count': int,\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'redirects to https://more.tv/',\n- }, {\n- 'url': 'https://videomore.ru/molodezhka/6_sezon/29_seriya?utm_so',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://more.tv/poslednii_ment/1_sezon/14_seriya',\n- 'only_matching': True,\n- }]\n-\n- @classmethod\n- def suitable(cls, url):\n- return False if VideomoreIE.suitable(url) else super().suitable(url)\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- return self._track_url_result(self._download_page_data(display_id))\n-\n-\n-class VideomoreSeasonIE(VideomoreBaseIE):\n- IE_NAME = 'videomore:season'\n- _VALID_URL = VideomoreBaseIE._VALID_URL_BASE + r'(?!embed)(?P<id>[^/]+/[^/?#&]+)(?:/*|[?#&].*?)$'\n- _TESTS = [{\n- 'url': 'http://videomore.ru/molodezhka/film_o_filme',\n- 'info_dict': {\n- 'id': 'molodezhka/film_o_filme',\n- 'title': 'ะคะธะปัะผ ะพ ัะธะปัะผะต',\n- },\n- 'playlist_mincount': 3,\n- }, {\n- 'url': 'http://videomore.ru/molodezhka/sezon_promo?utm_so',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://more.tv/molodezhka/film_o_filme',\n- 'only_matching': True,\n- }]\n-\n- @classmethod\n- def suitable(cls, url):\n- return (False if (VideomoreIE.suitable(url) or VideomoreVideoIE.suitable(url))\n- else super().suitable(url))\n-\n- def _real_extract(self, url):\n- display_id = self._match_id(url)\n- season = self._download_page_data(display_id)\n- season_id = str(season['id'])\n- tracks = self._download_json(\n- self._API_BASE_URL + f'seasons/{season_id}/tracks',\n- season_id)['data']\n- entries = []\n- for track in tracks:\n- entries.append(self._track_url_result(track))\n- return self.playlist_result(entries, display_id, season.get('title'))\ndiff --git a/yt_dlp/extractor/vimm.py b/yt_dlp/extractor/vimm.py\ndeleted file mode 100644\nindex 7097149a5528..000000000000\n--- a/yt_dlp/extractor/vimm.py\n+++ /dev/null\n@@ -1,66 +0,0 @@\n-from .common import InfoExtractor\n-\n-\n-class VimmIE(InfoExtractor):\n- IE_NAME = 'Vimm:stream'\n- _VALID_URL = r'https?://(?:www\\.)?vimm\\.tv/(?:c/)?(?P<id>[0-9a-z-]+)$'\n- _TESTS = [{\n- 'url': 'https://www.vimm.tv/c/calimeatwagon',\n- 'info_dict': {\n- 'id': 'calimeatwagon',\n- 'ext': 'mp4',\n- 'title': 're:^calimeatwagon [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',\n- 'live_status': 'is_live',\n- },\n- 'skip': 'Live',\n- }, {\n- 'url': 'https://www.vimm.tv/octaafradio',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- channel_id = self._match_id(url)\n-\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\n- f'https://www.vimm.tv/hls/{channel_id}.m3u8', channel_id, 'mp4', m3u8_id='hls', live=True)\n-\n- return {\n- 'id': channel_id,\n- 'title': channel_id,\n- 'is_live': True,\n- 'formats': formats,\n- 'subtitles': subs,\n- }\n-\n-\n-class VimmRecordingIE(InfoExtractor):\n- IE_NAME = 'Vimm:recording'\n- _VALID_URL = r'https?://(?:www\\.)?vimm\\.tv/c/(?P<channel_id>[0-9a-z-]+)\\?v=(?P<video_id>[0-9A-Za-z]+)'\n- _TESTS = [{\n- 'url': 'https://www.vimm.tv/c/kaldewei?v=2JZsrPTFxsSz',\n- 'md5': '15122ee95baa32a548e4a3e120b598f1',\n- 'info_dict': {\n- 'id': '2JZsrPTFxsSz',\n- 'ext': 'mp4',\n- 'title': 'VIMM - [DE/GER] Kaldewei Live - In Farbe und Bunt',\n- 'uploader_id': 'kaldewei',\n- },\n- }]\n-\n- def _real_extract(self, url):\n- channel_id, video_id = self._match_valid_url(url).groups()\n-\n- webpage = self._download_webpage(url, video_id)\n- title = self._og_search_title(webpage)\n-\n- formats, subs = self._extract_m3u8_formats_and_subtitles(\n- f'https://d211qfrkztakg3.cloudfront.net/{channel_id}/{video_id}/index.m3u8', video_id, 'mp4', m3u8_id='hls', live=False)\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'is_live': False,\n- 'uploader_id': channel_id,\n- 'formats': formats,\n- 'subtitles': subs,\n- }\ndiff --git a/yt_dlp/extractor/vodpl.py b/yt_dlp/extractor/vodpl.py\ndeleted file mode 100644\nindex 8af1572d074f..000000000000\n--- a/yt_dlp/extractor/vodpl.py\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-from .onet import OnetBaseIE\n-\n-\n-class VODPlIE(OnetBaseIE):\n- _VALID_URL = r'https?://vod\\.pl/(?:[^/]+/)+(?P<id>[0-9a-zA-Z]+)'\n-\n- _TESTS = [{\n- 'url': 'https://vod.pl/filmy/chlopaki-nie-placza/3ep3jns',\n- 'md5': 'a7dc3b2f7faa2421aefb0ecaabf7ec74',\n- 'info_dict': {\n- 'id': '3ep3jns',\n- 'ext': 'mp4',\n- 'title': 'Chลopaki nie pลaczฤ
',\n- 'description': 'md5:f5f03b84712e55f5ac9f0a3f94445224',\n- 'timestamp': 1463415154,\n- 'duration': 5765,\n- 'upload_date': '20160516',\n- },\n- }, {\n- 'url': 'https://vod.pl/seriale/belfer-na-planie-praca-kamery-online/2c10heh',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n- info_dict = self._extract_from_id(self._search_mvp_id(webpage), webpage)\n- info_dict['id'] = video_id\n- return info_dict\ndiff --git a/yt_dlp/extractor/vuclip.py b/yt_dlp/extractor/vuclip.py\ndeleted file mode 100644\nindex ad7eab351e3b..000000000000\n--- a/yt_dlp/extractor/vuclip.py\n+++ /dev/null\n@@ -1,66 +0,0 @@\n-import re\n-import urllib.parse\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- parse_duration,\n- remove_end,\n-)\n-\n-\n-class VuClipIE(InfoExtractor):\n- _VALID_URL = r'https?://(?:m\\.)?vuclip\\.com/w\\?.*?cid=(?P<id>[0-9]+)'\n-\n- _TEST = {\n- 'url': 'http://m.vuclip.com/w?cid=1129900602&bu=8589892792&frm=w&z=34801&op=0&oc=843169247§ion=recommend',\n- 'info_dict': {\n- 'id': '1129900602',\n- 'ext': '3gp',\n- 'title': 'Top 10 TV Convicts',\n- 'duration': 733,\n- },\n- }\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage(url, video_id)\n-\n- ad_m = re.search(\n- r'''value=\"No.*?\" onClick=\"location.href='([^\"']+)'\"''', webpage)\n- if ad_m:\n- urlr = urllib.parse.urlparse(url)\n- adfree_url = urlr.scheme + '://' + urlr.netloc + ad_m.group(1)\n- webpage = self._download_webpage(\n- adfree_url, video_id, note='Download post-ad page')\n-\n- error_msg = self._html_search_regex(\n- r'<p class=\"message\">(.*?)</p>', webpage, 'error message',\n- default=None)\n- if error_msg:\n- raise ExtractorError(\n- f'{self.IE_NAME} said: {error_msg}', expected=True)\n-\n- # These clowns alternate between two page types\n- video_url = self._search_regex(\n- r'<a[^>]+href=\"([^\"]+)\"[^>]*><img[^>]+src=\"[^\"]*/play\\.gif',\n- webpage, 'video URL', default=None)\n- if video_url:\n- formats = [{\n- 'url': video_url,\n- }]\n- else:\n- formats = self._parse_html5_media_entries(url, webpage, video_id)[0]['formats']\n-\n- title = remove_end(self._html_search_regex(\n- r'<title>(.*?)-\\s*Vuclip</title>', webpage, 'title').strip(), ' - Video')\n-\n- duration = parse_duration(self._html_search_regex(\n- r'[(>]([0-9]+:[0-9]+)(?:<span|\\))', webpage, 'duration', fatal=False))\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'title': title,\n- 'duration': duration,\n- }\ndiff --git a/yt_dlp/extractor/vvvvid.py b/yt_dlp/extractor/vvvvid.py\ndeleted file mode 100644\nindex 4671bcd1f43d..000000000000\n--- a/yt_dlp/extractor/vvvvid.py\n+++ /dev/null\n@@ -1,336 +0,0 @@\n-import functools\n-import re\n-\n-from .common import InfoExtractor\n-from .youtube import YoutubeIE\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- str_or_none,\n-)\n-\n-\n-class VVVVIDIE(InfoExtractor):\n- _VALID_URL_BASE = r'https?://(?:www\\.)?vvvvid\\.it/(?:#!)?(?:show|anime|film|series)/'\n- _VALID_URL = rf'{_VALID_URL_BASE}(?P<show_id>\\d+)/[^/]+/(?P<season_id>\\d+)/(?P<id>[0-9]+)'\n- _TESTS = [{\n- # video_type == 'video/vvvvid'\n- 'url': 'https://www.vvvvid.it/show/498/the-power-of-computing/518/505692/playstation-vr-cambiera-il-nostro-modo-di-giocare',\n- 'info_dict': {\n- 'id': '505692',\n- 'ext': 'mp4',\n- 'title': 'Playstation VR cambierร il nostro modo di giocare',\n- 'duration': 93,\n- 'series': 'The Power of Computing',\n- 'season_id': '518',\n- 'episode': 'Playstation VR cambierร il nostro modo di giocare',\n- 'episode_id': '4747',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'thumbnail': 'https://static.vvvvid.it/img/zoomin/28CA2409-E663-34F0-2B02E72356556EA3_500k.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # video_type == 'video/rcs'\n- 'url': 'https://www.vvvvid.it/#!show/376/death-note-live-action/377/482493/episodio-01',\n- 'info_dict': {\n- 'id': '482493',\n- 'ext': 'mp4',\n- 'title': 'Episodio 01',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- 'skip': 'Every video/rcs is not working even in real website',\n- }, {\n- # video_type == 'video/youtube'\n- 'url': 'https://www.vvvvid.it/show/404/one-punch-man/406/486683/trailer',\n- 'md5': '33e0edfba720ad73a8782157fdebc648',\n- 'info_dict': {\n- 'id': 'RzmFKUDOUgw',\n- 'ext': 'mp4',\n- 'title': 'Trailer',\n- 'upload_date': '20150906',\n- 'description': 'md5:a5e802558d35247fee285875328c0b80',\n- 'uploader_id': '@EMOTIONLabelChannel',\n- 'uploader': 'EMOTION Label Channel',\n- 'episode_id': '3115',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'availability': str,\n- 'categories': list,\n- 'age_limit': 0,\n- 'channel': 'EMOTION Label Channel',\n- 'channel_follower_count': int,\n- 'channel_id': 'UCQ5URCSs1f5Cz9rh-cDGxNQ',\n- 'channel_url': 'https://www.youtube.com/channel/UCQ5URCSs1f5Cz9rh-cDGxNQ',\n- 'comment_count': int,\n- 'duration': 133,\n- 'episode': 'Trailer',\n- 'heatmap': list,\n- 'live_status': 'not_live',\n- 'playable_in_embed': True,\n- 'season_id': '406',\n- 'series': 'One-Punch Man',\n- 'tags': list,\n- 'uploader_url': 'https://www.youtube.com/@EMOTIONLabelChannel',\n- 'thumbnail': 'https://i.ytimg.com/vi/RzmFKUDOUgw/maxresdefault.jpg',\n- },\n- 'params': {\n- 'skip_download': True,\n- },\n- }, {\n- # video_type == 'video/dash'\n- 'url': 'https://www.vvvvid.it/show/844/le-bizzarre-avventure-di-jojo-vento-aureo/938/527551/golden-wind',\n- 'info_dict': {\n- 'id': '527551',\n- 'ext': 'mp4',\n- 'title': 'Golden Wind',\n- 'duration': 1430,\n- 'series': 'Le bizzarre avventure di Jojo - Vento Aureo',\n- 'season_id': '938',\n- 'episode': 'Golden Wind',\n- 'episode_number': 1,\n- 'episode_id': '9089',\n- 'view_count': int,\n- 'like_count': int,\n- 'repost_count': int,\n- 'thumbnail': 'https://static.vvvvid.it/img/thumbs/Dynit/Jojo/Jojo_S05Ep01-t.jpg',\n- 'season': 'Season 5',\n- 'season_number': 5,\n- },\n- 'params': {\n- 'skip_download': True,\n- 'format': 'mp4',\n- },\n- }, {\n- 'url': 'https://www.vvvvid.it/show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048',\n- 'only_matching': True,\n- }]\n- _conn_id = None\n-\n- @functools.cached_property\n- def _headers(self):\n- return {\n- **self.geo_verification_headers(),\n- 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.37',\n- }\n-\n- def _real_initialize(self):\n- self._conn_id = self._download_json(\n- 'https://www.vvvvid.it/user/login',\n- None, headers=self._headers)['data']['conn_id']\n-\n- def _download_info(self, show_id, path, video_id, fatal=True, query=None):\n- q = {\n- 'conn_id': self._conn_id,\n- }\n- if query:\n- q.update(query)\n- response = self._download_json(\n- f'https://www.vvvvid.it/vvvvid/ondemand/{show_id}/{path}',\n- video_id, headers=self._headers, query=q, fatal=fatal)\n- if not (response or fatal):\n- return\n- if response.get('result') == 'error':\n- raise ExtractorError('{} said: {}'.format(\n- self.IE_NAME, response['message']), expected=True)\n- return response['data']\n-\n- def _extract_common_video_info(self, video_data):\n- return {\n- 'thumbnail': video_data.get('thumbnail'),\n- 'episode_id': str_or_none(video_data.get('id')),\n- }\n-\n- def _real_extract(self, url):\n- show_id, season_id, video_id = self._match_valid_url(url).groups()\n-\n- response = self._download_info(\n- show_id, f'season/{season_id}',\n- video_id, query={'video_id': video_id})\n-\n- vid = int(video_id)\n- video_data = next(filter(\n- lambda episode: episode.get('video_id') == vid, response))\n- title = video_data['title']\n- formats = []\n-\n- # vvvvid embed_info decryption algorithm is reverse engineered from function $ds(h) at vvvvid.js\n- def ds(h):\n- g = 'MNOPIJKL89+/4567UVWXQRSTEFGHABCDcdefYZabstuvopqr0123wxyzklmnghij'\n-\n- def f(m):\n- l = []\n- o = 0\n- b = False\n- m_len = len(m)\n- while ((not b) and o < m_len):\n- n = m[o] << 2\n- o += 1\n- k = -1\n- j = -1\n- if o < m_len:\n- n += m[o] >> 4\n- o += 1\n- if o < m_len:\n- k = (m[o - 1] << 4) & 255\n- k += m[o] >> 2\n- o += 1\n- if o < m_len:\n- j = (m[o - 1] << 6) & 255\n- j += m[o]\n- o += 1\n- else:\n- b = True\n- else:\n- b = True\n- else:\n- b = True\n- l.append(n)\n- if k != -1:\n- l.append(k)\n- if j != -1:\n- l.append(j)\n- return l\n-\n- c = []\n- for e in h:\n- c.append(g.index(e))\n-\n- c_len = len(c)\n- for e in range(c_len * 2 - 1, -1, -1):\n- a = c[e % c_len] ^ c[(e + 1) % c_len]\n- c[e % c_len] = a\n-\n- c = f(c)\n- d = ''\n- for e in c:\n- d += chr(e)\n-\n- return d\n-\n- info = {}\n-\n- def metadata_from_url(r_url):\n- if not info and r_url:\n- mobj = re.search(r'_(?:S(\\d+))?Ep(\\d+)', r_url)\n- if mobj:\n- info['episode_number'] = int(mobj.group(2))\n- season_number = mobj.group(1)\n- if season_number:\n- info['season_number'] = int(season_number)\n-\n- video_type = video_data.get('video_type')\n- is_youtube = False\n- for quality in ('', '_sd'):\n- embed_code = video_data.get('embed_info' + quality)\n- if not embed_code:\n- continue\n- embed_code = ds(embed_code)\n- if video_type == 'video/kenc':\n- embed_code = re.sub(r'https?(://[^/]+)/z/', r'https\\1/i/', embed_code).replace('/manifest.f4m', '/master.m3u8')\n- kenc = self._download_json(\n- 'https://www.vvvvid.it/kenc', video_id, query={\n- 'action': 'kt',\n- 'conn_id': self._conn_id,\n- 'url': embed_code,\n- }, fatal=False) or {}\n- kenc_message = kenc.get('message')\n- if kenc_message:\n- embed_code += '?' + ds(kenc_message)\n- formats.extend(self._extract_m3u8_formats(\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- elif video_type == 'video/rcs':\n- formats.extend(self._extract_akamai_formats(embed_code, video_id))\n- elif video_type == 'video/youtube':\n- info.update({\n- '_type': 'url_transparent',\n- 'ie_key': YoutubeIE.ie_key(),\n- 'url': embed_code,\n- })\n- is_youtube = True\n- break\n- elif video_type == 'video/dash':\n- formats.extend(self._extract_m3u8_formats(\n- embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))\n- else:\n- formats.extend(self._extract_wowza_formats(\n- f'http://sb.top-ix.org/videomg/_definst_/mp4:{embed_code}/playlist.m3u8', video_id, skip_protocols=['f4m']))\n- metadata_from_url(embed_code)\n-\n- if not is_youtube:\n- info['formats'] = formats\n-\n- metadata_from_url(video_data.get('thumbnail'))\n- info.update(self._extract_common_video_info(video_data))\n- info.update({\n- 'id': video_id,\n- 'title': title,\n- 'duration': int_or_none(video_data.get('length')),\n- 'series': video_data.get('show_title'),\n- 'season_id': season_id,\n- 'episode': title,\n- 'view_count': int_or_none(video_data.get('views')),\n- 'like_count': int_or_none(video_data.get('video_likes')),\n- 'repost_count': int_or_none(video_data.get('video_shares')),\n- })\n- return info\n-\n-\n-class VVVVIDShowIE(VVVVIDIE): # XXX: Do not subclass from concrete IE\n- _VALID_URL = rf'(?P<base_url>{VVVVIDIE._VALID_URL_BASE}(?P<id>\\d+)(?:/(?P<show_title>[^/?&#]+))?)/?(?:[?#&]|$)'\n- _TESTS = [{\n- 'url': 'https://www.vvvvid.it/show/156/psyco-pass',\n- 'info_dict': {\n- 'id': '156',\n- 'title': 'Psycho-Pass',\n- 'description': 'md5:94d572c0bd85894b193b8aebc9a3a806',\n- },\n- 'playlist_count': 46,\n- }, {\n- 'url': 'https://www.vvvvid.it/show/156',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- base_url, show_id, show_title = self._match_valid_url(url).groups()\n-\n- seasons = self._download_info(\n- show_id, 'seasons/', show_title)\n-\n- show_info = self._download_info(\n- show_id, 'info/', show_title, fatal=False)\n-\n- if not show_title:\n- base_url += '/title'\n-\n- entries = []\n- for season in (seasons or []):\n- episodes = season.get('episodes') or []\n- playlist_title = season.get('name') or show_info.get('title')\n- for episode in episodes:\n- if episode.get('playable') is False:\n- continue\n- season_id = str_or_none(episode.get('season_id'))\n- video_id = str_or_none(episode.get('video_id'))\n- if not (season_id and video_id):\n- continue\n- info = self._extract_common_video_info(episode)\n- info.update({\n- '_type': 'url_transparent',\n- 'ie_key': VVVVIDIE.ie_key(),\n- 'url': '/'.join([base_url, season_id, video_id]),\n- 'title': episode.get('title'),\n- 'description': episode.get('description'),\n- 'season_id': season_id,\n- 'playlist_title': playlist_title,\n- })\n- entries.append(info)\n-\n- return self.playlist_result(\n- entries, show_id, show_info.get('title'), show_info.get('description'))\ndiff --git a/yt_dlp/extractor/wdr.py b/yt_dlp/extractor/wdr.py\nindex 1c1f0ed0526f..d906605d19aa 100644\n--- a/yt_dlp/extractor/wdr.py\n+++ b/yt_dlp/extractor/wdr.py\n@@ -347,35 +347,3 @@ def _real_extract(self, url):\n raise ExtractorError(\n f'{display_id} is not a video', expected=True)\n return self.url_result(zmdb_url_element.text, ie=WDRIE.ie_key())\n-\n-\n-class WDRMobileIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- https?://mobile-ondemand\\.wdr\\.de/\n- .*?/fsk(?P<age_limit>[0-9]+)\n- /[0-9]+/[0-9]+/\n- (?P<id>[0-9]+)_(?P<title>[0-9]+)'''\n- IE_NAME = 'wdr:mobile'\n- _WORKING = False # no such domain\n- _TEST = {\n- 'url': 'http://mobile-ondemand.wdr.de/CMS2010/mdb/ondemand/weltweit/fsk0/42/421735/421735_4283021.mp4',\n- 'info_dict': {\n- 'title': '4283021',\n- 'id': '421735',\n- 'ext': 'mp4',\n- 'age_limit': 0,\n- },\n- 'skip': 'Problems with loading data.',\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- return {\n- 'id': mobj.group('id'),\n- 'title': mobj.group('title'),\n- 'age_limit': int(mobj.group('age_limit')),\n- 'url': url,\n- 'http_headers': {\n- 'User-Agent': 'mobile',\n- },\n- }\ndiff --git a/yt_dlp/extractor/weyyak.py b/yt_dlp/extractor/weyyak.py\ndeleted file mode 100644\nindex ef12be871fc7..000000000000\n--- a/yt_dlp/extractor/weyyak.py\n+++ /dev/null\n@@ -1,86 +0,0 @@\n-from .common import InfoExtractor\n-from ..utils import (\n- float_or_none,\n- int_or_none,\n- parse_age_limit,\n- traverse_obj,\n- unified_timestamp,\n- url_or_none,\n-)\n-\n-\n-class WeyyakIE(InfoExtractor):\n- _VALID_URL = r'https?://weyyak\\.com/(?P<lang>\\w+)/(?:player/)?(?P<type>episode|movie)/(?P<id>\\d+)'\n- _TESTS = [\n- {\n- 'url': 'https://weyyak.com/en/player/episode/1341952/Ribat-Al-Hob-Episode49',\n- 'md5': '0caf55c1a615531c8fe60f146ae46849',\n- 'info_dict': {\n- 'id': '1341952',\n- 'ext': 'mp4',\n- 'title': 'Ribat Al Hob',\n- 'duration': 2771,\n- 'alt_title': 'ุฑุจุงุท ุงูุญุจ',\n- 'season': 'Season 1',\n- 'season_number': 1,\n- 'episode': 'Episode 49',\n- 'episode_number': 49,\n- 'timestamp': 1485907200,\n- 'upload_date': '20170201',\n- 'thumbnail': r're:^https://content\\.weyyak\\.com/.+/poster-image',\n- 'categories': ['Drama', 'Thrillers', 'Romance'],\n- 'tags': 'count:8',\n- },\n- },\n- {\n- 'url': 'https://weyyak.com/en/movie/233255/8-Seconds',\n- 'md5': 'fe740ae0f63e4d1c8a7fc147a410c564',\n- 'info_dict': {\n- 'id': '233255',\n- 'ext': 'mp4',\n- 'title': '8 Seconds',\n- 'duration': 6490,\n- 'alt_title': '8 ุซูุงูู',\n- 'description': 'md5:45b83a155c30b49950624c7e99600b9d',\n- 'age_limit': 15,\n- 'release_year': 2015,\n- 'timestamp': 1683106031,\n- 'upload_date': '20230503',\n- 'thumbnail': r're:^https://content\\.weyyak\\.com/.+/poster-image',\n- 'categories': ['Drama', 'Social'],\n- 'cast': ['Ceylin Adiyaman', 'Esra Inal'],\n- },\n- },\n- ]\n-\n- def _real_extract(self, url):\n- video_id, lang, type_ = self._match_valid_url(url).group('id', 'lang', 'type')\n-\n- path = 'episode/' if type_ == 'episode' else 'contents/moviedetails?contentkey='\n- data = self._download_json(\n- f'https://msapifo-prod-me.weyyak.z5.com/v1/{lang}/{path}{video_id}', video_id)['data']\n- m3u8_url = self._download_json(\n- f'https://api-weyyak.akamaized.net/get_info/{data[\"video_id\"]}',\n- video_id, 'Extracting video details')['url_video']\n- formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id)\n-\n- return {\n- 'id': video_id,\n- 'formats': formats,\n- 'subtitles': subtitles,\n- **traverse_obj(data, {\n- 'title': ('title', {str}),\n- 'alt_title': ('translated_title', {str}),\n- 'description': ('synopsis', {str}),\n- 'duration': ('length', {float_or_none}),\n- 'age_limit': ('age_rating', {parse_age_limit}),\n- 'season_number': ('season_number', {int_or_none}),\n- 'episode_number': ('episode_number', {int_or_none}),\n- 'thumbnail': ('imagery', 'thumbnail', {url_or_none}),\n- 'categories': ('genres', ..., {str}),\n- 'tags': ('tags', ..., {str}),\n- 'cast': (('main_actor', 'main_actress'), {str}),\n- 'timestamp': ('insertedAt', {unified_timestamp}),\n- 'release_year': ('production_year', {int_or_none}),\n- }),\n- }\ndiff --git a/yt_dlp/extractor/xstream.py b/yt_dlp/extractor/xstream.py\ndeleted file mode 100644\nindex f7b48322cdf6..000000000000\n--- a/yt_dlp/extractor/xstream.py\n+++ /dev/null\n@@ -1,114 +0,0 @@\n-import re\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- find_xpath_attr,\n- int_or_none,\n- parse_iso8601,\n- xpath_text,\n- xpath_with_ns,\n-)\n-\n-\n-class XstreamIE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- (?:\n- xstream:|\n- https?://frontend\\.xstream\\.(?:dk|net)/\n- )\n- (?P<partner_id>[^/]+)\n- (?:\n- :|\n- /feed/video/\\?.*?\\bid=\n- )\n- (?P<id>\\d+)\n- '''\n- _TESTS = [{\n- 'url': 'http://frontend.xstream.dk/btno/feed/video/?platform=web&id=86588',\n- 'md5': 'd7d17e3337dc80de6d3a540aefbe441b',\n- 'info_dict': {\n- 'id': '86588',\n- 'ext': 'mov',\n- 'title': 'Otto Wollertsen',\n- 'description': 'Vestlendingen Otto Fredrik Wollertsen',\n- 'timestamp': 1430473209,\n- 'upload_date': '20150501',\n- },\n- }, {\n- 'url': 'http://frontend.xstream.dk/ap/feed/video/?platform=web&id=21039',\n- 'only_matching': True,\n- }]\n-\n- def _extract_video_info(self, partner_id, video_id):\n- data = self._download_xml(\n- f'http://frontend.xstream.dk/{partner_id}/feed/video/?platform=web&id={video_id}',\n- video_id)\n-\n- NS_MAP = {\n- 'atom': 'http://www.w3.org/2005/Atom',\n- 'xt': 'http://xstream.dk/',\n- 'media': 'http://search.yahoo.com/mrss/',\n- }\n-\n- entry = data.find(xpath_with_ns('./atom:entry', NS_MAP))\n-\n- title = xpath_text(\n- entry, xpath_with_ns('./atom:title', NS_MAP), 'title')\n- description = xpath_text(\n- entry, xpath_with_ns('./atom:summary', NS_MAP), 'description')\n- timestamp = parse_iso8601(xpath_text(\n- entry, xpath_with_ns('./atom:published', NS_MAP), 'upload date'))\n-\n- formats = []\n- media_group = entry.find(xpath_with_ns('./media:group', NS_MAP))\n- for media_content in media_group.findall(xpath_with_ns('./media:content', NS_MAP)):\n- media_url = media_content.get('url')\n- if not media_url:\n- continue\n- tbr = int_or_none(media_content.get('bitrate'))\n- mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', media_url)\n- if mobj:\n- formats.append({\n- 'url': mobj.group('url'),\n- 'play_path': 'mp4:{}'.format(mobj.group('playpath')),\n- 'app': mobj.group('app'),\n- 'ext': 'flv',\n- 'tbr': tbr,\n- 'format_id': 'rtmp-%d' % tbr,\n- })\n- else:\n- formats.append({\n- 'url': media_url,\n- 'tbr': tbr,\n- })\n-\n- link = find_xpath_attr(\n- entry, xpath_with_ns('./atom:link', NS_MAP), 'rel', 'original')\n- if link is not None:\n- formats.append({\n- 'url': link.get('href'),\n- 'format_id': link.get('rel'),\n- 'quality': 1,\n- })\n-\n- thumbnails = [{\n- 'url': splash.get('url'),\n- 'width': int_or_none(splash.get('width')),\n- 'height': int_or_none(splash.get('height')),\n- } for splash in media_group.findall(xpath_with_ns('./xt:splash', NS_MAP))]\n-\n- return {\n- 'id': video_id,\n- 'title': title,\n- 'description': description,\n- 'timestamp': timestamp,\n- 'formats': formats,\n- 'thumbnails': thumbnails,\n- }\n-\n- def _real_extract(self, url):\n- mobj = self._match_valid_url(url)\n- partner_id = mobj.group('partner_id')\n- video_id = mobj.group('id')\n-\n- return self._extract_video_info(partner_id, video_id)\ndiff --git a/yt_dlp/extractor/zee5.py b/yt_dlp/extractor/zee5.py\ndeleted file mode 100644\nindex fb523de03b4c..000000000000\n--- a/yt_dlp/extractor/zee5.py\n+++ /dev/null\n@@ -1,269 +0,0 @@\n-import json\n-import time\n-import uuid\n-\n-from .common import InfoExtractor\n-from ..utils import (\n- ExtractorError,\n- int_or_none,\n- jwt_decode_hs256,\n- parse_age_limit,\n- str_or_none,\n- try_call,\n- try_get,\n- unified_strdate,\n- unified_timestamp,\n- url_or_none,\n-)\n-\n-\n-class Zee5IE(InfoExtractor):\n- _VALID_URL = r'''(?x)\n- (?:\n- zee5:|\n- https?://(?:www\\.)?zee5\\.com/(?:[^#?]+/)?\n- (?:\n- (?:tv-shows|kids|web-series|zee5originals)(?:/[^#/?]+){3}\n- |(?:movies|kids|videos|news|music-videos)/(?!kids-shows)[^#/?]+\n- )/(?P<display_id>[^#/?]+)/\n- )\n- (?P<id>[^#/?]+)/?(?:$|[?#])\n- '''\n- _TESTS = [{\n- 'url': 'https://www.zee5.com/movies/details/adavari-matalaku-ardhale-verule/0-0-movie_1143162669',\n- 'info_dict': {\n- 'id': '0-0-movie_1143162669',\n- 'ext': 'mp4',\n- 'display_id': 'adavari-matalaku-ardhale-verule',\n- 'title': 'Adavari Matalaku Ardhale Verule',\n- 'duration': 9360,\n- 'description': str,\n- 'alt_title': 'Adavari Matalaku Ardhale Verule',\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\n- 'release_date': '20070427',\n- 'upload_date': '20070427',\n- 'timestamp': 1177632000,\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'episode_number': 0,\n- 'episode': 'Episode 0',\n- 'tags': list,\n- },\n- 'params': {\n- 'format': 'bv',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899/yoga-se-hoga-bandbudh-aur-budbak/0-1-239839',\n- 'info_dict': {\n- 'id': '0-1-239839',\n- 'ext': 'mp4',\n- 'display_id': 'yoga-se-hoga-bandbudh-aur-budbak',\n- 'title': 'Yoga Se Hoga-Bandbudh aur Budbak',\n- 'duration': 659,\n- 'description': str,\n- 'alt_title': 'Yoga Se Hoga-Bandbudh aur Budbak',\n- 'uploader': 'Zee Entertainment Enterprises Ltd',\n- 'release_date': '20150101',\n- 'upload_date': '20150101',\n- 'timestamp': 1420070400,\n- 'thumbnail': r're:^https?://.*\\.jpg$',\n- 'series': 'Bandbudh Aur Budbak',\n- 'season_number': 1,\n- 'episode_number': 1,\n- 'episode': 'Episode 1',\n- 'season': 'Season 1',\n- 'tags': list,\n- },\n- 'params': {\n- 'format': 'bv',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408/maine-dekhi-hai-uski-mrityu/0-1-6z587412',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/kids/kids-movies/maya-bommalu/0-0-movie_1040370005',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/news/details/jana-sena-chief-pawan-kalyan-shows-slippers-to-ysrcp-leaders/0-0-newsauto_6ettj4242oo0',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/music-videos/details/adhento-gaani-vunnapaatuga-jersey-nani-shraddha-srinath/0-0-56973',\n- 'only_matching': True,\n- }]\n- _DEVICE_ID = str(uuid.uuid4())\n- _USER_TOKEN = None\n- _LOGIN_HINT = 'Use \"--username <mobile_number>\" to login using otp or \"--username token\" and \"--password <user_token>\" to login using user token.'\n- _NETRC_MACHINE = 'zee5'\n- _GEO_COUNTRIES = ['IN']\n- _USER_COUNTRY = None\n-\n- def _perform_login(self, username, password):\n- if len(username) == 10 and username.isdigit() and self._USER_TOKEN is None:\n- self.report_login()\n- otp_request_json = self._download_json(f'https://b2bapi.zee5.com/device/sendotp_v1.php?phoneno=91{username}',\n- None, note='Sending OTP')\n- if otp_request_json['code'] == 0:\n- self.to_screen(otp_request_json['message'])\n- else:\n- raise ExtractorError(otp_request_json['message'], expected=True)\n- otp_code = self._get_tfa_info('OTP')\n- otp_verify_json = self._download_json(f'https://b2bapi.zee5.com/device/verifyotp_v1.php?phoneno=91{username}&otp={otp_code}&guest_token={self._DEVICE_ID}&platform=web',\n- None, note='Verifying OTP', fatal=False)\n- if not otp_verify_json:\n- raise ExtractorError('Unable to verify OTP.', expected=True)\n- self._USER_TOKEN = otp_verify_json.get('token')\n- if not self._USER_TOKEN:\n- raise ExtractorError(otp_request_json['message'], expected=True)\n- elif username.lower() == 'token' and try_call(lambda: jwt_decode_hs256(password)):\n- self._USER_TOKEN = password\n- else:\n- raise ExtractorError(self._LOGIN_HINT, expected=True)\n-\n- token = jwt_decode_hs256(self._USER_TOKEN)\n- if token.get('exp', 0) <= int(time.time()):\n- raise ExtractorError('User token has expired', expected=True)\n- self._USER_COUNTRY = token.get('current_country')\n-\n- def _real_extract(self, url):\n- video_id, display_id = self._match_valid_url(url).group('id', 'display_id')\n- access_token_request = self._download_json(\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\n- video_id, note='Downloading access token')['platform_token']\n- data = {\n- 'x-access-token': access_token_request['token'],\n- }\n- if self._USER_TOKEN:\n- data['Authorization'] = f'bearer {self._USER_TOKEN}'\n- else:\n- data['X-Z5-Guest-Token'] = self._DEVICE_ID\n-\n- json_data = self._download_json(\n- 'https://spapi.zee5.com/singlePlayback/getDetails/secure', video_id, query={\n- 'content_id': video_id,\n- 'device_id': self._DEVICE_ID,\n- 'platform_name': 'desktop_web',\n- 'country': self._USER_COUNTRY or self.get_param('geo_bypass_country') or 'IN',\n- 'check_parental_control': False,\n- }, headers={'content-type': 'application/json'}, data=json.dumps(data).encode())\n- asset_data = json_data['assetDetails']\n- show_data = json_data.get('showDetails', {})\n- if 'premium' in asset_data['business_type']:\n- raise ExtractorError('Premium content is DRM protected.', expected=True)\n- if not asset_data.get('hls_url'):\n- self.raise_login_required(self._LOGIN_HINT, metadata_available=True, method=None)\n- formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(asset_data['hls_url'], video_id, 'mp4', fatal=False)\n-\n- subtitles = {}\n- for sub in asset_data.get('subtitle_url', []):\n- sub_url = sub.get('url')\n- if not sub_url:\n- continue\n- subtitles.setdefault(sub.get('language', 'en'), []).append({\n- 'url': self._proto_relative_url(sub_url),\n- })\n- subtitles = self._merge_subtitles(subtitles, m3u8_subs)\n- return {\n- 'id': video_id,\n- 'display_id': display_id,\n- 'title': asset_data['title'],\n- 'formats': formats,\n- 'subtitles': subtitles,\n- 'duration': int_or_none(asset_data.get('duration')),\n- 'description': str_or_none(asset_data.get('description')),\n- 'alt_title': str_or_none(asset_data.get('original_title')),\n- 'uploader': str_or_none(asset_data.get('content_owner')),\n- 'age_limit': parse_age_limit(asset_data.get('age_rating')),\n- 'release_date': unified_strdate(asset_data.get('release_date')),\n- 'timestamp': unified_timestamp(asset_data.get('release_date')),\n- 'thumbnail': url_or_none(asset_data.get('image_url')),\n- 'series': str_or_none(asset_data.get('tvshow_name')),\n- 'season': try_get(show_data, lambda x: x['seasons']['title'], str),\n- 'season_number': int_or_none(try_get(show_data, lambda x: x['seasons'][0]['orderid'])),\n- 'episode_number': int_or_none(try_get(asset_data, lambda x: x['orderid'])),\n- 'tags': try_get(asset_data, lambda x: x['tags'], list),\n- }\n-\n-\n-class Zee5SeriesIE(InfoExtractor):\n- IE_NAME = 'zee5:series'\n- _VALID_URL = r'''(?x)\n- (?:\n- zee5:series:|\n- https?://(?:www\\.)?zee5\\.com/(?:[^#?]+/)?\n- (?:tv-shows|web-series|kids|zee5originals)/(?!kids-movies)(?:[^#/?]+/){2}\n- )\n- (?P<id>[^#/?]+)(?:/episodes)?/?(?:$|[?#])\n- '''\n- _TESTS = [{\n- 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899',\n- 'playlist_mincount': 156,\n- 'info_dict': {\n- 'id': '0-6-1899',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/bhabi-ji-ghar-par-hai/0-6-199',\n- 'playlist_mincount': 1500,\n- 'info_dict': {\n- 'id': '0-6-199',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/agent-raghav-crime-branch/0-6-965',\n- 'playlist_mincount': 24,\n- 'info_dict': {\n- 'id': '0-6-965',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/ta/tv-shows/details/nagabhairavi/0-6-3201',\n- 'playlist_mincount': 3,\n- 'info_dict': {\n- 'id': '0-6-3201',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/global/hi/tv-shows/details/khwaabon-ki-zamin-par/0-6-270',\n- 'playlist_mincount': 150,\n- 'info_dict': {\n- 'id': '0-6-270',\n- },\n- }, {\n- 'url': 'https://www.zee5.com/tv-shows/details/chala-hawa-yeu-dya-ladies-zindabaad/0-6-2943/episodes',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408',\n- 'only_matching': True,\n- }]\n-\n- def _entries(self, show_id):\n- access_token_request = self._download_json(\n- 'https://launchapi.zee5.com/launch?platform_name=web_app',\n- show_id, note='Downloading access token')['platform_token']\n- headers = {\n- 'X-Access-Token': access_token_request['token'],\n- 'Referer': 'https://www.zee5.com/',\n- }\n- show_url = f'https://gwapi.zee5.com/content/tvshow/{show_id}?translation=en&country=IN'\n-\n- page_num = 0\n- show_json = self._download_json(show_url, video_id=show_id, headers=headers)\n- for season in show_json.get('seasons') or []:\n- season_id = try_get(season, lambda x: x['id'], str)\n- next_url = f'https://gwapi.zee5.com/content/tvshow/?season_id={season_id}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100'\n- while next_url:\n- page_num += 1\n- episodes_json = self._download_json(\n- next_url, video_id=show_id, headers=headers,\n- note=f'Downloading JSON metadata page {page_num}')\n- for episode in try_get(episodes_json, lambda x: x['episode'], list) or []:\n- video_id = episode.get('id')\n- yield self.url_result(\n- f'zee5:{video_id}',\n- ie=Zee5IE.ie_key(), video_id=video_id)\n- next_url = url_or_none(episodes_json.get('next_episode_api'))\n-\n- def _real_extract(self, url):\n- show_id = self._match_id(url)\n- return self.playlist_result(self._entries(show_id), playlist_id=show_id)\n\ndiff --git a/test/test_subtitles.py b/test/test_subtitles.py\nindex 53e0b4eaf8dc..32e80df952c0 100644\n--- a/test/test_subtitles.py\n+++ b/test/test_subtitles.py\n@@ -16,7 +16,6 @@\n CeskaTelevizeIE,\n DailymotionIE,\n DemocracynowIE,\n- LyndaIE,\n RaiPlayIE,\n RTVEALaCartaIE,\n TedTalkIE,\n@@ -250,20 +249,6 @@ def test_nosubtitles(self):\n self.assertFalse(subtitles)\n \n \n-@is_download_test\n-@unittest.skip('IE broken')\n-class TestLyndaSubtitles(BaseTestSubtitles):\n- url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'\n- IE = LyndaIE\n-\n- def test_allsubtitles(self):\n- self.DL.params['writesubtitles'] = True\n- self.DL.params['allsubtitles'] = True\n- subtitles = self.getSubtitles()\n- self.assertEqual(set(subtitles.keys()), {'en'})\n- self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')\n-\n-\n @is_download_test\n @unittest.skip('IE broken')\n class TestNPOSubtitles(BaseTestSubtitles):\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":96,"string":"96"}}},{"rowIdx":34279,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16827"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16827,"string":"16,827"},"base_sha":{"kind":"string","value":"bc90c36b139c87cdc59399561dc1650198047a72"},"head_sha":{"kind":"string","value":"83c32f03861755dc7feb23d798f9317cc235157b"},"task":{"kind":"string","value":"Extract supplemental codecs from DASH manifests\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\nSome sites signal presence of supplemental codecs within the `supplementalCodecs` field of the DASH manifest, e.g. on Instagram, this is where Dolby Vision shows up. Extract `supplementalCodecs` when present and show it within the 'MORE INFO' column.\r\n\r\nExample usage:\r\n\r\n```\r\nโฏ ./yt-dlp.sh https://www.instagram.com/reel/DY5LOx3sFMa/ --cookies ~/instagram.com.cookies --add-headers \"User-Agent: Instagram 368.0.0.0.18 (iPhone17,1; iOS 18_3; en_US; en; scale=3.00; 1206x2622; 694977355) AppleWebKit/420+\" --extractor-args \"instagram:app_id=124024574287414\" -F\r\n[Instagram] Extracting URL: https://www.instagram.com/reel/DY5LOx3sFMa/\r\n[Instagram] DY5LOx3sFMa: Downloading video info\r\n[info] Available formats for DY5LOx3sFMa:\r\nID EXT RESOLUTION HDR โ FILESIZE TBR PROTO โ VCODEC VBR ACODEC ABR ASR MORE INFO\r\nโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ\r\ndash-1634602744320950a m4a audio only โ โ 44.31KiB 36k https โ audio only mp4a.40.42 36k 44k DASH audio, m4a_dash\r\ndash-27234122312941794a m4a audio only โ โ 86.28KiB 70k https โ audio only mp4a.40.42 70k 44k DASH audio, m4a_dash\r\ndash-982149028065299a m4a audio only โ โ117.33KiB 96k https โ audio only mp4a.40.42 96k 44k DASH audio, m4a_dash\r\ndash-980796334550567a m4a audio only โ โ144.23KiB 118k https โ audio only mp4a.40.42 118k 44k DASH audio, m4a_dash\r\n967388919549970v-0 mp4 720x1280 โ https โ unknown unknown\r\n967388919549970v-1 mp4 720x1280 โ https โ unknown unknown\r\n967388919549970v-2 mp4 720x1280 โ https โ unknown unknown\r\ndash-1392246932925383v mp4 720x1280 10 โ โ 1.23MiB 1027k https โ av01.0.05M.10 1027k video only DASH video, dav1.10.02, mp4_dash\r\ndash-1659217538534937v mp4 720x1280 10 โ โ 1.87MiB 1560k https โ av01.0.08M.10 1560k video only DASH video, dav1.10.04, mp4_dash\r\ndash-926863256996694v mp4 720x1280 10 โ โ 2.36MiB 1971k https โ av01.0.08M.10 1971k video only DASH video, dav1.10.04, mp4_dash\r\ndash-842871568436266v mp4 720x1280 10 โ โ 2.93MiB 2452k https โ av01.0.08M.10 2452k video only DASH video, dav1.10.04, mp4_dash\r\ndash-1570312311341272v mp4 720x1280 10 โ โ 3.50MiB 2923k https โ av01.0.08M.10 2923k video only DASH video, dav1.10.04, mp4_dash\r\ndash-991175720064395v mp4 720x1280 10 โ โ 4.57MiB 3823k https โ av01.0.08M.10 3823k video only DASH video, dav1.10.04, mp4_dash\r\ndash-1849465356024392v mp4 720x1280 10 โ โ 5.94MiB 4967k https โ av01.0.08M.10 4967k video only DASH video, dav1.10.04, mp4_dash\r\ndash-1306905454256214v mp4 1080x1920 10 โ โ 8.23MiB 6879k https โ av01.0.09M.10 6879k video only DASH video, dav1.10.05, mp4_dash\r\ndash-1735522221221232v mp4 1440x2560 10 โ โ 11.62MiB 9717k https โ av01.0.12M.10 9717k video only DASH video, dav1.10.07, mp4_dash\r\n```\r\n\r\nTest MPD fixture is based on `unfragmented.mpd` with `supplementalCodecs` attribute added to one representation.\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [ ] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n- [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))\r\n- [ ] Core bug fix/improvement\r\n- [ ] New feature (It is strongly [recommended to open an issue first](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#adding-new-feature-or-making-overarching-changes))\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `test/` needed for: Extract supplemental codecs from DASH manifests","scope_files":["test/test_InfoExtractor.py"]},{"subtask_id":"s2","goal":"Implement the changes under `test/testdata/mpd/` needed for: Extract supplemental codecs from DASH manifests","scope_files":["test/testdata/mpd/supplemental_codecs.mpd"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/extractor/` needed for: Extract supplemental codecs from DASH manifests","scope_files":["yt_dlp/extractor/common.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `test/` needed for: Extract supplemental codecs from DASH manifests\",\n \"scope_files\": [\n \"test/test_InfoExtractor.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/testdata/mpd/` needed for: Extract supplemental codecs from DASH manifests\",\n \"scope_files\": [\n \"test/testdata/mpd/supplemental_codecs.mpd\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/` needed for: Extract supplemental codecs from DASH manifests\",\n \"scope_files\": [\n \"yt_dlp/extractor/common.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["test/test_InfoExtractor.py"],"solution_diff":"diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py\nindex f66fdbf8da6f..63aef689a14f 100644\n--- a/test/test_InfoExtractor.py\n+++ b/test/test_InfoExtractor.py\n@@ -1415,6 +1415,51 @@ def test_parse_mpd_formats(self):\n },\n ],\n },\n+ ), (\n+ # SCTE 214 supplemental codecs (e.g. Dolby AV1)\n+ # Based on unfragmented.mpd with scte214:supplementalCodecs on VIDEO-1 only\n+ 'supplemental_codecs',\n+ 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd', # mpd_url\n+ 'https://v.redd.it/hw1x7rcg7zl21', # mpd_base_url\n+ [{\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/audio',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'm4a',\n+ 'format_id': 'AUDIO-1',\n+ 'format_note': 'DASH audio',\n+ 'container': 'm4a_dash',\n+ 'acodec': 'mp4a.40.2',\n+ 'vcodec': 'none',\n+ 'tbr': 129.87,\n+ 'asr': 48000,\n+ }, {\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_240',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'mp4',\n+ 'format_id': 'VIDEO-2',\n+ 'format_note': 'DASH video',\n+ 'container': 'mp4_dash',\n+ 'acodec': 'none',\n+ 'vcodec': 'avc1.4d401e',\n+ 'tbr': 608.0,\n+ 'width': 240,\n+ 'height': 240,\n+ 'fps': 30,\n+ }, {\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_360',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'mp4',\n+ 'format_id': 'VIDEO-1',\n+ 'format_note': 'DASH video, dav1.10.02',\n+ 'container': 'mp4_dash',\n+ 'acodec': 'none',\n+ 'vcodec': 'avc1.4d401e',\n+ 'tbr': 804.261,\n+ 'width': 360,\n+ 'height': 360,\n+ 'fps': 30,\n+ }],\n+ {},\n ),\n ]\n \n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s2","scope_files":["test/testdata/mpd/supplemental_codecs.mpd"],"solution_diff":"diff --git a/test/testdata/mpd/supplemental_codecs.mpd b/test/testdata/mpd/supplemental_codecs.mpd\nnew file mode 100644\nindex 000000000000..f005cf41549e\n--- /dev/null\n+++ b/test/testdata/mpd/supplemental_codecs.mpd\n@@ -0,0 +1,28 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n+<MPD mediaPresentationDuration=\"PT54.915S\" minBufferTime=\"PT1.500S\" profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\" type=\"static\" xmlns=\"urn:mpeg:dash:schema:mpd:2011\" xmlns:scte214=\"urn:scte:dash:scte214-extensions\">\n+ <Period duration=\"PT54.915S\">\n+ <AdaptationSet segmentAlignment=\"true\" subsegmentAlignment=\"true\" subsegmentStartsWithSAP=\"1\">\n+ <Representation bandwidth=\"804261\" codecs=\"avc1.4d401e\" frameRate=\"30\" height=\"360\" id=\"VIDEO-1\" mimeType=\"video/mp4\" scte214:supplementalCodecs=\"dav1.10.02\" startWithSAP=\"1\" width=\"360\">\n+ <BaseURL>DASH_360</BaseURL>\n+ <SegmentBase indexRange=\"915-1114\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-914\"/>\n+ </SegmentBase>\n+ </Representation>\n+ <Representation bandwidth=\"608000\" codecs=\"avc1.4d401e\" frameRate=\"30\" height=\"240\" id=\"VIDEO-2\" mimeType=\"video/mp4\" startWithSAP=\"1\" width=\"240\">\n+ <BaseURL>DASH_240</BaseURL>\n+ <SegmentBase indexRange=\"913-1112\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-912\"/>\n+ </SegmentBase>\n+ </Representation>\n+ </AdaptationSet>\n+ <AdaptationSet>\n+ <Representation audioSamplingRate=\"48000\" bandwidth=\"129870\" codecs=\"mp4a.40.2\" id=\"AUDIO-1\" mimeType=\"audio/mp4\" startWithSAP=\"1\">\n+ <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"2\"/>\n+ <BaseURL>audio</BaseURL>\n+ <SegmentBase indexRange=\"832-1007\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-831\"/>\n+ </SegmentBase>\n+ </Representation>\n+ </AdaptationSet>\n+ </Period>\n+</MPD>\n","summary":"Edited 1 file(s) in test/testdata/mpd/"},{"subtask_id":"s3","scope_files":["yt_dlp/extractor/common.py"],"solution_diff":"diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py\nindex 31c0266d4a9d..048c542858e5 100644\n--- a/yt_dlp/extractor/common.py\n+++ b/yt_dlp/extractor/common.py\n@@ -2970,6 +2970,8 @@ def extract_Initialization(source):\n content_type = representation_attrib.get('contentType', mime_type.split('/')[0])\n \n codec_str = representation_attrib.get('codecs', '')\n+ supplemental_codecs = representation_attrib.get(\n+ '{urn:scte:dash:scte214-extensions}supplementalCodecs')\n # Some kind of binary subtitle found in some youtube livestreams\n if mime_type == 'application/x-rawcc':\n codecs = {'scodec': codec_str}\n@@ -3025,7 +3027,7 @@ def extract_Initialization(source):\n 'asr': int_or_none(representation_attrib.get('audioSamplingRate')),\n 'fps': int_or_none(representation_attrib.get('frameRate')),\n 'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,\n- 'format_note': f'DASH {content_type}',\n+ 'format_note': join_nonempty(f'DASH {content_type}', supplemental_codecs, delim=', '),\n 'filesize': filesize,\n 'container': mimetype2ext(mime_type) + '_dash',\n **codecs,\n\n","summary":"Edited 1 file(s) in yt_dlp/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"test/test_InfoExtractor.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py\\nindex f66fdbf8da6f..63aef689a14f 100644\\n--- a/test/test_InfoExtractor.py\\n+++ b/test/test_InfoExtractor.py\\n@@ -1415,6 +1415,51 @@ def test_parse_mpd_formats(self):\\n },\\n ],\\n },\\n+ ), (\\n+ # SCTE 214 supplemental codecs (e.g. Dolby AV1)\\n+ # Based on unfragmented.mpd with scte214:supplementalCodecs on VIDEO-1 only\\n+ 'supplemental_codecs',\\n+ 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd', # mpd_url\\n+ 'https://v.redd.it/hw1x7rcg7zl21', # mpd_base_url\\n+ [{\\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/audio',\\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\\n+ 'ext': 'm4a',\\n+ 'format_id': 'AUDIO-1',\\n+ 'format_note': 'DASH audio',\\n+ 'container': 'm4a_dash',\\n+ 'acodec': 'mp4a.40.2',\\n+ 'vcodec': 'none',\\n+ 'tbr': 129.87,\\n+ 'asr': 48000,\\n+ }, {\\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_240',\\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\\n+ 'ext': 'mp4',\\n+ 'format_id': 'VIDEO-2',\\n+ 'format_note': 'DASH video',\\n+ 'container': 'mp4_dash',\\n+ 'acodec': 'none',\\n+ 'vcodec': 'avc1.4d401e',\\n+ 'tbr': 608.0,\\n+ 'width': 240,\\n+ 'height': 240,\\n+ 'fps': 30,\\n+ }, {\\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_360',\\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\\n+ 'ext': 'mp4',\\n+ 'format_id': 'VIDEO-1',\\n+ 'format_note': 'DASH video, dav1.10.02',\\n+ 'container': 'mp4_dash',\\n+ 'acodec': 'none',\\n+ 'vcodec': 'avc1.4d401e',\\n+ 'tbr': 804.261,\\n+ 'width': 360,\\n+ 'height': 360,\\n+ 'fps': 30,\\n+ }],\\n+ {},\\n ),\\n ]\\n \\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/testdata/mpd/supplemental_codecs.mpd\"\n ],\n \"solution_diff\": \"diff --git a/test/testdata/mpd/supplemental_codecs.mpd b/test/testdata/mpd/supplemental_codecs.mpd\\nnew file mode 100644\\nindex 000000000000..f005cf41549e\\n--- /dev/null\\n+++ b/test/testdata/mpd/supplemental_codecs.mpd\\n@@ -0,0 +1,28 @@\\n+<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\" standalone=\\\"yes\\\"?>\\n+<MPD mediaPresentationDuration=\\\"PT54.915S\\\" minBufferTime=\\\"PT1.500S\\\" profiles=\\\"urn:mpeg:dash:profile:isoff-on-demand:2011\\\" type=\\\"static\\\" xmlns=\\\"urn:mpeg:dash:schema:mpd:2011\\\" xmlns:scte214=\\\"urn:scte:dash:scte214-extensions\\\">\\n+ <Period duration=\\\"PT54.915S\\\">\\n+ <AdaptationSet segmentAlignment=\\\"true\\\" subsegmentAlignment=\\\"true\\\" subsegmentStartsWithSAP=\\\"1\\\">\\n+ <Representation bandwidth=\\\"804261\\\" codecs=\\\"avc1.4d401e\\\" frameRate=\\\"30\\\" height=\\\"360\\\" id=\\\"VIDEO-1\\\" mimeType=\\\"video/mp4\\\" scte214:supplementalCodecs=\\\"dav1.10.02\\\" startWithSAP=\\\"1\\\" width=\\\"360\\\">\\n+ <BaseURL>DASH_360</BaseURL>\\n+ <SegmentBase indexRange=\\\"915-1114\\\" indexRangeExact=\\\"true\\\">\\n+ <Initialization range=\\\"0-914\\\"/>\\n+ </SegmentBase>\\n+ </Representation>\\n+ <Representation bandwidth=\\\"608000\\\" codecs=\\\"avc1.4d401e\\\" frameRate=\\\"30\\\" height=\\\"240\\\" id=\\\"VIDEO-2\\\" mimeType=\\\"video/mp4\\\" startWithSAP=\\\"1\\\" width=\\\"240\\\">\\n+ <BaseURL>DASH_240</BaseURL>\\n+ <SegmentBase indexRange=\\\"913-1112\\\" indexRangeExact=\\\"true\\\">\\n+ <Initialization range=\\\"0-912\\\"/>\\n+ </SegmentBase>\\n+ </Representation>\\n+ </AdaptationSet>\\n+ <AdaptationSet>\\n+ <Representation audioSamplingRate=\\\"48000\\\" bandwidth=\\\"129870\\\" codecs=\\\"mp4a.40.2\\\" id=\\\"AUDIO-1\\\" mimeType=\\\"audio/mp4\\\" startWithSAP=\\\"1\\\">\\n+ <AudioChannelConfiguration schemeIdUri=\\\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\\\" value=\\\"2\\\"/>\\n+ <BaseURL>audio</BaseURL>\\n+ <SegmentBase indexRange=\\\"832-1007\\\" indexRangeExact=\\\"true\\\">\\n+ <Initialization range=\\\"0-831\\\"/>\\n+ </SegmentBase>\\n+ </Representation>\\n+ </AdaptationSet>\\n+ </Period>\\n+</MPD>\\n\",\n \"summary\": \"Edited 1 file(s) in test/testdata/mpd/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/extractor/common.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py\\nindex 31c0266d4a9d..048c542858e5 100644\\n--- a/yt_dlp/extractor/common.py\\n+++ b/yt_dlp/extractor/common.py\\n@@ -2970,6 +2970,8 @@ def extract_Initialization(source):\\n content_type = representation_attrib.get('contentType', mime_type.split('/')[0])\\n \\n codec_str = representation_attrib.get('codecs', '')\\n+ supplemental_codecs = representation_attrib.get(\\n+ '{urn:scte:dash:scte214-extensions}supplementalCodecs')\\n # Some kind of binary subtitle found in some youtube livestreams\\n if mime_type == 'application/x-rawcc':\\n codecs = {'scodec': codec_str}\\n@@ -3025,7 +3027,7 @@ def extract_Initialization(source):\\n 'asr': int_or_none(representation_attrib.get('audioSamplingRate')),\\n 'fps': int_or_none(representation_attrib.get('frameRate')),\\n 'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,\\n- 'format_note': f'DASH {content_type}',\\n+ 'format_note': join_nonempty(f'DASH {content_type}', supplemental_codecs, delim=', '),\\n 'filesize': filesize,\\n 'container': mimetype2ext(mime_type) + '_dash',\\n **codecs,\\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py\nindex 31c0266d4a9d..048c542858e5 100644\n--- a/yt_dlp/extractor/common.py\n+++ b/yt_dlp/extractor/common.py\n@@ -2970,6 +2970,8 @@ def extract_Initialization(source):\n content_type = representation_attrib.get('contentType', mime_type.split('/')[0])\n \n codec_str = representation_attrib.get('codecs', '')\n+ supplemental_codecs = representation_attrib.get(\n+ '{urn:scte:dash:scte214-extensions}supplementalCodecs')\n # Some kind of binary subtitle found in some youtube livestreams\n if mime_type == 'application/x-rawcc':\n codecs = {'scodec': codec_str}\n@@ -3025,7 +3027,7 @@ def extract_Initialization(source):\n 'asr': int_or_none(representation_attrib.get('audioSamplingRate')),\n 'fps': int_or_none(representation_attrib.get('frameRate')),\n 'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,\n- 'format_note': f'DASH {content_type}',\n+ 'format_note': join_nonempty(f'DASH {content_type}', supplemental_codecs, delim=', '),\n 'filesize': filesize,\n 'container': mimetype2ext(mime_type) + '_dash',\n **codecs,\n\ndiff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py\nindex f66fdbf8da6f..63aef689a14f 100644\n--- a/test/test_InfoExtractor.py\n+++ b/test/test_InfoExtractor.py\n@@ -1415,6 +1415,51 @@ def test_parse_mpd_formats(self):\n },\n ],\n },\n+ ), (\n+ # SCTE 214 supplemental codecs (e.g. Dolby AV1)\n+ # Based on unfragmented.mpd with scte214:supplementalCodecs on VIDEO-1 only\n+ 'supplemental_codecs',\n+ 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd', # mpd_url\n+ 'https://v.redd.it/hw1x7rcg7zl21', # mpd_base_url\n+ [{\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/audio',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'm4a',\n+ 'format_id': 'AUDIO-1',\n+ 'format_note': 'DASH audio',\n+ 'container': 'm4a_dash',\n+ 'acodec': 'mp4a.40.2',\n+ 'vcodec': 'none',\n+ 'tbr': 129.87,\n+ 'asr': 48000,\n+ }, {\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_240',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'mp4',\n+ 'format_id': 'VIDEO-2',\n+ 'format_note': 'DASH video',\n+ 'container': 'mp4_dash',\n+ 'acodec': 'none',\n+ 'vcodec': 'avc1.4d401e',\n+ 'tbr': 608.0,\n+ 'width': 240,\n+ 'height': 240,\n+ 'fps': 30,\n+ }, {\n+ 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_360',\n+ 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',\n+ 'ext': 'mp4',\n+ 'format_id': 'VIDEO-1',\n+ 'format_note': 'DASH video, dav1.10.02',\n+ 'container': 'mp4_dash',\n+ 'acodec': 'none',\n+ 'vcodec': 'avc1.4d401e',\n+ 'tbr': 804.261,\n+ 'width': 360,\n+ 'height': 360,\n+ 'fps': 30,\n+ }],\n+ {},\n ),\n ]\n \ndiff --git a/test/testdata/mpd/supplemental_codecs.mpd b/test/testdata/mpd/supplemental_codecs.mpd\nnew file mode 100644\nindex 000000000000..f005cf41549e\n--- /dev/null\n+++ b/test/testdata/mpd/supplemental_codecs.mpd\n@@ -0,0 +1,28 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n+<MPD mediaPresentationDuration=\"PT54.915S\" minBufferTime=\"PT1.500S\" profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\" type=\"static\" xmlns=\"urn:mpeg:dash:schema:mpd:2011\" xmlns:scte214=\"urn:scte:dash:scte214-extensions\">\n+ <Period duration=\"PT54.915S\">\n+ <AdaptationSet segmentAlignment=\"true\" subsegmentAlignment=\"true\" subsegmentStartsWithSAP=\"1\">\n+ <Representation bandwidth=\"804261\" codecs=\"avc1.4d401e\" frameRate=\"30\" height=\"360\" id=\"VIDEO-1\" mimeType=\"video/mp4\" scte214:supplementalCodecs=\"dav1.10.02\" startWithSAP=\"1\" width=\"360\">\n+ <BaseURL>DASH_360</BaseURL>\n+ <SegmentBase indexRange=\"915-1114\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-914\"/>\n+ </SegmentBase>\n+ </Representation>\n+ <Representation bandwidth=\"608000\" codecs=\"avc1.4d401e\" frameRate=\"30\" height=\"240\" id=\"VIDEO-2\" mimeType=\"video/mp4\" startWithSAP=\"1\" width=\"240\">\n+ <BaseURL>DASH_240</BaseURL>\n+ <SegmentBase indexRange=\"913-1112\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-912\"/>\n+ </SegmentBase>\n+ </Representation>\n+ </AdaptationSet>\n+ <AdaptationSet>\n+ <Representation audioSamplingRate=\"48000\" bandwidth=\"129870\" codecs=\"mp4a.40.2\" id=\"AUDIO-1\" mimeType=\"audio/mp4\" startWithSAP=\"1\">\n+ <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"2\"/>\n+ <BaseURL>audio</BaseURL>\n+ <SegmentBase indexRange=\"832-1007\" indexRangeExact=\"true\">\n+ <Initialization range=\"0-831\"/>\n+ </SegmentBase>\n+ </Representation>\n+ </AdaptationSet>\n+ </Period>\n+</MPD>\n"},"num_subtasks":{"kind":"number","value":3,"string":"3"},"num_changed_files":{"kind":"number","value":3,"string":"3"}}},{"rowIdx":34280,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16782"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16782,"string":"16,782"},"base_sha":{"kind":"string","value":"10b54835cf3f0d63cdd964a2f411db8f7cac3ff1"},"head_sha":{"kind":"string","value":"32724e2ac3f0b7449e0be95536b88045345a11de"},"task":{"kind":"string","value":"[ci] Update 3 actions in 9 workflows\n\n<!-- BEGIN dlp-bot generated section -->\n\nUpdated with `--exclude-newer 2026-06-08T13:09:14.108419Z`\n\naction | old | new | diff\n-------|-----|-----|-----\n[**`actions/checkout`**](<https://github.com/actions/checkout>) | [v6.0.***2***](<https://github.com/actions/checkout/releases/tag/v6.0.2>) | [v6.0.***3***](<https://github.com/actions/checkout/releases/tag/v6.0.3>) | [`de0fac2...df4cb1c`](<https://github.com/actions/checkout/compare/de0fac2e4500dabe0009e67214ff5f5447ce83dd...df4cb1c069e1874edd31b4311f1884172cec0e10>)\n[**`docker/setup-qemu-action`**](<https://github.com/docker/setup-qemu-action>) | [v4.***0.0***](<https://github.com/docker/setup-qemu-action/releases/tag/v4.0.0>) | [v4.***1.0***](<https://github.com/docker/setup-qemu-action/releases/tag/v4.1.0>) | [`ce36039...0611638`](<https://github.com/docker/setup-qemu-action/compare/ce360397dd3f832beb865e1373c09c0e9f86d70a...06116385d9baf250c9f4dcb4858b16962ea869c3>)\n[**`github/codeql-action`**](<https://github.com/github/codeql-action>) | [v4.***35.5***](<https://github.com/github/codeql-action/releases/tag/v4.35.5>) | [v4.***36.2***](<https://github.com/github/codeql-action/releases/tag/v4.36.2>) | [`9e0d7b8...8aad20d`](<https://github.com/github/codeql-action/compare/9e0d7b8d25671d64c341c19c0152d693099fb5ba...8aad20d150bbac5944a9f9d289da16a4b0d87c1e>)\n\nworkflow | updates\n---------|--------\n**`build.yml`** | `actions/checkout`, `docker/setup-qemu-action`\n**`challenge-tests.yml`** | `actions/checkout`\n**`codeql.yml`** | `actions/checkout`, `github/codeql-action`\n**`core.yml`** | `actions/checkout`\n**`quick-test.yml`** | `actions/checkout`\n**`release-nightly.yml`** | `actions/checkout`\n**`release.yml`** | `actions/checkout`\n**`test-workflows.yml`** | `actions/checkout`\n**`wiki.yml`** | `actions/checkout`\n\n```\n[ci] Update 3 actions in 9 workflows\n\n* Bump actions/checkout v6.0.2 => v6.0.3\n* Bump docker/setup-qemu-action v4.0.0 => v4.1.0\n* Bump github/codeql-action v4.35.5 => v4.36.2\n\nAuthored by: dlp-bot\n\n```\n\n<!-- END dlp-bot generated section -->\n\n\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\n\n\n### Before submitting a *pull request* make sure you have:\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\n\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/): This pull request was created by a bot that was written by the maintainers of this project\n\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\n- [x] Automated maintenance\n\n</details>\n\n\n---\n\n*This pull request is the product of [this GitHub Actions workflow run](https://github.com/bashonly/dlp-bot/actions/runs/27139819253).*"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [ci] Update 3 actions in 9 workflows","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/codeql.yml",".github/workflows/core.yml",".github/workflows/quick-test.yml",".github/workflows/release-nightly.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml",".github/workflows/wiki.yml"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [ci] Update 3 actions in 9 workflows\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/codeql.yml\",\n \".github/workflows/core.yml\",\n \".github/workflows/quick-test.yml\",\n \".github/workflows/release-nightly.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\",\n \".github/workflows/wiki.yml\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/codeql.yml",".github/workflows/core.yml",".github/workflows/quick-test.yml",".github/workflows/release-nightly.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml",".github/workflows/wiki.yml"],"solution_diff":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex a45a4b4e158f..37bbd65893bb 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -195,7 +195,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0 # Needed for changelog\n persist-credentials: false\n@@ -259,13 +259,13 @@ jobs:\n SKIP_ONEFILE_BUILD: ${{ (!matrix.onefile && '1') || '' }}\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n - name: Set up QEMU\n if: matrix.qemu_platform\n- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0\n+ uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0\n with:\n image: tonistiigi/binfmt:qemu-v10.0.4-56@sha256:30cc9a4d03765acac9be2ed0afc23af1ad018aed2c28ea4be8c2eb9afe03fbd1\n cache-image: false\n@@ -312,7 +312,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n@@ -438,7 +438,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 7f0f7078f6d1..77e4dd46d8a2 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -40,7 +40,7 @@ jobs:\n env:\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - name: Set up Python ${{ matrix.python-version }}\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 4bc3a63be85e..65b177548237 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -31,17 +31,17 @@ jobs:\n \n steps:\n - name: Checkout repository\n- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n+ uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n+ uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex d44bf703b78a..7f64564cb520 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -64,7 +64,7 @@ jobs:\n python-version: pypy-3.11\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: false\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\nindex 653971d8e79f..36f33866c21e 100644\n--- a/.github/workflows/quick-test.yml\n+++ b/.github/workflows/quick-test.yml\n@@ -21,7 +21,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - name: Set up Python 3.10\n@@ -48,7 +48,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\nindex a91e3a43bce5..37df9abb1c10 100644\n--- a/.github/workflows/release-nightly.yml\n+++ b/.github/workflows/release-nightly.yml\n@@ -16,7 +16,7 @@ jobs:\n outputs:\n commit: ${{ steps.check_for_new_commits.outputs.commit }}\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: false\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 9d926d9d349b..d5837af0beb3 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -84,7 +84,7 @@ jobs:\n head_sha: ${{ steps.get_target.outputs.head_sha }}\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: true # Needed to git-push the release commit\n@@ -174,7 +174,7 @@ jobs:\n runs-on: ubuntu-latest\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0 # Needed for changelog\n persist-credentials: false\n@@ -240,7 +240,7 @@ jobs:\n VERSION: ${{ needs.prepare.outputs.version }}\n HEAD_SHA: ${{ needs.prepare.outputs.head_sha }}\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: true # Needed to git-push the release tag\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 9332b69fbac9..360d36751234 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -26,7 +26,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n@@ -78,7 +78,7 @@ jobs:\n actions: read # Needed by zizmorcore/zizmor-action if repository is private\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \ndiff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml\nindex e8054d75cc3c..c368776ae310 100644\n--- a/.github/workflows/wiki.yml\n+++ b/.github/workflows/wiki.yml\n@@ -18,7 +18,7 @@ jobs:\n contents: write # Needed to git-push to the wiki\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n repository: yt-dlp/yt-dlp-wiki\n ref: master\n","summary":"Edited 9 file(s) in .github/workflows/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/codeql.yml\",\n \".github/workflows/core.yml\",\n \".github/workflows/quick-test.yml\",\n \".github/workflows/release-nightly.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\",\n \".github/workflows/wiki.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\\nindex a45a4b4e158f..37bbd65893bb 100644\\n--- a/.github/workflows/build.yml\\n+++ b/.github/workflows/build.yml\\n@@ -195,7 +195,7 @@ jobs:\\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0 # Needed for changelog\\n persist-credentials: false\\n@@ -259,13 +259,13 @@ jobs:\\n SKIP_ONEFILE_BUILD: ${{ (!matrix.onefile && '1') || '' }}\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\n - name: Set up QEMU\\n if: matrix.qemu_platform\\n- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0\\n+ uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0\\n with:\\n image: tonistiigi/binfmt:qemu-v10.0.4-56@sha256:30cc9a4d03765acac9be2ed0afc23af1ad018aed2c28ea4be8c2eb9afe03fbd1\\n cache-image: false\\n@@ -312,7 +312,7 @@ jobs:\\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\n@@ -438,7 +438,7 @@ jobs:\\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex 7f0f7078f6d1..77e4dd46d8a2 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -40,7 +40,7 @@ jobs:\\n env:\\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n - name: Set up Python ${{ matrix.python-version }}\\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\\nindex 4bc3a63be85e..65b177548237 100644\\n--- a/.github/workflows/codeql.yml\\n+++ b/.github/workflows/codeql.yml\\n@@ -31,17 +31,17 @@ jobs:\\n \\n steps:\\n - name: Checkout repository\\n- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\n - name: Initialize CodeQL\\n- uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\\n+ uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\\n with:\\n languages: ${{ matrix.language }}\\n build-mode: none\\n \\n - name: Perform CodeQL Analysis\\n- uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\\n+ uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\\n with:\\n category: \\\"/language:${{matrix.language}}\\\"\\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\\nindex d44bf703b78a..7f64564cb520 100644\\n--- a/.github/workflows/core.yml\\n+++ b/.github/workflows/core.yml\\n@@ -64,7 +64,7 @@ jobs:\\n python-version: pypy-3.11\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0\\n persist-credentials: false\\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\\nindex 653971d8e79f..36f33866c21e 100644\\n--- a/.github/workflows/quick-test.yml\\n+++ b/.github/workflows/quick-test.yml\\n@@ -21,7 +21,7 @@ jobs:\\n contents: read\\n runs-on: ubuntu-latest\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n - name: Set up Python 3.10\\n@@ -48,7 +48,7 @@ jobs:\\n contents: read\\n runs-on: ubuntu-latest\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\\nindex a91e3a43bce5..37df9abb1c10 100644\\n--- a/.github/workflows/release-nightly.yml\\n+++ b/.github/workflows/release-nightly.yml\\n@@ -16,7 +16,7 @@ jobs:\\n outputs:\\n commit: ${{ steps.check_for_new_commits.outputs.commit }}\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0\\n persist-credentials: false\\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\\nindex 9d926d9d349b..d5837af0beb3 100644\\n--- a/.github/workflows/release.yml\\n+++ b/.github/workflows/release.yml\\n@@ -84,7 +84,7 @@ jobs:\\n head_sha: ${{ steps.get_target.outputs.head_sha }}\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0\\n persist-credentials: true # Needed to git-push the release commit\\n@@ -174,7 +174,7 @@ jobs:\\n runs-on: ubuntu-latest\\n \\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0 # Needed for changelog\\n persist-credentials: false\\n@@ -240,7 +240,7 @@ jobs:\\n VERSION: ${{ needs.prepare.outputs.version }}\\n HEAD_SHA: ${{ needs.prepare.outputs.head_sha }}\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n fetch-depth: 0\\n persist-credentials: true # Needed to git-push the release tag\\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\\nindex 9332b69fbac9..360d36751234 100644\\n--- a/.github/workflows/test-workflows.yml\\n+++ b/.github/workflows/test-workflows.yml\\n@@ -26,7 +26,7 @@ jobs:\\n contents: read\\n runs-on: ubuntu-latest\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\n@@ -78,7 +78,7 @@ jobs:\\n actions: read # Needed by zizmorcore/zizmor-action if repository is private\\n runs-on: ubuntu-latest\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n persist-credentials: false\\n \\ndiff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml\\nindex e8054d75cc3c..c368776ae310 100644\\n--- a/.github/workflows/wiki.yml\\n+++ b/.github/workflows/wiki.yml\\n@@ -18,7 +18,7 @@ jobs:\\n contents: write # Needed to git-push to the wiki\\n runs-on: ubuntu-latest\\n steps:\\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\\n with:\\n repository: yt-dlp/yt-dlp-wiki\\n ref: master\\n\",\n \"summary\": \"Edited 9 file(s) in .github/workflows/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex a45a4b4e158f..37bbd65893bb 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -195,7 +195,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0 # Needed for changelog\n persist-credentials: false\n@@ -259,13 +259,13 @@ jobs:\n SKIP_ONEFILE_BUILD: ${{ (!matrix.onefile && '1') || '' }}\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n - name: Set up QEMU\n if: matrix.qemu_platform\n- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0\n+ uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0\n with:\n image: tonistiigi/binfmt:qemu-v10.0.4-56@sha256:30cc9a4d03765acac9be2ed0afc23af1ad018aed2c28ea4be8c2eb9afe03fbd1\n cache-image: false\n@@ -312,7 +312,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n@@ -438,7 +438,7 @@ jobs:\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 7f0f7078f6d1..77e4dd46d8a2 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -40,7 +40,7 @@ jobs:\n env:\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - name: Set up Python ${{ matrix.python-version }}\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 4bc3a63be85e..65b177548237 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -31,17 +31,17 @@ jobs:\n \n steps:\n - name: Checkout repository\n- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n+ uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n+ uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex d44bf703b78a..7f64564cb520 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -64,7 +64,7 @@ jobs:\n python-version: pypy-3.11\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: false\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\nindex 653971d8e79f..36f33866c21e 100644\n--- a/.github/workflows/quick-test.yml\n+++ b/.github/workflows/quick-test.yml\n@@ -21,7 +21,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - name: Set up Python 3.10\n@@ -48,7 +48,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\nindex a91e3a43bce5..37df9abb1c10 100644\n--- a/.github/workflows/release-nightly.yml\n+++ b/.github/workflows/release-nightly.yml\n@@ -16,7 +16,7 @@ jobs:\n outputs:\n commit: ${{ steps.check_for_new_commits.outputs.commit }}\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: false\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 9d926d9d349b..d5837af0beb3 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -84,7 +84,7 @@ jobs:\n head_sha: ${{ steps.get_target.outputs.head_sha }}\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: true # Needed to git-push the release commit\n@@ -174,7 +174,7 @@ jobs:\n runs-on: ubuntu-latest\n \n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0 # Needed for changelog\n persist-credentials: false\n@@ -240,7 +240,7 @@ jobs:\n VERSION: ${{ needs.prepare.outputs.version }}\n HEAD_SHA: ${{ needs.prepare.outputs.head_sha }}\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n fetch-depth: 0\n persist-credentials: true # Needed to git-push the release tag\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 9332b69fbac9..360d36751234 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -26,7 +26,7 @@ jobs:\n contents: read\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \n@@ -78,7 +78,7 @@ jobs:\n actions: read # Needed by zizmorcore/zizmor-action if repository is private\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n persist-credentials: false\n \ndiff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml\nindex e8054d75cc3c..c368776ae310 100644\n--- a/.github/workflows/wiki.yml\n+++ b/.github/workflows/wiki.yml\n@@ -18,7 +18,7 @@ jobs:\n contents: write # Needed to git-push to the wiki\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2\n+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3\n with:\n repository: yt-dlp/yt-dlp-wiki\n ref: master\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":9,"string":"9"}}},{"rowIdx":34281,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16903"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16903,"string":"16,903"},"base_sha":{"kind":"string","value":"1e4668e9df78ff2409e139b51610442cbefe762e"},"head_sha":{"kind":"string","value":"7fe27c4d1aba6b6d25fc715f96870dfbd8517e89"},"task":{"kind":"string","value":"[build] Update 12 dependencies\n\n<!-- BEGIN dlp-bot generated section -->\n\npackage | old | new | diff | changelog\n--------|-----|-----|------|----------\n[**`certifi`**](<https://pypi.org/project/certifi/>) | [2026.***4.22***](<https://github.com/certifi/python-certifi/releases/tag/2026.04.22>) | [2026.***5.20***](<https://github.com/certifi/python-certifi/releases/tag/2026.05.20>) | [`2026.04.22...2026.05.20`](<https://github.com/certifi/python-certifi/compare/2026.04.22...2026.05.20>) | \n[**`deno`**](<https://pypi.org/project/deno/>) | [2.***7.14***](<https://github.com/denoland/deno/releases/tag/v2.7.14>) | [2.***8.1***](<https://github.com/denoland/deno/releases/tag/v2.8.1>) | [`v2.7.14...v2.8.1`](<https://github.com/denoland/deno/compare/v2.7.14...v2.8.1>) | \n[**`idna`**](<https://pypi.org/project/idna/>) | [3.***15***](<https://github.com/kjd/idna/releases/tag/v3.15>) | [3.***17***](<https://github.com/kjd/idna/releases/tag/v3.17>) | [`v3.15...v3.17`](<https://github.com/kjd/idna/compare/v3.15...v3.17>) | [HISTORY.md](<https://github.com/kjd/idna/blob/master/HISTORY.md>)\n[**`pip`**](<https://pypi.org/project/pip/>) | [26.1.***1***](<https://github.com/pypa/pip/releases/tag/26.1.1>) | [26.1.***2***](<https://github.com/pypa/pip/releases/tag/26.1.2>) | [`26.1.1...26.1.2`](<https://github.com/pypa/pip/compare/26.1.1...26.1.2>) | [news](<https://pip.pypa.io/en/stable/news/>)\n[**`platformdirs`**](<https://pypi.org/project/platformdirs/>) | [4.***9.6***](<https://github.com/tox-dev/platformdirs/releases/tag/4.9.6>) | [4.***10.0***](<https://github.com/tox-dev/platformdirs/releases/tag/4.10.0>) | [`4.9.6...4.10.0`](<https://github.com/tox-dev/platformdirs/compare/4.9.6...4.10.0>) | [changelog.html](<https://platformdirs.readthedocs.io/en/latest/changelog.html>)\n[**`pytest-rerunfailures`**](<https://pypi.org/project/pytest-rerunfailures/>) | [16.***2***](<https://github.com/pytest-dev/pytest-rerunfailures/releases/tag/16.2>) | [16.***3***](<https://github.com/pytest-dev/pytest-rerunfailures/releases/tag/16.3>) | [`16.2...16.3`](<https://github.com/pytest-dev/pytest-rerunfailures/compare/16.2...16.3>) | \n[**`python-discovery`**](<https://pypi.org/project/python-discovery/>) | [1.***3.1***](<https://github.com/tox-dev/python-discovery/releases/tag/1.3.1>) | [1.***4.0***](<https://github.com/tox-dev/python-discovery/releases/tag/1.4.0>) | [`1.3.1...1.4.0`](<https://github.com/tox-dev/python-discovery/compare/1.3.1...1.4.0>) | [releases](<https://github.com/tox-dev/python-discovery/releases>)\n[**`ruff`**](<https://pypi.org/project/ruff/>) | [0.15.***13***](<https://github.com/astral-sh/ruff/releases/tag/0.15.13>) | [0.15.***15***](<https://github.com/astral-sh/ruff/releases/tag/0.15.15>) | [`0.15.13...0.15.15`](<https://github.com/astral-sh/ruff/compare/0.15.13...0.15.15>) | [CHANGELOG.md](<https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md>)\n[**`trove-classifiers`**](<https://pypi.org/project/trove-classifiers/>) | [2026.5.***7.17***](<https://github.com/pypa/trove-classifiers/releases/tag/2026.5.7.17>) | [2026.5.***22.10***](<https://github.com/pypa/trove-classifiers/releases/tag/2026.5.22.10>) | [`2026.5.7.17...2026.5.22.10`](<https://github.com/pypa/trove-classifiers/compare/2026.5.7.17...2026.5.22.10>) | \n[**`uv`**](<https://pypi.org/project/uv/>) | [0.11.***14***](<https://github.com/astral-sh/uv/releases/tag/0.11.14>) | [0.11.***17***](<https://github.com/astral-sh/uv/releases/tag/0.11.17>) | [`0.11.14...0.11.17`](<https://github.com/astral-sh/uv/compare/0.11.14...0.11.17>) | [CHANGELOG.md](<https://github.com/astral-sh/uv/blob/main/CHANGELOG.md>)\n[**`virtualenv`**](<https://pypi.org/project/virtualenv/>) | [21.***3.3***](<https://github.com/pypa/virtualenv/releases/tag/21.3.3>) | [21.***4.2***](<https://github.com/pypa/virtualenv/releases/tag/21.4.2>) | [`21.3.3...21.4.2`](<https://github.com/pypa/virtualenv/compare/21.3.3...21.4.2>) | \n[**`zipp`**](<https://pypi.org/project/zipp/>) | [***3.23.1***](<https://github.com/jaraco/zipp/releases/tag/v3.23.1>) | [***4.1.0***](<https://github.com/jaraco/zipp/releases/tag/v4.1.0>) | [`v3.23.1...v4.1.0`](<https://github.com/jaraco/zipp/compare/v3.23.1...v4.1.0>) | \n\n```\n[build] Update 12 dependencies\n\n* Bump certifi 2026.4.22 => 2026.5.20\n* Bump deno 2.7.14 => 2.8.1\n* Bump idna 3.15 => 3.17\n* Bump pip 26.1.1 => 26.1.2\n* Bump platformdirs 4.9.6 => 4.10.0\n* Bump pytest-rerunfailures 16.2 => 16.3\n* Bump python-discovery 1.3.1 => 1.4.0\n* Bump ruff 0.15.13 => 0.15.15\n* Bump trove-classifiers 2026.5.7.17 => 2026.5.22.10\n* Bump uv 0.11.14 => 0.11.17\n* Bump virtualenv 21.3.3 => 21.4.2\n* Bump zipp 3.23.1 => 4.1.0\n\nAuthored by: dlp-bot\n\n```\n\n<!-- END dlp-bot generated section -->\n\n\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\n\n\n### Before submitting a *pull request* make sure you have:\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\n\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/): This pull request was created by a bot that was written by the maintainers of this project\n\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\n- [x] Automated maintenance\n\n</details>\n\n\n---\n\n*This pull request is the product of [this GitHub Actions workflow run](https://github.com/bashonly/dlp-bot/actions/runs/27141491942).*"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [build] Update 12 dependencies","scope_files":["pyproject.toml","uv.lock"]},{"subtask_id":"s2","goal":"Implement the changes under `bundle/requirements/` needed for: [build] Update 12 dependencies","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [build] Update 12 dependencies\",\n \"scope_files\": [\n \"pyproject.toml\",\n \"uv.lock\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `bundle/requirements/` needed for: [build] Update 12 dependencies\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["pyproject.toml","uv.lock"],"solution_diff":"diff --git a/pyproject.toml b/pyproject.toml\nindex b2f8a007335b..8128fb31a85a 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -69,9 +69,9 @@ deno = [\n pin = [\n \"brotli==1.2.0 ; implementation_name == 'cpython' and sys_platform != 'ios'\",\n \"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\",\n- \"certifi==2026.4.22\",\n+ \"certifi==2026.5.20\",\n \"charset-normalizer==3.4.7\",\n- \"idna==3.15\",\n+ \"idna==3.17\",\n \"mutagen==1.47.0\",\n \"pycryptodomex==3.23.0\",\n \"requests==2.34.2\",\n@@ -80,7 +80,7 @@ pin = [\n \"yt-dlp-ejs==0.8.0\",\n ]\n pin-curl-cffi = [\n- \"certifi==2026.4.22 ; implementation_name == 'cpython'\",\n+ \"certifi==2026.5.20 ; implementation_name == 'cpython'\",\n \"cffi==2.0.0 ; implementation_name == 'cpython'\",\n \"curl-cffi==0.15.0 ; implementation_name == 'cpython'\",\n \"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\",\n@@ -98,7 +98,7 @@ pin-secretstorage = [\n \"typing-extensions==4.15.0 ; python_full_version < '3.11'\",\n ]\n pin-deno = [\n- \"deno==2.7.14\",\n+ \"deno==2.8.1\",\n ]\n \n [dependency-groups]\ndiff --git a/uv.lock b/uv.lock\nindex a1f2b7f8b08d..10e5d0f119a9 100644\n--- a/uv.lock\n+++ b/uv.lock\n@@ -137,11 +137,11 @@ wheels = [\n \n [[package]]\n name = \"certifi\"\n-version = \"2026.4.22\"\n+version = \"2026.5.20\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/25/ee/6caf7a40c36a1220410afe15a1cc64993a1f864871f698c0f93acb72842a/certifi-2026.4.22.tar.gz\", hash = \"sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\", size = 137077, upload-time = \"2026-04-22T11:26:11.191Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz\", hash = \"sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\", size = 135422, upload-time = \"2026-05-20T11:46:50.073Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/22/30/7cd8fdcdfbc5b869528b079bfb76dcdf6056b1a2097a662e5e8c04f42965/certifi-2026.4.22-py3-none-any.whl\", hash = \"sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a\", size = 135707, upload-time = \"2026-04-22T11:26:09.372Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl\", hash = \"sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897\", size = 134134, upload-time = \"2026-05-20T11:46:48.578Z\" },\n ]\n \n [[package]]\n@@ -458,15 +458,15 @@ wheels = [\n \n [[package]]\n name = \"deno\"\n-version = \"2.7.14\"\n+version = \"2.8.1\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/e4/adbeb37143551a4e575049e8b291bedc5f57191753ade31f7cf6665b1d52/deno-2.7.14.tar.gz\", hash = \"sha256:63a79caa105368813e434593f2c059d4cc3e2562ec57f606348e9321a525d582\", size = 8168, upload-time = \"2026-04-28T17:34:10.315Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/43/eb/b743a520cdd668e070a4535296123f1c62d054b00699f58e49c32ab5925c/deno-2.8.1.tar.gz\", hash = \"sha256:fb65e568bef30b1a7e63f033713f1a6792a8456e339febdb7d638c6bb2c4c008\", size = 8167, upload-time = \"2026-05-27T13:01:06.508Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c8/a1/82951e37de914ca9445e3dd99a5f06e36e857000f9d34beb3f9fc5ff0971/deno-2.7.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:3860efe76d9c8491ee847256f31ff5f1b1d1871137daab91eb4f28c0543eeb4d\", size = 47841490, upload-time = \"2026-04-28T17:33:53.968Z\" },\n- { url = \"https://files.pythonhosted.org/packages/fe/1f/809cac7474d86ad41f2938b4713cf846b261bba7a1fdb5ab27b3fabc435e/deno-2.7.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:194560abc29021d3b5b4be9bfd628f2b21152a3bae031bdcd30e41584ba4b9d8\", size = 44600497, upload-time = \"2026-04-28T17:33:57.426Z\" },\n- { url = \"https://files.pythonhosted.org/packages/52/51/c60816c902e5fa9daf4bab5869a5895e58748f05739eab399c1ae6d0ee37/deno-2.7.14-py3-none-manylinux_2_27_aarch64.whl\", hash = \"sha256:f47511d0c8080c2bdb0ee58f2b96d657b1e5f2ede088b1bb9a98bfb80362af22\", size = 48267415, upload-time = \"2026-04-28T17:34:00.553Z\" },\n- { url = \"https://files.pythonhosted.org/packages/79/a8/ea52407ebe29caadc67b6899437898880aad8d207ed889dd4f9ba7d9ddf7/deno-2.7.14-py3-none-manylinux_2_27_x86_64.whl\", hash = \"sha256:0a92040900311849a812d47e29e1494b1a4f4c7431536721888356c7a3662d22\", size = 50283833, upload-time = \"2026-04-28T17:34:04.094Z\" },\n- { url = \"https://files.pythonhosted.org/packages/98/0e/2581a39773004081f40ef4811059fe867953d86166b3f7fb77abb5d68757/deno-2.7.14-py3-none-win_amd64.whl\", hash = \"sha256:1646dbcd447465bc6eb9a9e25eef0283f74dd68ad5bd9c50bcaec641737eb730\", size = 49278963, upload-time = \"2026-04-28T17:34:07.671Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d1/71/f9dc8ad874dcc26cf1a154c8f89d77e1155ced1f6a64be9d21127bd555ce/deno-2.8.1-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:733e24e4883c9516534cae7a10277048ffea7cc034f9f726e8c145d48ba75d19\", size = 42749443, upload-time = \"2026-05-27T13:00:49.439Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f5/db/1721aca1a9bd132a3f721bd547022534fcdd6221701561c5e33705cdfb6d/deno-2.8.1-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:7b4638504f3730f9b25229db08d1bce87bc64f52498f9f8f5aeba702c7ff2115\", size = 39460813, upload-time = \"2026-05-27T13:00:52.578Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1a/20/b50646f865562b8f21532cad6f9804b126efd4030cfd0c5e1d11217b15ca/deno-2.8.1-py3-none-manylinux_2_27_aarch64.whl\", hash = \"sha256:91f29a2df4cb6135872d68f38005c08fe0c389c84cb7349d7399eedbfbe19829\", size = 43893026, upload-time = \"2026-05-27T13:00:55.939Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0d/1e/75b84e7096b53f077ac01f9b5c979b7b42b0a6497f56d7c4ae072381e059/deno-2.8.1-py3-none-manylinux_2_27_x86_64.whl\", hash = \"sha256:f0958910ffa88f6b6e142129ab34b7a3aec361fc63904ff803ce1594beca230a\", size = 46038250, upload-time = \"2026-05-27T13:00:59.662Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/14/d6/14f6cf25025644bb8b7d9b4606780b5ec6ee429a55c0d1f05681718c7fc0/deno-2.8.1-py3-none-win_amd64.whl\", hash = \"sha256:71ec55c0a0944beee376aa824722734cf3e617661bca5e143caa83991921e4f5\", size = 41962337, upload-time = \"2026-05-27T13:01:03.453Z\" },\n ]\n \n [[package]]\n@@ -526,11 +526,11 @@ wheels = [\n \n [[package]]\n name = \"idna\"\n-version = \"3.15\"\n+version = \"3.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\", hash = \"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\", size = 199245, upload-time = \"2026-05-12T22:45:57.011Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz\", hash = \"sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\", size = 196048, upload-time = \"2026-05-28T14:32:38.55Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\", hash = \"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\", size = 72340, upload-time = \"2026-05-12T22:45:55.733Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl\", hash = \"sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c\", size = 65316, upload-time = \"2026-05-28T14:32:37.035Z\" },\n ]\n \n [[package]]\n@@ -643,20 +643,20 @@ wheels = [\n \n [[package]]\n name = \"pip\"\n-version = \"26.1.1\"\n+version = \"26.1.2\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\", hash = \"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\", size = 1840400, upload-time = \"2026-05-04T19:02:21.248Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/01/91/47e7d486260f618783899587af63ccf7980fb60245c3e63dd4571c6b57ad/pip-26.1.2.tar.gz\", hash = \"sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\", size = 1840799, upload-time = \"2026-05-31T17:33:58.56Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\", hash = \"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\", size = 1812777, upload-time = \"2026-05-04T19:02:18.9Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/5d/95/6b5cb3461ea5673ba0995989746db58eb18b91b54dbf331e72f569540946/pip-26.1.2-py3-none-any.whl\", hash = \"sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab\", size = 1813144, upload-time = \"2026-05-31T17:33:56.772Z\" },\n ]\n \n [[package]]\n name = \"platformdirs\"\n-version = \"4.9.6\"\n+version = \"4.10.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/9f/4a/0883b8e3802965322523f0b200ecf33d31f10991d0401162f4b23c698b42/platformdirs-4.9.6.tar.gz\", hash = \"sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a\", size = 29400, upload-time = \"2026-04-09T00:04:10.812Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz\", hash = \"sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7\", size = 31224, upload-time = \"2026-05-28T03:32:53.587Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl\", hash = \"sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\", size = 21348, upload-time = \"2026-04-09T00:04:09.463Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl\", hash = \"sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\", size = 22743, upload-time = \"2026-05-28T03:32:52.175Z\" },\n ]\n \n [[package]]\n@@ -825,28 +825,28 @@ wheels = [\n \n [[package]]\n name = \"pytest-rerunfailures\"\n-version = \"16.2\"\n+version = \"16.3\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"pytest\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\", hash = \"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\", size = 32121, upload-time = \"2026-05-13T08:13:26.998Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/4d/f0/74f8e685be7ecd1572c1256132f18fce3a665d7e07649a3f23b7eb2d3bec/pytest_rerunfailures-16.3.tar.gz\", hash = \"sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c\", size = 34148, upload-time = \"2026-05-22T06:51:22.292Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\", hash = \"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\", size = 14505, upload-time = \"2026-05-13T08:13:25.485Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f8/98/58a71d68d3126d7f6a6ed1944c37ec207a4ff3dc66cad3bed7b59d38df61/pytest_rerunfailures-16.3-py3-none-any.whl\", hash = \"sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\", size = 15396, upload-time = \"2026-05-22T06:51:20.547Z\" },\n ]\n \n [[package]]\n name = \"python-discovery\"\n-version = \"1.3.1\"\n+version = \"1.4.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"filelock\" },\n { name = \"platformdirs\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\", hash = \"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\", size = 68011, upload-time = \"2026-05-12T20:53:36.336Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/a6/12/38c1a0b1e64806780c9563e3fc9f6e472251839662587cfbe9bfaf2ae10a/python_discovery-1.4.0.tar.gz\", hash = \"sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\", size = 68455, upload-time = \"2026-05-28T01:15:37.639Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\", hash = \"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\", size = 33185, upload-time = \"2026-05-12T20:53:34.969Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c8/8d/3d316429f65029532bb1e28ff77b797d86b5ac3915bb44ca4e19aa283d43/python_discovery-1.4.0-py3-none-any.whl\", hash = \"sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da\", size = 33217, upload-time = \"2026-05-28T01:15:36.573Z\" },\n ]\n \n [[package]]\n@@ -952,27 +952,27 @@ wheels = [\n \n [[package]]\n name = \"ruff\"\n-version = \"0.15.13\"\n+version = \"0.15.15\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\", hash = \"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\", size = 4678180, upload-time = \"2026-05-14T13:44:37.869Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz\", hash = \"sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6\", size = 4706985, upload-time = \"2026-05-28T14:16:57.784Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\", hash = \"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\", size = 10738279, upload-time = \"2026-05-14T13:44:18.7Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\", size = 11124798, upload-time = \"2026-05-14T13:44:06.427Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\", size = 10460761, upload-time = \"2026-05-14T13:44:04.375Z\" },\n- { url = \"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\", size = 10804451, upload-time = \"2026-05-14T13:44:25.221Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\", size = 10534285, upload-time = \"2026-05-14T13:44:08.888Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\", size = 11312063, upload-time = \"2026-05-14T13:44:11.274Z\" },\n- { url = \"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\", size = 12183079, upload-time = \"2026-05-14T13:44:01.634Z\" },\n- { url = \"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\", size = 11440833, upload-time = \"2026-05-14T13:43:59.043Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\", size = 11434486, upload-time = \"2026-05-14T13:44:27.761Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\", size = 11385189, upload-time = \"2026-05-14T13:44:13.704Z\" },\n- { url = \"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\", size = 10781380, upload-time = \"2026-05-14T13:43:56.734Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\", size = 10540605, upload-time = \"2026-05-14T13:44:20.748Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\", size = 11036554, upload-time = \"2026-05-14T13:44:16.256Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\", size = 11528133, upload-time = \"2026-05-14T13:44:22.808Z\" },\n- { url = \"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\", hash = \"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\", size = 10721455, upload-time = \"2026-05-14T13:44:35.697Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\", hash = \"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\", size = 11900409, upload-time = \"2026-05-14T13:44:30.389Z\" },\n- { url = \"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\", hash = \"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\", size = 11179336, upload-time = \"2026-05-14T13:44:33.026Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl\", hash = \"sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b\", size = 10710652, upload-time = \"2026-05-28T14:16:06.701Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e\", size = 11096615, upload-time = \"2026-05-28T14:16:23.313Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530\", size = 10436683, upload-time = \"2026-05-28T14:16:40.974Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4\", size = 10769064, upload-time = \"2026-05-28T14:16:28.905Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f\", size = 10511987, upload-time = \"2026-05-28T14:16:43.732Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622\", size = 11275100, upload-time = \"2026-05-28T14:16:55.244Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45\", size = 12176903, upload-time = \"2026-05-28T14:16:14.368Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627\", size = 11404550, upload-time = \"2026-05-28T14:16:20.138Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4\", size = 11382027, upload-time = \"2026-05-28T14:16:46.615Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c\", size = 11366041, upload-time = \"2026-05-28T14:16:26.247Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\", size = 10741795, upload-time = \"2026-05-28T14:16:17.11Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f\", size = 10511117, upload-time = \"2026-05-28T14:16:31.767Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb\", size = 10994867, upload-time = \"2026-05-28T14:16:35.149Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a\", size = 11482101, upload-time = \"2026-05-28T14:16:49.598Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl\", hash = \"sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9\", size = 10716774, upload-time = \"2026-05-28T14:16:52.337Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl\", hash = \"sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4\", size = 11868463, upload-time = \"2026-05-28T14:16:11.333Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl\", hash = \"sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7\", size = 11138498, upload-time = \"2026-05-28T14:16:38.425Z\" },\n ]\n \n [[package]]\n@@ -1053,11 +1053,11 @@ wheels = [\n \n [[package]]\n name = \"trove-classifiers\"\n-version = \"2026.5.7.17\"\n+version = \"2026.5.22.10\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\", hash = \"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\", size = 17041, upload-time = \"2026-05-07T17:48:01.931Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/86/b6/1c41aa221b157b624ea1a72e975404ef228724d249011ee411ac211a615e/trove_classifiers-2026.5.22.10.tar.gz\", hash = \"sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\", size = 17061, upload-time = \"2026-05-22T10:17:28.99Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\", hash = \"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\", size = 14201, upload-time = \"2026-05-07T17:48:00.488Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/02/9a14d3048ffa4f45b7c60956a9b22688dd925d6de50f6baf7e55f3664942/trove_classifiers-2026.5.22.10-py3-none-any.whl\", hash = \"sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c\", size = 14225, upload-time = \"2026-05-22T10:17:27.569Z\" },\n ]\n \n [[package]]\n@@ -1080,33 +1080,33 @@ wheels = [\n \n [[package]]\n name = \"uv\"\n-version = \"0.11.14\"\n+version = \"0.11.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\", hash = \"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\", size = 4130699, upload-time = \"2026-05-12T18:00:37.321Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/2c/8e/ec34c19d0f254fcbcc5c1ce8c7f06e47e0f69a7e1a0269c1d59cb0b0f279/uv-0.11.17.tar.gz\", hash = \"sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf\", size = 4203607, upload-time = \"2026-05-28T20:39:47.707Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\", hash = \"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\", size = 23545199, upload-time = \"2026-05-12T18:01:34.526Z\" },\n- { url = \"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\", size = 22957064, upload-time = \"2026-05-12T18:00:54.225Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\", size = 21678307, upload-time = \"2026-05-12T18:00:57.132Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\", size = 23353409, upload-time = \"2026-05-12T18:01:27.512Z\" },\n- { url = \"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\", size = 23103964, upload-time = \"2026-05-12T18:01:31.094Z\" },\n- { url = \"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\", size = 23104638, upload-time = \"2026-05-12T18:01:10.093Z\" },\n- { url = \"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\", size = 24625888, upload-time = \"2026-05-12T18:01:17.192Z\" },\n- { url = \"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\", size = 25445231, upload-time = \"2026-05-12T18:00:40.012Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\", size = 24571961, upload-time = \"2026-05-12T18:00:43.713Z\" },\n- { url = \"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\", size = 24718523, upload-time = \"2026-05-12T18:01:06.587Z\" },\n- { url = \"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\", size = 23454821, upload-time = \"2026-05-12T18:00:51.166Z\" },\n- { url = \"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\", size = 24087843, upload-time = \"2026-05-12T18:00:47.272Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\", size = 24147611, upload-time = \"2026-05-12T18:01:20.499Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\", size = 23920348, upload-time = \"2026-05-12T18:01:24.033Z\" },\n- { url = \"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\", size = 24928981, upload-time = \"2026-05-12T18:01:13.961Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\", hash = \"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\", size = 22573503, upload-time = \"2026-05-12T18:00:34.36Z\" },\n- { url = \"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\", hash = \"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\", size = 25175590, upload-time = \"2026-05-12T18:01:00.38Z\" },\n- { url = \"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\", hash = \"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\", size = 23594775, upload-time = \"2026-05-12T18:01:03.55Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/15/2e/e6d42f9d39009eee976f1e5dfd31d3d1943e6e593ad7b191cf11e9744a36/uv-0.11.17-py3-none-linux_armv6l.whl\", hash = \"sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f\", size = 23551216, upload-time = \"2026-05-28T20:39:05.395Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d0/ee/d72bcc60f3585653a4b768425854d737d98d65c1765547d25c2999547ea9/uv-0.11.17-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697\", size = 22997377, upload-time = \"2026-05-28T20:39:25.21Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/58/34/1bc69798d9ae998fbc42c61b02883f2ba00d04bdd858e589604d01846287/uv-0.11.17-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096\", size = 21630197, upload-time = \"2026-05-28T20:39:28.935Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/93/1be48ec6a8933d9a77d0ce5240ed63f68869f68517ccf5d62268ed03f3e8/uv-0.11.17-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3\", size = 23414940, upload-time = \"2026-05-28T20:39:55.015Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/00/31/b7488ff49d80090ea9d05d67a4d381a1b4479502e9853e654caa1c1c678e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577\", size = 23096330, upload-time = \"2026-05-28T20:39:01.284Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fe/95/42b6137c5de06278d229c7eef2f314df2a738cd799795bbb44dace21bd6e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\", size = 23101906, upload-time = \"2026-05-28T20:39:17.149Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/17/7c/0ca03b2d19965db6d5dfe0c8cf96a3d0b424503c8cbc3cd2ffdc5869a15d/uv-0.11.17-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e\", size = 24444409, upload-time = \"2026-05-28T20:39:59.218Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b5/fb/179f55a3b19d47c30ec1f41b9b964da74dfa7053ff310a70a9c4d8cb998d/uv-0.11.17-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00\", size = 25540153, upload-time = \"2026-05-28T20:39:09.535Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/29/592f42012765c43ae45c112110e214bca7b0cfc08c4c1b52e1dfa47dedd5/uv-0.11.17-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f\", size = 24665906, upload-time = \"2026-05-28T20:39:41.254Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0e/51/b75808766f895248553c6370968509cd4f726e6943e310a8f7a171036ad0/uv-0.11.17-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448\", size = 24863325, upload-time = \"2026-05-28T20:39:51.006Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ee/6a/6f27ee69e97f480104bb8ec335f04c2a12add98edfcc4844a68e9538b6e2/uv-0.11.17-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91\", size = 23521674, upload-time = \"2026-05-28T20:38:55.869Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/df/11/1344aca7c710f794750f74de0e552a54ab24193ecc01fa3b3ae22ff822a1/uv-0.11.17-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216\", size = 24224725, upload-time = \"2026-05-28T20:39:32.945Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ad/44/7b11550c1453ea13b81e549c83523e6ab6ed3231d09b2fd6b9eb19acceaf/uv-0.11.17-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22\", size = 24301643, upload-time = \"2026-05-28T20:39:45.183Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1a/36/8f683bc60547b8f93d0e752a8574d13fad776999cb978482b360c053ca22/uv-0.11.17-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba\", size = 23786049, upload-time = \"2026-05-28T20:39:20.999Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/10/dc/7a495db39c2970de4fa375c337dbd617b16780911f88f0511f8fe7f6747c/uv-0.11.17-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505\", size = 25049786, upload-time = \"2026-05-28T20:40:03.292Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/37/dd/74eff72d749eaf7e19f489878e21a368a7fef58d26ea0c63ec044ecd78b1/uv-0.11.17-py3-none-win32.whl\", hash = \"sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129\", size = 22479213, upload-time = \"2026-05-28T20:39:13.316Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/79/99/8af4a92b99a8a4823297c26df727fe957267e03e1196e3caa803c3f6ccb2/uv-0.11.17-py3-none-win_amd64.whl\", hash = \"sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7\", size = 25083161, upload-time = \"2026-05-28T20:40:07.931Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/00/76/a689077832d585d29d87f9cd0d65eca1af58abd29a4eab004d0a8a858b9c/uv-0.11.17-py3-none-win_arm64.whl\", hash = \"sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27\", size = 23544936, upload-time = \"2026-05-28T20:39:37.137Z\" },\n ]\n \n [[package]]\n name = \"virtualenv\"\n-version = \"21.3.3\"\n+version = \"21.4.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"distlib\" },\n@@ -1115,9 +1115,9 @@ dependencies = [\n { name = \"python-discovery\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\", hash = \"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\", size = 7613784, upload-time = \"2026-05-13T18:01:30.19Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/e1/0d/4e93c8e6d1001a75763f87d8f5ecda8ebc7f4aa2153dddfaf4ae8892821a/virtualenv-21.4.2.tar.gz\", hash = \"sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c\", size = 7613326, upload-time = \"2026-05-31T17:01:22.827Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\", hash = \"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\", size = 7594554, upload-time = \"2026-05-13T18:01:27.815Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bf/c4/557dc082be035381b85fdb2b74e21d3d21b57750b74f2b47a32f3a639ff9/virtualenv-21.4.2-py3-none-any.whl\", hash = \"sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\", size = 7594079, upload-time = \"2026-05-31T17:01:20.735Z\" },\n ]\n \n [[package]]\n@@ -1290,9 +1290,9 @@ requires-dist = [\n { name = \"brotli\", marker = \"implementation_name == 'cpython' and sys_platform != 'ios' and extra == 'pin'\", specifier = \"==1.2.0\" },\n { name = \"brotlicffi\", marker = \"implementation_name != 'cpython' and extra == 'default'\" },\n { name = \"brotlicffi\", marker = \"implementation_name != 'cpython' and extra == 'pin'\", specifier = \"==1.2.0.1\" },\n- { name = \"certifi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2026.4.22\" },\n+ { name = \"certifi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2026.5.20\" },\n { name = \"certifi\", marker = \"extra == 'default'\" },\n- { name = \"certifi\", marker = \"extra == 'pin'\", specifier = \"==2026.4.22\" },\n+ { name = \"certifi\", marker = \"extra == 'pin'\", specifier = \"==2026.5.20\" },\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\", specifier = \"==2.0.0\" },\n { name = \"cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.0.0\" },\n { name = \"charset-normalizer\", marker = \"extra == 'pin'\", specifier = \"==3.4.7\" },\n@@ -1300,8 +1300,8 @@ requires-dist = [\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'curl-cffi'\", specifier = \">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.15.0\" },\n { name = \"deno\", marker = \"extra == 'deno'\", specifier = \">=2.6.6\" },\n- { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.7.14\" },\n- { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.15\" },\n+ { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.8.1\" },\n+ { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.17\" },\n { name = \"jeepney\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==0.9.0\" },\n { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.2.0\" },\n { name = \"mdurl\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.1.2\" },\n@@ -1364,9 +1364,9 @@ wheels = [\n \n [[package]]\n name = \"zipp\"\n-version = \"3.23.1\"\n+version = \"4.1.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/21/093488dfc7cc8964ded15ab726fad40f25fd3d788fd741cc1c5a17d78ee8/zipp-3.23.1.tar.gz\", hash = \"sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\", size = 25965, upload-time = \"2026-04-13T23:21:46.6Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b9/d8/eab98a517c14134c0b2eb4e2387bc5f457334293ec5d2dd3857ec2966802/zipp-4.1.0.tar.gz\", hash = \"sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\", size = 26214, upload-time = \"2026-05-18T20:08:57.967Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/08/8a/0861bec20485572fbddf3dfba2910e38fe249796cb73ecdeb74e07eeb8d3/zipp-3.23.1-py3-none-any.whl\", hash = \"sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc\", size = 10378, upload-time = \"2026-04-13T23:21:45.386Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3a/13/547360d81e6d88d58492968ffda9f9542854f11310ee556fef14260cc886/zipp-4.1.0-py3-none-any.whl\", hash = \"sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f\", size = 10238, upload-time = \"2026-05-18T20:08:57.045Z\" },\n ]\n","summary":"Edited 2 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt"],"solution_diff":"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\nindex 16068a0eb5f9..00850201a6c8 100644\n--- a/bundle/requirements/build.txt\n+++ b/bundle/requirements/build.txt\n@@ -81,11 +81,11 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\n # via\n # build\n # hatchling\n-trove-classifiers==2026.5.7.17 \\\n- --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\n- --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\n+trove-classifiers==2026.5.22.10 \\\n+ --hash=sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c \\\n+ --hash=sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\n # via hatchling\n-zipp==3.23.1 ; python_full_version < '3.10.2' \\\n- --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\n- --hash=sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\n+zipp==4.1.0 ; python_full_version < '3.10.2' \\\n+ --hash=sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f \\\n+ --hash=sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\n # via importlib-metadata\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nindex 6dbf9e6add19..766a4c57470c 100644\n--- a/bundle/requirements/curl-cffi.txt\n+++ b/bundle/requirements/curl-cffi.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -274,9 +274,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\nindex 796076d76734..6b4aac15788d 100644\n--- a/bundle/requirements/default.txt\n+++ b/bundle/requirements/default.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # requests\n # yt-dlp\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n mutagen==1.47.0 \\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\nindex bdf854eb45d5..9e8ba3e8c99f 100644\n--- a/bundle/requirements/dev.txt\n+++ b/bundle/requirements/dev.txt\n@@ -41,9 +41,9 @@ packaging==26.2 \\\n # via\n # pytest\n # pytest-rerunfailures\n-platformdirs==4.9.6 \\\n- --hash=sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a \\\n- --hash=sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\n+platformdirs==4.10.0 \\\n+ --hash=sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7 \\\n+ --hash=sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\n # via\n # python-discovery\n # virtualenv\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.2 \\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n-python-discovery==1.3.1 \\\n- --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\n- --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\n+pytest-rerunfailures==16.3 \\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\n+python-discovery==1.4.0 \\\n+ --hash=sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da \\\n+ --hash=sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\n # via virtualenv\n pyyaml==6.0.3 \\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\n # via pre-commit\n-ruff==0.15.13 \\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n+ruff==0.15.15 \\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n # via\n # exceptiongroup\n # virtualenv\n-virtualenv==21.3.3 \\\n- --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\n- --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\n+virtualenv==21.4.2 \\\n+ --hash=sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c \\\n+ --hash=sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\n # via pre-commit\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\nindex d14c275f45f7..918c226a096b 100644\n--- a/bundle/requirements/linux.txt\n+++ b/bundle/requirements/linux.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -326,9 +326,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n jeepney==0.9.0 \\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\nindex 02e86d9dbac7..8297439904fb 100644\n--- a/bundle/requirements/macos.txt\n+++ b/bundle/requirements/macos.txt\n@@ -74,9 +74,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n macholib==1.16.4 ; sys_platform == 'darwin' \\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\nindex c72bbe824e70..486b81b5ec07 100644\n--- a/bundle/requirements/pip.txt\n+++ b/bundle/requirements/pip.txt\n@@ -1,3 +1,3 @@\n-pip==26.1.1 \\\n- --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\n- --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\n+pip==26.1.2 \\\n+ --hash=sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab \\\n+ --hash=sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\nindex dc2c0b2c5cda..fb17d779bbd3 100644\n--- a/bundle/requirements/static-analysis.txt\n+++ b/bundle/requirements/static-analysis.txt\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\n # via autopep8\n-ruff==0.15.13 \\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n+ruff==0.15.15 \\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\nindex 81a57e278ce9..8d805b2d0dde 100644\n--- a/bundle/requirements/test.txt\n+++ b/bundle/requirements/test.txt\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.2 \\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n+pytest-rerunfailures==16.3 \\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\nindex 9c7278f4a9e7..b939046e1e0f 100644\n--- a/bundle/requirements/uv.txt\n+++ b/bundle/requirements/uv.txt\n@@ -1,20 +1,20 @@\n-uv==0.11.14 \\\n- --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\n- --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\n- --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\n- --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\n- --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\n- --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\n- --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\n- --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\n- --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\n- --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\n- --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\n- --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\n- --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\n- --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\n- --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\n- --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\n- --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\n- --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\n- --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\n+uv==0.11.17 \\\n+ --hash=sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3 \\\n+ --hash=sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129 \\\n+ --hash=sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e \\\n+ --hash=sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf \\\n+ --hash=sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577 \\\n+ --hash=sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505 \\\n+ --hash=sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27 \\\n+ --hash=sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7 \\\n+ --hash=sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096 \\\n+ --hash=sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216 \\\n+ --hash=sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697 \\\n+ --hash=sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f \\\n+ --hash=sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448 \\\n+ --hash=sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00 \\\n+ --hash=sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f \\\n+ --hash=sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22 \\\n+ --hash=sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91 \\\n+ --hash=sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba \\\n+ --hash=sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\n","summary":"Edited 10 file(s) in bundle/requirements/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"pyproject.toml\",\n \"uv.lock\"\n ],\n \"solution_diff\": \"diff --git a/pyproject.toml b/pyproject.toml\\nindex b2f8a007335b..8128fb31a85a 100644\\n--- a/pyproject.toml\\n+++ b/pyproject.toml\\n@@ -69,9 +69,9 @@ deno = [\\n pin = [\\n \\\"brotli==1.2.0 ; implementation_name == 'cpython' and sys_platform != 'ios'\\\",\\n \\\"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\\\",\\n- \\\"certifi==2026.4.22\\\",\\n+ \\\"certifi==2026.5.20\\\",\\n \\\"charset-normalizer==3.4.7\\\",\\n- \\\"idna==3.15\\\",\\n+ \\\"idna==3.17\\\",\\n \\\"mutagen==1.47.0\\\",\\n \\\"pycryptodomex==3.23.0\\\",\\n \\\"requests==2.34.2\\\",\\n@@ -80,7 +80,7 @@ pin = [\\n \\\"yt-dlp-ejs==0.8.0\\\",\\n ]\\n pin-curl-cffi = [\\n- \\\"certifi==2026.4.22 ; implementation_name == 'cpython'\\\",\\n+ \\\"certifi==2026.5.20 ; implementation_name == 'cpython'\\\",\\n \\\"cffi==2.0.0 ; implementation_name == 'cpython'\\\",\\n \\\"curl-cffi==0.15.0 ; implementation_name == 'cpython'\\\",\\n \\\"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\\\",\\n@@ -98,7 +98,7 @@ pin-secretstorage = [\\n \\\"typing-extensions==4.15.0 ; python_full_version < '3.11'\\\",\\n ]\\n pin-deno = [\\n- \\\"deno==2.7.14\\\",\\n+ \\\"deno==2.8.1\\\",\\n ]\\n \\n [dependency-groups]\\ndiff --git a/uv.lock b/uv.lock\\nindex a1f2b7f8b08d..10e5d0f119a9 100644\\n--- a/uv.lock\\n+++ b/uv.lock\\n@@ -137,11 +137,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"certifi\\\"\\n-version = \\\"2026.4.22\\\"\\n+version = \\\"2026.5.20\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/25/ee/6caf7a40c36a1220410afe15a1cc64993a1f864871f698c0f93acb72842a/certifi-2026.4.22.tar.gz\\\", hash = \\\"sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\\\", size = 137077, upload-time = \\\"2026-04-22T11:26:11.191Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz\\\", hash = \\\"sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\\\", size = 135422, upload-time = \\\"2026-05-20T11:46:50.073Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/22/30/7cd8fdcdfbc5b869528b079bfb76dcdf6056b1a2097a662e5e8c04f42965/certifi-2026.4.22-py3-none-any.whl\\\", hash = \\\"sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a\\\", size = 135707, upload-time = \\\"2026-04-22T11:26:09.372Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl\\\", hash = \\\"sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897\\\", size = 134134, upload-time = \\\"2026-05-20T11:46:48.578Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -458,15 +458,15 @@ wheels = [\\n \\n [[package]]\\n name = \\\"deno\\\"\\n-version = \\\"2.7.14\\\"\\n+version = \\\"2.8.1\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/30/e4/adbeb37143551a4e575049e8b291bedc5f57191753ade31f7cf6665b1d52/deno-2.7.14.tar.gz\\\", hash = \\\"sha256:63a79caa105368813e434593f2c059d4cc3e2562ec57f606348e9321a525d582\\\", size = 8168, upload-time = \\\"2026-04-28T17:34:10.315Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/43/eb/b743a520cdd668e070a4535296123f1c62d054b00699f58e49c32ab5925c/deno-2.8.1.tar.gz\\\", hash = \\\"sha256:fb65e568bef30b1a7e63f033713f1a6792a8456e339febdb7d638c6bb2c4c008\\\", size = 8167, upload-time = \\\"2026-05-27T13:01:06.508Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/c8/a1/82951e37de914ca9445e3dd99a5f06e36e857000f9d34beb3f9fc5ff0971/deno-2.7.14-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:3860efe76d9c8491ee847256f31ff5f1b1d1871137daab91eb4f28c0543eeb4d\\\", size = 47841490, upload-time = \\\"2026-04-28T17:33:53.968Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/fe/1f/809cac7474d86ad41f2938b4713cf846b261bba7a1fdb5ab27b3fabc435e/deno-2.7.14-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:194560abc29021d3b5b4be9bfd628f2b21152a3bae031bdcd30e41584ba4b9d8\\\", size = 44600497, upload-time = \\\"2026-04-28T17:33:57.426Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/52/51/c60816c902e5fa9daf4bab5869a5895e58748f05739eab399c1ae6d0ee37/deno-2.7.14-py3-none-manylinux_2_27_aarch64.whl\\\", hash = \\\"sha256:f47511d0c8080c2bdb0ee58f2b96d657b1e5f2ede088b1bb9a98bfb80362af22\\\", size = 48267415, upload-time = \\\"2026-04-28T17:34:00.553Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/79/a8/ea52407ebe29caadc67b6899437898880aad8d207ed889dd4f9ba7d9ddf7/deno-2.7.14-py3-none-manylinux_2_27_x86_64.whl\\\", hash = \\\"sha256:0a92040900311849a812d47e29e1494b1a4f4c7431536721888356c7a3662d22\\\", size = 50283833, upload-time = \\\"2026-04-28T17:34:04.094Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/98/0e/2581a39773004081f40ef4811059fe867953d86166b3f7fb77abb5d68757/deno-2.7.14-py3-none-win_amd64.whl\\\", hash = \\\"sha256:1646dbcd447465bc6eb9a9e25eef0283f74dd68ad5bd9c50bcaec641737eb730\\\", size = 49278963, upload-time = \\\"2026-04-28T17:34:07.671Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d1/71/f9dc8ad874dcc26cf1a154c8f89d77e1155ced1f6a64be9d21127bd555ce/deno-2.8.1-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:733e24e4883c9516534cae7a10277048ffea7cc034f9f726e8c145d48ba75d19\\\", size = 42749443, upload-time = \\\"2026-05-27T13:00:49.439Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f5/db/1721aca1a9bd132a3f721bd547022534fcdd6221701561c5e33705cdfb6d/deno-2.8.1-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:7b4638504f3730f9b25229db08d1bce87bc64f52498f9f8f5aeba702c7ff2115\\\", size = 39460813, upload-time = \\\"2026-05-27T13:00:52.578Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1a/20/b50646f865562b8f21532cad6f9804b126efd4030cfd0c5e1d11217b15ca/deno-2.8.1-py3-none-manylinux_2_27_aarch64.whl\\\", hash = \\\"sha256:91f29a2df4cb6135872d68f38005c08fe0c389c84cb7349d7399eedbfbe19829\\\", size = 43893026, upload-time = \\\"2026-05-27T13:00:55.939Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0d/1e/75b84e7096b53f077ac01f9b5c979b7b42b0a6497f56d7c4ae072381e059/deno-2.8.1-py3-none-manylinux_2_27_x86_64.whl\\\", hash = \\\"sha256:f0958910ffa88f6b6e142129ab34b7a3aec361fc63904ff803ce1594beca230a\\\", size = 46038250, upload-time = \\\"2026-05-27T13:00:59.662Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/14/d6/14f6cf25025644bb8b7d9b4606780b5ec6ee429a55c0d1f05681718c7fc0/deno-2.8.1-py3-none-win_amd64.whl\\\", hash = \\\"sha256:71ec55c0a0944beee376aa824722734cf3e617661bca5e143caa83991921e4f5\\\", size = 41962337, upload-time = \\\"2026-05-27T13:01:03.453Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -526,11 +526,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"idna\\\"\\n-version = \\\"3.15\\\"\\n+version = \\\"3.17\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\\\", hash = \\\"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\\", size = 199245, upload-time = \\\"2026-05-12T22:45:57.011Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz\\\", hash = \\\"sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\\\", size = 196048, upload-time = \\\"2026-05-28T14:32:38.55Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\\\", hash = \\\"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\\\", size = 72340, upload-time = \\\"2026-05-12T22:45:55.733Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl\\\", hash = \\\"sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c\\\", size = 65316, upload-time = \\\"2026-05-28T14:32:37.035Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -643,20 +643,20 @@ wheels = [\\n \\n [[package]]\\n name = \\\"pip\\\"\\n-version = \\\"26.1.1\\\"\\n+version = \\\"26.1.2\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\\\", hash = \\\"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\\\", size = 1840400, upload-time = \\\"2026-05-04T19:02:21.248Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/01/91/47e7d486260f618783899587af63ccf7980fb60245c3e63dd4571c6b57ad/pip-26.1.2.tar.gz\\\", hash = \\\"sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\\\", size = 1840799, upload-time = \\\"2026-05-31T17:33:58.56Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\\\", hash = \\\"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\\\", size = 1812777, upload-time = \\\"2026-05-04T19:02:18.9Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/5d/95/6b5cb3461ea5673ba0995989746db58eb18b91b54dbf331e72f569540946/pip-26.1.2-py3-none-any.whl\\\", hash = \\\"sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab\\\", size = 1813144, upload-time = \\\"2026-05-31T17:33:56.772Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"platformdirs\\\"\\n-version = \\\"4.9.6\\\"\\n+version = \\\"4.10.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/9f/4a/0883b8e3802965322523f0b200ecf33d31f10991d0401162f4b23c698b42/platformdirs-4.9.6.tar.gz\\\", hash = \\\"sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a\\\", size = 29400, upload-time = \\\"2026-04-09T00:04:10.812Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz\\\", hash = \\\"sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7\\\", size = 31224, upload-time = \\\"2026-05-28T03:32:53.587Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl\\\", hash = \\\"sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\\\", size = 21348, upload-time = \\\"2026-04-09T00:04:09.463Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl\\\", hash = \\\"sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\\\", size = 22743, upload-time = \\\"2026-05-28T03:32:52.175Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -825,28 +825,28 @@ wheels = [\\n \\n [[package]]\\n name = \\\"pytest-rerunfailures\\\"\\n-version = \\\"16.2\\\"\\n+version = \\\"16.3\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"packaging\\\" },\\n { name = \\\"pytest\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\\\", hash = \\\"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\\\", size = 32121, upload-time = \\\"2026-05-13T08:13:26.998Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/4d/f0/74f8e685be7ecd1572c1256132f18fce3a665d7e07649a3f23b7eb2d3bec/pytest_rerunfailures-16.3.tar.gz\\\", hash = \\\"sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c\\\", size = 34148, upload-time = \\\"2026-05-22T06:51:22.292Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\\\", hash = \\\"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\\", size = 14505, upload-time = \\\"2026-05-13T08:13:25.485Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f8/98/58a71d68d3126d7f6a6ed1944c37ec207a4ff3dc66cad3bed7b59d38df61/pytest_rerunfailures-16.3-py3-none-any.whl\\\", hash = \\\"sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\\\", size = 15396, upload-time = \\\"2026-05-22T06:51:20.547Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"python-discovery\\\"\\n-version = \\\"1.3.1\\\"\\n+version = \\\"1.4.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"filelock\\\" },\\n { name = \\\"platformdirs\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\\\", hash = \\\"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\\\", size = 68011, upload-time = \\\"2026-05-12T20:53:36.336Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/a6/12/38c1a0b1e64806780c9563e3fc9f6e472251839662587cfbe9bfaf2ae10a/python_discovery-1.4.0.tar.gz\\\", hash = \\\"sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\\\", size = 68455, upload-time = \\\"2026-05-28T01:15:37.639Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\\\", hash = \\\"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\\\", size = 33185, upload-time = \\\"2026-05-12T20:53:34.969Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c8/8d/3d316429f65029532bb1e28ff77b797d86b5ac3915bb44ca4e19aa283d43/python_discovery-1.4.0-py3-none-any.whl\\\", hash = \\\"sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da\\\", size = 33217, upload-time = \\\"2026-05-28T01:15:36.573Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -952,27 +952,27 @@ wheels = [\\n \\n [[package]]\\n name = \\\"ruff\\\"\\n-version = \\\"0.15.13\\\"\\n+version = \\\"0.15.15\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\\\", hash = \\\"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\\\", size = 4678180, upload-time = \\\"2026-05-14T13:44:37.869Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz\\\", hash = \\\"sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6\\\", size = 4706985, upload-time = \\\"2026-05-28T14:16:57.784Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\\\", size = 10738279, upload-time = \\\"2026-05-14T13:44:18.7Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\\\", size = 11124798, upload-time = \\\"2026-05-14T13:44:06.427Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\\\", size = 10460761, upload-time = \\\"2026-05-14T13:44:04.375Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\\\", size = 10804451, upload-time = \\\"2026-05-14T13:44:25.221Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\\\", size = 10534285, upload-time = \\\"2026-05-14T13:44:08.888Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\\\", size = 11312063, upload-time = \\\"2026-05-14T13:44:11.274Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\\\", size = 12183079, upload-time = \\\"2026-05-14T13:44:01.634Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\\\", size = 11440833, upload-time = \\\"2026-05-14T13:43:59.043Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\\\", size = 11434486, upload-time = \\\"2026-05-14T13:44:27.761Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\\\", size = 11385189, upload-time = \\\"2026-05-14T13:44:13.704Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\\", size = 10781380, upload-time = \\\"2026-05-14T13:43:56.734Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\\\", hash = \\\"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\\\", size = 10540605, upload-time = \\\"2026-05-14T13:44:20.748Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\\\", size = 11036554, upload-time = \\\"2026-05-14T13:44:16.256Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\\\", size = 11528133, upload-time = \\\"2026-05-14T13:44:22.808Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\\\", hash = \\\"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\\\", size = 10721455, upload-time = \\\"2026-05-14T13:44:35.697Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\\\", hash = \\\"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\\\", size = 11900409, upload-time = \\\"2026-05-14T13:44:30.389Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\\\", hash = \\\"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\\\", size = 11179336, upload-time = \\\"2026-05-14T13:44:33.026Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b\\\", size = 10710652, upload-time = \\\"2026-05-28T14:16:06.701Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e\\\", size = 11096615, upload-time = \\\"2026-05-28T14:16:23.313Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530\\\", size = 10436683, upload-time = \\\"2026-05-28T14:16:40.974Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4\\\", size = 10769064, upload-time = \\\"2026-05-28T14:16:28.905Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f\\\", size = 10511987, upload-time = \\\"2026-05-28T14:16:43.732Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622\\\", size = 11275100, upload-time = \\\"2026-05-28T14:16:55.244Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45\\\", size = 12176903, upload-time = \\\"2026-05-28T14:16:14.368Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627\\\", size = 11404550, upload-time = \\\"2026-05-28T14:16:20.138Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4\\\", size = 11382027, upload-time = \\\"2026-05-28T14:16:46.615Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c\\\", size = 11366041, upload-time = \\\"2026-05-28T14:16:26.247Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\\\", size = 10741795, upload-time = \\\"2026-05-28T14:16:17.11Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl\\\", hash = \\\"sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f\\\", size = 10511117, upload-time = \\\"2026-05-28T14:16:31.767Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb\\\", size = 10994867, upload-time = \\\"2026-05-28T14:16:35.149Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a\\\", size = 11482101, upload-time = \\\"2026-05-28T14:16:49.598Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl\\\", hash = \\\"sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9\\\", size = 10716774, upload-time = \\\"2026-05-28T14:16:52.337Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl\\\", hash = \\\"sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4\\\", size = 11868463, upload-time = \\\"2026-05-28T14:16:11.333Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl\\\", hash = \\\"sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7\\\", size = 11138498, upload-time = \\\"2026-05-28T14:16:38.425Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1053,11 +1053,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"trove-classifiers\\\"\\n-version = \\\"2026.5.7.17\\\"\\n+version = \\\"2026.5.22.10\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\\\", hash = \\\"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\\\", size = 17041, upload-time = \\\"2026-05-07T17:48:01.931Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/86/b6/1c41aa221b157b624ea1a72e975404ef228724d249011ee411ac211a615e/trove_classifiers-2026.5.22.10.tar.gz\\\", hash = \\\"sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\\\", size = 17061, upload-time = \\\"2026-05-22T10:17:28.99Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\\\", hash = \\\"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\\\", size = 14201, upload-time = \\\"2026-05-07T17:48:00.488Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c9/02/9a14d3048ffa4f45b7c60956a9b22688dd925d6de50f6baf7e55f3664942/trove_classifiers-2026.5.22.10-py3-none-any.whl\\\", hash = \\\"sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c\\\", size = 14225, upload-time = \\\"2026-05-22T10:17:27.569Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1080,33 +1080,33 @@ wheels = [\\n \\n [[package]]\\n name = \\\"uv\\\"\\n-version = \\\"0.11.14\\\"\\n+version = \\\"0.11.17\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\\\", hash = \\\"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\\\", size = 4130699, upload-time = \\\"2026-05-12T18:00:37.321Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/2c/8e/ec34c19d0f254fcbcc5c1ce8c7f06e47e0f69a7e1a0269c1d59cb0b0f279/uv-0.11.17.tar.gz\\\", hash = \\\"sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf\\\", size = 4203607, upload-time = \\\"2026-05-28T20:39:47.707Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\\\", size = 23545199, upload-time = \\\"2026-05-12T18:01:34.526Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\\\", size = 22957064, upload-time = \\\"2026-05-12T18:00:54.225Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\\\", size = 21678307, upload-time = \\\"2026-05-12T18:00:57.132Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\\\", hash = \\\"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\\\", size = 23353409, upload-time = \\\"2026-05-12T18:01:27.512Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\\\", hash = \\\"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\\\", size = 23103964, upload-time = \\\"2026-05-12T18:01:31.094Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\\\", size = 23104638, upload-time = \\\"2026-05-12T18:01:10.093Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\\\", size = 24625888, upload-time = \\\"2026-05-12T18:01:17.192Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\\\", size = 25445231, upload-time = \\\"2026-05-12T18:00:40.012Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\\\", size = 24571961, upload-time = \\\"2026-05-12T18:00:43.713Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\\\", size = 24718523, upload-time = \\\"2026-05-12T18:01:06.587Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\\\", size = 23454821, upload-time = \\\"2026-05-12T18:00:51.166Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\\\", hash = \\\"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\\\", size = 24087843, upload-time = \\\"2026-05-12T18:00:47.272Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\\\", size = 24147611, upload-time = \\\"2026-05-12T18:01:20.499Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\\\", hash = \\\"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\\\", size = 23920348, upload-time = \\\"2026-05-12T18:01:24.033Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\\\", hash = \\\"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\\\", size = 24928981, upload-time = \\\"2026-05-12T18:01:13.961Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\\\", hash = \\\"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\\\", size = 22573503, upload-time = \\\"2026-05-12T18:00:34.36Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\\\", hash = \\\"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\\\", size = 25175590, upload-time = \\\"2026-05-12T18:01:00.38Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\\\", hash = \\\"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\\\", size = 23594775, upload-time = \\\"2026-05-12T18:01:03.55Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/15/2e/e6d42f9d39009eee976f1e5dfd31d3d1943e6e593ad7b191cf11e9744a36/uv-0.11.17-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f\\\", size = 23551216, upload-time = \\\"2026-05-28T20:39:05.395Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d0/ee/d72bcc60f3585653a4b768425854d737d98d65c1765547d25c2999547ea9/uv-0.11.17-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697\\\", size = 22997377, upload-time = \\\"2026-05-28T20:39:25.21Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/58/34/1bc69798d9ae998fbc42c61b02883f2ba00d04bdd858e589604d01846287/uv-0.11.17-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096\\\", size = 21630197, upload-time = \\\"2026-05-28T20:39:28.935Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/6b/93/1be48ec6a8933d9a77d0ce5240ed63f68869f68517ccf5d62268ed03f3e8/uv-0.11.17-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\\\", hash = \\\"sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3\\\", size = 23414940, upload-time = \\\"2026-05-28T20:39:55.015Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/00/31/b7488ff49d80090ea9d05d67a4d381a1b4479502e9853e654caa1c1c678e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\\\", hash = \\\"sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577\\\", size = 23096330, upload-time = \\\"2026-05-28T20:39:01.284Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/fe/95/42b6137c5de06278d229c7eef2f314df2a738cd799795bbb44dace21bd6e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\\\", size = 23101906, upload-time = \\\"2026-05-28T20:39:17.149Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/17/7c/0ca03b2d19965db6d5dfe0c8cf96a3d0b424503c8cbc3cd2ffdc5869a15d/uv-0.11.17-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e\\\", size = 24444409, upload-time = \\\"2026-05-28T20:39:59.218Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b5/fb/179f55a3b19d47c30ec1f41b9b964da74dfa7053ff310a70a9c4d8cb998d/uv-0.11.17-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00\\\", size = 25540153, upload-time = \\\"2026-05-28T20:39:09.535Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f7/29/592f42012765c43ae45c112110e214bca7b0cfc08c4c1b52e1dfa47dedd5/uv-0.11.17-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f\\\", size = 24665906, upload-time = \\\"2026-05-28T20:39:41.254Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0e/51/b75808766f895248553c6370968509cd4f726e6943e310a8f7a171036ad0/uv-0.11.17-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448\\\", size = 24863325, upload-time = \\\"2026-05-28T20:39:51.006Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ee/6a/6f27ee69e97f480104bb8ec335f04c2a12add98edfcc4844a68e9538b6e2/uv-0.11.17-py3-none-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91\\\", size = 23521674, upload-time = \\\"2026-05-28T20:38:55.869Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/df/11/1344aca7c710f794750f74de0e552a54ab24193ecc01fa3b3ae22ff822a1/uv-0.11.17-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\\\", hash = \\\"sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216\\\", size = 24224725, upload-time = \\\"2026-05-28T20:39:32.945Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ad/44/7b11550c1453ea13b81e549c83523e6ab6ed3231d09b2fd6b9eb19acceaf/uv-0.11.17-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22\\\", size = 24301643, upload-time = \\\"2026-05-28T20:39:45.183Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1a/36/8f683bc60547b8f93d0e752a8574d13fad776999cb978482b360c053ca22/uv-0.11.17-py3-none-musllinux_1_1_i686.whl\\\", hash = \\\"sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba\\\", size = 23786049, upload-time = \\\"2026-05-28T20:39:20.999Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/10/dc/7a495db39c2970de4fa375c337dbd617b16780911f88f0511f8fe7f6747c/uv-0.11.17-py3-none-musllinux_1_1_x86_64.whl\\\", hash = \\\"sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505\\\", size = 25049786, upload-time = \\\"2026-05-28T20:40:03.292Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/37/dd/74eff72d749eaf7e19f489878e21a368a7fef58d26ea0c63ec044ecd78b1/uv-0.11.17-py3-none-win32.whl\\\", hash = \\\"sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129\\\", size = 22479213, upload-time = \\\"2026-05-28T20:39:13.316Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/79/99/8af4a92b99a8a4823297c26df727fe957267e03e1196e3caa803c3f6ccb2/uv-0.11.17-py3-none-win_amd64.whl\\\", hash = \\\"sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7\\\", size = 25083161, upload-time = \\\"2026-05-28T20:40:07.931Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/00/76/a689077832d585d29d87f9cd0d65eca1af58abd29a4eab004d0a8a858b9c/uv-0.11.17-py3-none-win_arm64.whl\\\", hash = \\\"sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27\\\", size = 23544936, upload-time = \\\"2026-05-28T20:39:37.137Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"virtualenv\\\"\\n-version = \\\"21.3.3\\\"\\n+version = \\\"21.4.2\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"distlib\\\" },\\n@@ -1115,9 +1115,9 @@ dependencies = [\\n { name = \\\"python-discovery\\\" },\\n { name = \\\"typing-extensions\\\", marker = \\\"python_full_version < '3.11'\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\\\", hash = \\\"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\\\", size = 7613784, upload-time = \\\"2026-05-13T18:01:30.19Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/e1/0d/4e93c8e6d1001a75763f87d8f5ecda8ebc7f4aa2153dddfaf4ae8892821a/virtualenv-21.4.2.tar.gz\\\", hash = \\\"sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c\\\", size = 7613326, upload-time = \\\"2026-05-31T17:01:22.827Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\\\", hash = \\\"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\\\", size = 7594554, upload-time = \\\"2026-05-13T18:01:27.815Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/bf/c4/557dc082be035381b85fdb2b74e21d3d21b57750b74f2b47a32f3a639ff9/virtualenv-21.4.2-py3-none-any.whl\\\", hash = \\\"sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\\\", size = 7594079, upload-time = \\\"2026-05-31T17:01:20.735Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1290,9 +1290,9 @@ requires-dist = [\\n { name = \\\"brotli\\\", marker = \\\"implementation_name == 'cpython' and sys_platform != 'ios' and extra == 'pin'\\\", specifier = \\\"==1.2.0\\\" },\\n { name = \\\"brotlicffi\\\", marker = \\\"implementation_name != 'cpython' and extra == 'default'\\\" },\\n { name = \\\"brotlicffi\\\", marker = \\\"implementation_name != 'cpython' and extra == 'pin'\\\", specifier = \\\"==1.2.0.1\\\" },\\n- { name = \\\"certifi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==2026.4.22\\\" },\\n+ { name = \\\"certifi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==2026.5.20\\\" },\\n { name = \\\"certifi\\\", marker = \\\"extra == 'default'\\\" },\\n- { name = \\\"certifi\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2026.4.22\\\" },\\n+ { name = \\\"certifi\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2026.5.20\\\" },\\n { name = \\\"cffi\\\", marker = \\\"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\\\", specifier = \\\"==2.0.0\\\" },\\n { name = \\\"cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==2.0.0\\\" },\\n { name = \\\"charset-normalizer\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.4.7\\\" },\\n@@ -1300,8 +1300,8 @@ requires-dist = [\\n { name = \\\"curl-cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'curl-cffi'\\\", specifier = \\\">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\\\" },\\n { name = \\\"curl-cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==0.15.0\\\" },\\n { name = \\\"deno\\\", marker = \\\"extra == 'deno'\\\", specifier = \\\">=2.6.6\\\" },\\n- { name = \\\"deno\\\", marker = \\\"extra == 'pin-deno'\\\", specifier = \\\"==2.7.14\\\" },\\n- { name = \\\"idna\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.15\\\" },\\n+ { name = \\\"deno\\\", marker = \\\"extra == 'pin-deno'\\\", specifier = \\\"==2.8.1\\\" },\\n+ { name = \\\"idna\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.17\\\" },\\n { name = \\\"jeepney\\\", marker = \\\"extra == 'pin-secretstorage'\\\", specifier = \\\"==0.9.0\\\" },\\n { name = \\\"markdown-it-py\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==4.2.0\\\" },\\n { name = \\\"mdurl\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==0.1.2\\\" },\\n@@ -1364,9 +1364,9 @@ wheels = [\\n \\n [[package]]\\n name = \\\"zipp\\\"\\n-version = \\\"3.23.1\\\"\\n+version = \\\"4.1.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/30/21/093488dfc7cc8964ded15ab726fad40f25fd3d788fd741cc1c5a17d78ee8/zipp-3.23.1.tar.gz\\\", hash = \\\"sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\\\", size = 25965, upload-time = \\\"2026-04-13T23:21:46.6Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/b9/d8/eab98a517c14134c0b2eb4e2387bc5f457334293ec5d2dd3857ec2966802/zipp-4.1.0.tar.gz\\\", hash = \\\"sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\\\", size = 26214, upload-time = \\\"2026-05-18T20:08:57.967Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/08/8a/0861bec20485572fbddf3dfba2910e38fe249796cb73ecdeb74e07eeb8d3/zipp-3.23.1-py3-none-any.whl\\\", hash = \\\"sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc\\\", size = 10378, upload-time = \\\"2026-04-13T23:21:45.386Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/3a/13/547360d81e6d88d58492968ffda9f9542854f11310ee556fef14260cc886/zipp-4.1.0-py3-none-any.whl\\\", hash = \\\"sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f\\\", size = 10238, upload-time = \\\"2026-05-18T20:08:57.045Z\\\" },\\n ]\\n\",\n \"summary\": \"Edited 2 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\"\n ],\n \"solution_diff\": \"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\\nindex 16068a0eb5f9..00850201a6c8 100644\\n--- a/bundle/requirements/build.txt\\n+++ b/bundle/requirements/build.txt\\n@@ -81,11 +81,11 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n # via\\n # build\\n # hatchling\\n-trove-classifiers==2026.5.7.17 \\\\\\n- --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\\\\n- --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\\n+trove-classifiers==2026.5.22.10 \\\\\\n+ --hash=sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c \\\\\\n+ --hash=sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\\n # via hatchling\\n-zipp==3.23.1 ; python_full_version < '3.10.2' \\\\\\n- --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\\\\n- --hash=sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\\n+zipp==4.1.0 ; python_full_version < '3.10.2' \\\\\\n+ --hash=sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f \\\\\\n+ --hash=sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\\n # via importlib-metadata\\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\\nindex 6dbf9e6add19..766a4c57470c 100644\\n--- a/bundle/requirements/curl-cffi.txt\\n+++ b/bundle/requirements/curl-cffi.txt\\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\\\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\\\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\\n # via yt-dlp\\n-certifi==2026.4.22 \\\\\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\\\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\\n+certifi==2026.5.20 \\\\\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\\\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\\n # via\\n # curl-cffi\\n # requests\\n@@ -274,9 +274,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\\\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\\n # via yt-dlp\\n-idna==3.15 \\\\\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n+idna==3.17 \\\\\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\\\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\\n # via requests\\n markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\\\\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\\nindex 796076d76734..6b4aac15788d 100644\\n--- a/bundle/requirements/default.txt\\n+++ b/bundle/requirements/default.txt\\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\\\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\\\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\\n # via yt-dlp\\n-certifi==2026.4.22 \\\\\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\\\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\\n+certifi==2026.5.20 \\\\\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\\\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\\n # via\\n # requests\\n # yt-dlp\\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\\\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\\\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\\n # via requests\\n-idna==3.15 \\\\\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n+idna==3.17 \\\\\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\\\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\\n # via requests\\n mutagen==1.47.0 \\\\\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\\\\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\\nindex bdf854eb45d5..9e8ba3e8c99f 100644\\n--- a/bundle/requirements/dev.txt\\n+++ b/bundle/requirements/dev.txt\\n@@ -41,9 +41,9 @@ packaging==26.2 \\\\\\n # via\\n # pytest\\n # pytest-rerunfailures\\n-platformdirs==4.9.6 \\\\\\n- --hash=sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a \\\\\\n- --hash=sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\\n+platformdirs==4.10.0 \\\\\\n+ --hash=sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7 \\\\\\n+ --hash=sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\\n # via\\n # python-discovery\\n # virtualenv\\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\\\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\\\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\\n # via pytest-rerunfailures\\n-pytest-rerunfailures==16.2 \\\\\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\\\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\n-python-discovery==1.3.1 \\\\\\n- --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\\\\n- --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\\n+pytest-rerunfailures==16.3 \\\\\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\\\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\\n+python-discovery==1.4.0 \\\\\\n+ --hash=sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da \\\\\\n+ --hash=sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\\n # via virtualenv\\n pyyaml==6.0.3 \\\\\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\\\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\\\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\\\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\\n # via pre-commit\\n-ruff==0.15.13 \\\\\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\\\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\\\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\\\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\\\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\\\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\\\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\\\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\\\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\\\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\\\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\\\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\\\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\\\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\\\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\\\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\\\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\\\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\n+ruff==0.15.15 \\\\\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\\\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\\\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\\\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\\\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\\\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\\\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\\\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\\\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\\\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\\\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\\\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\\\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\\\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\\\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\\\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\\\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\\\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\\\\n # via\\n # exceptiongroup\\n # virtualenv\\n-virtualenv==21.3.3 \\\\\\n- --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\\\\n- --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\\n+virtualenv==21.4.2 \\\\\\n+ --hash=sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c \\\\\\n+ --hash=sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\\n # via pre-commit\\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\\nindex d14c275f45f7..918c226a096b 100644\\n--- a/bundle/requirements/linux.txt\\n+++ b/bundle/requirements/linux.txt\\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\\\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\\\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\\n # via yt-dlp\\n-certifi==2026.4.22 \\\\\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\\\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\\n+certifi==2026.5.20 \\\\\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\\\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\\n # via\\n # curl-cffi\\n # requests\\n@@ -326,9 +326,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\\\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\\n # via yt-dlp\\n-idna==3.15 \\\\\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n+idna==3.17 \\\\\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\\\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\\n # via requests\\n jeepney==0.9.0 \\\\\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\\\\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\\nindex 02e86d9dbac7..8297439904fb 100644\\n--- a/bundle/requirements/macos.txt\\n+++ b/bundle/requirements/macos.txt\\n@@ -74,9 +74,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\\\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\\\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\\n # via yt-dlp\\n-certifi==2026.4.22 \\\\\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\\\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\\n+certifi==2026.5.20 \\\\\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\\\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\\n # via\\n # curl-cffi\\n # requests\\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\\\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\\\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\\\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\\n-idna==3.15 \\\\\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n+idna==3.17 \\\\\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\\\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\\n # via requests\\n macholib==1.16.4 ; sys_platform == 'darwin' \\\\\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\\\\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\\nindex c72bbe824e70..486b81b5ec07 100644\\n--- a/bundle/requirements/pip.txt\\n+++ b/bundle/requirements/pip.txt\\n@@ -1,3 +1,3 @@\\n-pip==26.1.1 \\\\\\n- --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\\\\n- --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\\n+pip==26.1.2 \\\\\\n+ --hash=sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab \\\\\\n+ --hash=sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\\nindex dc2c0b2c5cda..fb17d779bbd3 100644\\n--- a/bundle/requirements/static-analysis.txt\\n+++ b/bundle/requirements/static-analysis.txt\\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\\\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\\\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\\n # via autopep8\\n-ruff==0.15.13 \\\\\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\\\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\\\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\\\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\\\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\\\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\\\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\\\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\\\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\\\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\\\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\\\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\\\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\\\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\\\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\\\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\\\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\\\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\n+ruff==0.15.15 \\\\\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\\\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\\\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\\\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\\\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\\\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\\\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\\\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\\\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\\\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\\\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\\\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\\\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\\\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\\\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\\\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\\\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\\\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\\nindex 81a57e278ce9..8d805b2d0dde 100644\\n--- a/bundle/requirements/test.txt\\n+++ b/bundle/requirements/test.txt\\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\\\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\\\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\\n # via pytest-rerunfailures\\n-pytest-rerunfailures==16.2 \\\\\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\\\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\n+pytest-rerunfailures==16.3 \\\\\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\\\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\\nindex 9c7278f4a9e7..b939046e1e0f 100644\\n--- a/bundle/requirements/uv.txt\\n+++ b/bundle/requirements/uv.txt\\n@@ -1,20 +1,20 @@\\n-uv==0.11.14 \\\\\\n- --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\\\\n- --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\\\\n- --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\\\\n- --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\\\\n- --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\\\\n- --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\\\\n- --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\\\\n- --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\\\\n- --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\\\\n- --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\\\\n- --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\\\\n- --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\\\\n- --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\\\\n- --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\\\\n- --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\\\\n- --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\\\\n- --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\\\\n- --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\\\\n- --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\\n+uv==0.11.17 \\\\\\n+ --hash=sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3 \\\\\\n+ --hash=sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129 \\\\\\n+ --hash=sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e \\\\\\n+ --hash=sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf \\\\\\n+ --hash=sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577 \\\\\\n+ --hash=sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505 \\\\\\n+ --hash=sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27 \\\\\\n+ --hash=sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7 \\\\\\n+ --hash=sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096 \\\\\\n+ --hash=sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216 \\\\\\n+ --hash=sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697 \\\\\\n+ --hash=sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f \\\\\\n+ --hash=sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448 \\\\\\n+ --hash=sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00 \\\\\\n+ --hash=sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f \\\\\\n+ --hash=sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22 \\\\\\n+ --hash=sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91 \\\\\\n+ --hash=sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba \\\\\\n+ --hash=sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\\n\",\n \"summary\": \"Edited 10 file(s) in bundle/requirements/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\nindex 16068a0eb5f9..00850201a6c8 100644\n--- a/bundle/requirements/build.txt\n+++ b/bundle/requirements/build.txt\n@@ -81,11 +81,11 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\n # via\n # build\n # hatchling\n-trove-classifiers==2026.5.7.17 \\\n- --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\n- --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\n+trove-classifiers==2026.5.22.10 \\\n+ --hash=sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c \\\n+ --hash=sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\n # via hatchling\n-zipp==3.23.1 ; python_full_version < '3.10.2' \\\n- --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\n- --hash=sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\n+zipp==4.1.0 ; python_full_version < '3.10.2' \\\n+ --hash=sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f \\\n+ --hash=sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\n # via importlib-metadata\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nindex 6dbf9e6add19..766a4c57470c 100644\n--- a/bundle/requirements/curl-cffi.txt\n+++ b/bundle/requirements/curl-cffi.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -274,9 +274,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\nindex 796076d76734..6b4aac15788d 100644\n--- a/bundle/requirements/default.txt\n+++ b/bundle/requirements/default.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # requests\n # yt-dlp\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n mutagen==1.47.0 \\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\nindex bdf854eb45d5..9e8ba3e8c99f 100644\n--- a/bundle/requirements/dev.txt\n+++ b/bundle/requirements/dev.txt\n@@ -41,9 +41,9 @@ packaging==26.2 \\\n # via\n # pytest\n # pytest-rerunfailures\n-platformdirs==4.9.6 \\\n- --hash=sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a \\\n- --hash=sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\n+platformdirs==4.10.0 \\\n+ --hash=sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7 \\\n+ --hash=sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\n # via\n # python-discovery\n # virtualenv\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.2 \\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n-python-discovery==1.3.1 \\\n- --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\n- --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\n+pytest-rerunfailures==16.3 \\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\n+python-discovery==1.4.0 \\\n+ --hash=sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da \\\n+ --hash=sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\n # via virtualenv\n pyyaml==6.0.3 \\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\n # via pre-commit\n-ruff==0.15.13 \\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n+ruff==0.15.15 \\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n # via\n # exceptiongroup\n # virtualenv\n-virtualenv==21.3.3 \\\n- --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\n- --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\n+virtualenv==21.4.2 \\\n+ --hash=sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c \\\n+ --hash=sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\n # via pre-commit\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\nindex d14c275f45f7..918c226a096b 100644\n--- a/bundle/requirements/linux.txt\n+++ b/bundle/requirements/linux.txt\n@@ -68,9 +68,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -326,9 +326,9 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n jeepney==0.9.0 \\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\nindex 02e86d9dbac7..8297439904fb 100644\n--- a/bundle/requirements/macos.txt\n+++ b/bundle/requirements/macos.txt\n@@ -74,9 +74,9 @@ brotlicffi==1.2.0.1 ; implementation_name != 'cpython' \\\n --hash=sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851 \\\n --hash=sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1\n # via yt-dlp\n-certifi==2026.4.22 \\\n- --hash=sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a \\\n- --hash=sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\n+certifi==2026.5.20 \\\n+ --hash=sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897 \\\n+ --hash=sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\n # via\n # curl-cffi\n # requests\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\n-idna==3.15 \\\n- --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n- --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n+idna==3.17 \\\n+ --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \\\n+ --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\n # via requests\n macholib==1.16.4 ; sys_platform == 'darwin' \\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\nindex c72bbe824e70..486b81b5ec07 100644\n--- a/bundle/requirements/pip.txt\n+++ b/bundle/requirements/pip.txt\n@@ -1,3 +1,3 @@\n-pip==26.1.1 \\\n- --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\n- --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\n+pip==26.1.2 \\\n+ --hash=sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab \\\n+ --hash=sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\nindex dc2c0b2c5cda..fb17d779bbd3 100644\n--- a/bundle/requirements/static-analysis.txt\n+++ b/bundle/requirements/static-analysis.txt\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\n # via autopep8\n-ruff==0.15.13 \\\n- --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n- --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n- --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n- --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n- --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n- --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n- --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n- --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n- --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n- --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n- --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n- --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n- --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n- --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n- --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n- --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n- --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n- --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n+ruff==0.15.15 \\\n+ --hash=sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622 \\\n+ --hash=sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9 \\\n+ --hash=sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7 \\\n+ --hash=sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f \\\n+ --hash=sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4 \\\n+ --hash=sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb \\\n+ --hash=sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4 \\\n+ --hash=sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530 \\\n+ --hash=sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627 \\\n+ --hash=sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4 \\\n+ --hash=sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c \\\n+ --hash=sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e \\\n+ --hash=sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6 \\\n+ --hash=sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45 \\\n+ --hash=sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b \\\n+ --hash=sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f \\\n+ --hash=sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a \\\n+ --hash=sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\nindex 81a57e278ce9..8d805b2d0dde 100644\n--- a/bundle/requirements/test.txt\n+++ b/bundle/requirements/test.txt\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.2 \\\n- --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n- --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n+pytest-rerunfailures==16.3 \\\n+ --hash=sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c \\\n+ --hash=sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\nindex 9c7278f4a9e7..b939046e1e0f 100644\n--- a/bundle/requirements/uv.txt\n+++ b/bundle/requirements/uv.txt\n@@ -1,20 +1,20 @@\n-uv==0.11.14 \\\n- --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\n- --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\n- --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\n- --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\n- --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\n- --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\n- --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\n- --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\n- --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\n- --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\n- --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\n- --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\n- --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\n- --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\n- --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\n- --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\n- --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\n- --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\n- --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\n+uv==0.11.17 \\\n+ --hash=sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3 \\\n+ --hash=sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129 \\\n+ --hash=sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e \\\n+ --hash=sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf \\\n+ --hash=sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577 \\\n+ --hash=sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505 \\\n+ --hash=sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27 \\\n+ --hash=sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7 \\\n+ --hash=sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096 \\\n+ --hash=sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216 \\\n+ --hash=sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697 \\\n+ --hash=sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f \\\n+ --hash=sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448 \\\n+ --hash=sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00 \\\n+ --hash=sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f \\\n+ --hash=sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22 \\\n+ --hash=sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91 \\\n+ --hash=sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba \\\n+ --hash=sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\ndiff --git a/pyproject.toml b/pyproject.toml\nindex b2f8a007335b..8128fb31a85a 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -69,9 +69,9 @@ deno = [\n pin = [\n \"brotli==1.2.0 ; implementation_name == 'cpython' and sys_platform != 'ios'\",\n \"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\",\n- \"certifi==2026.4.22\",\n+ \"certifi==2026.5.20\",\n \"charset-normalizer==3.4.7\",\n- \"idna==3.15\",\n+ \"idna==3.17\",\n \"mutagen==1.47.0\",\n \"pycryptodomex==3.23.0\",\n \"requests==2.34.2\",\n@@ -80,7 +80,7 @@ pin = [\n \"yt-dlp-ejs==0.8.0\",\n ]\n pin-curl-cffi = [\n- \"certifi==2026.4.22 ; implementation_name == 'cpython'\",\n+ \"certifi==2026.5.20 ; implementation_name == 'cpython'\",\n \"cffi==2.0.0 ; implementation_name == 'cpython'\",\n \"curl-cffi==0.15.0 ; implementation_name == 'cpython'\",\n \"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\",\n@@ -98,7 +98,7 @@ pin-secretstorage = [\n \"typing-extensions==4.15.0 ; python_full_version < '3.11'\",\n ]\n pin-deno = [\n- \"deno==2.7.14\",\n+ \"deno==2.8.1\",\n ]\n \n [dependency-groups]\ndiff --git a/uv.lock b/uv.lock\nindex a1f2b7f8b08d..10e5d0f119a9 100644\n--- a/uv.lock\n+++ b/uv.lock\n@@ -137,11 +137,11 @@ wheels = [\n \n [[package]]\n name = \"certifi\"\n-version = \"2026.4.22\"\n+version = \"2026.5.20\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/25/ee/6caf7a40c36a1220410afe15a1cc64993a1f864871f698c0f93acb72842a/certifi-2026.4.22.tar.gz\", hash = \"sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580\", size = 137077, upload-time = \"2026-04-22T11:26:11.191Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz\", hash = \"sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d\", size = 135422, upload-time = \"2026-05-20T11:46:50.073Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/22/30/7cd8fdcdfbc5b869528b079bfb76dcdf6056b1a2097a662e5e8c04f42965/certifi-2026.4.22-py3-none-any.whl\", hash = \"sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a\", size = 135707, upload-time = \"2026-04-22T11:26:09.372Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl\", hash = \"sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897\", size = 134134, upload-time = \"2026-05-20T11:46:48.578Z\" },\n ]\n \n [[package]]\n@@ -458,15 +458,15 @@ wheels = [\n \n [[package]]\n name = \"deno\"\n-version = \"2.7.14\"\n+version = \"2.8.1\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/e4/adbeb37143551a4e575049e8b291bedc5f57191753ade31f7cf6665b1d52/deno-2.7.14.tar.gz\", hash = \"sha256:63a79caa105368813e434593f2c059d4cc3e2562ec57f606348e9321a525d582\", size = 8168, upload-time = \"2026-04-28T17:34:10.315Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/43/eb/b743a520cdd668e070a4535296123f1c62d054b00699f58e49c32ab5925c/deno-2.8.1.tar.gz\", hash = \"sha256:fb65e568bef30b1a7e63f033713f1a6792a8456e339febdb7d638c6bb2c4c008\", size = 8167, upload-time = \"2026-05-27T13:01:06.508Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c8/a1/82951e37de914ca9445e3dd99a5f06e36e857000f9d34beb3f9fc5ff0971/deno-2.7.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:3860efe76d9c8491ee847256f31ff5f1b1d1871137daab91eb4f28c0543eeb4d\", size = 47841490, upload-time = \"2026-04-28T17:33:53.968Z\" },\n- { url = \"https://files.pythonhosted.org/packages/fe/1f/809cac7474d86ad41f2938b4713cf846b261bba7a1fdb5ab27b3fabc435e/deno-2.7.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:194560abc29021d3b5b4be9bfd628f2b21152a3bae031bdcd30e41584ba4b9d8\", size = 44600497, upload-time = \"2026-04-28T17:33:57.426Z\" },\n- { url = \"https://files.pythonhosted.org/packages/52/51/c60816c902e5fa9daf4bab5869a5895e58748f05739eab399c1ae6d0ee37/deno-2.7.14-py3-none-manylinux_2_27_aarch64.whl\", hash = \"sha256:f47511d0c8080c2bdb0ee58f2b96d657b1e5f2ede088b1bb9a98bfb80362af22\", size = 48267415, upload-time = \"2026-04-28T17:34:00.553Z\" },\n- { url = \"https://files.pythonhosted.org/packages/79/a8/ea52407ebe29caadc67b6899437898880aad8d207ed889dd4f9ba7d9ddf7/deno-2.7.14-py3-none-manylinux_2_27_x86_64.whl\", hash = \"sha256:0a92040900311849a812d47e29e1494b1a4f4c7431536721888356c7a3662d22\", size = 50283833, upload-time = \"2026-04-28T17:34:04.094Z\" },\n- { url = \"https://files.pythonhosted.org/packages/98/0e/2581a39773004081f40ef4811059fe867953d86166b3f7fb77abb5d68757/deno-2.7.14-py3-none-win_amd64.whl\", hash = \"sha256:1646dbcd447465bc6eb9a9e25eef0283f74dd68ad5bd9c50bcaec641737eb730\", size = 49278963, upload-time = \"2026-04-28T17:34:07.671Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d1/71/f9dc8ad874dcc26cf1a154c8f89d77e1155ced1f6a64be9d21127bd555ce/deno-2.8.1-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:733e24e4883c9516534cae7a10277048ffea7cc034f9f726e8c145d48ba75d19\", size = 42749443, upload-time = \"2026-05-27T13:00:49.439Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f5/db/1721aca1a9bd132a3f721bd547022534fcdd6221701561c5e33705cdfb6d/deno-2.8.1-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:7b4638504f3730f9b25229db08d1bce87bc64f52498f9f8f5aeba702c7ff2115\", size = 39460813, upload-time = \"2026-05-27T13:00:52.578Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1a/20/b50646f865562b8f21532cad6f9804b126efd4030cfd0c5e1d11217b15ca/deno-2.8.1-py3-none-manylinux_2_27_aarch64.whl\", hash = \"sha256:91f29a2df4cb6135872d68f38005c08fe0c389c84cb7349d7399eedbfbe19829\", size = 43893026, upload-time = \"2026-05-27T13:00:55.939Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0d/1e/75b84e7096b53f077ac01f9b5c979b7b42b0a6497f56d7c4ae072381e059/deno-2.8.1-py3-none-manylinux_2_27_x86_64.whl\", hash = \"sha256:f0958910ffa88f6b6e142129ab34b7a3aec361fc63904ff803ce1594beca230a\", size = 46038250, upload-time = \"2026-05-27T13:00:59.662Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/14/d6/14f6cf25025644bb8b7d9b4606780b5ec6ee429a55c0d1f05681718c7fc0/deno-2.8.1-py3-none-win_amd64.whl\", hash = \"sha256:71ec55c0a0944beee376aa824722734cf3e617661bca5e143caa83991921e4f5\", size = 41962337, upload-time = \"2026-05-27T13:01:03.453Z\" },\n ]\n \n [[package]]\n@@ -526,11 +526,11 @@ wheels = [\n \n [[package]]\n name = \"idna\"\n-version = \"3.15\"\n+version = \"3.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\", hash = \"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\", size = 199245, upload-time = \"2026-05-12T22:45:57.011Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz\", hash = \"sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f\", size = 196048, upload-time = \"2026-05-28T14:32:38.55Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\", hash = \"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\", size = 72340, upload-time = \"2026-05-12T22:45:55.733Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl\", hash = \"sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c\", size = 65316, upload-time = \"2026-05-28T14:32:37.035Z\" },\n ]\n \n [[package]]\n@@ -643,20 +643,20 @@ wheels = [\n \n [[package]]\n name = \"pip\"\n-version = \"26.1.1\"\n+version = \"26.1.2\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\", hash = \"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\", size = 1840400, upload-time = \"2026-05-04T19:02:21.248Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/01/91/47e7d486260f618783899587af63ccf7980fb60245c3e63dd4571c6b57ad/pip-26.1.2.tar.gz\", hash = \"sha256:f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605\", size = 1840799, upload-time = \"2026-05-31T17:33:58.56Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\", hash = \"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\", size = 1812777, upload-time = \"2026-05-04T19:02:18.9Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/5d/95/6b5cb3461ea5673ba0995989746db58eb18b91b54dbf331e72f569540946/pip-26.1.2-py3-none-any.whl\", hash = \"sha256:382ff9f685ee3bc25864f820aa50505825f10f5458ffff07e30a6d96e5715cab\", size = 1813144, upload-time = \"2026-05-31T17:33:56.772Z\" },\n ]\n \n [[package]]\n name = \"platformdirs\"\n-version = \"4.9.6\"\n+version = \"4.10.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/9f/4a/0883b8e3802965322523f0b200ecf33d31f10991d0401162f4b23c698b42/platformdirs-4.9.6.tar.gz\", hash = \"sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a\", size = 29400, upload-time = \"2026-04-09T00:04:10.812Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz\", hash = \"sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7\", size = 31224, upload-time = \"2026-05-28T03:32:53.587Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl\", hash = \"sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917\", size = 21348, upload-time = \"2026-04-09T00:04:09.463Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl\", hash = \"sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a\", size = 22743, upload-time = \"2026-05-28T03:32:52.175Z\" },\n ]\n \n [[package]]\n@@ -825,28 +825,28 @@ wheels = [\n \n [[package]]\n name = \"pytest-rerunfailures\"\n-version = \"16.2\"\n+version = \"16.3\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"pytest\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\", hash = \"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\", size = 32121, upload-time = \"2026-05-13T08:13:26.998Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/4d/f0/74f8e685be7ecd1572c1256132f18fce3a665d7e07649a3f23b7eb2d3bec/pytest_rerunfailures-16.3.tar.gz\", hash = \"sha256:37c9b1231c8083e9f4e724f50f7a21241822f9516c15c700ebbf218d6452355c\", size = 34148, upload-time = \"2026-05-22T06:51:22.292Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\", hash = \"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\", size = 14505, upload-time = \"2026-05-13T08:13:25.485Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f8/98/58a71d68d3126d7f6a6ed1944c37ec207a4ff3dc66cad3bed7b59d38df61/pytest_rerunfailures-16.3-py3-none-any.whl\", hash = \"sha256:6bdfb8ffb46c46072e6c16bdedee38b6c13eac620d9415ed5b63152cbf283170\", size = 15396, upload-time = \"2026-05-22T06:51:20.547Z\" },\n ]\n \n [[package]]\n name = \"python-discovery\"\n-version = \"1.3.1\"\n+version = \"1.4.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"filelock\" },\n { name = \"platformdirs\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\", hash = \"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\", size = 68011, upload-time = \"2026-05-12T20:53:36.336Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/a6/12/38c1a0b1e64806780c9563e3fc9f6e472251839662587cfbe9bfaf2ae10a/python_discovery-1.4.0.tar.gz\", hash = \"sha256:eb8bc7daad3c226c147e45bb4e970a1feb1bf4048ee178e6db59e197b8010ce3\", size = 68455, upload-time = \"2026-05-28T01:15:37.639Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\", hash = \"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\", size = 33185, upload-time = \"2026-05-12T20:53:34.969Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c8/8d/3d316429f65029532bb1e28ff77b797d86b5ac3915bb44ca4e19aa283d43/python_discovery-1.4.0-py3-none-any.whl\", hash = \"sha256:26ed78d703e234879a66244c7d4114563fb13ec5cd30a2d1357e5fb4850782da\", size = 33217, upload-time = \"2026-05-28T01:15:36.573Z\" },\n ]\n \n [[package]]\n@@ -952,27 +952,27 @@ wheels = [\n \n [[package]]\n name = \"ruff\"\n-version = \"0.15.13\"\n+version = \"0.15.15\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\", hash = \"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\", size = 4678180, upload-time = \"2026-05-14T13:44:37.869Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz\", hash = \"sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6\", size = 4706985, upload-time = \"2026-05-28T14:16:57.784Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\", hash = \"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\", size = 10738279, upload-time = \"2026-05-14T13:44:18.7Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\", size = 11124798, upload-time = \"2026-05-14T13:44:06.427Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\", size = 10460761, upload-time = \"2026-05-14T13:44:04.375Z\" },\n- { url = \"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\", size = 10804451, upload-time = \"2026-05-14T13:44:25.221Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\", size = 10534285, upload-time = \"2026-05-14T13:44:08.888Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\", size = 11312063, upload-time = \"2026-05-14T13:44:11.274Z\" },\n- { url = \"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\", size = 12183079, upload-time = \"2026-05-14T13:44:01.634Z\" },\n- { url = \"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\", size = 11440833, upload-time = \"2026-05-14T13:43:59.043Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\", size = 11434486, upload-time = \"2026-05-14T13:44:27.761Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\", size = 11385189, upload-time = \"2026-05-14T13:44:13.704Z\" },\n- { url = \"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\", size = 10781380, upload-time = \"2026-05-14T13:43:56.734Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\", size = 10540605, upload-time = \"2026-05-14T13:44:20.748Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\", size = 11036554, upload-time = \"2026-05-14T13:44:16.256Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\", size = 11528133, upload-time = \"2026-05-14T13:44:22.808Z\" },\n- { url = \"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\", hash = \"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\", size = 10721455, upload-time = \"2026-05-14T13:44:35.697Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\", hash = \"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\", size = 11900409, upload-time = \"2026-05-14T13:44:30.389Z\" },\n- { url = \"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\", hash = \"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\", size = 11179336, upload-time = \"2026-05-14T13:44:33.026Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl\", hash = \"sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b\", size = 10710652, upload-time = \"2026-05-28T14:16:06.701Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e\", size = 11096615, upload-time = \"2026-05-28T14:16:23.313Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530\", size = 10436683, upload-time = \"2026-05-28T14:16:40.974Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4\", size = 10769064, upload-time = \"2026-05-28T14:16:28.905Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f\", size = 10511987, upload-time = \"2026-05-28T14:16:43.732Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622\", size = 11275100, upload-time = \"2026-05-28T14:16:55.244Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45\", size = 12176903, upload-time = \"2026-05-28T14:16:14.368Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627\", size = 11404550, upload-time = \"2026-05-28T14:16:20.138Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4\", size = 11382027, upload-time = \"2026-05-28T14:16:46.615Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c\", size = 11366041, upload-time = \"2026-05-28T14:16:26.247Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd\", size = 10741795, upload-time = \"2026-05-28T14:16:17.11Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f\", size = 10511117, upload-time = \"2026-05-28T14:16:31.767Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb\", size = 10994867, upload-time = \"2026-05-28T14:16:35.149Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a\", size = 11482101, upload-time = \"2026-05-28T14:16:49.598Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl\", hash = \"sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9\", size = 10716774, upload-time = \"2026-05-28T14:16:52.337Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl\", hash = \"sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4\", size = 11868463, upload-time = \"2026-05-28T14:16:11.333Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl\", hash = \"sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7\", size = 11138498, upload-time = \"2026-05-28T14:16:38.425Z\" },\n ]\n \n [[package]]\n@@ -1053,11 +1053,11 @@ wheels = [\n \n [[package]]\n name = \"trove-classifiers\"\n-version = \"2026.5.7.17\"\n+version = \"2026.5.22.10\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\", hash = \"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\", size = 17041, upload-time = \"2026-05-07T17:48:01.931Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/86/b6/1c41aa221b157b624ea1a72e975404ef228724d249011ee411ac211a615e/trove_classifiers-2026.5.22.10.tar.gz\", hash = \"sha256:5477e9974e91904fb2cfa4a7581ab6e2f30c2c38d847fd00ed866080748101d5\", size = 17061, upload-time = \"2026-05-22T10:17:28.99Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\", hash = \"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\", size = 14201, upload-time = \"2026-05-07T17:48:00.488Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/02/9a14d3048ffa4f45b7c60956a9b22688dd925d6de50f6baf7e55f3664942/trove_classifiers-2026.5.22.10-py3-none-any.whl\", hash = \"sha256:01fe864225726e03efb843827ecabfe319fc4dee8dd66d65b8996cb09be46e2c\", size = 14225, upload-time = \"2026-05-22T10:17:27.569Z\" },\n ]\n \n [[package]]\n@@ -1080,33 +1080,33 @@ wheels = [\n \n [[package]]\n name = \"uv\"\n-version = \"0.11.14\"\n+version = \"0.11.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\", hash = \"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\", size = 4130699, upload-time = \"2026-05-12T18:00:37.321Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/2c/8e/ec34c19d0f254fcbcc5c1ce8c7f06e47e0f69a7e1a0269c1d59cb0b0f279/uv-0.11.17.tar.gz\", hash = \"sha256:1d1be74deec997db1dda05a7e67541c904d65cbfd72e455d3c0a2a1e4bf2cddf\", size = 4203607, upload-time = \"2026-05-28T20:39:47.707Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\", hash = \"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\", size = 23545199, upload-time = \"2026-05-12T18:01:34.526Z\" },\n- { url = \"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\", size = 22957064, upload-time = \"2026-05-12T18:00:54.225Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\", size = 21678307, upload-time = \"2026-05-12T18:00:57.132Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\", size = 23353409, upload-time = \"2026-05-12T18:01:27.512Z\" },\n- { url = \"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\", size = 23103964, upload-time = \"2026-05-12T18:01:31.094Z\" },\n- { url = \"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\", size = 23104638, upload-time = \"2026-05-12T18:01:10.093Z\" },\n- { url = \"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\", size = 24625888, upload-time = \"2026-05-12T18:01:17.192Z\" },\n- { url = \"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\", size = 25445231, upload-time = \"2026-05-12T18:00:40.012Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\", size = 24571961, upload-time = \"2026-05-12T18:00:43.713Z\" },\n- { url = \"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\", size = 24718523, upload-time = \"2026-05-12T18:01:06.587Z\" },\n- { url = \"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\", size = 23454821, upload-time = \"2026-05-12T18:00:51.166Z\" },\n- { url = \"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\", size = 24087843, upload-time = \"2026-05-12T18:00:47.272Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\", size = 24147611, upload-time = \"2026-05-12T18:01:20.499Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\", size = 23920348, upload-time = \"2026-05-12T18:01:24.033Z\" },\n- { url = \"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\", size = 24928981, upload-time = \"2026-05-12T18:01:13.961Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\", hash = \"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\", size = 22573503, upload-time = \"2026-05-12T18:00:34.36Z\" },\n- { url = \"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\", hash = \"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\", size = 25175590, upload-time = \"2026-05-12T18:01:00.38Z\" },\n- { url = \"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\", hash = \"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\", size = 23594775, upload-time = \"2026-05-12T18:01:03.55Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/15/2e/e6d42f9d39009eee976f1e5dfd31d3d1943e6e593ad7b191cf11e9744a36/uv-0.11.17-py3-none-linux_armv6l.whl\", hash = \"sha256:8426bfe315564d414cbc5ba5467595dc6348965e19acec742914f47da3ff269f\", size = 23551216, upload-time = \"2026-05-28T20:39:05.395Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d0/ee/d72bcc60f3585653a4b768425854d737d98d65c1765547d25c2999547ea9/uv-0.11.17-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6d1a033cc68cabb4141d6c1e3b66ffc6e970b98ba42e210f33270251e0bd8697\", size = 22997377, upload-time = \"2026-05-28T20:39:25.21Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/58/34/1bc69798d9ae998fbc42c61b02883f2ba00d04bdd858e589604d01846287/uv-0.11.17-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:58c07ffc272c847d29cd98ca5082fa4304a645f87c718ec900e3cca9026bd096\", size = 21630197, upload-time = \"2026-05-28T20:39:28.935Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/93/1be48ec6a8933d9a77d0ce5240ed63f68869f68517ccf5d62268ed03f3e8/uv-0.11.17-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:036d6e2940afe8b79637530b01b9241d8cfd174b07f1179a1ebbd42409c38ca3\", size = 23414940, upload-time = \"2026-05-28T20:39:55.015Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/00/31/b7488ff49d80090ea9d05d67a4d381a1b4479502e9853e654caa1c1c678e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:283186700c3e65a4644a73a917232da7d3e4a94d25ea0377a44f5b263fa49577\", size = 23096330, upload-time = \"2026-05-28T20:39:01.284Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fe/95/42b6137c5de06278d229c7eef2f314df2a738cd799795bbb44dace21bd6e/uv-0.11.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:f2e44dfbfc7778d0d90edc6738f237c91e5e37e4e3cfe94c8a312cec56a41485\", size = 23101906, upload-time = \"2026-05-28T20:39:17.149Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/17/7c/0ca03b2d19965db6d5dfe0c8cf96a3d0b424503c8cbc3cd2ffdc5869a15d/uv-0.11.17-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:1a817eeb3026f27a53d3f4b7855a5105f6787dd192140e201eda4d2b9a11b72e\", size = 24444409, upload-time = \"2026-05-28T20:39:59.218Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b5/fb/179f55a3b19d47c30ec1f41b9b964da74dfa7053ff310a70a9c4d8cb998d/uv-0.11.17-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:bf8f5ad959583dcd2c4ae445c754a97c05700246ff89259f3fd285c9c20f4c00\", size = 25540153, upload-time = \"2026-05-28T20:39:09.535Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/29/592f42012765c43ae45c112110e214bca7b0cfc08c4c1b52e1dfa47dedd5/uv-0.11.17-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:ce16892a45134d20165c1ceababe06f3e9ce6a58902db1eff812c8c93626823f\", size = 24665906, upload-time = \"2026-05-28T20:39:41.254Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0e/51/b75808766f895248553c6370968509cd4f726e6943e310a8f7a171036ad0/uv-0.11.17-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:9da839e5a491c9a701d7d327a199cafc76ac27a03ac84fd2a8d4bf32c3af2448\", size = 24863325, upload-time = \"2026-05-28T20:39:51.006Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ee/6a/6f27ee69e97f480104bb8ec335f04c2a12add98edfcc4844a68e9538b6e2/uv-0.11.17-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:ec004b3c9bf9cb7756067ad1bd0bf64eb843e6fa2edbfbb3135ee152c14cea91\", size = 23521674, upload-time = \"2026-05-28T20:38:55.869Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/df/11/1344aca7c710f794750f74de0e552a54ab24193ecc01fa3b3ae22ff822a1/uv-0.11.17-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:659227cac719b618cc91e02be9e274ad5bd72d74fa278123e6373537e9f28216\", size = 24224725, upload-time = \"2026-05-28T20:39:32.945Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ad/44/7b11550c1453ea13b81e549c83523e6ab6ed3231d09b2fd6b9eb19acceaf/uv-0.11.17-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:e301d844eed9401f0f0351de12c55f1306ca05372acb0f28d35717c8ba663a22\", size = 24301643, upload-time = \"2026-05-28T20:39:45.183Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1a/36/8f683bc60547b8f93d0e752a8574d13fad776999cb978482b360c053ca22/uv-0.11.17-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:f0bf483c0d9fa14283992d56061b498b9d3d4adebd285af8744dc33f64dadfba\", size = 23786049, upload-time = \"2026-05-28T20:39:20.999Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/10/dc/7a495db39c2970de4fa375c337dbd617b16780911f88f0511f8fe7f6747c/uv-0.11.17-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:2ccd5487a4a192bc832ea04c867a26883757db8fdfe88bed85d8129c82f9e505\", size = 25049786, upload-time = \"2026-05-28T20:40:03.292Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/37/dd/74eff72d749eaf7e19f489878e21a368a7fef58d26ea0c63ec044ecd78b1/uv-0.11.17-py3-none-win32.whl\", hash = \"sha256:12b701fa32c5be3691759a73956e4462f30fa7b0dfa52ec66cb305bbb6ea4129\", size = 22479213, upload-time = \"2026-05-28T20:39:13.316Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/79/99/8af4a92b99a8a4823297c26df727fe957267e03e1196e3caa803c3f6ccb2/uv-0.11.17-py3-none-win_amd64.whl\", hash = \"sha256:44ec1fe3af839f87370dcf0400c0cab917cc1ce697d563e860fc7d9ed72655e7\", size = 25083161, upload-time = \"2026-05-28T20:40:07.931Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/00/76/a689077832d585d29d87f9cd0d65eca1af58abd29a4eab004d0a8a858b9c/uv-0.11.17-py3-none-win_arm64.whl\", hash = \"sha256:37c915bfcf86f99c1c5be7c9ed21e0d80624067ba47bc8916a3cb0530bc94d27\", size = 23544936, upload-time = \"2026-05-28T20:39:37.137Z\" },\n ]\n \n [[package]]\n name = \"virtualenv\"\n-version = \"21.3.3\"\n+version = \"21.4.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"distlib\" },\n@@ -1115,9 +1115,9 @@ dependencies = [\n { name = \"python-discovery\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\", hash = \"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\", size = 7613784, upload-time = \"2026-05-13T18:01:30.19Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/e1/0d/4e93c8e6d1001a75763f87d8f5ecda8ebc7f4aa2153dddfaf4ae8892821a/virtualenv-21.4.2.tar.gz\", hash = \"sha256:38e6ee0a555615c0ea9da2ac7e9998fe8dc3b911dd33ad8eaad2020957653b0c\", size = 7613326, upload-time = \"2026-05-31T17:01:22.827Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\", hash = \"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\", size = 7594554, upload-time = \"2026-05-13T18:01:27.815Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bf/c4/557dc082be035381b85fdb2b74e21d3d21b57750b74f2b47a32f3a639ff9/virtualenv-21.4.2-py3-none-any.whl\", hash = \"sha256:854210ca524a1a4d0d744734f4acbc721c3ffe163b85bbf5d56d14d5ae2f0fae\", size = 7594079, upload-time = \"2026-05-31T17:01:20.735Z\" },\n ]\n \n [[package]]\n@@ -1290,9 +1290,9 @@ requires-dist = [\n { name = \"brotli\", marker = \"implementation_name == 'cpython' and sys_platform != 'ios' and extra == 'pin'\", specifier = \"==1.2.0\" },\n { name = \"brotlicffi\", marker = \"implementation_name != 'cpython' and extra == 'default'\" },\n { name = \"brotlicffi\", marker = \"implementation_name != 'cpython' and extra == 'pin'\", specifier = \"==1.2.0.1\" },\n- { name = \"certifi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2026.4.22\" },\n+ { name = \"certifi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2026.5.20\" },\n { name = \"certifi\", marker = \"extra == 'default'\" },\n- { name = \"certifi\", marker = \"extra == 'pin'\", specifier = \"==2026.4.22\" },\n+ { name = \"certifi\", marker = \"extra == 'pin'\", specifier = \"==2026.5.20\" },\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\", specifier = \"==2.0.0\" },\n { name = \"cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.0.0\" },\n { name = \"charset-normalizer\", marker = \"extra == 'pin'\", specifier = \"==3.4.7\" },\n@@ -1300,8 +1300,8 @@ requires-dist = [\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'curl-cffi'\", specifier = \">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.15.0\" },\n { name = \"deno\", marker = \"extra == 'deno'\", specifier = \">=2.6.6\" },\n- { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.7.14\" },\n- { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.15\" },\n+ { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.8.1\" },\n+ { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.17\" },\n { name = \"jeepney\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==0.9.0\" },\n { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.2.0\" },\n { name = \"mdurl\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.1.2\" },\n@@ -1364,9 +1364,9 @@ wheels = [\n \n [[package]]\n name = \"zipp\"\n-version = \"3.23.1\"\n+version = \"4.1.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/30/21/093488dfc7cc8964ded15ab726fad40f25fd3d788fd741cc1c5a17d78ee8/zipp-3.23.1.tar.gz\", hash = \"sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110\", size = 25965, upload-time = \"2026-04-13T23:21:46.6Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b9/d8/eab98a517c14134c0b2eb4e2387bc5f457334293ec5d2dd3857ec2966802/zipp-4.1.0.tar.gz\", hash = \"sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602\", size = 26214, upload-time = \"2026-05-18T20:08:57.967Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/08/8a/0861bec20485572fbddf3dfba2910e38fe249796cb73ecdeb74e07eeb8d3/zipp-3.23.1-py3-none-any.whl\", hash = \"sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc\", size = 10378, upload-time = \"2026-04-13T23:21:45.386Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3a/13/547360d81e6d88d58492968ffda9f9542854f11310ee556fef14260cc886/zipp-4.1.0-py3-none-any.whl\", hash = \"sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f\", size = 10238, upload-time = \"2026-05-18T20:08:57.045Z\" },\n ]\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":12,"string":"12"}}},{"rowIdx":34282,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16589"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16589,"string":"16,589"},"base_sha":{"kind":"string","value":"98e42eb04486e00bf86479b24dbfe19321f652ee"},"head_sha":{"kind":"string","value":"0415640523afcfb97dbf5e87e1cd4459b341f212"},"task":{"kind":"string","value":"[build] Update 14 dependencies\n\n<!-- BEGIN dlp-bot generated section -->\n\npackage | old | new | diff | changelog\n--------|-----|-----|------|----------\n[**`build`**](<https://pypi.org/project/build/>) | [1.***4.4***](<https://github.com/pypa/build/releases/tag/1.4.4>) | [1.***5.0***](<https://github.com/pypa/build/releases/tag/1.5.0>) | [`1.4.4...1.5.0`](<https://github.com/pypa/build/compare/1.4.4...1.5.0>) | [changelog.html](<https://build.pypa.io/en/stable/changelog.html>)\n[**`cryptography`**](<https://pypi.org/project/cryptography/>) | [***47.0.0***](<https://github.com/pyca/cryptography/releases/tag/47.0.0>) | [***48.0.0***](<https://github.com/pyca/cryptography/releases/tag/48.0.0>) | [`47.0.0...48.0.0`](<https://github.com/pyca/cryptography/compare/47.0.0...48.0.0>) | [changelog](<https://cryptography.io/en/latest/changelog/>)\n[**`idna`**](<https://pypi.org/project/idna/>) | [3.***13***](<https://github.com/kjd/idna/releases/tag/v3.13>) | [3.***15***](<https://github.com/kjd/idna/releases/tag/v3.15>) | [`v3.13...v3.15`](<https://github.com/kjd/idna/compare/v3.13...v3.15>) | [HISTORY.md](<https://github.com/kjd/idna/blob/master/HISTORY.md>)\n[**`markdown-it-py`**](<https://pypi.org/project/markdown-it-py/>) | [4.***0.0***](<https://github.com/executablebooks/markdown-it-py/releases/tag/v4.0.0>) | [4.***2.0***](<https://github.com/executablebooks/markdown-it-py/releases/tag/v4.2.0>) | [`v4.0.0...v4.2.0`](<https://github.com/executablebooks/markdown-it-py/compare/v4.0.0...v4.2.0>) | \n[**`pip`**](<https://pypi.org/project/pip/>) | [26.1](<https://github.com/pypa/pip/releases/tag/26.1>) | [26.1.1](<https://github.com/pypa/pip/releases/tag/26.1.1>) | [`26.1...26.1.1`](<https://github.com/pypa/pip/compare/26.1...26.1.1>) | [news](<https://pip.pypa.io/en/stable/news/>)\n[**`pyinstaller-hooks-contrib`**](<https://pypi.org/project/pyinstaller-hooks-contrib/>) | [2026.***4***](<https://github.com/pyinstaller/pyinstaller-hooks-contrib/releases/tag/v2026.4>) | [2026.***5***](<https://github.com/pyinstaller/pyinstaller-hooks-contrib/releases/tag/v2026.5>) | [`v2026.4...v2026.5`](<https://github.com/pyinstaller/pyinstaller-hooks-contrib/compare/v2026.4...v2026.5>) | \n[**`pytest-rerunfailures`**](<https://pypi.org/project/pytest-rerunfailures/>) | [16.***1***](<https://github.com/pytest-dev/pytest-rerunfailures/releases/tag/16.1>) | [16.***2***](<https://github.com/pytest-dev/pytest-rerunfailures/releases/tag/16.2>) | [`16.1...16.2`](<https://github.com/pytest-dev/pytest-rerunfailures/compare/16.1...16.2>) | \n[**`python-discovery`**](<https://pypi.org/project/python-discovery/>) | [1.***2.2***](<https://github.com/tox-dev/python-discovery/releases/tag/1.2.2>) | [1.***3.1***](<https://github.com/tox-dev/python-discovery/releases/tag/1.3.1>) | [`1.2.2...1.3.1`](<https://github.com/tox-dev/python-discovery/compare/1.2.2...1.3.1>) | [releases](<https://github.com/tox-dev/python-discovery/releases>)\n[**`requests`**](<https://pypi.org/project/requests/>) | [2.***33.1***](<https://github.com/psf/requests/releases/tag/v2.33.1>) | [2.***34.2***](<https://github.com/psf/requests/releases/tag/v2.34.2>) | [`v2.33.1...v2.34.2`](<https://github.com/psf/requests/compare/v2.33.1...v2.34.2>) | \n[**`ruff`**](<https://pypi.org/project/ruff/>) | [0.15.***12***](<https://github.com/astral-sh/ruff/releases/tag/0.15.12>) | [0.15.***13***](<https://github.com/astral-sh/ruff/releases/tag/0.15.13>) | [`0.15.12...0.15.13`](<https://github.com/astral-sh/ruff/compare/0.15.12...0.15.13>) | [CHANGELOG.md](<https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md>)\n[**`trove-classifiers`**](<https://pypi.org/project/trove-classifiers/>) | [2026.***4.28.13***](<https://github.com/pypa/trove-classifiers/releases/tag/2026.4.28.13>) | [2026.***5.7.17***](<https://github.com/pypa/trove-classifiers/releases/tag/2026.5.7.17>) | [`2026.4.28.13...2026.5.7.17`](<https://github.com/pypa/trove-classifiers/compare/2026.4.28.13...2026.5.7.17>) | \n[**`urllib3`**](<https://pypi.org/project/urllib3/>) | [2.***6.3***](<https://github.com/urllib3/urllib3/releases/tag/2.6.3>) | [2.***7.0***](<https://github.com/urllib3/urllib3/releases/tag/2.7.0>) | [`2.6.3...2.7.0`](<https://github.com/urllib3/urllib3/compare/2.6.3...2.7.0>) | [CHANGES.rst](<https://github.com/urllib3/urllib3/blob/main/CHANGES.rst>)\n[**`uv`**](<https://pypi.org/project/uv/>) | [0.11.***8***](<https://github.com/astral-sh/uv/releases/tag/0.11.8>) | [0.11.***14***](<https://github.com/astral-sh/uv/releases/tag/0.11.14>) | [`0.11.8...0.11.14`](<https://github.com/astral-sh/uv/compare/0.11.8...0.11.14>) | [CHANGELOG.md](<https://github.com/astral-sh/uv/blob/main/CHANGELOG.md>)\n[**`virtualenv`**](<https://pypi.org/project/virtualenv/>) | [21.3.***0***](<https://github.com/pypa/virtualenv/releases/tag/21.3.0>) | [21.3.***3***](<https://github.com/pypa/virtualenv/releases/tag/21.3.3>) | [`21.3.0...21.3.3`](<https://github.com/pypa/virtualenv/compare/21.3.0...21.3.3>) | \n\n```\n[build] Update 14 dependencies\n\n* Bump build 1.4.4 => 1.5.0\n* Bump cryptography 47.0.0 => 48.0.0\n* Bump idna 3.13 => 3.15\n* Bump markdown-it-py 4.0.0 => 4.2.0\n* Bump pip 26.1 => 26.1.1\n* Bump pyinstaller-hooks-contrib 2026.4 => 2026.5\n* Bump pytest-rerunfailures 16.1 => 16.2\n* Bump python-discovery 1.2.2 => 1.3.1\n* Bump requests 2.33.1 => 2.34.2\n* Bump ruff 0.15.12 => 0.15.13\n* Bump trove-classifiers 2026.4.28.13 => 2026.5.7.17\n* Bump urllib3 2.6.3 => 2.7.0\n* Bump uv 0.11.8 => 0.11.14\n* Bump virtualenv 21.3.0 => 21.3.3\n\nAuthored by: dlp-bot\n\n```\n\n<!-- END dlp-bot generated section -->\n\n\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\n\n\n### Before submitting a *pull request* make sure you have:\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\n\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/): This pull request was created by a bot that was written by the maintainers of this project\n\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\n- [x] Automated maintenance\n\n</details>\n\n\n---\n\n*This pull request is the product of [this GitHub Actions workflow run](https://github.com/bashonly/dlp-bot/actions/runs/26255875507).*"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [build] Update 14 dependencies","scope_files":["pyproject.toml","uv.lock"]},{"subtask_id":"s2","goal":"Implement the changes under `bundle/requirements/` needed for: [build] Update 14 dependencies","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/pyinstaller.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt","bundle/requirements/win-arm64-pyinstaller.txt","bundle/requirements/win-x64-pyinstaller.txt","bundle/requirements/win-x86-pyinstaller.txt"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [build] Update 14 dependencies\",\n \"scope_files\": [\n \"pyproject.toml\",\n \"uv.lock\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `bundle/requirements/` needed for: [build] Update 14 dependencies\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/pyinstaller.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\",\n \"bundle/requirements/win-arm64-pyinstaller.txt\",\n \"bundle/requirements/win-x64-pyinstaller.txt\",\n \"bundle/requirements/win-x86-pyinstaller.txt\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["pyproject.toml","uv.lock"],"solution_diff":"diff --git a/pyproject.toml b/pyproject.toml\nindex dcc67352b813..b2f8a007335b 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,11 +71,11 @@ pin = [\n \"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\",\n \"certifi==2026.4.22\",\n \"charset-normalizer==3.4.7\",\n- \"idna==3.13\",\n+ \"idna==3.15\",\n \"mutagen==1.47.0\",\n \"pycryptodomex==3.23.0\",\n- \"requests==2.33.1\",\n- \"urllib3==2.6.3\",\n+ \"requests==2.34.2\",\n+ \"urllib3==2.7.0\",\n \"websockets==16.0\",\n \"yt-dlp-ejs==0.8.0\",\n ]\n@@ -83,7 +83,7 @@ pin-curl-cffi = [\n \"certifi==2026.4.22 ; implementation_name == 'cpython'\",\n \"cffi==2.0.0 ; implementation_name == 'cpython'\",\n \"curl-cffi==0.15.0 ; implementation_name == 'cpython'\",\n- \"markdown-it-py==4.0.0 ; implementation_name == 'cpython'\",\n+ \"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\",\n \"mdurl==0.1.2 ; implementation_name == 'cpython'\",\n \"pycparser==3.0 ; implementation_name == 'cpython'\",\n \"pygments==2.20.0 ; implementation_name == 'cpython'\",\n@@ -91,7 +91,7 @@ pin-curl-cffi = [\n ]\n pin-secretstorage = [\n \"cffi==2.0.0 ; platform_python_implementation != 'PyPy'\",\n- \"cryptography==47.0.0\",\n+ \"cryptography==48.0.0\",\n \"jeepney==0.9.0\",\n \"pycparser==3.0 ; implementation_name != 'PyPy' and platform_python_implementation != 'PyPy'\",\n \"secretstorage==3.5.0\",\ndiff --git a/uv.lock b/uv.lock\nindex c29da496096e..a1f2b7f8b08d 100644\n--- a/uv.lock\n+++ b/uv.lock\n@@ -7,7 +7,7 @@ resolution-markers = [\n ]\n \n [options]\n-exclude-newer = \"2026-04-28T22:03:20.491912684Z\"\n+exclude-newer = \"0001-01-01T00:00:00Z\" # This has no effect and is included for backwards compatibility when using relative exclude-newer values.\n exclude-newer-span = \"P7D\"\n \n [options.exclude-newer-package]\n@@ -121,7 +121,7 @@ wheels = [\n \n [[package]]\n name = \"build\"\n-version = \"1.4.4\"\n+version = \"1.5.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"colorama\", marker = \"os_name == 'nt'\" },\n@@ -130,9 +130,9 @@ dependencies = [\n { name = \"pyproject-hooks\" },\n { name = \"tomli\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/02/ec/bf5ae0a7e5ab57abe8aabdd0759c971883895d1a20c49ae99f8146840c3c/build-1.4.4.tar.gz\", hash = \"sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\", size = 89220, upload-time = \"2026-04-22T20:53:44.807Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/78/e0/df5e171f685f82f37b12e1f208064e24244911079d7b767447d1af7e0d70/build-1.5.0.tar.gz\", hash = \"sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\", size = 89796, upload-time = \"2026-04-30T03:18:25.17Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/fa/88/6764e7a109dd84294850741501145da90d13cdeac9d4e614929464a37420/build-1.4.4-py3-none-any.whl\", hash = \"sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d\", size = 25921, upload-time = \"2026-04-22T20:53:43.251Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0d/fe/6bea5c9162869c5beba5d9c8abbed835ec85bf1ec1fba05a3822325c45f3/build-1.5.0-py3-none-any.whl\", hash = \"sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f\", size = 26018, upload-time = \"2026-04-30T03:18:23.644Z\" },\n ]\n \n [[package]]\n@@ -351,62 +351,62 @@ wheels = [\n \n [[package]]\n name = \"cryptography\"\n-version = \"47.0.0\"\n+version = \"48.0.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy'\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/ef/b2/7ffa7fe8207a8c42147ffe70c3e360b228160c1d85dc3faff16aaa3244c0/cryptography-47.0.0.tar.gz\", hash = \"sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb\", size = 830863, upload-time = \"2026-04-24T19:54:57.056Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz\", hash = \"sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920\", size = 832984, upload-time = \"2026-05-04T22:59:38.133Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/a4/98/40dfe932134bdcae4f6ab5927c87488754bf9eb79297d7e0070b78dd58e9/cryptography-47.0.0-cp311-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0\", size = 7912214, upload-time = \"2026-04-24T19:53:03.864Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/c6/2733531243fba725f58611b918056b277692f1033373dcc8bd01af1c05d4/cryptography-47.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973\", size = 4644617, upload-time = \"2026-04-24T19:53:06.909Z\" },\n- { url = \"https://files.pythonhosted.org/packages/00/e3/b27be1a670a9b87f855d211cf0e1174a5d721216b7616bd52d8581d912ed/cryptography-47.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8\", size = 4668186, upload-time = \"2026-04-24T19:53:09.053Z\" },\n- { url = \"https://files.pythonhosted.org/packages/81/b9/8443cfe5d17d482d348cee7048acf502bb89a51b6382f06240fd290d4ca3/cryptography-47.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b\", size = 4651244, upload-time = \"2026-04-24T19:53:11.217Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5d/5e/13ed0cdd0eb88ba159d6dd5ebfece8cb901dbcf1ae5ac4072e28b55d3153/cryptography-47.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92\", size = 5252906, upload-time = \"2026-04-24T19:53:13.532Z\" },\n- { url = \"https://files.pythonhosted.org/packages/64/16/ed058e1df0f33d440217cd120d41d5dda9dd215a80b8187f68483185af82/cryptography-47.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7\", size = 4701842, upload-time = \"2026-04-24T19:53:15.618Z\" },\n- { url = \"https://files.pythonhosted.org/packages/02/e0/3d30986b30fdbd9e969abbdf8ba00ed0618615144341faeb57f395a084fe/cryptography-47.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93\", size = 4289313, upload-time = \"2026-04-24T19:53:17.755Z\" },\n- { url = \"https://files.pythonhosted.org/packages/df/fd/32db38e3ad0cb331f0691cb4c7a8a6f176f679124dee746b3af6633db4d9/cryptography-47.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac\", size = 4650964, upload-time = \"2026-04-24T19:53:20.062Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/53/5395d944dfd48cb1f67917f533c609c34347185ef15eb4308024c876f274/cryptography-47.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f\", size = 5207817, upload-time = \"2026-04-24T19:53:22.498Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/4f/e5711b28e1901f7d480a2b1b688b645aa4c77c73f10731ed17e7f7db3f0d/cryptography-47.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8\", size = 4701544, upload-time = \"2026-04-24T19:53:24.356Z\" },\n- { url = \"https://files.pythonhosted.org/packages/22/22/c8ddc25de3010fc8da447648f5a092c40e7a8fadf01dd6d255d9c0b9373d/cryptography-47.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318\", size = 4783536, upload-time = \"2026-04-24T19:53:26.665Z\" },\n- { url = \"https://files.pythonhosted.org/packages/66/b6/d4a68f4ea999c6d89e8498579cba1c5fcba4276284de7773b17e4fa69293/cryptography-47.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001\", size = 4926106, upload-time = \"2026-04-24T19:53:28.686Z\" },\n- { url = \"https://files.pythonhosted.org/packages/54/ed/5f524db1fade9c013aa618e1c99c6ed05e8ffc9ceee6cda22fed22dda3f4/cryptography-47.0.0-cp311-abi3-win32.whl\", hash = \"sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203\", size = 3258581, upload-time = \"2026-04-24T19:53:31.058Z\" },\n- { url = \"https://files.pythonhosted.org/packages/b2/dc/1b901990b174786569029f67542b3edf72ac068b6c3c8683c17e6a2f5363/cryptography-47.0.0-cp311-abi3-win_amd64.whl\", hash = \"sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa\", size = 3775309, upload-time = \"2026-04-24T19:53:33.054Z\" },\n- { url = \"https://files.pythonhosted.org/packages/14/88/7aa18ad9c11bc87689affa5ce4368d884b517502d75739d475fc6f4a03c7/cryptography-47.0.0-cp314-cp314t-macosx_10_9_universal2.whl\", hash = \"sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0\", size = 7904299, upload-time = \"2026-04-24T19:53:35.003Z\" },\n- { url = \"https://files.pythonhosted.org/packages/07/55/c18f75724544872f234678fdedc871391722cb34a2aee19faa9f63100bb2/cryptography-47.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7\", size = 4631180, upload-time = \"2026-04-24T19:53:37.517Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ee/65/31a5cc0eaca99cec5bafffe155d407115d96136bb161e8b49e0ef73f09a7/cryptography-47.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1\", size = 4653529, upload-time = \"2026-04-24T19:53:39.775Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e5/bc/641c0519a495f3bfd0421b48d7cd325c4336578523ccd76ea322b6c29c7a/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\", hash = \"sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c\", size = 4638570, upload-time = \"2026-04-24T19:53:42.129Z\" },\n- { url = \"https://files.pythonhosted.org/packages/2b/f2/300327b0a47f6dc94dd8b71b57052aefe178bb51745073d73d80604f11ab/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\", hash = \"sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829\", size = 5238019, upload-time = \"2026-04-24T19:53:44.577Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e9/5a/5b5cf994391d4bf9d9c7efd4c66aabe4d95227256627f8fea6cff7dfadbd/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\", hash = \"sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7\", size = 4686832, upload-time = \"2026-04-24T19:53:47.015Z\" },\n- { url = \"https://files.pythonhosted.org/packages/dc/2c/ae950e28fd6475c852fc21a44db3e6b5bcc1261d1e370f2b6e42fa800fef/cryptography-47.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\", hash = \"sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923\", size = 4269301, upload-time = \"2026-04-24T19:53:48.97Z\" },\n- { url = \"https://files.pythonhosted.org/packages/67/fb/6a39782e150ffe5cc1b0018cb6ddc48bf7ca62b498d7539ffc8a758e977d/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\", hash = \"sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab\", size = 4638110, upload-time = \"2026-04-24T19:53:51.011Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8e/d7/0b3c71090a76e5c203164a47688b697635ece006dcd2499ab3a4dbd3f0bd/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\", hash = \"sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\", size = 5194988, upload-time = \"2026-04-24T19:53:52.962Z\" },\n- { url = \"https://files.pythonhosted.org/packages/63/33/63a961498a9df51721ab578c5a2622661411fc520e00bd83b0cc64eb20c4/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\", hash = \"sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7\", size = 4686563, upload-time = \"2026-04-24T19:53:55.274Z\" },\n- { url = \"https://files.pythonhosted.org/packages/b7/bf/5ee5b145248f92250de86145d1c1d6edebbd57a7fe7caa4dedb5d4cf06a1/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\", hash = \"sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52\", size = 4770094, upload-time = \"2026-04-24T19:53:57.753Z\" },\n- { url = \"https://files.pythonhosted.org/packages/92/43/21d220b2da5d517773894dacdcdb5c682c28d3fffce65548cb06e87d5501/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\", hash = \"sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd\", size = 4913811, upload-time = \"2026-04-24T19:54:00.236Z\" },\n- { url = \"https://files.pythonhosted.org/packages/31/98/dc4ad376ac5f1a1a7d4a83f7b0c6f2bcad36b5d2d8f30aeb482d3a7d9582/cryptography-47.0.0-cp314-cp314t-win32.whl\", hash = \"sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63\", size = 3237158, upload-time = \"2026-04-24T19:54:02.606Z\" },\n- { url = \"https://files.pythonhosted.org/packages/bc/da/97f62d18306b5133468bc3f8cc73a3111e8cdc8cf8d3e69474d6e5fd2d1b/cryptography-47.0.0-cp314-cp314t-win_amd64.whl\", hash = \"sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b\", size = 3758706, upload-time = \"2026-04-24T19:54:04.433Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e0/34/a4fae8ae7c3bc227460c9ae43f56abf1b911da0ec29e0ebac53bb0a4b6b7/cryptography-47.0.0-cp38-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4\", size = 7904072, upload-time = \"2026-04-24T19:54:06.411Z\" },\n- { url = \"https://files.pythonhosted.org/packages/01/64/d7b1e54fdb69f22d24a64bb3e88dc718b31c7fb10ef0b9691a3cf7eeea6e/cryptography-47.0.0-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27\", size = 4635767, upload-time = \"2026-04-24T19:54:08.519Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/7b/cca826391fb2a94efdcdfe4631eb69306ee1cff0b22f664a412c90713877/cryptography-47.0.0-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10\", size = 4654350, upload-time = \"2026-04-24T19:54:10.795Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4c/65/4b57bcc823f42a991627c51c2f68c9fd6eb1393c1756aac876cba2accae2/cryptography-47.0.0-cp38-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b\", size = 4643394, upload-time = \"2026-04-24T19:54:13.275Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f4/c4/2c5fbeea70adbbca2bbae865e1d605d6a4a7f8dbd9d33eaf69645087f06c/cryptography-47.0.0-cp38-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74\", size = 5225777, upload-time = \"2026-04-24T19:54:15.18Z\" },\n- { url = \"https://files.pythonhosted.org/packages/7e/b8/ac57107ef32749d2b244e36069bb688792a363aaaa3acc9e3cf84c130315/cryptography-47.0.0-cp38-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515\", size = 4688771, upload-time = \"2026-04-24T19:54:17.835Z\" },\n- { url = \"https://files.pythonhosted.org/packages/56/fc/9f1de22ff8be99d991f240a46863c52d475404c408886c5a38d2b5c3bb26/cryptography-47.0.0-cp38-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc\", size = 4270753, upload-time = \"2026-04-24T19:54:19.963Z\" },\n- { url = \"https://files.pythonhosted.org/packages/00/68/d70c852797aa68e8e48d12e5a87170c43f67bb4a59403627259dd57d15de/cryptography-47.0.0-cp38-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca\", size = 4642911, upload-time = \"2026-04-24T19:54:21.818Z\" },\n- { url = \"https://files.pythonhosted.org/packages/a5/51/661cbee74f594c5d97ff82d34f10d5551c085ca4668645f4606ebd22bd5d/cryptography-47.0.0-cp38-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76\", size = 5181411, upload-time = \"2026-04-24T19:54:24.376Z\" },\n- { url = \"https://files.pythonhosted.org/packages/94/87/f2b6c374a82cf076cfa1416992ac8e8ec94d79facc37aec87c1a5cb72352/cryptography-47.0.0-cp38-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe\", size = 4688262, upload-time = \"2026-04-24T19:54:26.946Z\" },\n- { url = \"https://files.pythonhosted.org/packages/14/e2/8b7462f4acf21ec509616f0245018bb197194ab0b65c2ea21a0bdd53c0eb/cryptography-47.0.0-cp38-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31\", size = 4775506, upload-time = \"2026-04-24T19:54:28.926Z\" },\n- { url = \"https://files.pythonhosted.org/packages/70/75/158e494e4c08dc05e039da5bb48553826bd26c23930cf8d3cd5f21fa8921/cryptography-47.0.0-cp38-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7\", size = 4912060, upload-time = \"2026-04-24T19:54:30.869Z\" },\n- { url = \"https://files.pythonhosted.org/packages/06/bd/0a9d3edbf5eadbac926d7b9b3cd0c4be584eeeae4a003d24d9eda4affbbd/cryptography-47.0.0-cp38-abi3-win32.whl\", hash = \"sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310\", size = 3248487, upload-time = \"2026-04-24T19:54:33.494Z\" },\n- { url = \"https://files.pythonhosted.org/packages/60/80/5681af756d0da3a599b7bdb586fac5a1540f1bcefd2717a20e611ddade45/cryptography-47.0.0-cp38-abi3-win_amd64.whl\", hash = \"sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769\", size = 3755737, upload-time = \"2026-04-24T19:54:35.408Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1b/a0/928c9ce0d120a40a81aa99e3ba383e87337b9ac9ef9f6db02e4d7822424d/cryptography-47.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\", hash = \"sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7\", size = 3909893, upload-time = \"2026-04-24T19:54:38.334Z\" },\n- { url = \"https://files.pythonhosted.org/packages/81/75/d691e284750df5d9569f2b1ce4a00a71e1d79566da83b2b3e5549c84917f/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\", hash = \"sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe\", size = 4587867, upload-time = \"2026-04-24T19:54:40.619Z\" },\n- { url = \"https://files.pythonhosted.org/packages/07/d6/1b90f1a4e453009730b4545286f0b39bb348d805c11181fc31544e4f9a65/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\", hash = \"sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475\", size = 4627192, upload-time = \"2026-04-24T19:54:42.849Z\" },\n- { url = \"https://files.pythonhosted.org/packages/dc/53/cb358a80e9e359529f496870dd08c102aa8a4b5b9f9064f00f0d6ed5b527/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\", hash = \"sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50\", size = 4587486, upload-time = \"2026-04-24T19:54:44.908Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/57/aaa3d53876467a226f9a7a82fd14dd48058ad2de1948493442dfa16e2ffd/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\", hash = \"sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab\", size = 4626327, upload-time = \"2026-04-24T19:54:47.813Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ab/9c/51f28c3550276bcf35660703ba0ab829a90b88be8cd98a71ef23c2413913/cryptography-47.0.0-pp311-pypy311_pp73-win_amd64.whl\", hash = \"sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8\", size = 3698916, upload-time = \"2026-04-24T19:54:49.782Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6\", size = 8001587, upload-time = \"2026-05-04T22:57:36.803Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c\", size = 4690433, upload-time = \"2026-05-04T22:57:40.373Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3\", size = 4710620, upload-time = \"2026-05-04T22:57:42.935Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5\", size = 4696283, upload-time = \"2026-05-04T22:57:45.294Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c\", size = 5296573, upload-time = \"2026-05-04T22:57:47.933Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f\", size = 4743677, upload-time = \"2026-05-04T22:57:50.067Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25\", size = 4330808, upload-time = \"2026-05-04T22:57:52.301Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602\", size = 4695941, upload-time = \"2026-05-04T22:57:54.603Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c\", size = 5252579, upload-time = \"2026-05-04T22:57:57.207Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5\", size = 4743326, upload-time = \"2026-05-04T22:57:59.535Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321\", size = 4826672, upload-time = \"2026-05-04T22:58:01.996Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74\", size = 4972574, upload-time = \"2026-05-04T22:58:03.968Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl\", hash = \"sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4\", size = 3294868, upload-time = \"2026-05-04T22:58:06.467Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl\", hash = \"sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7\", size = 3817107, upload-time = \"2026-05-04T22:58:08.845Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl\", hash = \"sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec\", size = 7986556, upload-time = \"2026-05-04T22:58:11.172Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18\", size = 4684776, upload-time = \"2026-05-04T22:58:13.712Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20\", size = 4698121, upload-time = \"2026-05-04T22:58:16.448Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\", hash = \"sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff\", size = 4690042, upload-time = \"2026-05-04T22:58:18.544Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\", hash = \"sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c\", size = 5282526, upload-time = \"2026-05-04T22:58:20.75Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\", hash = \"sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db\", size = 4733116, upload-time = \"2026-05-04T22:58:23.627Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\", hash = \"sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741\", size = 4316030, upload-time = \"2026-05-04T22:58:25.581Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\", hash = \"sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166\", size = 4689640, upload-time = \"2026-05-04T22:58:27.747Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\", hash = \"sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336\", size = 5237657, upload-time = \"2026-05-04T22:58:29.848Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\", hash = \"sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057\", size = 4732362, upload-time = \"2026-05-04T22:58:32.009Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\", hash = \"sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae\", size = 4819580, upload-time = \"2026-05-04T22:58:34.254Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\", hash = \"sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c\", size = 4963283, upload-time = \"2026-05-04T22:58:36.376Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl\", hash = \"sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f\", size = 3270954, upload-time = \"2026-05-04T22:58:38.791Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl\", hash = \"sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12\", size = 3797313, upload-time = \"2026-05-04T22:58:40.746Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86\", size = 7983482, upload-time = \"2026-05-04T22:58:43.769Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e\", size = 4683266, upload-time = \"2026-05-04T22:58:46.064Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f\", size = 4696228, upload-time = \"2026-05-04T22:58:48.22Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7\", size = 4689097, upload-time = \"2026-05-04T22:58:50.9Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832\", size = 5283582, upload-time = \"2026-05-04T22:58:53.017Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c\", size = 4730479, upload-time = \"2026-05-04T22:58:55.611Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a\", size = 4326481, upload-time = \"2026-05-04T22:58:57.607Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a\", size = 4688713, upload-time = \"2026-05-04T22:59:00.077Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a\", size = 5238165, upload-time = \"2026-05-04T22:59:02.317Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239\", size = 4729947, upload-time = \"2026-05-04T22:59:05.255Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c\", size = 4822059, upload-time = \"2026-05-04T22:59:07.802Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4\", size = 4960575, upload-time = \"2026-05-04T22:59:09.851Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl\", hash = \"sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd\", size = 3279117, upload-time = \"2026-05-04T22:59:12.019Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl\", hash = \"sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8\", size = 3792100, upload-time = \"2026-05-04T22:59:14.884Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\", hash = \"sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855\", size = 3950391, upload-time = \"2026-05-04T22:59:17.415Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\", hash = \"sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\", size = 4637126, upload-time = \"2026-05-04T22:59:20.197Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\", hash = \"sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13\", size = 4667270, upload-time = \"2026-05-04T22:59:22.647Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\", hash = \"sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb\", size = 4636797, upload-time = \"2026-05-04T22:59:24.912Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\", hash = \"sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355\", size = 4666800, upload-time = \"2026-05-04T22:59:27.474Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl\", hash = \"sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a\", size = 3739536, upload-time = \"2026-05-04T22:59:29.61Z\" },\n ]\n \n [[package]]\n@@ -526,11 +526,11 @@ wheels = [\n \n [[package]]\n name = \"idna\"\n-version = \"3.13\"\n+version = \"3.15\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/ce/cc/762dfb036166873f0059f3b7de4565e1b5bc3d6f28a414c13da27e442f99/idna-3.13.tar.gz\", hash = \"sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242\", size = 194210, upload-time = \"2026-04-22T16:42:42.314Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\", hash = \"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\", size = 199245, upload-time = \"2026-05-12T22:45:57.011Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/5d/13/ad7d7ca3808a898b4612b6fe93cde56b53f3034dcde235acb1f0e1df24c6/idna-3.13-py3-none-any.whl\", hash = \"sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\", size = 68629, upload-time = \"2026-04-22T16:42:40.909Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\", hash = \"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\", size = 72340, upload-time = \"2026-05-12T22:45:55.733Z\" },\n ]\n \n [[package]]\n@@ -577,14 +577,14 @@ wheels = [\n \n [[package]]\n name = \"markdown-it-py\"\n-version = \"4.0.0\"\n+version = \"4.2.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"mdurl\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz\", hash = \"sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\", size = 73070, upload-time = \"2025-08-11T12:57:52.854Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz\", hash = \"sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49\", size = 82454, upload-time = \"2026-05-07T12:08:28.36Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl\", hash = \"sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147\", size = 87321, upload-time = \"2025-08-11T12:57:51.923Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl\", hash = \"sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\", size = 91687, upload-time = \"2026-05-07T12:08:27.182Z\" },\n ]\n \n [[package]]\n@@ -643,11 +643,11 @@ wheels = [\n \n [[package]]\n name = \"pip\"\n-version = \"26.1\"\n+version = \"26.1.1\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/73/7e/d2b04004e1068ad4fdfa2f227b839b5d03e602e47cdbbf49de71137c9546/pip-26.1.tar.gz\", hash = \"sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\", size = 1840316, upload-time = \"2026-04-26T21:00:05.406Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\", hash = \"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\", size = 1840400, upload-time = \"2026-05-04T19:02:21.248Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/70/7a/be4bd8bcbb24ea475856dd68159d78b03b2bb53dae369f69c9606b8888f5/pip-26.1-py3-none-any.whl\", hash = \"sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1\", size = 1812804, upload-time = \"2026-04-26T21:00:03.194Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\", hash = \"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\", size = 1812777, upload-time = \"2026-05-04T19:02:18.9Z\" },\n ]\n \n [[package]]\n@@ -785,15 +785,15 @@ wheels = [\n \n [[package]]\n name = \"pyinstaller-hooks-contrib\"\n-version = \"2026.4\"\n+version = \"2026.5\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"setuptools\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/c7/fe/9278c29394bf69169febc21f96b4252c3ee7c8ec22c2fc545004bed47e71/pyinstaller_hooks_contrib-2026.4.tar.gz\", hash = \"sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\", size = 173050, upload-time = \"2026-03-31T14:10:51.188Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/1a/67/f4452d68793fb15beba4f19ef39a38a8822f0da7452b503c400d5a21f5c1/pyinstaller_hooks_contrib-2026.5.tar.gz\", hash = \"sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\", size = 173689, upload-time = \"2026-05-04T22:36:55.124Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/88/f4/035fb8c06deff827f540a9a4ed9122c54e5376fca3e42eddf0c263730775/pyinstaller_hooks_contrib-2026.4-py3-none-any.whl\", hash = \"sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f\", size = 455496, upload-time = \"2026-03-31T14:10:49.867Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f6/5c/fd465d11da4d12b50d7eb5d2ee2ceb780d8d049dbb489f3828d131e387af/pyinstaller_hooks_contrib-2026.5-py3-none-any.whl\", hash = \"sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9\", size = 457314, upload-time = \"2026-05-04T22:36:53.598Z\" },\n ]\n \n [[package]]\n@@ -825,28 +825,28 @@ wheels = [\n \n [[package]]\n name = \"pytest-rerunfailures\"\n-version = \"16.1\"\n+version = \"16.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"pytest\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/de/04/71e9520551fc8fe2cf5c1a1842e4e600265b0815f2016b7c27ec85688682/pytest_rerunfailures-16.1.tar.gz\", hash = \"sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\", size = 30889, upload-time = \"2025-10-10T07:06:01.238Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\", hash = \"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\", size = 32121, upload-time = \"2026-05-13T08:13:26.998Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/77/54/60eabb34445e3db3d3d874dc1dfa72751bfec3265bd611cb13c8b290adea/pytest_rerunfailures-16.1-py3-none-any.whl\", hash = \"sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86\", size = 14093, upload-time = \"2025-10-10T07:06:00.019Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\", hash = \"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\", size = 14505, upload-time = \"2026-05-13T08:13:25.485Z\" },\n ]\n \n [[package]]\n name = \"python-discovery\"\n-version = \"1.2.2\"\n+version = \"1.3.1\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"filelock\" },\n { name = \"platformdirs\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/de/ef/3bae0e537cfe91e8431efcba4434463d2c5a65f5a89edd47c6cf2f03c55f/python_discovery-1.2.2.tar.gz\", hash = \"sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb\", size = 58872, upload-time = \"2026-04-07T17:28:49.249Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\", hash = \"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\", size = 68011, upload-time = \"2026-05-12T20:53:36.336Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d8/db/795879cc3ddfe338599bddea6388cc5100b088db0a4caf6e6c1af1c27e04/python_discovery-1.2.2-py3-none-any.whl\", hash = \"sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\", size = 31894, upload-time = \"2026-04-07T17:28:48.09Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\", hash = \"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\", size = 33185, upload-time = \"2026-05-12T20:53:34.969Z\" },\n ]\n \n [[package]]\n@@ -924,7 +924,7 @@ wheels = [\n \n [[package]]\n name = \"requests\"\n-version = \"2.33.1\"\n+version = \"2.34.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"certifi\" },\n@@ -932,9 +932,9 @@ dependencies = [\n { name = \"idna\" },\n { name = \"urllib3\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz\", hash = \"sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517\", size = 134120, upload-time = \"2026-03-30T16:09:15.531Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz\", hash = \"sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\", size = 142856, upload-time = \"2026-05-14T19:25:27.735Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl\", hash = \"sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\", size = 64947, upload-time = \"2026-03-30T16:09:13.83Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl\", hash = \"sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0\", size = 73075, upload-time = \"2026-05-14T19:25:26.443Z\" },\n ]\n \n [[package]]\n@@ -952,27 +952,27 @@ wheels = [\n \n [[package]]\n name = \"ruff\"\n-version = \"0.15.12\"\n+version = \"0.15.13\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/99/43/3291f1cc9106f4c63bdce7a8d0df5047fe8422a75b091c16b5e9355e0b11/ruff-0.15.12.tar.gz\", hash = \"sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6\", size = 4643852, upload-time = \"2026-04-24T18:17:14.305Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\", hash = \"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\", size = 4678180, upload-time = \"2026-05-14T13:44:37.869Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c3/6e/e78ffb61d4686f3d96ba3df2c801161843746dcbcbb17a1e927d4829312b/ruff-0.15.12-py3-none-linux_armv6l.whl\", hash = \"sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c\", size = 10640713, upload-time = \"2026-04-24T18:17:22.841Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ae/08/a317bc231fb9e7b93e4ef3089501e51922ff88d6936ce5cf870c4fe55419/ruff-0.15.12-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c\", size = 11069267, upload-time = \"2026-04-24T18:17:30.105Z\" },\n- { url = \"https://files.pythonhosted.org/packages/aa/a4/f828e9718d3dce1f5f11c39c4f65afd32783c8b2aebb2e3d259e492c47bd/ruff-0.15.12-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\", size = 10397182, upload-time = \"2026-04-24T18:17:07.177Z\" },\n- { url = \"https://files.pythonhosted.org/packages/71/e0/3310fc6d1b5e1fdea22bf3b1b807c7e187b581021b0d7d4514cccdb5fb71/ruff-0.15.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002\", size = 10758012, upload-time = \"2026-04-24T18:16:55.759Z\" },\n- { url = \"https://files.pythonhosted.org/packages/11/c1/a606911aee04c324ddaa883ae418f3569792fd3c4a10c50e0dd0a2311e1e/ruff-0.15.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5\", size = 10447479, upload-time = \"2026-04-24T18:16:51.677Z\" },\n- { url = \"https://files.pythonhosted.org/packages/9d/68/4201e8444f0894f21ab4aeeaee68aa4f10b51613514a20d80bd628d57e88/ruff-0.15.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6\", size = 11234040, upload-time = \"2026-04-24T18:17:16.529Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/ff/8a6d6cf4ccc23fd67060874e832c18919d1557a0611ebef03fdb01fff11e/ruff-0.15.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33\", size = 12087377, upload-time = \"2026-04-24T18:17:04.944Z\" },\n- { url = \"https://files.pythonhosted.org/packages/85/f6/c669cf73f5152f623d34e69866a46d5e6185816b19fcd5b6dd8a2d299922/ruff-0.15.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847\", size = 11367784, upload-time = \"2026-04-24T18:17:25.409Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/39/c61d193b8a1daaa8977f7dea9e8d8ba866e02ea7b65d32f6861693aa4c12/ruff-0.15.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0\", size = 11344088, upload-time = \"2026-04-24T18:17:12.258Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c2/8d/49afab3645e31e12c590acb6d3b5b69d7aab5b81926dbaf7461f9441f37a/ruff-0.15.12-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339\", size = 11271770, upload-time = \"2026-04-24T18:17:02.457Z\" },\n- { url = \"https://files.pythonhosted.org/packages/46/06/33f41fe94403e2b755481cdfb9b7ef3e4e0ed031c4581124658d935d52b4/ruff-0.15.12-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5\", size = 10719355, upload-time = \"2026-04-24T18:17:27.648Z\" },\n- { url = \"https://files.pythonhosted.org/packages/0d/59/18aa4e014debbf559670e4048e39260a85c7fcee84acfd761ac01e7b8d35/ruff-0.15.12-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd\", size = 10462758, upload-time = \"2026-04-24T18:17:32.347Z\" },\n- { url = \"https://files.pythonhosted.org/packages/25/e7/cc9f16fd0f3b5fddcbd7ec3d6ae30c8f3fde1047f32a4093a98d633c6570/ruff-0.15.12-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b\", size = 10953498, upload-time = \"2026-04-24T18:17:20.674Z\" },\n- { url = \"https://files.pythonhosted.org/packages/72/7a/a9ba7f98c7a575978698f4230c5e8cc54bbc761af34f560818f933dafa0c/ruff-0.15.12-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e\", size = 11447765, upload-time = \"2026-04-24T18:17:09.755Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ea/f9/0ae446942c846b8266059ad8a30702a35afae55f5cdc54c5adf8d7afdc27/ruff-0.15.12-py3-none-win32.whl\", hash = \"sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20\", size = 10657277, upload-time = \"2026-04-24T18:17:18.591Z\" },\n- { url = \"https://files.pythonhosted.org/packages/33/f1/9614e03e1cdcbf9437570b5400ced8a720b5db22b28d8e0f1bda429f660d/ruff-0.15.12-py3-none-win_amd64.whl\", hash = \"sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d\", size = 11837758, upload-time = \"2026-04-24T18:17:00.113Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c0/98/6beb4b351e472e5f4c4613f7c35a5290b8be2497e183825310c4c3a3984b/ruff-0.15.12-py3-none-win_arm64.whl\", hash = \"sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f\", size = 11120821, upload-time = \"2026-04-24T18:16:57.979Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\", hash = \"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\", size = 10738279, upload-time = \"2026-05-14T13:44:18.7Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\", size = 11124798, upload-time = \"2026-05-14T13:44:06.427Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\", size = 10460761, upload-time = \"2026-05-14T13:44:04.375Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\", size = 10804451, upload-time = \"2026-05-14T13:44:25.221Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\", size = 10534285, upload-time = \"2026-05-14T13:44:08.888Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\", size = 11312063, upload-time = \"2026-05-14T13:44:11.274Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\", size = 12183079, upload-time = \"2026-05-14T13:44:01.634Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\", size = 11440833, upload-time = \"2026-05-14T13:43:59.043Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\", size = 11434486, upload-time = \"2026-05-14T13:44:27.761Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\", size = 11385189, upload-time = \"2026-05-14T13:44:13.704Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\", size = 10781380, upload-time = \"2026-05-14T13:43:56.734Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\", size = 10540605, upload-time = \"2026-05-14T13:44:20.748Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\", size = 11036554, upload-time = \"2026-05-14T13:44:16.256Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\", size = 11528133, upload-time = \"2026-05-14T13:44:22.808Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\", hash = \"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\", size = 10721455, upload-time = \"2026-05-14T13:44:35.697Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\", hash = \"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\", size = 11900409, upload-time = \"2026-05-14T13:44:30.389Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\", hash = \"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\", size = 11179336, upload-time = \"2026-05-14T13:44:33.026Z\" },\n ]\n \n [[package]]\n@@ -1053,11 +1053,11 @@ wheels = [\n \n [[package]]\n name = \"trove-classifiers\"\n-version = \"2026.4.28.13\"\n+version = \"2026.5.7.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/04/af/88fdebf242bc7bc4957c96c5358a2b2b0f07e5001401906783a521ea9f54/trove_classifiers-2026.4.28.13.tar.gz\", hash = \"sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\", size = 17035, upload-time = \"2026-04-28T13:45:41.495Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\", hash = \"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\", size = 17041, upload-time = \"2026-05-07T17:48:01.931Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d6/bb/fbdc4e57731efb86b4209ffdd2519520782bf27b3c961beac3e5c20d2b87/trove_classifiers-2026.4.28.13-py3-none-any.whl\", hash = \"sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8\", size = 14216, upload-time = \"2026-04-28T13:45:39.943Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\", hash = \"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\", size = 14201, upload-time = \"2026-05-07T17:48:00.488Z\" },\n ]\n \n [[package]]\n@@ -1071,42 +1071,42 @@ wheels = [\n \n [[package]]\n name = \"urllib3\"\n-version = \"2.6.3\"\n+version = \"2.7.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz\", hash = \"sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed\", size = 435556, upload-time = \"2026-01-07T16:24:43.925Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz\", hash = \"sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c\", size = 433602, upload-time = \"2026-05-07T16:13:18.596Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl\", hash = \"sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\", size = 131584, upload-time = \"2026-01-07T16:24:42.685Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl\", hash = \"sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\", size = 131087, upload-time = \"2026-05-07T16:13:17.151Z\" },\n ]\n \n [[package]]\n name = \"uv\"\n-version = \"0.11.8\"\n+version = \"0.11.14\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/c1/cd/4393fecb083897e956f016d4e66d0b8a496a08fe2e03cbda32a1e91da7ee/uv-0.11.8.tar.gz\", hash = \"sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335\", size = 4098020, upload-time = \"2026-04-27T13:15:31.625Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\", hash = \"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\", size = 4130699, upload-time = \"2026-05-12T18:00:37.321Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/99/84/dcb676a3e36a3a2b44dc2e4dfea471b8cd709025e27cce3e588b176fd899/uv-0.11.8-py3-none-linux_armv6l.whl\", hash = \"sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c\", size = 23664296, upload-time = \"2026-04-27T13:15:15.644Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/05/557aa070fda7b8460bbbe1e867e8e5b80602c5b30ed77d1d94fc5acae518/uv-0.11.8-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d\", size = 23087321, upload-time = \"2026-04-27T13:15:36.193Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d5/62/82953018801a250e16b091ef4b5e95e939b2f01224363d6fc80f600b7eff/uv-0.11.8-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd\", size = 21747142, upload-time = \"2026-04-27T13:15:20.4Z\" },\n- { url = \"https://files.pythonhosted.org/packages/af/4c/477f2abe16f9a3d3c73077f15615878a303eef3760115ec946be58ecb9b2/uv-0.11.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807\", size = 23425861, upload-time = \"2026-04-27T13:15:10.374Z\" },\n- { url = \"https://files.pythonhosted.org/packages/2a/63/19f46193e49f0c9bf33346a4d726313871864db16e7cdd1c0a63bc112000/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8\", size = 23215551, upload-time = \"2026-04-27T13:15:38.706Z\" },\n- { url = \"https://files.pythonhosted.org/packages/72/3e/5595b265df848a33cd060b10e8f763a46d67521ac9f6c314e8a4ad5329d7/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310\", size = 23224170, upload-time = \"2026-04-27T13:15:18.083Z\" },\n- { url = \"https://files.pythonhosted.org/packages/a6/b3/6ca95e690b52542caa1dae10ede57732f90c629946ab5f027ff746f87deb/uv-0.11.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989\", size = 24730048, upload-time = \"2026-04-27T13:15:13.254Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ea/49/71b7322067c85a3736a22a300072b0566991fe3f95b81bed793508ff5315/uv-0.11.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa\", size = 25585906, upload-time = \"2026-04-27T13:15:41.455Z\" },\n- { url = \"https://files.pythonhosted.org/packages/37/16/4e84cd5131327fe86d4784ebfc8a983149f4e6b811476ef271fc548b29e6/uv-0.11.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4\", size = 24795740, upload-time = \"2026-04-27T13:15:49.842Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5b/01/df175979018743cc5ba6e2fb9dcec916868271e8d88cf0b9df8fd805a0df/uv-0.11.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037\", size = 24824980, upload-time = \"2026-04-27T13:15:53.506Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1c/95/93c7f595f7136fb32807442860c55d0faed2cd3d7da4b7105ed3c2535d5f/uv-0.11.8-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\", size = 23526790, upload-time = \"2026-04-27T13:15:04.955Z\" },\n- { url = \"https://files.pythonhosted.org/packages/04/02/77430b89e172c20cc549b07a5b1dfda0c882c161b6d82781d3150a7063ac/uv-0.11.8-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b\", size = 24280498, upload-time = \"2026-04-27T13:15:43.978Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8a/e3/23e4a2bb91e3880e017e6116886e2d0bde14ba6aa95ddc458160ee630e7c/uv-0.11.8-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1\", size = 24375233, upload-time = \"2026-04-27T13:15:25.753Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d9/67/fb7dc17cea816a667d1be2632525aa1687566bfafd17bdac561a7a6c9484/uv-0.11.8-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80\", size = 23904818, upload-time = \"2026-04-27T13:15:23.21Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4b/91/b920e35f54f8c6b51f2c639e8170bb80a47a739a1442fea33a479bc93a3d/uv-0.11.8-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65\", size = 25015448, upload-time = \"2026-04-27T13:15:46.666Z\" },\n- { url = \"https://files.pythonhosted.org/packages/05/e8/3771956dc1c94b8484789bb8070d91872080d0af99332b8bdec7218c2bfd/uv-0.11.8-py3-none-win32.whl\", hash = \"sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d\", size = 22823583, upload-time = \"2026-04-27T13:15:33.674Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f9/9b/a91a9c60dcae0e1e3da06377d38f32118a523697d461fe41bc9f117ecf59/uv-0.11.8-py3-none-win_amd64.whl\", hash = \"sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726\", size = 25407438, upload-time = \"2026-04-27T13:15:28.957Z\" },\n- { url = \"https://files.pythonhosted.org/packages/61/5d/defa29fe617e6f07d4e514089e9d36fd9f44ede869e597e39ff7d69f6917/uv-0.11.8-py3-none-win_arm64.whl\", hash = \"sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe\", size = 23914243, upload-time = \"2026-04-27T13:15:07.717Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\", hash = \"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\", size = 23545199, upload-time = \"2026-05-12T18:01:34.526Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\", size = 22957064, upload-time = \"2026-05-12T18:00:54.225Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\", size = 21678307, upload-time = \"2026-05-12T18:00:57.132Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\", size = 23353409, upload-time = \"2026-05-12T18:01:27.512Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\", size = 23103964, upload-time = \"2026-05-12T18:01:31.094Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\", size = 23104638, upload-time = \"2026-05-12T18:01:10.093Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\", size = 24625888, upload-time = \"2026-05-12T18:01:17.192Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\", size = 25445231, upload-time = \"2026-05-12T18:00:40.012Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\", size = 24571961, upload-time = \"2026-05-12T18:00:43.713Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\", size = 24718523, upload-time = \"2026-05-12T18:01:06.587Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\", size = 23454821, upload-time = \"2026-05-12T18:00:51.166Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\", size = 24087843, upload-time = \"2026-05-12T18:00:47.272Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\", size = 24147611, upload-time = \"2026-05-12T18:01:20.499Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\", size = 23920348, upload-time = \"2026-05-12T18:01:24.033Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\", size = 24928981, upload-time = \"2026-05-12T18:01:13.961Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\", hash = \"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\", size = 22573503, upload-time = \"2026-05-12T18:00:34.36Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\", hash = \"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\", size = 25175590, upload-time = \"2026-05-12T18:01:00.38Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\", hash = \"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\", size = 23594775, upload-time = \"2026-05-12T18:01:03.55Z\" },\n ]\n \n [[package]]\n name = \"virtualenv\"\n-version = \"21.3.0\"\n+version = \"21.3.3\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"distlib\" },\n@@ -1115,9 +1115,9 @@ dependencies = [\n { name = \"python-discovery\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/3f/8b/6331f7a7fe70131c301106ec1e7cf23e2501bf7d4ca3636805801ca191bb/virtualenv-21.3.0.tar.gz\", hash = \"sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\", size = 7614069, upload-time = \"2026-04-27T17:05:58.927Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\", hash = \"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\", size = 7613784, upload-time = \"2026-05-13T18:01:30.19Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/4b/eb/03bfb1299d4c4510329e470f13f9a4ce793df7fcb5a2fd3510f911066f61/virtualenv-21.3.0-py3-none-any.whl\", hash = \"sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7\", size = 7594690, upload-time = \"2026-04-27T17:05:55.468Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\", hash = \"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\", size = 7594554, upload-time = \"2026-05-13T18:01:27.815Z\" },\n ]\n \n [[package]]\n@@ -1296,14 +1296,14 @@ requires-dist = [\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\", specifier = \"==2.0.0\" },\n { name = \"cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.0.0\" },\n { name = \"charset-normalizer\", marker = \"extra == 'pin'\", specifier = \"==3.4.7\" },\n- { name = \"cryptography\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==47.0.0\" },\n+ { name = \"cryptography\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==48.0.0\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'curl-cffi'\", specifier = \">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.15.0\" },\n { name = \"deno\", marker = \"extra == 'deno'\", specifier = \">=2.6.6\" },\n { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.7.14\" },\n- { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.13\" },\n+ { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.15\" },\n { name = \"jeepney\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==0.9.0\" },\n- { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.0.0\" },\n+ { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.2.0\" },\n { name = \"mdurl\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.1.2\" },\n { name = \"mutagen\", marker = \"extra == 'default'\" },\n { name = \"mutagen\", marker = \"extra == 'pin'\", specifier = \"==1.47.0\" },\n@@ -1313,13 +1313,13 @@ requires-dist = [\n { name = \"pycryptodomex\", marker = \"extra == 'pin'\", specifier = \"==3.23.0\" },\n { name = \"pygments\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.20.0\" },\n { name = \"requests\", marker = \"extra == 'default'\", specifier = \">=2.32.2,<3\" },\n- { name = \"requests\", marker = \"extra == 'pin'\", specifier = \"==2.33.1\" },\n+ { name = \"requests\", marker = \"extra == 'pin'\", specifier = \"==2.34.2\" },\n { name = \"rich\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==15.0.0\" },\n { name = \"secretstorage\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==3.5.0\" },\n { name = \"secretstorage\", marker = \"extra == 'secretstorage'\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11' and extra == 'pin-secretstorage'\", specifier = \"==4.15.0\" },\n { name = \"urllib3\", marker = \"extra == 'default'\", specifier = \">=2.0.2,<3\" },\n- { name = \"urllib3\", marker = \"extra == 'pin'\", specifier = \"==2.6.3\" },\n+ { name = \"urllib3\", marker = \"extra == 'pin'\", specifier = \"==2.7.0\" },\n { name = \"websockets\", marker = \"extra == 'default'\", specifier = \">=13.0\" },\n { name = \"websockets\", marker = \"extra == 'pin'\", specifier = \"==16.0\" },\n { name = \"yt-dlp-ejs\", marker = \"extra == 'default'\", specifier = \"==0.8.0\" },\n","summary":"Edited 2 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/pyinstaller.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt","bundle/requirements/win-arm64-pyinstaller.txt","bundle/requirements/win-x64-pyinstaller.txt","bundle/requirements/win-x86-pyinstaller.txt"],"solution_diff":"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\nindex 3b3830cd7806..16068a0eb5f9 100644\n--- a/bundle/requirements/build.txt\n+++ b/bundle/requirements/build.txt\n@@ -1,6 +1,6 @@\n-build==1.4.4 \\\n- --hash=sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d \\\n- --hash=sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\n+build==1.5.0 \\\n+ --hash=sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f \\\n+ --hash=sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\n colorama==0.4.6 ; os_name == 'nt' \\\n --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \\\n --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6\n@@ -81,9 +81,9 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\n # via\n # build\n # hatchling\n-trove-classifiers==2026.4.28.13 \\\n- --hash=sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8 \\\n- --hash=sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\n+trove-classifiers==2026.5.7.17 \\\n+ --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\n+ --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\n # via hatchling\n zipp==3.23.1 ; python_full_version < '3.10.2' \\\n --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nindex 5052a8538148..6dbf9e6add19 100644\n--- a/bundle/requirements/curl-cffi.txt\n+++ b/bundle/requirements/curl-cffi.txt\n@@ -274,13 +274,13 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -328,17 +328,17 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\n # via rich\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n --hash=sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36\n # via curl-cffi\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\nindex 82380205124c..796076d76734 100644\n--- a/bundle/requirements/default.txt\n+++ b/bundle/requirements/default.txt\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n mutagen==1.47.0 \\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\n@@ -212,13 +212,13 @@ pycryptodomex==3.23.0 \\\n --hash=sha256:f489c4765093fb60e2edafdf223397bc716491b2b69fe74367b70d6999257a5c \\\n --hash=sha256:fdfac7cda115bca3a5abb2f9e43bc2fb66c2b65ab074913643803ca7083a79ea\n # via yt-dlp\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\nindex 34f877b69b78..bdf854eb45d5 100644\n--- a/bundle/requirements/dev.txt\n+++ b/bundle/requirements/dev.txt\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.1 \\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\n-python-discovery==1.2.2 \\\n- --hash=sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb \\\n- --hash=sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\n+pytest-rerunfailures==16.2 \\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n+python-discovery==1.3.1 \\\n+ --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\n+ --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\n # via virtualenv\n pyyaml==6.0.3 \\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\n # via pre-commit\n-ruff==0.15.12 \\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\n+ruff==0.15.13 \\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n # via\n # exceptiongroup\n # virtualenv\n-virtualenv==21.3.0 \\\n- --hash=sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7 \\\n- --hash=sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\n+virtualenv==21.3.3 \\\n+ --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\n+ --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\n # via pre-commit\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\nindex 477b6d064648..d14c275f45f7 100644\n--- a/bundle/requirements/linux.txt\n+++ b/bundle/requirements/linux.txt\n@@ -252,56 +252,56 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-cryptography==47.0.0 \\\n- --hash=sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7 \\\n- --hash=sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27 \\\n- --hash=sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd \\\n- --hash=sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7 \\\n- --hash=sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001 \\\n- --hash=sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4 \\\n- --hash=sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca \\\n- --hash=sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0 \\\n- --hash=sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe \\\n- --hash=sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93 \\\n- --hash=sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475 \\\n- --hash=sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe \\\n- --hash=sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515 \\\n- --hash=sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10 \\\n- --hash=sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7 \\\n- --hash=sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92 \\\n- --hash=sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829 \\\n- --hash=sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8 \\\n- --hash=sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52 \\\n- --hash=sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b \\\n- --hash=sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc \\\n- --hash=sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c \\\n- --hash=sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63 \\\n- --hash=sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac \\\n- --hash=sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31 \\\n- --hash=sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7 \\\n- --hash=sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1 \\\n- --hash=sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203 \\\n- --hash=sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7 \\\n- --hash=sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769 \\\n- --hash=sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923 \\\n- --hash=sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74 \\\n- --hash=sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b \\\n- --hash=sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb \\\n- --hash=sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab \\\n- --hash=sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76 \\\n- --hash=sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f \\\n- --hash=sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7 \\\n- --hash=sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973 \\\n- --hash=sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0 \\\n- --hash=sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8 \\\n- --hash=sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310 \\\n- --hash=sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b \\\n- --hash=sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318 \\\n- --hash=sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab \\\n- --hash=sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8 \\\n- --hash=sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa \\\n- --hash=sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50 \\\n- --hash=sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\n+cryptography==48.0.0 \\\n+ --hash=sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13 \\\n+ --hash=sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6 \\\n+ --hash=sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8 \\\n+ --hash=sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25 \\\n+ --hash=sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c \\\n+ --hash=sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832 \\\n+ --hash=sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12 \\\n+ --hash=sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c \\\n+ --hash=sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7 \\\n+ --hash=sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c \\\n+ --hash=sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec \\\n+ --hash=sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5 \\\n+ --hash=sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355 \\\n+ --hash=sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c \\\n+ --hash=sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741 \\\n+ --hash=sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86 \\\n+ --hash=sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321 \\\n+ --hash=sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a \\\n+ --hash=sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7 \\\n+ --hash=sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920 \\\n+ --hash=sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e \\\n+ --hash=sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff \\\n+ --hash=sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd \\\n+ --hash=sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3 \\\n+ --hash=sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f \\\n+ --hash=sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602 \\\n+ --hash=sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855 \\\n+ --hash=sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18 \\\n+ --hash=sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a \\\n+ --hash=sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336 \\\n+ --hash=sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239 \\\n+ --hash=sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74 \\\n+ --hash=sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a \\\n+ --hash=sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c \\\n+ --hash=sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4 \\\n+ --hash=sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c \\\n+ --hash=sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f \\\n+ --hash=sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4 \\\n+ --hash=sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db \\\n+ --hash=sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166 \\\n+ --hash=sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5 \\\n+ --hash=sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f \\\n+ --hash=sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae \\\n+ --hash=sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20 \\\n+ --hash=sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a \\\n+ --hash=sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057 \\\n+ --hash=sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb \\\n+ --hash=sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c \\\n+ --hash=sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\n # via secretstorage\n curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:08c799b89740b9bc49c09fbc3d5907f13ac1f845ca52620507ef9466d4639dd5 \\\n@@ -326,17 +326,17 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n jeepney==0.9.0 \\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\n --hash=sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732\n # via secretstorage\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -384,9 +384,9 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\n # via rich\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n@@ -400,9 +400,9 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\n # via cryptography\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\nindex e2573f07e3b4..02e86d9dbac7 100644\n--- a/bundle/requirements/macos.txt\n+++ b/bundle/requirements/macos.txt\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n macholib==1.16.4 ; sys_platform == 'darwin' \\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\n@@ -194,9 +194,9 @@ macholib==1.16.4 ; sys_platform == 'darwin' \\\n # via\n # delocate\n # pyinstaller\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -268,17 +268,17 @@ pyinstaller==6.20.0 \\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\n --hash=sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755\n # via pyinstaller\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n@@ -294,9 +294,9 @@ typing-extensions==4.15.0 ; sys_platform == 'darwin' \\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\n # via delocate\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\nindex 0b67614956ce..c72bbe824e70 100644\n--- a/bundle/requirements/pip.txt\n+++ b/bundle/requirements/pip.txt\n@@ -1,3 +1,3 @@\n-pip==26.1 \\\n- --hash=sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1 \\\n- --hash=sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\n+pip==26.1.1 \\\n+ --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\n+ --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\ndiff --git a/bundle/requirements/pyinstaller.txt b/bundle/requirements/pyinstaller.txt\nindex 1d7967cb3e1a..474b44b44eb4 100644\n--- a/bundle/requirements/pyinstaller.txt\n+++ b/bundle/requirements/pyinstaller.txt\n@@ -31,9 +31,9 @@ pyinstaller==6.20.0 \\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\nindex 7efd236c0d3a..dc2c0b2c5cda 100644\n--- a/bundle/requirements/static-analysis.txt\n+++ b/bundle/requirements/static-analysis.txt\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\n # via autopep8\n-ruff==0.15.12 \\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\n+ruff==0.15.13 \\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\nindex d31d3d09ec47..81a57e278ce9 100644\n--- a/bundle/requirements/test.txt\n+++ b/bundle/requirements/test.txt\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.1 \\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\n+pytest-rerunfailures==16.2 \\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\nindex a9a84ad7c6ed..9c7278f4a9e7 100644\n--- a/bundle/requirements/uv.txt\n+++ b/bundle/requirements/uv.txt\n@@ -1,20 +1,20 @@\n-uv==0.11.8 \\\n- --hash=sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65 \\\n- --hash=sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726 \\\n- --hash=sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4 \\\n- --hash=sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8 \\\n- --hash=sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b \\\n- --hash=sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807 \\\n- --hash=sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa \\\n- --hash=sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989 \\\n- --hash=sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c \\\n- --hash=sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe \\\n- --hash=sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80 \\\n- --hash=sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310 \\\n- --hash=sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1 \\\n- --hash=sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335 \\\n- --hash=sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d \\\n- --hash=sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037 \\\n- --hash=sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d \\\n- --hash=sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd \\\n- --hash=sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\n+uv==0.11.14 \\\n+ --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\n+ --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\n+ --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\n+ --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\n+ --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\n+ --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\n+ --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\n+ --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\n+ --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\n+ --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\n+ --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\n+ --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\n+ --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\n+ --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\n+ --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\n+ --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\n+ --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\n+ --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\n+ --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\ndiff --git a/bundle/requirements/win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\nindex 01e6b8a683b6..99e3bb40b151 100644\n--- a/bundle/requirements/win-arm64-pyinstaller.txt\n+++ b/bundle/requirements/win-arm64-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_arm64.whl \\\n --hash=sha256:91c40536352aaeace0a4fa7b0094d98ad6c82983eaed5a4786a1a0005904fe4c\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\nindex a4d004eadd0c..5f1a06b3f9fc 100644\n--- a/bundle/requirements/win-x64-pyinstaller.txt\n+++ b/bundle/requirements/win-x64-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_amd64.whl \\\n --hash=sha256:a05582e749265f9ea1428dad0552bd4577ab8c5acd19ae0f1b1593d476d65748\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\nindex bc4603cb9712..5b169505f67f 100644\n--- a/bundle/requirements/win-x86-pyinstaller.txt\n+++ b/bundle/requirements/win-x86-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win32.whl \\\n --hash=sha256:6704e50e993c6a2faad3e369ed517bf710b4ae6b6a4def85bb50e4169265d9a4\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\n","summary":"Edited 14 file(s) in bundle/requirements/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"pyproject.toml\",\n \"uv.lock\"\n ],\n \"solution_diff\": \"diff --git a/pyproject.toml b/pyproject.toml\\nindex dcc67352b813..b2f8a007335b 100644\\n--- a/pyproject.toml\\n+++ b/pyproject.toml\\n@@ -71,11 +71,11 @@ pin = [\\n \\\"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\\\",\\n \\\"certifi==2026.4.22\\\",\\n \\\"charset-normalizer==3.4.7\\\",\\n- \\\"idna==3.13\\\",\\n+ \\\"idna==3.15\\\",\\n \\\"mutagen==1.47.0\\\",\\n \\\"pycryptodomex==3.23.0\\\",\\n- \\\"requests==2.33.1\\\",\\n- \\\"urllib3==2.6.3\\\",\\n+ \\\"requests==2.34.2\\\",\\n+ \\\"urllib3==2.7.0\\\",\\n \\\"websockets==16.0\\\",\\n \\\"yt-dlp-ejs==0.8.0\\\",\\n ]\\n@@ -83,7 +83,7 @@ pin-curl-cffi = [\\n \\\"certifi==2026.4.22 ; implementation_name == 'cpython'\\\",\\n \\\"cffi==2.0.0 ; implementation_name == 'cpython'\\\",\\n \\\"curl-cffi==0.15.0 ; implementation_name == 'cpython'\\\",\\n- \\\"markdown-it-py==4.0.0 ; implementation_name == 'cpython'\\\",\\n+ \\\"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\\\",\\n \\\"mdurl==0.1.2 ; implementation_name == 'cpython'\\\",\\n \\\"pycparser==3.0 ; implementation_name == 'cpython'\\\",\\n \\\"pygments==2.20.0 ; implementation_name == 'cpython'\\\",\\n@@ -91,7 +91,7 @@ pin-curl-cffi = [\\n ]\\n pin-secretstorage = [\\n \\\"cffi==2.0.0 ; platform_python_implementation != 'PyPy'\\\",\\n- \\\"cryptography==47.0.0\\\",\\n+ \\\"cryptography==48.0.0\\\",\\n \\\"jeepney==0.9.0\\\",\\n \\\"pycparser==3.0 ; implementation_name != 'PyPy' and platform_python_implementation != 'PyPy'\\\",\\n \\\"secretstorage==3.5.0\\\",\\ndiff --git a/uv.lock b/uv.lock\\nindex c29da496096e..a1f2b7f8b08d 100644\\n--- a/uv.lock\\n+++ b/uv.lock\\n@@ -7,7 +7,7 @@ resolution-markers = [\\n ]\\n \\n [options]\\n-exclude-newer = \\\"2026-04-28T22:03:20.491912684Z\\\"\\n+exclude-newer = \\\"0001-01-01T00:00:00Z\\\" # This has no effect and is included for backwards compatibility when using relative exclude-newer values.\\n exclude-newer-span = \\\"P7D\\\"\\n \\n [options.exclude-newer-package]\\n@@ -121,7 +121,7 @@ wheels = [\\n \\n [[package]]\\n name = \\\"build\\\"\\n-version = \\\"1.4.4\\\"\\n+version = \\\"1.5.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"colorama\\\", marker = \\\"os_name == 'nt'\\\" },\\n@@ -130,9 +130,9 @@ dependencies = [\\n { name = \\\"pyproject-hooks\\\" },\\n { name = \\\"tomli\\\", marker = \\\"python_full_version < '3.11'\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/02/ec/bf5ae0a7e5ab57abe8aabdd0759c971883895d1a20c49ae99f8146840c3c/build-1.4.4.tar.gz\\\", hash = \\\"sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\\\", size = 89220, upload-time = \\\"2026-04-22T20:53:44.807Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/78/e0/df5e171f685f82f37b12e1f208064e24244911079d7b767447d1af7e0d70/build-1.5.0.tar.gz\\\", hash = \\\"sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\\\", size = 89796, upload-time = \\\"2026-04-30T03:18:25.17Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/fa/88/6764e7a109dd84294850741501145da90d13cdeac9d4e614929464a37420/build-1.4.4-py3-none-any.whl\\\", hash = \\\"sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d\\\", size = 25921, upload-time = \\\"2026-04-22T20:53:43.251Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0d/fe/6bea5c9162869c5beba5d9c8abbed835ec85bf1ec1fba05a3822325c45f3/build-1.5.0-py3-none-any.whl\\\", hash = \\\"sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f\\\", size = 26018, upload-time = \\\"2026-04-30T03:18:23.644Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -351,62 +351,62 @@ wheels = [\\n \\n [[package]]\\n name = \\\"cryptography\\\"\\n-version = \\\"47.0.0\\\"\\n+version = \\\"48.0.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"cffi\\\", marker = \\\"platform_python_implementation != 'PyPy'\\\" },\\n { name = \\\"typing-extensions\\\", marker = \\\"python_full_version < '3.11'\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/ef/b2/7ffa7fe8207a8c42147ffe70c3e360b228160c1d85dc3faff16aaa3244c0/cryptography-47.0.0.tar.gz\\\", hash = \\\"sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb\\\", size = 830863, upload-time = \\\"2026-04-24T19:54:57.056Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz\\\", hash = \\\"sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920\\\", size = 832984, upload-time = \\\"2026-05-04T22:59:38.133Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/a4/98/40dfe932134bdcae4f6ab5927c87488754bf9eb79297d7e0070b78dd58e9/cryptography-47.0.0-cp311-abi3-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0\\\", size = 7912214, upload-time = \\\"2026-04-24T19:53:03.864Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/34/c6/2733531243fba725f58611b918056b277692f1033373dcc8bd01af1c05d4/cryptography-47.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973\\\", size = 4644617, upload-time = \\\"2026-04-24T19:53:06.909Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/00/e3/b27be1a670a9b87f855d211cf0e1174a5d721216b7616bd52d8581d912ed/cryptography-47.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8\\\", size = 4668186, upload-time = \\\"2026-04-24T19:53:09.053Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/81/b9/8443cfe5d17d482d348cee7048acf502bb89a51b6382f06240fd290d4ca3/cryptography-47.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b\\\", size = 4651244, upload-time = \\\"2026-04-24T19:53:11.217Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/5d/5e/13ed0cdd0eb88ba159d6dd5ebfece8cb901dbcf1ae5ac4072e28b55d3153/cryptography-47.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92\\\", size = 5252906, upload-time = \\\"2026-04-24T19:53:13.532Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/64/16/ed058e1df0f33d440217cd120d41d5dda9dd215a80b8187f68483185af82/cryptography-47.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7\\\", size = 4701842, upload-time = \\\"2026-04-24T19:53:15.618Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/02/e0/3d30986b30fdbd9e969abbdf8ba00ed0618615144341faeb57f395a084fe/cryptography-47.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93\\\", size = 4289313, upload-time = \\\"2026-04-24T19:53:17.755Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/df/fd/32db38e3ad0cb331f0691cb4c7a8a6f176f679124dee746b3af6633db4d9/cryptography-47.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac\\\", size = 4650964, upload-time = \\\"2026-04-24T19:53:20.062Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/86/53/5395d944dfd48cb1f67917f533c609c34347185ef15eb4308024c876f274/cryptography-47.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f\\\", size = 5207817, upload-time = \\\"2026-04-24T19:53:22.498Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/34/4f/e5711b28e1901f7d480a2b1b688b645aa4c77c73f10731ed17e7f7db3f0d/cryptography-47.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8\\\", size = 4701544, upload-time = \\\"2026-04-24T19:53:24.356Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/22/22/c8ddc25de3010fc8da447648f5a092c40e7a8fadf01dd6d255d9c0b9373d/cryptography-47.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318\\\", size = 4783536, upload-time = \\\"2026-04-24T19:53:26.665Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/66/b6/d4a68f4ea999c6d89e8498579cba1c5fcba4276284de7773b17e4fa69293/cryptography-47.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001\\\", size = 4926106, upload-time = \\\"2026-04-24T19:53:28.686Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/54/ed/5f524db1fade9c013aa618e1c99c6ed05e8ffc9ceee6cda22fed22dda3f4/cryptography-47.0.0-cp311-abi3-win32.whl\\\", hash = \\\"sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203\\\", size = 3258581, upload-time = \\\"2026-04-24T19:53:31.058Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/b2/dc/1b901990b174786569029f67542b3edf72ac068b6c3c8683c17e6a2f5363/cryptography-47.0.0-cp311-abi3-win_amd64.whl\\\", hash = \\\"sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa\\\", size = 3775309, upload-time = \\\"2026-04-24T19:53:33.054Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/14/88/7aa18ad9c11bc87689affa5ce4368d884b517502d75739d475fc6f4a03c7/cryptography-47.0.0-cp314-cp314t-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0\\\", size = 7904299, upload-time = \\\"2026-04-24T19:53:35.003Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/07/55/c18f75724544872f234678fdedc871391722cb34a2aee19faa9f63100bb2/cryptography-47.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7\\\", size = 4631180, upload-time = \\\"2026-04-24T19:53:37.517Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ee/65/31a5cc0eaca99cec5bafffe155d407115d96136bb161e8b49e0ef73f09a7/cryptography-47.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1\\\", size = 4653529, upload-time = \\\"2026-04-24T19:53:39.775Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e5/bc/641c0519a495f3bfd0421b48d7cd325c4336578523ccd76ea322b6c29c7a/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c\\\", size = 4638570, upload-time = \\\"2026-04-24T19:53:42.129Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/2b/f2/300327b0a47f6dc94dd8b71b57052aefe178bb51745073d73d80604f11ab/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829\\\", size = 5238019, upload-time = \\\"2026-04-24T19:53:44.577Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e9/5a/5b5cf994391d4bf9d9c7efd4c66aabe4d95227256627f8fea6cff7dfadbd/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7\\\", size = 4686832, upload-time = \\\"2026-04-24T19:53:47.015Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/dc/2c/ae950e28fd6475c852fc21a44db3e6b5bcc1261d1e370f2b6e42fa800fef/cryptography-47.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923\\\", size = 4269301, upload-time = \\\"2026-04-24T19:53:48.97Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/67/fb/6a39782e150ffe5cc1b0018cb6ddc48bf7ca62b498d7539ffc8a758e977d/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab\\\", size = 4638110, upload-time = \\\"2026-04-24T19:53:51.011Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/8e/d7/0b3c71090a76e5c203164a47688b697635ece006dcd2499ab3a4dbd3f0bd/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\\\", size = 5194988, upload-time = \\\"2026-04-24T19:53:52.962Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/63/33/63a961498a9df51721ab578c5a2622661411fc520e00bd83b0cc64eb20c4/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7\\\", size = 4686563, upload-time = \\\"2026-04-24T19:53:55.274Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/b7/bf/5ee5b145248f92250de86145d1c1d6edebbd57a7fe7caa4dedb5d4cf06a1/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52\\\", size = 4770094, upload-time = \\\"2026-04-24T19:53:57.753Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/92/43/21d220b2da5d517773894dacdcdb5c682c28d3fffce65548cb06e87d5501/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd\\\", size = 4913811, upload-time = \\\"2026-04-24T19:54:00.236Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/31/98/dc4ad376ac5f1a1a7d4a83f7b0c6f2bcad36b5d2d8f30aeb482d3a7d9582/cryptography-47.0.0-cp314-cp314t-win32.whl\\\", hash = \\\"sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63\\\", size = 3237158, upload-time = \\\"2026-04-24T19:54:02.606Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/bc/da/97f62d18306b5133468bc3f8cc73a3111e8cdc8cf8d3e69474d6e5fd2d1b/cryptography-47.0.0-cp314-cp314t-win_amd64.whl\\\", hash = \\\"sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b\\\", size = 3758706, upload-time = \\\"2026-04-24T19:54:04.433Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e0/34/a4fae8ae7c3bc227460c9ae43f56abf1b911da0ec29e0ebac53bb0a4b6b7/cryptography-47.0.0-cp38-abi3-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4\\\", size = 7904072, upload-time = \\\"2026-04-24T19:54:06.411Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/01/64/d7b1e54fdb69f22d24a64bb3e88dc718b31c7fb10ef0b9691a3cf7eeea6e/cryptography-47.0.0-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27\\\", size = 4635767, upload-time = \\\"2026-04-24T19:54:08.519Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/8b/7b/cca826391fb2a94efdcdfe4631eb69306ee1cff0b22f664a412c90713877/cryptography-47.0.0-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10\\\", size = 4654350, upload-time = \\\"2026-04-24T19:54:10.795Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/4c/65/4b57bcc823f42a991627c51c2f68c9fd6eb1393c1756aac876cba2accae2/cryptography-47.0.0-cp38-abi3-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b\\\", size = 4643394, upload-time = \\\"2026-04-24T19:54:13.275Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/f4/c4/2c5fbeea70adbbca2bbae865e1d605d6a4a7f8dbd9d33eaf69645087f06c/cryptography-47.0.0-cp38-abi3-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74\\\", size = 5225777, upload-time = \\\"2026-04-24T19:54:15.18Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/7e/b8/ac57107ef32749d2b244e36069bb688792a363aaaa3acc9e3cf84c130315/cryptography-47.0.0-cp38-abi3-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515\\\", size = 4688771, upload-time = \\\"2026-04-24T19:54:17.835Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/56/fc/9f1de22ff8be99d991f240a46863c52d475404c408886c5a38d2b5c3bb26/cryptography-47.0.0-cp38-abi3-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc\\\", size = 4270753, upload-time = \\\"2026-04-24T19:54:19.963Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/00/68/d70c852797aa68e8e48d12e5a87170c43f67bb4a59403627259dd57d15de/cryptography-47.0.0-cp38-abi3-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca\\\", size = 4642911, upload-time = \\\"2026-04-24T19:54:21.818Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/a5/51/661cbee74f594c5d97ff82d34f10d5551c085ca4668645f4606ebd22bd5d/cryptography-47.0.0-cp38-abi3-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76\\\", size = 5181411, upload-time = \\\"2026-04-24T19:54:24.376Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/94/87/f2b6c374a82cf076cfa1416992ac8e8ec94d79facc37aec87c1a5cb72352/cryptography-47.0.0-cp38-abi3-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe\\\", size = 4688262, upload-time = \\\"2026-04-24T19:54:26.946Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/14/e2/8b7462f4acf21ec509616f0245018bb197194ab0b65c2ea21a0bdd53c0eb/cryptography-47.0.0-cp38-abi3-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31\\\", size = 4775506, upload-time = \\\"2026-04-24T19:54:28.926Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/70/75/158e494e4c08dc05e039da5bb48553826bd26c23930cf8d3cd5f21fa8921/cryptography-47.0.0-cp38-abi3-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7\\\", size = 4912060, upload-time = \\\"2026-04-24T19:54:30.869Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/06/bd/0a9d3edbf5eadbac926d7b9b3cd0c4be584eeeae4a003d24d9eda4affbbd/cryptography-47.0.0-cp38-abi3-win32.whl\\\", hash = \\\"sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310\\\", size = 3248487, upload-time = \\\"2026-04-24T19:54:33.494Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/60/80/5681af756d0da3a599b7bdb586fac5a1540f1bcefd2717a20e611ddade45/cryptography-47.0.0-cp38-abi3-win_amd64.whl\\\", hash = \\\"sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769\\\", size = 3755737, upload-time = \\\"2026-04-24T19:54:35.408Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/1b/a0/928c9ce0d120a40a81aa99e3ba383e87337b9ac9ef9f6db02e4d7822424d/cryptography-47.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7\\\", size = 3909893, upload-time = \\\"2026-04-24T19:54:38.334Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/81/75/d691e284750df5d9569f2b1ce4a00a71e1d79566da83b2b3e5549c84917f/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe\\\", size = 4587867, upload-time = \\\"2026-04-24T19:54:40.619Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/07/d6/1b90f1a4e453009730b4545286f0b39bb348d805c11181fc31544e4f9a65/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475\\\", size = 4627192, upload-time = \\\"2026-04-24T19:54:42.849Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/dc/53/cb358a80e9e359529f496870dd08c102aa8a4b5b9f9064f00f0d6ed5b527/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50\\\", size = 4587486, upload-time = \\\"2026-04-24T19:54:44.908Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/8b/57/aaa3d53876467a226f9a7a82fd14dd48058ad2de1948493442dfa16e2ffd/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab\\\", size = 4626327, upload-time = \\\"2026-04-24T19:54:47.813Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ab/9c/51f28c3550276bcf35660703ba0ab829a90b88be8cd98a71ef23c2413913/cryptography-47.0.0-pp311-pypy311_pp73-win_amd64.whl\\\", hash = \\\"sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8\\\", size = 3698916, upload-time = \\\"2026-04-24T19:54:49.782Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6\\\", size = 8001587, upload-time = \\\"2026-05-04T22:57:36.803Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c\\\", size = 4690433, upload-time = \\\"2026-05-04T22:57:40.373Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3\\\", size = 4710620, upload-time = \\\"2026-05-04T22:57:42.935Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5\\\", size = 4696283, upload-time = \\\"2026-05-04T22:57:45.294Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c\\\", size = 5296573, upload-time = \\\"2026-05-04T22:57:47.933Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f\\\", size = 4743677, upload-time = \\\"2026-05-04T22:57:50.067Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25\\\", size = 4330808, upload-time = \\\"2026-05-04T22:57:52.301Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602\\\", size = 4695941, upload-time = \\\"2026-05-04T22:57:54.603Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c\\\", size = 5252579, upload-time = \\\"2026-05-04T22:57:57.207Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5\\\", size = 4743326, upload-time = \\\"2026-05-04T22:57:59.535Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321\\\", size = 4826672, upload-time = \\\"2026-05-04T22:58:01.996Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74\\\", size = 4972574, upload-time = \\\"2026-05-04T22:58:03.968Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl\\\", hash = \\\"sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4\\\", size = 3294868, upload-time = \\\"2026-05-04T22:58:06.467Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl\\\", hash = \\\"sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7\\\", size = 3817107, upload-time = \\\"2026-05-04T22:58:08.845Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec\\\", size = 7986556, upload-time = \\\"2026-05-04T22:58:11.172Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18\\\", size = 4684776, upload-time = \\\"2026-05-04T22:58:13.712Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20\\\", size = 4698121, upload-time = \\\"2026-05-04T22:58:16.448Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff\\\", size = 4690042, upload-time = \\\"2026-05-04T22:58:18.544Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c\\\", size = 5282526, upload-time = \\\"2026-05-04T22:58:20.75Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db\\\", size = 4733116, upload-time = \\\"2026-05-04T22:58:23.627Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741\\\", size = 4316030, upload-time = \\\"2026-05-04T22:58:25.581Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166\\\", size = 4689640, upload-time = \\\"2026-05-04T22:58:27.747Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336\\\", size = 5237657, upload-time = \\\"2026-05-04T22:58:29.848Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057\\\", size = 4732362, upload-time = \\\"2026-05-04T22:58:32.009Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae\\\", size = 4819580, upload-time = \\\"2026-05-04T22:58:34.254Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c\\\", size = 4963283, upload-time = \\\"2026-05-04T22:58:36.376Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl\\\", hash = \\\"sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f\\\", size = 3270954, upload-time = \\\"2026-05-04T22:58:38.791Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl\\\", hash = \\\"sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12\\\", size = 3797313, upload-time = \\\"2026-05-04T22:58:40.746Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl\\\", hash = \\\"sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86\\\", size = 7983482, upload-time = \\\"2026-05-04T22:58:43.769Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\\\", hash = \\\"sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e\\\", size = 4683266, upload-time = \\\"2026-05-04T22:58:46.064Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\\\", hash = \\\"sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f\\\", size = 4696228, upload-time = \\\"2026-05-04T22:58:48.22Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7\\\", size = 4689097, upload-time = \\\"2026-05-04T22:58:50.9Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl\\\", hash = \\\"sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832\\\", size = 5283582, upload-time = \\\"2026-05-04T22:58:53.017Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c\\\", size = 4730479, upload-time = \\\"2026-05-04T22:58:55.611Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl\\\", hash = \\\"sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a\\\", size = 4326481, upload-time = \\\"2026-05-04T22:58:57.607Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a\\\", size = 4688713, upload-time = \\\"2026-05-04T22:59:00.077Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl\\\", hash = \\\"sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a\\\", size = 5238165, upload-time = \\\"2026-05-04T22:59:02.317Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239\\\", size = 4729947, upload-time = \\\"2026-05-04T22:59:05.255Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c\\\", size = 4822059, upload-time = \\\"2026-05-04T22:59:07.802Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4\\\", size = 4960575, upload-time = \\\"2026-05-04T22:59:09.851Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl\\\", hash = \\\"sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd\\\", size = 3279117, upload-time = \\\"2026-05-04T22:59:12.019Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl\\\", hash = \\\"sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8\\\", size = 3792100, upload-time = \\\"2026-05-04T22:59:14.884Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855\\\", size = 3950391, upload-time = \\\"2026-05-04T22:59:17.415Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\\\", size = 4637126, upload-time = \\\"2026-05-04T22:59:20.197Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\\\", hash = \\\"sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13\\\", size = 4667270, upload-time = \\\"2026-05-04T22:59:22.647Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\\\", hash = \\\"sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb\\\", size = 4636797, upload-time = \\\"2026-05-04T22:59:24.912Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\\\", hash = \\\"sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355\\\", size = 4666800, upload-time = \\\"2026-05-04T22:59:27.474Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl\\\", hash = \\\"sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a\\\", size = 3739536, upload-time = \\\"2026-05-04T22:59:29.61Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -526,11 +526,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"idna\\\"\\n-version = \\\"3.13\\\"\\n+version = \\\"3.15\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/ce/cc/762dfb036166873f0059f3b7de4565e1b5bc3d6f28a414c13da27e442f99/idna-3.13.tar.gz\\\", hash = \\\"sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242\\\", size = 194210, upload-time = \\\"2026-04-22T16:42:42.314Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\\\", hash = \\\"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\\", size = 199245, upload-time = \\\"2026-05-12T22:45:57.011Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/5d/13/ad7d7ca3808a898b4612b6fe93cde56b53f3034dcde235acb1f0e1df24c6/idna-3.13-py3-none-any.whl\\\", hash = \\\"sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\\\", size = 68629, upload-time = \\\"2026-04-22T16:42:40.909Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\\\", hash = \\\"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\\\", size = 72340, upload-time = \\\"2026-05-12T22:45:55.733Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -577,14 +577,14 @@ wheels = [\\n \\n [[package]]\\n name = \\\"markdown-it-py\\\"\\n-version = \\\"4.0.0\\\"\\n+version = \\\"4.2.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"mdurl\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz\\\", hash = \\\"sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\\\", size = 73070, upload-time = \\\"2025-08-11T12:57:52.854Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz\\\", hash = \\\"sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49\\\", size = 82454, upload-time = \\\"2026-05-07T12:08:28.36Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl\\\", hash = \\\"sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147\\\", size = 87321, upload-time = \\\"2025-08-11T12:57:51.923Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl\\\", hash = \\\"sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\\\", size = 91687, upload-time = \\\"2026-05-07T12:08:27.182Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -643,11 +643,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"pip\\\"\\n-version = \\\"26.1\\\"\\n+version = \\\"26.1.1\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/73/7e/d2b04004e1068ad4fdfa2f227b839b5d03e602e47cdbbf49de71137c9546/pip-26.1.tar.gz\\\", hash = \\\"sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\\\", size = 1840316, upload-time = \\\"2026-04-26T21:00:05.406Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\\\", hash = \\\"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\\\", size = 1840400, upload-time = \\\"2026-05-04T19:02:21.248Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/70/7a/be4bd8bcbb24ea475856dd68159d78b03b2bb53dae369f69c9606b8888f5/pip-26.1-py3-none-any.whl\\\", hash = \\\"sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1\\\", size = 1812804, upload-time = \\\"2026-04-26T21:00:03.194Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\\\", hash = \\\"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\\\", size = 1812777, upload-time = \\\"2026-05-04T19:02:18.9Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -785,15 +785,15 @@ wheels = [\\n \\n [[package]]\\n name = \\\"pyinstaller-hooks-contrib\\\"\\n-version = \\\"2026.4\\\"\\n+version = \\\"2026.5\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"packaging\\\" },\\n { name = \\\"setuptools\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/c7/fe/9278c29394bf69169febc21f96b4252c3ee7c8ec22c2fc545004bed47e71/pyinstaller_hooks_contrib-2026.4.tar.gz\\\", hash = \\\"sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\\", size = 173050, upload-time = \\\"2026-03-31T14:10:51.188Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/1a/67/f4452d68793fb15beba4f19ef39a38a8822f0da7452b503c400d5a21f5c1/pyinstaller_hooks_contrib-2026.5.tar.gz\\\", hash = \\\"sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\\", size = 173689, upload-time = \\\"2026-05-04T22:36:55.124Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/88/f4/035fb8c06deff827f540a9a4ed9122c54e5376fca3e42eddf0c263730775/pyinstaller_hooks_contrib-2026.4-py3-none-any.whl\\\", hash = \\\"sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f\\\", size = 455496, upload-time = \\\"2026-03-31T14:10:49.867Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f6/5c/fd465d11da4d12b50d7eb5d2ee2ceb780d8d049dbb489f3828d131e387af/pyinstaller_hooks_contrib-2026.5-py3-none-any.whl\\\", hash = \\\"sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9\\\", size = 457314, upload-time = \\\"2026-05-04T22:36:53.598Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -825,28 +825,28 @@ wheels = [\\n \\n [[package]]\\n name = \\\"pytest-rerunfailures\\\"\\n-version = \\\"16.1\\\"\\n+version = \\\"16.2\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"packaging\\\" },\\n { name = \\\"pytest\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/de/04/71e9520551fc8fe2cf5c1a1842e4e600265b0815f2016b7c27ec85688682/pytest_rerunfailures-16.1.tar.gz\\\", hash = \\\"sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\\\", size = 30889, upload-time = \\\"2025-10-10T07:06:01.238Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\\\", hash = \\\"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\\\", size = 32121, upload-time = \\\"2026-05-13T08:13:26.998Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/77/54/60eabb34445e3db3d3d874dc1dfa72751bfec3265bd611cb13c8b290adea/pytest_rerunfailures-16.1-py3-none-any.whl\\\", hash = \\\"sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86\\\", size = 14093, upload-time = \\\"2025-10-10T07:06:00.019Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\\\", hash = \\\"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\\", size = 14505, upload-time = \\\"2026-05-13T08:13:25.485Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"python-discovery\\\"\\n-version = \\\"1.2.2\\\"\\n+version = \\\"1.3.1\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"filelock\\\" },\\n { name = \\\"platformdirs\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/de/ef/3bae0e537cfe91e8431efcba4434463d2c5a65f5a89edd47c6cf2f03c55f/python_discovery-1.2.2.tar.gz\\\", hash = \\\"sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb\\\", size = 58872, upload-time = \\\"2026-04-07T17:28:49.249Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\\\", hash = \\\"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\\\", size = 68011, upload-time = \\\"2026-05-12T20:53:36.336Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/d8/db/795879cc3ddfe338599bddea6388cc5100b088db0a4caf6e6c1af1c27e04/python_discovery-1.2.2-py3-none-any.whl\\\", hash = \\\"sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\\\", size = 31894, upload-time = \\\"2026-04-07T17:28:48.09Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\\\", hash = \\\"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\\\", size = 33185, upload-time = \\\"2026-05-12T20:53:34.969Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -924,7 +924,7 @@ wheels = [\\n \\n [[package]]\\n name = \\\"requests\\\"\\n-version = \\\"2.33.1\\\"\\n+version = \\\"2.34.2\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"certifi\\\" },\\n@@ -932,9 +932,9 @@ dependencies = [\\n { name = \\\"idna\\\" },\\n { name = \\\"urllib3\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz\\\", hash = \\\"sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517\\\", size = 134120, upload-time = \\\"2026-03-30T16:09:15.531Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz\\\", hash = \\\"sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\\\", size = 142856, upload-time = \\\"2026-05-14T19:25:27.735Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl\\\", hash = \\\"sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\\\", size = 64947, upload-time = \\\"2026-03-30T16:09:13.83Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl\\\", hash = \\\"sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0\\\", size = 73075, upload-time = \\\"2026-05-14T19:25:26.443Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -952,27 +952,27 @@ wheels = [\\n \\n [[package]]\\n name = \\\"ruff\\\"\\n-version = \\\"0.15.12\\\"\\n+version = \\\"0.15.13\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/99/43/3291f1cc9106f4c63bdce7a8d0df5047fe8422a75b091c16b5e9355e0b11/ruff-0.15.12.tar.gz\\\", hash = \\\"sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6\\\", size = 4643852, upload-time = \\\"2026-04-24T18:17:14.305Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\\\", hash = \\\"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\\\", size = 4678180, upload-time = \\\"2026-05-14T13:44:37.869Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/c3/6e/e78ffb61d4686f3d96ba3df2c801161843746dcbcbb17a1e927d4829312b/ruff-0.15.12-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c\\\", size = 10640713, upload-time = \\\"2026-04-24T18:17:22.841Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ae/08/a317bc231fb9e7b93e4ef3089501e51922ff88d6936ce5cf870c4fe55419/ruff-0.15.12-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c\\\", size = 11069267, upload-time = \\\"2026-04-24T18:17:30.105Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/aa/a4/f828e9718d3dce1f5f11c39c4f65afd32783c8b2aebb2e3d259e492c47bd/ruff-0.15.12-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\\\", size = 10397182, upload-time = \\\"2026-04-24T18:17:07.177Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/71/e0/3310fc6d1b5e1fdea22bf3b1b807c7e187b581021b0d7d4514cccdb5fb71/ruff-0.15.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002\\\", size = 10758012, upload-time = \\\"2026-04-24T18:16:55.759Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/11/c1/a606911aee04c324ddaa883ae418f3569792fd3c4a10c50e0dd0a2311e1e/ruff-0.15.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5\\\", size = 10447479, upload-time = \\\"2026-04-24T18:16:51.677Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/9d/68/4201e8444f0894f21ab4aeeaee68aa4f10b51613514a20d80bd628d57e88/ruff-0.15.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6\\\", size = 11234040, upload-time = \\\"2026-04-24T18:17:16.529Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/34/ff/8a6d6cf4ccc23fd67060874e832c18919d1557a0611ebef03fdb01fff11e/ruff-0.15.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33\\\", size = 12087377, upload-time = \\\"2026-04-24T18:17:04.944Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/85/f6/c669cf73f5152f623d34e69866a46d5e6185816b19fcd5b6dd8a2d299922/ruff-0.15.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847\\\", size = 11367784, upload-time = \\\"2026-04-24T18:17:25.409Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/e8/39/c61d193b8a1daaa8977f7dea9e8d8ba866e02ea7b65d32f6861693aa4c12/ruff-0.15.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0\\\", size = 11344088, upload-time = \\\"2026-04-24T18:17:12.258Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/c2/8d/49afab3645e31e12c590acb6d3b5b69d7aab5b81926dbaf7461f9441f37a/ruff-0.15.12-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339\\\", size = 11271770, upload-time = \\\"2026-04-24T18:17:02.457Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/46/06/33f41fe94403e2b755481cdfb9b7ef3e4e0ed031c4581124658d935d52b4/ruff-0.15.12-py3-none-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5\\\", size = 10719355, upload-time = \\\"2026-04-24T18:17:27.648Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/0d/59/18aa4e014debbf559670e4048e39260a85c7fcee84acfd761ac01e7b8d35/ruff-0.15.12-py3-none-musllinux_1_2_armv7l.whl\\\", hash = \\\"sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd\\\", size = 10462758, upload-time = \\\"2026-04-24T18:17:32.347Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/25/e7/cc9f16fd0f3b5fddcbd7ec3d6ae30c8f3fde1047f32a4093a98d633c6570/ruff-0.15.12-py3-none-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b\\\", size = 10953498, upload-time = \\\"2026-04-24T18:17:20.674Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/72/7a/a9ba7f98c7a575978698f4230c5e8cc54bbc761af34f560818f933dafa0c/ruff-0.15.12-py3-none-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e\\\", size = 11447765, upload-time = \\\"2026-04-24T18:17:09.755Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ea/f9/0ae446942c846b8266059ad8a30702a35afae55f5cdc54c5adf8d7afdc27/ruff-0.15.12-py3-none-win32.whl\\\", hash = \\\"sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20\\\", size = 10657277, upload-time = \\\"2026-04-24T18:17:18.591Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/33/f1/9614e03e1cdcbf9437570b5400ced8a720b5db22b28d8e0f1bda429f660d/ruff-0.15.12-py3-none-win_amd64.whl\\\", hash = \\\"sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d\\\", size = 11837758, upload-time = \\\"2026-04-24T18:17:00.113Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/c0/98/6beb4b351e472e5f4c4613f7c35a5290b8be2497e183825310c4c3a3984b/ruff-0.15.12-py3-none-win_arm64.whl\\\", hash = \\\"sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f\\\", size = 11120821, upload-time = \\\"2026-04-24T18:16:57.979Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\\\", size = 10738279, upload-time = \\\"2026-05-14T13:44:18.7Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\\\", size = 11124798, upload-time = \\\"2026-05-14T13:44:06.427Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\\\", size = 10460761, upload-time = \\\"2026-05-14T13:44:04.375Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\\\", size = 10804451, upload-time = \\\"2026-05-14T13:44:25.221Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\\\", size = 10534285, upload-time = \\\"2026-05-14T13:44:08.888Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\\\", size = 11312063, upload-time = \\\"2026-05-14T13:44:11.274Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\\\", size = 12183079, upload-time = \\\"2026-05-14T13:44:01.634Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\\\", size = 11440833, upload-time = \\\"2026-05-14T13:43:59.043Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\\\", size = 11434486, upload-time = \\\"2026-05-14T13:44:27.761Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\\\", size = 11385189, upload-time = \\\"2026-05-14T13:44:13.704Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\\", size = 10781380, upload-time = \\\"2026-05-14T13:43:56.734Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\\\", hash = \\\"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\\\", size = 10540605, upload-time = \\\"2026-05-14T13:44:20.748Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\\\", size = 11036554, upload-time = \\\"2026-05-14T13:44:16.256Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\\\", size = 11528133, upload-time = \\\"2026-05-14T13:44:22.808Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\\\", hash = \\\"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\\\", size = 10721455, upload-time = \\\"2026-05-14T13:44:35.697Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\\\", hash = \\\"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\\\", size = 11900409, upload-time = \\\"2026-05-14T13:44:30.389Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\\\", hash = \\\"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\\\", size = 11179336, upload-time = \\\"2026-05-14T13:44:33.026Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1053,11 +1053,11 @@ wheels = [\\n \\n [[package]]\\n name = \\\"trove-classifiers\\\"\\n-version = \\\"2026.4.28.13\\\"\\n+version = \\\"2026.5.7.17\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/04/af/88fdebf242bc7bc4957c96c5358a2b2b0f07e5001401906783a521ea9f54/trove_classifiers-2026.4.28.13.tar.gz\\\", hash = \\\"sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\\\", size = 17035, upload-time = \\\"2026-04-28T13:45:41.495Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\\\", hash = \\\"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\\\", size = 17041, upload-time = \\\"2026-05-07T17:48:01.931Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/d6/bb/fbdc4e57731efb86b4209ffdd2519520782bf27b3c961beac3e5c20d2b87/trove_classifiers-2026.4.28.13-py3-none-any.whl\\\", hash = \\\"sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8\\\", size = 14216, upload-time = \\\"2026-04-28T13:45:39.943Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\\\", hash = \\\"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\\\", size = 14201, upload-time = \\\"2026-05-07T17:48:00.488Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1071,42 +1071,42 @@ wheels = [\\n \\n [[package]]\\n name = \\\"urllib3\\\"\\n-version = \\\"2.6.3\\\"\\n+version = \\\"2.7.0\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz\\\", hash = \\\"sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed\\\", size = 435556, upload-time = \\\"2026-01-07T16:24:43.925Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz\\\", hash = \\\"sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c\\\", size = 433602, upload-time = \\\"2026-05-07T16:13:18.596Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl\\\", hash = \\\"sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\\\", size = 131584, upload-time = \\\"2026-01-07T16:24:42.685Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl\\\", hash = \\\"sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\\\", size = 131087, upload-time = \\\"2026-05-07T16:13:17.151Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"uv\\\"\\n-version = \\\"0.11.8\\\"\\n+version = \\\"0.11.14\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/c1/cd/4393fecb083897e956f016d4e66d0b8a496a08fe2e03cbda32a1e91da7ee/uv-0.11.8.tar.gz\\\", hash = \\\"sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335\\\", size = 4098020, upload-time = \\\"2026-04-27T13:15:31.625Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\\\", hash = \\\"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\\\", size = 4130699, upload-time = \\\"2026-05-12T18:00:37.321Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/99/84/dcb676a3e36a3a2b44dc2e4dfea471b8cd709025e27cce3e588b176fd899/uv-0.11.8-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c\\\", size = 23664296, upload-time = \\\"2026-04-27T13:15:15.644Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/86/05/557aa070fda7b8460bbbe1e867e8e5b80602c5b30ed77d1d94fc5acae518/uv-0.11.8-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d\\\", size = 23087321, upload-time = \\\"2026-04-27T13:15:36.193Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/d5/62/82953018801a250e16b091ef4b5e95e939b2f01224363d6fc80f600b7eff/uv-0.11.8-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd\\\", size = 21747142, upload-time = \\\"2026-04-27T13:15:20.4Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/af/4c/477f2abe16f9a3d3c73077f15615878a303eef3760115ec946be58ecb9b2/uv-0.11.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\\\", hash = \\\"sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807\\\", size = 23425861, upload-time = \\\"2026-04-27T13:15:10.374Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/2a/63/19f46193e49f0c9bf33346a4d726313871864db16e7cdd1c0a63bc112000/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\\\", hash = \\\"sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8\\\", size = 23215551, upload-time = \\\"2026-04-27T13:15:38.706Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/72/3e/5595b265df848a33cd060b10e8f763a46d67521ac9f6c314e8a4ad5329d7/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310\\\", size = 23224170, upload-time = \\\"2026-04-27T13:15:18.083Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/a6/b3/6ca95e690b52542caa1dae10ede57732f90c629946ab5f027ff746f87deb/uv-0.11.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989\\\", size = 24730048, upload-time = \\\"2026-04-27T13:15:13.254Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/ea/49/71b7322067c85a3736a22a300072b0566991fe3f95b81bed793508ff5315/uv-0.11.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa\\\", size = 25585906, upload-time = \\\"2026-04-27T13:15:41.455Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/37/16/4e84cd5131327fe86d4784ebfc8a983149f4e6b811476ef271fc548b29e6/uv-0.11.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4\\\", size = 24795740, upload-time = \\\"2026-04-27T13:15:49.842Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/5b/01/df175979018743cc5ba6e2fb9dcec916868271e8d88cf0b9df8fd805a0df/uv-0.11.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037\\\", size = 24824980, upload-time = \\\"2026-04-27T13:15:53.506Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/1c/95/93c7f595f7136fb32807442860c55d0faed2cd3d7da4b7105ed3c2535d5f/uv-0.11.8-py3-none-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\\\", size = 23526790, upload-time = \\\"2026-04-27T13:15:04.955Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/04/02/77430b89e172c20cc549b07a5b1dfda0c882c161b6d82781d3150a7063ac/uv-0.11.8-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\\\", hash = \\\"sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b\\\", size = 24280498, upload-time = \\\"2026-04-27T13:15:43.978Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/8a/e3/23e4a2bb91e3880e017e6116886e2d0bde14ba6aa95ddc458160ee630e7c/uv-0.11.8-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1\\\", size = 24375233, upload-time = \\\"2026-04-27T13:15:25.753Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/d9/67/fb7dc17cea816a667d1be2632525aa1687566bfafd17bdac561a7a6c9484/uv-0.11.8-py3-none-musllinux_1_1_i686.whl\\\", hash = \\\"sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80\\\", size = 23904818, upload-time = \\\"2026-04-27T13:15:23.21Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/4b/91/b920e35f54f8c6b51f2c639e8170bb80a47a739a1442fea33a479bc93a3d/uv-0.11.8-py3-none-musllinux_1_1_x86_64.whl\\\", hash = \\\"sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65\\\", size = 25015448, upload-time = \\\"2026-04-27T13:15:46.666Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/05/e8/3771956dc1c94b8484789bb8070d91872080d0af99332b8bdec7218c2bfd/uv-0.11.8-py3-none-win32.whl\\\", hash = \\\"sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d\\\", size = 22823583, upload-time = \\\"2026-04-27T13:15:33.674Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/f9/9b/a91a9c60dcae0e1e3da06377d38f32118a523697d461fe41bc9f117ecf59/uv-0.11.8-py3-none-win_amd64.whl\\\", hash = \\\"sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726\\\", size = 25407438, upload-time = \\\"2026-04-27T13:15:28.957Z\\\" },\\n- { url = \\\"https://files.pythonhosted.org/packages/61/5d/defa29fe617e6f07d4e514089e9d36fd9f44ede869e597e39ff7d69f6917/uv-0.11.8-py3-none-win_arm64.whl\\\", hash = \\\"sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe\\\", size = 23914243, upload-time = \\\"2026-04-27T13:15:07.717Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\\\", hash = \\\"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\\\", size = 23545199, upload-time = \\\"2026-05-12T18:01:34.526Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\\\", hash = \\\"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\\\", size = 22957064, upload-time = \\\"2026-05-12T18:00:54.225Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\\\", size = 21678307, upload-time = \\\"2026-05-12T18:00:57.132Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\\\", hash = \\\"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\\\", size = 23353409, upload-time = \\\"2026-05-12T18:01:27.512Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\\\", hash = \\\"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\\\", size = 23103964, upload-time = \\\"2026-05-12T18:01:31.094Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\\\", hash = \\\"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\\\", size = 23104638, upload-time = \\\"2026-05-12T18:01:10.093Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\\\", size = 24625888, upload-time = \\\"2026-05-12T18:01:17.192Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\\\", size = 25445231, upload-time = \\\"2026-05-12T18:00:40.012Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\\\", hash = \\\"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\\\", size = 24571961, upload-time = \\\"2026-05-12T18:00:43.713Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\\\", size = 24718523, upload-time = \\\"2026-05-12T18:01:06.587Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\\\", hash = \\\"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\\\", size = 23454821, upload-time = \\\"2026-05-12T18:00:51.166Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\\\", hash = \\\"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\\\", size = 24087843, upload-time = \\\"2026-05-12T18:00:47.272Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\\\", hash = \\\"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\\\", size = 24147611, upload-time = \\\"2026-05-12T18:01:20.499Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\\\", hash = \\\"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\\\", size = 23920348, upload-time = \\\"2026-05-12T18:01:24.033Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\\\", hash = \\\"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\\\", size = 24928981, upload-time = \\\"2026-05-12T18:01:13.961Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\\\", hash = \\\"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\\\", size = 22573503, upload-time = \\\"2026-05-12T18:00:34.36Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\\\", hash = \\\"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\\\", size = 25175590, upload-time = \\\"2026-05-12T18:01:00.38Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\\\", hash = \\\"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\\\", size = 23594775, upload-time = \\\"2026-05-12T18:01:03.55Z\\\" },\\n ]\\n \\n [[package]]\\n name = \\\"virtualenv\\\"\\n-version = \\\"21.3.0\\\"\\n+version = \\\"21.3.3\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"distlib\\\" },\\n@@ -1115,9 +1115,9 @@ dependencies = [\\n { name = \\\"python-discovery\\\" },\\n { name = \\\"typing-extensions\\\", marker = \\\"python_full_version < '3.11'\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/3f/8b/6331f7a7fe70131c301106ec1e7cf23e2501bf7d4ca3636805801ca191bb/virtualenv-21.3.0.tar.gz\\\", hash = \\\"sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\\\", size = 7614069, upload-time = \\\"2026-04-27T17:05:58.927Z\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\\\", hash = \\\"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\\\", size = 7613784, upload-time = \\\"2026-05-13T18:01:30.19Z\\\" }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/4b/eb/03bfb1299d4c4510329e470f13f9a4ce793df7fcb5a2fd3510f911066f61/virtualenv-21.3.0-py3-none-any.whl\\\", hash = \\\"sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7\\\", size = 7594690, upload-time = \\\"2026-04-27T17:05:55.468Z\\\" },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\\\", hash = \\\"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\\\", size = 7594554, upload-time = \\\"2026-05-13T18:01:27.815Z\\\" },\\n ]\\n \\n [[package]]\\n@@ -1296,14 +1296,14 @@ requires-dist = [\\n { name = \\\"cffi\\\", marker = \\\"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\\\", specifier = \\\"==2.0.0\\\" },\\n { name = \\\"cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==2.0.0\\\" },\\n { name = \\\"charset-normalizer\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.4.7\\\" },\\n- { name = \\\"cryptography\\\", marker = \\\"extra == 'pin-secretstorage'\\\", specifier = \\\"==47.0.0\\\" },\\n+ { name = \\\"cryptography\\\", marker = \\\"extra == 'pin-secretstorage'\\\", specifier = \\\"==48.0.0\\\" },\\n { name = \\\"curl-cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'curl-cffi'\\\", specifier = \\\">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\\\" },\\n { name = \\\"curl-cffi\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==0.15.0\\\" },\\n { name = \\\"deno\\\", marker = \\\"extra == 'deno'\\\", specifier = \\\">=2.6.6\\\" },\\n { name = \\\"deno\\\", marker = \\\"extra == 'pin-deno'\\\", specifier = \\\"==2.7.14\\\" },\\n- { name = \\\"idna\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.13\\\" },\\n+ { name = \\\"idna\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.15\\\" },\\n { name = \\\"jeepney\\\", marker = \\\"extra == 'pin-secretstorage'\\\", specifier = \\\"==0.9.0\\\" },\\n- { name = \\\"markdown-it-py\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==4.0.0\\\" },\\n+ { name = \\\"markdown-it-py\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==4.2.0\\\" },\\n { name = \\\"mdurl\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==0.1.2\\\" },\\n { name = \\\"mutagen\\\", marker = \\\"extra == 'default'\\\" },\\n { name = \\\"mutagen\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==1.47.0\\\" },\\n@@ -1313,13 +1313,13 @@ requires-dist = [\\n { name = \\\"pycryptodomex\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==3.23.0\\\" },\\n { name = \\\"pygments\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==2.20.0\\\" },\\n { name = \\\"requests\\\", marker = \\\"extra == 'default'\\\", specifier = \\\">=2.32.2,<3\\\" },\\n- { name = \\\"requests\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2.33.1\\\" },\\n+ { name = \\\"requests\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2.34.2\\\" },\\n { name = \\\"rich\\\", marker = \\\"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\\\", specifier = \\\"==15.0.0\\\" },\\n { name = \\\"secretstorage\\\", marker = \\\"extra == 'pin-secretstorage'\\\", specifier = \\\"==3.5.0\\\" },\\n { name = \\\"secretstorage\\\", marker = \\\"extra == 'secretstorage'\\\" },\\n { name = \\\"typing-extensions\\\", marker = \\\"python_full_version < '3.11' and extra == 'pin-secretstorage'\\\", specifier = \\\"==4.15.0\\\" },\\n { name = \\\"urllib3\\\", marker = \\\"extra == 'default'\\\", specifier = \\\">=2.0.2,<3\\\" },\\n- { name = \\\"urllib3\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2.6.3\\\" },\\n+ { name = \\\"urllib3\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==2.7.0\\\" },\\n { name = \\\"websockets\\\", marker = \\\"extra == 'default'\\\", specifier = \\\">=13.0\\\" },\\n { name = \\\"websockets\\\", marker = \\\"extra == 'pin'\\\", specifier = \\\"==16.0\\\" },\\n { name = \\\"yt-dlp-ejs\\\", marker = \\\"extra == 'default'\\\", specifier = \\\"==0.8.0\\\" },\\n\",\n \"summary\": \"Edited 2 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/pyinstaller.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\",\n \"bundle/requirements/win-arm64-pyinstaller.txt\",\n \"bundle/requirements/win-x64-pyinstaller.txt\",\n \"bundle/requirements/win-x86-pyinstaller.txt\"\n ],\n \"solution_diff\": \"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\\nindex 3b3830cd7806..16068a0eb5f9 100644\\n--- a/bundle/requirements/build.txt\\n+++ b/bundle/requirements/build.txt\\n@@ -1,6 +1,6 @@\\n-build==1.4.4 \\\\\\n- --hash=sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d \\\\\\n- --hash=sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\\n+build==1.5.0 \\\\\\n+ --hash=sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f \\\\\\n+ --hash=sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\\n colorama==0.4.6 ; os_name == 'nt' \\\\\\n --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \\\\\\n --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6\\n@@ -81,9 +81,9 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n # via\\n # build\\n # hatchling\\n-trove-classifiers==2026.4.28.13 \\\\\\n- --hash=sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8 \\\\\\n- --hash=sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\\n+trove-classifiers==2026.5.7.17 \\\\\\n+ --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\\\\n+ --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\\n # via hatchling\\n zipp==3.23.1 ; python_full_version < '3.10.2' \\\\\\n --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\\\\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\\nindex 5052a8538148..6dbf9e6add19 100644\\n--- a/bundle/requirements/curl-cffi.txt\\n+++ b/bundle/requirements/curl-cffi.txt\\n@@ -274,13 +274,13 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\\\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\\n # via yt-dlp\\n-idna==3.13 \\\\\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\\\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\\n+idna==3.15 \\\\\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n # via requests\\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\\\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\\\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\\\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\\\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\\n # via rich\\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\\\\n@@ -328,17 +328,17 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\\\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\\n # via rich\\n-requests==2.33.1 \\\\\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\\\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\\n+requests==2.34.2 \\\\\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\\\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\\n # via yt-dlp\\n rich==15.0.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\\\\n --hash=sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36\\n # via curl-cffi\\n-urllib3==2.6.3 \\\\\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\\\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\\n+urllib3==2.7.0 \\\\\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\\\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\\n # via\\n # requests\\n # yt-dlp\\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\\nindex 82380205124c..796076d76734 100644\\n--- a/bundle/requirements/default.txt\\n+++ b/bundle/requirements/default.txt\\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\\\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\\\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\\n # via requests\\n-idna==3.13 \\\\\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\\\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\\n+idna==3.15 \\\\\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n # via requests\\n mutagen==1.47.0 \\\\\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\\\\n@@ -212,13 +212,13 @@ pycryptodomex==3.23.0 \\\\\\n --hash=sha256:f489c4765093fb60e2edafdf223397bc716491b2b69fe74367b70d6999257a5c \\\\\\n --hash=sha256:fdfac7cda115bca3a5abb2f9e43bc2fb66c2b65ab074913643803ca7083a79ea\\n # via yt-dlp\\n-requests==2.33.1 \\\\\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\\\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\\n+requests==2.34.2 \\\\\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\\\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\\n # via yt-dlp\\n-urllib3==2.6.3 \\\\\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\\\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\\n+urllib3==2.7.0 \\\\\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\\\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\\n # via\\n # requests\\n # yt-dlp\\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\\nindex 34f877b69b78..bdf854eb45d5 100644\\n--- a/bundle/requirements/dev.txt\\n+++ b/bundle/requirements/dev.txt\\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\\\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\\\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\\n # via pytest-rerunfailures\\n-pytest-rerunfailures==16.1 \\\\\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\\\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\\n-python-discovery==1.2.2 \\\\\\n- --hash=sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb \\\\\\n- --hash=sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\\n+pytest-rerunfailures==16.2 \\\\\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\\\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\n+python-discovery==1.3.1 \\\\\\n+ --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\\\\n+ --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\\n # via virtualenv\\n pyyaml==6.0.3 \\\\\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\\\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\\\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\\\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\\n # via pre-commit\\n-ruff==0.15.12 \\\\\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\\\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\\\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\\\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\\\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\\\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\\\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\\\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\\\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\\\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\\\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\\\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\\\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\\\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\\\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\\\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\\\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\\\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\\n+ruff==0.15.13 \\\\\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\\\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\\\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\\\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\\\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\\\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\\\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\\\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\\\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\\\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\\\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\\\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\\\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\\\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\\\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\\\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\\\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\\\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\\\\n # via\\n # exceptiongroup\\n # virtualenv\\n-virtualenv==21.3.0 \\\\\\n- --hash=sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7 \\\\\\n- --hash=sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\\n+virtualenv==21.3.3 \\\\\\n+ --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\\\\n+ --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\\n # via pre-commit\\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\\nindex 477b6d064648..d14c275f45f7 100644\\n--- a/bundle/requirements/linux.txt\\n+++ b/bundle/requirements/linux.txt\\n@@ -252,56 +252,56 @@ charset-normalizer==3.4.7 \\\\\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\\\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\\n # via requests\\n-cryptography==47.0.0 \\\\\\n- --hash=sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7 \\\\\\n- --hash=sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27 \\\\\\n- --hash=sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd \\\\\\n- --hash=sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7 \\\\\\n- --hash=sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001 \\\\\\n- --hash=sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4 \\\\\\n- --hash=sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca \\\\\\n- --hash=sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0 \\\\\\n- --hash=sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe \\\\\\n- --hash=sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93 \\\\\\n- --hash=sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475 \\\\\\n- --hash=sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe \\\\\\n- --hash=sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515 \\\\\\n- --hash=sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10 \\\\\\n- --hash=sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7 \\\\\\n- --hash=sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92 \\\\\\n- --hash=sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829 \\\\\\n- --hash=sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8 \\\\\\n- --hash=sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52 \\\\\\n- --hash=sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b \\\\\\n- --hash=sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc \\\\\\n- --hash=sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c \\\\\\n- --hash=sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63 \\\\\\n- --hash=sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac \\\\\\n- --hash=sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31 \\\\\\n- --hash=sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7 \\\\\\n- --hash=sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1 \\\\\\n- --hash=sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203 \\\\\\n- --hash=sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7 \\\\\\n- --hash=sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769 \\\\\\n- --hash=sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923 \\\\\\n- --hash=sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74 \\\\\\n- --hash=sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b \\\\\\n- --hash=sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb \\\\\\n- --hash=sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab \\\\\\n- --hash=sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76 \\\\\\n- --hash=sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f \\\\\\n- --hash=sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7 \\\\\\n- --hash=sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973 \\\\\\n- --hash=sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0 \\\\\\n- --hash=sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8 \\\\\\n- --hash=sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310 \\\\\\n- --hash=sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b \\\\\\n- --hash=sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318 \\\\\\n- --hash=sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab \\\\\\n- --hash=sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8 \\\\\\n- --hash=sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa \\\\\\n- --hash=sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50 \\\\\\n- --hash=sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\\n+cryptography==48.0.0 \\\\\\n+ --hash=sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13 \\\\\\n+ --hash=sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6 \\\\\\n+ --hash=sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8 \\\\\\n+ --hash=sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25 \\\\\\n+ --hash=sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c \\\\\\n+ --hash=sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832 \\\\\\n+ --hash=sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12 \\\\\\n+ --hash=sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c \\\\\\n+ --hash=sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7 \\\\\\n+ --hash=sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c \\\\\\n+ --hash=sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec \\\\\\n+ --hash=sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5 \\\\\\n+ --hash=sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355 \\\\\\n+ --hash=sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c \\\\\\n+ --hash=sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741 \\\\\\n+ --hash=sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86 \\\\\\n+ --hash=sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321 \\\\\\n+ --hash=sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a \\\\\\n+ --hash=sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7 \\\\\\n+ --hash=sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920 \\\\\\n+ --hash=sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e \\\\\\n+ --hash=sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff \\\\\\n+ --hash=sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd \\\\\\n+ --hash=sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3 \\\\\\n+ --hash=sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f \\\\\\n+ --hash=sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602 \\\\\\n+ --hash=sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855 \\\\\\n+ --hash=sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18 \\\\\\n+ --hash=sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a \\\\\\n+ --hash=sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336 \\\\\\n+ --hash=sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239 \\\\\\n+ --hash=sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74 \\\\\\n+ --hash=sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a \\\\\\n+ --hash=sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c \\\\\\n+ --hash=sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4 \\\\\\n+ --hash=sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c \\\\\\n+ --hash=sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f \\\\\\n+ --hash=sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4 \\\\\\n+ --hash=sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db \\\\\\n+ --hash=sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166 \\\\\\n+ --hash=sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5 \\\\\\n+ --hash=sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f \\\\\\n+ --hash=sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae \\\\\\n+ --hash=sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20 \\\\\\n+ --hash=sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a \\\\\\n+ --hash=sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057 \\\\\\n+ --hash=sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb \\\\\\n+ --hash=sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c \\\\\\n+ --hash=sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\\n # via secretstorage\\n curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:08c799b89740b9bc49c09fbc3d5907f13ac1f845ca52620507ef9466d4639dd5 \\\\\\n@@ -326,17 +326,17 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\\\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\\n # via yt-dlp\\n-idna==3.13 \\\\\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\\\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\\n+idna==3.15 \\\\\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n # via requests\\n jeepney==0.9.0 \\\\\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\\\\n --hash=sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732\\n # via secretstorage\\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\\\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\\\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\\\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\\\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\\n # via rich\\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\\\\n@@ -384,9 +384,9 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\\\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\\n # via rich\\n-requests==2.33.1 \\\\\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\\\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\\n+requests==2.34.2 \\\\\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\\\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\\n # via yt-dlp\\n rich==15.0.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\\\\n@@ -400,9 +400,9 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\\\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\\\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\\n # via cryptography\\n-urllib3==2.6.3 \\\\\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\\\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\\n+urllib3==2.7.0 \\\\\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\\\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\\n # via\\n # requests\\n # yt-dlp\\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\\nindex e2573f07e3b4..02e86d9dbac7 100644\\n--- a/bundle/requirements/macos.txt\\n+++ b/bundle/requirements/macos.txt\\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\\\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\\\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\\\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\\n-idna==3.13 \\\\\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\\\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\\n+idna==3.15 \\\\\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\\\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\\n # via requests\\n macholib==1.16.4 ; sys_platform == 'darwin' \\\\\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\\\\n@@ -194,9 +194,9 @@ macholib==1.16.4 ; sys_platform == 'darwin' \\\\\\n # via\\n # delocate\\n # pyinstaller\\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\\\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\\\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\\\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\\\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\\n # via rich\\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\\\\n@@ -268,17 +268,17 @@ pyinstaller==6.20.0 \\\\\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\\\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\\\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\\n-pyinstaller-hooks-contrib==2026.4 \\\\\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\\\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\n+pyinstaller-hooks-contrib==2026.5 \\\\\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\\\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\n # via pyinstaller\\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\\\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\\\\n --hash=sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755\\n # via pyinstaller\\n-requests==2.33.1 \\\\\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\\\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\\n+requests==2.34.2 \\\\\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\\\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\\n # via yt-dlp\\n rich==15.0.0 ; implementation_name == 'cpython' \\\\\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\\\\n@@ -294,9 +294,9 @@ typing-extensions==4.15.0 ; sys_platform == 'darwin' \\\\\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\\\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\\n # via delocate\\n-urllib3==2.6.3 \\\\\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\\\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\\n+urllib3==2.7.0 \\\\\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\\\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\\n # via\\n # requests\\n # yt-dlp\\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\\nindex 0b67614956ce..c72bbe824e70 100644\\n--- a/bundle/requirements/pip.txt\\n+++ b/bundle/requirements/pip.txt\\n@@ -1,3 +1,3 @@\\n-pip==26.1 \\\\\\n- --hash=sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1 \\\\\\n- --hash=sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\\n+pip==26.1.1 \\\\\\n+ --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\\\\n+ --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\\ndiff --git a/bundle/requirements/pyinstaller.txt b/bundle/requirements/pyinstaller.txt\\nindex 1d7967cb3e1a..474b44b44eb4 100644\\n--- a/bundle/requirements/pyinstaller.txt\\n+++ b/bundle/requirements/pyinstaller.txt\\n@@ -31,9 +31,9 @@ pyinstaller==6.20.0 \\\\\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\\\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\\\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\\n-pyinstaller-hooks-contrib==2026.4 \\\\\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\\\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\n+pyinstaller-hooks-contrib==2026.5 \\\\\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\\\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\n # via pyinstaller\\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\\\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\\\\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\\nindex 7efd236c0d3a..dc2c0b2c5cda 100644\\n--- a/bundle/requirements/static-analysis.txt\\n+++ b/bundle/requirements/static-analysis.txt\\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\\\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\\\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\\n # via autopep8\\n-ruff==0.15.12 \\\\\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\\\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\\\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\\\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\\\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\\\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\\\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\\\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\\\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\\\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\\\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\\\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\\\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\\\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\\\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\\\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\\\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\\\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\\n+ruff==0.15.13 \\\\\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\\\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\\\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\\\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\\\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\\\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\\\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\\\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\\\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\\\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\\\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\\\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\\\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\\\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\\\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\\\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\\\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\\\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\\nindex d31d3d09ec47..81a57e278ce9 100644\\n--- a/bundle/requirements/test.txt\\n+++ b/bundle/requirements/test.txt\\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\\\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\\\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\\n # via pytest-rerunfailures\\n-pytest-rerunfailures==16.1 \\\\\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\\\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\\n+pytest-rerunfailures==16.2 \\\\\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\\\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\\n tomli==2.4.1 ; python_full_version < '3.11' \\\\\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\\\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\\\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\\nindex a9a84ad7c6ed..9c7278f4a9e7 100644\\n--- a/bundle/requirements/uv.txt\\n+++ b/bundle/requirements/uv.txt\\n@@ -1,20 +1,20 @@\\n-uv==0.11.8 \\\\\\n- --hash=sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65 \\\\\\n- --hash=sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726 \\\\\\n- --hash=sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4 \\\\\\n- --hash=sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8 \\\\\\n- --hash=sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b \\\\\\n- --hash=sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807 \\\\\\n- --hash=sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa \\\\\\n- --hash=sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989 \\\\\\n- --hash=sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c \\\\\\n- --hash=sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe \\\\\\n- --hash=sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80 \\\\\\n- --hash=sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310 \\\\\\n- --hash=sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1 \\\\\\n- --hash=sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335 \\\\\\n- --hash=sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d \\\\\\n- --hash=sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037 \\\\\\n- --hash=sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d \\\\\\n- --hash=sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd \\\\\\n- --hash=sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\\n+uv==0.11.14 \\\\\\n+ --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\\\\n+ --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\\\\n+ --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\\\\n+ --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\\\\n+ --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\\\\n+ --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\\\\n+ --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\\\\n+ --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\\\\n+ --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\\\\n+ --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\\\\n+ --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\\\\n+ --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\\\\n+ --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\\\\n+ --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\\\\n+ --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\\\\n+ --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\\\\n+ --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\\\\n+ --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\\\\n+ --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\\ndiff --git a/bundle/requirements/win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\\nindex 01e6b8a683b6..99e3bb40b151 100644\\n--- a/bundle/requirements/win-arm64-pyinstaller.txt\\n+++ b/bundle/requirements/win-arm64-pyinstaller.txt\\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\\\\n # via pyinstaller\\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_arm64.whl \\\\\\n --hash=sha256:91c40536352aaeace0a4fa7b0094d98ad6c82983eaed5a4786a1a0005904fe4c\\n-pyinstaller-hooks-contrib==2026.4 \\\\\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\\\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\n+pyinstaller-hooks-contrib==2026.5 \\\\\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\\\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\n # via pyinstaller\\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\\\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\\\\ndiff --git a/bundle/requirements/win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\\nindex a4d004eadd0c..5f1a06b3f9fc 100644\\n--- a/bundle/requirements/win-x64-pyinstaller.txt\\n+++ b/bundle/requirements/win-x64-pyinstaller.txt\\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\\\\n # via pyinstaller\\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_amd64.whl \\\\\\n --hash=sha256:a05582e749265f9ea1428dad0552bd4577ab8c5acd19ae0f1b1593d476d65748\\n-pyinstaller-hooks-contrib==2026.4 \\\\\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\\\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\n+pyinstaller-hooks-contrib==2026.5 \\\\\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\\\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\n # via pyinstaller\\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\\\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\\\\ndiff --git a/bundle/requirements/win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\\nindex bc4603cb9712..5b169505f67f 100644\\n--- a/bundle/requirements/win-x86-pyinstaller.txt\\n+++ b/bundle/requirements/win-x86-pyinstaller.txt\\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\\\\n # via pyinstaller\\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win32.whl \\\\\\n --hash=sha256:6704e50e993c6a2faad3e369ed517bf710b4ae6b6a4def85bb50e4169265d9a4\\n-pyinstaller-hooks-contrib==2026.4 \\\\\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\\\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\\n+pyinstaller-hooks-contrib==2026.5 \\\\\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\\\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\\n # via pyinstaller\\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\\\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\\\\n\",\n \"summary\": \"Edited 14 file(s) in bundle/requirements/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt\nindex 3b3830cd7806..16068a0eb5f9 100644\n--- a/bundle/requirements/build.txt\n+++ b/bundle/requirements/build.txt\n@@ -1,6 +1,6 @@\n-build==1.4.4 \\\n- --hash=sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d \\\n- --hash=sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\n+build==1.5.0 \\\n+ --hash=sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f \\\n+ --hash=sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\n colorama==0.4.6 ; os_name == 'nt' \\\n --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \\\n --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6\n@@ -81,9 +81,9 @@ tomli==2.4.1 ; python_full_version < '3.11' \\\n # via\n # build\n # hatchling\n-trove-classifiers==2026.4.28.13 \\\n- --hash=sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8 \\\n- --hash=sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\n+trove-classifiers==2026.5.7.17 \\\n+ --hash=sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33 \\\n+ --hash=sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\n # via hatchling\n zipp==3.23.1 ; python_full_version < '3.10.2' \\\n --hash=sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc \\\ndiff --git a/bundle/requirements/curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nindex 5052a8538148..6dbf9e6add19 100644\n--- a/bundle/requirements/curl-cffi.txt\n+++ b/bundle/requirements/curl-cffi.txt\n@@ -274,13 +274,13 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -328,17 +328,17 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\n # via rich\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n --hash=sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36\n # via curl-cffi\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/default.txt b/bundle/requirements/default.txt\nindex 82380205124c..796076d76734 100644\n--- a/bundle/requirements/default.txt\n+++ b/bundle/requirements/default.txt\n@@ -174,9 +174,9 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n mutagen==1.47.0 \\\n --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \\\n@@ -212,13 +212,13 @@ pycryptodomex==3.23.0 \\\n --hash=sha256:f489c4765093fb60e2edafdf223397bc716491b2b69fe74367b70d6999257a5c \\\n --hash=sha256:fdfac7cda115bca3a5abb2f9e43bc2fb66c2b65ab074913643803ca7083a79ea\n # via yt-dlp\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/dev.txt b/bundle/requirements/dev.txt\nindex 34f877b69b78..bdf854eb45d5 100644\n--- a/bundle/requirements/dev.txt\n+++ b/bundle/requirements/dev.txt\n@@ -66,12 +66,12 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.1 \\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\n-python-discovery==1.2.2 \\\n- --hash=sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb \\\n- --hash=sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\n+pytest-rerunfailures==16.2 \\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n+python-discovery==1.3.1 \\\n+ --hash=sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6 \\\n+ --hash=sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\n # via virtualenv\n pyyaml==6.0.3 \\\n --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \\\n@@ -132,25 +132,25 @@ pyyaml==6.0.3 \\\n --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \\\n --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0\n # via pre-commit\n-ruff==0.15.12 \\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\n+ruff==0.15.13 \\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\n@@ -208,7 +208,7 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n # via\n # exceptiongroup\n # virtualenv\n-virtualenv==21.3.0 \\\n- --hash=sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7 \\\n- --hash=sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\n+virtualenv==21.3.3 \\\n+ --hash=sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3 \\\n+ --hash=sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\n # via pre-commit\ndiff --git a/bundle/requirements/linux.txt b/bundle/requirements/linux.txt\nindex 477b6d064648..d14c275f45f7 100644\n--- a/bundle/requirements/linux.txt\n+++ b/bundle/requirements/linux.txt\n@@ -252,56 +252,56 @@ charset-normalizer==3.4.7 \\\n --hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \\\n --hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464\n # via requests\n-cryptography==47.0.0 \\\n- --hash=sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7 \\\n- --hash=sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27 \\\n- --hash=sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd \\\n- --hash=sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7 \\\n- --hash=sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001 \\\n- --hash=sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4 \\\n- --hash=sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca \\\n- --hash=sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0 \\\n- --hash=sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe \\\n- --hash=sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93 \\\n- --hash=sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475 \\\n- --hash=sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe \\\n- --hash=sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515 \\\n- --hash=sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10 \\\n- --hash=sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7 \\\n- --hash=sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92 \\\n- --hash=sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829 \\\n- --hash=sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8 \\\n- --hash=sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52 \\\n- --hash=sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b \\\n- --hash=sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc \\\n- --hash=sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c \\\n- --hash=sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63 \\\n- --hash=sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac \\\n- --hash=sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31 \\\n- --hash=sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7 \\\n- --hash=sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1 \\\n- --hash=sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203 \\\n- --hash=sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7 \\\n- --hash=sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769 \\\n- --hash=sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923 \\\n- --hash=sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74 \\\n- --hash=sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b \\\n- --hash=sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb \\\n- --hash=sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab \\\n- --hash=sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76 \\\n- --hash=sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f \\\n- --hash=sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7 \\\n- --hash=sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973 \\\n- --hash=sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0 \\\n- --hash=sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8 \\\n- --hash=sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310 \\\n- --hash=sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b \\\n- --hash=sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318 \\\n- --hash=sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab \\\n- --hash=sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8 \\\n- --hash=sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa \\\n- --hash=sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50 \\\n- --hash=sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\n+cryptography==48.0.0 \\\n+ --hash=sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13 \\\n+ --hash=sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6 \\\n+ --hash=sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8 \\\n+ --hash=sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25 \\\n+ --hash=sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c \\\n+ --hash=sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832 \\\n+ --hash=sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12 \\\n+ --hash=sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c \\\n+ --hash=sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7 \\\n+ --hash=sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c \\\n+ --hash=sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec \\\n+ --hash=sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5 \\\n+ --hash=sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355 \\\n+ --hash=sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c \\\n+ --hash=sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741 \\\n+ --hash=sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86 \\\n+ --hash=sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321 \\\n+ --hash=sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a \\\n+ --hash=sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7 \\\n+ --hash=sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920 \\\n+ --hash=sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e \\\n+ --hash=sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff \\\n+ --hash=sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd \\\n+ --hash=sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3 \\\n+ --hash=sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f \\\n+ --hash=sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602 \\\n+ --hash=sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855 \\\n+ --hash=sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18 \\\n+ --hash=sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a \\\n+ --hash=sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336 \\\n+ --hash=sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239 \\\n+ --hash=sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74 \\\n+ --hash=sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a \\\n+ --hash=sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c \\\n+ --hash=sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4 \\\n+ --hash=sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c \\\n+ --hash=sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f \\\n+ --hash=sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4 \\\n+ --hash=sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db \\\n+ --hash=sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166 \\\n+ --hash=sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5 \\\n+ --hash=sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f \\\n+ --hash=sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae \\\n+ --hash=sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20 \\\n+ --hash=sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a \\\n+ --hash=sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057 \\\n+ --hash=sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb \\\n+ --hash=sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c \\\n+ --hash=sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\n # via secretstorage\n curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:08c799b89740b9bc49c09fbc3d5907f13ac1f845ca52620507ef9466d4639dd5 \\\n@@ -326,17 +326,17 @@ curl-cffi==0.15.0 ; implementation_name == 'cpython' \\\n --hash=sha256:bda66404010e9ed743b1b83c20c86f24fe21a9a6873e17479d6e67e29d8ded28 \\\n --hash=sha256:ea0c67652bf6893d34ee0f82c944f37e488f6147e9421bef1771cc6545b02ded\n # via yt-dlp\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n jeepney==0.9.0 \\\n --hash=sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683 \\\n --hash=sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732\n # via secretstorage\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -384,9 +384,9 @@ pygments==2.20.0 ; implementation_name == 'cpython' \\\n --hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \\\n --hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176\n # via rich\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n@@ -400,9 +400,9 @@ typing-extensions==4.15.0 ; python_full_version < '3.11' \\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\n # via cryptography\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/macos.txt b/bundle/requirements/macos.txt\nindex e2573f07e3b4..02e86d9dbac7 100644\n--- a/bundle/requirements/macos.txt\n+++ b/bundle/requirements/macos.txt\n@@ -184,9 +184,9 @@ charset-normalizer==3.4.7 \\\n delocate==0.13.0 ; sys_platform == 'darwin' \\\n --hash=sha256:11f7596f88984c33f76b27fe2eea7637d1ce369a9e0b6737bbc706b6426e862c \\\n --hash=sha256:a93e67a9f56ee01a3f7096a042231d4ac37fecac873cd5ea34ea2b4f43a8fa13\n-idna==3.13 \\\n- --hash=sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242 \\\n- --hash=sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\n+idna==3.15 \\\n+ --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \\\n+ --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\n # via requests\n macholib==1.16.4 ; sys_platform == 'darwin' \\\n --hash=sha256:da1a3fa8266e30f0ce7e97c6a54eefaae8edd1e5f86f3eb8b95457cae90265ea \\\n@@ -194,9 +194,9 @@ macholib==1.16.4 ; sys_platform == 'darwin' \\\n # via\n # delocate\n # pyinstaller\n-markdown-it-py==4.0.0 ; implementation_name == 'cpython' \\\n- --hash=sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147 \\\n- --hash=sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\n+markdown-it-py==4.2.0 ; implementation_name == 'cpython' \\\n+ --hash=sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49 \\\n+ --hash=sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\n # via rich\n mdurl==0.1.2 ; implementation_name == 'cpython' \\\n --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \\\n@@ -268,17 +268,17 @@ pyinstaller==6.20.0 \\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\n --hash=sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755\n # via pyinstaller\n-requests==2.33.1 \\\n- --hash=sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517 \\\n- --hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\n+requests==2.34.2 \\\n+ --hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \\\n+ --hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\n # via yt-dlp\n rich==15.0.0 ; implementation_name == 'cpython' \\\n --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \\\n@@ -294,9 +294,9 @@ typing-extensions==4.15.0 ; sys_platform == 'darwin' \\\n --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \\\n --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548\n # via delocate\n-urllib3==2.6.3 \\\n- --hash=sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed \\\n- --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\n+urllib3==2.7.0 \\\n+ --hash=sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c \\\n+ --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\n # via\n # requests\n # yt-dlp\ndiff --git a/bundle/requirements/pip.txt b/bundle/requirements/pip.txt\nindex 0b67614956ce..c72bbe824e70 100644\n--- a/bundle/requirements/pip.txt\n+++ b/bundle/requirements/pip.txt\n@@ -1,3 +1,3 @@\n-pip==26.1 \\\n- --hash=sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1 \\\n- --hash=sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\n+pip==26.1.1 \\\n+ --hash=sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb \\\n+ --hash=sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\ndiff --git a/bundle/requirements/pyinstaller.txt b/bundle/requirements/pyinstaller.txt\nindex 1d7967cb3e1a..474b44b44eb4 100644\n--- a/bundle/requirements/pyinstaller.txt\n+++ b/bundle/requirements/pyinstaller.txt\n@@ -31,9 +31,9 @@ pyinstaller==6.20.0 \\\n --hash=sha256:bd53282c0a73e5c95573e1ddc8e5d564d4932bec91efbaed4dc5fdff9c2ae7f2 \\\n --hash=sha256:bf3be4e1284ee78ddccba5e29f99443a12a7b4673168288ffc4c9d38c6f7b90e \\\n --hash=sha256:d588844e890ee80c4365867f98146636e1849bbca8e4284bbf0c809aff0f161a\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/static-analysis.txt b/bundle/requirements/static-analysis.txt\nindex 7efd236c0d3a..dc2c0b2c5cda 100644\n--- a/bundle/requirements/static-analysis.txt\n+++ b/bundle/requirements/static-analysis.txt\n@@ -5,25 +5,25 @@ pycodestyle==2.14.0 \\\n --hash=sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783 \\\n --hash=sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d\n # via autopep8\n-ruff==0.15.12 \\\n- --hash=sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b \\\n- --hash=sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33 \\\n- --hash=sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0 \\\n- --hash=sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002 \\\n- --hash=sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339 \\\n- --hash=sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e \\\n- --hash=sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847 \\\n- --hash=sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f \\\n- --hash=sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6 \\\n- --hash=sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d \\\n- --hash=sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20 \\\n- --hash=sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd \\\n- --hash=sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c \\\n- --hash=sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5 \\\n- --hash=sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6 \\\n- --hash=sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c \\\n- --hash=sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5 \\\n- --hash=sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\n+ruff==0.15.13 \\\n+ --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \\\n+ --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \\\n+ --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \\\n+ --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \\\n+ --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \\\n+ --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \\\n+ --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \\\n+ --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \\\n+ --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \\\n+ --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \\\n+ --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \\\n+ --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \\\n+ --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \\\n+ --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \\\n+ --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \\\n+ --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \\\n+ --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \\\n+ --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/test.txt b/bundle/requirements/test.txt\nindex d31d3d09ec47..81a57e278ce9 100644\n--- a/bundle/requirements/test.txt\n+++ b/bundle/requirements/test.txt\n@@ -28,9 +28,9 @@ pytest==9.0.3 \\\n --hash=sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9 \\\n --hash=sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c\n # via pytest-rerunfailures\n-pytest-rerunfailures==16.1 \\\n- --hash=sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86 \\\n- --hash=sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\n+pytest-rerunfailures==16.2 \\\n+ --hash=sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23 \\\n+ --hash=sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\n tomli==2.4.1 ; python_full_version < '3.11' \\\n --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \\\n --hash=sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe \\\ndiff --git a/bundle/requirements/uv.txt b/bundle/requirements/uv.txt\nindex a9a84ad7c6ed..9c7278f4a9e7 100644\n--- a/bundle/requirements/uv.txt\n+++ b/bundle/requirements/uv.txt\n@@ -1,20 +1,20 @@\n-uv==0.11.8 \\\n- --hash=sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65 \\\n- --hash=sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726 \\\n- --hash=sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4 \\\n- --hash=sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8 \\\n- --hash=sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b \\\n- --hash=sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807 \\\n- --hash=sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa \\\n- --hash=sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989 \\\n- --hash=sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c \\\n- --hash=sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe \\\n- --hash=sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80 \\\n- --hash=sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310 \\\n- --hash=sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1 \\\n- --hash=sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335 \\\n- --hash=sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d \\\n- --hash=sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037 \\\n- --hash=sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d \\\n- --hash=sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd \\\n- --hash=sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\n+uv==0.11.14 \\\n+ --hash=sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd \\\n+ --hash=sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb \\\n+ --hash=sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1 \\\n+ --hash=sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71 \\\n+ --hash=sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718 \\\n+ --hash=sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7 \\\n+ --hash=sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4 \\\n+ --hash=sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f \\\n+ --hash=sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b \\\n+ --hash=sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d \\\n+ --hash=sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e \\\n+ --hash=sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1 \\\n+ --hash=sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706 \\\n+ --hash=sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e \\\n+ --hash=sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d \\\n+ --hash=sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c \\\n+ --hash=sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d \\\n+ --hash=sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95 \\\n+ --hash=sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\ndiff --git a/bundle/requirements/win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\nindex 01e6b8a683b6..99e3bb40b151 100644\n--- a/bundle/requirements/win-arm64-pyinstaller.txt\n+++ b/bundle/requirements/win-arm64-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_arm64.whl \\\n --hash=sha256:91c40536352aaeace0a4fa7b0094d98ad6c82983eaed5a4786a1a0005904fe4c\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\nindex a4d004eadd0c..5f1a06b3f9fc 100644\n--- a/bundle/requirements/win-x64-pyinstaller.txt\n+++ b/bundle/requirements/win-x64-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win_amd64.whl \\\n --hash=sha256:a05582e749265f9ea1428dad0552bd4577ab8c5acd19ae0f1b1593d476d65748\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/bundle/requirements/win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\nindex bc4603cb9712..5b169505f67f 100644\n--- a/bundle/requirements/win-x86-pyinstaller.txt\n+++ b/bundle/requirements/win-x86-pyinstaller.txt\n@@ -20,9 +20,9 @@ pefile==2024.8.26 ; sys_platform == 'win32' \\\n # via pyinstaller\n pyinstaller @ https://github.com/yt-dlp/Pyinstaller-Builds/releases/download/2026.05.02.225304/pyinstaller-6.20.0-py3-none-win32.whl \\\n --hash=sha256:6704e50e993c6a2faad3e369ed517bf710b4ae6b6a4def85bb50e4169265d9a4\n-pyinstaller-hooks-contrib==2026.4 \\\n- --hash=sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f \\\n- --hash=sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\n+pyinstaller-hooks-contrib==2026.5 \\\n+ --hash=sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9 \\\n+ --hash=sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\n # via pyinstaller\n pywin32-ctypes==0.2.3 ; sys_platform == 'win32' \\\n --hash=sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 \\\ndiff --git a/pyproject.toml b/pyproject.toml\nindex dcc67352b813..b2f8a007335b 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,11 +71,11 @@ pin = [\n \"brotlicffi==1.2.0.1 ; implementation_name != 'cpython'\",\n \"certifi==2026.4.22\",\n \"charset-normalizer==3.4.7\",\n- \"idna==3.13\",\n+ \"idna==3.15\",\n \"mutagen==1.47.0\",\n \"pycryptodomex==3.23.0\",\n- \"requests==2.33.1\",\n- \"urllib3==2.6.3\",\n+ \"requests==2.34.2\",\n+ \"urllib3==2.7.0\",\n \"websockets==16.0\",\n \"yt-dlp-ejs==0.8.0\",\n ]\n@@ -83,7 +83,7 @@ pin-curl-cffi = [\n \"certifi==2026.4.22 ; implementation_name == 'cpython'\",\n \"cffi==2.0.0 ; implementation_name == 'cpython'\",\n \"curl-cffi==0.15.0 ; implementation_name == 'cpython'\",\n- \"markdown-it-py==4.0.0 ; implementation_name == 'cpython'\",\n+ \"markdown-it-py==4.2.0 ; implementation_name == 'cpython'\",\n \"mdurl==0.1.2 ; implementation_name == 'cpython'\",\n \"pycparser==3.0 ; implementation_name == 'cpython'\",\n \"pygments==2.20.0 ; implementation_name == 'cpython'\",\n@@ -91,7 +91,7 @@ pin-curl-cffi = [\n ]\n pin-secretstorage = [\n \"cffi==2.0.0 ; platform_python_implementation != 'PyPy'\",\n- \"cryptography==47.0.0\",\n+ \"cryptography==48.0.0\",\n \"jeepney==0.9.0\",\n \"pycparser==3.0 ; implementation_name != 'PyPy' and platform_python_implementation != 'PyPy'\",\n \"secretstorage==3.5.0\",\ndiff --git a/uv.lock b/uv.lock\nindex c29da496096e..a1f2b7f8b08d 100644\n--- a/uv.lock\n+++ b/uv.lock\n@@ -7,7 +7,7 @@ resolution-markers = [\n ]\n \n [options]\n-exclude-newer = \"2026-04-28T22:03:20.491912684Z\"\n+exclude-newer = \"0001-01-01T00:00:00Z\" # This has no effect and is included for backwards compatibility when using relative exclude-newer values.\n exclude-newer-span = \"P7D\"\n \n [options.exclude-newer-package]\n@@ -121,7 +121,7 @@ wheels = [\n \n [[package]]\n name = \"build\"\n-version = \"1.4.4\"\n+version = \"1.5.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"colorama\", marker = \"os_name == 'nt'\" },\n@@ -130,9 +130,9 @@ dependencies = [\n { name = \"pyproject-hooks\" },\n { name = \"tomli\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/02/ec/bf5ae0a7e5ab57abe8aabdd0759c971883895d1a20c49ae99f8146840c3c/build-1.4.4.tar.gz\", hash = \"sha256:f832ae053061f3fb524af812dc94b8b84bac6880cd587630e3b5d91a6a9c1703\", size = 89220, upload-time = \"2026-04-22T20:53:44.807Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/78/e0/df5e171f685f82f37b12e1f208064e24244911079d7b767447d1af7e0d70/build-1.5.0.tar.gz\", hash = \"sha256:302c22c3ba2a0fd5f3911918651341ebb3896176cbdec15bd421f80b1afc7647\", size = 89796, upload-time = \"2026-04-30T03:18:25.17Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/fa/88/6764e7a109dd84294850741501145da90d13cdeac9d4e614929464a37420/build-1.4.4-py3-none-any.whl\", hash = \"sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d\", size = 25921, upload-time = \"2026-04-22T20:53:43.251Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0d/fe/6bea5c9162869c5beba5d9c8abbed835ec85bf1ec1fba05a3822325c45f3/build-1.5.0-py3-none-any.whl\", hash = \"sha256:13f3eecb844759ab66efec90ca17639bbf14dc06cb2fdf37a9010322d9c50a6f\", size = 26018, upload-time = \"2026-04-30T03:18:23.644Z\" },\n ]\n \n [[package]]\n@@ -351,62 +351,62 @@ wheels = [\n \n [[package]]\n name = \"cryptography\"\n-version = \"47.0.0\"\n+version = \"48.0.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy'\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/ef/b2/7ffa7fe8207a8c42147ffe70c3e360b228160c1d85dc3faff16aaa3244c0/cryptography-47.0.0.tar.gz\", hash = \"sha256:9f8e55fe4e63613a5e1cc5819030f27b97742d720203a087802ce4ce9ceb52bb\", size = 830863, upload-time = \"2026-04-24T19:54:57.056Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz\", hash = \"sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920\", size = 832984, upload-time = \"2026-05-04T22:59:38.133Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/a4/98/40dfe932134bdcae4f6ab5927c87488754bf9eb79297d7e0070b78dd58e9/cryptography-47.0.0-cp311-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:160ad728f128972d362e714054f6ba0067cab7fb350c5202a9ae8ae4ce3ef1a0\", size = 7912214, upload-time = \"2026-04-24T19:53:03.864Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/c6/2733531243fba725f58611b918056b277692f1033373dcc8bd01af1c05d4/cryptography-47.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:b9a8943e359b7615db1a3ba587994618e094ff3d6fa5a390c73d079ce18b3973\", size = 4644617, upload-time = \"2026-04-24T19:53:06.909Z\" },\n- { url = \"https://files.pythonhosted.org/packages/00/e3/b27be1a670a9b87f855d211cf0e1174a5d721216b7616bd52d8581d912ed/cryptography-47.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:f5c15764f261394b22aef6b00252f5195f46f2ca300bec57149474e2538b31f8\", size = 4668186, upload-time = \"2026-04-24T19:53:09.053Z\" },\n- { url = \"https://files.pythonhosted.org/packages/81/b9/8443cfe5d17d482d348cee7048acf502bb89a51b6382f06240fd290d4ca3/cryptography-47.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:9c59ab0e0fa3a180a5a9c59f3a5abe3ef90d474bc56d7fadfbe80359491b615b\", size = 4651244, upload-time = \"2026-04-24T19:53:11.217Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5d/5e/13ed0cdd0eb88ba159d6dd5ebfece8cb901dbcf1ae5ac4072e28b55d3153/cryptography-47.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:34b4358b925a5ea3e14384ca781a2c0ef7ac219b57bb9eacc4457078e2b19f92\", size = 5252906, upload-time = \"2026-04-24T19:53:13.532Z\" },\n- { url = \"https://files.pythonhosted.org/packages/64/16/ed058e1df0f33d440217cd120d41d5dda9dd215a80b8187f68483185af82/cryptography-47.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:0024b87d47ae2399165a6bfb20d24888881eeab83ae2566d62467c5ff0030ce7\", size = 4701842, upload-time = \"2026-04-24T19:53:15.618Z\" },\n- { url = \"https://files.pythonhosted.org/packages/02/e0/3d30986b30fdbd9e969abbdf8ba00ed0618615144341faeb57f395a084fe/cryptography-47.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:1e47422b5557bb82d3fff997e8d92cff4e28b9789576984f08c248d2b3535d93\", size = 4289313, upload-time = \"2026-04-24T19:53:17.755Z\" },\n- { url = \"https://files.pythonhosted.org/packages/df/fd/32db38e3ad0cb331f0691cb4c7a8a6f176f679124dee746b3af6633db4d9/cryptography-47.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:6f29f36582e6151d9686235e586dd35bb67491f024767d10b842e520dc6a07ac\", size = 4650964, upload-time = \"2026-04-24T19:53:20.062Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/53/5395d944dfd48cb1f67917f533c609c34347185ef15eb4308024c876f274/cryptography-47.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:a9b761f012a943b7de0e828843c5688d0de94a0578d44d6c85a1bae32f87791f\", size = 5207817, upload-time = \"2026-04-24T19:53:22.498Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/4f/e5711b28e1901f7d480a2b1b688b645aa4c77c73f10731ed17e7f7db3f0d/cryptography-47.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:4e1de79e047e25d6e9f8cea71c86b4a53aced64134f0f003bbcbf3655fd172c8\", size = 4701544, upload-time = \"2026-04-24T19:53:24.356Z\" },\n- { url = \"https://files.pythonhosted.org/packages/22/22/c8ddc25de3010fc8da447648f5a092c40e7a8fadf01dd6d255d9c0b9373d/cryptography-47.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:ef6b3634087f18d2155b1e8ce264e5345a753da2c5fa9815e7d41315c90f8318\", size = 4783536, upload-time = \"2026-04-24T19:53:26.665Z\" },\n- { url = \"https://files.pythonhosted.org/packages/66/b6/d4a68f4ea999c6d89e8498579cba1c5fcba4276284de7773b17e4fa69293/cryptography-47.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:11dbb9f50a0f1bb9757b3d8c27c1101780efb8f0bdecfb12439c22a74d64c001\", size = 4926106, upload-time = \"2026-04-24T19:53:28.686Z\" },\n- { url = \"https://files.pythonhosted.org/packages/54/ed/5f524db1fade9c013aa618e1c99c6ed05e8ffc9ceee6cda22fed22dda3f4/cryptography-47.0.0-cp311-abi3-win32.whl\", hash = \"sha256:7fda2f02c9015db3f42bb8a22324a454516ed10a8c29ca6ece6cdbb5efe2a203\", size = 3258581, upload-time = \"2026-04-24T19:53:31.058Z\" },\n- { url = \"https://files.pythonhosted.org/packages/b2/dc/1b901990b174786569029f67542b3edf72ac068b6c3c8683c17e6a2f5363/cryptography-47.0.0-cp311-abi3-win_amd64.whl\", hash = \"sha256:f5c3296dab66202f1b18a91fa266be93d6aa0c2806ea3d67762c69f60adc71aa\", size = 3775309, upload-time = \"2026-04-24T19:53:33.054Z\" },\n- { url = \"https://files.pythonhosted.org/packages/14/88/7aa18ad9c11bc87689affa5ce4368d884b517502d75739d475fc6f4a03c7/cryptography-47.0.0-cp314-cp314t-macosx_10_9_universal2.whl\", hash = \"sha256:be12cb6a204f77ed968bcefe68086eb061695b540a3dd05edac507a3111b25f0\", size = 7904299, upload-time = \"2026-04-24T19:53:35.003Z\" },\n- { url = \"https://files.pythonhosted.org/packages/07/55/c18f75724544872f234678fdedc871391722cb34a2aee19faa9f63100bb2/cryptography-47.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:2ebd84adf0728c039a3be2700289378e1c164afc6748df1a5ed456767bef9ba7\", size = 4631180, upload-time = \"2026-04-24T19:53:37.517Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ee/65/31a5cc0eaca99cec5bafffe155d407115d96136bb161e8b49e0ef73f09a7/cryptography-47.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7f68d6fbc7fbbcfb0939fea72c3b96a9f9a6edfc0e1b1d29778a2066030418b1\", size = 4653529, upload-time = \"2026-04-24T19:53:39.775Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e5/bc/641c0519a495f3bfd0421b48d7cd325c4336578523ccd76ea322b6c29c7a/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\", hash = \"sha256:6651d32eff255423503aa276739da98c30f26c40cbeffcc6048e0d54ef704c0c\", size = 4638570, upload-time = \"2026-04-24T19:53:42.129Z\" },\n- { url = \"https://files.pythonhosted.org/packages/2b/f2/300327b0a47f6dc94dd8b71b57052aefe178bb51745073d73d80604f11ab/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\", hash = \"sha256:3fb8fa48075fad7193f2e5496135c6a76ac4b2aa5a38433df0a539296b377829\", size = 5238019, upload-time = \"2026-04-24T19:53:44.577Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e9/5a/5b5cf994391d4bf9d9c7efd4c66aabe4d95227256627f8fea6cff7dfadbd/cryptography-47.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\", hash = \"sha256:11438c7518132d95f354fa01a4aa2f806d172a061a7bed18cf18cbdacdb204d7\", size = 4686832, upload-time = \"2026-04-24T19:53:47.015Z\" },\n- { url = \"https://files.pythonhosted.org/packages/dc/2c/ae950e28fd6475c852fc21a44db3e6b5bcc1261d1e370f2b6e42fa800fef/cryptography-47.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\", hash = \"sha256:8c1a736bbb3288005796c3f7ccb9453360d7fed483b13b9f468aea5171432923\", size = 4269301, upload-time = \"2026-04-24T19:53:48.97Z\" },\n- { url = \"https://files.pythonhosted.org/packages/67/fb/6a39782e150ffe5cc1b0018cb6ddc48bf7ca62b498d7539ffc8a758e977d/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\", hash = \"sha256:f1557695e5c2b86e204f6ce9470497848634100787935ab7adc5397c54abd7ab\", size = 4638110, upload-time = \"2026-04-24T19:53:51.011Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8e/d7/0b3c71090a76e5c203164a47688b697635ece006dcd2499ab3a4dbd3f0bd/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\", hash = \"sha256:f9a034b642b960767fb343766ae5ba6ad653f2e890ddd82955aef288ffea8736\", size = 5194988, upload-time = \"2026-04-24T19:53:52.962Z\" },\n- { url = \"https://files.pythonhosted.org/packages/63/33/63a961498a9df51721ab578c5a2622661411fc520e00bd83b0cc64eb20c4/cryptography-47.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\", hash = \"sha256:b1c76fca783aa7698eb21eb14f9c4aa09452248ee54a627d125025a43f83e7a7\", size = 4686563, upload-time = \"2026-04-24T19:53:55.274Z\" },\n- { url = \"https://files.pythonhosted.org/packages/b7/bf/5ee5b145248f92250de86145d1c1d6edebbd57a7fe7caa4dedb5d4cf06a1/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\", hash = \"sha256:4f7722c97826770bab8ae92959a2e7b20a5e9e9bf4deae68fd86c3ca457bab52\", size = 4770094, upload-time = \"2026-04-24T19:53:57.753Z\" },\n- { url = \"https://files.pythonhosted.org/packages/92/43/21d220b2da5d517773894dacdcdb5c682c28d3fffce65548cb06e87d5501/cryptography-47.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\", hash = \"sha256:09f6d7bf6724f8db8b32f11eccf23efc8e759924bc5603800335cf8859a3ddbd\", size = 4913811, upload-time = \"2026-04-24T19:54:00.236Z\" },\n- { url = \"https://files.pythonhosted.org/packages/31/98/dc4ad376ac5f1a1a7d4a83f7b0c6f2bcad36b5d2d8f30aeb482d3a7d9582/cryptography-47.0.0-cp314-cp314t-win32.whl\", hash = \"sha256:6eebcaf0df1d21ce1f90605c9b432dd2c4f4ab665ac29a40d5e3fc68f51b5e63\", size = 3237158, upload-time = \"2026-04-24T19:54:02.606Z\" },\n- { url = \"https://files.pythonhosted.org/packages/bc/da/97f62d18306b5133468bc3f8cc73a3111e8cdc8cf8d3e69474d6e5fd2d1b/cryptography-47.0.0-cp314-cp314t-win_amd64.whl\", hash = \"sha256:51c9313e90bd1690ec5a75ed047c27c0b8e6c570029712943d6116ef9a90620b\", size = 3758706, upload-time = \"2026-04-24T19:54:04.433Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e0/34/a4fae8ae7c3bc227460c9ae43f56abf1b911da0ec29e0ebac53bb0a4b6b7/cryptography-47.0.0-cp38-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:14432c8a9bcb37009784f9594a62fae211a2ae9543e96c92b2a8e4c3cd5cd0c4\", size = 7904072, upload-time = \"2026-04-24T19:54:06.411Z\" },\n- { url = \"https://files.pythonhosted.org/packages/01/64/d7b1e54fdb69f22d24a64bb3e88dc718b31c7fb10ef0b9691a3cf7eeea6e/cryptography-47.0.0-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:07efe86201817e7d3c18781ca9770bc0db04e1e48c994be384e4602bc38f8f27\", size = 4635767, upload-time = \"2026-04-24T19:54:08.519Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/7b/cca826391fb2a94efdcdfe4631eb69306ee1cff0b22f664a412c90713877/cryptography-47.0.0-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:2b45761c6ec22b7c726d6a829558777e32d0f1c8be7c3f3480f9c912d5ee8a10\", size = 4654350, upload-time = \"2026-04-24T19:54:10.795Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4c/65/4b57bcc823f42a991627c51c2f68c9fd6eb1393c1756aac876cba2accae2/cryptography-47.0.0-cp38-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:edd4da498015da5b9f26d38d3bfc2e90257bfa9cbed1f6767c282a0025ae649b\", size = 4643394, upload-time = \"2026-04-24T19:54:13.275Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f4/c4/2c5fbeea70adbbca2bbae865e1d605d6a4a7f8dbd9d33eaf69645087f06c/cryptography-47.0.0-cp38-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:9af828c0d5a65c70ec729cd7495a4bf1a67ecb66417b8f02ff125ab8a6326a74\", size = 5225777, upload-time = \"2026-04-24T19:54:15.18Z\" },\n- { url = \"https://files.pythonhosted.org/packages/7e/b8/ac57107ef32749d2b244e36069bb688792a363aaaa3acc9e3cf84c130315/cryptography-47.0.0-cp38-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:256d07c78a04d6b276f5df935a9923275f53bd1522f214447fdf365494e2d515\", size = 4688771, upload-time = \"2026-04-24T19:54:17.835Z\" },\n- { url = \"https://files.pythonhosted.org/packages/56/fc/9f1de22ff8be99d991f240a46863c52d475404c408886c5a38d2b5c3bb26/cryptography-47.0.0-cp38-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:5d0e362ff51041b0c0d219cc7d6924d7b8996f57ce5712bdcef71eb3c65a59cc\", size = 4270753, upload-time = \"2026-04-24T19:54:19.963Z\" },\n- { url = \"https://files.pythonhosted.org/packages/00/68/d70c852797aa68e8e48d12e5a87170c43f67bb4a59403627259dd57d15de/cryptography-47.0.0-cp38-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:1581aef4219f7ca2849d0250edaa3866212fb74bf5667284f46aa92f9e65c1ca\", size = 4642911, upload-time = \"2026-04-24T19:54:21.818Z\" },\n- { url = \"https://files.pythonhosted.org/packages/a5/51/661cbee74f594c5d97ff82d34f10d5551c085ca4668645f4606ebd22bd5d/cryptography-47.0.0-cp38-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:a49a3eb5341b9503fa3000a9a0db033161db90d47285291f53c2a9d2cd1b7f76\", size = 5181411, upload-time = \"2026-04-24T19:54:24.376Z\" },\n- { url = \"https://files.pythonhosted.org/packages/94/87/f2b6c374a82cf076cfa1416992ac8e8ec94d79facc37aec87c1a5cb72352/cryptography-47.0.0-cp38-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:2207a498b03275d0051589e326b79d4cf59985c99031b05bb292ac52631c37fe\", size = 4688262, upload-time = \"2026-04-24T19:54:26.946Z\" },\n- { url = \"https://files.pythonhosted.org/packages/14/e2/8b7462f4acf21ec509616f0245018bb197194ab0b65c2ea21a0bdd53c0eb/cryptography-47.0.0-cp38-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:7a02675e2fabd0c0fc04c868b8781863cbf1967691543c22f5470500ff840b31\", size = 4775506, upload-time = \"2026-04-24T19:54:28.926Z\" },\n- { url = \"https://files.pythonhosted.org/packages/70/75/158e494e4c08dc05e039da5bb48553826bd26c23930cf8d3cd5f21fa8921/cryptography-47.0.0-cp38-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:80887c5cbd1774683cb126f0ab4184567f080071d5acf62205acb354b4b753b7\", size = 4912060, upload-time = \"2026-04-24T19:54:30.869Z\" },\n- { url = \"https://files.pythonhosted.org/packages/06/bd/0a9d3edbf5eadbac926d7b9b3cd0c4be584eeeae4a003d24d9eda4affbbd/cryptography-47.0.0-cp38-abi3-win32.whl\", hash = \"sha256:ed67ea4e0cfb5faa5bc7ecb6e2b8838f3807a03758eec239d6c21c8769355310\", size = 3248487, upload-time = \"2026-04-24T19:54:33.494Z\" },\n- { url = \"https://files.pythonhosted.org/packages/60/80/5681af756d0da3a599b7bdb586fac5a1540f1bcefd2717a20e611ddade45/cryptography-47.0.0-cp38-abi3-win_amd64.whl\", hash = \"sha256:835d2d7f47cdc53b3224e90810fb1d36ca94ea29cc1801fb4c1bc43876735769\", size = 3755737, upload-time = \"2026-04-24T19:54:35.408Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1b/a0/928c9ce0d120a40a81aa99e3ba383e87337b9ac9ef9f6db02e4d7822424d/cryptography-47.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\", hash = \"sha256:7f1207974a904e005f762869996cf620e9bf79ecb4622f148550bb48e0eb35a7\", size = 3909893, upload-time = \"2026-04-24T19:54:38.334Z\" },\n- { url = \"https://files.pythonhosted.org/packages/81/75/d691e284750df5d9569f2b1ce4a00a71e1d79566da83b2b3e5549c84917f/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\", hash = \"sha256:1a405c08857258c11016777e11c02bacbe7ef596faf259305d282272a3a05cbe\", size = 4587867, upload-time = \"2026-04-24T19:54:40.619Z\" },\n- { url = \"https://files.pythonhosted.org/packages/07/d6/1b90f1a4e453009730b4545286f0b39bb348d805c11181fc31544e4f9a65/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\", hash = \"sha256:20fdbe3e38fb67c385d233c89371fa27f9909f6ebca1cecc20c13518dae65475\", size = 4627192, upload-time = \"2026-04-24T19:54:42.849Z\" },\n- { url = \"https://files.pythonhosted.org/packages/dc/53/cb358a80e9e359529f496870dd08c102aa8a4b5b9f9064f00f0d6ed5b527/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\", hash = \"sha256:f7db373287273d8af1414cf95dc4118b13ffdc62be521997b0f2b270771fef50\", size = 4587486, upload-time = \"2026-04-24T19:54:44.908Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8b/57/aaa3d53876467a226f9a7a82fd14dd48058ad2de1948493442dfa16e2ffd/cryptography-47.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\", hash = \"sha256:9fe6b7c64926c765f9dff301f9c1b867febcda5768868ca084e18589113732ab\", size = 4626327, upload-time = \"2026-04-24T19:54:47.813Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ab/9c/51f28c3550276bcf35660703ba0ab829a90b88be8cd98a71ef23c2413913/cryptography-47.0.0-pp311-pypy311_pp73-win_amd64.whl\", hash = \"sha256:cffbba3392df0fa8629bb7f43454ee2925059ee158e23c54620b9063912b86c8\", size = 3698916, upload-time = \"2026-04-24T19:54:49.782Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6\", size = 8001587, upload-time = \"2026-05-04T22:57:36.803Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c\", size = 4690433, upload-time = \"2026-05-04T22:57:40.373Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3\", size = 4710620, upload-time = \"2026-05-04T22:57:42.935Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5\", size = 4696283, upload-time = \"2026-05-04T22:57:45.294Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c\", size = 5296573, upload-time = \"2026-05-04T22:57:47.933Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f\", size = 4743677, upload-time = \"2026-05-04T22:57:50.067Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25\", size = 4330808, upload-time = \"2026-05-04T22:57:52.301Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602\", size = 4695941, upload-time = \"2026-05-04T22:57:54.603Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c\", size = 5252579, upload-time = \"2026-05-04T22:57:57.207Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5\", size = 4743326, upload-time = \"2026-05-04T22:57:59.535Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321\", size = 4826672, upload-time = \"2026-05-04T22:58:01.996Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74\", size = 4972574, upload-time = \"2026-05-04T22:58:03.968Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl\", hash = \"sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4\", size = 3294868, upload-time = \"2026-05-04T22:58:06.467Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl\", hash = \"sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7\", size = 3817107, upload-time = \"2026-05-04T22:58:08.845Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl\", hash = \"sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec\", size = 7986556, upload-time = \"2026-05-04T22:58:11.172Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18\", size = 4684776, upload-time = \"2026-05-04T22:58:13.712Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20\", size = 4698121, upload-time = \"2026-05-04T22:58:16.448Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl\", hash = \"sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff\", size = 4690042, upload-time = \"2026-05-04T22:58:18.544Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl\", hash = \"sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c\", size = 5282526, upload-time = \"2026-05-04T22:58:20.75Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl\", hash = \"sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db\", size = 4733116, upload-time = \"2026-05-04T22:58:23.627Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl\", hash = \"sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741\", size = 4316030, upload-time = \"2026-05-04T22:58:25.581Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl\", hash = \"sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166\", size = 4689640, upload-time = \"2026-05-04T22:58:27.747Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl\", hash = \"sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336\", size = 5237657, upload-time = \"2026-05-04T22:58:29.848Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl\", hash = \"sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057\", size = 4732362, upload-time = \"2026-05-04T22:58:32.009Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl\", hash = \"sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae\", size = 4819580, upload-time = \"2026-05-04T22:58:34.254Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl\", hash = \"sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c\", size = 4963283, upload-time = \"2026-05-04T22:58:36.376Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl\", hash = \"sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f\", size = 3270954, upload-time = \"2026-05-04T22:58:38.791Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl\", hash = \"sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12\", size = 3797313, upload-time = \"2026-05-04T22:58:40.746Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl\", hash = \"sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86\", size = 7983482, upload-time = \"2026-05-04T22:58:43.769Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl\", hash = \"sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e\", size = 4683266, upload-time = \"2026-05-04T22:58:46.064Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl\", hash = \"sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f\", size = 4696228, upload-time = \"2026-05-04T22:58:48.22Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl\", hash = \"sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7\", size = 4689097, upload-time = \"2026-05-04T22:58:50.9Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl\", hash = \"sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832\", size = 5283582, upload-time = \"2026-05-04T22:58:53.017Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl\", hash = \"sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c\", size = 4730479, upload-time = \"2026-05-04T22:58:55.611Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl\", hash = \"sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a\", size = 4326481, upload-time = \"2026-05-04T22:58:57.607Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl\", hash = \"sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a\", size = 4688713, upload-time = \"2026-05-04T22:59:00.077Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl\", hash = \"sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a\", size = 5238165, upload-time = \"2026-05-04T22:59:02.317Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl\", hash = \"sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239\", size = 4729947, upload-time = \"2026-05-04T22:59:05.255Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl\", hash = \"sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c\", size = 4822059, upload-time = \"2026-05-04T22:59:07.802Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl\", hash = \"sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4\", size = 4960575, upload-time = \"2026-05-04T22:59:09.851Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl\", hash = \"sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd\", size = 3279117, upload-time = \"2026-05-04T22:59:12.019Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl\", hash = \"sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8\", size = 3792100, upload-time = \"2026-05-04T22:59:14.884Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl\", hash = \"sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855\", size = 3950391, upload-time = \"2026-05-04T22:59:17.415Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl\", hash = \"sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b\", size = 4637126, upload-time = \"2026-05-04T22:59:20.197Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl\", hash = \"sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13\", size = 4667270, upload-time = \"2026-05-04T22:59:22.647Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl\", hash = \"sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb\", size = 4636797, upload-time = \"2026-05-04T22:59:24.912Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl\", hash = \"sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355\", size = 4666800, upload-time = \"2026-05-04T22:59:27.474Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl\", hash = \"sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a\", size = 3739536, upload-time = \"2026-05-04T22:59:29.61Z\" },\n ]\n \n [[package]]\n@@ -526,11 +526,11 @@ wheels = [\n \n [[package]]\n name = \"idna\"\n-version = \"3.13\"\n+version = \"3.15\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/ce/cc/762dfb036166873f0059f3b7de4565e1b5bc3d6f28a414c13da27e442f99/idna-3.13.tar.gz\", hash = \"sha256:585ea8fe5d69b9181ec1afba340451fba6ba764af97026f92a91d4eef164a242\", size = 194210, upload-time = \"2026-04-22T16:42:42.314Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz\", hash = \"sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc\", size = 199245, upload-time = \"2026-05-12T22:45:57.011Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/5d/13/ad7d7ca3808a898b4612b6fe93cde56b53f3034dcde235acb1f0e1df24c6/idna-3.13-py3-none-any.whl\", hash = \"sha256:892ea0cde124a99ce773decba204c5552b69c3c67ffd5f232eb7696135bc8bb3\", size = 68629, upload-time = \"2026-04-22T16:42:40.909Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl\", hash = \"sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8\", size = 72340, upload-time = \"2026-05-12T22:45:55.733Z\" },\n ]\n \n [[package]]\n@@ -577,14 +577,14 @@ wheels = [\n \n [[package]]\n name = \"markdown-it-py\"\n-version = \"4.0.0\"\n+version = \"4.2.0\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"mdurl\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz\", hash = \"sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3\", size = 73070, upload-time = \"2025-08-11T12:57:52.854Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz\", hash = \"sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49\", size = 82454, upload-time = \"2026-05-07T12:08:28.36Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl\", hash = \"sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147\", size = 87321, upload-time = \"2025-08-11T12:57:51.923Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl\", hash = \"sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a\", size = 91687, upload-time = \"2026-05-07T12:08:27.182Z\" },\n ]\n \n [[package]]\n@@ -643,11 +643,11 @@ wheels = [\n \n [[package]]\n name = \"pip\"\n-version = \"26.1\"\n+version = \"26.1.1\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/73/7e/d2b04004e1068ad4fdfa2f227b839b5d03e602e47cdbbf49de71137c9546/pip-26.1.tar.gz\", hash = \"sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3\", size = 1840316, upload-time = \"2026-04-26T21:00:05.406Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/b6/48/cb9b7a682f6fe01a4221e1728941dd4ac3cd9090a17db3779d6ff490b602/pip-26.1.1.tar.gz\", hash = \"sha256:d36762751d156a4ee895de8af39aa0abeeeb577f93a2eca6ab62467bbf0f8a78\", size = 1840400, upload-time = \"2026-05-04T19:02:21.248Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/70/7a/be4bd8bcbb24ea475856dd68159d78b03b2bb53dae369f69c9606b8888f5/pip-26.1-py3-none-any.whl\", hash = \"sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1\", size = 1812804, upload-time = \"2026-04-26T21:00:03.194Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3a/eb/fea4d1d51c49832120f7f285d07306db3960f423a2612c6057caf3e8196f/pip-26.1.1-py3-none-any.whl\", hash = \"sha256:99cb1c2899893b075ff56e4ed0af55669a955b49ad7fb8d8603ecdaf4ed653fb\", size = 1812777, upload-time = \"2026-05-04T19:02:18.9Z\" },\n ]\n \n [[package]]\n@@ -785,15 +785,15 @@ wheels = [\n \n [[package]]\n name = \"pyinstaller-hooks-contrib\"\n-version = \"2026.4\"\n+version = \"2026.5\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"setuptools\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/c7/fe/9278c29394bf69169febc21f96b4252c3ee7c8ec22c2fc545004bed47e71/pyinstaller_hooks_contrib-2026.4.tar.gz\", hash = \"sha256:766c281acb1ecc32e21c8c667056d7ebf5da0aabd5e30c219f9c2a283620eeaa\", size = 173050, upload-time = \"2026-03-31T14:10:51.188Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/1a/67/f4452d68793fb15beba4f19ef39a38a8822f0da7452b503c400d5a21f5c1/pyinstaller_hooks_contrib-2026.5.tar.gz\", hash = \"sha256:f066dfca8f7c45ff6336c9cf9fe25b4e48bfeb322a1aa24faaedfb8a8d1b0b08\", size = 173689, upload-time = \"2026-05-04T22:36:55.124Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/88/f4/035fb8c06deff827f540a9a4ed9122c54e5376fca3e42eddf0c263730775/pyinstaller_hooks_contrib-2026.4-py3-none-any.whl\", hash = \"sha256:1de1a5e49a878122010b88c7e295502bc69776c157c4a4dc78741a4e6178b00f\", size = 455496, upload-time = \"2026-03-31T14:10:49.867Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f6/5c/fd465d11da4d12b50d7eb5d2ee2ceb780d8d049dbb489f3828d131e387af/pyinstaller_hooks_contrib-2026.5-py3-none-any.whl\", hash = \"sha256:ea1535783fbdac4626351709e83f3ea80b681d3a4745763ebb407b5e27342eb9\", size = 457314, upload-time = \"2026-05-04T22:36:53.598Z\" },\n ]\n \n [[package]]\n@@ -825,28 +825,28 @@ wheels = [\n \n [[package]]\n name = \"pytest-rerunfailures\"\n-version = \"16.1\"\n+version = \"16.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"packaging\" },\n { name = \"pytest\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/de/04/71e9520551fc8fe2cf5c1a1842e4e600265b0815f2016b7c27ec85688682/pytest_rerunfailures-16.1.tar.gz\", hash = \"sha256:c38b266db8a808953ebd71ac25c381cb1981a78ff9340a14bcb9f1b9bff1899e\", size = 30889, upload-time = \"2025-10-10T07:06:01.238Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/6b/27/fd0209642f3a1069da3e0be3c7e339f942d052d81ccb1fb4eb9b187d3633/pytest_rerunfailures-16.2.tar.gz\", hash = \"sha256:5f5a32f15674a3d54f7598388fcd3cc1bc5c37284731a4704a44485dcdda5e23\", size = 32121, upload-time = \"2026-05-13T08:13:26.998Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/77/54/60eabb34445e3db3d3d874dc1dfa72751bfec3265bd611cb13c8b290adea/pytest_rerunfailures-16.1-py3-none-any.whl\", hash = \"sha256:5d11b12c0ca9a1665b5054052fcc1084f8deadd9328962745ef6b04e26382e86\", size = 14093, upload-time = \"2025-10-10T07:06:00.019Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/3f/a5/d8c1ad74529b483044b787ead2d24ecc624bca4084a509002102e4bab8cc/pytest_rerunfailures-16.2-py3-none-any.whl\", hash = \"sha256:c22a53d2827becc76f057d4ded123c0e726523f2f0e5f0bb4efb31fd59e1f14e\", size = 14505, upload-time = \"2026-05-13T08:13:25.485Z\" },\n ]\n \n [[package]]\n name = \"python-discovery\"\n-version = \"1.2.2\"\n+version = \"1.3.1\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"filelock\" },\n { name = \"platformdirs\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/de/ef/3bae0e537cfe91e8431efcba4434463d2c5a65f5a89edd47c6cf2f03c55f/python_discovery-1.2.2.tar.gz\", hash = \"sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb\", size = 58872, upload-time = \"2026-04-07T17:28:49.249Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/48/60/e88788207d81e46362cfbef0d4aaf4c0f49efc3c12d4c3fa3f542c34ebec/python_discovery-1.3.1.tar.gz\", hash = \"sha256:62f6db28064c9613e7ca76cb3f00c38c839a07c31c00dfe7ed0986493d2150a6\", size = 68011, upload-time = \"2026-05-12T20:53:36.336Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d8/db/795879cc3ddfe338599bddea6388cc5100b088db0a4caf6e6c1af1c27e04/python_discovery-1.2.2-py3-none-any.whl\", hash = \"sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a\", size = 31894, upload-time = \"2026-04-07T17:28:48.09Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/b7/6f/a05a317a66fee0aad270011461f1a63a453ed12471249f172f7d2e2bc7b4/python_discovery-1.3.1-py3-none-any.whl\", hash = \"sha256:ed188687ebb3b82c01a17cd5ac62fc94d9f6487a7f1a0f9dfe89753fec91039c\", size = 33185, upload-time = \"2026-05-12T20:53:34.969Z\" },\n ]\n \n [[package]]\n@@ -924,7 +924,7 @@ wheels = [\n \n [[package]]\n name = \"requests\"\n-version = \"2.33.1\"\n+version = \"2.34.2\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"certifi\" },\n@@ -932,9 +932,9 @@ dependencies = [\n { name = \"idna\" },\n { name = \"urllib3\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz\", hash = \"sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517\", size = 134120, upload-time = \"2026-03-30T16:09:15.531Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz\", hash = \"sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed\", size = 142856, upload-time = \"2026-05-14T19:25:27.735Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl\", hash = \"sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a\", size = 64947, upload-time = \"2026-03-30T16:09:13.83Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl\", hash = \"sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0\", size = 73075, upload-time = \"2026-05-14T19:25:26.443Z\" },\n ]\n \n [[package]]\n@@ -952,27 +952,27 @@ wheels = [\n \n [[package]]\n name = \"ruff\"\n-version = \"0.15.12\"\n+version = \"0.15.13\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/99/43/3291f1cc9106f4c63bdce7a8d0df5047fe8422a75b091c16b5e9355e0b11/ruff-0.15.12.tar.gz\", hash = \"sha256:ecea26adb26b4232c0c2ca19ccbc0083a68344180bba2a600605538ce51a40a6\", size = 4643852, upload-time = \"2026-04-24T18:17:14.305Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/24/21/a7d5c126d5b557715ef81098f3db2fe20f622a039ff2e626af28d674ab80/ruff-0.15.13.tar.gz\", hash = \"sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7\", size = 4678180, upload-time = \"2026-05-14T13:44:37.869Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c3/6e/e78ffb61d4686f3d96ba3df2c801161843746dcbcbb17a1e927d4829312b/ruff-0.15.12-py3-none-linux_armv6l.whl\", hash = \"sha256:f86f176e188e94d6bdbc09f09bfd9dc729059ad93d0e7390b5a73efe19f8861c\", size = 10640713, upload-time = \"2026-04-24T18:17:22.841Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ae/08/a317bc231fb9e7b93e4ef3089501e51922ff88d6936ce5cf870c4fe55419/ruff-0.15.12-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:e3bcd123364c3770b8e1b7baaf343cc99a35f197c5c6e8af79015c666c423a6c\", size = 11069267, upload-time = \"2026-04-24T18:17:30.105Z\" },\n- { url = \"https://files.pythonhosted.org/packages/aa/a4/f828e9718d3dce1f5f11c39c4f65afd32783c8b2aebb2e3d259e492c47bd/ruff-0.15.12-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:fe87510d000220aa1ed530d4448a7c696a0cae1213e5ec30e5874287b66557b5\", size = 10397182, upload-time = \"2026-04-24T18:17:07.177Z\" },\n- { url = \"https://files.pythonhosted.org/packages/71/e0/3310fc6d1b5e1fdea22bf3b1b807c7e187b581021b0d7d4514cccdb5fb71/ruff-0.15.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:84a1630093121375a3e2a95b4a6dc7b59e2b4ee76216e32d81aae550a832d002\", size = 10758012, upload-time = \"2026-04-24T18:16:55.759Z\" },\n- { url = \"https://files.pythonhosted.org/packages/11/c1/a606911aee04c324ddaa883ae418f3569792fd3c4a10c50e0dd0a2311e1e/ruff-0.15.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:fb129f40f114f089ebe0ca56c0d251cf2061b17651d464bb6478dc01e69f11f5\", size = 10447479, upload-time = \"2026-04-24T18:16:51.677Z\" },\n- { url = \"https://files.pythonhosted.org/packages/9d/68/4201e8444f0894f21ab4aeeaee68aa4f10b51613514a20d80bd628d57e88/ruff-0.15.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:b0c862b172d695db7598426b8af465e7e9ac00a3ea2a3630ee67eb82e366aaa6\", size = 11234040, upload-time = \"2026-04-24T18:17:16.529Z\" },\n- { url = \"https://files.pythonhosted.org/packages/34/ff/8a6d6cf4ccc23fd67060874e832c18919d1557a0611ebef03fdb01fff11e/ruff-0.15.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2849ea9f3484c3aca43a82f484210370319e7170df4dfe4843395ddf6c57bc33\", size = 12087377, upload-time = \"2026-04-24T18:17:04.944Z\" },\n- { url = \"https://files.pythonhosted.org/packages/85/f6/c669cf73f5152f623d34e69866a46d5e6185816b19fcd5b6dd8a2d299922/ruff-0.15.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:9e77c7e51c07fe396826d5969a5b846d9cd4c402535835fb6e21ce8b28fef847\", size = 11367784, upload-time = \"2026-04-24T18:17:25.409Z\" },\n- { url = \"https://files.pythonhosted.org/packages/e8/39/c61d193b8a1daaa8977f7dea9e8d8ba866e02ea7b65d32f6861693aa4c12/ruff-0.15.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:83b2f4f2f3b1026b5fb449b467d9264bf22067b600f7b6f41fc5958909f449d0\", size = 11344088, upload-time = \"2026-04-24T18:17:12.258Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c2/8d/49afab3645e31e12c590acb6d3b5b69d7aab5b81926dbaf7461f9441f37a/ruff-0.15.12-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:9ba3b8f1afd7e2e43d8943e55f249e13f9682fde09711644a6e7290eb4f3e339\", size = 11271770, upload-time = \"2026-04-24T18:17:02.457Z\" },\n- { url = \"https://files.pythonhosted.org/packages/46/06/33f41fe94403e2b755481cdfb9b7ef3e4e0ed031c4581124658d935d52b4/ruff-0.15.12-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:e852ba9fdc890655e1d78f2df1499efbe0e54126bd405362154a75e2bde159c5\", size = 10719355, upload-time = \"2026-04-24T18:17:27.648Z\" },\n- { url = \"https://files.pythonhosted.org/packages/0d/59/18aa4e014debbf559670e4048e39260a85c7fcee84acfd761ac01e7b8d35/ruff-0.15.12-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:dd8aed930da53780d22fc70bdf84452c843cf64f8cb4eb38984319c24c5cd5fd\", size = 10462758, upload-time = \"2026-04-24T18:17:32.347Z\" },\n- { url = \"https://files.pythonhosted.org/packages/25/e7/cc9f16fd0f3b5fddcbd7ec3d6ae30c8f3fde1047f32a4093a98d633c6570/ruff-0.15.12-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:01da3988d225628b709493d7dc67c3b9b12c0210016b08690ef9bd27970b262b\", size = 10953498, upload-time = \"2026-04-24T18:17:20.674Z\" },\n- { url = \"https://files.pythonhosted.org/packages/72/7a/a9ba7f98c7a575978698f4230c5e8cc54bbc761af34f560818f933dafa0c/ruff-0.15.12-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:9cae0f92bd5700d1213188b31cd3bdd2b315361296d10b96b8e2337d3d11f53e\", size = 11447765, upload-time = \"2026-04-24T18:17:09.755Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ea/f9/0ae446942c846b8266059ad8a30702a35afae55f5cdc54c5adf8d7afdc27/ruff-0.15.12-py3-none-win32.whl\", hash = \"sha256:d0185894e038d7043ba8fd6aee7499ece6462dc0ea9f1e260c7451807c714c20\", size = 10657277, upload-time = \"2026-04-24T18:17:18.591Z\" },\n- { url = \"https://files.pythonhosted.org/packages/33/f1/9614e03e1cdcbf9437570b5400ced8a720b5db22b28d8e0f1bda429f660d/ruff-0.15.12-py3-none-win_amd64.whl\", hash = \"sha256:c87a162d61ab3adca47c03f7f717c68672edec7d1b5499e652331780fe74950d\", size = 11837758, upload-time = \"2026-04-24T18:17:00.113Z\" },\n- { url = \"https://files.pythonhosted.org/packages/c0/98/6beb4b351e472e5f4c4613f7c35a5290b8be2497e183825310c4c3a3984b/ruff-0.15.12-py3-none-win_arm64.whl\", hash = \"sha256:a538f7a82d061cee7be55542aca1d86d1393d55d81d4fcc314370f4340930d4f\", size = 11120821, upload-time = \"2026-04-24T18:16:57.979Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c6/61/11d458dc6ac22504fd8e237b29dfd40504c7fbbcc8930402cfe51a8e63ed/ruff-0.15.13-py3-none-linux_armv6l.whl\", hash = \"sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8\", size = 10738279, upload-time = \"2026-05-14T13:44:18.7Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/86/ca/caa871ee7be718c45256fada4e16a218ee3e33f0c4a46b729a60a24912e6/ruff-0.15.13-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7\", size = 11124798, upload-time = \"2026-05-14T13:44:06.427Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/d3/19/43f5f2e568dddde567fc41f8471f9432c09563e19d3e617a48cfa52f8f0a/ruff-0.15.13-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629\", size = 10460761, upload-time = \"2026-05-14T13:44:04.375Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/99/df/cf938cd6de3003178f03ad7c1ea2a6c099468c03a35037985070b37e76be/ruff-0.15.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5\", size = 10804451, upload-time = \"2026-05-14T13:44:25.221Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c7/7d/5d0973129b154ded2225729169d7068f26b467760b146493fde138415f23/ruff-0.15.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22\", size = 10534285, upload-time = \"2026-05-14T13:44:08.888Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/1f/e3/6b999bbc66cd51e5f073842bc2a3995e99c5e0e72e16b15e7261f7abf57a/ruff-0.15.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9\", size = 11312063, upload-time = \"2026-05-14T13:44:11.274Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/af/5a/642639e9f5db04f1e97fbd6e091c6fd20725bdf072fb114d00eefb9e6eb8/ruff-0.15.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55\", size = 12183079, upload-time = \"2026-05-14T13:44:01.634Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/19/4c/7585735f6b53b0f12de13618b2f7d250a844f018822efc899df2e7b8295f/ruff-0.15.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6\", size = 11440833, upload-time = \"2026-05-14T13:43:59.043Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e8/31/bf1a0803d077e679cfeee5f2f67290a0fa79c7385b5d9a8c17b9db2c48f0/ruff-0.15.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca\", size = 11434486, upload-time = \"2026-05-14T13:44:27.761Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e1/4e/62c9b999875d4f14db80f277c030578f5e249c9852d65b7ac7ad0b43c041/ruff-0.15.13-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd\", size = 11385189, upload-time = \"2026-05-14T13:44:13.704Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/fc/89/7e959047a104df3eb12863447c110140191fc5b6c4f379ea2e803fcdb0e4/ruff-0.15.13-py3-none-musllinux_1_2_aarch64.whl\", hash = \"sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6\", size = 10781380, upload-time = \"2026-05-14T13:43:56.734Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ff/52/5fd18f3b88cab63e88aa11516b3b4e1e5f720e5c330f8dbe5c26210f41f8/ruff-0.15.13-py3-none-musllinux_1_2_armv7l.whl\", hash = \"sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51\", size = 10540605, upload-time = \"2026-05-14T13:44:20.748Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/e8/e0/9e35f338990d3e41a82875ff7053ffe97541dae81c9d02143177f381d572/ruff-0.15.13-py3-none-musllinux_1_2_i686.whl\", hash = \"sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2\", size = 11036554, upload-time = \"2026-05-14T13:44:16.256Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c2/13/070fb048c24080fba188f66371e2a92785be257ad02242066dc7255ac6e9/ruff-0.15.13-py3-none-musllinux_1_2_x86_64.whl\", hash = \"sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b\", size = 11528133, upload-time = \"2026-05-14T13:44:22.808Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/8c/b1e1666aef7fc6555094d73ae6cd981701781ae85b97ceefc0eebd0b4668/ruff-0.15.13-py3-none-win32.whl\", hash = \"sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41\", size = 10721455, upload-time = \"2026-05-14T13:44:35.697Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ab/a6/870a3e8a50590bb92be184ad928c2922f088b00d9dc5c5ec7b924ee08c22/ruff-0.15.13-py3-none-win_amd64.whl\", hash = \"sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4\", size = 11900409, upload-time = \"2026-05-14T13:44:30.389Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/9b/36/9c015cd052fca743dae8cb2aeb16b551444787467db42ceab0fc968865af/ruff-0.15.13-py3-none-win_arm64.whl\", hash = \"sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21\", size = 11179336, upload-time = \"2026-05-14T13:44:33.026Z\" },\n ]\n \n [[package]]\n@@ -1053,11 +1053,11 @@ wheels = [\n \n [[package]]\n name = \"trove-classifiers\"\n-version = \"2026.4.28.13\"\n+version = \"2026.5.7.17\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/04/af/88fdebf242bc7bc4957c96c5358a2b2b0f07e5001401906783a521ea9f54/trove_classifiers-2026.4.28.13.tar.gz\", hash = \"sha256:c85bb8a53c3de7330d1699b844ed9fb809a602a09ac15dc79ad6d1a509be0676\", size = 17035, upload-time = \"2026-04-28T13:45:41.495Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/35/68/175e7c07c5be13200387d5c0995b0da1e198e360047c08eb17d1002fcd92/trove_classifiers-2026.5.7.17.tar.gz\", hash = \"sha256:a04a48f8f0a787cb996514d3969ac7608aa3c60cb15d073c1e02801e60533e80\", size = 17041, upload-time = \"2026-05-07T17:48:01.931Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/d6/bb/fbdc4e57731efb86b4209ffdd2519520782bf27b3c961beac3e5c20d2b87/trove_classifiers-2026.4.28.13-py3-none-any.whl\", hash = \"sha256:8f4b1eb4e16296b57d612965444f87a83861cc989a0451ac97fe4265ddef03b8\", size = 14216, upload-time = \"2026-04-28T13:45:39.943Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7b/e3/d81b065a2d866a33a541ac63a2a4cc5737e03ce2379ac3191c98bb8867e3/trove_classifiers-2026.5.7.17-py3-none-any.whl\", hash = \"sha256:5ec0800de5e2ddbd7c663cb4c0c15328f132dc168813897c18866c5c7b93db33\", size = 14201, upload-time = \"2026-05-07T17:48:00.488Z\" },\n ]\n \n [[package]]\n@@ -1071,42 +1071,42 @@ wheels = [\n \n [[package]]\n name = \"urllib3\"\n-version = \"2.6.3\"\n+version = \"2.7.0\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz\", hash = \"sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed\", size = 435556, upload-time = \"2026-01-07T16:24:43.925Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz\", hash = \"sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c\", size = 433602, upload-time = \"2026-05-07T16:13:18.596Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl\", hash = \"sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4\", size = 131584, upload-time = \"2026-01-07T16:24:42.685Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl\", hash = \"sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897\", size = 131087, upload-time = \"2026-05-07T16:13:17.151Z\" },\n ]\n \n [[package]]\n name = \"uv\"\n-version = \"0.11.8\"\n+version = \"0.11.14\"\n source = { registry = \"https://pypi.org/simple\" }\n-sdist = { url = \"https://files.pythonhosted.org/packages/c1/cd/4393fecb083897e956f016d4e66d0b8a496a08fe2e03cbda32a1e91da7ee/uv-0.11.8.tar.gz\", hash = \"sha256:bb2cf302b8503629aab6f0090a05551e6f8cfc2d687ca059cad7ec9e11214335\", size = 4098020, upload-time = \"2026-04-27T13:15:31.625Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/30/a3/be4a946c7c2fc4094c020c8f7d8bd0a739bad55ebe4e2817d6e2b1bc6bff/uv-0.11.14.tar.gz\", hash = \"sha256:0ea006a117b586b2681b6dfd9703a540d2ad2a136ec0f48d272767e599cc3dfb\", size = 4130699, upload-time = \"2026-05-12T18:00:37.321Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/99/84/dcb676a3e36a3a2b44dc2e4dfea471b8cd709025e27cce3e588b176fd899/uv-0.11.8-py3-none-linux_armv6l.whl\", hash = \"sha256:a53e704a780a9e78a50f5a880e99a690f84e6fb9e82610903ce26f47c271d74c\", size = 23664296, upload-time = \"2026-04-27T13:15:15.644Z\" },\n- { url = \"https://files.pythonhosted.org/packages/86/05/557aa070fda7b8460bbbe1e867e8e5b80602c5b30ed77d1d94fc5acae518/uv-0.11.8-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:d414fc3795b6f56fb6b1fa359537930924fdfe857750a144d2aedf3077be3f1d\", size = 23087321, upload-time = \"2026-04-27T13:15:36.193Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d5/62/82953018801a250e16b091ef4b5e95e939b2f01224363d6fc80f600b7eff/uv-0.11.8-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:f0d402e182ab581e934c159cc9edf25ec6e08d32f29aa797980e949afefc87cd\", size = 21747142, upload-time = \"2026-04-27T13:15:20.4Z\" },\n- { url = \"https://files.pythonhosted.org/packages/af/4c/477f2abe16f9a3d3c73077f15615878a303eef3760115ec946be58ecb9b2/uv-0.11.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:877c9af3b3955a35ef739e5b2ba79c56dae5c4d50420a7ed908c0901e1c8c807\", size = 23425861, upload-time = \"2026-04-27T13:15:10.374Z\" },\n- { url = \"https://files.pythonhosted.org/packages/2a/63/19f46193e49f0c9bf33346a4d726313871864db16e7cdd1c0a63bc112000/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:8278144df8d80a83f770c264a5e79ea50791316d2a0dda869e53b3c1174142a8\", size = 23215551, upload-time = \"2026-04-27T13:15:38.706Z\" },\n- { url = \"https://files.pythonhosted.org/packages/72/3e/5595b265df848a33cd060b10e8f763a46d67521ac9f6c314e8a4ad5329d7/uv-0.11.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:b3494ad32465f4e02259cfb104d24efe5bb8f7a782351f0354de9385415fb310\", size = 23224170, upload-time = \"2026-04-27T13:15:18.083Z\" },\n- { url = \"https://files.pythonhosted.org/packages/a6/b3/6ca95e690b52542caa1dae10ede57732f90c629946ab5f027ff746f87deb/uv-0.11.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a4421e27e81f85bce3bdb75986c38b5f9bfab9cdccaf3d977cf124b3f0f0b989\", size = 24730048, upload-time = \"2026-04-27T13:15:13.254Z\" },\n- { url = \"https://files.pythonhosted.org/packages/ea/49/71b7322067c85a3736a22a300072b0566991fe3f95b81bed793508ff5315/uv-0.11.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:91943e77fc962752d4f64ad5739219858395981078051c740b28b52963b366aa\", size = 25585906, upload-time = \"2026-04-27T13:15:41.455Z\" },\n- { url = \"https://files.pythonhosted.org/packages/37/16/4e84cd5131327fe86d4784ebfc8a983149f4e6b811476ef271fc548b29e6/uv-0.11.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:41fbba287efcc9bc9505a60549b3a223220da720eacd03be8c23d9daaafa44f4\", size = 24795740, upload-time = \"2026-04-27T13:15:49.842Z\" },\n- { url = \"https://files.pythonhosted.org/packages/5b/01/df175979018743cc5ba6e2fb9dcec916868271e8d88cf0b9df8fd805a0df/uv-0.11.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:d97bb2920d6cddc07faa475013461294cc09b77ec8139278416c6e54b938d037\", size = 24824980, upload-time = \"2026-04-27T13:15:53.506Z\" },\n- { url = \"https://files.pythonhosted.org/packages/1c/95/93c7f595f7136fb32807442860c55d0faed2cd3d7da4b7105ed3c2535d5f/uv-0.11.8-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:fb6a755305eb1e081dfe6a8bc007dbae2d26fe75e551656ca7c9cd08fba21d26\", size = 23526790, upload-time = \"2026-04-27T13:15:04.955Z\" },\n- { url = \"https://files.pythonhosted.org/packages/04/02/77430b89e172c20cc549b07a5b1dfda0c882c161b6d82781d3150a7063ac/uv-0.11.8-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:841ecbb38532698f73b14b49dc5f0c5e756194c7fcf6e5c6b7ed3859200fe91b\", size = 24280498, upload-time = \"2026-04-27T13:15:43.978Z\" },\n- { url = \"https://files.pythonhosted.org/packages/8a/e3/23e4a2bb91e3880e017e6116886e2d0bde14ba6aa95ddc458160ee630e7c/uv-0.11.8-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b3ff2b20c1897105ebe7ed7f9b1b331c7171da029bc1e35970ce31dc086141c1\", size = 24375233, upload-time = \"2026-04-27T13:15:25.753Z\" },\n- { url = \"https://files.pythonhosted.org/packages/d9/67/fb7dc17cea816a667d1be2632525aa1687566bfafd17bdac561a7a6c9484/uv-0.11.8-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ad381228b0170ef9646902c7e908d4a10a7ecc3da8139450506cf70c7e7f3e80\", size = 23904818, upload-time = \"2026-04-27T13:15:23.21Z\" },\n- { url = \"https://files.pythonhosted.org/packages/4b/91/b920e35f54f8c6b51f2c639e8170bb80a47a739a1442fea33a479bc93a3d/uv-0.11.8-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:0172b5215544844cd3db0fa3c73a2eb74999b3f00cd2527dde578725076d7b65\", size = 25015448, upload-time = \"2026-04-27T13:15:46.666Z\" },\n- { url = \"https://files.pythonhosted.org/packages/05/e8/3771956dc1c94b8484789bb8070d91872080d0af99332b8bdec7218c2bfd/uv-0.11.8-py3-none-win32.whl\", hash = \"sha256:e71c1dd23cbb480f3952c3a95b4fd00f96bd618e2a94583fc9388c500af3070d\", size = 22823583, upload-time = \"2026-04-27T13:15:33.674Z\" },\n- { url = \"https://files.pythonhosted.org/packages/f9/9b/a91a9c60dcae0e1e3da06377d38f32118a523697d461fe41bc9f117ecf59/uv-0.11.8-py3-none-win_amd64.whl\", hash = \"sha256:306c624c68d95dd7ea3647675323d72c1abc25f91c3e92ae4cd6f0f11b508726\", size = 25407438, upload-time = \"2026-04-27T13:15:28.957Z\" },\n- { url = \"https://files.pythonhosted.org/packages/61/5d/defa29fe617e6f07d4e514089e9d36fd9f44ede869e597e39ff7d69f6917/uv-0.11.8-py3-none-win_arm64.whl\", hash = \"sha256:a9853456696d579f206135c9dda7227a6ed8311b8a9a0b9b2008c4ae81950efe\", size = 23914243, upload-time = \"2026-04-27T13:15:07.717Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/15/9b2138b16eb1fa8c2cd84b1037ad10c38b3acc36ce96c6d27000bfb7e716/uv-0.11.14-py3-none-linux_armv6l.whl\", hash = \"sha256:78411a883f230a710af19f2ac6e6f0ba8eae90f0e5af4605f923fd367539fff4\", size = 23545199, upload-time = \"2026-05-12T18:01:34.526Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/75/81/c678e8b9a8e624f9c338c66cd57dd9cfc6b5a0501ad3c87fd0cc0bf8850a/uv-0.11.14-py3-none-macosx_10_12_x86_64.whl\", hash = \"sha256:078f2e63da89c8fcf6d578f02156045c5990c57d76464aab3f3f798d3fff95cd\", size = 22957064, upload-time = \"2026-05-12T18:00:54.225Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f7/ad/95fbd15b23f26f36d0cfb0ddf159b9602a1b1c0feced60a7f98385e919f1/uv-0.11.14-py3-none-macosx_11_0_arm64.whl\", hash = \"sha256:dcdad43d52c130e3159e84ab1844e04d819d2c4a2495a687d27f80d560a3650e\", size = 21678307, upload-time = \"2026-05-12T18:00:57.132Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/8b/cb/b3da1c4d95d6dd507896bca16dbd643118013b2b151f5f35a08d3391728c/uv-0.11.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl\", hash = \"sha256:9923da7c63d70de9fe71829503d7e7ebfd6304e804d7232aad5f716e190db25b\", size = 23353409, upload-time = \"2026-05-12T18:01:27.512Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/51/ad/78c6b8d6bcc04c5043b50631e9b413422a03a0bd7c4a997748f8e9cbac25/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl\", hash = \"sha256:3b0759ca504e48dcd4fafb1a61ef69aeb24c5a60fbf5f504a7873c8db1b24718\", size = 23103964, upload-time = \"2026-05-12T18:01:31.094Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0f/7d/acb66e09bc54a74e4288e996d841af04d88588fd6bdbfbab2468ab7169a7/uv-0.11.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\", hash = \"sha256:78b51b117549ee4db7197ea5ece0848cecd443e464fb9dff9f254cdc1e4ed96f\", size = 23104638, upload-time = \"2026-05-12T18:01:10.093Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/31/0a/8497be61accdb8e56d02e11edd3ac471466259420e0bd9c05c1966df134a/uv-0.11.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:a1ddbe8a2ab160affc179e9c3a40913b23a08cdf55254e1f3829cc22a51a0d8d\", size = 24625888, upload-time = \"2026-05-12T18:01:17.192Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/95/91/f730799fd20a45777b255e20cf9f648a4e4e0979bf65e87a8633197cf7d9/uv-0.11.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:f3005a2db1e8d72e125630d4f22ac4ceddb2c033e1f9b94b7f3ea38ebac46dd6\", size = 25445231, upload-time = \"2026-05-12T18:00:40.012Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f5/4d/106463fc27e63e402aec2e791774dac2db5bd5e1c36cdcf38125aa97ab1c/uv-0.11.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl\", hash = \"sha256:d5c8f9ea36274ef2f9d24f0522085e280844172e901d9213f66a21b212266706\", size = 24571961, upload-time = \"2026-05-12T18:00:43.713Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/12/4d/163fe746b97bd1129627e8b1f943e17583ddc143eaab532d56a799a9ba5a/uv-0.11.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:379e64b236cf55f762a8308d7efe4365d5296ba29f3a4868761bc45b4e915a71\", size = 24718523, upload-time = \"2026-05-12T18:01:06.587Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/19/fb/7a3673494a0cf70267559166398f9c50c4925ff20122f99a28d6c5a80d83/uv-0.11.14-py3-none-manylinux_2_28_aarch64.whl\", hash = \"sha256:29c12a562441fc2d604e6920c558cacce74a55f889468708683a79b35a6e18a1\", size = 23454821, upload-time = \"2026-05-12T18:00:51.166Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/bb/43/6358394a567d865f3a5ce27b1e0d939549911e36d9b59f0c545a167f92f7/uv-0.11.14-py3-none-manylinux_2_31_riscv64.musllinux_1_1_riscv64.whl\", hash = \"sha256:e84069681c0334e07cbc7f114eb09d7fe1335e1db0297a66dbca80a1b393fe6d\", size = 24087843, upload-time = \"2026-05-12T18:00:47.272Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/ef/f6/7d0ae1e1f52b85057ca24d8876d6a4cc87b541ea6aca627fe36594c06099/uv-0.11.14-py3-none-manylinux_2_31_riscv64.whl\", hash = \"sha256:b15bf7c146e38d7c938d3a207115d5fdd8ef764fe1f866c225b1bed27e88da1e\", size = 24147611, upload-time = \"2026-05-12T18:01:20.499Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/5a/a2/511ad0c5da5697fd990b99569425b62b81cbc3458c35acc845211b55d6b5/uv-0.11.14-py3-none-musllinux_1_1_i686.whl\", hash = \"sha256:ddda5c5e41097814adac535c74851bae55e8097b9afc79aeae7fcffd8d86c06d\", size = 23920348, upload-time = \"2026-05-12T18:01:24.033Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/6b/b6/7084e3401b1f1020f215a125136eec1ed2bd541e10a5fea1625515579599/uv-0.11.14-py3-none-musllinux_1_1_x86_64.whl\", hash = \"sha256:e54326703f1eca83a6fd73275e0f398b16b7d3f81531bf58899c2869bc403f6c\", size = 24928981, upload-time = \"2026-05-12T18:01:13.961Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/4d/6a/7e81729fe729889c8cc63bbf64291734359bd7f6ba84852dc0504453511d/uv-0.11.14-py3-none-win32.whl\", hash = \"sha256:b384d873d0d18552c7524226125efd3965d921b7134c2f476c333771beb733e1\", size = 22573503, upload-time = \"2026-05-12T18:00:34.36Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/94/5d/f8905f9af5cd46af2a688b2246dbb5a4d95b8557eeffd7f241e037659d9e/uv-0.11.14-py3-none-win_amd64.whl\", hash = \"sha256:f0a8b58b38e984241bca5d7a5a47bf9ffe1ca2ab392a640887db8a04c4a9ec95\", size = 25175590, upload-time = \"2026-05-12T18:01:00.38Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/04/cb/7333d08d944f3018eb89242cd5e646e7b37faa1b567faeaf9254a8b59d53/uv-0.11.14-py3-none-win_arm64.whl\", hash = \"sha256:6a13e7e064563050c6606b3fd77091d427cdbdc5938b6f134baf8d8ec79bfdb7\", size = 23594775, upload-time = \"2026-05-12T18:01:03.55Z\" },\n ]\n \n [[package]]\n name = \"virtualenv\"\n-version = \"21.3.0\"\n+version = \"21.3.3\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"distlib\" },\n@@ -1115,9 +1115,9 @@ dependencies = [\n { name = \"python-discovery\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11'\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/3f/8b/6331f7a7fe70131c301106ec1e7cf23e2501bf7d4ca3636805801ca191bb/virtualenv-21.3.0.tar.gz\", hash = \"sha256:733750db978ec95c2d8eb4feadaa57091002bce404cb39ba69899cf7bd28944e\", size = 7614069, upload-time = \"2026-04-27T17:05:58.927Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/15/ba/1f6e8c957e4932be060dcdc482d339c12e0216351478add3645cdaa53c05/virtualenv-21.3.3.tar.gz\", hash = \"sha256:f5bda277e553b1c2b3c1a8debfc30496e1288cc93ce6b7b71b3280047e317328\", size = 7613784, upload-time = \"2026-05-13T18:01:30.19Z\" }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/4b/eb/03bfb1299d4c4510329e470f13f9a4ce793df7fcb5a2fd3510f911066f61/virtualenv-21.3.0-py3-none-any.whl\", hash = \"sha256:4d28ee41f6d9ec8f1f00cd472b9ffbcedda1b3d3b9a575b5c94a2d004fd51bd7\", size = 7594690, upload-time = \"2026-04-27T17:05:55.468Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/f4/34/a9dbe051de88a63eb7408ea66630bac38e72f7f6077d4be58737106860d9/virtualenv-21.3.3-py3-none-any.whl\", hash = \"sha256:7d5987d8369e098e41406efb780a3d4ca79280097293899e351a6407ee153ab3\", size = 7594554, upload-time = \"2026-05-13T18:01:27.815Z\" },\n ]\n \n [[package]]\n@@ -1296,14 +1296,14 @@ requires-dist = [\n { name = \"cffi\", marker = \"platform_python_implementation != 'PyPy' and extra == 'pin-secretstorage'\", specifier = \"==2.0.0\" },\n { name = \"cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.0.0\" },\n { name = \"charset-normalizer\", marker = \"extra == 'pin'\", specifier = \"==3.4.7\" },\n- { name = \"cryptography\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==47.0.0\" },\n+ { name = \"cryptography\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==48.0.0\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'curl-cffi'\", specifier = \">=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.16\" },\n { name = \"curl-cffi\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.15.0\" },\n { name = \"deno\", marker = \"extra == 'deno'\", specifier = \">=2.6.6\" },\n { name = \"deno\", marker = \"extra == 'pin-deno'\", specifier = \"==2.7.14\" },\n- { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.13\" },\n+ { name = \"idna\", marker = \"extra == 'pin'\", specifier = \"==3.15\" },\n { name = \"jeepney\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==0.9.0\" },\n- { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.0.0\" },\n+ { name = \"markdown-it-py\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==4.2.0\" },\n { name = \"mdurl\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==0.1.2\" },\n { name = \"mutagen\", marker = \"extra == 'default'\" },\n { name = \"mutagen\", marker = \"extra == 'pin'\", specifier = \"==1.47.0\" },\n@@ -1313,13 +1313,13 @@ requires-dist = [\n { name = \"pycryptodomex\", marker = \"extra == 'pin'\", specifier = \"==3.23.0\" },\n { name = \"pygments\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==2.20.0\" },\n { name = \"requests\", marker = \"extra == 'default'\", specifier = \">=2.32.2,<3\" },\n- { name = \"requests\", marker = \"extra == 'pin'\", specifier = \"==2.33.1\" },\n+ { name = \"requests\", marker = \"extra == 'pin'\", specifier = \"==2.34.2\" },\n { name = \"rich\", marker = \"implementation_name == 'cpython' and extra == 'pin-curl-cffi'\", specifier = \"==15.0.0\" },\n { name = \"secretstorage\", marker = \"extra == 'pin-secretstorage'\", specifier = \"==3.5.0\" },\n { name = \"secretstorage\", marker = \"extra == 'secretstorage'\" },\n { name = \"typing-extensions\", marker = \"python_full_version < '3.11' and extra == 'pin-secretstorage'\", specifier = \"==4.15.0\" },\n { name = \"urllib3\", marker = \"extra == 'default'\", specifier = \">=2.0.2,<3\" },\n- { name = \"urllib3\", marker = \"extra == 'pin'\", specifier = \"==2.6.3\" },\n+ { name = \"urllib3\", marker = \"extra == 'pin'\", specifier = \"==2.7.0\" },\n { name = \"websockets\", marker = \"extra == 'default'\", specifier = \">=13.0\" },\n { name = \"websockets\", marker = \"extra == 'pin'\", specifier = \"==16.0\" },\n { name = \"yt-dlp-ejs\", marker = \"extra == 'default'\", specifier = \"==0.8.0\" },\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":16,"string":"16"}}},{"rowIdx":34283,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16883"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16883,"string":"16,883"},"base_sha":{"kind":"string","value":"7aac95eae663be82cffeaf2a8c1193a5e349e401"},"head_sha":{"kind":"string","value":"4431ce9d64b78b4cbdf94fc3420201e81b28220d"},"task":{"kind":"string","value":"[pp/exec] Restrict `--exec` template usage to safe conversions\n\nRemove `--exec` footguns by restricting the conversions and default/placeholder values that are able to be used in the `exec` command template.\r\n\r\nPreviously, the user was able to pass something like this:\r\n```\r\n--exec 'echo \"%(title)s\"'\r\n```\r\nThis could yield unexpected and possibly damaging results if the `title` value contained a closing quote (`\"`) or special character such as `$`.\r\n\r\nThe only truly safe conversions to use in an exec template are `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). This patch restricts `--exec` templates to using those conversions.\r\n\r\nFurthermore, conversion is not performed on template default values (given after a `|`) or the placeholder value (given with `--output-na-placeholder`).\r\n\r\nSo a safe conversion could be used with an unsafe default, which would nullify the conversion, e.g.:\r\n```\r\n--exec 'echo %(nonexistent_field|;echo self-pwned)q'\r\n```\r\n...or a safe conversion could be nullified with an unsafe placeholder value, e.g.:\r\n```\r\n--output-na-placeholder ';echo self-pwned' --exec 'echo %(nonexistent_field)q'\r\n```\r\n\r\nThis patch also restricts the default values and placeholder values that can be used in conjunction with `--exec` such that they cannot contain special shell characters.\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions","scope_files":["README.md"]},{"subtask_id":"s2","goal":"Implement the changes under `test/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions","scope_files":["test/test_postprocessors.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions","scope_files":["yt_dlp/YoutubeDL.py","yt_dlp/__init__.py","yt_dlp/options.py"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/postprocessor/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions","scope_files":["yt_dlp/postprocessor/exec.py"]},{"subtask_id":"s5","goal":"Implement the changes under `yt_dlp/utils/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions","scope_files":["yt_dlp/utils/_utils.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions\",\n \"scope_files\": [\n \"README.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions\",\n \"scope_files\": [\n \"test/test_postprocessors.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\",\n \"yt_dlp/__init__.py\",\n \"yt_dlp/options.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/postprocessor/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions\",\n \"scope_files\": [\n \"yt_dlp/postprocessor/exec.py\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions\",\n \"scope_files\": [\n \"yt_dlp/utils/_utils.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["README.md"],"solution_diff":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["test/test_postprocessors.py"],"solution_diff":"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\nindex d58a97fc6ee9..ad595d6b70c6 100644\n--- a/test/test_postprocessors.py\n+++ b/test/test_postprocessors.py\n@@ -11,7 +11,10 @@\n import subprocess\n \n from yt_dlp import YoutubeDL\n-from yt_dlp.utils import shell_quote\n+from yt_dlp.utils import (\n+ UnsafeExecExpansionError,\n+ shell_quote,\n+)\n from yt_dlp.postprocessor import (\n ExecPP,\n FFmpegThumbnailsConvertorPP,\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\n \n+ def test_unsafe_exec_expansion(self):\n+ # Test unsafe placeholder\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\n+\n+ ydl = YoutubeDL()\n+ # Test unsafe commands\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)s\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title).100B\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)S\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)#j\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\n+ # Test safe commands\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo',\n+ 'echo {}',\n+ 'echo %(title)q',\n+ 'echo %(title|NA)q',\n+ 'echo %(title)#q',\n+ 'echo %(view_count)i',\n+ 'echo %(view_count)02d',\n+ 'echo %(aspect_ratio)f',\n+ 'echo %(aspect_ratio).2f',\n+ ]),\n+ ExecPP)\n+\n+ # Test compat opt\n+ ydl = YoutubeDL({\n+ 'outtmpl_na_placeholder': ';',\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\n+ })\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo \"%(title)s\"',\n+ 'echo %(title)q',\n+ 'echo \"%(title).100B\"',\n+ 'echo \"%(title)S\"',\n+ 'echo \"%(title)#S\"',\n+ 'echo \"%(title)j\"',\n+ 'echo \"%(title)#j\"',\n+ 'echo %(title|;)q',\n+ ]),\n+ ExecPP)\n+\n \n class TestModifyChaptersPP(unittest.TestCase):\n def setUp(self):\n","summary":"Edited 1 file(s) in test/"},{"subtask_id":"s3","scope_files":["yt_dlp/YoutubeDL.py","yt_dlp/__init__.py","yt_dlp/options.py"],"solution_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex 2f6ba478326e..18cf4c8d2c3f 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -44,6 +44,7 @@\n GeoUtils,\n PlaylistEntries,\n SameFileError,\n+ UnsafeExecExpansionError,\n download_range_func,\n expand_path,\n float_or_none,\n@@ -1077,7 +1078,7 @@ def main(argv=None):\n IN_CLI.value = True\n try:\n _exit(*variadic(_real_main(argv)))\n- except (CookieLoadError, DownloadError):\n+ except (CookieLoadError, DownloadError, UnsafeExecExpansionError):\n _exit(1)\n except SameFileError as e:\n _exit(f'ERROR: {e}')\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex ab25540642af..c64f4c4363a1 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\n+ 'allow-unsafe-exec-expansion',\n }, 'aliases': {\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\n '2023': ['2024', 'prefer-vp9-sort'],\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\n help=(\n 'Execute a command, optionally prefixed with when to execute it, separated by a \":\". '\n 'Supported values of \"WHEN\" are the same as that of --use-postprocessor (default: after_move). '\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\n+ 'however, for security reasons the only allowed conversions are: '\n+ '\"i\"/\"d\" (signed integer decimal), \"f\" (floating-point decimal) and \"q\" (shell-quoted). '\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\n 'This option can be used multiple times'))\n postproc.add_option(\n","summary":"Edited 3 file(s) in yt_dlp/"},{"subtask_id":"s4","scope_files":["yt_dlp/postprocessor/exec.py"],"solution_diff":"diff --git a/yt_dlp/postprocessor/exec.py b/yt_dlp/postprocessor/exec.py\nindex 243487dd25a4..ac5708b10e2d 100644\n--- a/yt_dlp/postprocessor/exec.py\n+++ b/yt_dlp/postprocessor/exec.py\n@@ -5,8 +5,17 @@\n class ExecPP(PostProcessor):\n \n def __init__(self, downloader, exec_cmd):\n- PostProcessor.__init__(self, downloader)\n+ # Need to set exec_cmd attribute before set_downloader is called by PostProcessor.__init__\n self.exec_cmd = variadic(exec_cmd)\n+ PostProcessor.__init__(self, downloader)\n+\n+ def set_downloader(self, downloader):\n+ super().set_downloader(downloader)\n+ # Validate safety of exec commands\n+ params = getattr(self._downloader, 'params', None)\n+ if params and 'allow-unsafe-exec-expansion' not in params['compat_opts']:\n+ for cmd in self.exec_cmd:\n+ _ = self._downloader.prepare_outtmpl(cmd, {}, _exec=True)\n \n def parse_cmd(self, cmd, info):\n tmpl, tmpl_dict = self._downloader.prepare_outtmpl(cmd, info)\n","summary":"Edited 1 file(s) in yt_dlp/postprocessor/"},{"subtask_id":"s5","scope_files":["yt_dlp/utils/_utils.py"],"solution_diff":"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 74bb6dcdb174..34388e6fe68a 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -1182,6 +1182,10 @@ class XAttrUnavailableError(YoutubeDLError):\n pass\n \n \n+class UnsafeExecExpansionError(YoutubeDLError):\n+ pass\n+\n+\n def is_path_like(f):\n return isinstance(f, (str, bytes, os.PathLike))\n \n\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"README.md\"\n ],\n \"solution_diff\": \"diff --git a/README.md b/README.md\\nindex 09e290b89dbc..e334bec8ed41 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\\n * The sub-modules `swfinterp`, `casefold` are removed.\\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n For convenience, there are some compat option aliases available to use:\\n \\n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\\n \\n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\\n >\\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\\n+\\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\\n+\\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\\n+\\n \\n ### Deprecated options\\n \\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/test_postprocessors.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\\nindex d58a97fc6ee9..ad595d6b70c6 100644\\n--- a/test/test_postprocessors.py\\n+++ b/test/test_postprocessors.py\\n@@ -11,7 +11,10 @@\\n import subprocess\\n \\n from yt_dlp import YoutubeDL\\n-from yt_dlp.utils import shell_quote\\n+from yt_dlp.utils import (\\n+ UnsafeExecExpansionError,\\n+ shell_quote,\\n+)\\n from yt_dlp.postprocessor import (\\n ExecPP,\\n FFmpegThumbnailsConvertorPP,\\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\\n \\n+ def test_unsafe_exec_expansion(self):\\n+ # Test unsafe placeholder\\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\\n+\\n+ ydl = YoutubeDL()\\n+ # Test unsafe commands\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)s\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title).100B\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)S\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)#j\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\\n+ # Test safe commands\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo',\\n+ 'echo {}',\\n+ 'echo %(title)q',\\n+ 'echo %(title|NA)q',\\n+ 'echo %(title)#q',\\n+ 'echo %(view_count)i',\\n+ 'echo %(view_count)02d',\\n+ 'echo %(aspect_ratio)f',\\n+ 'echo %(aspect_ratio).2f',\\n+ ]),\\n+ ExecPP)\\n+\\n+ # Test compat opt\\n+ ydl = YoutubeDL({\\n+ 'outtmpl_na_placeholder': ';',\\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\\n+ })\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo \\\"%(title)s\\\"',\\n+ 'echo %(title)q',\\n+ 'echo \\\"%(title).100B\\\"',\\n+ 'echo \\\"%(title)S\\\"',\\n+ 'echo \\\"%(title)#S\\\"',\\n+ 'echo \\\"%(title)j\\\"',\\n+ 'echo \\\"%(title)#j\\\"',\\n+ 'echo %(title|;)q',\\n+ ]),\\n+ ExecPP)\\n+\\n \\n class TestModifyChaptersPP(unittest.TestCase):\\n def setUp(self):\\n\",\n \"summary\": \"Edited 1 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/YoutubeDL.py\",\n \"yt_dlp/__init__.py\",\n \"yt_dlp/options.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\\nindex 2f6ba478326e..18cf4c8d2c3f 100644\\n--- a/yt_dlp/__init__.py\\n+++ b/yt_dlp/__init__.py\\n@@ -44,6 +44,7 @@\\n GeoUtils,\\n PlaylistEntries,\\n SameFileError,\\n+ UnsafeExecExpansionError,\\n download_range_func,\\n expand_path,\\n float_or_none,\\n@@ -1077,7 +1078,7 @@ def main(argv=None):\\n IN_CLI.value = True\\n try:\\n _exit(*variadic(_real_main(argv)))\\n- except (CookieLoadError, DownloadError):\\n+ except (CookieLoadError, DownloadError, UnsafeExecExpansionError):\\n _exit(1)\\n except SameFileError as e:\\n _exit(f'ERROR: {e}')\\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\\nindex ab25540642af..c64f4c4363a1 100644\\n--- a/yt_dlp/options.py\\n+++ b/yt_dlp/options.py\\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\\n+ 'allow-unsafe-exec-expansion',\\n }, 'aliases': {\\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\\n '2023': ['2024', 'prefer-vp9-sort'],\\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n help=(\\n 'Execute a command, optionally prefixed with when to execute it, separated by a \\\":\\\". '\\n 'Supported values of \\\"WHEN\\\" are the same as that of --use-postprocessor (default: after_move). '\\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\\n+ 'however, for security reasons the only allowed conversions are: '\\n+ '\\\"i\\\"/\\\"d\\\" (signed integer decimal), \\\"f\\\" (floating-point decimal) and \\\"q\\\" (shell-quoted). '\\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\\n 'This option can be used multiple times'))\\n postproc.add_option(\\n\",\n \"summary\": \"Edited 3 file(s) in yt_dlp/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/postprocessor/exec.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/postprocessor/exec.py b/yt_dlp/postprocessor/exec.py\\nindex 243487dd25a4..ac5708b10e2d 100644\\n--- a/yt_dlp/postprocessor/exec.py\\n+++ b/yt_dlp/postprocessor/exec.py\\n@@ -5,8 +5,17 @@\\n class ExecPP(PostProcessor):\\n \\n def __init__(self, downloader, exec_cmd):\\n- PostProcessor.__init__(self, downloader)\\n+ # Need to set exec_cmd attribute before set_downloader is called by PostProcessor.__init__\\n self.exec_cmd = variadic(exec_cmd)\\n+ PostProcessor.__init__(self, downloader)\\n+\\n+ def set_downloader(self, downloader):\\n+ super().set_downloader(downloader)\\n+ # Validate safety of exec commands\\n+ params = getattr(self._downloader, 'params', None)\\n+ if params and 'allow-unsafe-exec-expansion' not in params['compat_opts']:\\n+ for cmd in self.exec_cmd:\\n+ _ = self._downloader.prepare_outtmpl(cmd, {}, _exec=True)\\n \\n def parse_cmd(self, cmd, info):\\n tmpl, tmpl_dict = self._downloader.prepare_outtmpl(cmd, info)\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/postprocessor/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"yt_dlp/utils/_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\\nindex 74bb6dcdb174..34388e6fe68a 100644\\n--- a/yt_dlp/utils/_utils.py\\n+++ b/yt_dlp/utils/_utils.py\\n@@ -1182,6 +1182,10 @@ class XAttrUnavailableError(YoutubeDLError):\\n pass\\n \\n \\n+class UnsafeExecExpansionError(YoutubeDLError):\\n+ pass\\n+\\n+\\n def is_path_like(f):\\n return isinstance(f, (str, bytes, os.PathLike))\\n \\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s3","comment":"do we want to allow `'S'` (filename-sanitized)?","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\n"},{"subtask_id":"s3","comment":"These should be string literals imo","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\n"},{"subtask_id":"s3","comment":"Id without the discard, as the try catch and comment make it obvious\n```suggestion\n self.prepare_outtmpl(exec_cmd, {}, _exec=True)\n```","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\n"},{"subtask_id":"s3","comment":"API allows this to be a string instead of list\r\n```suggestion\r\n for exec_cmd in variadic(pp_def.get('exec_cmd', [])):\r\n```","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\n"},{"subtask_id":"s3","comment":"better name?\r\n```suggestion\r\n 'allow-unsafe-exec-expansion',\r\n```","revised_diff":"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex ab25540642af..c64f4c4363a1 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\n+ 'allow-unsafe-exec-expansion',\n }, 'aliases': {\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\n '2023': ['2024', 'prefer-vp9-sort'],\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\n help=(\n 'Execute a command, optionally prefixed with when to execute it, separated by a \":\". '\n 'Supported values of \"WHEN\" are the same as that of --use-postprocessor (default: after_move). '\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\n+ 'however, for security reasons the only allowed conversions are: '\n+ '\"i\"/\"d\" (signed integer decimal), \"f\" (floating-point decimal) and \"q\" (shell-quoted). '\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\n 'This option can be used multiple times'))\n postproc.add_option(\n"},{"subtask_id":"s3","comment":"```suggestion\r\n 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\r\n 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\r\n```","revised_diff":"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex ab25540642af..c64f4c4363a1 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\n+ 'allow-unsafe-exec-expansion',\n }, 'aliases': {\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\n '2023': ['2024', 'prefer-vp9-sort'],\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\n help=(\n 'Execute a command, optionally prefixed with when to execute it, separated by a \":\". '\n 'Supported values of \"WHEN\" are the same as that of --use-postprocessor (default: after_move). '\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\n+ 'however, for security reasons the only allowed conversions are: '\n+ '\"i\"/\"d\" (signed integer decimal), \"f\" (floating-point decimal) and \"q\" (shell-quoted). '\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\n 'This option can be used multiple times'))\n postproc.add_option(\n"},{"subtask_id":"s3","comment":"better name?\r\n```suggestion\r\n '2025': ['allow-unsafe-exec-expansion'],\r\n```\r\n\r\n\r\n \r\n\r\nor omit it from the annual aliases altogether (since it's security-related)?\r\n\r\n```suggestion\r\n '2025': [],\r\n```","revised_diff":"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex ab25540642af..c64f4c4363a1 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\n+ 'allow-unsafe-exec-expansion',\n }, 'aliases': {\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\n '2023': ['2024', 'prefer-vp9-sort'],\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\n help=(\n 'Execute a command, optionally prefixed with when to execute it, separated by a \":\". '\n 'Supported values of \"WHEN\" are the same as that of --use-postprocessor (default: after_move). '\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\n+ 'however, for security reasons the only allowed conversions are: '\n+ '\"i\"/\"d\" (signed integer decimal), \"f\" (floating-point decimal) and \"q\" (shell-quoted). '\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\n 'This option can be used multiple times'))\n postproc.add_option(\n"},{"subtask_id":"s3","comment":"```suggestion\r\n if pp_key == 'Exec' and 'allow-unsafe-exec-expansion' not in self.params['compat_opts']:\r\n```","revised_diff":"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\n"},{"subtask_id":"s1","comment":"better name?\r\n```suggestion\r\n* `--compat-options 2025`: Same as `--compat-options allow-unsafe-exec-expansion`\r\n```\r\n\r\n \r\n\r\nor omit it from the annual aliases altogether (since it's security-related)?\r\n```suggestion\r\n* `--compat-options 2025`: Currently does nothing. Use this to enable all future compat options\r\n```","revised_diff":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \n"},{"subtask_id":"s1","comment":"```suggestion\r\n* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\r\n* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\r\n```","revised_diff":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \n"},{"subtask_id":"s1","comment":"better name?\r\n\r\n```suggestion\r\n* The `--exec` option allows output template syntax to be used in its commands, but for security reasons the conversions that can be used are restricted to `d` (digit) and `q` (shell-quote). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. Use `--compat-opts allow-unsafe-exec-expansion` to revert this restriction\r\n```","revised_diff":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \n"},{"subtask_id":"s1","comment":"Last question I have:\r\n\r\nDo we keep this here, or move it down below under \"The following compat options restore vulnerable behavior from before security patches:\" to be with `allow-unsafe-ext` ?","revised_diff":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \n"},{"subtask_id":"s2","comment":"This implicit capture is quite hard to follow. Maybe we could do this instead:\n```py\n ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\n self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\n```","revised_diff":"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\nindex d58a97fc6ee9..ad595d6b70c6 100644\n--- a/test/test_postprocessors.py\n+++ b/test/test_postprocessors.py\n@@ -11,7 +11,10 @@\n import subprocess\n \n from yt_dlp import YoutubeDL\n-from yt_dlp.utils import shell_quote\n+from yt_dlp.utils import (\n+ UnsafeExecExpansionError,\n+ shell_quote,\n+)\n from yt_dlp.postprocessor import (\n ExecPP,\n FFmpegThumbnailsConvertorPP,\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\n \n+ def test_unsafe_exec_expansion(self):\n+ # Test unsafe placeholder\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\n+\n+ ydl = YoutubeDL()\n+ # Test unsafe commands\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)s\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title).100B\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)S\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)#j\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\n+ # Test safe commands\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo',\n+ 'echo {}',\n+ 'echo %(title)q',\n+ 'echo %(title|NA)q',\n+ 'echo %(title)#q',\n+ 'echo %(view_count)i',\n+ 'echo %(view_count)02d',\n+ 'echo %(aspect_ratio)f',\n+ 'echo %(aspect_ratio).2f',\n+ ]),\n+ ExecPP)\n+\n+ # Test compat opt\n+ ydl = YoutubeDL({\n+ 'outtmpl_na_placeholder': ';',\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\n+ })\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo \"%(title)s\"',\n+ 'echo %(title)q',\n+ 'echo \"%(title).100B\"',\n+ 'echo \"%(title)S\"',\n+ 'echo \"%(title)#S\"',\n+ 'echo \"%(title)j\"',\n+ 'echo \"%(title)#j\"',\n+ 'echo %(title|;)q',\n+ ]),\n+ ExecPP)\n+\n \n class TestModifyChaptersPP(unittest.TestCase):\n def setUp(self):\n"},{"subtask_id":"s4","comment":"Should consider moving this to an override of `def set_downloader`, so that it also works if someone `ExecPP(None, 'asdad').set_downloader(ydl)`?","revised_diff":"diff --git a/yt_dlp/postprocessor/exec.py b/yt_dlp/postprocessor/exec.py\nindex 243487dd25a4..ac5708b10e2d 100644\n--- a/yt_dlp/postprocessor/exec.py\n+++ b/yt_dlp/postprocessor/exec.py\n@@ -5,8 +5,17 @@\n class ExecPP(PostProcessor):\n \n def __init__(self, downloader, exec_cmd):\n- PostProcessor.__init__(self, downloader)\n+ # Need to set exec_cmd attribute before set_downloader is called by PostProcessor.__init__\n self.exec_cmd = variadic(exec_cmd)\n+ PostProcessor.__init__(self, downloader)\n+\n+ def set_downloader(self, downloader):\n+ super().set_downloader(downloader)\n+ # Validate safety of exec commands\n+ params = getattr(self._downloader, 'params', None)\n+ if params and 'allow-unsafe-exec-expansion' not in params['compat_opts']:\n+ for cmd in self.exec_cmd:\n+ _ = self._downloader.prepare_outtmpl(cmd, {}, _exec=True)\n \n def parse_cmd(self, cmd, info):\n tmpl, tmpl_dict = self._downloader.prepare_outtmpl(cmd, info)\n"},{"subtask_id":"s2","comment":"Mayhaps this?\n```suggestion\n self.assertIsInstance(test([\n 'echo',\n 'echo {}',\n 'echo %(title)q',\n 'echo %(title|NA)q',\n 'echo %(title)#q',\n 'echo %(view_count)i',\n 'echo %(view_count)02d',\n 'echo %(aspect_ratio)f',\n 'echo %(aspect_ratio).2f',\n ]), ExecPP)\n```","revised_diff":"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\nindex d58a97fc6ee9..ad595d6b70c6 100644\n--- a/test/test_postprocessors.py\n+++ b/test/test_postprocessors.py\n@@ -11,7 +11,10 @@\n import subprocess\n \n from yt_dlp import YoutubeDL\n-from yt_dlp.utils import shell_quote\n+from yt_dlp.utils import (\n+ UnsafeExecExpansionError,\n+ shell_quote,\n+)\n from yt_dlp.postprocessor import (\n ExecPP,\n FFmpegThumbnailsConvertorPP,\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\n \n+ def test_unsafe_exec_expansion(self):\n+ # Test unsafe placeholder\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\n+\n+ ydl = YoutubeDL()\n+ # Test unsafe commands\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)s\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title).100B\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)S\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)#j\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\n+ # Test safe commands\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo',\n+ 'echo {}',\n+ 'echo %(title)q',\n+ 'echo %(title|NA)q',\n+ 'echo %(title)#q',\n+ 'echo %(view_count)i',\n+ 'echo %(view_count)02d',\n+ 'echo %(aspect_ratio)f',\n+ 'echo %(aspect_ratio).2f',\n+ ]),\n+ ExecPP)\n+\n+ # Test compat opt\n+ ydl = YoutubeDL({\n+ 'outtmpl_na_placeholder': ';',\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\n+ })\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo \"%(title)s\"',\n+ 'echo %(title)q',\n+ 'echo \"%(title).100B\"',\n+ 'echo \"%(title)S\"',\n+ 'echo \"%(title)#S\"',\n+ 'echo \"%(title)j\"',\n+ 'echo \"%(title)#j\"',\n+ 'echo %(title|;)q',\n+ ]),\n+ ExecPP)\n+\n \n class TestModifyChaptersPP(unittest.TestCase):\n def setUp(self):\n"}],"string":"[\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"do we want to allow `'S'` (filename-sanitized)?\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"These should be string literals imo\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"Id without the discard, as the try catch and comment make it obvious\\n```suggestion\\n self.prepare_outtmpl(exec_cmd, {}, _exec=True)\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"API allows this to be a string instead of list\\r\\n```suggestion\\r\\n for exec_cmd in variadic(pp_def.get('exec_cmd', [])):\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"better name?\\r\\n```suggestion\\r\\n 'allow-unsafe-exec-expansion',\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\\nindex ab25540642af..c64f4c4363a1 100644\\n--- a/yt_dlp/options.py\\n+++ b/yt_dlp/options.py\\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\\n+ 'allow-unsafe-exec-expansion',\\n }, 'aliases': {\\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\\n '2023': ['2024', 'prefer-vp9-sort'],\\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n help=(\\n 'Execute a command, optionally prefixed with when to execute it, separated by a \\\":\\\". '\\n 'Supported values of \\\"WHEN\\\" are the same as that of --use-postprocessor (default: after_move). '\\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\\n+ 'however, for security reasons the only allowed conversions are: '\\n+ '\\\"i\\\"/\\\"d\\\" (signed integer decimal), \\\"f\\\" (floating-point decimal) and \\\"q\\\" (shell-quoted). '\\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\\n 'This option can be used multiple times'))\\n postproc.add_option(\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"```suggestion\\r\\n 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\r\\n 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\\nindex ab25540642af..c64f4c4363a1 100644\\n--- a/yt_dlp/options.py\\n+++ b/yt_dlp/options.py\\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\\n+ 'allow-unsafe-exec-expansion',\\n }, 'aliases': {\\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\\n '2023': ['2024', 'prefer-vp9-sort'],\\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n help=(\\n 'Execute a command, optionally prefixed with when to execute it, separated by a \\\":\\\". '\\n 'Supported values of \\\"WHEN\\\" are the same as that of --use-postprocessor (default: after_move). '\\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\\n+ 'however, for security reasons the only allowed conversions are: '\\n+ '\\\"i\\\"/\\\"d\\\" (signed integer decimal), \\\"f\\\" (floating-point decimal) and \\\"q\\\" (shell-quoted). '\\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\\n 'This option can be used multiple times'))\\n postproc.add_option(\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"better name?\\r\\n```suggestion\\r\\n '2025': ['allow-unsafe-exec-expansion'],\\r\\n```\\r\\n\\r\\n\\r\\n \\r\\n\\r\\nor omit it from the annual aliases altogether (since it's security-related)?\\r\\n\\r\\n```suggestion\\r\\n '2025': [],\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/options.py b/yt_dlp/options.py\\nindex ab25540642af..c64f4c4363a1 100644\\n--- a/yt_dlp/options.py\\n+++ b/yt_dlp/options.py\\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\\n+ 'allow-unsafe-exec-expansion',\\n }, 'aliases': {\\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\\n '2023': ['2024', 'prefer-vp9-sort'],\\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\\n help=(\\n 'Execute a command, optionally prefixed with when to execute it, separated by a \\\":\\\". '\\n 'Supported values of \\\"WHEN\\\" are the same as that of --use-postprocessor (default: after_move). '\\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\\n+ 'however, for security reasons the only allowed conversions are: '\\n+ '\\\"i\\\"/\\\"d\\\" (signed integer decimal), \\\"f\\\" (floating-point decimal) and \\\"q\\\" (shell-quoted). '\\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\\n 'This option can be used multiple times'))\\n postproc.add_option(\\n\"\n },\n {\n \"subtask_id\": \"s3\",\n \"comment\": \"```suggestion\\r\\n if pp_key == 'Exec' and 'allow-unsafe-exec-expansion' not in self.params['compat_opts']:\\r\\n```\",\n \"revised_diff\": \"diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\\nindex 7db6303d4fda..8ce01d52335b 100644\\n--- a/yt_dlp/YoutubeDL.py\\n+++ b/yt_dlp/YoutubeDL.py\\n@@ -112,6 +112,7 @@\\n RejectedVideoReached,\\n SameFileError,\\n UnavailableVideoError,\\n+ UnsafeExecExpansionError,\\n UserNotLive,\\n YoutubeDLError,\\n age_restricted,\\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\\n for pp_def_raw in self.params.get('postprocessors', []):\\n pp_def = dict(pp_def_raw)\\n when = pp_def.pop('when', 'post_process')\\n- self.add_post_processor(\\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n- when=when)\\n+ # Handle errors for ExecPP command validation\\n+ try:\\n+ self.add_post_processor(\\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\\n+ when=when)\\n+ except UnsafeExecExpansionError as e:\\n+ self.report_error(e)\\n+ raise\\n \\n def preload_download_archive(fn):\\n \\\"\\\"\\\"Preload the archive, if any is specified\\\"\\\"\\\"\\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\\n info_dict.pop('__pending_error', None)\\n return info_dict\\n \\n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\\n \\\"\\\"\\\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\\n @param sanitize Whether to sanitize the output as a filename\\n \\\"\\\"\\\"\\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\\n (?:&(?P<replacement>.*?))?\\n (?:\\\\|(?P<default>.*?))?\\n )$''')\\n+ SAFE_EXEC_CONVERSIONS = 'difq'\\n+ UNSAFE_DEFAULT_CHARS = '\\\"\\\\' \\\\n\\\\t;&|^$%*<>{}()[]`#\\\\\\\\'\\n \\n def _from_user_input(field):\\n if field == ':':\\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\\n fmt = f'0{field_size_compat_map[last_field]:d}d'\\n \\n+ # Validate safety of exec commands\\n+ if _exec:\\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\\n+ if default == na:\\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\\n+ else:\\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\\n+\\n flags = outer_mobj.group('conversion') or ''\\n str_fmt = f'{fmt[:-1]}s'\\n if value is None:\\n\"\n },\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"better name?\\r\\n```suggestion\\r\\n* `--compat-options 2025`: Same as `--compat-options allow-unsafe-exec-expansion`\\r\\n```\\r\\n\\r\\n \\r\\n\\r\\nor omit it from the annual aliases altogether (since it's security-related)?\\r\\n```suggestion\\r\\n* `--compat-options 2025`: Currently does nothing. Use this to enable all future compat options\\r\\n```\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex 09e290b89dbc..e334bec8ed41 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\\n * The sub-modules `swfinterp`, `casefold` are removed.\\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n For convenience, there are some compat option aliases available to use:\\n \\n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\\n \\n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\\n >\\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\\n+\\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\\n+\\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\\n+\\n \\n ### Deprecated options\\n \\n\"\n },\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"```suggestion\\r\\n* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\r\\n* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\r\\n```\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex 09e290b89dbc..e334bec8ed41 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\\n * The sub-modules `swfinterp`, `casefold` are removed.\\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n For convenience, there are some compat option aliases available to use:\\n \\n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\\n \\n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\\n >\\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\\n+\\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\\n+\\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\\n+\\n \\n ### Deprecated options\\n \\n\"\n },\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"better name?\\r\\n\\r\\n```suggestion\\r\\n* The `--exec` option allows output template syntax to be used in its commands, but for security reasons the conversions that can be used are restricted to `d` (digit) and `q` (shell-quote). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. Use `--compat-opts allow-unsafe-exec-expansion` to revert this restriction\\r\\n```\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex 09e290b89dbc..e334bec8ed41 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\\n * The sub-modules `swfinterp`, `casefold` are removed.\\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n For convenience, there are some compat option aliases available to use:\\n \\n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\\n \\n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\\n >\\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\\n+\\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\\n+\\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\\n+\\n \\n ### Deprecated options\\n \\n\"\n },\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"Last question I have:\\r\\n\\r\\nDo we keep this here, or move it down below under \\\"The following compat options restore vulnerable behavior from before security patches:\\\" to be with `allow-unsafe-ext` ?\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex 09e290b89dbc..e334bec8ed41 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\\n * The sub-modules `swfinterp`, `casefold` are removed.\\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\\n For convenience, there are some compat option aliases available to use:\\n \\n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\\n \\n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\\n >\\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\\n+\\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\\n+\\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\\n+\\n \\n ### Deprecated options\\n \\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"This implicit capture is quite hard to follow. Maybe we could do this instead:\\n```py\\n ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\\n self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\\n```\",\n \"revised_diff\": \"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\\nindex d58a97fc6ee9..ad595d6b70c6 100644\\n--- a/test/test_postprocessors.py\\n+++ b/test/test_postprocessors.py\\n@@ -11,7 +11,10 @@\\n import subprocess\\n \\n from yt_dlp import YoutubeDL\\n-from yt_dlp.utils import shell_quote\\n+from yt_dlp.utils import (\\n+ UnsafeExecExpansionError,\\n+ shell_quote,\\n+)\\n from yt_dlp.postprocessor import (\\n ExecPP,\\n FFmpegThumbnailsConvertorPP,\\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\\n \\n+ def test_unsafe_exec_expansion(self):\\n+ # Test unsafe placeholder\\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\\n+\\n+ ydl = YoutubeDL()\\n+ # Test unsafe commands\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)s\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title).100B\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)S\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)#j\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\\n+ # Test safe commands\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo',\\n+ 'echo {}',\\n+ 'echo %(title)q',\\n+ 'echo %(title|NA)q',\\n+ 'echo %(title)#q',\\n+ 'echo %(view_count)i',\\n+ 'echo %(view_count)02d',\\n+ 'echo %(aspect_ratio)f',\\n+ 'echo %(aspect_ratio).2f',\\n+ ]),\\n+ ExecPP)\\n+\\n+ # Test compat opt\\n+ ydl = YoutubeDL({\\n+ 'outtmpl_na_placeholder': ';',\\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\\n+ })\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo \\\"%(title)s\\\"',\\n+ 'echo %(title)q',\\n+ 'echo \\\"%(title).100B\\\"',\\n+ 'echo \\\"%(title)S\\\"',\\n+ 'echo \\\"%(title)#S\\\"',\\n+ 'echo \\\"%(title)j\\\"',\\n+ 'echo \\\"%(title)#j\\\"',\\n+ 'echo %(title|;)q',\\n+ ]),\\n+ ExecPP)\\n+\\n \\n class TestModifyChaptersPP(unittest.TestCase):\\n def setUp(self):\\n\"\n },\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"Should consider moving this to an override of `def set_downloader`, so that it also works if someone `ExecPP(None, 'asdad').set_downloader(ydl)`?\",\n \"revised_diff\": \"diff --git a/yt_dlp/postprocessor/exec.py b/yt_dlp/postprocessor/exec.py\\nindex 243487dd25a4..ac5708b10e2d 100644\\n--- a/yt_dlp/postprocessor/exec.py\\n+++ b/yt_dlp/postprocessor/exec.py\\n@@ -5,8 +5,17 @@\\n class ExecPP(PostProcessor):\\n \\n def __init__(self, downloader, exec_cmd):\\n- PostProcessor.__init__(self, downloader)\\n+ # Need to set exec_cmd attribute before set_downloader is called by PostProcessor.__init__\\n self.exec_cmd = variadic(exec_cmd)\\n+ PostProcessor.__init__(self, downloader)\\n+\\n+ def set_downloader(self, downloader):\\n+ super().set_downloader(downloader)\\n+ # Validate safety of exec commands\\n+ params = getattr(self._downloader, 'params', None)\\n+ if params and 'allow-unsafe-exec-expansion' not in params['compat_opts']:\\n+ for cmd in self.exec_cmd:\\n+ _ = self._downloader.prepare_outtmpl(cmd, {}, _exec=True)\\n \\n def parse_cmd(self, cmd, info):\\n tmpl, tmpl_dict = self._downloader.prepare_outtmpl(cmd, info)\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"Mayhaps this?\\n```suggestion\\n self.assertIsInstance(test([\\n 'echo',\\n 'echo {}',\\n 'echo %(title)q',\\n 'echo %(title|NA)q',\\n 'echo %(title)#q',\\n 'echo %(view_count)i',\\n 'echo %(view_count)02d',\\n 'echo %(aspect_ratio)f',\\n 'echo %(aspect_ratio).2f',\\n ]), ExecPP)\\n```\",\n \"revised_diff\": \"diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\\nindex d58a97fc6ee9..ad595d6b70c6 100644\\n--- a/test/test_postprocessors.py\\n+++ b/test/test_postprocessors.py\\n@@ -11,7 +11,10 @@\\n import subprocess\\n \\n from yt_dlp import YoutubeDL\\n-from yt_dlp.utils import shell_quote\\n+from yt_dlp.utils import (\\n+ UnsafeExecExpansionError,\\n+ shell_quote,\\n+)\\n from yt_dlp.postprocessor import (\\n ExecPP,\\n FFmpegThumbnailsConvertorPP,\\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\\n \\n+ def test_unsafe_exec_expansion(self):\\n+ # Test unsafe placeholder\\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\\n+\\n+ ydl = YoutubeDL()\\n+ # Test unsafe commands\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)s\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title).100B\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)S\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \\\"%(title)#j\\\"')\\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\\n+ # Test safe commands\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo',\\n+ 'echo {}',\\n+ 'echo %(title)q',\\n+ 'echo %(title|NA)q',\\n+ 'echo %(title)#q',\\n+ 'echo %(view_count)i',\\n+ 'echo %(view_count)02d',\\n+ 'echo %(aspect_ratio)f',\\n+ 'echo %(aspect_ratio).2f',\\n+ ]),\\n+ ExecPP)\\n+\\n+ # Test compat opt\\n+ ydl = YoutubeDL({\\n+ 'outtmpl_na_placeholder': ';',\\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\\n+ })\\n+ self.assertIsInstance(\\n+ ExecPP(ydl, [\\n+ 'echo \\\"%(title)s\\\"',\\n+ 'echo %(title)q',\\n+ 'echo \\\"%(title).100B\\\"',\\n+ 'echo \\\"%(title)S\\\"',\\n+ 'echo \\\"%(title)#S\\\"',\\n+ 'echo \\\"%(title)j\\\"',\\n+ 'echo \\\"%(title)#j\\\"',\\n+ 'echo %(title|;)q',\\n+ ]),\\n+ ExecPP)\\n+\\n \\n class TestModifyChaptersPP(unittest.TestCase):\\n def setUp(self):\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g. self-signed), use `--compat-options no-certifi`\n * yt-dlp's sanitization of invalid characters in filenames is different/smarter than in youtube-dl. You can use `--compat-options filename-sanitization` to revert to youtube-dl's behavior\n * ~~yt-dlp tries to parse the external downloader outputs into the standard progress output if possible (Currently implemented: [aria2c](https://github.com/yt-dlp/yt-dlp/issues/5931)). You can use `--compat-options no-external-downloader-progress` to get the downloader output as-is~~\n-* yt-dlp versions between 2021.09.01 and 2023.01.02 applies `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n-* yt-dlp versions between 2021.11.10 and 2023.06.21 estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n+* yt-dlp versions from 2021.09.01 to 2022.11.11 (inclusive) applied `--match-filters` to nested playlists. This was an unintentional side-effect of [8f18ac](https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88) and is fixed in [d7b460](https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80). Use `--compat-options playlist-match-filter` to revert this\n+* yt-dlp versions from 2021.11.10 to 2023.06.21 (inclusive) estimated `filesize_approx` values for fragmented/manifest formats. This was added for convenience in [f2fe69](https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a), but was reverted in [0dff8e](https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f) due to the potentially extreme inaccuracy of the estimated values. Use `--compat-options manifest-filesize-approx` to keep extracting the estimated values\n * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.\n * The sub-modules `swfinterp`, `casefold` are removed.\n * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.\n@@ -2342,8 +2342,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n For convenience, there are some compat option aliases available to use:\n \n * `--compat-options all`: Use all compat options (**Do NOT use this!**)\n-* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n-* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`\n+* `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n+* `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort,-allow-unsafe-exec-expansion`\n * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`\n * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`\n * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`\n@@ -2358,7 +2358,12 @@ The following compat options restore vulnerable behavior from before security pa\n \n > :warning: Only use if a valid file download is rejected because its extension is detected as uncommon\n >\n- > **This option can enable remote code execution! Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!**\n+ > **This option can enable remote code execution!** Consider [opening an issue](<https://github.com/yt-dlp/yt-dlp/issues/new/choose>) instead!\n+\n+* `--compat-options allow-unsafe-exec-expansion`: The `--exec` option allows output template syntax to be used in its commands; however, for security reasons the conversions that can be used are restricted to `i`/`d` (signed integer decimal), `f` (floating-point decimal) and `q` (shell-quoted). yt-dlp versions from 2021.04.11 to 2026.03.17 (inclusive) did not apply this restriction. This option reverts this restriction\n+\n+ > :warning: **This option can enable remote code execution!** Consider using `%()q` conversions in your exec command templates for any string values.\n+\n \n ### Deprecated options\n \ndiff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n SameFileError,\n UnavailableVideoError,\n+ UnsafeExecExpansionError,\n UserNotLive,\n YoutubeDLError,\n age_restricted,\n@@ -826,9 +827,14 @@ def check_deprecated(param, option, suggestion):\n for pp_def_raw in self.params.get('postprocessors', []):\n pp_def = dict(pp_def_raw)\n when = pp_def.pop('when', 'post_process')\n- self.add_post_processor(\n- get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n- when=when)\n+ # Handle errors for ExecPP command validation\n+ try:\n+ self.add_post_processor(\n+ get_postprocessor(pp_def.pop('key'))(self, **pp_def),\n+ when=when)\n+ except UnsafeExecExpansionError as e:\n+ self.report_error(e)\n+ raise\n \n def preload_download_archive(fn):\n \"\"\"Preload the archive, if any is specified\"\"\"\n@@ -1254,7 +1260,7 @@ def _copy_infodict(info_dict):\n info_dict.pop('__pending_error', None)\n return info_dict\n \n- def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n+ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False, *, _exec=False):\n \"\"\" Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict\n @param sanitize Whether to sanitize the output as a filename\n \"\"\"\n@@ -1305,6 +1311,8 @@ def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):\n (?:&(?P<replacement>.*?))?\n (?:\\|(?P<default>.*?))?\n )$''')\n+ SAFE_EXEC_CONVERSIONS = 'difq'\n+ UNSAFE_DEFAULT_CHARS = '\"\\' \\n\\t;&|^$%*<>{}()[]`#\\\\'\n \n def _from_user_input(field):\n if field == ':':\n@@ -1429,6 +1437,16 @@ def create_key(outer_mobj):\n if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):\n fmt = f'0{field_size_compat_map[last_field]:d}d'\n \n+ # Validate safety of exec commands\n+ if _exec:\n+ if fmt[-1] not in SAFE_EXEC_CONVERSIONS:\n+ raise UnsafeExecExpansionError(f'Unsafe conversion(s) in exec command: {outtmpl!r}')\n+ elif any(unsafe_char in default for unsafe_char in UNSAFE_DEFAULT_CHARS):\n+ if default == na:\n+ raise UnsafeExecExpansionError(f'Unsafe placeholder for exec command: {na!r}')\n+ else:\n+ raise UnsafeExecExpansionError(f'Unsafe default(s) in exec command: {outtmpl!r}')\n+\n flags = outer_mobj.group('conversion') or ''\n str_fmt = f'{fmt[:-1]}s'\n if value is None:\ndiff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py\nindex 2f6ba478326e..18cf4c8d2c3f 100644\n--- a/yt_dlp/__init__.py\n+++ b/yt_dlp/__init__.py\n@@ -44,6 +44,7 @@\n GeoUtils,\n PlaylistEntries,\n SameFileError,\n+ UnsafeExecExpansionError,\n download_range_func,\n expand_path,\n float_or_none,\n@@ -1077,7 +1078,7 @@ def main(argv=None):\n IN_CLI.value = True\n try:\n _exit(*variadic(_real_main(argv)))\n- except (CookieLoadError, DownloadError):\n+ except (CookieLoadError, DownloadError, UnsafeExecExpansionError):\n _exit(1)\n except SameFileError as e:\n _exit(f'ERROR: {e}')\ndiff --git a/yt_dlp/options.py b/yt_dlp/options.py\nindex ab25540642af..c64f4c4363a1 100644\n--- a/yt_dlp/options.py\n+++ b/yt_dlp/options.py\n@@ -568,9 +568,10 @@ def _preset_alias_callback(option, opt_str, value, parser):\n 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',\n 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',\n 'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',\n+ 'allow-unsafe-exec-expansion',\n }, 'aliases': {\n- 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n- 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],\n+ 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n+ 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort', '-allow-unsafe-exec-expansion'],\n '2021': ['2022', 'no-certifi', 'filename-sanitization'],\n '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],\n '2023': ['2024', 'prefer-vp9-sort'],\n@@ -1769,7 +1770,9 @@ def _preset_alias_callback(option, opt_str, value, parser):\n help=(\n 'Execute a command, optionally prefixed with when to execute it, separated by a \":\". '\n 'Supported values of \"WHEN\" are the same as that of --use-postprocessor (default: after_move). '\n- 'The same syntax as the output template can be used to pass any field as arguments to the command. '\n+ 'The same syntax as the output template can be used to pass any field as arguments to the command; '\n+ 'however, for security reasons the only allowed conversions are: '\n+ '\"i\"/\"d\" (signed integer decimal), \"f\" (floating-point decimal) and \"q\" (shell-quoted). '\n 'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '\n 'This option can be used multiple times'))\n postproc.add_option(\ndiff --git a/yt_dlp/postprocessor/exec.py b/yt_dlp/postprocessor/exec.py\nindex 243487dd25a4..ac5708b10e2d 100644\n--- a/yt_dlp/postprocessor/exec.py\n+++ b/yt_dlp/postprocessor/exec.py\n@@ -5,8 +5,17 @@\n class ExecPP(PostProcessor):\n \n def __init__(self, downloader, exec_cmd):\n- PostProcessor.__init__(self, downloader)\n+ # Need to set exec_cmd attribute before set_downloader is called by PostProcessor.__init__\n self.exec_cmd = variadic(exec_cmd)\n+ PostProcessor.__init__(self, downloader)\n+\n+ def set_downloader(self, downloader):\n+ super().set_downloader(downloader)\n+ # Validate safety of exec commands\n+ params = getattr(self._downloader, 'params', None)\n+ if params and 'allow-unsafe-exec-expansion' not in params['compat_opts']:\n+ for cmd in self.exec_cmd:\n+ _ = self._downloader.prepare_outtmpl(cmd, {}, _exec=True)\n \n def parse_cmd(self, cmd, info):\n tmpl, tmpl_dict = self._downloader.prepare_outtmpl(cmd, info)\ndiff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 74bb6dcdb174..34388e6fe68a 100644\n--- a/yt_dlp/utils/_utils.py\n+++ b/yt_dlp/utils/_utils.py\n@@ -1182,6 +1182,10 @@ class XAttrUnavailableError(YoutubeDLError):\n pass\n \n \n+class UnsafeExecExpansionError(YoutubeDLError):\n+ pass\n+\n+\n def is_path_like(f):\n return isinstance(f, (str, bytes, os.PathLike))\n \n\ndiff --git a/test/test_postprocessors.py b/test/test_postprocessors.py\nindex d58a97fc6ee9..ad595d6b70c6 100644\n--- a/test/test_postprocessors.py\n+++ b/test/test_postprocessors.py\n@@ -11,7 +11,10 @@\n import subprocess\n \n from yt_dlp import YoutubeDL\n-from yt_dlp.utils import shell_quote\n+from yt_dlp.utils import (\n+ UnsafeExecExpansionError,\n+ shell_quote,\n+)\n from yt_dlp.postprocessor import (\n ExecPP,\n FFmpegThumbnailsConvertorPP,\n@@ -91,6 +94,51 @@ def test_parse_cmd(self):\n self.assertEqual(pp.parse_cmd('echo {}', info), cmd)\n self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)\n \n+ def test_unsafe_exec_expansion(self):\n+ # Test unsafe placeholder\n+ ydl = YoutubeDL({'outtmpl_na_placeholder': ';'})\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe placeholder', ExecPP, ydl, 'echo %(title)q')\n+\n+ ydl = YoutubeDL()\n+ # Test unsafe commands\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)s\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title).100B\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)S\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe conversion', ExecPP, ydl, 'echo \"%(title)#j\"')\n+ self.assertRaisesRegex(UnsafeExecExpansionError, r'Unsafe default', ExecPP, ydl, 'echo %(title|;)q')\n+ # Test safe commands\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo',\n+ 'echo {}',\n+ 'echo %(title)q',\n+ 'echo %(title|NA)q',\n+ 'echo %(title)#q',\n+ 'echo %(view_count)i',\n+ 'echo %(view_count)02d',\n+ 'echo %(aspect_ratio)f',\n+ 'echo %(aspect_ratio).2f',\n+ ]),\n+ ExecPP)\n+\n+ # Test compat opt\n+ ydl = YoutubeDL({\n+ 'outtmpl_na_placeholder': ';',\n+ 'compat_opts': {'allow-unsafe-exec-expansion'},\n+ })\n+ self.assertIsInstance(\n+ ExecPP(ydl, [\n+ 'echo \"%(title)s\"',\n+ 'echo %(title)q',\n+ 'echo \"%(title).100B\"',\n+ 'echo \"%(title)S\"',\n+ 'echo \"%(title)#S\"',\n+ 'echo \"%(title)j\"',\n+ 'echo \"%(title)#j\"',\n+ 'echo %(title|;)q',\n+ ]),\n+ ExecPP)\n+\n \n class TestModifyChaptersPP(unittest.TestCase):\n def setUp(self):\n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":7,"string":"7"}}},{"rowIdx":34284,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16896"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16896,"string":"16,896"},"base_sha":{"kind":"string","value":"7fdc46d01619afbb2371b0465d6830602013148f"},"head_sha":{"kind":"string","value":"c1e68c43dd875ff23897f45cf5c6d5250b9b5ba5"},"task":{"kind":"string","value":"[ci] Test with Python 3.15\n\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] CI\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [ci] Test with Python 3.15","scope_files":[".github/workflows/challenge-tests.yml",".github/workflows/core.yml"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [ci] Test with Python 3.15\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/core.yml\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/challenge-tests.yml",".github/workflows/core.yml"],"solution_diff":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex f55cf68f47d0..7f0f7078f6d1 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -36,7 +36,7 @@ jobs:\n fail-fast: false\n matrix:\n os: [ubuntu-latest, windows-latest]\n- python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', pypy-3.11]\n+ python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\n env:\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\n steps:\n@@ -47,6 +47,7 @@ jobs:\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\n with:\n python-version: ${{ matrix.python-version }}\n+ allow-prereleases: true\n - name: Install Deno\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex 256d1877986f..d44bf703b78a 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -45,7 +45,7 @@ jobs:\n matrix:\n os: [ubuntu-latest]\n # CPython 3.10 is in quick-test\n- python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]\n+ python-version: ['3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\n include:\n # atleast one of each CPython/PyPy tests must be in windows\n - os: windows-latest\n@@ -58,6 +58,8 @@ jobs:\n python-version: '3.13'\n - os: windows-latest\n python-version: '3.14'\n+ - os: windows-latest\n+ python-version: '3.15'\n - os: windows-latest\n python-version: pypy-3.11\n \n@@ -71,6 +73,7 @@ jobs:\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\n with:\n python-version: ${{ matrix.python-version }}\n+ allow-prereleases: true\n \n - name: Install test requirements (cpython)\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\n","summary":"Edited 2 file(s) in .github/workflows/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/core.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex f55cf68f47d0..7f0f7078f6d1 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -36,7 +36,7 @@ jobs:\\n fail-fast: false\\n matrix:\\n os: [ubuntu-latest, windows-latest]\\n- python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', pypy-3.11]\\n+ python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\\n env:\\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\\n steps:\\n@@ -47,6 +47,7 @@ jobs:\\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\\n with:\\n python-version: ${{ matrix.python-version }}\\n+ allow-prereleases: true\\n - name: Install Deno\\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\\n with:\\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\\nindex 256d1877986f..d44bf703b78a 100644\\n--- a/.github/workflows/core.yml\\n+++ b/.github/workflows/core.yml\\n@@ -45,7 +45,7 @@ jobs:\\n matrix:\\n os: [ubuntu-latest]\\n # CPython 3.10 is in quick-test\\n- python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]\\n+ python-version: ['3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\\n include:\\n # atleast one of each CPython/PyPy tests must be in windows\\n - os: windows-latest\\n@@ -58,6 +58,8 @@ jobs:\\n python-version: '3.13'\\n - os: windows-latest\\n python-version: '3.14'\\n+ - os: windows-latest\\n+ python-version: '3.15'\\n - os: windows-latest\\n python-version: pypy-3.11\\n \\n@@ -71,6 +73,7 @@ jobs:\\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\\n with:\\n python-version: ${{ matrix.python-version }}\\n+ allow-prereleases: true\\n \\n - name: Install test requirements (cpython)\\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\\n\",\n \"summary\": \"Edited 2 file(s) in .github/workflows/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex f55cf68f47d0..7f0f7078f6d1 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -36,7 +36,7 @@ jobs:\n fail-fast: false\n matrix:\n os: [ubuntu-latest, windows-latest]\n- python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', pypy-3.11]\n+ python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\n env:\n QJS_VERSION: '2025-04-26' # Earliest version with rope strings\n steps:\n@@ -47,6 +47,7 @@ jobs:\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\n with:\n python-version: ${{ matrix.python-version }}\n+ allow-prereleases: true\n - name: Install Deno\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex 256d1877986f..d44bf703b78a 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -45,7 +45,7 @@ jobs:\n matrix:\n os: [ubuntu-latest]\n # CPython 3.10 is in quick-test\n- python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]\n+ python-version: ['3.11', '3.12', '3.13', '3.14', '3.15', pypy-3.11]\n include:\n # atleast one of each CPython/PyPy tests must be in windows\n - os: windows-latest\n@@ -58,6 +58,8 @@ jobs:\n python-version: '3.13'\n - os: windows-latest\n python-version: '3.14'\n+ - os: windows-latest\n+ python-version: '3.15'\n - os: windows-latest\n python-version: pypy-3.11\n \n@@ -71,6 +73,7 @@ jobs:\n uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0\n with:\n python-version: ${{ matrix.python-version }}\n+ allow-prereleases: true\n \n - name: Install test requirements (cpython)\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34285,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#2222"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":2222,"string":"2,222"},"base_sha":{"kind":"string","value":"fdeab99eaba64317f4c72ba6384da98f1c4f2687"},"head_sha":{"kind":"string","value":"d3c074036e1e527e20d6b516a2c6da4134e1bff4"},"task":{"kind":"string","value":"[openrec] support movie URLs\n\n### Checklist\r\n\r\n- [X] I'm reporting a site feature request\r\n- [X] I've verified that I'm running yt-dlp version **2021.12.27**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))\r\n- [X] I've checked that all provided URLs are alive and playable in a browser\r\n- [X] I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues including closed ones. DO NOT post duplicates\r\n- [X] I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)\r\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\r\n\r\n### Example URLs\r\n\r\nhttps://www.openrec.tv/movie/nqz5xl5km8v\r\n\r\n\r\n### Description\r\n\r\nIt seems URLs of this form are not supported yet: openrec.tv/movie/random_string\r\n\r\n### Verbose log\r\n\r\n```shell\r\n[debug] Command-line config: ['--ignore-config', 'https://www.openrec.tv/movie/nqz5xl5km8v', '--verbose']\r\n[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, err utf-8, pref UTF-8\r\n[debug] yt-dlp version 2021.12.27 [6223f67a8]\r\n[debug] Python version 3.10.1 (CPython 64bit) - Linux-5.15.12-arch1-1-x86_64-with-glibc2.33\r\n[debug] exe versions: ffmpeg 4.4.1 (setts), ffprobe 4.4.1\r\n[debug] Optional libraries: Cryptodome, mutagen, sqlite, websockets\r\n[debug] Proxy map: {}\r\n[debug] [generic] Extracting URL: https://www.openrec.tv/movie/nqz5xl5km8v\r\n[generic] nqz5xl5km8v: Requesting header\r\nWARNING: [generic] Falling back on generic information extractor.\r\n[generic] nqz5xl5km8v: Downloading webpage\r\n[generic] nqz5xl5km8v: Extracting information\r\n[debug] Looking for video embeds\r\nERROR: Unsupported URL: https://www.openrec.tv/movie/nqz5xl5km8v\r\nTraceback (most recent call last):\r\n File \"/home/user/.local/lib/python3.10/site-packages/yt_dlp/YoutubeDL.py\", line 1353, in wrapper\r\n return func(self, *args, **kwargs)\r\n File \"/home/user/.local/lib/python3.10/site-packages/yt_dlp/YoutubeDL.py\", line 1423, in __extract_info\r\n ie_result = ie.extract(url)\r\n File \"/home/user/.local/lib/python3.10/site-packages/yt_dlp/extractor/common.py\", line 599, in extract\r\n ie_result = self._real_extract(url)\r\n File \"/home/user/.local/lib/python3.10/site-packages/yt_dlp/extractor/generic.py\", line 3829, in _real_extract\r\n raise UnsupportedError(url)\r\nyt_dlp.utils.UnsupportedError: Unsupported URL: https://www.openrec.tv/movie/nqz5xl5km8v\r\n```\n\n[openrec] refactor and add /movie/ support\n\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\n### What is the purpose of your *pull request*?\r\n- [x] Bug fix\r\n- [ ] Improvement\r\n- [x] New extractor\r\n- [ ] New feature\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\nCloses #2218 and some refactors"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `yt_dlp/extractor/` needed for: [openrec] support movie URLs","scope_files":["yt_dlp/extractor/extractors.py","yt_dlp/extractor/openrec.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/` needed for: [openrec] support movie URLs\",\n \"scope_files\": [\n \"yt_dlp/extractor/extractors.py\",\n \"yt_dlp/extractor/openrec.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["yt_dlp/extractor/extractors.py","yt_dlp/extractor/openrec.py"],"solution_diff":"diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\nindex 77d6ef511de4..02236bf6796b 100644\n--- a/yt_dlp/extractor/extractors.py\n+++ b/yt_dlp/extractor/extractors.py\n@@ -1058,6 +1058,7 @@\n from .openrec import (\n OpenRecIE,\n OpenRecCaptureIE,\n+ OpenRecMovieIE,\n )\n from .ora import OraTVIE\n from .orf import (\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nindex d7073ab445bc..7cdc7d17ce27 100644\n--- a/yt_dlp/extractor/openrec.py\n+++ b/yt_dlp/extractor/openrec.py\n@@ -4,51 +4,41 @@\n from .common import InfoExtractor\n from ..utils import (\n ExtractorError,\n+ int_or_none,\n traverse_obj,\n- try_get,\n- unified_strdate\n+ unified_strdate,\n+ unified_timestamp\n )\n from ..compat import compat_str\n \n \n-class OpenRecIE(InfoExtractor):\n- IE_NAME = 'openrec'\n- _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n- _TESTS = [{\n- 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n-\n- window_stores = self._parse_json(\n+class OpenRecBaseIE(InfoExtractor):\n+ def _extract_pagestore(self, webpage, video_id):\n+ return self._parse_json(\n self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+\n+ def _extract_movie(self, webpage, video_id, name, is_live):\n+ window_stores = self._extract_pagestore(webpage, video_id)\n movie_store = traverse_obj(\n window_stores,\n ('v8', 'state', 'movie'),\n ('v8', 'movie'),\n expected_type=dict)\n if not movie_store:\n- raise ExtractorError('Failed to extract live info')\n+ raise ExtractorError(f'Failed to extract {name} info')\n \n title = movie_store.get('title')\n description = movie_store.get('introduction')\n thumbnail = movie_store.get('thumbnailUrl')\n \n- channel_user = movie_store.get('channel', {}).get('user')\n- uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n- uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+ uploader = traverse_obj(movie_store, ('channel', 'user', 'name'), expected_type=compat_str)\n+ uploader_id = traverse_obj(movie_store, ('channel', 'user', 'id'), expected_type=compat_str)\n \n- timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+ timestamp = int_or_none(traverse_obj(movie_store, ('publishedAt', 'time')), scale=1000)\n \n- m3u8_playlists = movie_store.get('media')\n+ m3u8_playlists = movie_store.get('media') or {}\n formats = []\n- for (name, m3u8_url) in m3u8_playlists.items():\n+ for name, m3u8_url in m3u8_playlists.items():\n if not m3u8_url:\n continue\n formats.extend(self._extract_m3u8_formats(\n@@ -66,11 +56,29 @@ def _real_extract(self, url):\n 'uploader': uploader,\n 'uploader_id': uploader_id,\n 'timestamp': timestamp,\n- 'is_live': True,\n+ 'is_live': is_live,\n }\n \n \n-class OpenRecCaptureIE(InfoExtractor):\n+class OpenRecIE(OpenRecBaseIE):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ return self._extract_movie(webpage, video_id, 'live', True)\n+\n+\n+class OpenRecCaptureIE(OpenRecBaseIE):\n IE_NAME = 'openrec:capture'\n _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n _TESTS = [{\n@@ -91,8 +99,7 @@ def _real_extract(self, url):\n video_id = self._match_id(url)\n webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n \n- window_stores = self._parse_json(\n- self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ window_stores = self._extract_pagestore(webpage, video_id)\n movie_store = window_stores.get('movie')\n \n capture_data = window_stores.get('capture')\n@@ -102,17 +109,14 @@ def _real_extract(self, url):\n thumbnail = capture_data.get('thumbnailUrl')\n upload_date = unified_strdate(capture_data.get('createdAt'))\n \n- channel_info = movie_store.get('channel') or {}\n- uploader = channel_info.get('name')\n- uploader_id = channel_info.get('id')\n+ uploader = traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str)\n+ uploader_id = traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str)\n \n- m3u8_url = capture_data.get('source')\n- if not m3u8_url:\n- raise ExtractorError('Cannot extract m3u8 url')\n- formats = self._extract_m3u8_formats(\n- m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n- m3u8_id='hls')\n+ timestamp = traverse_obj(movie_store, 'createdAt', expected_type=compat_str)\n+ timestamp = unified_timestamp(timestamp)\n \n+ formats = self._extract_m3u8_formats(\n+ capture_data.get('source'), video_id, ext='mp4')\n self._sort_formats(formats)\n \n return {\n@@ -120,7 +124,31 @@ def _real_extract(self, url):\n 'title': title,\n 'thumbnail': thumbnail,\n 'formats': formats,\n+ 'timestamp': timestamp,\n 'uploader': uploader,\n 'uploader_id': uploader_id,\n 'upload_date': upload_date,\n }\n+\n+\n+class OpenRecMovieIE(OpenRecBaseIE):\n+ IE_NAME = 'openrec:movie'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/movie/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/movie/nqz5xl5km8v',\n+ 'info_dict': {\n+ 'id': 'nqz5xl5km8v',\n+ 'title': '้ๅฎใณใใฅใใใฃ(Discord)ๅๅ ๆนๆณใ่ชฌๆๅ็ป',\n+ 'description': 'md5:ebd563e5f5b060cda2f02bf26b14d87f',\n+ 'thumbnail': r're:https://.+',\n+ 'uploader': 'ใฟใคใญใจใซใบใใญ',\n+ 'uploader_id': 'taiki_to_kazuhiro',\n+ 'timestamp': 1638856800,\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/movie/%s' % video_id, video_id)\n+\n+ return self._extract_movie(webpage, video_id, 'movie', False)\n","summary":"Edited 2 file(s) in yt_dlp/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"yt_dlp/extractor/extractors.py\",\n \"yt_dlp/extractor/openrec.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\\nindex 77d6ef511de4..02236bf6796b 100644\\n--- a/yt_dlp/extractor/extractors.py\\n+++ b/yt_dlp/extractor/extractors.py\\n@@ -1058,6 +1058,7 @@\\n from .openrec import (\\n OpenRecIE,\\n OpenRecCaptureIE,\\n+ OpenRecMovieIE,\\n )\\n from .ora import OraTVIE\\n from .orf import (\\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\\nindex d7073ab445bc..7cdc7d17ce27 100644\\n--- a/yt_dlp/extractor/openrec.py\\n+++ b/yt_dlp/extractor/openrec.py\\n@@ -4,51 +4,41 @@\\n from .common import InfoExtractor\\n from ..utils import (\\n ExtractorError,\\n+ int_or_none,\\n traverse_obj,\\n- try_get,\\n- unified_strdate\\n+ unified_strdate,\\n+ unified_timestamp\\n )\\n from ..compat import compat_str\\n \\n \\n-class OpenRecIE(InfoExtractor):\\n- IE_NAME = 'openrec'\\n- _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n- _TESTS = [{\\n- 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n- 'only_matching': True,\\n- }, {\\n- 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n- 'only_matching': True,\\n- }]\\n-\\n- def _real_extract(self, url):\\n- video_id = self._match_id(url)\\n- webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n-\\n- window_stores = self._parse_json(\\n+class OpenRecBaseIE(InfoExtractor):\\n+ def _extract_pagestore(self, webpage, video_id):\\n+ return self._parse_json(\\n self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+\\n+ def _extract_movie(self, webpage, video_id, name, is_live):\\n+ window_stores = self._extract_pagestore(webpage, video_id)\\n movie_store = traverse_obj(\\n window_stores,\\n ('v8', 'state', 'movie'),\\n ('v8', 'movie'),\\n expected_type=dict)\\n if not movie_store:\\n- raise ExtractorError('Failed to extract live info')\\n+ raise ExtractorError(f'Failed to extract {name} info')\\n \\n title = movie_store.get('title')\\n description = movie_store.get('introduction')\\n thumbnail = movie_store.get('thumbnailUrl')\\n \\n- channel_user = movie_store.get('channel', {}).get('user')\\n- uploader = try_get(channel_user, lambda x: x['name'], compat_str)\\n- uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\\n+ uploader = traverse_obj(movie_store, ('channel', 'user', 'name'), expected_type=compat_str)\\n+ uploader_id = traverse_obj(movie_store, ('channel', 'user', 'id'), expected_type=compat_str)\\n \\n- timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\\n+ timestamp = int_or_none(traverse_obj(movie_store, ('publishedAt', 'time')), scale=1000)\\n \\n- m3u8_playlists = movie_store.get('media')\\n+ m3u8_playlists = movie_store.get('media') or {}\\n formats = []\\n- for (name, m3u8_url) in m3u8_playlists.items():\\n+ for name, m3u8_url in m3u8_playlists.items():\\n if not m3u8_url:\\n continue\\n formats.extend(self._extract_m3u8_formats(\\n@@ -66,11 +56,29 @@ def _real_extract(self, url):\\n 'uploader': uploader,\\n 'uploader_id': uploader_id,\\n 'timestamp': timestamp,\\n- 'is_live': True,\\n+ 'is_live': is_live,\\n }\\n \\n \\n-class OpenRecCaptureIE(InfoExtractor):\\n+class OpenRecIE(OpenRecBaseIE):\\n+ IE_NAME = 'openrec'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n+ 'only_matching': True,\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n+\\n+ return self._extract_movie(webpage, video_id, 'live', True)\\n+\\n+\\n+class OpenRecCaptureIE(OpenRecBaseIE):\\n IE_NAME = 'openrec:capture'\\n _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/capture/(?P<id>[^/]+)'\\n _TESTS = [{\\n@@ -91,8 +99,7 @@ def _real_extract(self, url):\\n video_id = self._match_id(url)\\n webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\\n \\n- window_stores = self._parse_json(\\n- self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ window_stores = self._extract_pagestore(webpage, video_id)\\n movie_store = window_stores.get('movie')\\n \\n capture_data = window_stores.get('capture')\\n@@ -102,17 +109,14 @@ def _real_extract(self, url):\\n thumbnail = capture_data.get('thumbnailUrl')\\n upload_date = unified_strdate(capture_data.get('createdAt'))\\n \\n- channel_info = movie_store.get('channel') or {}\\n- uploader = channel_info.get('name')\\n- uploader_id = channel_info.get('id')\\n+ uploader = traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str)\\n+ uploader_id = traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str)\\n \\n- m3u8_url = capture_data.get('source')\\n- if not m3u8_url:\\n- raise ExtractorError('Cannot extract m3u8 url')\\n- formats = self._extract_m3u8_formats(\\n- m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\\n- m3u8_id='hls')\\n+ timestamp = traverse_obj(movie_store, 'createdAt', expected_type=compat_str)\\n+ timestamp = unified_timestamp(timestamp)\\n \\n+ formats = self._extract_m3u8_formats(\\n+ capture_data.get('source'), video_id, ext='mp4')\\n self._sort_formats(formats)\\n \\n return {\\n@@ -120,7 +124,31 @@ def _real_extract(self, url):\\n 'title': title,\\n 'thumbnail': thumbnail,\\n 'formats': formats,\\n+ 'timestamp': timestamp,\\n 'uploader': uploader,\\n 'uploader_id': uploader_id,\\n 'upload_date': upload_date,\\n }\\n+\\n+\\n+class OpenRecMovieIE(OpenRecBaseIE):\\n+ IE_NAME = 'openrec:movie'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/movie/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/movie/nqz5xl5km8v',\\n+ 'info_dict': {\\n+ 'id': 'nqz5xl5km8v',\\n+ 'title': '้ๅฎใณใใฅใใใฃ(Discord)ๅๅ ๆนๆณใ่ชฌๆๅ็ป',\\n+ 'description': 'md5:ebd563e5f5b060cda2f02bf26b14d87f',\\n+ 'thumbnail': r're:https://.+',\\n+ 'uploader': 'ใฟใคใญใจใซใบใใญ',\\n+ 'uploader_id': 'taiki_to_kazuhiro',\\n+ 'timestamp': 1638856800,\\n+ },\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/movie/%s' % video_id, video_id)\\n+\\n+ return self._extract_movie(webpage, video_id, 'movie', False)\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\nindex 77d6ef511de4..02236bf6796b 100644\n--- a/yt_dlp/extractor/extractors.py\n+++ b/yt_dlp/extractor/extractors.py\n@@ -1058,6 +1058,7 @@\n from .openrec import (\n OpenRecIE,\n OpenRecCaptureIE,\n+ OpenRecMovieIE,\n )\n from .ora import OraTVIE\n from .orf import (\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nindex d7073ab445bc..7cdc7d17ce27 100644\n--- a/yt_dlp/extractor/openrec.py\n+++ b/yt_dlp/extractor/openrec.py\n@@ -4,51 +4,41 @@\n from .common import InfoExtractor\n from ..utils import (\n ExtractorError,\n+ int_or_none,\n traverse_obj,\n- try_get,\n- unified_strdate\n+ unified_strdate,\n+ unified_timestamp\n )\n from ..compat import compat_str\n \n \n-class OpenRecIE(InfoExtractor):\n- IE_NAME = 'openrec'\n- _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n- _TESTS = [{\n- 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n- 'only_matching': True,\n- }, {\n- 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n- 'only_matching': True,\n- }]\n-\n- def _real_extract(self, url):\n- video_id = self._match_id(url)\n- webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n-\n- window_stores = self._parse_json(\n+class OpenRecBaseIE(InfoExtractor):\n+ def _extract_pagestore(self, webpage, video_id):\n+ return self._parse_json(\n self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+\n+ def _extract_movie(self, webpage, video_id, name, is_live):\n+ window_stores = self._extract_pagestore(webpage, video_id)\n movie_store = traverse_obj(\n window_stores,\n ('v8', 'state', 'movie'),\n ('v8', 'movie'),\n expected_type=dict)\n if not movie_store:\n- raise ExtractorError('Failed to extract live info')\n+ raise ExtractorError(f'Failed to extract {name} info')\n \n title = movie_store.get('title')\n description = movie_store.get('introduction')\n thumbnail = movie_store.get('thumbnailUrl')\n \n- channel_user = movie_store.get('channel', {}).get('user')\n- uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n- uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+ uploader = traverse_obj(movie_store, ('channel', 'user', 'name'), expected_type=compat_str)\n+ uploader_id = traverse_obj(movie_store, ('channel', 'user', 'id'), expected_type=compat_str)\n \n- timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+ timestamp = int_or_none(traverse_obj(movie_store, ('publishedAt', 'time')), scale=1000)\n \n- m3u8_playlists = movie_store.get('media')\n+ m3u8_playlists = movie_store.get('media') or {}\n formats = []\n- for (name, m3u8_url) in m3u8_playlists.items():\n+ for name, m3u8_url in m3u8_playlists.items():\n if not m3u8_url:\n continue\n formats.extend(self._extract_m3u8_formats(\n@@ -66,11 +56,29 @@ def _real_extract(self, url):\n 'uploader': uploader,\n 'uploader_id': uploader_id,\n 'timestamp': timestamp,\n- 'is_live': True,\n+ 'is_live': is_live,\n }\n \n \n-class OpenRecCaptureIE(InfoExtractor):\n+class OpenRecIE(OpenRecBaseIE):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ return self._extract_movie(webpage, video_id, 'live', True)\n+\n+\n+class OpenRecCaptureIE(OpenRecBaseIE):\n IE_NAME = 'openrec:capture'\n _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n _TESTS = [{\n@@ -91,8 +99,7 @@ def _real_extract(self, url):\n video_id = self._match_id(url)\n webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n \n- window_stores = self._parse_json(\n- self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ window_stores = self._extract_pagestore(webpage, video_id)\n movie_store = window_stores.get('movie')\n \n capture_data = window_stores.get('capture')\n@@ -102,17 +109,14 @@ def _real_extract(self, url):\n thumbnail = capture_data.get('thumbnailUrl')\n upload_date = unified_strdate(capture_data.get('createdAt'))\n \n- channel_info = movie_store.get('channel') or {}\n- uploader = channel_info.get('name')\n- uploader_id = channel_info.get('id')\n+ uploader = traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str)\n+ uploader_id = traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str)\n \n- m3u8_url = capture_data.get('source')\n- if not m3u8_url:\n- raise ExtractorError('Cannot extract m3u8 url')\n- formats = self._extract_m3u8_formats(\n- m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n- m3u8_id='hls')\n+ timestamp = traverse_obj(movie_store, 'createdAt', expected_type=compat_str)\n+ timestamp = unified_timestamp(timestamp)\n \n+ formats = self._extract_m3u8_formats(\n+ capture_data.get('source'), video_id, ext='mp4')\n self._sort_formats(formats)\n \n return {\n@@ -120,7 +124,31 @@ def _real_extract(self, url):\n 'title': title,\n 'thumbnail': thumbnail,\n 'formats': formats,\n+ 'timestamp': timestamp,\n 'uploader': uploader,\n 'uploader_id': uploader_id,\n 'upload_date': upload_date,\n }\n+\n+\n+class OpenRecMovieIE(OpenRecBaseIE):\n+ IE_NAME = 'openrec:movie'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/movie/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/movie/nqz5xl5km8v',\n+ 'info_dict': {\n+ 'id': 'nqz5xl5km8v',\n+ 'title': '้ๅฎใณใใฅใใใฃ(Discord)ๅๅ ๆนๆณใ่ชฌๆๅ็ป',\n+ 'description': 'md5:ebd563e5f5b060cda2f02bf26b14d87f',\n+ 'thumbnail': r're:https://.+',\n+ 'uploader': 'ใฟใคใญใจใซใบใใญ',\n+ 'uploader_id': 'taiki_to_kazuhiro',\n+ 'timestamp': 1638856800,\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/movie/%s' % video_id, video_id)\n+\n+ return self._extract_movie(webpage, video_id, 'movie', False)\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34286,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#624"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":624,"string":"624"},"base_sha":{"kind":"string","value":"888299e6ca65009e8ae2809c384ba1ba6b5ae701"},"head_sha":{"kind":"string","value":"867c7a3c32093b1dd197beba21ca62a6ad08ba37"},"task":{"kind":"string","value":"[openrec] add support for openrec.tv\n\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site) and [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) sections\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\nNote that the code is taken from [my fork](https://github.com/ytdl-patched/ytdl-patched/blob/ytdlp/yt_dlp/extractor/openrec.py), which is my own work.\r\n\r\n### What is the purpose of your *pull request*?\r\n- [ ] Bug fix\r\n- [ ] Improvement\r\n- [x] New extractor\r\n- [ ] New feature\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\nThis PR adds support for openrec.tv, which is like Twitch but in Japan. Not geo-restricted I think.\r\n\r\nThis does not support replay-from-start feature for live, because I don't have Premium subscription.\r\n\r\nexample URL for live: https://www.openrec.tv/live/kdr7xq0l38j (running as of writing, but you can find new one at https://www.openrec.tv/popular/live )\r\nexample URL for capture (so-called \"clip\" in Twitch or so): https://www.openrec.tv/capture/kvn4eorkzqe"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [openrec] add support for openrec.tv","scope_files":["README.md"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/extractor/` needed for: [openrec] add support for openrec.tv","scope_files":["yt_dlp/extractor/extractors.py","yt_dlp/extractor/openrec.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [openrec] add support for openrec.tv\",\n \"scope_files\": [\n \"README.md\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/` needed for: [openrec] add support for openrec.tv\",\n \"scope_files\": [\n \"yt_dlp/extractor/extractors.py\",\n \"yt_dlp/extractor/openrec.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["README.md"],"solution_diff":"diff --git a/README.md b/README.md\nindex 7fb2c087404d..9ac50dbe00e2 100644\n--- a/README.md\n+++ b/README.md\n@@ -88,7 +88,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/\n \n * **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats\n \n-* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon\n+* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon, OpenRec\n \n * **Fixed/improved extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu, crackle, curiositystream, mediasite, rmcdecouverte, sonyliv, tubi, tenplay, patreon, videa, yahoo, BravoTV, crunchyroll playlist, RTP, viki, Hotstar, vidio, vimeo, mediaset, Mxplayer\n \n","summary":"Edited 1 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["yt_dlp/extractor/extractors.py","yt_dlp/extractor/openrec.py"],"solution_diff":"diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\nindex e12121073525..99fd7cb78130 100644\n--- a/yt_dlp/extractor/extractors.py\n+++ b/yt_dlp/extractor/extractors.py\n@@ -936,6 +936,10 @@\n OoyalaIE,\n OoyalaExternalIE,\n )\n+from .openrec import (\n+ OpenRecIE,\n+ OpenRecCaptureIE,\n+)\n from .ora import OraTVIE\n from .orf import (\n ORFTVthekIE,\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __future__ import unicode_literals\n+\n+from .common import InfoExtractor\n+from ..utils import (\n+ ExtractorError,\n+ traverse_obj,\n+ try_get,\n+ unified_strdate\n+)\n+from ..compat import compat_str\n+\n+\n+class OpenRecIE(InfoExtractor):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = traverse_obj(\n+ window_stores,\n+ ('v8', 'state', 'movie'),\n+ ('v8', 'movie'),\n+ expected_type=dict)\n+ if not movie_store:\n+ raise ExtractorError('Failed to extract live info')\n+\n+ title = movie_store.get('title')\n+ description = movie_store.get('introduction')\n+ thumbnail = movie_store.get('thumbnailUrl')\n+\n+ channel_user = movie_store.get('channel', {}).get('user')\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+\n+ m3u8_playlists = movie_store.get('media')\n+ formats = []\n+ for (name, m3u8_url) in m3u8_playlists.items():\n+ if not m3u8_url:\n+ continue\n+ formats.extend(self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\n+ m3u8_id='hls-%s' % name, live=True))\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'description': description,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'timestamp': timestamp,\n+ 'is_live': True,\n+ }\n+\n+\n+class OpenRecCaptureIE(InfoExtractor):\n+ IE_NAME = 'openrec:capture'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\n+ 'info_dict': {\n+ 'id': 'mldjr82p7qk',\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\n+ 'uploader': 'ใใใกใใใญใ',\n+ 'uploader_id': 'Yaritaiji',\n+ 'upload_date': '20210803',\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = window_stores.get('movie')\n+\n+ capture_data = window_stores.get('capture')\n+ if not capture_data:\n+ raise ExtractorError('Cannot extract title')\n+ title = capture_data.get('title')\n+ thumbnail = capture_data.get('thumbnailUrl')\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\n+\n+ channel_info = movie_store.get('channel') or {}\n+ uploader = channel_info.get('name')\n+ uploader_id = channel_info.get('id')\n+\n+ m3u8_url = capture_data.get('source')\n+ if not m3u8_url:\n+ raise ExtractorError('Cannot extract m3u8 url')\n+ formats = self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n+ m3u8_id='hls')\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'upload_date': upload_date,\n+ }\n","summary":"Edited 2 file(s) in yt_dlp/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"README.md\"\n ],\n \"solution_diff\": \"diff --git a/README.md b/README.md\\nindex 7fb2c087404d..9ac50dbe00e2 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -88,7 +88,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/\\n \\n * **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats\\n \\n-* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon\\n+* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon, OpenRec\\n \\n * **Fixed/improved extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu, crackle, curiositystream, mediasite, rmcdecouverte, sonyliv, tubi, tenplay, patreon, videa, yahoo, BravoTV, crunchyroll playlist, RTP, viki, Hotstar, vidio, vimeo, mediaset, Mxplayer\\n \\n\",\n \"summary\": \"Edited 1 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/extractor/extractors.py\",\n \"yt_dlp/extractor/openrec.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\\nindex e12121073525..99fd7cb78130 100644\\n--- a/yt_dlp/extractor/extractors.py\\n+++ b/yt_dlp/extractor/extractors.py\\n@@ -936,6 +936,10 @@\\n OoyalaIE,\\n OoyalaExternalIE,\\n )\\n+from .openrec import (\\n+ OpenRecIE,\\n+ OpenRecCaptureIE,\\n+)\\n from .ora import OraTVIE\\n from .orf import (\\n ORFTVthekIE,\\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\\nnew file mode 100644\\nindex 000000000000..d7073ab445bc\\n--- /dev/null\\n+++ b/yt_dlp/extractor/openrec.py\\n@@ -0,0 +1,126 @@\\n+# coding: utf-8\\n+from __future__ import unicode_literals\\n+\\n+from .common import InfoExtractor\\n+from ..utils import (\\n+ ExtractorError,\\n+ traverse_obj,\\n+ try_get,\\n+ unified_strdate\\n+)\\n+from ..compat import compat_str\\n+\\n+\\n+class OpenRecIE(InfoExtractor):\\n+ IE_NAME = 'openrec'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n+ 'only_matching': True,\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = traverse_obj(\\n+ window_stores,\\n+ ('v8', 'state', 'movie'),\\n+ ('v8', 'movie'),\\n+ expected_type=dict)\\n+ if not movie_store:\\n+ raise ExtractorError('Failed to extract live info')\\n+\\n+ title = movie_store.get('title')\\n+ description = movie_store.get('introduction')\\n+ thumbnail = movie_store.get('thumbnailUrl')\\n+\\n+ channel_user = movie_store.get('channel', {}).get('user')\\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\\n+\\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\\n+\\n+ m3u8_playlists = movie_store.get('media')\\n+ formats = []\\n+ for (name, m3u8_url) in m3u8_playlists.items():\\n+ if not m3u8_url:\\n+ continue\\n+ formats.extend(self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\\n+ m3u8_id='hls-%s' % name, live=True))\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'description': description,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'timestamp': timestamp,\\n+ 'is_live': True,\\n+ }\\n+\\n+\\n+class OpenRecCaptureIE(InfoExtractor):\\n+ IE_NAME = 'openrec:capture'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/capture/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\\n+ 'info_dict': {\\n+ 'id': 'mldjr82p7qk',\\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\\n+ 'uploader': 'ใใใกใใใญใ',\\n+ 'uploader_id': 'Yaritaiji',\\n+ 'upload_date': '20210803',\\n+ },\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = window_stores.get('movie')\\n+\\n+ capture_data = window_stores.get('capture')\\n+ if not capture_data:\\n+ raise ExtractorError('Cannot extract title')\\n+ title = capture_data.get('title')\\n+ thumbnail = capture_data.get('thumbnailUrl')\\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\\n+\\n+ channel_info = movie_store.get('channel') or {}\\n+ uploader = channel_info.get('name')\\n+ uploader_id = channel_info.get('id')\\n+\\n+ m3u8_url = capture_data.get('source')\\n+ if not m3u8_url:\\n+ raise ExtractorError('Cannot extract m3u8 url')\\n+ formats = self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\\n+ m3u8_id='hls')\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'upload_date': upload_date,\\n+ }\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s2","comment":"Use try_get / traverse_obj","revised_diff":"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __future__ import unicode_literals\n+\n+from .common import InfoExtractor\n+from ..utils import (\n+ ExtractorError,\n+ traverse_obj,\n+ try_get,\n+ unified_strdate\n+)\n+from ..compat import compat_str\n+\n+\n+class OpenRecIE(InfoExtractor):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = traverse_obj(\n+ window_stores,\n+ ('v8', 'state', 'movie'),\n+ ('v8', 'movie'),\n+ expected_type=dict)\n+ if not movie_store:\n+ raise ExtractorError('Failed to extract live info')\n+\n+ title = movie_store.get('title')\n+ description = movie_store.get('introduction')\n+ thumbnail = movie_store.get('thumbnailUrl')\n+\n+ channel_user = movie_store.get('channel', {}).get('user')\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+\n+ m3u8_playlists = movie_store.get('media')\n+ formats = []\n+ for (name, m3u8_url) in m3u8_playlists.items():\n+ if not m3u8_url:\n+ continue\n+ formats.extend(self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\n+ m3u8_id='hls-%s' % name, live=True))\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'description': description,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'timestamp': timestamp,\n+ 'is_live': True,\n+ }\n+\n+\n+class OpenRecCaptureIE(InfoExtractor):\n+ IE_NAME = 'openrec:capture'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\n+ 'info_dict': {\n+ 'id': 'mldjr82p7qk',\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\n+ 'uploader': 'ใใใกใใใญใ',\n+ 'uploader_id': 'Yaritaiji',\n+ 'upload_date': '20210803',\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = window_stores.get('movie')\n+\n+ capture_data = window_stores.get('capture')\n+ if not capture_data:\n+ raise ExtractorError('Cannot extract title')\n+ title = capture_data.get('title')\n+ thumbnail = capture_data.get('thumbnailUrl')\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\n+\n+ channel_info = movie_store.get('channel') or {}\n+ uploader = channel_info.get('name')\n+ uploader_id = channel_info.get('id')\n+\n+ m3u8_url = capture_data.get('source')\n+ if not m3u8_url:\n+ raise ExtractorError('Cannot extract m3u8 url')\n+ formats = self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n+ m3u8_id='hls')\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'upload_date': upload_date,\n+ }\n"},{"subtask_id":"s2","comment":"Why so complicated?\r\nIsnt this the same as L106-108?","revised_diff":"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __future__ import unicode_literals\n+\n+from .common import InfoExtractor\n+from ..utils import (\n+ ExtractorError,\n+ traverse_obj,\n+ try_get,\n+ unified_strdate\n+)\n+from ..compat import compat_str\n+\n+\n+class OpenRecIE(InfoExtractor):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = traverse_obj(\n+ window_stores,\n+ ('v8', 'state', 'movie'),\n+ ('v8', 'movie'),\n+ expected_type=dict)\n+ if not movie_store:\n+ raise ExtractorError('Failed to extract live info')\n+\n+ title = movie_store.get('title')\n+ description = movie_store.get('introduction')\n+ thumbnail = movie_store.get('thumbnailUrl')\n+\n+ channel_user = movie_store.get('channel', {}).get('user')\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+\n+ m3u8_playlists = movie_store.get('media')\n+ formats = []\n+ for (name, m3u8_url) in m3u8_playlists.items():\n+ if not m3u8_url:\n+ continue\n+ formats.extend(self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\n+ m3u8_id='hls-%s' % name, live=True))\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'description': description,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'timestamp': timestamp,\n+ 'is_live': True,\n+ }\n+\n+\n+class OpenRecCaptureIE(InfoExtractor):\n+ IE_NAME = 'openrec:capture'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\n+ 'info_dict': {\n+ 'id': 'mldjr82p7qk',\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\n+ 'uploader': 'ใใใกใใใญใ',\n+ 'uploader_id': 'Yaritaiji',\n+ 'upload_date': '20210803',\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = window_stores.get('movie')\n+\n+ capture_data = window_stores.get('capture')\n+ if not capture_data:\n+ raise ExtractorError('Cannot extract title')\n+ title = capture_data.get('title')\n+ thumbnail = capture_data.get('thumbnailUrl')\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\n+\n+ channel_info = movie_store.get('channel') or {}\n+ uploader = channel_info.get('name')\n+ uploader_id = channel_info.get('id')\n+\n+ m3u8_url = capture_data.get('source')\n+ if not m3u8_url:\n+ raise ExtractorError('Cannot extract m3u8 url')\n+ formats = self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n+ m3u8_id='hls')\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'upload_date': upload_date,\n+ }\n"},{"subtask_id":"s2","comment":"Why?","revised_diff":"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __future__ import unicode_literals\n+\n+from .common import InfoExtractor\n+from ..utils import (\n+ ExtractorError,\n+ traverse_obj,\n+ try_get,\n+ unified_strdate\n+)\n+from ..compat import compat_str\n+\n+\n+class OpenRecIE(InfoExtractor):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = traverse_obj(\n+ window_stores,\n+ ('v8', 'state', 'movie'),\n+ ('v8', 'movie'),\n+ expected_type=dict)\n+ if not movie_store:\n+ raise ExtractorError('Failed to extract live info')\n+\n+ title = movie_store.get('title')\n+ description = movie_store.get('introduction')\n+ thumbnail = movie_store.get('thumbnailUrl')\n+\n+ channel_user = movie_store.get('channel', {}).get('user')\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+\n+ m3u8_playlists = movie_store.get('media')\n+ formats = []\n+ for (name, m3u8_url) in m3u8_playlists.items():\n+ if not m3u8_url:\n+ continue\n+ formats.extend(self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\n+ m3u8_id='hls-%s' % name, live=True))\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'description': description,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'timestamp': timestamp,\n+ 'is_live': True,\n+ }\n+\n+\n+class OpenRecCaptureIE(InfoExtractor):\n+ IE_NAME = 'openrec:capture'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\n+ 'info_dict': {\n+ 'id': 'mldjr82p7qk',\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\n+ 'uploader': 'ใใใกใใใญใ',\n+ 'uploader_id': 'Yaritaiji',\n+ 'upload_date': '20210803',\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = window_stores.get('movie')\n+\n+ capture_data = window_stores.get('capture')\n+ if not capture_data:\n+ raise ExtractorError('Cannot extract title')\n+ title = capture_data.get('title')\n+ thumbnail = capture_data.get('thumbnailUrl')\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\n+\n+ channel_info = movie_store.get('channel') or {}\n+ uploader = channel_info.get('name')\n+ uploader_id = channel_info.get('id')\n+\n+ m3u8_url = capture_data.get('source')\n+ if not m3u8_url:\n+ raise ExtractorError('Cannot extract m3u8 url')\n+ formats = self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n+ m3u8_id='hls')\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'upload_date': upload_date,\n+ }\n"}],"string":"[\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"Use try_get / traverse_obj\",\n \"revised_diff\": \"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\\nnew file mode 100644\\nindex 000000000000..d7073ab445bc\\n--- /dev/null\\n+++ b/yt_dlp/extractor/openrec.py\\n@@ -0,0 +1,126 @@\\n+# coding: utf-8\\n+from __future__ import unicode_literals\\n+\\n+from .common import InfoExtractor\\n+from ..utils import (\\n+ ExtractorError,\\n+ traverse_obj,\\n+ try_get,\\n+ unified_strdate\\n+)\\n+from ..compat import compat_str\\n+\\n+\\n+class OpenRecIE(InfoExtractor):\\n+ IE_NAME = 'openrec'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n+ 'only_matching': True,\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = traverse_obj(\\n+ window_stores,\\n+ ('v8', 'state', 'movie'),\\n+ ('v8', 'movie'),\\n+ expected_type=dict)\\n+ if not movie_store:\\n+ raise ExtractorError('Failed to extract live info')\\n+\\n+ title = movie_store.get('title')\\n+ description = movie_store.get('introduction')\\n+ thumbnail = movie_store.get('thumbnailUrl')\\n+\\n+ channel_user = movie_store.get('channel', {}).get('user')\\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\\n+\\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\\n+\\n+ m3u8_playlists = movie_store.get('media')\\n+ formats = []\\n+ for (name, m3u8_url) in m3u8_playlists.items():\\n+ if not m3u8_url:\\n+ continue\\n+ formats.extend(self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\\n+ m3u8_id='hls-%s' % name, live=True))\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'description': description,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'timestamp': timestamp,\\n+ 'is_live': True,\\n+ }\\n+\\n+\\n+class OpenRecCaptureIE(InfoExtractor):\\n+ IE_NAME = 'openrec:capture'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/capture/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\\n+ 'info_dict': {\\n+ 'id': 'mldjr82p7qk',\\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\\n+ 'uploader': 'ใใใกใใใญใ',\\n+ 'uploader_id': 'Yaritaiji',\\n+ 'upload_date': '20210803',\\n+ },\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = window_stores.get('movie')\\n+\\n+ capture_data = window_stores.get('capture')\\n+ if not capture_data:\\n+ raise ExtractorError('Cannot extract title')\\n+ title = capture_data.get('title')\\n+ thumbnail = capture_data.get('thumbnailUrl')\\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\\n+\\n+ channel_info = movie_store.get('channel') or {}\\n+ uploader = channel_info.get('name')\\n+ uploader_id = channel_info.get('id')\\n+\\n+ m3u8_url = capture_data.get('source')\\n+ if not m3u8_url:\\n+ raise ExtractorError('Cannot extract m3u8 url')\\n+ formats = self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\\n+ m3u8_id='hls')\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'upload_date': upload_date,\\n+ }\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"Why so complicated?\\r\\nIsnt this the same as L106-108?\",\n \"revised_diff\": \"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\\nnew file mode 100644\\nindex 000000000000..d7073ab445bc\\n--- /dev/null\\n+++ b/yt_dlp/extractor/openrec.py\\n@@ -0,0 +1,126 @@\\n+# coding: utf-8\\n+from __future__ import unicode_literals\\n+\\n+from .common import InfoExtractor\\n+from ..utils import (\\n+ ExtractorError,\\n+ traverse_obj,\\n+ try_get,\\n+ unified_strdate\\n+)\\n+from ..compat import compat_str\\n+\\n+\\n+class OpenRecIE(InfoExtractor):\\n+ IE_NAME = 'openrec'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n+ 'only_matching': True,\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = traverse_obj(\\n+ window_stores,\\n+ ('v8', 'state', 'movie'),\\n+ ('v8', 'movie'),\\n+ expected_type=dict)\\n+ if not movie_store:\\n+ raise ExtractorError('Failed to extract live info')\\n+\\n+ title = movie_store.get('title')\\n+ description = movie_store.get('introduction')\\n+ thumbnail = movie_store.get('thumbnailUrl')\\n+\\n+ channel_user = movie_store.get('channel', {}).get('user')\\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\\n+\\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\\n+\\n+ m3u8_playlists = movie_store.get('media')\\n+ formats = []\\n+ for (name, m3u8_url) in m3u8_playlists.items():\\n+ if not m3u8_url:\\n+ continue\\n+ formats.extend(self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\\n+ m3u8_id='hls-%s' % name, live=True))\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'description': description,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'timestamp': timestamp,\\n+ 'is_live': True,\\n+ }\\n+\\n+\\n+class OpenRecCaptureIE(InfoExtractor):\\n+ IE_NAME = 'openrec:capture'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/capture/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\\n+ 'info_dict': {\\n+ 'id': 'mldjr82p7qk',\\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\\n+ 'uploader': 'ใใใกใใใญใ',\\n+ 'uploader_id': 'Yaritaiji',\\n+ 'upload_date': '20210803',\\n+ },\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = window_stores.get('movie')\\n+\\n+ capture_data = window_stores.get('capture')\\n+ if not capture_data:\\n+ raise ExtractorError('Cannot extract title')\\n+ title = capture_data.get('title')\\n+ thumbnail = capture_data.get('thumbnailUrl')\\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\\n+\\n+ channel_info = movie_store.get('channel') or {}\\n+ uploader = channel_info.get('name')\\n+ uploader_id = channel_info.get('id')\\n+\\n+ m3u8_url = capture_data.get('source')\\n+ if not m3u8_url:\\n+ raise ExtractorError('Cannot extract m3u8 url')\\n+ formats = self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\\n+ m3u8_id='hls')\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'upload_date': upload_date,\\n+ }\\n\"\n },\n {\n \"subtask_id\": \"s2\",\n \"comment\": \"Why?\",\n \"revised_diff\": \"diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\\nnew file mode 100644\\nindex 000000000000..d7073ab445bc\\n--- /dev/null\\n+++ b/yt_dlp/extractor/openrec.py\\n@@ -0,0 +1,126 @@\\n+# coding: utf-8\\n+from __future__ import unicode_literals\\n+\\n+from .common import InfoExtractor\\n+from ..utils import (\\n+ ExtractorError,\\n+ traverse_obj,\\n+ try_get,\\n+ unified_strdate\\n+)\\n+from ..compat import compat_str\\n+\\n+\\n+class OpenRecIE(InfoExtractor):\\n+ IE_NAME = 'openrec'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/live/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\\n+ 'only_matching': True,\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = traverse_obj(\\n+ window_stores,\\n+ ('v8', 'state', 'movie'),\\n+ ('v8', 'movie'),\\n+ expected_type=dict)\\n+ if not movie_store:\\n+ raise ExtractorError('Failed to extract live info')\\n+\\n+ title = movie_store.get('title')\\n+ description = movie_store.get('introduction')\\n+ thumbnail = movie_store.get('thumbnailUrl')\\n+\\n+ channel_user = movie_store.get('channel', {}).get('user')\\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\\n+\\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\\n+\\n+ m3u8_playlists = movie_store.get('media')\\n+ formats = []\\n+ for (name, m3u8_url) in m3u8_playlists.items():\\n+ if not m3u8_url:\\n+ continue\\n+ formats.extend(self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\\n+ m3u8_id='hls-%s' % name, live=True))\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'description': description,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'timestamp': timestamp,\\n+ 'is_live': True,\\n+ }\\n+\\n+\\n+class OpenRecCaptureIE(InfoExtractor):\\n+ IE_NAME = 'openrec:capture'\\n+ _VALID_URL = r'https?://(?:www\\\\.)?openrec\\\\.tv/capture/(?P<id>[^/]+)'\\n+ _TESTS = [{\\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\\n+ 'only_matching': True,\\n+ }, {\\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\\n+ 'info_dict': {\\n+ 'id': 'mldjr82p7qk',\\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\\n+ 'uploader': 'ใใใกใใใญใ',\\n+ 'uploader_id': 'Yaritaiji',\\n+ 'upload_date': '20210803',\\n+ },\\n+ }]\\n+\\n+ def _real_extract(self, url):\\n+ video_id = self._match_id(url)\\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\\n+\\n+ window_stores = self._parse_json(\\n+ self._search_regex(r'(?m)window\\\\.pageStore\\\\s*=\\\\s*(\\\\{.+?\\\\});$', webpage, 'window.pageStore'), video_id)\\n+ movie_store = window_stores.get('movie')\\n+\\n+ capture_data = window_stores.get('capture')\\n+ if not capture_data:\\n+ raise ExtractorError('Cannot extract title')\\n+ title = capture_data.get('title')\\n+ thumbnail = capture_data.get('thumbnailUrl')\\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\\n+\\n+ channel_info = movie_store.get('channel') or {}\\n+ uploader = channel_info.get('name')\\n+ uploader_id = channel_info.get('id')\\n+\\n+ m3u8_url = capture_data.get('source')\\n+ if not m3u8_url:\\n+ raise ExtractorError('Cannot extract m3u8 url')\\n+ formats = self._extract_m3u8_formats(\\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\\n+ m3u8_id='hls')\\n+\\n+ self._sort_formats(formats)\\n+\\n+ return {\\n+ 'id': video_id,\\n+ 'title': title,\\n+ 'thumbnail': thumbnail,\\n+ 'formats': formats,\\n+ 'uploader': uploader,\\n+ 'uploader_id': uploader_id,\\n+ 'upload_date': upload_date,\\n+ }\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 7fb2c087404d..9ac50dbe00e2 100644\n--- a/README.md\n+++ b/README.md\n@@ -88,7 +88,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/\n \n * **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats\n \n-* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon\n+* **New extractors**: AnimeLab, Philo MSO, Spectrum MSO, SlingTV MSO, Rcs, Gedi, bitwave.tv, mildom, audius, zee5, mtv.it, wimtv, pluto.tv, niconico users, discoveryplus.in, mediathek, NFHSNetwork, nebula, ukcolumn, whowatch, MxplayerShow, parlview (au), YoutubeWebArchive, fancode, Saitosan, ShemarooMe, telemundo, VootSeries, SonyLIVSeries, HotstarSeries, VidioPremier, VidioLive, RCTIPlus, TBS Live, douyin, pornflip, ParamountPlusSeries, ScienceChannel, Utreon, OpenRec\n \n * **Fixed/improved extractors**: archive.org, roosterteeth.com, skyit, instagram, itv, SouthparkDe, spreaker, Vlive, akamai, ina, rumble, tennistv, amcnetworks, la7 podcasts, linuxacadamy, nitter, twitcasting, viu, crackle, curiositystream, mediasite, rmcdecouverte, sonyliv, tubi, tenplay, patreon, videa, yahoo, BravoTV, crunchyroll playlist, RTP, viki, Hotstar, vidio, vimeo, mediaset, Mxplayer\n \ndiff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\nindex e12121073525..99fd7cb78130 100644\n--- a/yt_dlp/extractor/extractors.py\n+++ b/yt_dlp/extractor/extractors.py\n@@ -936,6 +936,10 @@\n OoyalaIE,\n OoyalaExternalIE,\n )\n+from .openrec import (\n+ OpenRecIE,\n+ OpenRecCaptureIE,\n+)\n from .ora import OraTVIE\n from .orf import (\n ORFTVthekIE,\ndiff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __future__ import unicode_literals\n+\n+from .common import InfoExtractor\n+from ..utils import (\n+ ExtractorError,\n+ traverse_obj,\n+ try_get,\n+ unified_strdate\n+)\n+from ..compat import compat_str\n+\n+\n+class OpenRecIE(InfoExtractor):\n+ IE_NAME = 'openrec'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/live/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/live/2p8v31qe4zy',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/live/wez93eqvjzl',\n+ 'only_matching': True,\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = traverse_obj(\n+ window_stores,\n+ ('v8', 'state', 'movie'),\n+ ('v8', 'movie'),\n+ expected_type=dict)\n+ if not movie_store:\n+ raise ExtractorError('Failed to extract live info')\n+\n+ title = movie_store.get('title')\n+ description = movie_store.get('introduction')\n+ thumbnail = movie_store.get('thumbnailUrl')\n+\n+ channel_user = movie_store.get('channel', {}).get('user')\n+ uploader = try_get(channel_user, lambda x: x['name'], compat_str)\n+ uploader_id = try_get(channel_user, lambda x: x['id'], compat_str)\n+\n+ timestamp = traverse_obj(movie_store, ('startedAt', 'time'), expected_type=int)\n+\n+ m3u8_playlists = movie_store.get('media')\n+ formats = []\n+ for (name, m3u8_url) in m3u8_playlists.items():\n+ if not m3u8_url:\n+ continue\n+ formats.extend(self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8',\n+ m3u8_id='hls-%s' % name, live=True))\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'description': description,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'timestamp': timestamp,\n+ 'is_live': True,\n+ }\n+\n+\n+class OpenRecCaptureIE(InfoExtractor):\n+ IE_NAME = 'openrec:capture'\n+ _VALID_URL = r'https?://(?:www\\.)?openrec\\.tv/capture/(?P<id>[^/]+)'\n+ _TESTS = [{\n+ 'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',\n+ 'only_matching': True,\n+ }, {\n+ 'url': 'https://www.openrec.tv/capture/mldjr82p7qk',\n+ 'info_dict': {\n+ 'id': 'mldjr82p7qk',\n+ 'title': 'ใใใใฎๆฅใใใใ่ฑ่ชๅ',\n+ 'uploader': 'ใใใกใใใญใ',\n+ 'uploader_id': 'Yaritaiji',\n+ 'upload_date': '20210803',\n+ },\n+ }]\n+\n+ def _real_extract(self, url):\n+ video_id = self._match_id(url)\n+ webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id)\n+\n+ window_stores = self._parse_json(\n+ self._search_regex(r'(?m)window\\.pageStore\\s*=\\s*(\\{.+?\\});$', webpage, 'window.pageStore'), video_id)\n+ movie_store = window_stores.get('movie')\n+\n+ capture_data = window_stores.get('capture')\n+ if not capture_data:\n+ raise ExtractorError('Cannot extract title')\n+ title = capture_data.get('title')\n+ thumbnail = capture_data.get('thumbnailUrl')\n+ upload_date = unified_strdate(capture_data.get('createdAt'))\n+\n+ channel_info = movie_store.get('channel') or {}\n+ uploader = channel_info.get('name')\n+ uploader_id = channel_info.get('id')\n+\n+ m3u8_url = capture_data.get('source')\n+ if not m3u8_url:\n+ raise ExtractorError('Cannot extract m3u8 url')\n+ formats = self._extract_m3u8_formats(\n+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',\n+ m3u8_id='hls')\n+\n+ self._sort_formats(formats)\n+\n+ return {\n+ 'id': video_id,\n+ 'title': title,\n+ 'thumbnail': thumbnail,\n+ 'formats': formats,\n+ 'uploader': uploader,\n+ 'uploader_id': uploader_id,\n+ 'upload_date': upload_date,\n+ }\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":3,"string":"3"}}},{"rowIdx":34287,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16787"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16787,"string":"16,787"},"base_sha":{"kind":"string","value":"e534a32619d1d944631a0483f28522bdd11f0745"},"head_sha":{"kind":"string","value":"5781682ef3b24e14264ed03a4e620adce332b6d1"},"task":{"kind":"string","value":"[Announcement] `ejs` is dropping support for Node v20 and v21\n\nNode (aka Node.js) is an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime.\n\nNode v20 reached its end-of-life (EOL) at the end of April 2026. Node v21, which is not a long-term support (LTS) version of Node, reached its end-of-life well before that. \n\nAs of the next yt-dlp and/or ejs release, the minimum supported version of Node will be raised to v22.\n\nGoing forward, yt-dlp/ejs intends to *mostly* align with the Node.js support lifecycle, with a notable exception: yt-dlp/ejs will continue to support the non-LTS (odd-numbered) major versions that are above our support floor for as long as they work.\n\n---\n\nSee [the EJS wiki article](https://github.com/yt-dlp/yt-dlp/wiki/EJS) for more information about supported JavaScript runtimes.\n\n[ie/youtube] Drop support for `node<22`\n\nCloses #16765\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [Announcement] `ejs` is dropping support for Node v20 and v21","scope_files":[".github/workflows/challenge-tests.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] `ejs` is dropping support for Node v20 and v21","scope_files":["yt_dlp/utils/_jsruntime.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [Announcement] `ejs` is dropping support for Node v20 and v21\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] `ejs` is dropping support for Node v20 and v21\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/challenge-tests.yml"],"solution_diff":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex c76b9fa84c83..36f973f9b77d 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -60,7 +60,7 @@ jobs:\n - name: Install Node\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\n with:\n- node-version: '20.0' # minimum supported version\n+ node-version: '22.0' # minimum supported version\n - name: Install QuickJS (Linux)\n if: matrix.os == 'ubuntu-latest'\n shell: bash\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["yt_dlp/utils/_jsruntime.py"],"solution_diff":"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex 0abd6f428051..a1a647e6706f 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -117,7 +117,7 @@ def _info(self):\n \n \n class NodeJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (20, 0, 0)\n+ MIN_SUPPORTED_VERSION = (22, 0, 0)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'node')\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex c76b9fa84c83..36f973f9b77d 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -60,7 +60,7 @@ jobs:\\n - name: Install Node\\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\\n with:\\n- node-version: '20.0' # minimum supported version\\n+ node-version: '22.0' # minimum supported version\\n - name: Install QuickJS (Linux)\\n if: matrix.os == 'ubuntu-latest'\\n shell: bash\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\\nindex 0abd6f428051..a1a647e6706f 100644\\n--- a/yt_dlp/utils/_jsruntime.py\\n+++ b/yt_dlp/utils/_jsruntime.py\\n@@ -117,7 +117,7 @@ def _info(self):\\n \\n \\n class NodeJsRuntime(JsRuntime):\\n- MIN_SUPPORTED_VERSION = (20, 0, 0)\\n+ MIN_SUPPORTED_VERSION = (22, 0, 0)\\n \\n def _info(self):\\n path = _determine_runtime_path(self._path, 'node')\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex c76b9fa84c83..36f973f9b77d 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -60,7 +60,7 @@ jobs:\n - name: Install Node\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\n with:\n- node-version: '20.0' # minimum supported version\n+ node-version: '22.0' # minimum supported version\n - name: Install QuickJS (Linux)\n if: matrix.os == 'ubuntu-latest'\n shell: bash\ndiff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex 0abd6f428051..a1a647e6706f 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -117,7 +117,7 @@ def _info(self):\n \n \n class NodeJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (20, 0, 0)\n+ MIN_SUPPORTED_VERSION = (22, 0, 0)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'node')\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34288,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16788"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16788,"string":"16,788"},"base_sha":{"kind":"string","value":"125bb40468a8618e592d607c1c496095fda764f0"},"head_sha":{"kind":"string","value":"2942dc0334d22b03e50b156181d93b7a267c3c79"},"task":{"kind":"string","value":"[Announcement] Raising the minimum supported version of Deno to v2.3.0\n\nDeno is an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime.\n\nAs of the next yt-dlp and/or ejs release, the minimum supported version of Deno will be raised from `v2.0.0` to `v2.3.0`.\n\nThis is being done for security reasons: Deno v2.3.0 introduced a new lockfile format that is incompatible with earlier versions. The lockfile is not used at runtime, but it is necessary to safely build the package (e.g. if the user installs `ejs` from source or builds their own wheel). Cooldown support, which is crucial to avoiding npm supply chain attacks, was not introduced until Deno v2.6.0. So we are unable to generate a lockfile that is both protected by cooldown enforcement *and* compatible with Deno versions earlier than v2.3.0. The clear solution is to raise the support floor for Deno.\n\n---\n\nSee [the EJS wiki article](https://github.com/yt-dlp/yt-dlp/wiki/EJS) for more information about supported JavaScript runtimes.\n\n[ie/youtube] Drop support for `deno<2.3.0`\n\nCloses #16767\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [Announcement] Raising the minimum supported version of Deno to v2.3.0","scope_files":[".github/workflows/challenge-tests.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] Raising the minimum supported version of Deno to v2.3.0","scope_files":["yt_dlp/utils/_jsruntime.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [Announcement] Raising the minimum supported version of Deno to v2.3.0\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] Raising the minimum supported version of Deno to v2.3.0\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/challenge-tests.yml"],"solution_diff":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 287a115bd10d..c76b9fa84c83 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -50,7 +50,7 @@ jobs:\n - name: Install Deno\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\n- deno-version: '2.0.0' # minimum supported version\n+ deno-version: '2.3.0' # minimum supported version\n - name: Install Bun\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\n with:\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["yt_dlp/utils/_jsruntime.py"],"solution_diff":"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex 740248533b48..0abd6f428051 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -87,7 +87,7 @@ def _info(self) -> JsRuntimeInfo | None:\n \n \n class DenoJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (2, 0, 0)\n+ MIN_SUPPORTED_VERSION = (2, 3, 0)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'deno')\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex 287a115bd10d..c76b9fa84c83 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -50,7 +50,7 @@ jobs:\\n - name: Install Deno\\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\\n with:\\n- deno-version: '2.0.0' # minimum supported version\\n+ deno-version: '2.3.0' # minimum supported version\\n - name: Install Bun\\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\\n with:\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\\nindex 740248533b48..0abd6f428051 100644\\n--- a/yt_dlp/utils/_jsruntime.py\\n+++ b/yt_dlp/utils/_jsruntime.py\\n@@ -87,7 +87,7 @@ def _info(self) -> JsRuntimeInfo | None:\\n \\n \\n class DenoJsRuntime(JsRuntime):\\n- MIN_SUPPORTED_VERSION = (2, 0, 0)\\n+ MIN_SUPPORTED_VERSION = (2, 3, 0)\\n \\n def _info(self):\\n path = _determine_runtime_path(self._path, 'deno')\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 287a115bd10d..c76b9fa84c83 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -50,7 +50,7 @@ jobs:\n - name: Install Deno\n uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\n- deno-version: '2.0.0' # minimum supported version\n+ deno-version: '2.3.0' # minimum supported version\n - name: Install Bun\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\n with:\ndiff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex 740248533b48..0abd6f428051 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -87,7 +87,7 @@ def _info(self) -> JsRuntimeInfo | None:\n \n \n class DenoJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (2, 0, 0)\n+ MIN_SUPPORTED_VERSION = (2, 3, 0)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'deno')\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34289,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16786"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16786,"string":"16,786"},"base_sha":{"kind":"string","value":"b536d72c869e47eb048fc54746e4d2f384706d2f"},"head_sha":{"kind":"string","value":"efc3fcab514e9f43931815ff22dbbbd70acb38b4"},"task":{"kind":"string","value":"[Announcement] Bun support is now limited and deprecated\n\nDue to foreseeable compatibility and security issues, yt-dlp's support for Bun as an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime is being both limited and deprecated.\n\nAs of the next yt-dlp and/or ejs release, only Bun versions `1.2.11` through `1.3.14` will be supported. The rationale for this change is twofold:\n\n1. The minimum required version is being raised from `1.0.31` to `1.2.11` because building the `ejs` package with a version earlier than `1.2.0` results in the ejs lockfile being ignored, which is a significant security concern for users when considering all of the recent npm supply chain attacks. Additionally, the support floor is being bumped to `1.2.11` instead of `1.2.0` because the `ejs` test suite cannot be run with versions of Bun earlier than `1.2.11`.\n\n2. Bun was recently rewritten in Rust using Claude, and its development seems to have taken a turn towards being fully vibe-coded. This is alarming and disappointing for a number of reasons, and frankly it seems like a future headache that we'd prefer to avoid. We are adding a support ceiling of version `1.3.14`, as that is the last release built from the original zig codebase.\n\nBun support will also be deprecated. This means that while yt-dlp will continue to support this narrower range of Bun versions for as long as they're able to meet the needs of yt-dlp and ejs, we reserve the right to completely drop support for Bun should it at any point become too burdensome to maintain.\n\n---\n\nSee [the EJS wiki article](https://github.com/yt-dlp/yt-dlp/wiki/EJS) for more information about supported JavaScript runtimes.\n\n[ie/youtube] Drop support for `bun<1.2.11` and `bun>1.3.14`\n\nCloses #16766\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n- [x] Core bug fix/improvement\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [Announcement] Bun support is now limited and deprecated","scope_files":[".github/workflows/challenge-tests.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `test/test_jsc/` needed for: [Announcement] Bun support is now limited and deprecated","scope_files":["test/test_jsc/conftest.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/extractor/youtube/jsc/_builtin/` needed for: [Announcement] Bun support is now limited and deprecated","scope_files":["yt_dlp/extractor/youtube/jsc/_builtin/bun.py"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/extractor/youtube/pot/` needed for: [Announcement] Bun support is now limited and deprecated","scope_files":["yt_dlp/extractor/youtube/pot/_director.py","yt_dlp/extractor/youtube/pot/_provider.py"]},{"subtask_id":"s5","goal":"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] Bun support is now limited and deprecated","scope_files":["yt_dlp/utils/_jsruntime.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [Announcement] Bun support is now limited and deprecated\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/test_jsc/` needed for: [Announcement] Bun support is now limited and deprecated\",\n \"scope_files\": [\n \"test/test_jsc/conftest.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/youtube/jsc/_builtin/` needed for: [Announcement] Bun support is now limited and deprecated\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/jsc/_builtin/bun.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/youtube/pot/` needed for: [Announcement] Bun support is now limited and deprecated\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/pot/_director.py\",\n \"yt_dlp/extractor/youtube/pot/_provider.py\"\n ]\n },\n {\n \"subtask_id\": \"s5\",\n \"goal\": \"Implement the changes under `yt_dlp/utils/` needed for: [Announcement] Bun support is now limited and deprecated\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/challenge-tests.yml"],"solution_diff":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 36f973f9b77d..f55cf68f47d0 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -54,8 +54,7 @@ jobs:\n - name: Install Bun\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\n with:\n- # minimum supported version is 1.0.31 but earliest available Windows version is 1.1.0\n- bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\n+ bun-version: '1.2.11' # minimum supported version\n no-cache: true\n - name: Install Node\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["test/test_jsc/conftest.py"],"solution_diff":"diff --git a/test/test_jsc/conftest.py b/test/test_jsc/conftest.py\nindex 28d673412246..07c30b7b06ad 100644\n--- a/test/test_jsc/conftest.py\n+++ b/test/test_jsc/conftest.py\n@@ -45,7 +45,7 @@ def trace(self, message: str):\n def debug(self, message: str, *, once=False):\n print(f'debug: {message}')\n \n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n print(f'info: {message}')\n \n def warning(self, message: str, *, once=False):\n","summary":"Edited 1 file(s) in test/test_jsc/"},{"subtask_id":"s3","scope_files":["yt_dlp/extractor/youtube/jsc/_builtin/bun.py"],"solution_diff":"diff --git a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\nindex 8b0a6e551081..3f6dff0a710b 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\n@@ -45,6 +45,8 @@ class BunJCP(EJSBaseJCP, BuiltinIEContentProvider):\n JS_RUNTIME_NAME = 'bun'\n BUN_NPM_LIB_FILENAME = 'yt.solver.bun.lib.js'\n SUPPORTED_PROXY_SCHEMES = ['http', 'https']\n+ _BUN_MAX_SUPPORTED_VERSION = (1, 3, 14)\n+ _BUN_DEPRECATION_URL = 'https://github.com/yt-dlp/yt-dlp/issues/16766'\n \n def _iter_script_sources(self):\n yield from super()._iter_script_sources()\n@@ -112,6 +114,19 @@ def _get_env_options(self) -> dict[str, str]:\n return options\n \n def _run_js_runtime(self, stdin: str, /) -> str:\n+ is_unsupported_version = self.runtime_info.version_tuple > self._BUN_MAX_SUPPORTED_VERSION\n+ if is_unsupported_version:\n+ self.logger.warning(\n+ f'bun version {\".\".join(map(str, self.runtime_info.version_tuple))} is not supported! '\n+ f'{\".\".join(map(str, self._BUN_MAX_SUPPORTED_VERSION))} is the last supported bun version. '\n+ f'{self.ie._downloader._format_err(\"DO NOT\", self.ie._downloader.Styles.ERROR)} '\n+ f'open a bug report even if you encounter any errors!',\n+ once=True)\n+ else:\n+ self.logger.info(\n+ f'bun support has been deprecated. See {self._BUN_DEPRECATION_URL} for details',\n+ once=True)\n+\n # https://bun.com/docs/cli/run\n options = ['--no-addons', '--prefer-offline']\n if self._lib_script.variant == ScriptVariant.BUN_NPM:\n@@ -136,7 +151,7 @@ def _run_js_runtime(self, stdin: str, /) -> str:\n msg = f'Error running bun process (returncode: {proc.returncode})'\n if stderr:\n msg = f'{msg}: {stderr.strip()}'\n- raise JsChallengeProviderError(msg)\n+ raise JsChallengeProviderError(msg, expected=is_unsupported_version)\n return stdout\n \n def _clean_stderr(self, stderr):\n","summary":"Edited 1 file(s) in yt_dlp/extractor/youtube/jsc/_builtin/"},{"subtask_id":"s4","scope_files":["yt_dlp/extractor/youtube/pot/_director.py","yt_dlp/extractor/youtube/pot/_provider.py"],"solution_diff":"diff --git a/yt_dlp/extractor/youtube/pot/_director.py b/yt_dlp/extractor/youtube/pot/_director.py\nindex ae1edc46aeb8..9e467c809255 100644\n--- a/yt_dlp/extractor/youtube/pot/_director.py\n+++ b/yt_dlp/extractor/youtube/pot/_director.py\n@@ -64,9 +64,9 @@ def debug(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.DEBUG:\n self.__ie.write_debug(self._format_msg(message), only_once=once)\n \n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.INFO:\n- self.__ie.to_screen(self._format_msg(message))\n+ self.__ie.to_screen(self._format_msg(message), only_once=once)\n \n def warning(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.WARNING:\ndiff --git a/yt_dlp/extractor/youtube/pot/_provider.py b/yt_dlp/extractor/youtube/pot/_provider.py\nindex 3aa467342f66..0ba7c3039f6a 100644\n--- a/yt_dlp/extractor/youtube/pot/_provider.py\n+++ b/yt_dlp/extractor/youtube/pot/_provider.py\n@@ -40,7 +40,7 @@ def debug(self, message: str, *, once=False):\n pass\n \n @abc.abstractmethod\n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n pass\n \n @abc.abstractmethod\n","summary":"Edited 2 file(s) in yt_dlp/extractor/youtube/pot/"},{"subtask_id":"s5","scope_files":["yt_dlp/utils/_jsruntime.py"],"solution_diff":"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex a1a647e6706f..b77bb9fd0501 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -102,7 +102,7 @@ def _info(self):\n \n \n class BunJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (1, 0, 31)\n+ MIN_SUPPORTED_VERSION = (1, 2, 11)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'bun')\n\n","summary":"Edited 1 file(s) in yt_dlp/utils/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/challenge-tests.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex 36f973f9b77d..f55cf68f47d0 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -54,8 +54,7 @@ jobs:\\n - name: Install Bun\\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\\n with:\\n- # minimum supported version is 1.0.31 but earliest available Windows version is 1.1.0\\n- bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\\n+ bun-version: '1.2.11' # minimum supported version\\n no-cache: true\\n - name: Install Node\\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/test_jsc/conftest.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_jsc/conftest.py b/test/test_jsc/conftest.py\\nindex 28d673412246..07c30b7b06ad 100644\\n--- a/test/test_jsc/conftest.py\\n+++ b/test/test_jsc/conftest.py\\n@@ -45,7 +45,7 @@ def trace(self, message: str):\\n def debug(self, message: str, *, once=False):\\n print(f'debug: {message}')\\n \\n- def info(self, message: str):\\n+ def info(self, message: str, *, once=False):\\n print(f'info: {message}')\\n \\n def warning(self, message: str, *, once=False):\\n\",\n \"summary\": \"Edited 1 file(s) in test/test_jsc/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/jsc/_builtin/bun.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\\nindex 8b0a6e551081..3f6dff0a710b 100644\\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\\n@@ -45,6 +45,8 @@ class BunJCP(EJSBaseJCP, BuiltinIEContentProvider):\\n JS_RUNTIME_NAME = 'bun'\\n BUN_NPM_LIB_FILENAME = 'yt.solver.bun.lib.js'\\n SUPPORTED_PROXY_SCHEMES = ['http', 'https']\\n+ _BUN_MAX_SUPPORTED_VERSION = (1, 3, 14)\\n+ _BUN_DEPRECATION_URL = 'https://github.com/yt-dlp/yt-dlp/issues/16766'\\n \\n def _iter_script_sources(self):\\n yield from super()._iter_script_sources()\\n@@ -112,6 +114,19 @@ def _get_env_options(self) -> dict[str, str]:\\n return options\\n \\n def _run_js_runtime(self, stdin: str, /) -> str:\\n+ is_unsupported_version = self.runtime_info.version_tuple > self._BUN_MAX_SUPPORTED_VERSION\\n+ if is_unsupported_version:\\n+ self.logger.warning(\\n+ f'bun version {\\\".\\\".join(map(str, self.runtime_info.version_tuple))} is not supported! '\\n+ f'{\\\".\\\".join(map(str, self._BUN_MAX_SUPPORTED_VERSION))} is the last supported bun version. '\\n+ f'{self.ie._downloader._format_err(\\\"DO NOT\\\", self.ie._downloader.Styles.ERROR)} '\\n+ f'open a bug report even if you encounter any errors!',\\n+ once=True)\\n+ else:\\n+ self.logger.info(\\n+ f'bun support has been deprecated. See {self._BUN_DEPRECATION_URL} for details',\\n+ once=True)\\n+\\n # https://bun.com/docs/cli/run\\n options = ['--no-addons', '--prefer-offline']\\n if self._lib_script.variant == ScriptVariant.BUN_NPM:\\n@@ -136,7 +151,7 @@ def _run_js_runtime(self, stdin: str, /) -> str:\\n msg = f'Error running bun process (returncode: {proc.returncode})'\\n if stderr:\\n msg = f'{msg}: {stderr.strip()}'\\n- raise JsChallengeProviderError(msg)\\n+ raise JsChallengeProviderError(msg, expected=is_unsupported_version)\\n return stdout\\n \\n def _clean_stderr(self, stderr):\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/extractor/youtube/jsc/_builtin/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/pot/_director.py\",\n \"yt_dlp/extractor/youtube/pot/_provider.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/youtube/pot/_director.py b/yt_dlp/extractor/youtube/pot/_director.py\\nindex ae1edc46aeb8..9e467c809255 100644\\n--- a/yt_dlp/extractor/youtube/pot/_director.py\\n+++ b/yt_dlp/extractor/youtube/pot/_director.py\\n@@ -64,9 +64,9 @@ def debug(self, message: str, *, once=False):\\n if self.log_level <= self.LogLevel.DEBUG:\\n self.__ie.write_debug(self._format_msg(message), only_once=once)\\n \\n- def info(self, message: str):\\n+ def info(self, message: str, *, once=False):\\n if self.log_level <= self.LogLevel.INFO:\\n- self.__ie.to_screen(self._format_msg(message))\\n+ self.__ie.to_screen(self._format_msg(message), only_once=once)\\n \\n def warning(self, message: str, *, once=False):\\n if self.log_level <= self.LogLevel.WARNING:\\ndiff --git a/yt_dlp/extractor/youtube/pot/_provider.py b/yt_dlp/extractor/youtube/pot/_provider.py\\nindex 3aa467342f66..0ba7c3039f6a 100644\\n--- a/yt_dlp/extractor/youtube/pot/_provider.py\\n+++ b/yt_dlp/extractor/youtube/pot/_provider.py\\n@@ -40,7 +40,7 @@ def debug(self, message: str, *, once=False):\\n pass\\n \\n @abc.abstractmethod\\n- def info(self, message: str):\\n+ def info(self, message: str, *, once=False):\\n pass\\n \\n @abc.abstractmethod\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/extractor/youtube/pot/\"\n },\n {\n \"subtask_id\": \"s5\",\n \"scope_files\": [\n \"yt_dlp/utils/_jsruntime.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\\nindex a1a647e6706f..b77bb9fd0501 100644\\n--- a/yt_dlp/utils/_jsruntime.py\\n+++ b/yt_dlp/utils/_jsruntime.py\\n@@ -102,7 +102,7 @@ def _info(self):\\n \\n \\n class BunJsRuntime(JsRuntime):\\n- MIN_SUPPORTED_VERSION = (1, 0, 31)\\n+ MIN_SUPPORTED_VERSION = (1, 2, 11)\\n \\n def _info(self):\\n path = _determine_runtime_path(self._path, 'bun')\\n\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/utils/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 36f973f9b77d..f55cf68f47d0 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -54,8 +54,7 @@ jobs:\n - name: Install Bun\n uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0\n with:\n- # minimum supported version is 1.0.31 but earliest available Windows version is 1.1.0\n- bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\n+ bun-version: '1.2.11' # minimum supported version\n no-cache: true\n - name: Install Node\n uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\ndiff --git a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\nindex 8b0a6e551081..3f6dff0a710b 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/bun.py\n@@ -45,6 +45,8 @@ class BunJCP(EJSBaseJCP, BuiltinIEContentProvider):\n JS_RUNTIME_NAME = 'bun'\n BUN_NPM_LIB_FILENAME = 'yt.solver.bun.lib.js'\n SUPPORTED_PROXY_SCHEMES = ['http', 'https']\n+ _BUN_MAX_SUPPORTED_VERSION = (1, 3, 14)\n+ _BUN_DEPRECATION_URL = 'https://github.com/yt-dlp/yt-dlp/issues/16766'\n \n def _iter_script_sources(self):\n yield from super()._iter_script_sources()\n@@ -112,6 +114,19 @@ def _get_env_options(self) -> dict[str, str]:\n return options\n \n def _run_js_runtime(self, stdin: str, /) -> str:\n+ is_unsupported_version = self.runtime_info.version_tuple > self._BUN_MAX_SUPPORTED_VERSION\n+ if is_unsupported_version:\n+ self.logger.warning(\n+ f'bun version {\".\".join(map(str, self.runtime_info.version_tuple))} is not supported! '\n+ f'{\".\".join(map(str, self._BUN_MAX_SUPPORTED_VERSION))} is the last supported bun version. '\n+ f'{self.ie._downloader._format_err(\"DO NOT\", self.ie._downloader.Styles.ERROR)} '\n+ f'open a bug report even if you encounter any errors!',\n+ once=True)\n+ else:\n+ self.logger.info(\n+ f'bun support has been deprecated. See {self._BUN_DEPRECATION_URL} for details',\n+ once=True)\n+\n # https://bun.com/docs/cli/run\n options = ['--no-addons', '--prefer-offline']\n if self._lib_script.variant == ScriptVariant.BUN_NPM:\n@@ -136,7 +151,7 @@ def _run_js_runtime(self, stdin: str, /) -> str:\n msg = f'Error running bun process (returncode: {proc.returncode})'\n if stderr:\n msg = f'{msg}: {stderr.strip()}'\n- raise JsChallengeProviderError(msg)\n+ raise JsChallengeProviderError(msg, expected=is_unsupported_version)\n return stdout\n \n def _clean_stderr(self, stderr):\ndiff --git a/yt_dlp/extractor/youtube/pot/_director.py b/yt_dlp/extractor/youtube/pot/_director.py\nindex ae1edc46aeb8..9e467c809255 100644\n--- a/yt_dlp/extractor/youtube/pot/_director.py\n+++ b/yt_dlp/extractor/youtube/pot/_director.py\n@@ -64,9 +64,9 @@ def debug(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.DEBUG:\n self.__ie.write_debug(self._format_msg(message), only_once=once)\n \n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.INFO:\n- self.__ie.to_screen(self._format_msg(message))\n+ self.__ie.to_screen(self._format_msg(message), only_once=once)\n \n def warning(self, message: str, *, once=False):\n if self.log_level <= self.LogLevel.WARNING:\ndiff --git a/yt_dlp/extractor/youtube/pot/_provider.py b/yt_dlp/extractor/youtube/pot/_provider.py\nindex 3aa467342f66..0ba7c3039f6a 100644\n--- a/yt_dlp/extractor/youtube/pot/_provider.py\n+++ b/yt_dlp/extractor/youtube/pot/_provider.py\n@@ -40,7 +40,7 @@ def debug(self, message: str, *, once=False):\n pass\n \n @abc.abstractmethod\n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n pass\n \n @abc.abstractmethod\ndiff --git a/yt_dlp/utils/_jsruntime.py b/yt_dlp/utils/_jsruntime.py\nindex a1a647e6706f..b77bb9fd0501 100644\n--- a/yt_dlp/utils/_jsruntime.py\n+++ b/yt_dlp/utils/_jsruntime.py\n@@ -102,7 +102,7 @@ def _info(self):\n \n \n class BunJsRuntime(JsRuntime):\n- MIN_SUPPORTED_VERSION = (1, 0, 31)\n+ MIN_SUPPORTED_VERSION = (1, 2, 11)\n \n def _info(self):\n path = _determine_runtime_path(self._path, 'bun')\n\ndiff --git a/test/test_jsc/conftest.py b/test/test_jsc/conftest.py\nindex 28d673412246..07c30b7b06ad 100644\n--- a/test/test_jsc/conftest.py\n+++ b/test/test_jsc/conftest.py\n@@ -45,7 +45,7 @@ def trace(self, message: str):\n def debug(self, message: str, *, once=False):\n print(f'debug: {message}')\n \n- def info(self, message: str):\n+ def info(self, message: str, *, once=False):\n print(f'info: {message}')\n \n def warning(self, message: str, *, once=False):\n"},"num_subtasks":{"kind":"number","value":5,"string":"5"},"num_changed_files":{"kind":"number","value":6,"string":"6"}}},{"rowIdx":34290,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#14257"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":14257,"string":"14,257"},"base_sha":{"kind":"string","value":"7c9b10ebc83907d37f9f65ea9d4bd6f5e3bd1371"},"head_sha":{"kind":"string","value":"cc6bf1c384de37365160ca50eee03d6e652fd06b"},"task":{"kind":"string","value":"Clarify third-party licenses and license Windows builds under GPL due to `mutagen`\n\n<!--\r\n\r\n######################################################################\r\n WARNING!\r\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\r\n######################################################################\r\n\r\n-->\r\n\r\n\r\n## Checklist\r\n\r\n<!--\r\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:\r\n- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.05.20. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.\r\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\r\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.\r\n- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.\r\n- Read bugs section in FAQ: https://github.com/yt-dlp/yt-dlp\r\n- Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)\r\n-->\r\n\r\n- [ ] I'm reporting a broken site support issue\r\n- [x] I've verified that I'm running yt-dlp version **2021.05.20**\r\n- [ ] I've checked that all provided URLs are alive and playable in a browser\r\n- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped\r\n- [x] I've searched the bugtracker for similar bug reports including closed ones\r\n- [x] I've read bugs section in FAQ\r\n\r\n\r\n## Verbose log\r\n\r\n<!--\r\nProvide the complete verbose output of yt-dlp that clearly demonstrates the problem.\r\nAdd the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\r\n [debug] System config: []\r\n [debug] User config: []\r\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\r\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\r\n [debug] yt-dlp version 2021.05.20\r\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\r\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\r\n [debug] Proxy map: {}\r\n <more lines>\r\n-->\r\nN/A\r\n\r\n<!--\r\nDo not remove the above ```\r\n-->\r\n\r\n\r\n## Description\r\n\r\n<!--\r\nProvide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.\r\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\r\n-->\r\n\r\nAs I was reading the README, I noticed this line:\r\n> Although there are no other required dependencies, `ffmpeg` and `ffprobe` are highly recommended. Other optional dependencies are `sponskrub`, `AtomicParsley`, `mutagen`, `pycryptodome`, `phantomjs` and any of the supported external downloaders. Note that the windows releases are already built with the python interpreter, mutagen and pycryptodome included. \r\n\r\nI decided to check the licenses for each project, and got:\r\n - [ffmpeg (and ffprobe)](https://www.ffmpeg.org/legal.html): LGPLv2.1 or later / GPLv2 or later / non-free, depending on the build\r\n - [sponskrub](https://github.com/faissaloo/SponSkrub/blob/master/LICENCE.md): GPLv3 or later\r\n - [AtomicParsley](https://github.com/wez/atomicparsley/blob/master/COPYING): GPLv2 or later\r\n - [mutagen](https://github.com/quodlibet/mutagen/blob/master/COPYING): GPLv2 or later\r\n - [pycryptodome](https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst): BSD 2-Clause (with some code in the public domain via Unlicense)\r\n - [phantomjs](https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD): BSD 3-Clause\r\n\r\nFirst of all, I recommend that we include a line stating that these optional dependencies may be distributed under different license terms than `yt-dlp`, and so, using them and/or redistributing them will require you to follow their specific licenses:\r\n\r\nAn example:\r\n> Each optional dependency may be licensed under different terms than `yt-dlp`. If you choose to use these optional dependencies, you must agree to their license terms. Please refer to each dependency's repository or README file for more information.\r\n>\r\n> Additionally, if you wish to redistribute `yt-dlp` with any of these optional dependencies included, you must ensure that you follow all of your dependencies' license terms, such as distributing the whole software under the terms of the GPL if you link to a GPL library.\r\n\r\nAdditionally, because of this line pertaining to the Windows builds:\r\n\r\n> Note that the windows releases are already built with the python interpreter, mutagen and pycryptodome included. \r\n\r\nI believe that the Windows builds now fall under the terms of the GPL since `mutagen` is licensed under the GPLv2 and we *include* it in the final binary, as well as using it in the code.\r\n\r\nAdditionally, we should include both a LICENSE file containing the text of the GPLv2 license (because of `mutagen`) and a\r\nTHIRD-PARTY-NOTICES file or similar that includes the text of the license for `pycryptodome` and for `Python` itself since we embed the interpreter into the executable.\r\n\r\nPSF License and license stack: https://docs.python.org/3/license.html\r\nFAQ on bundling Python: https://wiki.python.org/moin/PythonSoftwareFoundationLicenseFaq\r\n\r\n> *If I bundle Python with my application, what do I need to include in my\r\n> software and/or printed documentation?*\r\n> \r\n> You must retain all copyright notices found in the code you are redistributing and include a copy of the PSF License and all of the other licenses in the Python \"license stack\" with the software distribution. The \"license stack\" is a result of the history of Python's development as described here (this page also lists all licenses in the stack).\r\n> \r\n> Separate from the issue of copyright, the name โPythonโ is also a trademark. You should include the notice โ\"Python\" is a registered trademark of the Python Software Foundationโ in the appropriate part of your documentation or About box and place the โยฎโ symbol after the first mention of โPythonโ in your documentation. (For example: โPythonยฎ is used as the scripting language for...โ)\r\n\r\n\r\nI'm not sure whether `yt-dlp` as a whole needs to be licensed under the GPL since it's not exactly clear what constitutes as \"linking\" and therefore making a \"combined work\", but I'd (personally) lean on the side of \"no\" since we disable the relevant features if the dependency is not present. The way we use some of these libraries isn't exactly deeply linking into them, but that's up for debate and out of the scope of this issue.\r\n\r\nThough, I do finally suggest that we remove `mutagen` and `pycryptodome` from [requirements.txt](requirements.txt) or at least make them an optional dependency under another package like `yt-dlp[full]` or something which is listed as GPL-licensed rather than Public Domain just to be safe.\r\n\r\nIn summary, I have 4 suggestions:\r\n1. Add text in the README saying that optional dependencies have different license terms\r\n2. Add text in the README saying that redistributions which include optional dependencies may be licensed under different terms than the Unlicense\r\n3. License the Windows builds under GPL and package LICENSE + THIRD-PARTY-NOTICES files along with the `.exe`\r\n4. Move `mutagen` and `pycryptodome` requirements to another package like `yt-dlp[full]` with GPL license if possible\r\n\r\nI apologize for the rather long write-up, and I am willing to help with this if necessary.\n\nClarify license of executables\n\n<!--\r\n **IMPORTANT**: PRs without the template will be CLOSED\r\n \r\n Due to the high volume of pull requests, it may be a while before your PR is reviewed.\r\n Please try to keep your pull request focused on a single bugfix or new feature.\r\n Pull requests with a vast scope and/or very large diff will take much longer to review.\r\n It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.\r\n\r\n PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.\r\n-->\r\n\r\n### Description of your *pull request* and other information\r\n\r\nFixes #348\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n<!--\r\n # PLEASE FOLLOW THE GUIDE BELOW\r\n\r\n - You will be asked some questions, please read them **carefully** and answer honestly\r\n - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])\r\n - Use *Preview* tab to see what your *pull request* will actually look like\r\n-->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Meta\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`","scope_files":["README.md","THIRD_PARTY_LICENSES.txt"]},{"subtask_id":"s2","goal":"Implement the changes under `.github/workflows/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`","scope_files":[".github/workflows/release.yml"]},{"subtask_id":"s3","goal":"Implement the changes under `bundle/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`","scope_files":["bundle/pyinstaller.py"]},{"subtask_id":"s4","goal":"Implement the changes under `devscripts/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`","scope_files":["devscripts/generate_third_party_licenses.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`\",\n \"scope_files\": [\n \"README.md\",\n \"THIRD_PARTY_LICENSES.txt\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`\",\n \"scope_files\": [\n \".github/workflows/release.yml\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `bundle/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`\",\n \"scope_files\": [\n \"bundle/pyinstaller.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `devscripts/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`\",\n \"scope_files\": [\n \"devscripts/generate_third_party_licenses.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["README.md","THIRD_PARTY_LICENSES.txt"],"solution_diff":"diff --git a/README.md b/README.md\nindex e582e1e53cbe..7be3266ea54c 100644\n--- a/README.md\n+++ b/README.md\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import\n gpg --verify SHA2-256SUMS.sig SHA2-256SUMS\n gpg --verify SHA2-512SUMS.sig SHA2-512SUMS\n ```\n+\n+#### Licensing\n+\n+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\n+\n+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\n+\n+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\n+\n+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\n+\n <!-- MANPAGE: END EXCLUDED SECTION -->\n \n **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)\ndiff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt\nnew file mode 100644\nindex 000000000000..104004654119\n--- /dev/null\n+++ b/THIRD_PARTY_LICENSES.txt\n@@ -0,0 +1,4433 @@\n+THIRD-PARTY LICENSES\n+\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\n+Source code for bundled third-party components is available from the original projects.\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.\n+\n+\n+--------------------------------------------------------------------------------\n+Python | PSF-2.0\n+URL: https://www.python.org/\n+--------------------------------------------------------------------------------\n+A. HISTORY OF THE SOFTWARE\n+==========================\n+\n+Python was created in the early 1990s by Guido van Rossum at Stichting\n+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands\n+as a successor of a language called ABC. Guido remains Python's\n+principal author, although it includes many contributions from others.\n+\n+In 1995, Guido continued his work on Python at the Corporation for\n+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)\n+in Reston, Virginia where he released several versions of the\n+software.\n+\n+In May 2000, Guido and the Python core development team moved to\n+BeOpen.com to form the BeOpen PythonLabs team. In October of the same\n+year, the PythonLabs team moved to Digital Creations, which became\n+Zope Corporation. In 2001, the Python Software Foundation (PSF, see\n+https://www.python.org/psf/) was formed, a non-profit organization\n+created specifically to own Python-related Intellectual Property.\n+Zope Corporation was a sponsoring member of the PSF.\n+\n+All Python releases are Open Source (see https://opensource.org for\n+the Open Source Definition). Historically, most, but not all, Python\n+releases have also been GPL-compatible; the table below summarizes\n+the various releases.\n+\n+ Release Derived Year Owner GPL-\n+ from compatible? (1)\n+\n+ 0.9.0 thru 1.2 1991-1995 CWI yes\n+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\n+ 1.6 1.5.2 2000 CNRI no\n+ 2.0 1.6 2000 BeOpen.com no\n+ 1.6.1 1.6 2001 CNRI yes (2)\n+ 2.1 2.0+1.6.1 2001 PSF no\n+ 2.0.1 2.0+1.6.1 2001 PSF yes\n+ 2.1.1 2.1+2.0.1 2001 PSF yes\n+ 2.1.2 2.1.1 2002 PSF yes\n+ 2.1.3 2.1.2 2002 PSF yes\n+ 2.2 and above 2.1.1 2001-now PSF yes\n+\n+Footnotes:\n+\n+(1) GPL-compatible doesn't mean that we're distributing Python under\n+ the GPL. All Python licenses, unlike the GPL, let you distribute\n+ a modified version without making your changes open source. The\n+ GPL-compatible licenses make it possible to combine Python with\n+ other software that is released under the GPL; the others don't.\n+\n+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,\n+ because its license has a choice of law clause. According to\n+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1\n+ is \"not incompatible\" with the GPL.\n+\n+Thanks to the many outside volunteers who have worked under Guido's\n+direction to make these releases possible.\n+\n+\n+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n+===============================================================\n+\n+Python software and documentation are licensed under the\n+Python Software Foundation License Version 2.\n+\n+Starting with Python 3.8.6, examples, recipes, and other code in\n+the documentation are dual licensed under the PSF License Version 2\n+and the Zero-Clause BSD license.\n+\n+Some software incorporated into Python is under different licenses.\n+The licenses are listed with code falling under that license.\n+\n+\n+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n+--------------------------------------------\n+\n+1. This LICENSE AGREEMENT is between the Python Software Foundation\n+(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\n+otherwise using this software (\"Python\") in source or binary form and\n+its associated documentation.\n+\n+2. Subject to the terms and conditions of this License Agreement, PSF hereby\n+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,\n+analyze, test, perform and/or display publicly, prepare derivative works,\n+distribute, and otherwise use Python alone or in any derivative version,\n+provided, however, that PSF's License Agreement and PSF's notice of copyright,\n+i.e., \"Copyright (c) 2001 Python Software Foundation; All Rights Reserved\"\n+are retained in Python alone or in any derivative version prepared by Licensee.\n+\n+3. In the event Licensee prepares a derivative work that is based on\n+or incorporates Python or any part thereof, and wants to make\n+the derivative work available to others as provided herein, then\n+Licensee hereby agrees to include in any such work a brief summary of\n+the changes made to Python.\n+\n+4. PSF is making Python available to Licensee on an \"AS IS\"\n+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+6. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+7. Nothing in this License Agreement shall be deemed to create any\n+relationship of agency, partnership, or joint venture between PSF and\n+Licensee. This License Agreement does not grant permission to use PSF\n+trademarks or trade name in a trademark sense to endorse or promote\n+products or services of Licensee, or any third party.\n+\n+8. By copying, installing or otherwise using Python, Licensee\n+agrees to be bound by the terms and conditions of this License\n+Agreement.\n+\n+\n+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n+-------------------------------------------\n+\n+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n+\n+1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\n+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\n+Individual or Organization (\"Licensee\") accessing and otherwise using\n+this software in source or binary form and its associated\n+documentation (\"the Software\").\n+\n+2. Subject to the terms and conditions of this BeOpen Python License\n+Agreement, BeOpen hereby grants Licensee a non-exclusive,\n+royalty-free, world-wide license to reproduce, analyze, test, perform\n+and/or display publicly, prepare derivative works, distribute, and\n+otherwise use the Software alone or in any derivative version,\n+provided, however, that the BeOpen Python License is retained in the\n+Software, alone or in any derivative version prepared by Licensee.\n+\n+3. BeOpen is making the Software available to Licensee on an \"AS IS\"\n+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\n+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\n+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\n+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+5. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+6. This License Agreement shall be governed by and interpreted in all\n+respects by the law of the State of California, excluding conflict of\n+law provisions. Nothing in this License Agreement shall be deemed to\n+create any relationship of agency, partnership, or joint venture\n+between BeOpen and Licensee. This License Agreement does not grant\n+permission to use BeOpen trademarks or trade names in a trademark\n+sense to endorse or promote products or services of Licensee, or any\n+third party. As an exception, the \"BeOpen Python\" logos available at\n+http://www.pythonlabs.com/logos.html may be used according to the\n+permissions granted on that web page.\n+\n+7. By copying, installing or otherwise using the software, Licensee\n+agrees to be bound by the terms and conditions of this License\n+Agreement.\n+\n+\n+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n+---------------------------------------\n+\n+1. This LICENSE AGREEMENT is between the Corporation for National\n+Research Initiatives, having an office at 1895 Preston White Drive,\n+Reston, VA 20191 (\"CNRI\"), and the Individual or Organization\n+(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\n+source or binary form and its associated documentation.\n+\n+2. Subject to the terms and conditions of this License Agreement, CNRI\n+hereby grants Licensee a nonexclusive, royalty-free, world-wide\n+license to reproduce, analyze, test, perform and/or display publicly,\n+prepare derivative works, distribute, and otherwise use Python 1.6.1\n+alone or in any derivative version, provided, however, that CNRI's\n+License Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n+1995-2001 Corporation for National Research Initiatives; All Rights\n+Reserved\" are retained in Python 1.6.1 alone or in any derivative\n+version prepared by Licensee. Alternately, in lieu of CNRI's License\n+Agreement, Licensee may substitute the following text (omitting the\n+quotes): \"Python 1.6.1 is made available subject to the terms and\n+conditions in CNRI's License Agreement. This Agreement together with\n+Python 1.6.1 may be located on the internet using the following\n+unique, persistent identifier (known as a handle): 1895.22/1013. This\n+Agreement may also be obtained from a proxy server on the internet\n+using the following URL: http://hdl.handle.net/1895.22/1013\".\n+\n+3. In the event Licensee prepares a derivative work that is based on\n+or incorporates Python 1.6.1 or any part thereof, and wants to make\n+the derivative work available to others as provided herein, then\n+Licensee hereby agrees to include in any such work a brief summary of\n+the changes made to Python 1.6.1.\n+\n+4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\n+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+6. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+7. This License Agreement shall be governed by the federal\n+intellectual property law of the United States, including without\n+limitation the federal copyright law, and, to the extent such\n+U.S. federal law does not apply, by the law of the Commonwealth of\n+Virginia, excluding Virginia's conflict of law provisions.\n+Notwithstanding the foregoing, with regard to derivative works based\n+on Python 1.6.1 that incorporate non-separable material that was\n+previously distributed under the GNU General Public License (GPL), the\n+law of the Commonwealth of Virginia shall govern this License\n+Agreement only as to issues arising under or with respect to\n+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this\n+License Agreement shall be deemed to create any relationship of\n+agency, partnership, or joint venture between CNRI and Licensee. This\n+License Agreement does not grant permission to use CNRI trademarks or\n+trade name in a trademark sense to endorse or promote products or\n+services of Licensee, or any third party.\n+\n+8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\n+installing or otherwise using Python 1.6.1, Licensee agrees to be\n+bound by the terms and conditions of this License Agreement.\n+\n+ ACCEPT\n+\n+\n+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n+--------------------------------------------------\n+\n+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\n+The Netherlands. All rights reserved.\n+\n+Permission to use, copy, modify, and distribute this software and its\n+documentation for any purpose and without fee is hereby granted,\n+provided that the above copyright notice appear in all copies and that\n+both that copyright notice and this permission notice appear in\n+supporting documentation, and that the name of Stichting Mathematisch\n+Centrum or CWI not be used in advertising or publicity pertaining to\n+distribution of the software without specific, written prior\n+permission.\n+\n+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\n+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\n+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\n+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\n+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\n+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\n+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n+\n+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION\n+----------------------------------------------------------------------\n+\n+Permission to use, copy, modify, and/or distribute this software for any\n+purpose with or without fee is hereby granted.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n+PERFORMANCE OF THIS SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Microsoft Distributable Code\n+Note: Only included in Windows builds\n+--------------------------------------------------------------------------------\n+Additional Conditions for this Windows binary build\n+---------------------------------------------------\n+\n+This program is linked with and uses Microsoft Distributable Code,\n+copyrighted by Microsoft Corporation. The Microsoft Distributable Code\n+is embedded in each .exe, .dll and .pyd file as a result of running\n+the code through a linker.\n+\n+If you further distribute programs that include the Microsoft\n+Distributable Code, you must comply with the restrictions on\n+distribution specified by Microsoft. In particular, you must require\n+distributors and external end users to agree to terms that protect the\n+Microsoft Distributable Code at least as much as Microsoft's own\n+requirements for the Distributable Code. See Microsoft's documentation\n+(included in its developer tools and on its website at microsoft.com)\n+for specific details.\n+\n+Redistribution of the Windows binary build of the Python interpreter\n+complies with this agreement, provided that you do not:\n+\n+- alter any copyright, trademark or patent notice in Microsoft's\n+Distributable Code;\n+\n+- use Microsoft's trademarks in your programs' names or in a way that\n+suggests your programs come from or are endorsed by Microsoft;\n+\n+- distribute Microsoft's Distributable Code to run on a platform other\n+than Microsoft operating systems, run-time technologies or application\n+platforms; or\n+\n+- include Microsoft Distributable Code in malicious, deceptive or\n+unlawful programs.\n+\n+These restrictions apply only to the Microsoft Distributable Code as\n+defined above, not to Python itself or any programs running on the\n+Python interpreter. The redistribution of the Python interpreter and\n+libraries is governed by the Python Software License included with this\n+file, or by other licenses as marked.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+bzip2 | bzip2-1.0.6\n+URL: https://sourceware.org/bzip2/\n+--------------------------------------------------------------------------------\n+--------------------------------------------------------------------------\n+\n+This program, \"bzip2\", the associated library \"libbzip2\", and all\n+documentation, are copyright (C) 1996-2010 Julian R Seward. All\n+rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+\n+2. The origin of this software must not be misrepresented; you must \n+ not claim that you wrote the original software. If you use this \n+ software in a product, an acknowledgment in the product \n+ documentation would be appreciated but is not required.\n+\n+3. Altered source versions must be plainly marked as such, and must\n+ not be misrepresented as being the original software.\n+\n+4. The name of the author may not be used to endorse or promote \n+ products derived from this software without specific prior written \n+ permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\n+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+Julian Seward, jseward@acm.org\n+bzip2/libbzip2 version 1.0.6 of 6 September 2010\n+\n+--------------------------------------------------------------------------\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libffi | MIT\n+URL: https://sourceware.org/libffi/\n+--------------------------------------------------------------------------------\n+libffi - Copyright (c) 1996-2025 Anthony Green, Red Hat, Inc and others.\n+See source files for details.\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of this software and associated documentation files (the\n+``Software''), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, sublicense, and/or sell copies of the Software, and to\n+permit persons to whom the Software is furnished to do so, subject to\n+the following conditions:\n+\n+The above copyright notice and this permission notice shall be\n+included in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+OpenSSL 3.0+ | Apache-2.0\n+URL: https://www.openssl.org/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ https://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+\n+\n+--------------------------------------------------------------------------------\n+SQLite | Public Domain\n+URL: https://www.sqlite.org/\n+--------------------------------------------------------------------------------\n+License Information\n+===================\n+\n+SQLite Is Public Domain\n+-----------------------\n+\n+The SQLite source code, including all of the files in the directories\n+listed in the bullets below are \n+[Public Domain](https://sqlite.org/copyright.html).\n+The authors have submitted written affidavits releasing their work to\n+the public for any use. Every byte of the public-domain code can be\n+traced back to the original authors. The files of this repository\n+that are public domain include the following:\n+\n+ * All of the primary SQLite source code files found in the\n+ [src/ directory](https://sqlite.org/src/tree/src?type=tree&expand)\n+ * All of the test cases and testing code in the\n+ [test/ directory](https://sqlite.org/src/tree/test?type=tree&expand)\n+ * All of the SQLite extension source code and test cases in the\n+ [ext/ directory](https://sqlite.org/src/tree/ext?type=tree&expand)\n+ * All code that ends up in the \"sqlite3.c\" and \"sqlite3.h\" build products\n+ that actually implement the SQLite RDBMS.\n+ * All of the code used to compile the\n+ [command-line interface](https://sqlite.org/cli.html)\n+ * All of the code used to build various utility programs such as\n+ \"sqldiff\", \"sqlite3_rsync\", and \"sqlite3_analyzer\".\n+\n+\n+The public domain source files usually contain a header comment\n+similar to the following to make it clear that the software is\n+public domain.\n+\n+> ~~~\n+The author disclaims copyright to this source code. In place of\n+a legal notice, here is a blessing:\n+\n+ * May you do good and not evil.\n+ * May you find forgiveness for yourself and forgive others.\n+ * May you share freely, never taking more than you give.\n+~~~\n+\n+Almost every file you find in this source repository will be\n+public domain. But there are a small number of exceptions:\n+\n+Non-Public-Domain Code Included With This Source Repository AS A Convenience\n+----------------------------------------------------------------------------\n+\n+This repository contains a (relatively) small amount of non-public-domain\n+code used to help implement the configuration and build logic. In other\n+words, there are some non-public-domain files used to implement:\n+\n+> ~~~\n+./configure && make\n+~~~\n+\n+In all cases, the non-public-domain files included with this\n+repository have generous BSD-style licenses. So anyone is free to\n+use any of the code in this source repository for any purpose, though\n+attribution may be required to reuse or republish the configure and\n+build scripts. None of the non-public-domain code ever actually reaches\n+the build products, such as \"sqlite3.c\", however, so no attribution is\n+required to use SQLite itself. The non-public-domain code consists of\n+scripts used to help compile SQLite. The non-public-domain code is\n+technically not part of SQLite. The non-public-domain code is\n+included in this repository as a convenience to developers, so that those\n+who want to build SQLite do not need to go download a bunch of\n+third-party build scripts in order to compile SQLite.\n+\n+Non-public-domain code included in this respository includes:\n+\n+ * The [\"autosetup\"](http://msteveb.github.io/autosetup/) configuration\n+ system that is contained (mostly) the autosetup/ directory, but also\n+ includes the \"./configure\" script at the top-level of this archive.\n+ Autosetup has a separate BSD-style license. See the\n+ [autosetup/LICENSE](http://msteveb.github.io/autosetup/license/)\n+ for details.\n+\n+ * There are BSD-style licenses on some of the configuration\n+ software found in the legacy autoconf/ directory and its\n+ subdirectories.\n+\n+The following unix shell command is can be run from the top-level\n+of this source repository in order to remove all non-public-domain\n+code:\n+\n+> ~~~\n+rm -rf configure autosetup autoconf\n+~~~\n+\n+If you unpack this source repository and then run the command above, what\n+is left will be 100% public domain.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+liblzma | 0BSD\n+URL: https://tukaani.org/xz/\n+--------------------------------------------------------------------------------\n+XZ Utils Licensing\n+==================\n+\n+ Different licenses apply to different files in this package. Here\n+ is a summary of which licenses apply to which parts of this package:\n+\n+ - liblzma is under the BSD Zero Clause License (0BSD).\n+\n+ - The command line tools xz, xzdec, lzmadec, and lzmainfo are\n+ under 0BSD except that, on systems that don't have a usable\n+ getopt_long, GNU getopt_long is compiled and linked in from the\n+ 'lib' directory. The getopt_long code is under GNU LGPLv2.1+.\n+\n+ - The scripts to grep, diff, and view compressed files have been\n+ adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless,\n+ and xzmore) are under GNU GPLv2+. The man pages of the scripts\n+ are under 0BSD; they aren't based on the man pages of GNU gzip.\n+\n+ - Most of the XZ Utils specific documentation that is in\n+ plain text files (like README, INSTALL, PACKAGERS, NEWS,\n+ and ChangeLog) are under 0BSD unless stated otherwise in\n+ the file itself. The files xz-file-format.txt and\n+ lzma-file-format.xt are in the public domain but may\n+ be distributed under the terms of 0BSD too.\n+\n+ - Translated messages and man pages are under 0BSD except that\n+ some old translations are in the public domain.\n+\n+ - Test files and test code in the 'tests' directory, and\n+ debugging utilities in the 'debug' directory are under\n+ the BSD Zero Clause License (0BSD).\n+\n+ - The GNU Autotools based build system contains files that are\n+ under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses.\n+ These files don't affect the licensing of the binaries being\n+ built.\n+\n+ - The 'extra' directory contains files that are under various\n+ free software licenses. These aren't built or installed as\n+ part of XZ Utils.\n+\n+ The following command may be helpful in finding per-file license\n+ information. It works on xz.git and on a clean file tree extracted\n+ from a release tarball.\n+\n+ sh build-aux/license-check.sh -v\n+\n+ For the files under the BSD Zero Clause License (0BSD), if\n+ a copyright notice is needed, the following is sufficient:\n+\n+ Copyright (C) The XZ Utils authors and contributors\n+\n+ If you copy significant amounts of 0BSD-licensed code from XZ Utils\n+ into your project, acknowledging this somewhere in your software is\n+ polite (especially if it is proprietary, non-free software), but\n+ it is not legally required by the license terms. Here is an example\n+ of a good notice to put into \"about box\" or into documentation:\n+\n+ This software includes code from XZ Utils <https://tukaani.org/xz/>.\n+\n+ The following license texts are included in the following files:\n+ - COPYING.0BSD: BSD Zero Clause License\n+ - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1\n+ - COPYING.GPLv2: GNU General Public License version 2\n+ - COPYING.GPLv3: GNU General Public License version 3\n+\n+ If you have questions, don't hesitate to ask for more information.\n+ The contact information is in the README file.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+mpdecimal | BSD-2-Clause\n+URL: https://www.bytereef.org/mpdecimal/\n+--------------------------------------------------------------------------------\n+Copyright (c) 2008-2025 Stefan Krah. All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n+SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+zlib | zlib\n+URL: https://zlib.net/\n+--------------------------------------------------------------------------------\n+Copyright notice:\n+\n+ (C) 1995-2024 Jean-loup Gailly and Mark Adler\n+\n+ This software is provided 'as-is', without any express or implied\n+ warranty. In no event will the authors be held liable for any damages\n+ arising from the use of this software.\n+\n+ Permission is granted to anyone to use this software for any purpose,\n+ including commercial applications, and to alter it and redistribute it\n+ freely, subject to the following restrictions:\n+\n+ 1. The origin of this software must not be misrepresented; you must not\n+ claim that you wrote the original software. If you use this software\n+ in a product, an acknowledgment in the product documentation would be\n+ appreciated but is not required.\n+ 2. Altered source versions must be plainly marked as such, and must not be\n+ misrepresented as being the original software.\n+ 3. This notice may not be removed or altered from any source distribution.\n+\n+ Jean-loup Gailly Mark Adler\n+ jloup@gzip.org madler@alumni.caltech.edu\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Expat | MIT\n+URL: https://libexpat.github.io/\n+--------------------------------------------------------------------------------\n+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper\n+Copyright (c) 2001-2025 Expat maintainers\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of this software and associated documentation files (the\n+\"Software\"), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, sublicense, and/or sell copies of the Software, and to\n+permit persons to whom the Software is furnished to do so, subject to\n+the following conditions:\n+\n+The above copyright notice and this permission notice shall be included\n+in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+ncurses | X11-distribute-modifications-variant\n+Note: Only included in Linux/macOS builds\n+URL: https://invisible-island.net/ncurses/\n+--------------------------------------------------------------------------------\n+Copyright 2018-2022,2023 Thomas E. Dickey\n+Copyright 1998-2017,2018 Free Software Foundation, Inc.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a\n+copy of this software and associated documentation files (the\n+\"Software\"), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, distribute with modifications, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included\n+in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\n+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\n+THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+Except as contained in this notice, the name(s) of the above copyright\n+holders shall not be used in advertising or otherwise to promote the\n+sale, use or other dealings in this Software without prior written\n+authorization.\n+\n+-- vile:txtmode fc=72\n+-- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $\n+\n+\n+\n+--------------------------------------------------------------------------------\n+GNU Readline | GPL-3.0-or-later\n+Note: Only included in Linux builds\n+URL: https://www.gnu.org/software/readline/\n+--------------------------------------------------------------------------------\n+ GNU GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+ Preamble\n+\n+ The GNU General Public License is a free, copyleft license for\n+software and other kinds of works.\n+\n+ The licenses for most software and other practical works are designed\n+to take away your freedom to share and change the works. By contrast,\n+the GNU General Public License is intended to guarantee your freedom to\n+share and change all versions of a program--to make sure it remains free\n+software for all its users. We, the Free Software Foundation, use the\n+GNU General Public License for most of our software; it applies also to\n+any other work released this way by its authors. You can apply it to\n+your programs, too.\n+\n+ When we speak of free software, we are referring to freedom, not\n+price. Our General Public Licenses are designed to make sure that you\n+have the freedom to distribute copies of free software (and charge for\n+them if you wish), that you receive source code or can get it if you\n+want it, that you can change the software or use pieces of it in new\n+free programs, and that you know you can do these things.\n+\n+ To protect your rights, we need to prevent others from denying you\n+these rights or asking you to surrender the rights. Therefore, you have\n+certain responsibilities if you distribute copies of the software, or if\n+you modify it: responsibilities to respect the freedom of others.\n+\n+ For example, if you distribute copies of such a program, whether\n+gratis or for a fee, you must pass on to the recipients the same\n+freedoms that you received. You must make sure that they, too, receive\n+or can get the source code. And you must show them these terms so they\n+know their rights.\n+\n+ Developers that use the GNU GPL protect your rights with two steps:\n+(1) assert copyright on the software, and (2) offer you this License\n+giving you legal permission to copy, distribute and/or modify it.\n+\n+ For the developers' and authors' protection, the GPL clearly explains\n+that there is no warranty for this free software. For both users' and\n+authors' sake, the GPL requires that modified versions be marked as\n+changed, so that their problems will not be attributed erroneously to\n+authors of previous versions.\n+\n+ Some devices are designed to deny users access to install or run\n+modified versions of the software inside them, although the manufacturer\n+can do so. This is fundamentally incompatible with the aim of\n+protecting users' freedom to change the software. The systematic\n+pattern of such abuse occurs in the area of products for individuals to\n+use, which is precisely where it is most unacceptable. Therefore, we\n+have designed this version of the GPL to prohibit the practice for those\n+products. If such problems arise substantially in other domains, we\n+stand ready to extend this provision to those domains in future versions\n+of the GPL, as needed to protect the freedom of users.\n+\n+ Finally, every program is threatened constantly by software patents.\n+States should not allow patents to restrict development and use of\n+software on general-purpose computers, but in those that do, we wish to\n+avoid the special danger that patents applied to a free program could\n+make it effectively proprietary. To prevent this, the GPL assures that\n+patents cannot be used to render the program non-free.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow.\n+\n+ TERMS AND CONDITIONS\n+\n+ 0. Definitions.\n+\n+ \"This License\" refers to version 3 of the GNU General Public License.\n+\n+ \"Copyright\" also means copyright-like laws that apply to other kinds of\n+works, such as semiconductor masks.\n+\n+ \"The Program\" refers to any copyrightable work licensed under this\n+License. Each licensee is addressed as \"you\". \"Licensees\" and\n+\"recipients\" may be individuals or organizations.\n+\n+ To \"modify\" a work means to copy from or adapt all or part of the work\n+in a fashion requiring copyright permission, other than the making of an\n+exact copy. The resulting work is called a \"modified version\" of the\n+earlier work or a work \"based on\" the earlier work.\n+\n+ A \"covered work\" means either the unmodified Program or a work based\n+on the Program.\n+\n+ To \"propagate\" a work means to do anything with it that, without\n+permission, would make you directly or secondarily liable for\n+infringement under applicable copyright law, except executing it on a\n+computer or modifying a private copy. Propagation includes copying,\n+distribution (with or without modification), making available to the\n+public, and in some countries other activities as well.\n+\n+ To \"convey\" a work means any kind of propagation that enables other\n+parties to make or receive copies. Mere interaction with a user through\n+a computer network, with no transfer of a copy, is not conveying.\n+\n+ An interactive user interface displays \"Appropriate Legal Notices\"\n+to the extent that it includes a convenient and prominently visible\n+feature that (1) displays an appropriate copyright notice, and (2)\n+tells the user that there is no warranty for the work (except to the\n+extent that warranties are provided), that licensees may convey the\n+work under this License, and how to view a copy of this License. If\n+the interface presents a list of user commands or options, such as a\n+menu, a prominent item in the list meets this criterion.\n+\n+ 1. Source Code.\n+\n+ The \"source code\" for a work means the preferred form of the work\n+for making modifications to it. \"Object code\" means any non-source\n+form of a work.\n+\n+ A \"Standard Interface\" means an interface that either is an official\n+standard defined by a recognized standards body, or, in the case of\n+interfaces specified for a particular programming language, one that\n+is widely used among developers working in that language.\n+\n+ The \"System Libraries\" of an executable work include anything, other\n+than the work as a whole, that (a) is included in the normal form of\n+packaging a Major Component, but which is not part of that Major\n+Component, and (b) serves only to enable use of the work with that\n+Major Component, or to implement a Standard Interface for which an\n+implementation is available to the public in source code form. A\n+\"Major Component\", in this context, means a major essential component\n+(kernel, window system, and so on) of the specific operating system\n+(if any) on which the executable work runs, or a compiler used to\n+produce the work, or an object code interpreter used to run it.\n+\n+ The \"Corresponding Source\" for a work in object code form means all\n+the source code needed to generate, install, and (for an executable\n+work) run the object code and to modify the work, including scripts to\n+control those activities. However, it does not include the work's\n+System Libraries, or general-purpose tools or generally available free\n+programs which are used unmodified in performing those activities but\n+which are not part of the work. For example, Corresponding Source\n+includes interface definition files associated with source files for\n+the work, and the source code for shared libraries and dynamically\n+linked subprograms that the work is specifically designed to require,\n+such as by intimate data communication or control flow between those\n+subprograms and other parts of the work.\n+\n+ The Corresponding Source need not include anything that users\n+can regenerate automatically from other parts of the Corresponding\n+Source.\n+\n+ The Corresponding Source for a work in source code form is that\n+same work.\n+\n+ 2. Basic Permissions.\n+\n+ All rights granted under this License are granted for the term of\n+copyright on the Program, and are irrevocable provided the stated\n+conditions are met. This License explicitly affirms your unlimited\n+permission to run the unmodified Program. The output from running a\n+covered work is covered by this License only if the output, given its\n+content, constitutes a covered work. This License acknowledges your\n+rights of fair use or other equivalent, as provided by copyright law.\n+\n+ You may make, run and propagate covered works that you do not\n+convey, without conditions so long as your license otherwise remains\n+in force. You may convey covered works to others for the sole purpose\n+of having them make modifications exclusively for you, or provide you\n+with facilities for running those works, provided that you comply with\n+the terms of this License in conveying all material for which you do\n+not control copyright. Those thus making or running the covered works\n+for you must do so exclusively on your behalf, under your direction\n+and control, on terms that prohibit them from making any copies of\n+your copyrighted material outside their relationship with you.\n+\n+ Conveying under any other circumstances is permitted solely under\n+the conditions stated below. Sublicensing is not allowed; section 10\n+makes it unnecessary.\n+\n+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n+\n+ No covered work shall be deemed part of an effective technological\n+measure under any applicable law fulfilling obligations under article\n+11 of the WIPO copyright treaty adopted on 20 December 1996, or\n+similar laws prohibiting or restricting circumvention of such\n+measures.\n+\n+ When you convey a covered work, you waive any legal power to forbid\n+circumvention of technological measures to the extent such circumvention\n+is effected by exercising rights under this License with respect to\n+the covered work, and you disclaim any intention to limit operation or\n+modification of the work as a means of enforcing, against the work's\n+users, your or third parties' legal rights to forbid circumvention of\n+technological measures.\n+\n+ 4. Conveying Verbatim Copies.\n+\n+ You may convey verbatim copies of the Program's source code as you\n+receive it, in any medium, provided that you conspicuously and\n+appropriately publish on each copy an appropriate copyright notice;\n+keep intact all notices stating that this License and any\n+non-permissive terms added in accord with section 7 apply to the code;\n+keep intact all notices of the absence of any warranty; and give all\n+recipients a copy of this License along with the Program.\n+\n+ You may charge any price or no price for each copy that you convey,\n+and you may offer support or warranty protection for a fee.\n+\n+ 5. Conveying Modified Source Versions.\n+\n+ You may convey a work based on the Program, or the modifications to\n+produce it from the Program, in the form of source code under the\n+terms of section 4, provided that you also meet all of these conditions:\n+\n+ a) The work must carry prominent notices stating that you modified\n+ it, and giving a relevant date.\n+\n+ b) The work must carry prominent notices stating that it is\n+ released under this License and any conditions added under section\n+ 7. This requirement modifies the requirement in section 4 to\n+ \"keep intact all notices\".\n+\n+ c) You must license the entire work, as a whole, under this\n+ License to anyone who comes into possession of a copy. This\n+ License will therefore apply, along with any applicable section 7\n+ additional terms, to the whole of the work, and all its parts,\n+ regardless of how they are packaged. This License gives no\n+ permission to license the work in any other way, but it does not\n+ invalidate such permission if you have separately received it.\n+\n+ d) If the work has interactive user interfaces, each must display\n+ Appropriate Legal Notices; however, if the Program has interactive\n+ interfaces that do not display Appropriate Legal Notices, your\n+ work need not make them do so.\n+\n+ A compilation of a covered work with other separate and independent\n+works, which are not by their nature extensions of the covered work,\n+and which are not combined with it such as to form a larger program,\n+in or on a volume of a storage or distribution medium, is called an\n+\"aggregate\" if the compilation and its resulting copyright are not\n+used to limit the access or legal rights of the compilation's users\n+beyond what the individual works permit. Inclusion of a covered work\n+in an aggregate does not cause this License to apply to the other\n+parts of the aggregate.\n+\n+ 6. Conveying Non-Source Forms.\n+\n+ You may convey a covered work in object code form under the terms\n+of sections 4 and 5, provided that you also convey the\n+machine-readable Corresponding Source under the terms of this License,\n+in one of these ways:\n+\n+ a) Convey the object code in, or embodied in, a physical product\n+ (including a physical distribution medium), accompanied by the\n+ Corresponding Source fixed on a durable physical medium\n+ customarily used for software interchange.\n+\n+ b) Convey the object code in, or embodied in, a physical product\n+ (including a physical distribution medium), accompanied by a\n+ written offer, valid for at least three years and valid for as\n+ long as you offer spare parts or customer support for that product\n+ model, to give anyone who possesses the object code either (1) a\n+ copy of the Corresponding Source for all the software in the\n+ product that is covered by this License, on a durable physical\n+ medium customarily used for software interchange, for a price no\n+ more than your reasonable cost of physically performing this\n+ conveying of source, or (2) access to copy the\n+ Corresponding Source from a network server at no charge.\n+\n+ c) Convey individual copies of the object code with a copy of the\n+ written offer to provide the Corresponding Source. This\n+ alternative is allowed only occasionally and noncommercially, and\n+ only if you received the object code with such an offer, in accord\n+ with subsection 6b.\n+\n+ d) Convey the object code by offering access from a designated\n+ place (gratis or for a charge), and offer equivalent access to the\n+ Corresponding Source in the same way through the same place at no\n+ further charge. You need not require recipients to copy the\n+ Corresponding Source along with the object code. If the place to\n+ copy the object code is a network server, the Corresponding Source\n+ may be on a different server (operated by you or a third party)\n+ that supports equivalent copying facilities, provided you maintain\n+ clear directions next to the object code saying where to find the\n+ Corresponding Source. Regardless of what server hosts the\n+ Corresponding Source, you remain obligated to ensure that it is\n+ available for as long as needed to satisfy these requirements.\n+\n+ e) Convey the object code using peer-to-peer transmission, provided\n+ you inform other peers where the object code and Corresponding\n+ Source of the work are being offered to the general public at no\n+ charge under subsection 6d.\n+\n+ A separable portion of the object code, whose source code is excluded\n+from the Corresponding Source as a System Library, need not be\n+included in conveying the object code work.\n+\n+ A \"User Product\" is either (1) a \"consumer product\", which means any\n+tangible personal property which is normally used for personal, family,\n+or household purposes, or (2) anything designed or sold for incorporation\n+into a dwelling. In determining whether a product is a consumer product,\n+doubtful cases shall be resolved in favor of coverage. For a particular\n+product received by a particular user, \"normally used\" refers to a\n+typical or common use of that class of product, regardless of the status\n+of the particular user or of the way in which the particular user\n+actually uses, or expects or is expected to use, the product. A product\n+is a consumer product regardless of whether the product has substantial\n+commercial, industrial or non-consumer uses, unless such uses represent\n+the only significant mode of use of the product.\n+\n+ \"Installation Information\" for a User Product means any methods,\n+procedures, authorization keys, or other information required to install\n+and execute modified versions of a covered work in that User Product from\n+a modified version of its Corresponding Source. The information must\n+suffice to ensure that the continued functioning of the modified object\n+code is in no case prevented or interfered with solely because\n+modification has been made.\n+\n+ If you convey an object code work under this section in, or with, or\n+specifically for use in, a User Product, and the conveying occurs as\n+part of a transaction in which the right of possession and use of the\n+User Product is transferred to the recipient in perpetuity or for a\n+fixed term (regardless of how the transaction is characterized), the\n+Corresponding Source conveyed under this section must be accompanied\n+by the Installation Information. But this requirement does not apply\n+if neither you nor any third party retains the ability to install\n+modified object code on the User Product (for example, the work has\n+been installed in ROM).\n+\n+ The requirement to provide Installation Information does not include a\n+requirement to continue to provide support service, warranty, or updates\n+for a work that has been modified or installed by the recipient, or for\n+the User Product in which it has been modified or installed. Access to a\n+network may be denied when the modification itself materially and\n+adversely affects the operation of the network or violates the rules and\n+protocols for communication across the network.\n+\n+ Corresponding Source conveyed, and Installation Information provided,\n+in accord with this section must be in a format that is publicly\n+documented (and with an implementation available to the public in\n+source code form), and must require no special password or key for\n+unpacking, reading or copying.\n+\n+ 7. Additional Terms.\n+\n+ \"Additional permissions\" are terms that supplement the terms of this\n+License by making exceptions from one or more of its conditions.\n+Additional permissions that are applicable to the entire Program shall\n+be treated as though they were included in this License, to the extent\n+that they are valid under applicable law. If additional permissions\n+apply only to part of the Program, that part may be used separately\n+under those permissions, but the entire Program remains governed by\n+this License without regard to the additional permissions.\n+\n+ When you convey a copy of a covered work, you may at your option\n+remove any additional permissions from that copy, or from any part of\n+it. (Additional permissions may be written to require their own\n+removal in certain cases when you modify the work.) You may place\n+additional permissions on material, added by you to a covered work,\n+for which you have or can give appropriate copyright permission.\n+\n+ Notwithstanding any other provision of this License, for material you\n+add to a covered work, you may (if authorized by the copyright holders of\n+that material) supplement the terms of this License with terms:\n+\n+ a) Disclaiming warranty or limiting liability differently from the\n+ terms of sections 15 and 16 of this License; or\n+\n+ b) Requiring preservation of specified reasonable legal notices or\n+ author attributions in that material or in the Appropriate Legal\n+ Notices displayed by works containing it; or\n+\n+ c) Prohibiting misrepresentation of the origin of that material, or\n+ requiring that modified versions of such material be marked in\n+ reasonable ways as different from the original version; or\n+\n+ d) Limiting the use for publicity purposes of names of licensors or\n+ authors of the material; or\n+\n+ e) Declining to grant rights under trademark law for use of some\n+ trade names, trademarks, or service marks; or\n+\n+ f) Requiring indemnification of licensors and authors of that\n+ material by anyone who conveys the material (or modified versions of\n+ it) with contractual assumptions of liability to the recipient, for\n+ any liability that these contractual assumptions directly impose on\n+ those licensors and authors.\n+\n+ All other non-permissive additional terms are considered \"further\n+restrictions\" within the meaning of section 10. If the Program as you\n+received it, or any part of it, contains a notice stating that it is\n+governed by this License along with a term that is a further\n+restriction, you may remove that term. If a license document contains\n+a further restriction but permits relicensing or conveying under this\n+License, you may add to a covered work material governed by the terms\n+of that license document, provided that the further restriction does\n+not survive such relicensing or conveying.\n+\n+ If you add terms to a covered work in accord with this section, you\n+must place, in the relevant source files, a statement of the\n+additional terms that apply to those files, or a notice indicating\n+where to find the applicable terms.\n+\n+ Additional terms, permissive or non-permissive, may be stated in the\n+form of a separately written license, or stated as exceptions;\n+the above requirements apply either way.\n+\n+ 8. Termination.\n+\n+ You may not propagate or modify a covered work except as expressly\n+provided under this License. Any attempt otherwise to propagate or\n+modify it is void, and will automatically terminate your rights under\n+this License (including any patent licenses granted under the third\n+paragraph of section 11).\n+\n+ However, if you cease all violation of this License, then your\n+license from a particular copyright holder is reinstated (a)\n+provisionally, unless and until the copyright holder explicitly and\n+finally terminates your license, and (b) permanently, if the copyright\n+holder fails to notify you of the violation by some reasonable means\n+prior to 60 days after the cessation.\n+\n+ Moreover, your license from a particular copyright holder is\n+reinstated permanently if the copyright holder notifies you of the\n+violation by some reasonable means, this is the first time you have\n+received notice of violation of this License (for any work) from that\n+copyright holder, and you cure the violation prior to 30 days after\n+your receipt of the notice.\n+\n+ Termination of your rights under this section does not terminate the\n+licenses of parties who have received copies or rights from you under\n+this License. If your rights have been terminated and not permanently\n+reinstated, you do not qualify to receive new licenses for the same\n+material under section 10.\n+\n+ 9. Acceptance Not Required for Having Copies.\n+\n+ You are not required to accept this License in order to receive or\n+run a copy of the Program. Ancillary propagation of a covered work\n+occurring solely as a consequence of using peer-to-peer transmission\n+to receive a copy likewise does not require acceptance. However,\n+nothing other than this License grants you permission to propagate or\n+modify any covered work. These actions infringe copyright if you do\n+not accept this License. Therefore, by modifying or propagating a\n+covered work, you indicate your acceptance of this License to do so.\n+\n+ 10. Automatic Licensing of Downstream Recipients.\n+\n+ Each time you convey a covered work, the recipient automatically\n+receives a license from the original licensors, to run, modify and\n+propagate that work, subject to this License. You are not responsible\n+for enforcing compliance by third parties with this License.\n+\n+ An \"entity transaction\" is a transaction transferring control of an\n+organization, or substantially all assets of one, or subdividing an\n+organization, or merging organizations. If propagation of a covered\n+work results from an entity transaction, each party to that\n+transaction who receives a copy of the work also receives whatever\n+licenses to the work the party's predecessor in interest had or could\n+give under the previous paragraph, plus a right to possession of the\n+Corresponding Source of the work from the predecessor in interest, if\n+the predecessor has it or can get it with reasonable efforts.\n+\n+ You may not impose any further restrictions on the exercise of the\n+rights granted or affirmed under this License. For example, you may\n+not impose a license fee, royalty, or other charge for exercise of\n+rights granted under this License, and you may not initiate litigation\n+(including a cross-claim or counterclaim in a lawsuit) alleging that\n+any patent claim is infringed by making, using, selling, offering for\n+sale, or importing the Program or any portion of it.\n+\n+ 11. Patents.\n+\n+ A \"contributor\" is a copyright holder who authorizes use under this\n+License of the Program or a work on which the Program is based. The\n+work thus licensed is called the contributor's \"contributor version\".\n+\n+ A contributor's \"essential patent claims\" are all patent claims\n+owned or controlled by the contributor, whether already acquired or\n+hereafter acquired, that would be infringed by some manner, permitted\n+by this License, of making, using, or selling its contributor version,\n+but do not include claims that would be infringed only as a\n+consequence of further modification of the contributor version. For\n+purposes of this definition, \"control\" includes the right to grant\n+patent sublicenses in a manner consistent with the requirements of\n+this License.\n+\n+ Each contributor grants you a non-exclusive, worldwide, royalty-free\n+patent license under the contributor's essential patent claims, to\n+make, use, sell, offer for sale, import and otherwise run, modify and\n+propagate the contents of its contributor version.\n+\n+ In the following three paragraphs, a \"patent license\" is any express\n+agreement or commitment, however denominated, not to enforce a patent\n+(such as an express permission to practice a patent or covenant not to\n+sue for patent infringement). To \"grant\" such a patent license to a\n+party means to make such an agreement or commitment not to enforce a\n+patent against the party.\n+\n+ If you convey a covered work, knowingly relying on a patent license,\n+and the Corresponding Source of the work is not available for anyone\n+to copy, free of charge and under the terms of this License, through a\n+publicly available network server or other readily accessible means,\n+then you must either (1) cause the Corresponding Source to be so\n+available, or (2) arrange to deprive yourself of the benefit of the\n+patent license for this particular work, or (3) arrange, in a manner\n+consistent with the requirements of this License, to extend the patent\n+license to downstream recipients. \"Knowingly relying\" means you have\n+actual knowledge that, but for the patent license, your conveying the\n+covered work in a country, or your recipient's use of the covered work\n+in a country, would infringe one or more identifiable patents in that\n+country that you have reason to believe are valid.\n+\n+ If, pursuant to or in connection with a single transaction or\n+arrangement, you convey, or propagate by procuring conveyance of, a\n+covered work, and grant a patent license to some of the parties\n+receiving the covered work authorizing them to use, propagate, modify\n+or convey a specific copy of the covered work, then the patent license\n+you grant is automatically extended to all recipients of the covered\n+work and works based on it.\n+\n+ A patent license is \"discriminatory\" if it does not include within\n+the scope of its coverage, prohibits the exercise of, or is\n+conditioned on the non-exercise of one or more of the rights that are\n+specifically granted under this License. You may not convey a covered\n+work if you are a party to an arrangement with a third party that is\n+in the business of distributing software, under which you make payment\n+to the third party based on the extent of your activity of conveying\n+the work, and under which the third party grants, to any of the\n+parties who would receive the covered work from you, a discriminatory\n+patent license (a) in connection with copies of the covered work\n+conveyed by you (or copies made from those copies), or (b) primarily\n+for and in connection with specific products or compilations that\n+contain the covered work, unless you entered into that arrangement,\n+or that patent license was granted, prior to 28 March 2007.\n+\n+ Nothing in this License shall be construed as excluding or limiting\n+any implied license or other defenses to infringement that may\n+otherwise be available to you under applicable patent law.\n+\n+ 12. No Surrender of Others' Freedom.\n+\n+ If conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot convey a\n+covered work so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you may\n+not convey it at all. For example, if you agree to terms that obligate you\n+to collect a royalty for further conveying from those to whom you convey\n+the Program, the only way you could satisfy both those terms and this\n+License would be to refrain entirely from conveying the Program.\n+\n+ 13. Use with the GNU Affero General Public License.\n+\n+ Notwithstanding any other provision of this License, you have\n+permission to link or combine any covered work with a work licensed\n+under version 3 of the GNU Affero General Public License into a single\n+combined work, and to convey the resulting work. The terms of this\n+License will continue to apply to the part which is the covered work,\n+but the special requirements of the GNU Affero General Public License,\n+section 13, concerning interaction through a network will apply to the\n+combination as such.\n+\n+ 14. Revised Versions of this License.\n+\n+ The Free Software Foundation may publish revised and/or new versions of\n+the GNU General Public License from time to time. Such new versions will\n+be similar in spirit to the present version, but may differ in detail to\n+address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Program specifies that a certain numbered version of the GNU General\n+Public License \"or any later version\" applies to it, you have the\n+option of following the terms and conditions either of that numbered\n+version or of any later version published by the Free Software\n+Foundation. If the Program does not specify a version number of the\n+GNU General Public License, you may choose any version ever published\n+by the Free Software Foundation.\n+\n+ If the Program specifies that a proxy can decide which future\n+versions of the GNU General Public License can be used, that proxy's\n+public statement of acceptance of a version permanently authorizes you\n+to choose that version for the Program.\n+\n+ Later license versions may give you additional or different\n+permissions. However, no additional obligations are imposed on any\n+author or copyright holder as a result of your choosing to follow a\n+later version.\n+\n+ 15. Disclaimer of Warranty.\n+\n+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\n+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\n+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\n+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\n+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\n+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\n+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. Limitation of Liability.\n+\n+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\n+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\n+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\n+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\n+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\n+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\n+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\n+SUCH DAMAGES.\n+\n+ 17. Interpretation of Sections 15 and 16.\n+\n+ If the disclaimer of warranty and limitation of liability provided\n+above cannot be given local legal effect according to their terms,\n+reviewing courts shall apply local law that most closely approximates\n+an absolute waiver of all civil liability in connection with the\n+Program, unless a warranty or assumption of liability accompanies a\n+copy of the Program in return for a fee.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ How to Apply These Terms to Your New Programs\n+\n+ If you develop a new program, and you want it to be of the greatest\n+possible use to the public, the best way to achieve this is to make it\n+free software which everyone can redistribute and change under these terms.\n+\n+ To do so, attach the following notices to the program. It is safest\n+to attach them to the start of each source file to most effectively\n+state the exclusion of warranty; and each file should have at least\n+the \"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the program's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This program is free software: you can redistribute it and/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation, either version 3 of the License, or\n+ (at your option) any later version.\n+\n+ This program is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License\n+ along with this program. If not, see <http://www.gnu.org/licenses/>.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+ If the program does terminal interaction, make it output a short\n+notice like this when it starts in an interactive mode:\n+\n+ <program> Copyright (C) <year> <name of author>\n+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n+ This is free software, and you are welcome to redistribute it\n+ under certain conditions; type `show c' for details.\n+\n+The hypothetical commands `show w' and `show c' should show the appropriate\n+parts of the General Public License. Of course, your program's commands\n+might be different; for a GUI interface, you would use an \"about box\".\n+\n+ You should also get your employer (if you work as a programmer) or school,\n+if any, to sign a \"copyright disclaimer\" for the program, if necessary.\n+For more information on this, and how to apply and follow the GNU GPL, see\n+<http://www.gnu.org/licenses/>.\n+\n+ The GNU General Public License does not permit incorporating your program\n+into proprietary programs. If your program is a subroutine library, you\n+may consider it more useful to permit linking proprietary applications with\n+the library. If this is what you want to do, use the GNU Lesser General\n+Public License instead of this License. But first, please read\n+<http://www.gnu.org/philosophy/why-not-lgpl.html>.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libstdc++ | GPL-3.0-with-GCC-exception\n+Note: Only included in Linux builds\n+URL: https://gcc.gnu.org/onlinedocs/libstdc++/\n+--------------------------------------------------------------------------------\n+GCC RUNTIME LIBRARY EXCEPTION\n+\n+Version 3.1, 31 March 2009\n+\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\n+\n+Everyone is permitted to copy and distribute verbatim copies of this\n+license document, but changing it is not allowed.\n+\n+This GCC Runtime Library Exception (\"Exception\") is an additional\n+permission under section 7 of the GNU General Public License, version\n+3 (\"GPLv3\"). It applies to a given file (the \"Runtime Library\") that\n+bears a notice placed by the copyright holder of the file stating that\n+the file is governed by GPLv3 along with this Exception.\n+\n+When you use GCC to compile a program, GCC may combine portions of\n+certain GCC header files and runtime libraries with the compiled\n+program. The purpose of this Exception is to allow compilation of\n+non-GPL (including proprietary) programs to use, in this way, the\n+header files and runtime libraries covered by this Exception.\n+\n+0. Definitions.\n+\n+A file is an \"Independent Module\" if it either requires the Runtime\n+Library for execution after a Compilation Process, or makes use of an\n+interface provided by the Runtime Library, but is not otherwise based\n+on the Runtime Library.\n+\n+\"GCC\" means a version of the GNU Compiler Collection, with or without\n+modifications, governed by version 3 (or a specified later version) of\n+the GNU General Public License (GPL) with the option of using any\n+subsequent versions published by the FSF.\n+\n+\"GPL-compatible Software\" is software whose conditions of propagation,\n+modification and use would permit combination with GCC in accord with\n+the license of GCC.\n+\n+\"Target Code\" refers to output from any compiler for a real or virtual\n+target processor architecture, in executable form or suitable for\n+input to an assembler, loader, linker and/or execution\n+phase. Notwithstanding that, Target Code does not include data in any\n+format that is used as a compiler intermediate representation, or used\n+for producing a compiler intermediate representation.\n+\n+The \"Compilation Process\" transforms code entirely represented in\n+non-intermediate languages designed for human-written code, and/or in\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\n+use of source code generators and preprocessors need not be considered\n+part of the Compilation Process, since the Compilation Process can be\n+understood as starting with the output of the generators or\n+preprocessors.\n+\n+A Compilation Process is \"Eligible\" if it is done using GCC, alone or\n+with other GPL-compatible software, or if it is done without using any\n+work based on GCC. For example, using non-GPL-compatible Software to\n+optimize any GCC intermediate representations would not qualify as an\n+Eligible Compilation Process.\n+\n+1. Grant of Additional Permission.\n+\n+You have permission to propagate a work of Target Code formed by\n+combining the Runtime Library with Independent Modules, even if such\n+propagation would otherwise violate the terms of GPLv3, provided that\n+all Target Code was generated by Eligible Compilation Processes. You\n+may then convey such a combination under terms of your choice,\n+consistent with the licensing of the Independent Modules.\n+\n+2. No Weakening of GCC Copyleft.\n+\n+The availability of this Exception does not imply any general\n+presumption that third-party software is unaffected by the copyleft\n+requirements of the license of GCC.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libgcc | GPL-3.0-with-GCC-exception\n+Note: Only included in Linux builds\n+URL: https://gcc.gnu.org/\n+--------------------------------------------------------------------------------\n+GCC RUNTIME LIBRARY EXCEPTION\n+\n+Version 3.1, 31 March 2009\n+\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\n+\n+Everyone is permitted to copy and distribute verbatim copies of this\n+license document, but changing it is not allowed.\n+\n+This GCC Runtime Library Exception (\"Exception\") is an additional\n+permission under section 7 of the GNU General Public License, version\n+3 (\"GPLv3\"). It applies to a given file (the \"Runtime Library\") that\n+bears a notice placed by the copyright holder of the file stating that\n+the file is governed by GPLv3 along with this Exception.\n+\n+When you use GCC to compile a program, GCC may combine portions of\n+certain GCC header files and runtime libraries with the compiled\n+program. The purpose of this Exception is to allow compilation of\n+non-GPL (including proprietary) programs to use, in this way, the\n+header files and runtime libraries covered by this Exception.\n+\n+0. Definitions.\n+\n+A file is an \"Independent Module\" if it either requires the Runtime\n+Library for execution after a Compilation Process, or makes use of an\n+interface provided by the Runtime Library, but is not otherwise based\n+on the Runtime Library.\n+\n+\"GCC\" means a version of the GNU Compiler Collection, with or without\n+modifications, governed by version 3 (or a specified later version) of\n+the GNU General Public License (GPL) with the option of using any\n+subsequent versions published by the FSF.\n+\n+\"GPL-compatible Software\" is software whose conditions of propagation,\n+modification and use would permit combination with GCC in accord with\n+the license of GCC.\n+\n+\"Target Code\" refers to output from any compiler for a real or virtual\n+target processor architecture, in executable form or suitable for\n+input to an assembler, loader, linker and/or execution\n+phase. Notwithstanding that, Target Code does not include data in any\n+format that is used as a compiler intermediate representation, or used\n+for producing a compiler intermediate representation.\n+\n+The \"Compilation Process\" transforms code entirely represented in\n+non-intermediate languages designed for human-written code, and/or in\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\n+use of source code generators and preprocessors need not be considered\n+part of the Compilation Process, since the Compilation Process can be\n+understood as starting with the output of the generators or\n+preprocessors.\n+\n+A Compilation Process is \"Eligible\" if it is done using GCC, alone or\n+with other GPL-compatible software, or if it is done without using any\n+work based on GCC. For example, using non-GPL-compatible Software to\n+optimize any GCC intermediate representations would not qualify as an\n+Eligible Compilation Process.\n+\n+1. Grant of Additional Permission.\n+\n+You have permission to propagate a work of Target Code formed by\n+combining the Runtime Library with Independent Modules, even if such\n+propagation would otherwise violate the terms of GPLv3, provided that\n+all Target Code was generated by Eligible Compilation Processes. You\n+may then convey such a combination under terms of your choice,\n+consistent with the licensing of the Independent Modules.\n+\n+2. No Weakening of GCC Copyleft.\n+\n+The availability of this Exception does not imply any general\n+presumption that third-party software is unaffected by the copyleft\n+requirements of the license of GCC.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libuuid | BSD-3-Clause\n+Note: Only included in Linux builds\n+URL: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid\n+--------------------------------------------------------------------------------\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+1. Redistributions of source code must retain the above copyright\n+ notice, and the entire permission notice in its entirety,\n+ including the disclaimer of warranties.\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+3. The name of the author may not be used to endorse or promote\n+ products derived from this software without specific prior\n+ written permission.\n+\n+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED\n+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF\n+WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE\n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\n+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\n+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libintl | LGPL-2.1-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/gettext/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 2.1, February 1999\n+\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\n+ <https://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+[This is the first released version of the Lesser GPL. It also counts\n+ as the successor of the GNU Library Public License, version 2, hence\n+ the version number 2.1.]\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+Licenses are intended to guarantee your freedom to share and change\n+free software--to make sure the software is free for all its users.\n+\n+ This license, the Lesser General Public License, applies to some\n+specially designated software packages--typically libraries--of the\n+Free Software Foundation and other authors who decide to use it. You\n+can use it too, but we suggest you first think carefully about whether\n+this license or the ordinary General Public License is the better\n+strategy to use in any particular case, based on the explanations below.\n+\n+ When we speak of free software, we are referring to freedom of use,\n+not price. Our General Public Licenses are designed to make sure that\n+you have the freedom to distribute copies of free software (and charge\n+for this service if you wish); that you receive source code or can get\n+it if you want it; that you can change the software and use pieces of\n+it in new free programs; and that you are informed that you can do\n+these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+distributors to deny you these rights or to ask you to surrender these\n+rights. These restrictions translate to certain responsibilities for\n+you if you distribute copies of the library or if you modify it.\n+\n+ For example, if you distribute copies of the library, whether gratis\n+or for a fee, you must give the recipients all the rights that we gave\n+you. You must make sure that they, too, receive or can get the source\n+code. If you link other code with the library, you must provide\n+complete object files to the recipients, so that they can relink them\n+with the library after making changes to the library and recompiling\n+it. And you must show them these terms so they know their rights.\n+\n+ We protect your rights with a two-step method: (1) we copyright the\n+library, and (2) we offer you this license, which gives you legal\n+permission to copy, distribute and/or modify the library.\n+\n+ To protect each distributor, we want to make it very clear that\n+there is no warranty for the free library. Also, if the library is\n+modified by someone else and passed on, the recipients should know\n+that what they have is not the original version, so that the original\n+author's reputation will not be affected by problems that might be\n+introduced by others.\n+\f\n+ Finally, software patents pose a constant threat to the existence of\n+any free program. We wish to make sure that a company cannot\n+effectively restrict the users of a free program by obtaining a\n+restrictive license from a patent holder. Therefore, we insist that\n+any patent license obtained for a version of the library must be\n+consistent with the full freedom of use specified in this license.\n+\n+ Most GNU software, including some libraries, is covered by the\n+ordinary GNU General Public License. This license, the GNU Lesser\n+General Public License, applies to certain designated libraries, and\n+is quite different from the ordinary General Public License. We use\n+this license for certain libraries in order to permit linking those\n+libraries into non-free programs.\n+\n+ When a program is linked with a library, whether statically or using\n+a shared library, the combination of the two is legally speaking a\n+combined work, a derivative of the original library. The ordinary\n+General Public License therefore permits such linking only if the\n+entire combination fits its criteria of freedom. The Lesser General\n+Public License permits more lax criteria for linking other code with\n+the library.\n+\n+ We call this license the \"Lesser\" General Public License because it\n+does Less to protect the user's freedom than the ordinary General\n+Public License. It also provides other free software developers Less\n+of an advantage over competing non-free programs. These disadvantages\n+are the reason we use the ordinary General Public License for many\n+libraries. However, the Lesser license provides advantages in certain\n+special circumstances.\n+\n+ For example, on rare occasions, there may be a special need to\n+encourage the widest possible use of a certain library, so that it becomes\n+a de-facto standard. To achieve this, non-free programs must be\n+allowed to use the library. A more frequent case is that a free\n+library does the same job as widely used non-free libraries. In this\n+case, there is little to gain by limiting the free library to free\n+software only, so we use the Lesser General Public License.\n+\n+ In other cases, permission to use a particular library in non-free\n+programs enables a greater number of people to use a large body of\n+free software. For example, permission to use the GNU C Library in\n+non-free programs enables many more people to use the whole GNU\n+operating system, as well as its variant, the GNU/Linux operating\n+system.\n+\n+ Although the Lesser General Public License is Less protective of the\n+users' freedom, it does ensure that the user of a program that is\n+linked with the Library has the freedom and the wherewithal to run\n+that program using a modified version of the Library.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow. Pay close attention to the difference between a\n+\"work based on the library\" and a \"work that uses the library\". The\n+former contains code derived from the library, whereas the latter must\n+be combined with the library in order to run.\n+\f\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License Agreement applies to any software library or other\n+program which contains a notice placed by the copyright holder or\n+other authorized party saying it may be distributed under the terms of\n+this Lesser General Public License (also called \"this License\").\n+Each licensee is addressed as \"you\".\n+\n+ A \"library\" means a collection of software functions and/or data\n+prepared so as to be conveniently linked with application programs\n+(which use some of those functions and data) to form executables.\n+\n+ The \"Library\", below, refers to any such software library or work\n+which has been distributed under these terms. A \"work based on the\n+Library\" means either the Library or any derivative work under\n+copyright law: that is to say, a work containing the Library or a\n+portion of it, either verbatim or with modifications and/or translated\n+straightforwardly into another language. (Hereinafter, translation is\n+included without limitation in the term \"modification\".)\n+\n+ \"Source code\" for a work means the preferred form of the work for\n+making modifications to it. For a library, complete source code means\n+all the source code for all modules it contains, plus any associated\n+interface definition files, plus the scripts used to control compilation\n+and installation of the library.\n+\n+ Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running a program using the Library is not restricted, and output from\n+such a program is covered only if its contents constitute a work based\n+on the Library (independent of the use of the Library in a tool for\n+writing it). Whether that is true depends on what the Library does\n+and what the program that uses the Library does.\n+\n+ 1. You may copy and distribute verbatim copies of the Library's\n+complete source code as you receive it, in any medium, provided that\n+you conspicuously and appropriately publish on each copy an\n+appropriate copyright notice and disclaimer of warranty; keep intact\n+all the notices that refer to this License and to the absence of any\n+warranty; and distribute a copy of this License along with the\n+Library.\n+\n+ You may charge a fee for the physical act of transferring a copy,\n+and you may at your option offer warranty protection in exchange for a\n+fee.\n+\f\n+ 2. You may modify your copy or copies of the Library or any portion\n+of it, thus forming a work based on the Library, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) The modified work must itself be a software library.\n+\n+ b) You must cause the files modified to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ c) You must cause the whole of the work to be licensed at no\n+ charge to all third parties under the terms of this License.\n+\n+ d) If a facility in the modified Library refers to a function or a\n+ table of data to be supplied by an application program that uses\n+ the facility, other than as an argument passed when the facility\n+ is invoked, then you must make a good faith effort to ensure that,\n+ in the event an application does not supply such function or\n+ table, the facility still operates, and performs whatever part of\n+ its purpose remains meaningful.\n+\n+ (For example, a function in a library to compute square roots has\n+ a purpose that is entirely well-defined independent of the\n+ application. Therefore, Subsection 2d requires that any\n+ application-supplied function or table used by this function must\n+ be optional: if the application does not supply it, the square\n+ root function must still compute square roots.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Library,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Library, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote\n+it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Library.\n+\n+In addition, mere aggregation of another work not based on the Library\n+with the Library (or with a work based on the Library) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\n+License instead of this License to a given copy of the Library. To do\n+this, you must alter all the notices that refer to this License, so\n+that they refer to the ordinary GNU General Public License, version 2,\n+instead of to this License. (If a newer version than version 2 of the\n+ordinary GNU General Public License has appeared, then you can specify\n+that version instead if you wish.) Do not make any other change in\n+these notices.\n+\f\n+ Once this change is made in a given copy, it is irreversible for\n+that copy, so the ordinary GNU General Public License applies to all\n+subsequent copies and derivative works made from that copy.\n+\n+ This option is useful when you wish to copy part of the code of\n+the Library into a program that is not a library.\n+\n+ 4. You may copy and distribute the Library (or a portion or\n+derivative of it, under Section 2) in object code or executable form\n+under the terms of Sections 1 and 2 above provided that you accompany\n+it with the complete corresponding machine-readable source code, which\n+must be distributed under the terms of Sections 1 and 2 above on a\n+medium customarily used for software interchange.\n+\n+ If distribution of object code is made by offering access to copy\n+from a designated place, then offering equivalent access to copy the\n+source code from the same place satisfies the requirement to\n+distribute the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 5. A program that contains no derivative of any portion of the\n+Library, but is designed to work with the Library by being compiled or\n+linked with it, is called a \"work that uses the Library\". Such a\n+work, in isolation, is not a derivative work of the Library, and\n+therefore falls outside the scope of this License.\n+\n+ However, linking a \"work that uses the Library\" with the Library\n+creates an executable that is a derivative of the Library (because it\n+contains portions of the Library), rather than a \"work that uses the\n+library\". The executable is therefore covered by this License.\n+Section 6 states terms for distribution of such executables.\n+\n+ When a \"work that uses the Library\" uses material from a header file\n+that is part of the Library, the object code for the work may be a\n+derivative work of the Library even though the source code is not.\n+Whether this is true is especially significant if the work can be\n+linked without the Library, or if the work is itself a library. The\n+threshold for this to be true is not precisely defined by law.\n+\n+ If such an object file uses only numerical parameters, data\n+structure layouts and accessors, and small macros and small inline\n+functions (ten lines or less in length), then the use of the object\n+file is unrestricted, regardless of whether it is legally a derivative\n+work. (Executables containing this object code plus portions of the\n+Library will still fall under Section 6.)\n+\n+ Otherwise, if the work is a derivative of the Library, you may\n+distribute the object code for the work under the terms of Section 6.\n+Any executables containing that work also fall under Section 6,\n+whether or not they are linked directly with the Library itself.\n+\f\n+ 6. As an exception to the Sections above, you may also combine or\n+link a \"work that uses the Library\" with the Library to produce a\n+work containing portions of the Library, and distribute that work\n+under terms of your choice, provided that the terms permit\n+modification of the work for the customer's own use and reverse\n+engineering for debugging such modifications.\n+\n+ You must give prominent notice with each copy of the work that the\n+Library is used in it and that the Library and its use are covered by\n+this License. You must supply a copy of this License. If the work\n+during execution displays copyright notices, you must include the\n+copyright notice for the Library among them, as well as a reference\n+directing the user to the copy of this License. Also, you must do one\n+of these things:\n+\n+ a) Accompany the work with the complete corresponding\n+ machine-readable source code for the Library including whatever\n+ changes were used in the work (which must be distributed under\n+ Sections 1 and 2 above); and, if the work is an executable linked\n+ with the Library, with the complete machine-readable \"work that\n+ uses the Library\", as object code and/or source code, so that the\n+ user can modify the Library and then relink to produce a modified\n+ executable containing the modified Library. (It is understood\n+ that the user who changes the contents of definitions files in the\n+ Library will not necessarily be able to recompile the application\n+ to use the modified definitions.)\n+\n+ b) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (1) uses at run time a\n+ copy of the library already present on the user's computer system,\n+ rather than copying library functions into the executable, and (2)\n+ will operate properly with a modified version of the library, if\n+ the user installs one, as long as the modified version is\n+ interface-compatible with the version that the work was made with.\n+\n+ c) Accompany the work with a written offer, valid for at\n+ least three years, to give the same user the materials\n+ specified in Subsection 6a, above, for a charge no more\n+ than the cost of performing this distribution.\n+\n+ d) If distribution of the work is made by offering access to copy\n+ from a designated place, offer equivalent access to copy the above\n+ specified materials from the same place.\n+\n+ e) Verify that the user has already received a copy of these\n+ materials or that you have already sent this user a copy.\n+\n+ For an executable, the required form of the \"work that uses the\n+Library\" must include any data and utility programs needed for\n+reproducing the executable from it. However, as a special exception,\n+the materials to be distributed need not include anything that is\n+normally distributed (in either source or binary form) with the major\n+components (compiler, kernel, and so on) of the operating system on\n+which the executable runs, unless that component itself accompanies\n+the executable.\n+\n+ It may happen that this requirement contradicts the license\n+restrictions of other proprietary libraries that do not normally\n+accompany the operating system. Such a contradiction means you cannot\n+use both them and the Library together in an executable that you\n+distribute.\n+\f\n+ 7. You may place library facilities that are a work based on the\n+Library side-by-side in a single library together with other library\n+facilities not covered by this License, and distribute such a combined\n+library, provided that the separate distribution of the work based on\n+the Library and of the other library facilities is otherwise\n+permitted, and provided that you do these two things:\n+\n+ a) Accompany the combined library with a copy of the same work\n+ based on the Library, uncombined with any other library\n+ facilities. This must be distributed under the terms of the\n+ Sections above.\n+\n+ b) Give prominent notice with the combined library of the fact\n+ that part of it is a work based on the Library, and explaining\n+ where to find the accompanying uncombined form of the same work.\n+\n+ 8. You may not copy, modify, sublicense, link with, or distribute\n+the Library except as expressly provided under this License. Any\n+attempt otherwise to copy, modify, sublicense, link with, or\n+distribute the Library is void, and will automatically terminate your\n+rights under this License. However, parties who have received copies,\n+or rights, from you under this License will not have their licenses\n+terminated so long as such parties remain in full compliance.\n+\n+ 9. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Library or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Library (or any work based on the\n+Library), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Library or works based on it.\n+\n+ 10. Each time you redistribute the Library (or any work based on the\n+Library), the recipient automatically receives a license from the\n+original licensor to copy, distribute, link with or modify the Library\n+subject to these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties with\n+this License.\n+\f\n+ 11. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Library at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Library by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Library.\n+\n+If any portion of this section is held invalid or unenforceable under any\n+particular circumstance, the balance of the section is intended to apply,\n+and the section as a whole is intended to apply in other circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 12. If the distribution and/or use of the Library is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Library under this License may add\n+an explicit geographical distribution limitation excluding those countries,\n+so that distribution is permitted only in or among countries not thus\n+excluded. In such case, this License incorporates the limitation as if\n+written in the body of this License.\n+\n+ 13. The Free Software Foundation may publish revised and/or new\n+versions of the Lesser General Public License from time to time.\n+Such new versions will be similar in spirit to the present version,\n+but may differ in detail to address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Library\n+specifies a version number of this License which applies to it and\n+\"any later version\", you have the option of following the terms and\n+conditions either of that version or of any later version published by\n+the Free Software Foundation. If the Library does not specify a\n+license version number, you may choose any version ever published by\n+the Free Software Foundation.\n+\f\n+ 14. If you wish to incorporate parts of the Library into other free\n+programs whose distribution conditions are incompatible with these,\n+write to the author to ask for permission. For software which is\n+copyrighted by the Free Software Foundation, write to the Free\n+Software Foundation; we sometimes make exceptions for this. Our\n+decision will be guided by the two goals of preserving the free status\n+of all derivatives of our free software and of promoting the sharing\n+and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\n+OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\f\n+ How to Apply These Terms to Your New Libraries\n+\n+ If you develop a new library, and you want it to be of the greatest\n+possible use to the public, we recommend making it free software that\n+everyone can redistribute and change. You can do so by permitting\n+redistribution under these terms (or, alternatively, under the terms of the\n+ordinary General Public License).\n+\n+ To apply these terms, attach the following notices to the library. It is\n+safest to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least the\n+\"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the library's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This library is free software; you can redistribute it and/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with this library; if not, see <https://www.gnu.org/licenses/>.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the library, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\n+\n+ <signature of Moe Ghoul>, 1 April 1990\n+ Moe Ghoul, President of Vice\n+\n+That's all there is to it!\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libidn2 | LGPL-3.0-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libidn/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+\n+ This version of the GNU Lesser General Public License incorporates\n+the terms and conditions of version 3 of the GNU General Public\n+License, supplemented by the additional permissions listed below.\n+\n+ 0. Additional Definitions.\n+\n+ As used herein, \"this License\" refers to version 3 of the GNU Lesser\n+General Public License, and the \"GNU GPL\" refers to version 3 of the GNU\n+General Public License.\n+\n+ \"The Library\" refers to a covered work governed by this License,\n+other than an Application or a Combined Work as defined below.\n+\n+ An \"Application\" is any work that makes use of an interface provided\n+by the Library, but which is not otherwise based on the Library.\n+Defining a subclass of a class defined by the Library is deemed a mode\n+of using an interface provided by the Library.\n+\n+ A \"Combined Work\" is a work produced by combining or linking an\n+Application with the Library. The particular version of the Library\n+with which the Combined Work was made is also called the \"Linked\n+Version\".\n+\n+ The \"Minimal Corresponding Source\" for a Combined Work means the\n+Corresponding Source for the Combined Work, excluding any source code\n+for portions of the Combined Work that, considered in isolation, are\n+based on the Application, and not on the Linked Version.\n+\n+ The \"Corresponding Application Code\" for a Combined Work means the\n+object code and/or source code for the Application, including any data\n+and utility programs needed for reproducing the Combined Work from the\n+Application, but excluding the System Libraries of the Combined Work.\n+\n+ 1. Exception to Section 3 of the GNU GPL.\n+\n+ You may convey a covered work under sections 3 and 4 of this License\n+without being bound by section 3 of the GNU GPL.\n+\n+ 2. Conveying Modified Versions.\n+\n+ If you modify a copy of the Library, and, in your modifications, a\n+facility refers to a function or data to be supplied by an Application\n+that uses the facility (other than as an argument passed when the\n+facility is invoked), then you may convey a copy of the modified\n+version:\n+\n+ a) under this License, provided that you make a good faith effort to\n+ ensure that, in the event an Application does not supply the\n+ function or data, the facility still operates, and performs\n+ whatever part of its purpose remains meaningful, or\n+\n+ b) under the GNU GPL, with none of the additional permissions of\n+ this License applicable to that copy.\n+\n+ 3. Object Code Incorporating Material from Library Header Files.\n+\n+ The object code form of an Application may incorporate material from\n+a header file that is part of the Library. You may convey such object\n+code under terms of your choice, provided that, if the incorporated\n+material is not limited to numerical parameters, data structure\n+layouts and accessors, or small macros, inline functions and templates\n+(ten or fewer lines in length), you do both of the following:\n+\n+ a) Give prominent notice with each copy of the object code that the\n+ Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the object code with a copy of the GNU GPL and this license\n+ document.\n+\n+ 4. Combined Works.\n+\n+ You may convey a Combined Work under terms of your choice that,\n+taken together, effectively do not restrict modification of the\n+portions of the Library contained in the Combined Work and reverse\n+engineering for debugging such modifications, if you also do each of\n+the following:\n+\n+ a) Give prominent notice with each copy of the Combined Work that\n+ the Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\n+ document.\n+\n+ c) For a Combined Work that displays copyright notices during\n+ execution, include the copyright notice for the Library among\n+ these notices, as well as a reference directing the user to the\n+ copies of the GNU GPL and this license document.\n+\n+ d) Do one of the following:\n+\n+ 0) Convey the Minimal Corresponding Source under the terms of this\n+ License, and the Corresponding Application Code in a form\n+ suitable for, and under terms that permit, the user to\n+ recombine or relink the Application with a modified version of\n+ the Linked Version to produce a modified Combined Work, in the\n+ manner specified by section 6 of the GNU GPL for conveying\n+ Corresponding Source.\n+\n+ 1) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (a) uses at run time\n+ a copy of the Library already present on the user's computer\n+ system, and (b) will operate properly with a modified version\n+ of the Library that is interface-compatible with the Linked\n+ Version.\n+\n+ e) Provide Installation Information, but only if you would otherwise\n+ be required to provide such information under section 6 of the\n+ GNU GPL, and only to the extent that such information is\n+ necessary to install and execute a modified version of the\n+ Combined Work produced by recombining or relinking the\n+ Application with a modified version of the Linked Version. (If\n+ you use option 4d0, the Installation Information must accompany\n+ the Minimal Corresponding Source and Corresponding Application\n+ Code. If you use option 4d1, you must provide the Installation\n+ Information in the manner specified by section 6 of the GNU GPL\n+ for conveying Corresponding Source.)\n+\n+ 5. Combined Libraries.\n+\n+ You may place library facilities that are a work based on the\n+Library side by side in a single library together with other library\n+facilities that are not Applications and are not covered by this\n+License, and convey such a combined library under terms of your\n+choice, if you do both of the following:\n+\n+ a) Accompany the combined library with a copy of the same work based\n+ on the Library, uncombined with any other library facilities,\n+ conveyed under the terms of this License.\n+\n+ b) Give prominent notice with the combined library that part of it\n+ is a work based on the Library, and explaining where to find the\n+ accompanying uncombined form of the same work.\n+\n+ 6. Revised Versions of the GNU Lesser General Public License.\n+\n+ The Free Software Foundation may publish revised and/or new versions\n+of the GNU Lesser General Public License from time to time. Such new\n+versions will be similar in spirit to the present version, but may\n+differ in detail to address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Library as you received it specifies that a certain numbered version\n+of the GNU Lesser General Public License \"or any later version\"\n+applies to it, you have the option of following the terms and\n+conditions either of that published version or of any later version\n+published by the Free Software Foundation. If the Library as you\n+received it does not specify a version number of the GNU Lesser\n+General Public License, you may choose any version of the GNU Lesser\n+General Public License ever published by the Free Software Foundation.\n+\n+ If the Library as you received it specifies that a proxy can decide\n+whether future versions of the GNU Lesser General Public License shall\n+apply, that proxy's public statement of acceptance of any version is\n+permanent authorization for you to choose that version for the\n+Library.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libidn2 (Unicode character data files) | Unicode-TOU AND Unicode-DFS-2016\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libidn/\n+--------------------------------------------------------------------------------\n+A. Unicode Copyright.\n+\n+ Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\n+ Certain documents and files on this website contain a legend indicating that \"Modification is permitted.\" Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode๏ฟฝ Standard, subject to Terms and Conditions herein.\n+ Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein.\n+ Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the \"Unicode Character Database\" can be found in the License.\n+ Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.\n+ No license is granted to \"mirror\" the Unicode website where a fee is charged for access to the \"mirror\" site.\n+ Modification is not permitted with respect to this document. All copies of this document must be verbatim.\n+\n+B. Restricted Rights Legend.\n+ Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.\n+\n+C. Warranties and Disclaimers.\n+ This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.\n+ If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.\n+ EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED \"AS IS\" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.\n+\n+D. Waiver of Damages.\n+ In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.\n+\n+E. Trademarks & Logos.\n+ The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. ๏ฟฝThe Unicode Consortium๏ฟฝ and ๏ฟฝUnicode, Inc.๏ฟฝ are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.๏ฟฝs exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.\n+ The Unicode Consortium Name and Trademark Usage Policy (๏ฟฝTrademark Policy๏ฟฝ) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.\n+ All third party trademarks referenced herein are the property of their respective owners.\n+\n+F. Miscellaneous.\n+ Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.\n+ Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode๏ฟฝs prior written consent.\n+ Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode๏ฟฝs net income.\n+ Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.\n+ Entire Agreement. This Agreement constitutes the entire agreement between the parties.\n+\n+\n+\n+EXHIBIT 1\n+Unicode Data Files include all data files under the directories\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\n+http://www.unicode.org/utility/trac/browser/.\n+\n+Unicode Data Files do not include PDF online code charts under the\n+directory http://www.unicode.org/Public/.\n+\n+Software includes any source code published in the Unicode Standard\n+or under the directories\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\n+http://www.unicode.org/utility/trac/browser/.\n+\n+NOTICE TO USER: Carefully read the following legal agreement.\n+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S\n+DATA FILES (\"DATA FILES\"), AND/OR SOFTWARE (\"SOFTWARE\"),\n+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE\n+TERMS AND CONDITIONS OF THIS AGREEMENT.\n+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE\n+THE DATA FILES OR SOFTWARE.\n+\n+COPYRIGHT AND PERMISSION NOTICE\n+\n+Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\n+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of the Unicode data files and any associated documentation\n+(the \"Data Files\") or Unicode software and any associated documentation\n+(the \"Software\") to deal in the Data Files or Software\n+without restriction, including without limitation the rights to use,\n+copy, modify, merge, publish, distribute, and/or sell copies of\n+the Data Files or Software, and to permit persons to whom the Data Files\n+or Software are furnished to do so, provided that either\n+(a) this copyright and permission notice appear with all copies\n+of the Data Files or Software, or\n+(b) this copyright and permission notice appear in associated\n+Documentation.\n+\n+THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n+NONINFRINGEMENT OF THIRD PARTY RIGHTS.\n+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\n+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\n+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n+PERFORMANCE OF THE DATA FILES OR SOFTWARE.\n+\n+Except as contained in this notice, the name of a copyright holder\n+shall not be used in advertising or otherwise to promote the sale,\n+use or other dealings in these Data Files or Software without prior\n+written authorization of the copyright holder.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libunistring | LGPL-3.0-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libunistring/\n+--------------------------------------------------------------------------------\n+\t\t GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+\n+ This version of the GNU Lesser General Public License incorporates\n+the terms and conditions of version 3 of the GNU General Public\n+License, supplemented by the additional permissions listed below.\n+\n+ 0. Additional Definitions. \n+\n+ As used herein, \"this License\" refers to version 3 of the GNU Lesser\n+General Public License, and the \"GNU GPL\" refers to version 3 of the GNU\n+General Public License.\n+\n+ \"The Library\" refers to a covered work governed by this License,\n+other than an Application or a Combined Work as defined below.\n+\n+ An \"Application\" is any work that makes use of an interface provided\n+by the Library, but which is not otherwise based on the Library.\n+Defining a subclass of a class defined by the Library is deemed a mode\n+of using an interface provided by the Library.\n+\n+ A \"Combined Work\" is a work produced by combining or linking an\n+Application with the Library. The particular version of the Library\n+with which the Combined Work was made is also called the \"Linked\n+Version\".\n+\n+ The \"Minimal Corresponding Source\" for a Combined Work means the\n+Corresponding Source for the Combined Work, excluding any source code\n+for portions of the Combined Work that, considered in isolation, are\n+based on the Application, and not on the Linked Version.\n+\n+ The \"Corresponding Application Code\" for a Combined Work means the\n+object code and/or source code for the Application, including any data\n+and utility programs needed for reproducing the Combined Work from the\n+Application, but excluding the System Libraries of the Combined Work.\n+\n+ 1. Exception to Section 3 of the GNU GPL.\n+\n+ You may convey a covered work under sections 3 and 4 of this License\n+without being bound by section 3 of the GNU GPL.\n+\n+ 2. Conveying Modified Versions.\n+\n+ If you modify a copy of the Library, and, in your modifications, a\n+facility refers to a function or data to be supplied by an Application\n+that uses the facility (other than as an argument passed when the\n+facility is invoked), then you may convey a copy of the modified\n+version:\n+\n+ a) under this License, provided that you make a good faith effort to\n+ ensure that, in the event an Application does not supply the\n+ function or data, the facility still operates, and performs\n+ whatever part of its purpose remains meaningful, or\n+\n+ b) under the GNU GPL, with none of the additional permissions of\n+ this License applicable to that copy.\n+\n+ 3. Object Code Incorporating Material from Library Header Files.\n+\n+ The object code form of an Application may incorporate material from\n+a header file that is part of the Library. You may convey such object\n+code under terms of your choice, provided that, if the incorporated\n+material is not limited to numerical parameters, data structure\n+layouts and accessors, or small macros, inline functions and templates\n+(ten or fewer lines in length), you do both of the following:\n+\n+ a) Give prominent notice with each copy of the object code that the\n+ Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the object code with a copy of the GNU GPL and this license\n+ document.\n+\n+ 4. Combined Works.\n+\n+ You may convey a Combined Work under terms of your choice that,\n+taken together, effectively do not restrict modification of the\n+portions of the Library contained in the Combined Work and reverse\n+engineering for debugging such modifications, if you also do each of\n+the following:\n+\n+ a) Give prominent notice with each copy of the Combined Work that\n+ the Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\n+ document.\n+\n+ c) For a Combined Work that displays copyright notices during\n+ execution, include the copyright notice for the Library among\n+ these notices, as well as a reference directing the user to the\n+ copies of the GNU GPL and this license document.\n+\n+ d) Do one of the following:\n+\n+ 0) Convey the Minimal Corresponding Source under the terms of this\n+ License, and the Corresponding Application Code in a form\n+ suitable for, and under terms that permit, the user to\n+ recombine or relink the Application with a modified version of\n+ the Linked Version to produce a modified Combined Work, in the\n+ manner specified by section 6 of the GNU GPL for conveying\n+ Corresponding Source.\n+\n+ 1) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (a) uses at run time\n+ a copy of the Library already present on the user's computer\n+ system, and (b) will operate properly with a modified version\n+ of the Library that is interface-compatible with the Linked\n+ Version. \n+\n+ e) Provide Installation Information, but only if you would otherwise\n+ be required to provide such information under section 6 of the\n+ GNU GPL, and only to the extent that such information is\n+ necessary to install and execute a modified version of the\n+ Combined Work produced by recombining or relinking the\n+ Application with a modified version of the Linked Version. (If\n+ you use option 4d0, the Installation Information must accompany\n+ the Minimal Corresponding Source and Corresponding Application\n+ Code. If you use option 4d1, you must provide the Installation\n+ Information in the manner specified by section 6 of the GNU GPL\n+ for conveying Corresponding Source.)\n+\n+ 5. Combined Libraries.\n+\n+ You may place library facilities that are a work based on the\n+Library side by side in a single library together with other library\n+facilities that are not Applications and are not covered by this\n+License, and convey such a combined library under terms of your\n+choice, if you do both of the following:\n+\n+ a) Accompany the combined library with a copy of the same work based\n+ on the Library, uncombined with any other library facilities,\n+ conveyed under the terms of this License.\n+\n+ b) Give prominent notice with the combined library that part of it\n+ is a work based on the Library, and explaining where to find the\n+ accompanying uncombined form of the same work.\n+\n+ 6. Revised Versions of the GNU Lesser General Public License.\n+\n+ The Free Software Foundation may publish revised and/or new versions\n+of the GNU Lesser General Public License from time to time. Such new\n+versions will be similar in spirit to the present version, but may\n+differ in detail to address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Library as you received it specifies that a certain numbered version\n+of the GNU Lesser General Public License \"or any later version\"\n+applies to it, you have the option of following the terms and\n+conditions either of that published version or of any later version\n+published by the Free Software Foundation. If the Library as you\n+received it does not specify a version number of the GNU Lesser\n+General Public License, you may choose any version of the GNU Lesser\n+General Public License ever published by the Free Software Foundation.\n+\n+ If the Library as you received it specifies that a proxy can decide\n+whether future versions of the GNU Lesser General Public License shall\n+apply, that proxy's public statement of acceptance of any version is\n+permanent authorization for you to choose that version for the\n+Library.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+librtmp | LGPL-2.1-or-later\n+Note: Only included in macOS builds\n+URL: https://rtmpdump.mplayerhq.hu/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 2.1, February 1999\n+\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+[This is the first released version of the Lesser GPL. It also counts\n+ as the successor of the GNU Library Public License, version 2, hence\n+ the version number 2.1.]\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+Licenses are intended to guarantee your freedom to share and change\n+free software--to make sure the software is free for all its users.\n+\n+ This license, the Lesser General Public License, applies to some\n+specially designated software packages--typically libraries--of the\n+Free Software Foundation and other authors who decide to use it. You\n+can use it too, but we suggest you first think carefully about whether\n+this license or the ordinary General Public License is the better\n+strategy to use in any particular case, based on the explanations below.\n+\n+ When we speak of free software, we are referring to freedom of use,\n+not price. Our General Public Licenses are designed to make sure that\n+you have the freedom to distribute copies of free software (and charge\n+for this service if you wish); that you receive source code or can get\n+it if you want it; that you can change the software and use pieces of\n+it in new free programs; and that you are informed that you can do\n+these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+distributors to deny you these rights or to ask you to surrender these\n+rights. These restrictions translate to certain responsibilities for\n+you if you distribute copies of the library or if you modify it.\n+\n+ For example, if you distribute copies of the library, whether gratis\n+or for a fee, you must give the recipients all the rights that we gave\n+you. You must make sure that they, too, receive or can get the source\n+code. If you link other code with the library, you must provide\n+complete object files to the recipients, so that they can relink them\n+with the library after making changes to the library and recompiling\n+it. And you must show them these terms so they know their rights.\n+\n+ We protect your rights with a two-step method: (1) we copyright the\n+library, and (2) we offer you this license, which gives you legal\n+permission to copy, distribute and/or modify the library.\n+\n+ To protect each distributor, we want to make it very clear that\n+there is no warranty for the free library. Also, if the library is\n+modified by someone else and passed on, the recipients should know\n+that what they have is not the original version, so that the original\n+author's reputation will not be affected by problems that might be\n+introduced by others.\n+\f\n+ Finally, software patents pose a constant threat to the existence of\n+any free program. We wish to make sure that a company cannot\n+effectively restrict the users of a free program by obtaining a\n+restrictive license from a patent holder. Therefore, we insist that\n+any patent license obtained for a version of the library must be\n+consistent with the full freedom of use specified in this license.\n+\n+ Most GNU software, including some libraries, is covered by the\n+ordinary GNU General Public License. This license, the GNU Lesser\n+General Public License, applies to certain designated libraries, and\n+is quite different from the ordinary General Public License. We use\n+this license for certain libraries in order to permit linking those\n+libraries into non-free programs.\n+\n+ When a program is linked with a library, whether statically or using\n+a shared library, the combination of the two is legally speaking a\n+combined work, a derivative of the original library. The ordinary\n+General Public License therefore permits such linking only if the\n+entire combination fits its criteria of freedom. The Lesser General\n+Public License permits more lax criteria for linking other code with\n+the library.\n+\n+ We call this license the \"Lesser\" General Public License because it\n+does Less to protect the user's freedom than the ordinary General\n+Public License. It also provides other free software developers Less\n+of an advantage over competing non-free programs. These disadvantages\n+are the reason we use the ordinary General Public License for many\n+libraries. However, the Lesser license provides advantages in certain\n+special circumstances.\n+\n+ For example, on rare occasions, there may be a special need to\n+encourage the widest possible use of a certain library, so that it becomes\n+a de-facto standard. To achieve this, non-free programs must be\n+allowed to use the library. A more frequent case is that a free\n+library does the same job as widely used non-free libraries. In this\n+case, there is little to gain by limiting the free library to free\n+software only, so we use the Lesser General Public License.\n+\n+ In other cases, permission to use a particular library in non-free\n+programs enables a greater number of people to use a large body of\n+free software. For example, permission to use the GNU C Library in\n+non-free programs enables many more people to use the whole GNU\n+operating system, as well as its variant, the GNU/Linux operating\n+system.\n+\n+ Although the Lesser General Public License is Less protective of the\n+users' freedom, it does ensure that the user of a program that is\n+linked with the Library has the freedom and the wherewithal to run\n+that program using a modified version of the Library.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow. Pay close attention to the difference between a\n+\"work based on the library\" and a \"work that uses the library\". The\n+former contains code derived from the library, whereas the latter must\n+be combined with the library in order to run.\n+\f\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License Agreement applies to any software library or other\n+program which contains a notice placed by the copyright holder or\n+other authorized party saying it may be distributed under the terms of\n+this Lesser General Public License (also called \"this License\").\n+Each licensee is addressed as \"you\".\n+\n+ A \"library\" means a collection of software functions and/or data\n+prepared so as to be conveniently linked with application programs\n+(which use some of those functions and data) to form executables.\n+\n+ The \"Library\", below, refers to any such software library or work\n+which has been distributed under these terms. A \"work based on the\n+Library\" means either the Library or any derivative work under\n+copyright law: that is to say, a work containing the Library or a\n+portion of it, either verbatim or with modifications and/or translated\n+straightforwardly into another language. (Hereinafter, translation is\n+included without limitation in the term \"modification\".)\n+\n+ \"Source code\" for a work means the preferred form of the work for\n+making modifications to it. For a library, complete source code means\n+all the source code for all modules it contains, plus any associated\n+interface definition files, plus the scripts used to control compilation\n+and installation of the library.\n+\n+ Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running a program using the Library is not restricted, and output from\n+such a program is covered only if its contents constitute a work based\n+on the Library (independent of the use of the Library in a tool for\n+writing it). Whether that is true depends on what the Library does\n+and what the program that uses the Library does.\n+\n+ 1. You may copy and distribute verbatim copies of the Library's\n+complete source code as you receive it, in any medium, provided that\n+you conspicuously and appropriately publish on each copy an\n+appropriate copyright notice and disclaimer of warranty; keep intact\n+all the notices that refer to this License and to the absence of any\n+warranty; and distribute a copy of this License along with the\n+Library.\n+\n+ You may charge a fee for the physical act of transferring a copy,\n+and you may at your option offer warranty protection in exchange for a\n+fee.\n+\f\n+ 2. You may modify your copy or copies of the Library or any portion\n+of it, thus forming a work based on the Library, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) The modified work must itself be a software library.\n+\n+ b) You must cause the files modified to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ c) You must cause the whole of the work to be licensed at no\n+ charge to all third parties under the terms of this License.\n+\n+ d) If a facility in the modified Library refers to a function or a\n+ table of data to be supplied by an application program that uses\n+ the facility, other than as an argument passed when the facility\n+ is invoked, then you must make a good faith effort to ensure that,\n+ in the event an application does not supply such function or\n+ table, the facility still operates, and performs whatever part of\n+ its purpose remains meaningful.\n+\n+ (For example, a function in a library to compute square roots has\n+ a purpose that is entirely well-defined independent of the\n+ application. Therefore, Subsection 2d requires that any\n+ application-supplied function or table used by this function must\n+ be optional: if the application does not supply it, the square\n+ root function must still compute square roots.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Library,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Library, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote\n+it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Library.\n+\n+In addition, mere aggregation of another work not based on the Library\n+with the Library (or with a work based on the Library) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\n+License instead of this License to a given copy of the Library. To do\n+this, you must alter all the notices that refer to this License, so\n+that they refer to the ordinary GNU General Public License, version 2,\n+instead of to this License. (If a newer version than version 2 of the\n+ordinary GNU General Public License has appeared, then you can specify\n+that version instead if you wish.) Do not make any other change in\n+these notices.\n+\f\n+ Once this change is made in a given copy, it is irreversible for\n+that copy, so the ordinary GNU General Public License applies to all\n+subsequent copies and derivative works made from that copy.\n+\n+ This option is useful when you wish to copy part of the code of\n+the Library into a program that is not a library.\n+\n+ 4. You may copy and distribute the Library (or a portion or\n+derivative of it, under Section 2) in object code or executable form\n+under the terms of Sections 1 and 2 above provided that you accompany\n+it with the complete corresponding machine-readable source code, which\n+must be distributed under the terms of Sections 1 and 2 above on a\n+medium customarily used for software interchange.\n+\n+ If distribution of object code is made by offering access to copy\n+from a designated place, then offering equivalent access to copy the\n+source code from the same place satisfies the requirement to\n+distribute the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 5. A program that contains no derivative of any portion of the\n+Library, but is designed to work with the Library by being compiled or\n+linked with it, is called a \"work that uses the Library\". Such a\n+work, in isolation, is not a derivative work of the Library, and\n+therefore falls outside the scope of this License.\n+\n+ However, linking a \"work that uses the Library\" with the Library\n+creates an executable that is a derivative of the Library (because it\n+contains portions of the Library), rather than a \"work that uses the\n+library\". The executable is therefore covered by this License.\n+Section 6 states terms for distribution of such executables.\n+\n+ When a \"work that uses the Library\" uses material from a header file\n+that is part of the Library, the object code for the work may be a\n+derivative work of the Library even though the source code is not.\n+Whether this is true is especially significant if the work can be\n+linked without the Library, or if the work is itself a library. The\n+threshold for this to be true is not precisely defined by law.\n+\n+ If such an object file uses only numerical parameters, data\n+structure layouts and accessors, and small macros and small inline\n+functions (ten lines or less in length), then the use of the object\n+file is unrestricted, regardless of whether it is legally a derivative\n+work. (Executables containing this object code plus portions of the\n+Library will still fall under Section 6.)\n+\n+ Otherwise, if the work is a derivative of the Library, you may\n+distribute the object code for the work under the terms of Section 6.\n+Any executables containing that work also fall under Section 6,\n+whether or not they are linked directly with the Library itself.\n+\f\n+ 6. As an exception to the Sections above, you may also combine or\n+link a \"work that uses the Library\" with the Library to produce a\n+work containing portions of the Library, and distribute that work\n+under terms of your choice, provided that the terms permit\n+modification of the work for the customer's own use and reverse\n+engineering for debugging such modifications.\n+\n+ You must give prominent notice with each copy of the work that the\n+Library is used in it and that the Library and its use are covered by\n+this License. You must supply a copy of this License. If the work\n+during execution displays copyright notices, you must include the\n+copyright notice for the Library among them, as well as a reference\n+directing the user to the copy of this License. Also, you must do one\n+of these things:\n+\n+ a) Accompany the work with the complete corresponding\n+ machine-readable source code for the Library including whatever\n+ changes were used in the work (which must be distributed under\n+ Sections 1 and 2 above); and, if the work is an executable linked\n+ with the Library, with the complete machine-readable \"work that\n+ uses the Library\", as object code and/or source code, so that the\n+ user can modify the Library and then relink to produce a modified\n+ executable containing the modified Library. (It is understood\n+ that the user who changes the contents of definitions files in the\n+ Library will not necessarily be able to recompile the application\n+ to use the modified definitions.)\n+\n+ b) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (1) uses at run time a\n+ copy of the library already present on the user's computer system,\n+ rather than copying library functions into the executable, and (2)\n+ will operate properly with a modified version of the library, if\n+ the user installs one, as long as the modified version is\n+ interface-compatible with the version that the work was made with.\n+\n+ c) Accompany the work with a written offer, valid for at\n+ least three years, to give the same user the materials\n+ specified in Subsection 6a, above, for a charge no more\n+ than the cost of performing this distribution.\n+\n+ d) If distribution of the work is made by offering access to copy\n+ from a designated place, offer equivalent access to copy the above\n+ specified materials from the same place.\n+\n+ e) Verify that the user has already received a copy of these\n+ materials or that you have already sent this user a copy.\n+\n+ For an executable, the required form of the \"work that uses the\n+Library\" must include any data and utility programs needed for\n+reproducing the executable from it. However, as a special exception,\n+the materials to be distributed need not include anything that is\n+normally distributed (in either source or binary form) with the major\n+components (compiler, kernel, and so on) of the operating system on\n+which the executable runs, unless that component itself accompanies\n+the executable.\n+\n+ It may happen that this requirement contradicts the license\n+restrictions of other proprietary libraries that do not normally\n+accompany the operating system. Such a contradiction means you cannot\n+use both them and the Library together in an executable that you\n+distribute.\n+\f\n+ 7. You may place library facilities that are a work based on the\n+Library side-by-side in a single library together with other library\n+facilities not covered by this License, and distribute such a combined\n+library, provided that the separate distribution of the work based on\n+the Library and of the other library facilities is otherwise\n+permitted, and provided that you do these two things:\n+\n+ a) Accompany the combined library with a copy of the same work\n+ based on the Library, uncombined with any other library\n+ facilities. This must be distributed under the terms of the\n+ Sections above.\n+\n+ b) Give prominent notice with the combined library of the fact\n+ that part of it is a work based on the Library, and explaining\n+ where to find the accompanying uncombined form of the same work.\n+\n+ 8. You may not copy, modify, sublicense, link with, or distribute\n+the Library except as expressly provided under this License. Any\n+attempt otherwise to copy, modify, sublicense, link with, or\n+distribute the Library is void, and will automatically terminate your\n+rights under this License. However, parties who have received copies,\n+or rights, from you under this License will not have their licenses\n+terminated so long as such parties remain in full compliance.\n+\n+ 9. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Library or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Library (or any work based on the\n+Library), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Library or works based on it.\n+\n+ 10. Each time you redistribute the Library (or any work based on the\n+Library), the recipient automatically receives a license from the\n+original licensor to copy, distribute, link with or modify the Library\n+subject to these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties with\n+this License.\n+\f\n+ 11. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Library at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Library by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Library.\n+\n+If any portion of this section is held invalid or unenforceable under any\n+particular circumstance, the balance of the section is intended to apply,\n+and the section as a whole is intended to apply in other circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 12. If the distribution and/or use of the Library is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Library under this License may add\n+an explicit geographical distribution limitation excluding those countries,\n+so that distribution is permitted only in or among countries not thus\n+excluded. In such case, this License incorporates the limitation as if\n+written in the body of this License.\n+\n+ 13. The Free Software Foundation may publish revised and/or new\n+versions of the Lesser General Public License from time to time.\n+Such new versions will be similar in spirit to the present version,\n+but may differ in detail to address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Library\n+specifies a version number of this License which applies to it and\n+\"any later version\", you have the option of following the terms and\n+conditions either of that version or of any later version published by\n+the Free Software Foundation. If the Library does not specify a\n+license version number, you may choose any version ever published by\n+the Free Software Foundation.\n+\f\n+ 14. If you wish to incorporate parts of the Library into other free\n+programs whose distribution conditions are incompatible with these,\n+write to the author to ask for permission. For software which is\n+copyrighted by the Free Software Foundation, write to the Free\n+Software Foundation; we sometimes make exceptions for this. Our\n+decision will be guided by the two goals of preserving the free status\n+of all derivatives of our free software and of promoting the sharing\n+and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\n+OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\f\n+ How to Apply These Terms to Your New Libraries\n+\n+ If you develop a new library, and you want it to be of the greatest\n+possible use to the public, we recommend making it free software that\n+everyone can redistribute and change. You can do so by permitting\n+redistribution under these terms (or, alternatively, under the terms of the\n+ordinary General Public License).\n+\n+ To apply these terms, attach the following notices to the library. It is\n+safest to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least the\n+\"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the library's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This library is free software; you can redistribute it and/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with this library; if not, write to the Free Software\n+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the library, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\n+\n+ <signature of Ty Coon>, 1 April 1990\n+ Ty Coon, President of Vice\n+\n+That's all there is to it!\n+\n+\n+\n+--------------------------------------------------------------------------------\n+zstd | BSD-3-Clause\n+Note: Only included in macOS builds\n+URL: https://facebook.github.io/zstd/\n+--------------------------------------------------------------------------------\n+BSD License\n+\n+For Zstandard software\n+\n+Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without modification,\n+are permitted provided that the following conditions are met:\n+\n+ * Redistributions of source code must retain the above copyright notice, this\n+ list of conditions and the following disclaimer.\n+\n+ * Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+\n+ * Neither the name Facebook, nor Meta, nor the names of its contributors may\n+ be used to endorse or promote products derived from this software without\n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR\n+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+brotli | MIT\n+URL: https://brotli.org/\n+--------------------------------------------------------------------------------\n+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in\n+all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+curl_cffi | MIT\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\n+URL: https://curl-cffi.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+\n+Copyright (c) 2018 multippt\n+Copyright (c) 2022 curl_cffi developers\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+curl-impersonate | MIT\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\n+URL: https://github.com/lexiforest/curl-impersonate\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2025 curl_cffi developers\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+cffi | MIT-0\n+URL: https://cffi.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Except when otherwise stated (look for LICENSE files in directories or\n+information at the beginning of each file) all software and\n+documentation is licensed as follows: \n+\n+ MIT No Attribution\n+\n+ Permission is hereby granted, free of charge, to any person \n+ obtaining a copy of this software and associated documentation \n+ files (the \"Software\"), to deal in the Software without \n+ restriction, including without limitation the rights to use, \n+ copy, modify, merge, publish, distribute, sublicense, and/or \n+ sell copies of the Software, and to permit persons to whom the \n+ Software is furnished to do so.\n+\n+ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS \n+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, \n+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL \n+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER \n+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING \n+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \n+ DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+pycparser | BSD-3-Clause\n+URL: https://github.com/eliben/pycparser\n+--------------------------------------------------------------------------------\n+pycparser -- A C parser in Python\n+\n+Copyright (c) 2008-2022, Eli Bendersky\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without modification,\n+are permitted provided that the following conditions are met:\n+\n+* Redistributions of source code must retain the above copyright notice, this \n+ list of conditions and the following disclaimer.\n+* Redistributions in binary form must reproduce the above copyright notice, \n+ this list of conditions and the following disclaimer in the documentation \n+ and/or other materials provided with the distribution.\n+* Neither the name of the copyright holder nor the names of its contributors may \n+ be used to endorse or promote products derived from this software without \n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE \n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE \n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT \n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT \n+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+mutagen | GPL-2.0-or-later\n+URL: https://mutagen.readthedocs.io/\n+--------------------------------------------------------------------------------\n+ GNU GENERAL PUBLIC LICENSE\n+ Version 2, June 1991\n+\n+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+License is intended to guarantee your freedom to share and change free\n+software--to make sure the software is free for all its users. This\n+General Public License applies to most of the Free Software\n+Foundation's software and to any other program whose authors commit to\n+using it. (Some other Free Software Foundation software is covered by\n+the GNU Lesser General Public License instead.) You can apply it to\n+your programs, too.\n+\n+ When we speak of free software, we are referring to freedom, not\n+price. Our General Public Licenses are designed to make sure that you\n+have the freedom to distribute copies of free software (and charge for\n+this service if you wish), that you receive source code or can get it\n+if you want it, that you can change the software or use pieces of it\n+in new free programs; and that you know you can do these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+anyone to deny you these rights or to ask you to surrender the rights.\n+These restrictions translate to certain responsibilities for you if you\n+distribute copies of the software, or if you modify it.\n+\n+ For example, if you distribute copies of such a program, whether\n+gratis or for a fee, you must give the recipients all the rights that\n+you have. You must make sure that they, too, receive or can get the\n+source code. And you must show them these terms so they know their\n+rights.\n+\n+ We protect your rights with two steps: (1) copyright the software, and\n+(2) offer you this license which gives you legal permission to copy,\n+distribute and/or modify the software.\n+\n+ Also, for each author's protection and ours, we want to make certain\n+that everyone understands that there is no warranty for this free\n+software. If the software is modified by someone else and passed on, we\n+want its recipients to know that what they have is not the original, so\n+that any problems introduced by others will not reflect on the original\n+authors' reputations.\n+\n+ Finally, any free program is threatened constantly by software\n+patents. We wish to avoid the danger that redistributors of a free\n+program will individually obtain patent licenses, in effect making the\n+program proprietary. To prevent this, we have made it clear that any\n+patent must be licensed for everyone's free use or not licensed at all.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow.\n+\n+ GNU GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License applies to any program or other work which contains\n+a notice placed by the copyright holder saying it may be distributed\n+under the terms of this General Public License. The \"Program\", below,\n+refers to any such program or work, and a \"work based on the Program\"\n+means either the Program or any derivative work under copyright law:\n+that is to say, a work containing the Program or a portion of it,\n+either verbatim or with modifications and/or translated into another\n+language. (Hereinafter, translation is included without limitation in\n+the term \"modification\".) Each licensee is addressed as \"you\".\n+\n+Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running the Program is not restricted, and the output from the Program\n+is covered only if its contents constitute a work based on the\n+Program (independent of having been made by running the Program).\n+Whether that is true depends on what the Program does.\n+\n+ 1. You may copy and distribute verbatim copies of the Program's\n+source code as you receive it, in any medium, provided that you\n+conspicuously and appropriately publish on each copy an appropriate\n+copyright notice and disclaimer of warranty; keep intact all the\n+notices that refer to this License and to the absence of any warranty;\n+and give any other recipients of the Program a copy of this License\n+along with the Program.\n+\n+You may charge a fee for the physical act of transferring a copy, and\n+you may at your option offer warranty protection in exchange for a fee.\n+\n+ 2. You may modify your copy or copies of the Program or any portion\n+of it, thus forming a work based on the Program, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) You must cause the modified files to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ b) You must cause any work that you distribute or publish, that in\n+ whole or in part contains or is derived from the Program or any\n+ part thereof, to be licensed as a whole at no charge to all third\n+ parties under the terms of this License.\n+\n+ c) If the modified program normally reads commands interactively\n+ when run, you must cause it, when started running for such\n+ interactive use in the most ordinary way, to print or display an\n+ announcement including an appropriate copyright notice and a\n+ notice that there is no warranty (or else, saying that you provide\n+ a warranty) and that users may redistribute the program under\n+ these conditions, and telling the user how to view a copy of this\n+ License. (Exception: if the Program itself is interactive but\n+ does not normally print such an announcement, your work based on\n+ the Program is not required to print an announcement.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Program,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Program, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Program.\n+\n+In addition, mere aggregation of another work not based on the Program\n+with the Program (or with a work based on the Program) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may copy and distribute the Program (or a work based on it,\n+under Section 2) in object code or executable form under the terms of\n+Sections 1 and 2 above provided that you also do one of the following:\n+\n+ a) Accompany it with the complete corresponding machine-readable\n+ source code, which must be distributed under the terms of Sections\n+ 1 and 2 above on a medium customarily used for software interchange; or,\n+\n+ b) Accompany it with a written offer, valid for at least three\n+ years, to give any third party, for a charge no more than your\n+ cost of physically performing source distribution, a complete\n+ machine-readable copy of the corresponding source code, to be\n+ distributed under the terms of Sections 1 and 2 above on a medium\n+ customarily used for software interchange; or,\n+\n+ c) Accompany it with the information you received as to the offer\n+ to distribute corresponding source code. (This alternative is\n+ allowed only for noncommercial distribution and only if you\n+ received the program in object code or executable form with such\n+ an offer, in accord with Subsection b above.)\n+\n+The source code for a work means the preferred form of the work for\n+making modifications to it. For an executable work, complete source\n+code means all the source code for all modules it contains, plus any\n+associated interface definition files, plus the scripts used to\n+control compilation and installation of the executable. However, as a\n+special exception, the source code distributed need not include\n+anything that is normally distributed (in either source or binary\n+form) with the major components (compiler, kernel, and so on) of the\n+operating system on which the executable runs, unless that component\n+itself accompanies the executable.\n+\n+If distribution of executable or object code is made by offering\n+access to copy from a designated place, then offering equivalent\n+access to copy the source code from the same place counts as\n+distribution of the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 4. You may not copy, modify, sublicense, or distribute the Program\n+except as expressly provided under this License. Any attempt\n+otherwise to copy, modify, sublicense or distribute the Program is\n+void, and will automatically terminate your rights under this License.\n+However, parties who have received copies, or rights, from you under\n+this License will not have their licenses terminated so long as such\n+parties remain in full compliance.\n+\n+ 5. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Program or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Program (or any work based on the\n+Program), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Program or works based on it.\n+\n+ 6. Each time you redistribute the Program (or any work based on the\n+Program), the recipient automatically receives a license from the\n+original licensor to copy, distribute or modify the Program subject to\n+these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties to\n+this License.\n+\n+ 7. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Program at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Program by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Program.\n+\n+If any portion of this section is held invalid or unenforceable under\n+any particular circumstance, the balance of the section is intended to\n+apply and the section as a whole is intended to apply in other\n+circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system, which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 8. If the distribution and/or use of the Program is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Program under this License\n+may add an explicit geographical distribution limitation excluding\n+those countries, so that distribution is permitted only in or among\n+countries not thus excluded. In such case, this License incorporates\n+the limitation as if written in the body of this License.\n+\n+ 9. The Free Software Foundation may publish revised and/or new versions\n+of the General Public License from time to time. Such new versions will\n+be similar in spirit to the present version, but may differ in detail to\n+address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Program\n+specifies a version number of this License which applies to it and \"any\n+later version\", you have the option of following the terms and conditions\n+either of that version or of any later version published by the Free\n+Software Foundation. If the Program does not specify a version number of\n+this License, you may choose any version ever published by the Free Software\n+Foundation.\n+\n+ 10. If you wish to incorporate parts of the Program into other free\n+programs whose distribution conditions are different, write to the author\n+to ask for permission. For software which is copyrighted by the Free\n+Software Foundation, write to the Free Software Foundation; we sometimes\n+make exceptions for this. Our decision will be guided by the two goals\n+of preserving the free status of all derivatives of our free software and\n+of promoting the sharing and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n+REPAIR OR CORRECTION.\n+\n+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n+POSSIBILITY OF SUCH DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ How to Apply These Terms to Your New Programs\n+\n+ If you develop a new program, and you want it to be of the greatest\n+possible use to the public, the best way to achieve this is to make it\n+free software which everyone can redistribute and change under these terms.\n+\n+ To do so, attach the following notices to the program. It is safest\n+to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least\n+the \"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the program's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This program is free software; you can redistribute it and/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation; either version 2 of the License, or\n+ (at your option) any later version.\n+\n+ This program is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License along\n+ with this program; if not, write to the Free Software Foundation, Inc.,\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+If the program is interactive, make it output a short notice like this\n+when it starts in an interactive mode:\n+\n+ Gnomovision version 69, Copyright (C) year name of author\n+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n+ This is free software, and you are welcome to redistribute it\n+ under certain conditions; type `show c' for details.\n+\n+The hypothetical commands `show w' and `show c' should show the appropriate\n+parts of the General Public License. Of course, the commands you use may\n+be called something other than `show w' and `show c'; they could even be\n+mouse-clicks or menu items--whatever suits your program.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the program, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n+ `Gnomovision' (which makes passes at compilers) written by James Hacker.\n+\n+ <signature of Ty Coon>, 1 April 1989\n+ Ty Coon, President of Vice\n+\n+This General Public License does not permit incorporating your program into\n+proprietary programs. If your program is a subroutine library, you may\n+consider it more useful to permit linking proprietary applications with the\n+library. If this is what you want to do, use the GNU Lesser General\n+Public License instead of this License.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+PyCryptodome | Public Domain and BSD-2-Clause\n+URL: https://www.pycryptodome.org/\n+--------------------------------------------------------------------------------\n+The source code in PyCryptodome is partially in the public domain\n+and partially released under the BSD 2-Clause license.\n+\n+In either case, there are minimal if no restrictions on the redistribution,\n+modification and usage of the software.\n+\n+Public domain\n+=============\n+\n+All code originating from PyCrypto is free and unencumbered software\n+released into the public domain.\n+\n+Anyone is free to copy, modify, publish, use, compile, sell, or\n+distribute this software, either in source code form or as a compiled\n+binary, for any purpose, commercial or non-commercial, and by any\n+means.\n+\n+In jurisdictions that recognize copyright laws, the author or authors\n+of this software dedicate any and all copyright interest in the\n+software to the public domain. We make this dedication for the benefit\n+of the public at large and to the detriment of our heirs and\n+successors. We intend this dedication to be an overt act of\n+relinquishment in perpetuity of all present and future rights to this\n+software under copyright law.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\n+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\n+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n+OTHER DEALINGS IN THE SOFTWARE.\n+\n+For more information, please refer to <http://unlicense.org>\n+\n+BSD license\n+===========\n+\n+All direct contributions to PyCryptodome are released under the following\n+license. The copyright of each piece belongs to the respective author.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+1. Redistributions of source code must retain the above copyright notice,\n+ this list of conditions and the following disclaimer.\n+\n+2. Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+certifi | MPL-2.0\n+URL: https://github.com/certifi/python-certifi\n+--------------------------------------------------------------------------------\n+This package contains a modified version of ca-bundle.crt:\n+\n+ca-bundle.crt -- Bundle of CA Root Certificates\n+\n+This is a bundle of X.509 certificates of public Certificate Authorities\n+(CA). These were automatically extracted from Mozilla's root certificates\n+file (certdata.txt). This file can be found in the mozilla source tree:\n+https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt\n+It contains the certificates in PEM format and therefore\n+can be directly used with curl / libcurl / php_curl, or with\n+an Apache+mod_ssl webserver for SSL client authentication.\n+Just configure this file as the SSLCACertificateFile.#\n+\n+***** BEGIN LICENSE BLOCK *****\n+This Source Code Form is subject to the terms of the Mozilla Public License,\n+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain\n+one at http://mozilla.org/MPL/2.0/.\n+\n+***** END LICENSE BLOCK *****\n+@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $\n+\n+\n+\n+--------------------------------------------------------------------------------\n+requests | Apache-2.0\n+URL: https://requests.readthedocs.io/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ http://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+charset-normalizer | MIT\n+URL: https://charset-normalizer.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2025 TAHRI Ahmed R.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+idna | BSD-3-Clause\n+URL: https://github.com/kjd/idna\n+--------------------------------------------------------------------------------\n+BSD 3-Clause License\n+\n+Copyright (c) 2013-2025, Kim Davies and contributors.\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+\n+3. Neither the name of the copyright holder nor the names of its\n+ contributors may be used to endorse or promote products derived from\n+ this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\n+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+urllib3 | MIT\n+URL: https://urllib3.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2008-2020 Andrey Petrov and contributors.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+SecretStorage | BSD-3-Clause\n+Note: Only included in Linux builds\n+URL: https://secretstorage.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Copyright 2012-2018 Dmitry Shachnev <mitya57@gmail.com>\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+1. Redistributions of source code must retain the above copyright notice, this\n+ list of conditions and the following disclaimer.\n+2. Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+3. Neither the name of the University nor the names of its contributors may be\n+ used to endorse or promote products derived from this software without\n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+cryptography | Apache-2.0\n+Note: Only included in Linux builds\n+URL: https://cryptography.io/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ https://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ APPENDIX: How to apply the Apache License to your work.\n+\n+ To apply the Apache License to your work, attach the following\n+ boilerplate notice, with the fields enclosed by brackets \"[]\"\n+ replaced with your own identifying information. (Don't include\n+ the brackets!) The text should be enclosed in the appropriate\n+ comment syntax for the file format. We also recommend that a\n+ file or class name and description of purpose be included on the\n+ same \"printed page\" as the copyright notice for easier\n+ identification within third-party archives.\n+\n+ Copyright [yyyy] [name of copyright owner]\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ https://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Jeepney | MIT\n+Note: Only included in Linux builds\n+URL: https://jeepney.readthedocs.io/\n+--------------------------------------------------------------------------------\n+The MIT License (MIT)\n+\n+Copyright (c) 2017 Thomas Kluyver\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in\n+all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+websockets | BSD-3-Clause\n+URL: https://websockets.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Copyright (c) Aymeric Augustin and contributors\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+ * Redistributions of source code must retain the above copyright notice,\n+ this list of conditions and the following disclaimer.\n+ * Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+ * Neither the name of the copyright holder nor the names of its contributors\n+ may be used to endorse or promote products derived from this software\n+ without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n","summary":"Edited 2 file(s) in (root)/"},{"subtask_id":"s2","scope_files":[".github/workflows/release.yml"],"solution_diff":"diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 911bdaf6afee..ab02f59beec8 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -269,12 +269,11 @@ jobs:\n \"[]\" \\\n \"(https://github.com/${MASTER_REPO}/releases/latest \\\"Master builds\\\")\" >> ./RELEASE_NOTES\n fi\n- printf '\\n\\n' >> ./RELEASE_NOTES\n- cat >> ./RELEASE_NOTES << EOF\n- #### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\n- ---\n- $(python ./devscripts/make_changelog.py -vv --collapsible)\n- EOF\n+ printf '\\n\\n%s\\n\\n%s%s\\n\\n---\\n' \\\n+ \"#### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\" \\\n+ \"The PyInstaller-bundled executables are subject to the licenses described in \" \\\n+ \"[THIRD_PARTY_LICENSES.txt](https://github.com/${BASE_REPO}/blob/master/THIRD_PARTY_LICENSES.txt)\" >> ./RELEASE_NOTES\n+ python ./devscripts/make_changelog.py -vv --collapsible >> ./RELEASE_NOTES\n printf '%s\\n\\n' '**This is a pre-release build**' >> ./PRERELEASE_NOTES\n cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES\n printf '%s\\n\\n' \"Generated from: https://github.com/${REPOSITORY}/commit/${HEAD_SHA}\" >> ./ARCHIVE_NOTES\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s3","scope_files":["bundle/pyinstaller.py"],"solution_diff":"diff --git a/bundle/pyinstaller.py b/bundle/pyinstaller.py\nindex 8286f077abb2..422b9d0c741a 100755\n--- a/bundle/pyinstaller.py\n+++ b/bundle/pyinstaller.py\n@@ -129,7 +129,6 @@ def windows_set_version(exe, version):\n StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),\n StringStruct('FileVersion', version),\n StringStruct('InternalName', f'yt-dlp{suffix}'),\n- StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),\n StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),\n StringStruct('ProductName', f'yt-dlp{suffix}'),\n StringStruct(\n","summary":"Edited 1 file(s) in bundle/"},{"subtask_id":"s4","scope_files":["devscripts/generate_third_party_licenses.py"],"solution_diff":"diff --git a/devscripts/generate_third_party_licenses.py b/devscripts/generate_third_party_licenses.py\nnew file mode 100644\nindex 000000000000..db615d2e352e\n--- /dev/null\n+++ b/devscripts/generate_third_party_licenses.py\n@@ -0,0 +1,316 @@\n+import requests\n+from dataclasses import dataclass\n+from pathlib import Path\n+import hashlib\n+\n+DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'\n+CACHE_LOCATION = '.license_cache'\n+HEADER = '''THIRD-PARTY LICENSES\n+\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\n+Source code for bundled third-party components is available from the original projects.\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''\n+\n+\n+@dataclass(frozen=True)\n+class Dependency:\n+ name: str\n+ license_url: str\n+ project_url: str = ''\n+ license: str = ''\n+ comment: str = ''\n+\n+\n+DEPENDENCIES: list[Dependency] = [\n+ # Core runtime environment components\n+ Dependency(\n+ name='Python',\n+ license='PSF-2.0',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',\n+ project_url='https://www.python.org/',\n+ ),\n+ Dependency(\n+ name='Microsoft Distributable Code',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',\n+ comment='Only included in Windows builds',\n+ ),\n+ Dependency(\n+ name='bzip2',\n+ license='bzip2-1.0.6',\n+ license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',\n+ project_url='https://sourceware.org/bzip2/',\n+ ),\n+ Dependency(\n+ name='libffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',\n+ project_url='https://sourceware.org/libffi/',\n+ ),\n+ Dependency(\n+ name='OpenSSL 3.0+',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',\n+ project_url='https://www.openssl.org/',\n+ ),\n+ Dependency(\n+ name='SQLite',\n+ license='Public Domain', # Technically does not need to be included\n+ license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',\n+ project_url='https://www.sqlite.org/',\n+ ),\n+ Dependency(\n+ name='liblzma',\n+ license='0BSD', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',\n+ project_url='https://tukaani.org/xz/',\n+ ),\n+ Dependency(\n+ name='mpdecimal',\n+ license='BSD-2-Clause',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',\n+ project_url='https://www.bytereef.org/mpdecimal/',\n+ ),\n+ Dependency(\n+ name='zlib',\n+ license='zlib',\n+ license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',\n+ project_url='https://zlib.net/',\n+ ),\n+ Dependency(\n+ name='Expat',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',\n+ project_url='https://libexpat.github.io/',\n+ ),\n+ Dependency(\n+ name='ncurses',\n+ license='X11-distribute-modifications-variant',\n+ license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',\n+ comment='Only included in Linux/macOS builds',\n+ project_url='https://invisible-island.net/ncurses/',\n+ ),\n+ Dependency(\n+ name='GNU Readline',\n+ license='GPL-3.0-or-later',\n+ license_url='https://tiswww.case.edu/php/chet/readline/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://www.gnu.org/software/readline/',\n+ ),\n+ Dependency(\n+ name='libstdc++',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',\n+ ),\n+ Dependency(\n+ name='libgcc',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/',\n+ ),\n+ Dependency(\n+ name='libuuid',\n+ license='BSD-3-Clause',\n+ license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',\n+ ),\n+ Dependency(\n+ name='libintl',\n+ license='LGPL-2.1-or-later',\n+ license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/gettext/',\n+ ),\n+ Dependency(\n+ name='libidn2',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libidn2 (Unicode character data files)',\n+ license='Unicode-TOU AND Unicode-DFS-2016',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libunistring',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libunistring/',\n+ ),\n+ Dependency(\n+ name='librtmp',\n+ license='LGPL-2.1-or-later',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',\n+ comment='Only included in macOS builds',\n+ project_url='https://rtmpdump.mplayerhq.hu/',\n+ ),\n+ Dependency(\n+ name='zstd',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',\n+ comment='Only included in macOS builds',\n+ project_url='https://facebook.github.io/zstd/',\n+ ),\n+\n+ # Python packages\n+ Dependency(\n+ name='brotli',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',\n+ project_url='https://brotli.org/',\n+ ),\n+ Dependency(\n+ name='curl_cffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://curl-cffi.readthedocs.io/',\n+ ),\n+ # Dependency of curl_cffi\n+ Dependency(\n+ name='curl-impersonate',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://github.com/lexiforest/curl-impersonate',\n+ ),\n+ Dependency(\n+ name='cffi',\n+ license='MIT-0', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',\n+ project_url='https://cffi.readthedocs.io/',\n+ ),\n+ # Dependecy of cffi\n+ Dependency(\n+ name='pycparser',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',\n+ project_url='https://github.com/eliben/pycparser',\n+ ),\n+ Dependency(\n+ name='mutagen',\n+ license='GPL-2.0-or-later',\n+ license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',\n+ project_url='https://mutagen.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='PyCryptodome',\n+ license='Public Domain and BSD-2-Clause',\n+ license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',\n+ project_url='https://www.pycryptodome.org/',\n+ ),\n+ Dependency(\n+ name='certifi',\n+ license='MPL-2.0',\n+ license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',\n+ project_url='https://github.com/certifi/python-certifi',\n+ ),\n+ Dependency(\n+ name='requests',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',\n+ project_url='https://requests.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='charset-normalizer',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',\n+ project_url='https://charset-normalizer.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='idna',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',\n+ project_url='https://github.com/kjd/idna',\n+ ),\n+ Dependency(\n+ name='urllib3',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',\n+ project_url='https://urllib3.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='SecretStorage',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://secretstorage.readthedocs.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='cryptography',\n+ license='Apache-2.0', # Also available as BSD-3-Clause\n+ license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',\n+ comment='Only included in Linux builds',\n+ project_url='https://cryptography.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='Jeepney',\n+ license='MIT',\n+ license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://jeepney.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='websockets',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',\n+ project_url='https://websockets.readthedocs.io/',\n+ ),\n+]\n+\n+\n+def fetch_text(dep: Dependency) -> str:\n+ cache_dir = Path(CACHE_LOCATION)\n+ cache_dir.mkdir(exist_ok=True)\n+ url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()\n+ cache_file = cache_dir / f'{url_hash}.txt'\n+\n+ if cache_file.exists():\n+ return cache_file.read_text()\n+\n+ # UA needed since some domains block requests default UA\n+ req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})\n+ req.raise_for_status()\n+ text = req.text\n+ cache_file.write_text(text)\n+ return text\n+\n+\n+def build_output() -> str:\n+ lines = [HEADER]\n+ for d in DEPENDENCIES:\n+ lines.append('\\n')\n+ lines.append('-' * 80)\n+ header = f'{d.name}'\n+ if d.license:\n+ header += f' | {d.license}'\n+ if d.comment:\n+ header += f'\\nNote: {d.comment}'\n+ if d.project_url:\n+ header += f'\\nURL: {d.project_url}'\n+ lines.append(header)\n+ lines.append('-' * 80)\n+\n+ text = fetch_text(d)\n+ lines.append(text.strip('\\n') + '\\n')\n+ return '\\n'.join(lines)\n+\n+\n+if __name__ == '__main__':\n+ content = build_output()\n+ Path(DEFAULT_OUTPUT).write_text(content)\n","summary":"Edited 1 file(s) in devscripts/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"README.md\",\n \"THIRD_PARTY_LICENSES.txt\"\n ],\n \"solution_diff\": \"diff --git a/README.md b/README.md\\nindex e582e1e53cbe..7be3266ea54c 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import\\n gpg --verify SHA2-256SUMS.sig SHA2-256SUMS\\n gpg --verify SHA2-512SUMS.sig SHA2-512SUMS\\n ```\\n+\\n+#### Licensing\\n+\\n+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\\n+\\n+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\\n+\\n+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\\n+\\n+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\\n+\\n <!-- MANPAGE: END EXCLUDED SECTION -->\\n \\n **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)\\ndiff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt\\nnew file mode 100644\\nindex 000000000000..104004654119\\n--- /dev/null\\n+++ b/THIRD_PARTY_LICENSES.txt\\n@@ -0,0 +1,4433 @@\\n+THIRD-PARTY LICENSES\\n+\\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\\n+Source code for bundled third-party components is available from the original projects.\\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+Python | PSF-2.0\\n+URL: https://www.python.org/\\n+--------------------------------------------------------------------------------\\n+A. HISTORY OF THE SOFTWARE\\n+==========================\\n+\\n+Python was created in the early 1990s by Guido van Rossum at Stichting\\n+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands\\n+as a successor of a language called ABC. Guido remains Python's\\n+principal author, although it includes many contributions from others.\\n+\\n+In 1995, Guido continued his work on Python at the Corporation for\\n+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)\\n+in Reston, Virginia where he released several versions of the\\n+software.\\n+\\n+In May 2000, Guido and the Python core development team moved to\\n+BeOpen.com to form the BeOpen PythonLabs team. In October of the same\\n+year, the PythonLabs team moved to Digital Creations, which became\\n+Zope Corporation. In 2001, the Python Software Foundation (PSF, see\\n+https://www.python.org/psf/) was formed, a non-profit organization\\n+created specifically to own Python-related Intellectual Property.\\n+Zope Corporation was a sponsoring member of the PSF.\\n+\\n+All Python releases are Open Source (see https://opensource.org for\\n+the Open Source Definition). Historically, most, but not all, Python\\n+releases have also been GPL-compatible; the table below summarizes\\n+the various releases.\\n+\\n+ Release Derived Year Owner GPL-\\n+ from compatible? (1)\\n+\\n+ 0.9.0 thru 1.2 1991-1995 CWI yes\\n+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\\n+ 1.6 1.5.2 2000 CNRI no\\n+ 2.0 1.6 2000 BeOpen.com no\\n+ 1.6.1 1.6 2001 CNRI yes (2)\\n+ 2.1 2.0+1.6.1 2001 PSF no\\n+ 2.0.1 2.0+1.6.1 2001 PSF yes\\n+ 2.1.1 2.1+2.0.1 2001 PSF yes\\n+ 2.1.2 2.1.1 2002 PSF yes\\n+ 2.1.3 2.1.2 2002 PSF yes\\n+ 2.2 and above 2.1.1 2001-now PSF yes\\n+\\n+Footnotes:\\n+\\n+(1) GPL-compatible doesn't mean that we're distributing Python under\\n+ the GPL. All Python licenses, unlike the GPL, let you distribute\\n+ a modified version without making your changes open source. The\\n+ GPL-compatible licenses make it possible to combine Python with\\n+ other software that is released under the GPL; the others don't.\\n+\\n+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,\\n+ because its license has a choice of law clause. According to\\n+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1\\n+ is \\\"not incompatible\\\" with the GPL.\\n+\\n+Thanks to the many outside volunteers who have worked under Guido's\\n+direction to make these releases possible.\\n+\\n+\\n+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\\n+===============================================================\\n+\\n+Python software and documentation are licensed under the\\n+Python Software Foundation License Version 2.\\n+\\n+Starting with Python 3.8.6, examples, recipes, and other code in\\n+the documentation are dual licensed under the PSF License Version 2\\n+and the Zero-Clause BSD license.\\n+\\n+Some software incorporated into Python is under different licenses.\\n+The licenses are listed with code falling under that license.\\n+\\n+\\n+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\\n+--------------------------------------------\\n+\\n+1. This LICENSE AGREEMENT is between the Python Software Foundation\\n+(\\\"PSF\\\"), and the Individual or Organization (\\\"Licensee\\\") accessing and\\n+otherwise using this software (\\\"Python\\\") in source or binary form and\\n+its associated documentation.\\n+\\n+2. Subject to the terms and conditions of this License Agreement, PSF hereby\\n+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,\\n+analyze, test, perform and/or display publicly, prepare derivative works,\\n+distribute, and otherwise use Python alone or in any derivative version,\\n+provided, however, that PSF's License Agreement and PSF's notice of copyright,\\n+i.e., \\\"Copyright (c) 2001 Python Software Foundation; All Rights Reserved\\\"\\n+are retained in Python alone or in any derivative version prepared by Licensee.\\n+\\n+3. In the event Licensee prepares a derivative work that is based on\\n+or incorporates Python or any part thereof, and wants to make\\n+the derivative work available to others as provided herein, then\\n+Licensee hereby agrees to include in any such work a brief summary of\\n+the changes made to Python.\\n+\\n+4. PSF is making Python available to Licensee on an \\\"AS IS\\\"\\n+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\\n+INFRINGE ANY THIRD PARTY RIGHTS.\\n+\\n+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\\n+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\\n+\\n+6. This License Agreement will automatically terminate upon a material\\n+breach of its terms and conditions.\\n+\\n+7. Nothing in this License Agreement shall be deemed to create any\\n+relationship of agency, partnership, or joint venture between PSF and\\n+Licensee. This License Agreement does not grant permission to use PSF\\n+trademarks or trade name in a trademark sense to endorse or promote\\n+products or services of Licensee, or any third party.\\n+\\n+8. By copying, installing or otherwise using Python, Licensee\\n+agrees to be bound by the terms and conditions of this License\\n+Agreement.\\n+\\n+\\n+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\\n+-------------------------------------------\\n+\\n+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\\n+\\n+1. This LICENSE AGREEMENT is between BeOpen.com (\\\"BeOpen\\\"), having an\\n+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\\n+Individual or Organization (\\\"Licensee\\\") accessing and otherwise using\\n+this software in source or binary form and its associated\\n+documentation (\\\"the Software\\\").\\n+\\n+2. Subject to the terms and conditions of this BeOpen Python License\\n+Agreement, BeOpen hereby grants Licensee a non-exclusive,\\n+royalty-free, world-wide license to reproduce, analyze, test, perform\\n+and/or display publicly, prepare derivative works, distribute, and\\n+otherwise use the Software alone or in any derivative version,\\n+provided, however, that the BeOpen Python License is retained in the\\n+Software, alone or in any derivative version prepared by Licensee.\\n+\\n+3. BeOpen is making the Software available to Licensee on an \\\"AS IS\\\"\\n+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\\n+INFRINGE ANY THIRD PARTY RIGHTS.\\n+\\n+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\\n+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\\n+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\\n+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\\n+\\n+5. This License Agreement will automatically terminate upon a material\\n+breach of its terms and conditions.\\n+\\n+6. This License Agreement shall be governed by and interpreted in all\\n+respects by the law of the State of California, excluding conflict of\\n+law provisions. Nothing in this License Agreement shall be deemed to\\n+create any relationship of agency, partnership, or joint venture\\n+between BeOpen and Licensee. This License Agreement does not grant\\n+permission to use BeOpen trademarks or trade names in a trademark\\n+sense to endorse or promote products or services of Licensee, or any\\n+third party. As an exception, the \\\"BeOpen Python\\\" logos available at\\n+http://www.pythonlabs.com/logos.html may be used according to the\\n+permissions granted on that web page.\\n+\\n+7. By copying, installing or otherwise using the software, Licensee\\n+agrees to be bound by the terms and conditions of this License\\n+Agreement.\\n+\\n+\\n+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\\n+---------------------------------------\\n+\\n+1. This LICENSE AGREEMENT is between the Corporation for National\\n+Research Initiatives, having an office at 1895 Preston White Drive,\\n+Reston, VA 20191 (\\\"CNRI\\\"), and the Individual or Organization\\n+(\\\"Licensee\\\") accessing and otherwise using Python 1.6.1 software in\\n+source or binary form and its associated documentation.\\n+\\n+2. Subject to the terms and conditions of this License Agreement, CNRI\\n+hereby grants Licensee a nonexclusive, royalty-free, world-wide\\n+license to reproduce, analyze, test, perform and/or display publicly,\\n+prepare derivative works, distribute, and otherwise use Python 1.6.1\\n+alone or in any derivative version, provided, however, that CNRI's\\n+License Agreement and CNRI's notice of copyright, i.e., \\\"Copyright (c)\\n+1995-2001 Corporation for National Research Initiatives; All Rights\\n+Reserved\\\" are retained in Python 1.6.1 alone or in any derivative\\n+version prepared by Licensee. Alternately, in lieu of CNRI's License\\n+Agreement, Licensee may substitute the following text (omitting the\\n+quotes): \\\"Python 1.6.1 is made available subject to the terms and\\n+conditions in CNRI's License Agreement. This Agreement together with\\n+Python 1.6.1 may be located on the internet using the following\\n+unique, persistent identifier (known as a handle): 1895.22/1013. This\\n+Agreement may also be obtained from a proxy server on the internet\\n+using the following URL: http://hdl.handle.net/1895.22/1013\\\".\\n+\\n+3. In the event Licensee prepares a derivative work that is based on\\n+or incorporates Python 1.6.1 or any part thereof, and wants to make\\n+the derivative work available to others as provided herein, then\\n+Licensee hereby agrees to include in any such work a brief summary of\\n+the changes made to Python 1.6.1.\\n+\\n+4. CNRI is making Python 1.6.1 available to Licensee on an \\\"AS IS\\\"\\n+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\\n+INFRINGE ANY THIRD PARTY RIGHTS.\\n+\\n+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\\n+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\\n+\\n+6. This License Agreement will automatically terminate upon a material\\n+breach of its terms and conditions.\\n+\\n+7. This License Agreement shall be governed by the federal\\n+intellectual property law of the United States, including without\\n+limitation the federal copyright law, and, to the extent such\\n+U.S. federal law does not apply, by the law of the Commonwealth of\\n+Virginia, excluding Virginia's conflict of law provisions.\\n+Notwithstanding the foregoing, with regard to derivative works based\\n+on Python 1.6.1 that incorporate non-separable material that was\\n+previously distributed under the GNU General Public License (GPL), the\\n+law of the Commonwealth of Virginia shall govern this License\\n+Agreement only as to issues arising under or with respect to\\n+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this\\n+License Agreement shall be deemed to create any relationship of\\n+agency, partnership, or joint venture between CNRI and Licensee. This\\n+License Agreement does not grant permission to use CNRI trademarks or\\n+trade name in a trademark sense to endorse or promote products or\\n+services of Licensee, or any third party.\\n+\\n+8. By clicking on the \\\"ACCEPT\\\" button where indicated, or by copying,\\n+installing or otherwise using Python 1.6.1, Licensee agrees to be\\n+bound by the terms and conditions of this License Agreement.\\n+\\n+ ACCEPT\\n+\\n+\\n+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\\n+--------------------------------------------------\\n+\\n+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\\n+The Netherlands. All rights reserved.\\n+\\n+Permission to use, copy, modify, and distribute this software and its\\n+documentation for any purpose and without fee is hereby granted,\\n+provided that the above copyright notice appear in all copies and that\\n+both that copyright notice and this permission notice appear in\\n+supporting documentation, and that the name of Stichting Mathematisch\\n+Centrum or CWI not be used in advertising or publicity pertaining to\\n+distribution of the software without specific, written prior\\n+permission.\\n+\\n+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\\n+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\\n+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\\n+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\\n+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\\n+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\\n+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\\n+\\n+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION\\n+----------------------------------------------------------------------\\n+\\n+Permission to use, copy, modify, and/or distribute this software for any\\n+purpose with or without fee is hereby granted.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\\n+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\\n+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\\n+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\\n+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\\n+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\\n+PERFORMANCE OF THIS SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+Microsoft Distributable Code\\n+Note: Only included in Windows builds\\n+--------------------------------------------------------------------------------\\n+Additional Conditions for this Windows binary build\\n+---------------------------------------------------\\n+\\n+This program is linked with and uses Microsoft Distributable Code,\\n+copyrighted by Microsoft Corporation. The Microsoft Distributable Code\\n+is embedded in each .exe, .dll and .pyd file as a result of running\\n+the code through a linker.\\n+\\n+If you further distribute programs that include the Microsoft\\n+Distributable Code, you must comply with the restrictions on\\n+distribution specified by Microsoft. In particular, you must require\\n+distributors and external end users to agree to terms that protect the\\n+Microsoft Distributable Code at least as much as Microsoft's own\\n+requirements for the Distributable Code. See Microsoft's documentation\\n+(included in its developer tools and on its website at microsoft.com)\\n+for specific details.\\n+\\n+Redistribution of the Windows binary build of the Python interpreter\\n+complies with this agreement, provided that you do not:\\n+\\n+- alter any copyright, trademark or patent notice in Microsoft's\\n+Distributable Code;\\n+\\n+- use Microsoft's trademarks in your programs' names or in a way that\\n+suggests your programs come from or are endorsed by Microsoft;\\n+\\n+- distribute Microsoft's Distributable Code to run on a platform other\\n+than Microsoft operating systems, run-time technologies or application\\n+platforms; or\\n+\\n+- include Microsoft Distributable Code in malicious, deceptive or\\n+unlawful programs.\\n+\\n+These restrictions apply only to the Microsoft Distributable Code as\\n+defined above, not to Python itself or any programs running on the\\n+Python interpreter. The redistribution of the Python interpreter and\\n+libraries is governed by the Python Software License included with this\\n+file, or by other licenses as marked.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+bzip2 | bzip2-1.0.6\\n+URL: https://sourceware.org/bzip2/\\n+--------------------------------------------------------------------------------\\n+--------------------------------------------------------------------------\\n+\\n+This program, \\\"bzip2\\\", the associated library \\\"libbzip2\\\", and all\\n+documentation, are copyright (C) 1996-2010 Julian R Seward. All\\n+rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions\\n+are met:\\n+\\n+1. Redistributions of source code must retain the above copyright\\n+ notice, this list of conditions and the following disclaimer.\\n+\\n+2. The origin of this software must not be misrepresented; you must \\n+ not claim that you wrote the original software. If you use this \\n+ software in a product, an acknowledgment in the product \\n+ documentation would be appreciated but is not required.\\n+\\n+3. Altered source versions must be plainly marked as such, and must\\n+ not be misrepresented as being the original software.\\n+\\n+4. The name of the author may not be used to endorse or promote \\n+ products derived from this software without specific prior written \\n+ permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\\n+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\\n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\\n+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\\n+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+Julian Seward, jseward@acm.org\\n+bzip2/libbzip2 version 1.0.6 of 6 September 2010\\n+\\n+--------------------------------------------------------------------------\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libffi | MIT\\n+URL: https://sourceware.org/libffi/\\n+--------------------------------------------------------------------------------\\n+libffi - Copyright (c) 1996-2025 Anthony Green, Red Hat, Inc and others.\\n+See source files for details.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining\\n+a copy of this software and associated documentation files (the\\n+``Software''), to deal in the Software without restriction, including\\n+without limitation the rights to use, copy, modify, merge, publish,\\n+distribute, sublicense, and/or sell copies of the Software, and to\\n+permit persons to whom the Software is furnished to do so, subject to\\n+the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be\\n+included in all copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,\\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+OpenSSL 3.0+ | Apache-2.0\\n+URL: https://www.openssl.org/\\n+--------------------------------------------------------------------------------\\n+ Apache License\\n+ Version 2.0, January 2004\\n+ https://www.apache.org/licenses/\\n+\\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\\n+\\n+ 1. Definitions.\\n+\\n+ \\\"License\\\" shall mean the terms and conditions for use, reproduction,\\n+ and distribution as defined by Sections 1 through 9 of this document.\\n+\\n+ \\\"Licensor\\\" shall mean the copyright owner or entity authorized by\\n+ the copyright owner that is granting the License.\\n+\\n+ \\\"Legal Entity\\\" shall mean the union of the acting entity and all\\n+ other entities that control, are controlled by, or are under common\\n+ control with that entity. For the purposes of this definition,\\n+ \\\"control\\\" means (i) the power, direct or indirect, to cause the\\n+ direction or management of such entity, whether by contract or\\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\\n+ outstanding shares, or (iii) beneficial ownership of such entity.\\n+\\n+ \\\"You\\\" (or \\\"Your\\\") shall mean an individual or Legal Entity\\n+ exercising permissions granted by this License.\\n+\\n+ \\\"Source\\\" form shall mean the preferred form for making modifications,\\n+ including but not limited to software source code, documentation\\n+ source, and configuration files.\\n+\\n+ \\\"Object\\\" form shall mean any form resulting from mechanical\\n+ transformation or translation of a Source form, including but\\n+ not limited to compiled object code, generated documentation,\\n+ and conversions to other media types.\\n+\\n+ \\\"Work\\\" shall mean the work of authorship, whether in Source or\\n+ Object form, made available under the License, as indicated by a\\n+ copyright notice that is included in or attached to the work\\n+ (an example is provided in the Appendix below).\\n+\\n+ \\\"Derivative Works\\\" shall mean any work, whether in Source or Object\\n+ form, that is based on (or derived from) the Work and for which the\\n+ editorial revisions, annotations, elaborations, or other modifications\\n+ represent, as a whole, an original work of authorship. For the purposes\\n+ of this License, Derivative Works shall not include works that remain\\n+ separable from, or merely link (or bind by name) to the interfaces of,\\n+ the Work and Derivative Works thereof.\\n+\\n+ \\\"Contribution\\\" shall mean any work of authorship, including\\n+ the original version of the Work and any modifications or additions\\n+ to that Work or Derivative Works thereof, that is intentionally\\n+ submitted to Licensor for inclusion in the Work by the copyright owner\\n+ or by an individual or Legal Entity authorized to submit on behalf of\\n+ the copyright owner. For the purposes of this definition, \\\"submitted\\\"\\n+ means any form of electronic, verbal, or written communication sent\\n+ to the Licensor or its representatives, including but not limited to\\n+ communication on electronic mailing lists, source code control systems,\\n+ and issue tracking systems that are managed by, or on behalf of, the\\n+ Licensor for the purpose of discussing and improving the Work, but\\n+ excluding communication that is conspicuously marked or otherwise\\n+ designated in writing by the copyright owner as \\\"Not a Contribution.\\\"\\n+\\n+ \\\"Contributor\\\" shall mean Licensor and any individual or Legal Entity\\n+ on behalf of whom a Contribution has been received by Licensor and\\n+ subsequently incorporated within the Work.\\n+\\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ copyright license to reproduce, prepare Derivative Works of,\\n+ publicly display, publicly perform, sublicense, and distribute the\\n+ Work and such Derivative Works in Source or Object form.\\n+\\n+ 3. Grant of Patent License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ (except as stated in this section) patent license to make, have made,\\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\\n+ where such license applies only to those patent claims licensable\\n+ by such Contributor that are necessarily infringed by their\\n+ Contribution(s) alone or by combination of their Contribution(s)\\n+ with the Work to which such Contribution(s) was submitted. If You\\n+ institute patent litigation against any entity (including a\\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\\n+ or a Contribution incorporated within the Work constitutes direct\\n+ or contributory patent infringement, then any patent licenses\\n+ granted to You under this License for that Work shall terminate\\n+ as of the date such litigation is filed.\\n+\\n+ 4. Redistribution. You may reproduce and distribute copies of the\\n+ Work or Derivative Works thereof in any medium, with or without\\n+ modifications, and in Source or Object form, provided that You\\n+ meet the following conditions:\\n+\\n+ (a) You must give any other recipients of the Work or\\n+ Derivative Works a copy of this License; and\\n+\\n+ (b) You must cause any modified files to carry prominent notices\\n+ stating that You changed the files; and\\n+\\n+ (c) You must retain, in the Source form of any Derivative Works\\n+ that You distribute, all copyright, patent, trademark, and\\n+ attribution notices from the Source form of the Work,\\n+ excluding those notices that do not pertain to any part of\\n+ the Derivative Works; and\\n+\\n+ (d) If the Work includes a \\\"NOTICE\\\" text file as part of its\\n+ distribution, then any Derivative Works that You distribute must\\n+ include a readable copy of the attribution notices contained\\n+ within such NOTICE file, excluding those notices that do not\\n+ pertain to any part of the Derivative Works, in at least one\\n+ of the following places: within a NOTICE text file distributed\\n+ as part of the Derivative Works; within the Source form or\\n+ documentation, if provided along with the Derivative Works; or,\\n+ within a display generated by the Derivative Works, if and\\n+ wherever such third-party notices normally appear. The contents\\n+ of the NOTICE file are for informational purposes only and\\n+ do not modify the License. You may add Your own attribution\\n+ notices within Derivative Works that You distribute, alongside\\n+ or as an addendum to the NOTICE text from the Work, provided\\n+ that such additional attribution notices cannot be construed\\n+ as modifying the License.\\n+\\n+ You may add Your own copyright statement to Your modifications and\\n+ may provide additional or different license terms and conditions\\n+ for use, reproduction, or distribution of Your modifications, or\\n+ for any such Derivative Works as a whole, provided Your use,\\n+ reproduction, and distribution of the Work otherwise complies with\\n+ the conditions stated in this License.\\n+\\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\\n+ any Contribution intentionally submitted for inclusion in the Work\\n+ by You to the Licensor shall be under the terms and conditions of\\n+ this License, without any additional terms or conditions.\\n+ Notwithstanding the above, nothing herein shall supersede or modify\\n+ the terms of any separate license agreement you may have executed\\n+ with Licensor regarding such Contributions.\\n+\\n+ 6. Trademarks. This License does not grant permission to use the trade\\n+ names, trademarks, service marks, or product names of the Licensor,\\n+ except as required for reasonable and customary use in describing the\\n+ origin of the Work and reproducing the content of the NOTICE file.\\n+\\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\\n+ agreed to in writing, Licensor provides the Work (and each\\n+ Contributor provides its Contributions) on an \\\"AS IS\\\" BASIS,\\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\\n+ implied, including, without limitation, any warranties or conditions\\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\\n+ appropriateness of using or redistributing the Work and assume any\\n+ risks associated with Your exercise of permissions under this License.\\n+\\n+ 8. Limitation of Liability. In no event and under no legal theory,\\n+ whether in tort (including negligence), contract, or otherwise,\\n+ unless required by applicable law (such as deliberate and grossly\\n+ negligent acts) or agreed to in writing, shall any Contributor be\\n+ liable to You for damages, including any direct, indirect, special,\\n+ incidental, or consequential damages of any character arising as a\\n+ result of this License or out of the use or inability to use the\\n+ Work (including but not limited to damages for loss of goodwill,\\n+ work stoppage, computer failure or malfunction, or any and all\\n+ other commercial damages or losses), even if such Contributor\\n+ has been advised of the possibility of such damages.\\n+\\n+ 9. Accepting Warranty or Additional Liability. While redistributing\\n+ the Work or Derivative Works thereof, You may choose to offer,\\n+ and charge a fee for, acceptance of support, warranty, indemnity,\\n+ or other liability obligations and/or rights consistent with this\\n+ License. However, in accepting such obligations, You may act only\\n+ on Your own behalf and on Your sole responsibility, not on behalf\\n+ of any other Contributor, and only if You agree to indemnify,\\n+ defend, and hold each Contributor harmless for any liability\\n+ incurred by, or claims asserted against, such Contributor by reason\\n+ of your accepting any such warranty or additional liability.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+SQLite | Public Domain\\n+URL: https://www.sqlite.org/\\n+--------------------------------------------------------------------------------\\n+License Information\\n+===================\\n+\\n+SQLite Is Public Domain\\n+-----------------------\\n+\\n+The SQLite source code, including all of the files in the directories\\n+listed in the bullets below are \\n+[Public Domain](https://sqlite.org/copyright.html).\\n+The authors have submitted written affidavits releasing their work to\\n+the public for any use. Every byte of the public-domain code can be\\n+traced back to the original authors. The files of this repository\\n+that are public domain include the following:\\n+\\n+ * All of the primary SQLite source code files found in the\\n+ [src/ directory](https://sqlite.org/src/tree/src?type=tree&expand)\\n+ * All of the test cases and testing code in the\\n+ [test/ directory](https://sqlite.org/src/tree/test?type=tree&expand)\\n+ * All of the SQLite extension source code and test cases in the\\n+ [ext/ directory](https://sqlite.org/src/tree/ext?type=tree&expand)\\n+ * All code that ends up in the \\\"sqlite3.c\\\" and \\\"sqlite3.h\\\" build products\\n+ that actually implement the SQLite RDBMS.\\n+ * All of the code used to compile the\\n+ [command-line interface](https://sqlite.org/cli.html)\\n+ * All of the code used to build various utility programs such as\\n+ \\\"sqldiff\\\", \\\"sqlite3_rsync\\\", and \\\"sqlite3_analyzer\\\".\\n+\\n+\\n+The public domain source files usually contain a header comment\\n+similar to the following to make it clear that the software is\\n+public domain.\\n+\\n+> ~~~\\n+The author disclaims copyright to this source code. In place of\\n+a legal notice, here is a blessing:\\n+\\n+ * May you do good and not evil.\\n+ * May you find forgiveness for yourself and forgive others.\\n+ * May you share freely, never taking more than you give.\\n+~~~\\n+\\n+Almost every file you find in this source repository will be\\n+public domain. But there are a small number of exceptions:\\n+\\n+Non-Public-Domain Code Included With This Source Repository AS A Convenience\\n+----------------------------------------------------------------------------\\n+\\n+This repository contains a (relatively) small amount of non-public-domain\\n+code used to help implement the configuration and build logic. In other\\n+words, there are some non-public-domain files used to implement:\\n+\\n+> ~~~\\n+./configure && make\\n+~~~\\n+\\n+In all cases, the non-public-domain files included with this\\n+repository have generous BSD-style licenses. So anyone is free to\\n+use any of the code in this source repository for any purpose, though\\n+attribution may be required to reuse or republish the configure and\\n+build scripts. None of the non-public-domain code ever actually reaches\\n+the build products, such as \\\"sqlite3.c\\\", however, so no attribution is\\n+required to use SQLite itself. The non-public-domain code consists of\\n+scripts used to help compile SQLite. The non-public-domain code is\\n+technically not part of SQLite. The non-public-domain code is\\n+included in this repository as a convenience to developers, so that those\\n+who want to build SQLite do not need to go download a bunch of\\n+third-party build scripts in order to compile SQLite.\\n+\\n+Non-public-domain code included in this respository includes:\\n+\\n+ * The [\\\"autosetup\\\"](http://msteveb.github.io/autosetup/) configuration\\n+ system that is contained (mostly) the autosetup/ directory, but also\\n+ includes the \\\"./configure\\\" script at the top-level of this archive.\\n+ Autosetup has a separate BSD-style license. See the\\n+ [autosetup/LICENSE](http://msteveb.github.io/autosetup/license/)\\n+ for details.\\n+\\n+ * There are BSD-style licenses on some of the configuration\\n+ software found in the legacy autoconf/ directory and its\\n+ subdirectories.\\n+\\n+The following unix shell command is can be run from the top-level\\n+of this source repository in order to remove all non-public-domain\\n+code:\\n+\\n+> ~~~\\n+rm -rf configure autosetup autoconf\\n+~~~\\n+\\n+If you unpack this source repository and then run the command above, what\\n+is left will be 100% public domain.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+liblzma | 0BSD\\n+URL: https://tukaani.org/xz/\\n+--------------------------------------------------------------------------------\\n+XZ Utils Licensing\\n+==================\\n+\\n+ Different licenses apply to different files in this package. Here\\n+ is a summary of which licenses apply to which parts of this package:\\n+\\n+ - liblzma is under the BSD Zero Clause License (0BSD).\\n+\\n+ - The command line tools xz, xzdec, lzmadec, and lzmainfo are\\n+ under 0BSD except that, on systems that don't have a usable\\n+ getopt_long, GNU getopt_long is compiled and linked in from the\\n+ 'lib' directory. The getopt_long code is under GNU LGPLv2.1+.\\n+\\n+ - The scripts to grep, diff, and view compressed files have been\\n+ adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless,\\n+ and xzmore) are under GNU GPLv2+. The man pages of the scripts\\n+ are under 0BSD; they aren't based on the man pages of GNU gzip.\\n+\\n+ - Most of the XZ Utils specific documentation that is in\\n+ plain text files (like README, INSTALL, PACKAGERS, NEWS,\\n+ and ChangeLog) are under 0BSD unless stated otherwise in\\n+ the file itself. The files xz-file-format.txt and\\n+ lzma-file-format.xt are in the public domain but may\\n+ be distributed under the terms of 0BSD too.\\n+\\n+ - Translated messages and man pages are under 0BSD except that\\n+ some old translations are in the public domain.\\n+\\n+ - Test files and test code in the 'tests' directory, and\\n+ debugging utilities in the 'debug' directory are under\\n+ the BSD Zero Clause License (0BSD).\\n+\\n+ - The GNU Autotools based build system contains files that are\\n+ under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses.\\n+ These files don't affect the licensing of the binaries being\\n+ built.\\n+\\n+ - The 'extra' directory contains files that are under various\\n+ free software licenses. These aren't built or installed as\\n+ part of XZ Utils.\\n+\\n+ The following command may be helpful in finding per-file license\\n+ information. It works on xz.git and on a clean file tree extracted\\n+ from a release tarball.\\n+\\n+ sh build-aux/license-check.sh -v\\n+\\n+ For the files under the BSD Zero Clause License (0BSD), if\\n+ a copyright notice is needed, the following is sufficient:\\n+\\n+ Copyright (C) The XZ Utils authors and contributors\\n+\\n+ If you copy significant amounts of 0BSD-licensed code from XZ Utils\\n+ into your project, acknowledging this somewhere in your software is\\n+ polite (especially if it is proprietary, non-free software), but\\n+ it is not legally required by the license terms. Here is an example\\n+ of a good notice to put into \\\"about box\\\" or into documentation:\\n+\\n+ This software includes code from XZ Utils <https://tukaani.org/xz/>.\\n+\\n+ The following license texts are included in the following files:\\n+ - COPYING.0BSD: BSD Zero Clause License\\n+ - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1\\n+ - COPYING.GPLv2: GNU General Public License version 2\\n+ - COPYING.GPLv3: GNU General Public License version 3\\n+\\n+ If you have questions, don't hesitate to ask for more information.\\n+ The contact information is in the README file.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+mpdecimal | BSD-2-Clause\\n+URL: https://www.bytereef.org/mpdecimal/\\n+--------------------------------------------------------------------------------\\n+Copyright (c) 2008-2025 Stefan Krah. All rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions\\n+are met:\\n+\\n+1. Redistributions of source code must retain the above copyright\\n+ notice, this list of conditions and the following disclaimer.\\n+2. Redistributions in binary form must reproduce the above copyright\\n+ notice, this list of conditions and the following disclaimer in the\\n+ documentation and/or other materials provided with the distribution.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\\n+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\\n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\\n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\\n+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\\n+SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+zlib | zlib\\n+URL: https://zlib.net/\\n+--------------------------------------------------------------------------------\\n+Copyright notice:\\n+\\n+ (C) 1995-2024 Jean-loup Gailly and Mark Adler\\n+\\n+ This software is provided 'as-is', without any express or implied\\n+ warranty. In no event will the authors be held liable for any damages\\n+ arising from the use of this software.\\n+\\n+ Permission is granted to anyone to use this software for any purpose,\\n+ including commercial applications, and to alter it and redistribute it\\n+ freely, subject to the following restrictions:\\n+\\n+ 1. The origin of this software must not be misrepresented; you must not\\n+ claim that you wrote the original software. If you use this software\\n+ in a product, an acknowledgment in the product documentation would be\\n+ appreciated but is not required.\\n+ 2. Altered source versions must be plainly marked as such, and must not be\\n+ misrepresented as being the original software.\\n+ 3. This notice may not be removed or altered from any source distribution.\\n+\\n+ Jean-loup Gailly Mark Adler\\n+ jloup@gzip.org madler@alumni.caltech.edu\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+Expat | MIT\\n+URL: https://libexpat.github.io/\\n+--------------------------------------------------------------------------------\\n+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper\\n+Copyright (c) 2001-2025 Expat maintainers\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining\\n+a copy of this software and associated documentation files (the\\n+\\\"Software\\\"), to deal in the Software without restriction, including\\n+without limitation the rights to use, copy, modify, merge, publish,\\n+distribute, sublicense, and/or sell copies of the Software, and to\\n+permit persons to whom the Software is furnished to do so, subject to\\n+the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included\\n+in all copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND,\\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+ncurses | X11-distribute-modifications-variant\\n+Note: Only included in Linux/macOS builds\\n+URL: https://invisible-island.net/ncurses/\\n+--------------------------------------------------------------------------------\\n+Copyright 2018-2022,2023 Thomas E. Dickey\\n+Copyright 1998-2017,2018 Free Software Foundation, Inc.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a\\n+copy of this software and associated documentation files (the\\n+\\\"Software\\\"), to deal in the Software without restriction, including\\n+without limitation the rights to use, copy, modify, merge, publish,\\n+distribute, distribute with modifications, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included\\n+in all copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\\n+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\\n+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\\n+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\\n+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\\n+THE USE OR OTHER DEALINGS IN THE SOFTWARE.\\n+\\n+Except as contained in this notice, the name(s) of the above copyright\\n+holders shall not be used in advertising or otherwise to promote the\\n+sale, use or other dealings in this Software without prior written\\n+authorization.\\n+\\n+-- vile:txtmode fc=72\\n+-- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+GNU Readline | GPL-3.0-or-later\\n+Note: Only included in Linux builds\\n+URL: https://www.gnu.org/software/readline/\\n+--------------------------------------------------------------------------------\\n+ GNU GENERAL PUBLIC LICENSE\\n+ Version 3, 29 June 2007\\n+\\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+ Preamble\\n+\\n+ The GNU General Public License is a free, copyleft license for\\n+software and other kinds of works.\\n+\\n+ The licenses for most software and other practical works are designed\\n+to take away your freedom to share and change the works. By contrast,\\n+the GNU General Public License is intended to guarantee your freedom to\\n+share and change all versions of a program--to make sure it remains free\\n+software for all its users. We, the Free Software Foundation, use the\\n+GNU General Public License for most of our software; it applies also to\\n+any other work released this way by its authors. You can apply it to\\n+your programs, too.\\n+\\n+ When we speak of free software, we are referring to freedom, not\\n+price. Our General Public Licenses are designed to make sure that you\\n+have the freedom to distribute copies of free software (and charge for\\n+them if you wish), that you receive source code or can get it if you\\n+want it, that you can change the software or use pieces of it in new\\n+free programs, and that you know you can do these things.\\n+\\n+ To protect your rights, we need to prevent others from denying you\\n+these rights or asking you to surrender the rights. Therefore, you have\\n+certain responsibilities if you distribute copies of the software, or if\\n+you modify it: responsibilities to respect the freedom of others.\\n+\\n+ For example, if you distribute copies of such a program, whether\\n+gratis or for a fee, you must pass on to the recipients the same\\n+freedoms that you received. You must make sure that they, too, receive\\n+or can get the source code. And you must show them these terms so they\\n+know their rights.\\n+\\n+ Developers that use the GNU GPL protect your rights with two steps:\\n+(1) assert copyright on the software, and (2) offer you this License\\n+giving you legal permission to copy, distribute and/or modify it.\\n+\\n+ For the developers' and authors' protection, the GPL clearly explains\\n+that there is no warranty for this free software. For both users' and\\n+authors' sake, the GPL requires that modified versions be marked as\\n+changed, so that their problems will not be attributed erroneously to\\n+authors of previous versions.\\n+\\n+ Some devices are designed to deny users access to install or run\\n+modified versions of the software inside them, although the manufacturer\\n+can do so. This is fundamentally incompatible with the aim of\\n+protecting users' freedom to change the software. The systematic\\n+pattern of such abuse occurs in the area of products for individuals to\\n+use, which is precisely where it is most unacceptable. Therefore, we\\n+have designed this version of the GPL to prohibit the practice for those\\n+products. If such problems arise substantially in other domains, we\\n+stand ready to extend this provision to those domains in future versions\\n+of the GPL, as needed to protect the freedom of users.\\n+\\n+ Finally, every program is threatened constantly by software patents.\\n+States should not allow patents to restrict development and use of\\n+software on general-purpose computers, but in those that do, we wish to\\n+avoid the special danger that patents applied to a free program could\\n+make it effectively proprietary. To prevent this, the GPL assures that\\n+patents cannot be used to render the program non-free.\\n+\\n+ The precise terms and conditions for copying, distribution and\\n+modification follow.\\n+\\n+ TERMS AND CONDITIONS\\n+\\n+ 0. Definitions.\\n+\\n+ \\\"This License\\\" refers to version 3 of the GNU General Public License.\\n+\\n+ \\\"Copyright\\\" also means copyright-like laws that apply to other kinds of\\n+works, such as semiconductor masks.\\n+\\n+ \\\"The Program\\\" refers to any copyrightable work licensed under this\\n+License. Each licensee is addressed as \\\"you\\\". \\\"Licensees\\\" and\\n+\\\"recipients\\\" may be individuals or organizations.\\n+\\n+ To \\\"modify\\\" a work means to copy from or adapt all or part of the work\\n+in a fashion requiring copyright permission, other than the making of an\\n+exact copy. The resulting work is called a \\\"modified version\\\" of the\\n+earlier work or a work \\\"based on\\\" the earlier work.\\n+\\n+ A \\\"covered work\\\" means either the unmodified Program or a work based\\n+on the Program.\\n+\\n+ To \\\"propagate\\\" a work means to do anything with it that, without\\n+permission, would make you directly or secondarily liable for\\n+infringement under applicable copyright law, except executing it on a\\n+computer or modifying a private copy. Propagation includes copying,\\n+distribution (with or without modification), making available to the\\n+public, and in some countries other activities as well.\\n+\\n+ To \\\"convey\\\" a work means any kind of propagation that enables other\\n+parties to make or receive copies. Mere interaction with a user through\\n+a computer network, with no transfer of a copy, is not conveying.\\n+\\n+ An interactive user interface displays \\\"Appropriate Legal Notices\\\"\\n+to the extent that it includes a convenient and prominently visible\\n+feature that (1) displays an appropriate copyright notice, and (2)\\n+tells the user that there is no warranty for the work (except to the\\n+extent that warranties are provided), that licensees may convey the\\n+work under this License, and how to view a copy of this License. If\\n+the interface presents a list of user commands or options, such as a\\n+menu, a prominent item in the list meets this criterion.\\n+\\n+ 1. Source Code.\\n+\\n+ The \\\"source code\\\" for a work means the preferred form of the work\\n+for making modifications to it. \\\"Object code\\\" means any non-source\\n+form of a work.\\n+\\n+ A \\\"Standard Interface\\\" means an interface that either is an official\\n+standard defined by a recognized standards body, or, in the case of\\n+interfaces specified for a particular programming language, one that\\n+is widely used among developers working in that language.\\n+\\n+ The \\\"System Libraries\\\" of an executable work include anything, other\\n+than the work as a whole, that (a) is included in the normal form of\\n+packaging a Major Component, but which is not part of that Major\\n+Component, and (b) serves only to enable use of the work with that\\n+Major Component, or to implement a Standard Interface for which an\\n+implementation is available to the public in source code form. A\\n+\\\"Major Component\\\", in this context, means a major essential component\\n+(kernel, window system, and so on) of the specific operating system\\n+(if any) on which the executable work runs, or a compiler used to\\n+produce the work, or an object code interpreter used to run it.\\n+\\n+ The \\\"Corresponding Source\\\" for a work in object code form means all\\n+the source code needed to generate, install, and (for an executable\\n+work) run the object code and to modify the work, including scripts to\\n+control those activities. However, it does not include the work's\\n+System Libraries, or general-purpose tools or generally available free\\n+programs which are used unmodified in performing those activities but\\n+which are not part of the work. For example, Corresponding Source\\n+includes interface definition files associated with source files for\\n+the work, and the source code for shared libraries and dynamically\\n+linked subprograms that the work is specifically designed to require,\\n+such as by intimate data communication or control flow between those\\n+subprograms and other parts of the work.\\n+\\n+ The Corresponding Source need not include anything that users\\n+can regenerate automatically from other parts of the Corresponding\\n+Source.\\n+\\n+ The Corresponding Source for a work in source code form is that\\n+same work.\\n+\\n+ 2. Basic Permissions.\\n+\\n+ All rights granted under this License are granted for the term of\\n+copyright on the Program, and are irrevocable provided the stated\\n+conditions are met. This License explicitly affirms your unlimited\\n+permission to run the unmodified Program. The output from running a\\n+covered work is covered by this License only if the output, given its\\n+content, constitutes a covered work. This License acknowledges your\\n+rights of fair use or other equivalent, as provided by copyright law.\\n+\\n+ You may make, run and propagate covered works that you do not\\n+convey, without conditions so long as your license otherwise remains\\n+in force. You may convey covered works to others for the sole purpose\\n+of having them make modifications exclusively for you, or provide you\\n+with facilities for running those works, provided that you comply with\\n+the terms of this License in conveying all material for which you do\\n+not control copyright. Those thus making or running the covered works\\n+for you must do so exclusively on your behalf, under your direction\\n+and control, on terms that prohibit them from making any copies of\\n+your copyrighted material outside their relationship with you.\\n+\\n+ Conveying under any other circumstances is permitted solely under\\n+the conditions stated below. Sublicensing is not allowed; section 10\\n+makes it unnecessary.\\n+\\n+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\\n+\\n+ No covered work shall be deemed part of an effective technological\\n+measure under any applicable law fulfilling obligations under article\\n+11 of the WIPO copyright treaty adopted on 20 December 1996, or\\n+similar laws prohibiting or restricting circumvention of such\\n+measures.\\n+\\n+ When you convey a covered work, you waive any legal power to forbid\\n+circumvention of technological measures to the extent such circumvention\\n+is effected by exercising rights under this License with respect to\\n+the covered work, and you disclaim any intention to limit operation or\\n+modification of the work as a means of enforcing, against the work's\\n+users, your or third parties' legal rights to forbid circumvention of\\n+technological measures.\\n+\\n+ 4. Conveying Verbatim Copies.\\n+\\n+ You may convey verbatim copies of the Program's source code as you\\n+receive it, in any medium, provided that you conspicuously and\\n+appropriately publish on each copy an appropriate copyright notice;\\n+keep intact all notices stating that this License and any\\n+non-permissive terms added in accord with section 7 apply to the code;\\n+keep intact all notices of the absence of any warranty; and give all\\n+recipients a copy of this License along with the Program.\\n+\\n+ You may charge any price or no price for each copy that you convey,\\n+and you may offer support or warranty protection for a fee.\\n+\\n+ 5. Conveying Modified Source Versions.\\n+\\n+ You may convey a work based on the Program, or the modifications to\\n+produce it from the Program, in the form of source code under the\\n+terms of section 4, provided that you also meet all of these conditions:\\n+\\n+ a) The work must carry prominent notices stating that you modified\\n+ it, and giving a relevant date.\\n+\\n+ b) The work must carry prominent notices stating that it is\\n+ released under this License and any conditions added under section\\n+ 7. This requirement modifies the requirement in section 4 to\\n+ \\\"keep intact all notices\\\".\\n+\\n+ c) You must license the entire work, as a whole, under this\\n+ License to anyone who comes into possession of a copy. This\\n+ License will therefore apply, along with any applicable section 7\\n+ additional terms, to the whole of the work, and all its parts,\\n+ regardless of how they are packaged. This License gives no\\n+ permission to license the work in any other way, but it does not\\n+ invalidate such permission if you have separately received it.\\n+\\n+ d) If the work has interactive user interfaces, each must display\\n+ Appropriate Legal Notices; however, if the Program has interactive\\n+ interfaces that do not display Appropriate Legal Notices, your\\n+ work need not make them do so.\\n+\\n+ A compilation of a covered work with other separate and independent\\n+works, which are not by their nature extensions of the covered work,\\n+and which are not combined with it such as to form a larger program,\\n+in or on a volume of a storage or distribution medium, is called an\\n+\\\"aggregate\\\" if the compilation and its resulting copyright are not\\n+used to limit the access or legal rights of the compilation's users\\n+beyond what the individual works permit. Inclusion of a covered work\\n+in an aggregate does not cause this License to apply to the other\\n+parts of the aggregate.\\n+\\n+ 6. Conveying Non-Source Forms.\\n+\\n+ You may convey a covered work in object code form under the terms\\n+of sections 4 and 5, provided that you also convey the\\n+machine-readable Corresponding Source under the terms of this License,\\n+in one of these ways:\\n+\\n+ a) Convey the object code in, or embodied in, a physical product\\n+ (including a physical distribution medium), accompanied by the\\n+ Corresponding Source fixed on a durable physical medium\\n+ customarily used for software interchange.\\n+\\n+ b) Convey the object code in, or embodied in, a physical product\\n+ (including a physical distribution medium), accompanied by a\\n+ written offer, valid for at least three years and valid for as\\n+ long as you offer spare parts or customer support for that product\\n+ model, to give anyone who possesses the object code either (1) a\\n+ copy of the Corresponding Source for all the software in the\\n+ product that is covered by this License, on a durable physical\\n+ medium customarily used for software interchange, for a price no\\n+ more than your reasonable cost of physically performing this\\n+ conveying of source, or (2) access to copy the\\n+ Corresponding Source from a network server at no charge.\\n+\\n+ c) Convey individual copies of the object code with a copy of the\\n+ written offer to provide the Corresponding Source. This\\n+ alternative is allowed only occasionally and noncommercially, and\\n+ only if you received the object code with such an offer, in accord\\n+ with subsection 6b.\\n+\\n+ d) Convey the object code by offering access from a designated\\n+ place (gratis or for a charge), and offer equivalent access to the\\n+ Corresponding Source in the same way through the same place at no\\n+ further charge. You need not require recipients to copy the\\n+ Corresponding Source along with the object code. If the place to\\n+ copy the object code is a network server, the Corresponding Source\\n+ may be on a different server (operated by you or a third party)\\n+ that supports equivalent copying facilities, provided you maintain\\n+ clear directions next to the object code saying where to find the\\n+ Corresponding Source. Regardless of what server hosts the\\n+ Corresponding Source, you remain obligated to ensure that it is\\n+ available for as long as needed to satisfy these requirements.\\n+\\n+ e) Convey the object code using peer-to-peer transmission, provided\\n+ you inform other peers where the object code and Corresponding\\n+ Source of the work are being offered to the general public at no\\n+ charge under subsection 6d.\\n+\\n+ A separable portion of the object code, whose source code is excluded\\n+from the Corresponding Source as a System Library, need not be\\n+included in conveying the object code work.\\n+\\n+ A \\\"User Product\\\" is either (1) a \\\"consumer product\\\", which means any\\n+tangible personal property which is normally used for personal, family,\\n+or household purposes, or (2) anything designed or sold for incorporation\\n+into a dwelling. In determining whether a product is a consumer product,\\n+doubtful cases shall be resolved in favor of coverage. For a particular\\n+product received by a particular user, \\\"normally used\\\" refers to a\\n+typical or common use of that class of product, regardless of the status\\n+of the particular user or of the way in which the particular user\\n+actually uses, or expects or is expected to use, the product. A product\\n+is a consumer product regardless of whether the product has substantial\\n+commercial, industrial or non-consumer uses, unless such uses represent\\n+the only significant mode of use of the product.\\n+\\n+ \\\"Installation Information\\\" for a User Product means any methods,\\n+procedures, authorization keys, or other information required to install\\n+and execute modified versions of a covered work in that User Product from\\n+a modified version of its Corresponding Source. The information must\\n+suffice to ensure that the continued functioning of the modified object\\n+code is in no case prevented or interfered with solely because\\n+modification has been made.\\n+\\n+ If you convey an object code work under this section in, or with, or\\n+specifically for use in, a User Product, and the conveying occurs as\\n+part of a transaction in which the right of possession and use of the\\n+User Product is transferred to the recipient in perpetuity or for a\\n+fixed term (regardless of how the transaction is characterized), the\\n+Corresponding Source conveyed under this section must be accompanied\\n+by the Installation Information. But this requirement does not apply\\n+if neither you nor any third party retains the ability to install\\n+modified object code on the User Product (for example, the work has\\n+been installed in ROM).\\n+\\n+ The requirement to provide Installation Information does not include a\\n+requirement to continue to provide support service, warranty, or updates\\n+for a work that has been modified or installed by the recipient, or for\\n+the User Product in which it has been modified or installed. Access to a\\n+network may be denied when the modification itself materially and\\n+adversely affects the operation of the network or violates the rules and\\n+protocols for communication across the network.\\n+\\n+ Corresponding Source conveyed, and Installation Information provided,\\n+in accord with this section must be in a format that is publicly\\n+documented (and with an implementation available to the public in\\n+source code form), and must require no special password or key for\\n+unpacking, reading or copying.\\n+\\n+ 7. Additional Terms.\\n+\\n+ \\\"Additional permissions\\\" are terms that supplement the terms of this\\n+License by making exceptions from one or more of its conditions.\\n+Additional permissions that are applicable to the entire Program shall\\n+be treated as though they were included in this License, to the extent\\n+that they are valid under applicable law. If additional permissions\\n+apply only to part of the Program, that part may be used separately\\n+under those permissions, but the entire Program remains governed by\\n+this License without regard to the additional permissions.\\n+\\n+ When you convey a copy of a covered work, you may at your option\\n+remove any additional permissions from that copy, or from any part of\\n+it. (Additional permissions may be written to require their own\\n+removal in certain cases when you modify the work.) You may place\\n+additional permissions on material, added by you to a covered work,\\n+for which you have or can give appropriate copyright permission.\\n+\\n+ Notwithstanding any other provision of this License, for material you\\n+add to a covered work, you may (if authorized by the copyright holders of\\n+that material) supplement the terms of this License with terms:\\n+\\n+ a) Disclaiming warranty or limiting liability differently from the\\n+ terms of sections 15 and 16 of this License; or\\n+\\n+ b) Requiring preservation of specified reasonable legal notices or\\n+ author attributions in that material or in the Appropriate Legal\\n+ Notices displayed by works containing it; or\\n+\\n+ c) Prohibiting misrepresentation of the origin of that material, or\\n+ requiring that modified versions of such material be marked in\\n+ reasonable ways as different from the original version; or\\n+\\n+ d) Limiting the use for publicity purposes of names of licensors or\\n+ authors of the material; or\\n+\\n+ e) Declining to grant rights under trademark law for use of some\\n+ trade names, trademarks, or service marks; or\\n+\\n+ f) Requiring indemnification of licensors and authors of that\\n+ material by anyone who conveys the material (or modified versions of\\n+ it) with contractual assumptions of liability to the recipient, for\\n+ any liability that these contractual assumptions directly impose on\\n+ those licensors and authors.\\n+\\n+ All other non-permissive additional terms are considered \\\"further\\n+restrictions\\\" within the meaning of section 10. If the Program as you\\n+received it, or any part of it, contains a notice stating that it is\\n+governed by this License along with a term that is a further\\n+restriction, you may remove that term. If a license document contains\\n+a further restriction but permits relicensing or conveying under this\\n+License, you may add to a covered work material governed by the terms\\n+of that license document, provided that the further restriction does\\n+not survive such relicensing or conveying.\\n+\\n+ If you add terms to a covered work in accord with this section, you\\n+must place, in the relevant source files, a statement of the\\n+additional terms that apply to those files, or a notice indicating\\n+where to find the applicable terms.\\n+\\n+ Additional terms, permissive or non-permissive, may be stated in the\\n+form of a separately written license, or stated as exceptions;\\n+the above requirements apply either way.\\n+\\n+ 8. Termination.\\n+\\n+ You may not propagate or modify a covered work except as expressly\\n+provided under this License. Any attempt otherwise to propagate or\\n+modify it is void, and will automatically terminate your rights under\\n+this License (including any patent licenses granted under the third\\n+paragraph of section 11).\\n+\\n+ However, if you cease all violation of this License, then your\\n+license from a particular copyright holder is reinstated (a)\\n+provisionally, unless and until the copyright holder explicitly and\\n+finally terminates your license, and (b) permanently, if the copyright\\n+holder fails to notify you of the violation by some reasonable means\\n+prior to 60 days after the cessation.\\n+\\n+ Moreover, your license from a particular copyright holder is\\n+reinstated permanently if the copyright holder notifies you of the\\n+violation by some reasonable means, this is the first time you have\\n+received notice of violation of this License (for any work) from that\\n+copyright holder, and you cure the violation prior to 30 days after\\n+your receipt of the notice.\\n+\\n+ Termination of your rights under this section does not terminate the\\n+licenses of parties who have received copies or rights from you under\\n+this License. If your rights have been terminated and not permanently\\n+reinstated, you do not qualify to receive new licenses for the same\\n+material under section 10.\\n+\\n+ 9. Acceptance Not Required for Having Copies.\\n+\\n+ You are not required to accept this License in order to receive or\\n+run a copy of the Program. Ancillary propagation of a covered work\\n+occurring solely as a consequence of using peer-to-peer transmission\\n+to receive a copy likewise does not require acceptance. However,\\n+nothing other than this License grants you permission to propagate or\\n+modify any covered work. These actions infringe copyright if you do\\n+not accept this License. Therefore, by modifying or propagating a\\n+covered work, you indicate your acceptance of this License to do so.\\n+\\n+ 10. Automatic Licensing of Downstream Recipients.\\n+\\n+ Each time you convey a covered work, the recipient automatically\\n+receives a license from the original licensors, to run, modify and\\n+propagate that work, subject to this License. You are not responsible\\n+for enforcing compliance by third parties with this License.\\n+\\n+ An \\\"entity transaction\\\" is a transaction transferring control of an\\n+organization, or substantially all assets of one, or subdividing an\\n+organization, or merging organizations. If propagation of a covered\\n+work results from an entity transaction, each party to that\\n+transaction who receives a copy of the work also receives whatever\\n+licenses to the work the party's predecessor in interest had or could\\n+give under the previous paragraph, plus a right to possession of the\\n+Corresponding Source of the work from the predecessor in interest, if\\n+the predecessor has it or can get it with reasonable efforts.\\n+\\n+ You may not impose any further restrictions on the exercise of the\\n+rights granted or affirmed under this License. For example, you may\\n+not impose a license fee, royalty, or other charge for exercise of\\n+rights granted under this License, and you may not initiate litigation\\n+(including a cross-claim or counterclaim in a lawsuit) alleging that\\n+any patent claim is infringed by making, using, selling, offering for\\n+sale, or importing the Program or any portion of it.\\n+\\n+ 11. Patents.\\n+\\n+ A \\\"contributor\\\" is a copyright holder who authorizes use under this\\n+License of the Program or a work on which the Program is based. The\\n+work thus licensed is called the contributor's \\\"contributor version\\\".\\n+\\n+ A contributor's \\\"essential patent claims\\\" are all patent claims\\n+owned or controlled by the contributor, whether already acquired or\\n+hereafter acquired, that would be infringed by some manner, permitted\\n+by this License, of making, using, or selling its contributor version,\\n+but do not include claims that would be infringed only as a\\n+consequence of further modification of the contributor version. For\\n+purposes of this definition, \\\"control\\\" includes the right to grant\\n+patent sublicenses in a manner consistent with the requirements of\\n+this License.\\n+\\n+ Each contributor grants you a non-exclusive, worldwide, royalty-free\\n+patent license under the contributor's essential patent claims, to\\n+make, use, sell, offer for sale, import and otherwise run, modify and\\n+propagate the contents of its contributor version.\\n+\\n+ In the following three paragraphs, a \\\"patent license\\\" is any express\\n+agreement or commitment, however denominated, not to enforce a patent\\n+(such as an express permission to practice a patent or covenant not to\\n+sue for patent infringement). To \\\"grant\\\" such a patent license to a\\n+party means to make such an agreement or commitment not to enforce a\\n+patent against the party.\\n+\\n+ If you convey a covered work, knowingly relying on a patent license,\\n+and the Corresponding Source of the work is not available for anyone\\n+to copy, free of charge and under the terms of this License, through a\\n+publicly available network server or other readily accessible means,\\n+then you must either (1) cause the Corresponding Source to be so\\n+available, or (2) arrange to deprive yourself of the benefit of the\\n+patent license for this particular work, or (3) arrange, in a manner\\n+consistent with the requirements of this License, to extend the patent\\n+license to downstream recipients. \\\"Knowingly relying\\\" means you have\\n+actual knowledge that, but for the patent license, your conveying the\\n+covered work in a country, or your recipient's use of the covered work\\n+in a country, would infringe one or more identifiable patents in that\\n+country that you have reason to believe are valid.\\n+\\n+ If, pursuant to or in connection with a single transaction or\\n+arrangement, you convey, or propagate by procuring conveyance of, a\\n+covered work, and grant a patent license to some of the parties\\n+receiving the covered work authorizing them to use, propagate, modify\\n+or convey a specific copy of the covered work, then the patent license\\n+you grant is automatically extended to all recipients of the covered\\n+work and works based on it.\\n+\\n+ A patent license is \\\"discriminatory\\\" if it does not include within\\n+the scope of its coverage, prohibits the exercise of, or is\\n+conditioned on the non-exercise of one or more of the rights that are\\n+specifically granted under this License. You may not convey a covered\\n+work if you are a party to an arrangement with a third party that is\\n+in the business of distributing software, under which you make payment\\n+to the third party based on the extent of your activity of conveying\\n+the work, and under which the third party grants, to any of the\\n+parties who would receive the covered work from you, a discriminatory\\n+patent license (a) in connection with copies of the covered work\\n+conveyed by you (or copies made from those copies), or (b) primarily\\n+for and in connection with specific products or compilations that\\n+contain the covered work, unless you entered into that arrangement,\\n+or that patent license was granted, prior to 28 March 2007.\\n+\\n+ Nothing in this License shall be construed as excluding or limiting\\n+any implied license or other defenses to infringement that may\\n+otherwise be available to you under applicable patent law.\\n+\\n+ 12. No Surrender of Others' Freedom.\\n+\\n+ If conditions are imposed on you (whether by court order, agreement or\\n+otherwise) that contradict the conditions of this License, they do not\\n+excuse you from the conditions of this License. If you cannot convey a\\n+covered work so as to satisfy simultaneously your obligations under this\\n+License and any other pertinent obligations, then as a consequence you may\\n+not convey it at all. For example, if you agree to terms that obligate you\\n+to collect a royalty for further conveying from those to whom you convey\\n+the Program, the only way you could satisfy both those terms and this\\n+License would be to refrain entirely from conveying the Program.\\n+\\n+ 13. Use with the GNU Affero General Public License.\\n+\\n+ Notwithstanding any other provision of this License, you have\\n+permission to link or combine any covered work with a work licensed\\n+under version 3 of the GNU Affero General Public License into a single\\n+combined work, and to convey the resulting work. The terms of this\\n+License will continue to apply to the part which is the covered work,\\n+but the special requirements of the GNU Affero General Public License,\\n+section 13, concerning interaction through a network will apply to the\\n+combination as such.\\n+\\n+ 14. Revised Versions of this License.\\n+\\n+ The Free Software Foundation may publish revised and/or new versions of\\n+the GNU General Public License from time to time. Such new versions will\\n+be similar in spirit to the present version, but may differ in detail to\\n+address new problems or concerns.\\n+\\n+ Each version is given a distinguishing version number. If the\\n+Program specifies that a certain numbered version of the GNU General\\n+Public License \\\"or any later version\\\" applies to it, you have the\\n+option of following the terms and conditions either of that numbered\\n+version or of any later version published by the Free Software\\n+Foundation. If the Program does not specify a version number of the\\n+GNU General Public License, you may choose any version ever published\\n+by the Free Software Foundation.\\n+\\n+ If the Program specifies that a proxy can decide which future\\n+versions of the GNU General Public License can be used, that proxy's\\n+public statement of acceptance of a version permanently authorizes you\\n+to choose that version for the Program.\\n+\\n+ Later license versions may give you additional or different\\n+permissions. However, no additional obligations are imposed on any\\n+author or copyright holder as a result of your choosing to follow a\\n+later version.\\n+\\n+ 15. Disclaimer of Warranty.\\n+\\n+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\\n+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\\n+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \\\"AS IS\\\" WITHOUT WARRANTY\\n+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\\n+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\\n+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\\n+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\\n+\\n+ 16. Limitation of Liability.\\n+\\n+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\\n+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\\n+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\\n+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\\n+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\\n+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\\n+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\\n+SUCH DAMAGES.\\n+\\n+ 17. Interpretation of Sections 15 and 16.\\n+\\n+ If the disclaimer of warranty and limitation of liability provided\\n+above cannot be given local legal effect according to their terms,\\n+reviewing courts shall apply local law that most closely approximates\\n+an absolute waiver of all civil liability in connection with the\\n+Program, unless a warranty or assumption of liability accompanies a\\n+copy of the Program in return for a fee.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\n+ How to Apply These Terms to Your New Programs\\n+\\n+ If you develop a new program, and you want it to be of the greatest\\n+possible use to the public, the best way to achieve this is to make it\\n+free software which everyone can redistribute and change under these terms.\\n+\\n+ To do so, attach the following notices to the program. It is safest\\n+to attach them to the start of each source file to most effectively\\n+state the exclusion of warranty; and each file should have at least\\n+the \\\"copyright\\\" line and a pointer to where the full notice is found.\\n+\\n+ <one line to give the program's name and a brief idea of what it does.>\\n+ Copyright (C) <year> <name of author>\\n+\\n+ This program is free software: you can redistribute it and/or modify\\n+ it under the terms of the GNU General Public License as published by\\n+ the Free Software Foundation, either version 3 of the License, or\\n+ (at your option) any later version.\\n+\\n+ This program is distributed in the hope that it will be useful,\\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\\n+ GNU General Public License for more details.\\n+\\n+ You should have received a copy of the GNU General Public License\\n+ along with this program. If not, see <http://www.gnu.org/licenses/>.\\n+\\n+Also add information on how to contact you by electronic and paper mail.\\n+\\n+ If the program does terminal interaction, make it output a short\\n+notice like this when it starts in an interactive mode:\\n+\\n+ <program> Copyright (C) <year> <name of author>\\n+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\\n+ This is free software, and you are welcome to redistribute it\\n+ under certain conditions; type `show c' for details.\\n+\\n+The hypothetical commands `show w' and `show c' should show the appropriate\\n+parts of the General Public License. Of course, your program's commands\\n+might be different; for a GUI interface, you would use an \\\"about box\\\".\\n+\\n+ You should also get your employer (if you work as a programmer) or school,\\n+if any, to sign a \\\"copyright disclaimer\\\" for the program, if necessary.\\n+For more information on this, and how to apply and follow the GNU GPL, see\\n+<http://www.gnu.org/licenses/>.\\n+\\n+ The GNU General Public License does not permit incorporating your program\\n+into proprietary programs. If your program is a subroutine library, you\\n+may consider it more useful to permit linking proprietary applications with\\n+the library. If this is what you want to do, use the GNU Lesser General\\n+Public License instead of this License. But first, please read\\n+<http://www.gnu.org/philosophy/why-not-lgpl.html>.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libstdc++ | GPL-3.0-with-GCC-exception\\n+Note: Only included in Linux builds\\n+URL: https://gcc.gnu.org/onlinedocs/libstdc++/\\n+--------------------------------------------------------------------------------\\n+GCC RUNTIME LIBRARY EXCEPTION\\n+\\n+Version 3.1, 31 March 2009\\n+\\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\\n+\\n+Everyone is permitted to copy and distribute verbatim copies of this\\n+license document, but changing it is not allowed.\\n+\\n+This GCC Runtime Library Exception (\\\"Exception\\\") is an additional\\n+permission under section 7 of the GNU General Public License, version\\n+3 (\\\"GPLv3\\\"). It applies to a given file (the \\\"Runtime Library\\\") that\\n+bears a notice placed by the copyright holder of the file stating that\\n+the file is governed by GPLv3 along with this Exception.\\n+\\n+When you use GCC to compile a program, GCC may combine portions of\\n+certain GCC header files and runtime libraries with the compiled\\n+program. The purpose of this Exception is to allow compilation of\\n+non-GPL (including proprietary) programs to use, in this way, the\\n+header files and runtime libraries covered by this Exception.\\n+\\n+0. Definitions.\\n+\\n+A file is an \\\"Independent Module\\\" if it either requires the Runtime\\n+Library for execution after a Compilation Process, or makes use of an\\n+interface provided by the Runtime Library, but is not otherwise based\\n+on the Runtime Library.\\n+\\n+\\\"GCC\\\" means a version of the GNU Compiler Collection, with or without\\n+modifications, governed by version 3 (or a specified later version) of\\n+the GNU General Public License (GPL) with the option of using any\\n+subsequent versions published by the FSF.\\n+\\n+\\\"GPL-compatible Software\\\" is software whose conditions of propagation,\\n+modification and use would permit combination with GCC in accord with\\n+the license of GCC.\\n+\\n+\\\"Target Code\\\" refers to output from any compiler for a real or virtual\\n+target processor architecture, in executable form or suitable for\\n+input to an assembler, loader, linker and/or execution\\n+phase. Notwithstanding that, Target Code does not include data in any\\n+format that is used as a compiler intermediate representation, or used\\n+for producing a compiler intermediate representation.\\n+\\n+The \\\"Compilation Process\\\" transforms code entirely represented in\\n+non-intermediate languages designed for human-written code, and/or in\\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\\n+use of source code generators and preprocessors need not be considered\\n+part of the Compilation Process, since the Compilation Process can be\\n+understood as starting with the output of the generators or\\n+preprocessors.\\n+\\n+A Compilation Process is \\\"Eligible\\\" if it is done using GCC, alone or\\n+with other GPL-compatible software, or if it is done without using any\\n+work based on GCC. For example, using non-GPL-compatible Software to\\n+optimize any GCC intermediate representations would not qualify as an\\n+Eligible Compilation Process.\\n+\\n+1. Grant of Additional Permission.\\n+\\n+You have permission to propagate a work of Target Code formed by\\n+combining the Runtime Library with Independent Modules, even if such\\n+propagation would otherwise violate the terms of GPLv3, provided that\\n+all Target Code was generated by Eligible Compilation Processes. You\\n+may then convey such a combination under terms of your choice,\\n+consistent with the licensing of the Independent Modules.\\n+\\n+2. No Weakening of GCC Copyleft.\\n+\\n+The availability of this Exception does not imply any general\\n+presumption that third-party software is unaffected by the copyleft\\n+requirements of the license of GCC.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libgcc | GPL-3.0-with-GCC-exception\\n+Note: Only included in Linux builds\\n+URL: https://gcc.gnu.org/\\n+--------------------------------------------------------------------------------\\n+GCC RUNTIME LIBRARY EXCEPTION\\n+\\n+Version 3.1, 31 March 2009\\n+\\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\\n+\\n+Everyone is permitted to copy and distribute verbatim copies of this\\n+license document, but changing it is not allowed.\\n+\\n+This GCC Runtime Library Exception (\\\"Exception\\\") is an additional\\n+permission under section 7 of the GNU General Public License, version\\n+3 (\\\"GPLv3\\\"). It applies to a given file (the \\\"Runtime Library\\\") that\\n+bears a notice placed by the copyright holder of the file stating that\\n+the file is governed by GPLv3 along with this Exception.\\n+\\n+When you use GCC to compile a program, GCC may combine portions of\\n+certain GCC header files and runtime libraries with the compiled\\n+program. The purpose of this Exception is to allow compilation of\\n+non-GPL (including proprietary) programs to use, in this way, the\\n+header files and runtime libraries covered by this Exception.\\n+\\n+0. Definitions.\\n+\\n+A file is an \\\"Independent Module\\\" if it either requires the Runtime\\n+Library for execution after a Compilation Process, or makes use of an\\n+interface provided by the Runtime Library, but is not otherwise based\\n+on the Runtime Library.\\n+\\n+\\\"GCC\\\" means a version of the GNU Compiler Collection, with or without\\n+modifications, governed by version 3 (or a specified later version) of\\n+the GNU General Public License (GPL) with the option of using any\\n+subsequent versions published by the FSF.\\n+\\n+\\\"GPL-compatible Software\\\" is software whose conditions of propagation,\\n+modification and use would permit combination with GCC in accord with\\n+the license of GCC.\\n+\\n+\\\"Target Code\\\" refers to output from any compiler for a real or virtual\\n+target processor architecture, in executable form or suitable for\\n+input to an assembler, loader, linker and/or execution\\n+phase. Notwithstanding that, Target Code does not include data in any\\n+format that is used as a compiler intermediate representation, or used\\n+for producing a compiler intermediate representation.\\n+\\n+The \\\"Compilation Process\\\" transforms code entirely represented in\\n+non-intermediate languages designed for human-written code, and/or in\\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\\n+use of source code generators and preprocessors need not be considered\\n+part of the Compilation Process, since the Compilation Process can be\\n+understood as starting with the output of the generators or\\n+preprocessors.\\n+\\n+A Compilation Process is \\\"Eligible\\\" if it is done using GCC, alone or\\n+with other GPL-compatible software, or if it is done without using any\\n+work based on GCC. For example, using non-GPL-compatible Software to\\n+optimize any GCC intermediate representations would not qualify as an\\n+Eligible Compilation Process.\\n+\\n+1. Grant of Additional Permission.\\n+\\n+You have permission to propagate a work of Target Code formed by\\n+combining the Runtime Library with Independent Modules, even if such\\n+propagation would otherwise violate the terms of GPLv3, provided that\\n+all Target Code was generated by Eligible Compilation Processes. You\\n+may then convey such a combination under terms of your choice,\\n+consistent with the licensing of the Independent Modules.\\n+\\n+2. No Weakening of GCC Copyleft.\\n+\\n+The availability of this Exception does not imply any general\\n+presumption that third-party software is unaffected by the copyleft\\n+requirements of the license of GCC.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libuuid | BSD-3-Clause\\n+Note: Only included in Linux builds\\n+URL: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid\\n+--------------------------------------------------------------------------------\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions\\n+are met:\\n+1. Redistributions of source code must retain the above copyright\\n+ notice, and the entire permission notice in its entirety,\\n+ including the disclaimer of warranties.\\n+2. Redistributions in binary form must reproduce the above copyright\\n+ notice, this list of conditions and the following disclaimer in the\\n+ documentation and/or other materials provided with the distribution.\\n+3. The name of the author may not be used to endorse or promote\\n+ products derived from this software without specific prior\\n+ written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED\\n+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\\n+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF\\n+WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE\\n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\\n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\\n+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\\n+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\\n+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH\\n+DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libintl | LGPL-2.1-or-later\\n+Note: Only included in macOS builds\\n+URL: https://www.gnu.org/software/gettext/\\n+--------------------------------------------------------------------------------\\n+ GNU LESSER GENERAL PUBLIC LICENSE\\n+ Version 2.1, February 1999\\n+\\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\\n+ <https://fsf.org/>\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+[This is the first released version of the Lesser GPL. It also counts\\n+ as the successor of the GNU Library Public License, version 2, hence\\n+ the version number 2.1.]\\n+\\n+ Preamble\\n+\\n+ The licenses for most software are designed to take away your\\n+freedom to share and change it. By contrast, the GNU General Public\\n+Licenses are intended to guarantee your freedom to share and change\\n+free software--to make sure the software is free for all its users.\\n+\\n+ This license, the Lesser General Public License, applies to some\\n+specially designated software packages--typically libraries--of the\\n+Free Software Foundation and other authors who decide to use it. You\\n+can use it too, but we suggest you first think carefully about whether\\n+this license or the ordinary General Public License is the better\\n+strategy to use in any particular case, based on the explanations below.\\n+\\n+ When we speak of free software, we are referring to freedom of use,\\n+not price. Our General Public Licenses are designed to make sure that\\n+you have the freedom to distribute copies of free software (and charge\\n+for this service if you wish); that you receive source code or can get\\n+it if you want it; that you can change the software and use pieces of\\n+it in new free programs; and that you are informed that you can do\\n+these things.\\n+\\n+ To protect your rights, we need to make restrictions that forbid\\n+distributors to deny you these rights or to ask you to surrender these\\n+rights. These restrictions translate to certain responsibilities for\\n+you if you distribute copies of the library or if you modify it.\\n+\\n+ For example, if you distribute copies of the library, whether gratis\\n+or for a fee, you must give the recipients all the rights that we gave\\n+you. You must make sure that they, too, receive or can get the source\\n+code. If you link other code with the library, you must provide\\n+complete object files to the recipients, so that they can relink them\\n+with the library after making changes to the library and recompiling\\n+it. And you must show them these terms so they know their rights.\\n+\\n+ We protect your rights with a two-step method: (1) we copyright the\\n+library, and (2) we offer you this license, which gives you legal\\n+permission to copy, distribute and/or modify the library.\\n+\\n+ To protect each distributor, we want to make it very clear that\\n+there is no warranty for the free library. Also, if the library is\\n+modified by someone else and passed on, the recipients should know\\n+that what they have is not the original version, so that the original\\n+author's reputation will not be affected by problems that might be\\n+introduced by others.\\n+\\f\\n+ Finally, software patents pose a constant threat to the existence of\\n+any free program. We wish to make sure that a company cannot\\n+effectively restrict the users of a free program by obtaining a\\n+restrictive license from a patent holder. Therefore, we insist that\\n+any patent license obtained for a version of the library must be\\n+consistent with the full freedom of use specified in this license.\\n+\\n+ Most GNU software, including some libraries, is covered by the\\n+ordinary GNU General Public License. This license, the GNU Lesser\\n+General Public License, applies to certain designated libraries, and\\n+is quite different from the ordinary General Public License. We use\\n+this license for certain libraries in order to permit linking those\\n+libraries into non-free programs.\\n+\\n+ When a program is linked with a library, whether statically or using\\n+a shared library, the combination of the two is legally speaking a\\n+combined work, a derivative of the original library. The ordinary\\n+General Public License therefore permits such linking only if the\\n+entire combination fits its criteria of freedom. The Lesser General\\n+Public License permits more lax criteria for linking other code with\\n+the library.\\n+\\n+ We call this license the \\\"Lesser\\\" General Public License because it\\n+does Less to protect the user's freedom than the ordinary General\\n+Public License. It also provides other free software developers Less\\n+of an advantage over competing non-free programs. These disadvantages\\n+are the reason we use the ordinary General Public License for many\\n+libraries. However, the Lesser license provides advantages in certain\\n+special circumstances.\\n+\\n+ For example, on rare occasions, there may be a special need to\\n+encourage the widest possible use of a certain library, so that it becomes\\n+a de-facto standard. To achieve this, non-free programs must be\\n+allowed to use the library. A more frequent case is that a free\\n+library does the same job as widely used non-free libraries. In this\\n+case, there is little to gain by limiting the free library to free\\n+software only, so we use the Lesser General Public License.\\n+\\n+ In other cases, permission to use a particular library in non-free\\n+programs enables a greater number of people to use a large body of\\n+free software. For example, permission to use the GNU C Library in\\n+non-free programs enables many more people to use the whole GNU\\n+operating system, as well as its variant, the GNU/Linux operating\\n+system.\\n+\\n+ Although the Lesser General Public License is Less protective of the\\n+users' freedom, it does ensure that the user of a program that is\\n+linked with the Library has the freedom and the wherewithal to run\\n+that program using a modified version of the Library.\\n+\\n+ The precise terms and conditions for copying, distribution and\\n+modification follow. Pay close attention to the difference between a\\n+\\\"work based on the library\\\" and a \\\"work that uses the library\\\". The\\n+former contains code derived from the library, whereas the latter must\\n+be combined with the library in order to run.\\n+\\f\\n+ GNU LESSER GENERAL PUBLIC LICENSE\\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\\n+\\n+ 0. This License Agreement applies to any software library or other\\n+program which contains a notice placed by the copyright holder or\\n+other authorized party saying it may be distributed under the terms of\\n+this Lesser General Public License (also called \\\"this License\\\").\\n+Each licensee is addressed as \\\"you\\\".\\n+\\n+ A \\\"library\\\" means a collection of software functions and/or data\\n+prepared so as to be conveniently linked with application programs\\n+(which use some of those functions and data) to form executables.\\n+\\n+ The \\\"Library\\\", below, refers to any such software library or work\\n+which has been distributed under these terms. A \\\"work based on the\\n+Library\\\" means either the Library or any derivative work under\\n+copyright law: that is to say, a work containing the Library or a\\n+portion of it, either verbatim or with modifications and/or translated\\n+straightforwardly into another language. (Hereinafter, translation is\\n+included without limitation in the term \\\"modification\\\".)\\n+\\n+ \\\"Source code\\\" for a work means the preferred form of the work for\\n+making modifications to it. For a library, complete source code means\\n+all the source code for all modules it contains, plus any associated\\n+interface definition files, plus the scripts used to control compilation\\n+and installation of the library.\\n+\\n+ Activities other than copying, distribution and modification are not\\n+covered by this License; they are outside its scope. The act of\\n+running a program using the Library is not restricted, and output from\\n+such a program is covered only if its contents constitute a work based\\n+on the Library (independent of the use of the Library in a tool for\\n+writing it). Whether that is true depends on what the Library does\\n+and what the program that uses the Library does.\\n+\\n+ 1. You may copy and distribute verbatim copies of the Library's\\n+complete source code as you receive it, in any medium, provided that\\n+you conspicuously and appropriately publish on each copy an\\n+appropriate copyright notice and disclaimer of warranty; keep intact\\n+all the notices that refer to this License and to the absence of any\\n+warranty; and distribute a copy of this License along with the\\n+Library.\\n+\\n+ You may charge a fee for the physical act of transferring a copy,\\n+and you may at your option offer warranty protection in exchange for a\\n+fee.\\n+\\f\\n+ 2. You may modify your copy or copies of the Library or any portion\\n+of it, thus forming a work based on the Library, and copy and\\n+distribute such modifications or work under the terms of Section 1\\n+above, provided that you also meet all of these conditions:\\n+\\n+ a) The modified work must itself be a software library.\\n+\\n+ b) You must cause the files modified to carry prominent notices\\n+ stating that you changed the files and the date of any change.\\n+\\n+ c) You must cause the whole of the work to be licensed at no\\n+ charge to all third parties under the terms of this License.\\n+\\n+ d) If a facility in the modified Library refers to a function or a\\n+ table of data to be supplied by an application program that uses\\n+ the facility, other than as an argument passed when the facility\\n+ is invoked, then you must make a good faith effort to ensure that,\\n+ in the event an application does not supply such function or\\n+ table, the facility still operates, and performs whatever part of\\n+ its purpose remains meaningful.\\n+\\n+ (For example, a function in a library to compute square roots has\\n+ a purpose that is entirely well-defined independent of the\\n+ application. Therefore, Subsection 2d requires that any\\n+ application-supplied function or table used by this function must\\n+ be optional: if the application does not supply it, the square\\n+ root function must still compute square roots.)\\n+\\n+These requirements apply to the modified work as a whole. If\\n+identifiable sections of that work are not derived from the Library,\\n+and can be reasonably considered independent and separate works in\\n+themselves, then this License, and its terms, do not apply to those\\n+sections when you distribute them as separate works. But when you\\n+distribute the same sections as part of a whole which is a work based\\n+on the Library, the distribution of the whole must be on the terms of\\n+this License, whose permissions for other licensees extend to the\\n+entire whole, and thus to each and every part regardless of who wrote\\n+it.\\n+\\n+Thus, it is not the intent of this section to claim rights or contest\\n+your rights to work written entirely by you; rather, the intent is to\\n+exercise the right to control the distribution of derivative or\\n+collective works based on the Library.\\n+\\n+In addition, mere aggregation of another work not based on the Library\\n+with the Library (or with a work based on the Library) on a volume of\\n+a storage or distribution medium does not bring the other work under\\n+the scope of this License.\\n+\\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\\n+License instead of this License to a given copy of the Library. To do\\n+this, you must alter all the notices that refer to this License, so\\n+that they refer to the ordinary GNU General Public License, version 2,\\n+instead of to this License. (If a newer version than version 2 of the\\n+ordinary GNU General Public License has appeared, then you can specify\\n+that version instead if you wish.) Do not make any other change in\\n+these notices.\\n+\\f\\n+ Once this change is made in a given copy, it is irreversible for\\n+that copy, so the ordinary GNU General Public License applies to all\\n+subsequent copies and derivative works made from that copy.\\n+\\n+ This option is useful when you wish to copy part of the code of\\n+the Library into a program that is not a library.\\n+\\n+ 4. You may copy and distribute the Library (or a portion or\\n+derivative of it, under Section 2) in object code or executable form\\n+under the terms of Sections 1 and 2 above provided that you accompany\\n+it with the complete corresponding machine-readable source code, which\\n+must be distributed under the terms of Sections 1 and 2 above on a\\n+medium customarily used for software interchange.\\n+\\n+ If distribution of object code is made by offering access to copy\\n+from a designated place, then offering equivalent access to copy the\\n+source code from the same place satisfies the requirement to\\n+distribute the source code, even though third parties are not\\n+compelled to copy the source along with the object code.\\n+\\n+ 5. A program that contains no derivative of any portion of the\\n+Library, but is designed to work with the Library by being compiled or\\n+linked with it, is called a \\\"work that uses the Library\\\". Such a\\n+work, in isolation, is not a derivative work of the Library, and\\n+therefore falls outside the scope of this License.\\n+\\n+ However, linking a \\\"work that uses the Library\\\" with the Library\\n+creates an executable that is a derivative of the Library (because it\\n+contains portions of the Library), rather than a \\\"work that uses the\\n+library\\\". The executable is therefore covered by this License.\\n+Section 6 states terms for distribution of such executables.\\n+\\n+ When a \\\"work that uses the Library\\\" uses material from a header file\\n+that is part of the Library, the object code for the work may be a\\n+derivative work of the Library even though the source code is not.\\n+Whether this is true is especially significant if the work can be\\n+linked without the Library, or if the work is itself a library. The\\n+threshold for this to be true is not precisely defined by law.\\n+\\n+ If such an object file uses only numerical parameters, data\\n+structure layouts and accessors, and small macros and small inline\\n+functions (ten lines or less in length), then the use of the object\\n+file is unrestricted, regardless of whether it is legally a derivative\\n+work. (Executables containing this object code plus portions of the\\n+Library will still fall under Section 6.)\\n+\\n+ Otherwise, if the work is a derivative of the Library, you may\\n+distribute the object code for the work under the terms of Section 6.\\n+Any executables containing that work also fall under Section 6,\\n+whether or not they are linked directly with the Library itself.\\n+\\f\\n+ 6. As an exception to the Sections above, you may also combine or\\n+link a \\\"work that uses the Library\\\" with the Library to produce a\\n+work containing portions of the Library, and distribute that work\\n+under terms of your choice, provided that the terms permit\\n+modification of the work for the customer's own use and reverse\\n+engineering for debugging such modifications.\\n+\\n+ You must give prominent notice with each copy of the work that the\\n+Library is used in it and that the Library and its use are covered by\\n+this License. You must supply a copy of this License. If the work\\n+during execution displays copyright notices, you must include the\\n+copyright notice for the Library among them, as well as a reference\\n+directing the user to the copy of this License. Also, you must do one\\n+of these things:\\n+\\n+ a) Accompany the work with the complete corresponding\\n+ machine-readable source code for the Library including whatever\\n+ changes were used in the work (which must be distributed under\\n+ Sections 1 and 2 above); and, if the work is an executable linked\\n+ with the Library, with the complete machine-readable \\\"work that\\n+ uses the Library\\\", as object code and/or source code, so that the\\n+ user can modify the Library and then relink to produce a modified\\n+ executable containing the modified Library. (It is understood\\n+ that the user who changes the contents of definitions files in the\\n+ Library will not necessarily be able to recompile the application\\n+ to use the modified definitions.)\\n+\\n+ b) Use a suitable shared library mechanism for linking with the\\n+ Library. A suitable mechanism is one that (1) uses at run time a\\n+ copy of the library already present on the user's computer system,\\n+ rather than copying library functions into the executable, and (2)\\n+ will operate properly with a modified version of the library, if\\n+ the user installs one, as long as the modified version is\\n+ interface-compatible with the version that the work was made with.\\n+\\n+ c) Accompany the work with a written offer, valid for at\\n+ least three years, to give the same user the materials\\n+ specified in Subsection 6a, above, for a charge no more\\n+ than the cost of performing this distribution.\\n+\\n+ d) If distribution of the work is made by offering access to copy\\n+ from a designated place, offer equivalent access to copy the above\\n+ specified materials from the same place.\\n+\\n+ e) Verify that the user has already received a copy of these\\n+ materials or that you have already sent this user a copy.\\n+\\n+ For an executable, the required form of the \\\"work that uses the\\n+Library\\\" must include any data and utility programs needed for\\n+reproducing the executable from it. However, as a special exception,\\n+the materials to be distributed need not include anything that is\\n+normally distributed (in either source or binary form) with the major\\n+components (compiler, kernel, and so on) of the operating system on\\n+which the executable runs, unless that component itself accompanies\\n+the executable.\\n+\\n+ It may happen that this requirement contradicts the license\\n+restrictions of other proprietary libraries that do not normally\\n+accompany the operating system. Such a contradiction means you cannot\\n+use both them and the Library together in an executable that you\\n+distribute.\\n+\\f\\n+ 7. You may place library facilities that are a work based on the\\n+Library side-by-side in a single library together with other library\\n+facilities not covered by this License, and distribute such a combined\\n+library, provided that the separate distribution of the work based on\\n+the Library and of the other library facilities is otherwise\\n+permitted, and provided that you do these two things:\\n+\\n+ a) Accompany the combined library with a copy of the same work\\n+ based on the Library, uncombined with any other library\\n+ facilities. This must be distributed under the terms of the\\n+ Sections above.\\n+\\n+ b) Give prominent notice with the combined library of the fact\\n+ that part of it is a work based on the Library, and explaining\\n+ where to find the accompanying uncombined form of the same work.\\n+\\n+ 8. You may not copy, modify, sublicense, link with, or distribute\\n+the Library except as expressly provided under this License. Any\\n+attempt otherwise to copy, modify, sublicense, link with, or\\n+distribute the Library is void, and will automatically terminate your\\n+rights under this License. However, parties who have received copies,\\n+or rights, from you under this License will not have their licenses\\n+terminated so long as such parties remain in full compliance.\\n+\\n+ 9. You are not required to accept this License, since you have not\\n+signed it. However, nothing else grants you permission to modify or\\n+distribute the Library or its derivative works. These actions are\\n+prohibited by law if you do not accept this License. Therefore, by\\n+modifying or distributing the Library (or any work based on the\\n+Library), you indicate your acceptance of this License to do so, and\\n+all its terms and conditions for copying, distributing or modifying\\n+the Library or works based on it.\\n+\\n+ 10. Each time you redistribute the Library (or any work based on the\\n+Library), the recipient automatically receives a license from the\\n+original licensor to copy, distribute, link with or modify the Library\\n+subject to these terms and conditions. You may not impose any further\\n+restrictions on the recipients' exercise of the rights granted herein.\\n+You are not responsible for enforcing compliance by third parties with\\n+this License.\\n+\\f\\n+ 11. If, as a consequence of a court judgment or allegation of patent\\n+infringement or for any other reason (not limited to patent issues),\\n+conditions are imposed on you (whether by court order, agreement or\\n+otherwise) that contradict the conditions of this License, they do not\\n+excuse you from the conditions of this License. If you cannot\\n+distribute so as to satisfy simultaneously your obligations under this\\n+License and any other pertinent obligations, then as a consequence you\\n+may not distribute the Library at all. For example, if a patent\\n+license would not permit royalty-free redistribution of the Library by\\n+all those who receive copies directly or indirectly through you, then\\n+the only way you could satisfy both it and this License would be to\\n+refrain entirely from distribution of the Library.\\n+\\n+If any portion of this section is held invalid or unenforceable under any\\n+particular circumstance, the balance of the section is intended to apply,\\n+and the section as a whole is intended to apply in other circumstances.\\n+\\n+It is not the purpose of this section to induce you to infringe any\\n+patents or other property right claims or to contest validity of any\\n+such claims; this section has the sole purpose of protecting the\\n+integrity of the free software distribution system which is\\n+implemented by public license practices. Many people have made\\n+generous contributions to the wide range of software distributed\\n+through that system in reliance on consistent application of that\\n+system; it is up to the author/donor to decide if he or she is willing\\n+to distribute software through any other system and a licensee cannot\\n+impose that choice.\\n+\\n+This section is intended to make thoroughly clear what is believed to\\n+be a consequence of the rest of this License.\\n+\\n+ 12. If the distribution and/or use of the Library is restricted in\\n+certain countries either by patents or by copyrighted interfaces, the\\n+original copyright holder who places the Library under this License may add\\n+an explicit geographical distribution limitation excluding those countries,\\n+so that distribution is permitted only in or among countries not thus\\n+excluded. In such case, this License incorporates the limitation as if\\n+written in the body of this License.\\n+\\n+ 13. The Free Software Foundation may publish revised and/or new\\n+versions of the Lesser General Public License from time to time.\\n+Such new versions will be similar in spirit to the present version,\\n+but may differ in detail to address new problems or concerns.\\n+\\n+Each version is given a distinguishing version number. If the Library\\n+specifies a version number of this License which applies to it and\\n+\\\"any later version\\\", you have the option of following the terms and\\n+conditions either of that version or of any later version published by\\n+the Free Software Foundation. If the Library does not specify a\\n+license version number, you may choose any version ever published by\\n+the Free Software Foundation.\\n+\\f\\n+ 14. If you wish to incorporate parts of the Library into other free\\n+programs whose distribution conditions are incompatible with these,\\n+write to the author to ask for permission. For software which is\\n+copyrighted by the Free Software Foundation, write to the Free\\n+Software Foundation; we sometimes make exceptions for this. Our\\n+decision will be guided by the two goals of preserving the free status\\n+of all derivatives of our free software and of promoting the sharing\\n+and reuse of software generally.\\n+\\n+ NO WARRANTY\\n+\\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\\n+OTHER PARTIES PROVIDE THE LIBRARY \\\"AS IS\\\" WITHOUT WARRANTY OF ANY\\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\\n+\\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\\n+DAMAGES.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\f\\n+ How to Apply These Terms to Your New Libraries\\n+\\n+ If you develop a new library, and you want it to be of the greatest\\n+possible use to the public, we recommend making it free software that\\n+everyone can redistribute and change. You can do so by permitting\\n+redistribution under these terms (or, alternatively, under the terms of the\\n+ordinary General Public License).\\n+\\n+ To apply these terms, attach the following notices to the library. It is\\n+safest to attach them to the start of each source file to most effectively\\n+convey the exclusion of warranty; and each file should have at least the\\n+\\\"copyright\\\" line and a pointer to where the full notice is found.\\n+\\n+ <one line to give the library's name and a brief idea of what it does.>\\n+ Copyright (C) <year> <name of author>\\n+\\n+ This library is free software; you can redistribute it and/or\\n+ modify it under the terms of the GNU Lesser General Public\\n+ License as published by the Free Software Foundation; either\\n+ version 2.1 of the License, or (at your option) any later version.\\n+\\n+ This library is distributed in the hope that it will be useful,\\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ Lesser General Public License for more details.\\n+\\n+ You should have received a copy of the GNU Lesser General Public\\n+ License along with this library; if not, see <https://www.gnu.org/licenses/>.\\n+\\n+Also add information on how to contact you by electronic and paper mail.\\n+\\n+You should also get your employer (if you work as a programmer) or your\\n+school, if any, to sign a \\\"copyright disclaimer\\\" for the library, if\\n+necessary. Here is a sample; alter the names:\\n+\\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\\n+\\n+ <signature of Moe Ghoul>, 1 April 1990\\n+ Moe Ghoul, President of Vice\\n+\\n+That's all there is to it!\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libidn2 | LGPL-3.0-or-later\\n+Note: Only included in macOS builds\\n+URL: https://www.gnu.org/software/libidn/\\n+--------------------------------------------------------------------------------\\n+ GNU LESSER GENERAL PUBLIC LICENSE\\n+ Version 3, 29 June 2007\\n+\\n+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+\\n+ This version of the GNU Lesser General Public License incorporates\\n+the terms and conditions of version 3 of the GNU General Public\\n+License, supplemented by the additional permissions listed below.\\n+\\n+ 0. Additional Definitions.\\n+\\n+ As used herein, \\\"this License\\\" refers to version 3 of the GNU Lesser\\n+General Public License, and the \\\"GNU GPL\\\" refers to version 3 of the GNU\\n+General Public License.\\n+\\n+ \\\"The Library\\\" refers to a covered work governed by this License,\\n+other than an Application or a Combined Work as defined below.\\n+\\n+ An \\\"Application\\\" is any work that makes use of an interface provided\\n+by the Library, but which is not otherwise based on the Library.\\n+Defining a subclass of a class defined by the Library is deemed a mode\\n+of using an interface provided by the Library.\\n+\\n+ A \\\"Combined Work\\\" is a work produced by combining or linking an\\n+Application with the Library. The particular version of the Library\\n+with which the Combined Work was made is also called the \\\"Linked\\n+Version\\\".\\n+\\n+ The \\\"Minimal Corresponding Source\\\" for a Combined Work means the\\n+Corresponding Source for the Combined Work, excluding any source code\\n+for portions of the Combined Work that, considered in isolation, are\\n+based on the Application, and not on the Linked Version.\\n+\\n+ The \\\"Corresponding Application Code\\\" for a Combined Work means the\\n+object code and/or source code for the Application, including any data\\n+and utility programs needed for reproducing the Combined Work from the\\n+Application, but excluding the System Libraries of the Combined Work.\\n+\\n+ 1. Exception to Section 3 of the GNU GPL.\\n+\\n+ You may convey a covered work under sections 3 and 4 of this License\\n+without being bound by section 3 of the GNU GPL.\\n+\\n+ 2. Conveying Modified Versions.\\n+\\n+ If you modify a copy of the Library, and, in your modifications, a\\n+facility refers to a function or data to be supplied by an Application\\n+that uses the facility (other than as an argument passed when the\\n+facility is invoked), then you may convey a copy of the modified\\n+version:\\n+\\n+ a) under this License, provided that you make a good faith effort to\\n+ ensure that, in the event an Application does not supply the\\n+ function or data, the facility still operates, and performs\\n+ whatever part of its purpose remains meaningful, or\\n+\\n+ b) under the GNU GPL, with none of the additional permissions of\\n+ this License applicable to that copy.\\n+\\n+ 3. Object Code Incorporating Material from Library Header Files.\\n+\\n+ The object code form of an Application may incorporate material from\\n+a header file that is part of the Library. You may convey such object\\n+code under terms of your choice, provided that, if the incorporated\\n+material is not limited to numerical parameters, data structure\\n+layouts and accessors, or small macros, inline functions and templates\\n+(ten or fewer lines in length), you do both of the following:\\n+\\n+ a) Give prominent notice with each copy of the object code that the\\n+ Library is used in it and that the Library and its use are\\n+ covered by this License.\\n+\\n+ b) Accompany the object code with a copy of the GNU GPL and this license\\n+ document.\\n+\\n+ 4. Combined Works.\\n+\\n+ You may convey a Combined Work under terms of your choice that,\\n+taken together, effectively do not restrict modification of the\\n+portions of the Library contained in the Combined Work and reverse\\n+engineering for debugging such modifications, if you also do each of\\n+the following:\\n+\\n+ a) Give prominent notice with each copy of the Combined Work that\\n+ the Library is used in it and that the Library and its use are\\n+ covered by this License.\\n+\\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\\n+ document.\\n+\\n+ c) For a Combined Work that displays copyright notices during\\n+ execution, include the copyright notice for the Library among\\n+ these notices, as well as a reference directing the user to the\\n+ copies of the GNU GPL and this license document.\\n+\\n+ d) Do one of the following:\\n+\\n+ 0) Convey the Minimal Corresponding Source under the terms of this\\n+ License, and the Corresponding Application Code in a form\\n+ suitable for, and under terms that permit, the user to\\n+ recombine or relink the Application with a modified version of\\n+ the Linked Version to produce a modified Combined Work, in the\\n+ manner specified by section 6 of the GNU GPL for conveying\\n+ Corresponding Source.\\n+\\n+ 1) Use a suitable shared library mechanism for linking with the\\n+ Library. A suitable mechanism is one that (a) uses at run time\\n+ a copy of the Library already present on the user's computer\\n+ system, and (b) will operate properly with a modified version\\n+ of the Library that is interface-compatible with the Linked\\n+ Version.\\n+\\n+ e) Provide Installation Information, but only if you would otherwise\\n+ be required to provide such information under section 6 of the\\n+ GNU GPL, and only to the extent that such information is\\n+ necessary to install and execute a modified version of the\\n+ Combined Work produced by recombining or relinking the\\n+ Application with a modified version of the Linked Version. (If\\n+ you use option 4d0, the Installation Information must accompany\\n+ the Minimal Corresponding Source and Corresponding Application\\n+ Code. If you use option 4d1, you must provide the Installation\\n+ Information in the manner specified by section 6 of the GNU GPL\\n+ for conveying Corresponding Source.)\\n+\\n+ 5. Combined Libraries.\\n+\\n+ You may place library facilities that are a work based on the\\n+Library side by side in a single library together with other library\\n+facilities that are not Applications and are not covered by this\\n+License, and convey such a combined library under terms of your\\n+choice, if you do both of the following:\\n+\\n+ a) Accompany the combined library with a copy of the same work based\\n+ on the Library, uncombined with any other library facilities,\\n+ conveyed under the terms of this License.\\n+\\n+ b) Give prominent notice with the combined library that part of it\\n+ is a work based on the Library, and explaining where to find the\\n+ accompanying uncombined form of the same work.\\n+\\n+ 6. Revised Versions of the GNU Lesser General Public License.\\n+\\n+ The Free Software Foundation may publish revised and/or new versions\\n+of the GNU Lesser General Public License from time to time. Such new\\n+versions will be similar in spirit to the present version, but may\\n+differ in detail to address new problems or concerns.\\n+\\n+ Each version is given a distinguishing version number. If the\\n+Library as you received it specifies that a certain numbered version\\n+of the GNU Lesser General Public License \\\"or any later version\\\"\\n+applies to it, you have the option of following the terms and\\n+conditions either of that published version or of any later version\\n+published by the Free Software Foundation. If the Library as you\\n+received it does not specify a version number of the GNU Lesser\\n+General Public License, you may choose any version of the GNU Lesser\\n+General Public License ever published by the Free Software Foundation.\\n+\\n+ If the Library as you received it specifies that a proxy can decide\\n+whether future versions of the GNU Lesser General Public License shall\\n+apply, that proxy's public statement of acceptance of any version is\\n+permanent authorization for you to choose that version for the\\n+Library.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libidn2 (Unicode character data files) | Unicode-TOU AND Unicode-DFS-2016\\n+Note: Only included in macOS builds\\n+URL: https://www.gnu.org/software/libidn/\\n+--------------------------------------------------------------------------------\\n+A. Unicode Copyright.\\n+\\n+ Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\\n+ Certain documents and files on this website contain a legend indicating that \\\"Modification is permitted.\\\" Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode๏ฟฝ Standard, subject to Terms and Conditions herein.\\n+ Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein.\\n+ Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the \\\"Unicode Character Database\\\" can be found in the License.\\n+ Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.\\n+ No license is granted to \\\"mirror\\\" the Unicode website where a fee is charged for access to the \\\"mirror\\\" site.\\n+ Modification is not permitted with respect to this document. All copies of this document must be verbatim.\\n+\\n+B. Restricted Rights Legend.\\n+ Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.\\n+\\n+C. Warranties and Disclaimers.\\n+ This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.\\n+ If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.\\n+ EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED \\\"AS IS\\\" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.\\n+\\n+D. Waiver of Damages.\\n+ In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.\\n+\\n+E. Trademarks & Logos.\\n+ The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. ๏ฟฝThe Unicode Consortium๏ฟฝ and ๏ฟฝUnicode, Inc.๏ฟฝ are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.๏ฟฝs exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.\\n+ The Unicode Consortium Name and Trademark Usage Policy (๏ฟฝTrademark Policy๏ฟฝ) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.\\n+ All third party trademarks referenced herein are the property of their respective owners.\\n+\\n+F. Miscellaneous.\\n+ Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.\\n+ Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode๏ฟฝs prior written consent.\\n+ Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode๏ฟฝs net income.\\n+ Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.\\n+ Entire Agreement. This Agreement constitutes the entire agreement between the parties.\\n+\\n+\\n+\\n+EXHIBIT 1\\n+Unicode Data Files include all data files under the directories\\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\\n+http://www.unicode.org/utility/trac/browser/.\\n+\\n+Unicode Data Files do not include PDF online code charts under the\\n+directory http://www.unicode.org/Public/.\\n+\\n+Software includes any source code published in the Unicode Standard\\n+or under the directories\\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\\n+http://www.unicode.org/utility/trac/browser/.\\n+\\n+NOTICE TO USER: Carefully read the following legal agreement.\\n+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S\\n+DATA FILES (\\\"DATA FILES\\\"), AND/OR SOFTWARE (\\\"SOFTWARE\\\"),\\n+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE\\n+TERMS AND CONDITIONS OF THIS AGREEMENT.\\n+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE\\n+THE DATA FILES OR SOFTWARE.\\n+\\n+COPYRIGHT AND PERMISSION NOTICE\\n+\\n+Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\\n+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining\\n+a copy of the Unicode data files and any associated documentation\\n+(the \\\"Data Files\\\") or Unicode software and any associated documentation\\n+(the \\\"Software\\\") to deal in the Data Files or Software\\n+without restriction, including without limitation the rights to use,\\n+copy, modify, merge, publish, distribute, and/or sell copies of\\n+the Data Files or Software, and to permit persons to whom the Data Files\\n+or Software are furnished to do so, provided that either\\n+(a) this copyright and permission notice appear with all copies\\n+of the Data Files or Software, or\\n+(b) this copyright and permission notice appear in associated\\n+Documentation.\\n+\\n+THE DATA FILES AND SOFTWARE ARE PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF\\n+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\\n+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\\n+NONINFRINGEMENT OF THIRD PARTY RIGHTS.\\n+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\\n+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\\n+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\\n+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\\n+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\\n+PERFORMANCE OF THE DATA FILES OR SOFTWARE.\\n+\\n+Except as contained in this notice, the name of a copyright holder\\n+shall not be used in advertising or otherwise to promote the sale,\\n+use or other dealings in these Data Files or Software without prior\\n+written authorization of the copyright holder.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+libunistring | LGPL-3.0-or-later\\n+Note: Only included in macOS builds\\n+URL: https://www.gnu.org/software/libunistring/\\n+--------------------------------------------------------------------------------\\n+\\t\\t GNU LESSER GENERAL PUBLIC LICENSE\\n+ Version 3, 29 June 2007\\n+\\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+\\n+ This version of the GNU Lesser General Public License incorporates\\n+the terms and conditions of version 3 of the GNU General Public\\n+License, supplemented by the additional permissions listed below.\\n+\\n+ 0. Additional Definitions. \\n+\\n+ As used herein, \\\"this License\\\" refers to version 3 of the GNU Lesser\\n+General Public License, and the \\\"GNU GPL\\\" refers to version 3 of the GNU\\n+General Public License.\\n+\\n+ \\\"The Library\\\" refers to a covered work governed by this License,\\n+other than an Application or a Combined Work as defined below.\\n+\\n+ An \\\"Application\\\" is any work that makes use of an interface provided\\n+by the Library, but which is not otherwise based on the Library.\\n+Defining a subclass of a class defined by the Library is deemed a mode\\n+of using an interface provided by the Library.\\n+\\n+ A \\\"Combined Work\\\" is a work produced by combining or linking an\\n+Application with the Library. The particular version of the Library\\n+with which the Combined Work was made is also called the \\\"Linked\\n+Version\\\".\\n+\\n+ The \\\"Minimal Corresponding Source\\\" for a Combined Work means the\\n+Corresponding Source for the Combined Work, excluding any source code\\n+for portions of the Combined Work that, considered in isolation, are\\n+based on the Application, and not on the Linked Version.\\n+\\n+ The \\\"Corresponding Application Code\\\" for a Combined Work means the\\n+object code and/or source code for the Application, including any data\\n+and utility programs needed for reproducing the Combined Work from the\\n+Application, but excluding the System Libraries of the Combined Work.\\n+\\n+ 1. Exception to Section 3 of the GNU GPL.\\n+\\n+ You may convey a covered work under sections 3 and 4 of this License\\n+without being bound by section 3 of the GNU GPL.\\n+\\n+ 2. Conveying Modified Versions.\\n+\\n+ If you modify a copy of the Library, and, in your modifications, a\\n+facility refers to a function or data to be supplied by an Application\\n+that uses the facility (other than as an argument passed when the\\n+facility is invoked), then you may convey a copy of the modified\\n+version:\\n+\\n+ a) under this License, provided that you make a good faith effort to\\n+ ensure that, in the event an Application does not supply the\\n+ function or data, the facility still operates, and performs\\n+ whatever part of its purpose remains meaningful, or\\n+\\n+ b) under the GNU GPL, with none of the additional permissions of\\n+ this License applicable to that copy.\\n+\\n+ 3. Object Code Incorporating Material from Library Header Files.\\n+\\n+ The object code form of an Application may incorporate material from\\n+a header file that is part of the Library. You may convey such object\\n+code under terms of your choice, provided that, if the incorporated\\n+material is not limited to numerical parameters, data structure\\n+layouts and accessors, or small macros, inline functions and templates\\n+(ten or fewer lines in length), you do both of the following:\\n+\\n+ a) Give prominent notice with each copy of the object code that the\\n+ Library is used in it and that the Library and its use are\\n+ covered by this License.\\n+\\n+ b) Accompany the object code with a copy of the GNU GPL and this license\\n+ document.\\n+\\n+ 4. Combined Works.\\n+\\n+ You may convey a Combined Work under terms of your choice that,\\n+taken together, effectively do not restrict modification of the\\n+portions of the Library contained in the Combined Work and reverse\\n+engineering for debugging such modifications, if you also do each of\\n+the following:\\n+\\n+ a) Give prominent notice with each copy of the Combined Work that\\n+ the Library is used in it and that the Library and its use are\\n+ covered by this License.\\n+\\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\\n+ document.\\n+\\n+ c) For a Combined Work that displays copyright notices during\\n+ execution, include the copyright notice for the Library among\\n+ these notices, as well as a reference directing the user to the\\n+ copies of the GNU GPL and this license document.\\n+\\n+ d) Do one of the following:\\n+\\n+ 0) Convey the Minimal Corresponding Source under the terms of this\\n+ License, and the Corresponding Application Code in a form\\n+ suitable for, and under terms that permit, the user to\\n+ recombine or relink the Application with a modified version of\\n+ the Linked Version to produce a modified Combined Work, in the\\n+ manner specified by section 6 of the GNU GPL for conveying\\n+ Corresponding Source.\\n+\\n+ 1) Use a suitable shared library mechanism for linking with the\\n+ Library. A suitable mechanism is one that (a) uses at run time\\n+ a copy of the Library already present on the user's computer\\n+ system, and (b) will operate properly with a modified version\\n+ of the Library that is interface-compatible with the Linked\\n+ Version. \\n+\\n+ e) Provide Installation Information, but only if you would otherwise\\n+ be required to provide such information under section 6 of the\\n+ GNU GPL, and only to the extent that such information is\\n+ necessary to install and execute a modified version of the\\n+ Combined Work produced by recombining or relinking the\\n+ Application with a modified version of the Linked Version. (If\\n+ you use option 4d0, the Installation Information must accompany\\n+ the Minimal Corresponding Source and Corresponding Application\\n+ Code. If you use option 4d1, you must provide the Installation\\n+ Information in the manner specified by section 6 of the GNU GPL\\n+ for conveying Corresponding Source.)\\n+\\n+ 5. Combined Libraries.\\n+\\n+ You may place library facilities that are a work based on the\\n+Library side by side in a single library together with other library\\n+facilities that are not Applications and are not covered by this\\n+License, and convey such a combined library under terms of your\\n+choice, if you do both of the following:\\n+\\n+ a) Accompany the combined library with a copy of the same work based\\n+ on the Library, uncombined with any other library facilities,\\n+ conveyed under the terms of this License.\\n+\\n+ b) Give prominent notice with the combined library that part of it\\n+ is a work based on the Library, and explaining where to find the\\n+ accompanying uncombined form of the same work.\\n+\\n+ 6. Revised Versions of the GNU Lesser General Public License.\\n+\\n+ The Free Software Foundation may publish revised and/or new versions\\n+of the GNU Lesser General Public License from time to time. Such new\\n+versions will be similar in spirit to the present version, but may\\n+differ in detail to address new problems or concerns.\\n+\\n+ Each version is given a distinguishing version number. If the\\n+Library as you received it specifies that a certain numbered version\\n+of the GNU Lesser General Public License \\\"or any later version\\\"\\n+applies to it, you have the option of following the terms and\\n+conditions either of that published version or of any later version\\n+published by the Free Software Foundation. If the Library as you\\n+received it does not specify a version number of the GNU Lesser\\n+General Public License, you may choose any version of the GNU Lesser\\n+General Public License ever published by the Free Software Foundation.\\n+\\n+ If the Library as you received it specifies that a proxy can decide\\n+whether future versions of the GNU Lesser General Public License shall\\n+apply, that proxy's public statement of acceptance of any version is\\n+permanent authorization for you to choose that version for the\\n+Library.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+librtmp | LGPL-2.1-or-later\\n+Note: Only included in macOS builds\\n+URL: https://rtmpdump.mplayerhq.hu/\\n+--------------------------------------------------------------------------------\\n+ GNU LESSER GENERAL PUBLIC LICENSE\\n+ Version 2.1, February 1999\\n+\\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+[This is the first released version of the Lesser GPL. It also counts\\n+ as the successor of the GNU Library Public License, version 2, hence\\n+ the version number 2.1.]\\n+\\n+ Preamble\\n+\\n+ The licenses for most software are designed to take away your\\n+freedom to share and change it. By contrast, the GNU General Public\\n+Licenses are intended to guarantee your freedom to share and change\\n+free software--to make sure the software is free for all its users.\\n+\\n+ This license, the Lesser General Public License, applies to some\\n+specially designated software packages--typically libraries--of the\\n+Free Software Foundation and other authors who decide to use it. You\\n+can use it too, but we suggest you first think carefully about whether\\n+this license or the ordinary General Public License is the better\\n+strategy to use in any particular case, based on the explanations below.\\n+\\n+ When we speak of free software, we are referring to freedom of use,\\n+not price. Our General Public Licenses are designed to make sure that\\n+you have the freedom to distribute copies of free software (and charge\\n+for this service if you wish); that you receive source code or can get\\n+it if you want it; that you can change the software and use pieces of\\n+it in new free programs; and that you are informed that you can do\\n+these things.\\n+\\n+ To protect your rights, we need to make restrictions that forbid\\n+distributors to deny you these rights or to ask you to surrender these\\n+rights. These restrictions translate to certain responsibilities for\\n+you if you distribute copies of the library or if you modify it.\\n+\\n+ For example, if you distribute copies of the library, whether gratis\\n+or for a fee, you must give the recipients all the rights that we gave\\n+you. You must make sure that they, too, receive or can get the source\\n+code. If you link other code with the library, you must provide\\n+complete object files to the recipients, so that they can relink them\\n+with the library after making changes to the library and recompiling\\n+it. And you must show them these terms so they know their rights.\\n+\\n+ We protect your rights with a two-step method: (1) we copyright the\\n+library, and (2) we offer you this license, which gives you legal\\n+permission to copy, distribute and/or modify the library.\\n+\\n+ To protect each distributor, we want to make it very clear that\\n+there is no warranty for the free library. Also, if the library is\\n+modified by someone else and passed on, the recipients should know\\n+that what they have is not the original version, so that the original\\n+author's reputation will not be affected by problems that might be\\n+introduced by others.\\n+\\f\\n+ Finally, software patents pose a constant threat to the existence of\\n+any free program. We wish to make sure that a company cannot\\n+effectively restrict the users of a free program by obtaining a\\n+restrictive license from a patent holder. Therefore, we insist that\\n+any patent license obtained for a version of the library must be\\n+consistent with the full freedom of use specified in this license.\\n+\\n+ Most GNU software, including some libraries, is covered by the\\n+ordinary GNU General Public License. This license, the GNU Lesser\\n+General Public License, applies to certain designated libraries, and\\n+is quite different from the ordinary General Public License. We use\\n+this license for certain libraries in order to permit linking those\\n+libraries into non-free programs.\\n+\\n+ When a program is linked with a library, whether statically or using\\n+a shared library, the combination of the two is legally speaking a\\n+combined work, a derivative of the original library. The ordinary\\n+General Public License therefore permits such linking only if the\\n+entire combination fits its criteria of freedom. The Lesser General\\n+Public License permits more lax criteria for linking other code with\\n+the library.\\n+\\n+ We call this license the \\\"Lesser\\\" General Public License because it\\n+does Less to protect the user's freedom than the ordinary General\\n+Public License. It also provides other free software developers Less\\n+of an advantage over competing non-free programs. These disadvantages\\n+are the reason we use the ordinary General Public License for many\\n+libraries. However, the Lesser license provides advantages in certain\\n+special circumstances.\\n+\\n+ For example, on rare occasions, there may be a special need to\\n+encourage the widest possible use of a certain library, so that it becomes\\n+a de-facto standard. To achieve this, non-free programs must be\\n+allowed to use the library. A more frequent case is that a free\\n+library does the same job as widely used non-free libraries. In this\\n+case, there is little to gain by limiting the free library to free\\n+software only, so we use the Lesser General Public License.\\n+\\n+ In other cases, permission to use a particular library in non-free\\n+programs enables a greater number of people to use a large body of\\n+free software. For example, permission to use the GNU C Library in\\n+non-free programs enables many more people to use the whole GNU\\n+operating system, as well as its variant, the GNU/Linux operating\\n+system.\\n+\\n+ Although the Lesser General Public License is Less protective of the\\n+users' freedom, it does ensure that the user of a program that is\\n+linked with the Library has the freedom and the wherewithal to run\\n+that program using a modified version of the Library.\\n+\\n+ The precise terms and conditions for copying, distribution and\\n+modification follow. Pay close attention to the difference between a\\n+\\\"work based on the library\\\" and a \\\"work that uses the library\\\". The\\n+former contains code derived from the library, whereas the latter must\\n+be combined with the library in order to run.\\n+\\f\\n+ GNU LESSER GENERAL PUBLIC LICENSE\\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\\n+\\n+ 0. This License Agreement applies to any software library or other\\n+program which contains a notice placed by the copyright holder or\\n+other authorized party saying it may be distributed under the terms of\\n+this Lesser General Public License (also called \\\"this License\\\").\\n+Each licensee is addressed as \\\"you\\\".\\n+\\n+ A \\\"library\\\" means a collection of software functions and/or data\\n+prepared so as to be conveniently linked with application programs\\n+(which use some of those functions and data) to form executables.\\n+\\n+ The \\\"Library\\\", below, refers to any such software library or work\\n+which has been distributed under these terms. A \\\"work based on the\\n+Library\\\" means either the Library or any derivative work under\\n+copyright law: that is to say, a work containing the Library or a\\n+portion of it, either verbatim or with modifications and/or translated\\n+straightforwardly into another language. (Hereinafter, translation is\\n+included without limitation in the term \\\"modification\\\".)\\n+\\n+ \\\"Source code\\\" for a work means the preferred form of the work for\\n+making modifications to it. For a library, complete source code means\\n+all the source code for all modules it contains, plus any associated\\n+interface definition files, plus the scripts used to control compilation\\n+and installation of the library.\\n+\\n+ Activities other than copying, distribution and modification are not\\n+covered by this License; they are outside its scope. The act of\\n+running a program using the Library is not restricted, and output from\\n+such a program is covered only if its contents constitute a work based\\n+on the Library (independent of the use of the Library in a tool for\\n+writing it). Whether that is true depends on what the Library does\\n+and what the program that uses the Library does.\\n+\\n+ 1. You may copy and distribute verbatim copies of the Library's\\n+complete source code as you receive it, in any medium, provided that\\n+you conspicuously and appropriately publish on each copy an\\n+appropriate copyright notice and disclaimer of warranty; keep intact\\n+all the notices that refer to this License and to the absence of any\\n+warranty; and distribute a copy of this License along with the\\n+Library.\\n+\\n+ You may charge a fee for the physical act of transferring a copy,\\n+and you may at your option offer warranty protection in exchange for a\\n+fee.\\n+\\f\\n+ 2. You may modify your copy or copies of the Library or any portion\\n+of it, thus forming a work based on the Library, and copy and\\n+distribute such modifications or work under the terms of Section 1\\n+above, provided that you also meet all of these conditions:\\n+\\n+ a) The modified work must itself be a software library.\\n+\\n+ b) You must cause the files modified to carry prominent notices\\n+ stating that you changed the files and the date of any change.\\n+\\n+ c) You must cause the whole of the work to be licensed at no\\n+ charge to all third parties under the terms of this License.\\n+\\n+ d) If a facility in the modified Library refers to a function or a\\n+ table of data to be supplied by an application program that uses\\n+ the facility, other than as an argument passed when the facility\\n+ is invoked, then you must make a good faith effort to ensure that,\\n+ in the event an application does not supply such function or\\n+ table, the facility still operates, and performs whatever part of\\n+ its purpose remains meaningful.\\n+\\n+ (For example, a function in a library to compute square roots has\\n+ a purpose that is entirely well-defined independent of the\\n+ application. Therefore, Subsection 2d requires that any\\n+ application-supplied function or table used by this function must\\n+ be optional: if the application does not supply it, the square\\n+ root function must still compute square roots.)\\n+\\n+These requirements apply to the modified work as a whole. If\\n+identifiable sections of that work are not derived from the Library,\\n+and can be reasonably considered independent and separate works in\\n+themselves, then this License, and its terms, do not apply to those\\n+sections when you distribute them as separate works. But when you\\n+distribute the same sections as part of a whole which is a work based\\n+on the Library, the distribution of the whole must be on the terms of\\n+this License, whose permissions for other licensees extend to the\\n+entire whole, and thus to each and every part regardless of who wrote\\n+it.\\n+\\n+Thus, it is not the intent of this section to claim rights or contest\\n+your rights to work written entirely by you; rather, the intent is to\\n+exercise the right to control the distribution of derivative or\\n+collective works based on the Library.\\n+\\n+In addition, mere aggregation of another work not based on the Library\\n+with the Library (or with a work based on the Library) on a volume of\\n+a storage or distribution medium does not bring the other work under\\n+the scope of this License.\\n+\\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\\n+License instead of this License to a given copy of the Library. To do\\n+this, you must alter all the notices that refer to this License, so\\n+that they refer to the ordinary GNU General Public License, version 2,\\n+instead of to this License. (If a newer version than version 2 of the\\n+ordinary GNU General Public License has appeared, then you can specify\\n+that version instead if you wish.) Do not make any other change in\\n+these notices.\\n+\\f\\n+ Once this change is made in a given copy, it is irreversible for\\n+that copy, so the ordinary GNU General Public License applies to all\\n+subsequent copies and derivative works made from that copy.\\n+\\n+ This option is useful when you wish to copy part of the code of\\n+the Library into a program that is not a library.\\n+\\n+ 4. You may copy and distribute the Library (or a portion or\\n+derivative of it, under Section 2) in object code or executable form\\n+under the terms of Sections 1 and 2 above provided that you accompany\\n+it with the complete corresponding machine-readable source code, which\\n+must be distributed under the terms of Sections 1 and 2 above on a\\n+medium customarily used for software interchange.\\n+\\n+ If distribution of object code is made by offering access to copy\\n+from a designated place, then offering equivalent access to copy the\\n+source code from the same place satisfies the requirement to\\n+distribute the source code, even though third parties are not\\n+compelled to copy the source along with the object code.\\n+\\n+ 5. A program that contains no derivative of any portion of the\\n+Library, but is designed to work with the Library by being compiled or\\n+linked with it, is called a \\\"work that uses the Library\\\". Such a\\n+work, in isolation, is not a derivative work of the Library, and\\n+therefore falls outside the scope of this License.\\n+\\n+ However, linking a \\\"work that uses the Library\\\" with the Library\\n+creates an executable that is a derivative of the Library (because it\\n+contains portions of the Library), rather than a \\\"work that uses the\\n+library\\\". The executable is therefore covered by this License.\\n+Section 6 states terms for distribution of such executables.\\n+\\n+ When a \\\"work that uses the Library\\\" uses material from a header file\\n+that is part of the Library, the object code for the work may be a\\n+derivative work of the Library even though the source code is not.\\n+Whether this is true is especially significant if the work can be\\n+linked without the Library, or if the work is itself a library. The\\n+threshold for this to be true is not precisely defined by law.\\n+\\n+ If such an object file uses only numerical parameters, data\\n+structure layouts and accessors, and small macros and small inline\\n+functions (ten lines or less in length), then the use of the object\\n+file is unrestricted, regardless of whether it is legally a derivative\\n+work. (Executables containing this object code plus portions of the\\n+Library will still fall under Section 6.)\\n+\\n+ Otherwise, if the work is a derivative of the Library, you may\\n+distribute the object code for the work under the terms of Section 6.\\n+Any executables containing that work also fall under Section 6,\\n+whether or not they are linked directly with the Library itself.\\n+\\f\\n+ 6. As an exception to the Sections above, you may also combine or\\n+link a \\\"work that uses the Library\\\" with the Library to produce a\\n+work containing portions of the Library, and distribute that work\\n+under terms of your choice, provided that the terms permit\\n+modification of the work for the customer's own use and reverse\\n+engineering for debugging such modifications.\\n+\\n+ You must give prominent notice with each copy of the work that the\\n+Library is used in it and that the Library and its use are covered by\\n+this License. You must supply a copy of this License. If the work\\n+during execution displays copyright notices, you must include the\\n+copyright notice for the Library among them, as well as a reference\\n+directing the user to the copy of this License. Also, you must do one\\n+of these things:\\n+\\n+ a) Accompany the work with the complete corresponding\\n+ machine-readable source code for the Library including whatever\\n+ changes were used in the work (which must be distributed under\\n+ Sections 1 and 2 above); and, if the work is an executable linked\\n+ with the Library, with the complete machine-readable \\\"work that\\n+ uses the Library\\\", as object code and/or source code, so that the\\n+ user can modify the Library and then relink to produce a modified\\n+ executable containing the modified Library. (It is understood\\n+ that the user who changes the contents of definitions files in the\\n+ Library will not necessarily be able to recompile the application\\n+ to use the modified definitions.)\\n+\\n+ b) Use a suitable shared library mechanism for linking with the\\n+ Library. A suitable mechanism is one that (1) uses at run time a\\n+ copy of the library already present on the user's computer system,\\n+ rather than copying library functions into the executable, and (2)\\n+ will operate properly with a modified version of the library, if\\n+ the user installs one, as long as the modified version is\\n+ interface-compatible with the version that the work was made with.\\n+\\n+ c) Accompany the work with a written offer, valid for at\\n+ least three years, to give the same user the materials\\n+ specified in Subsection 6a, above, for a charge no more\\n+ than the cost of performing this distribution.\\n+\\n+ d) If distribution of the work is made by offering access to copy\\n+ from a designated place, offer equivalent access to copy the above\\n+ specified materials from the same place.\\n+\\n+ e) Verify that the user has already received a copy of these\\n+ materials or that you have already sent this user a copy.\\n+\\n+ For an executable, the required form of the \\\"work that uses the\\n+Library\\\" must include any data and utility programs needed for\\n+reproducing the executable from it. However, as a special exception,\\n+the materials to be distributed need not include anything that is\\n+normally distributed (in either source or binary form) with the major\\n+components (compiler, kernel, and so on) of the operating system on\\n+which the executable runs, unless that component itself accompanies\\n+the executable.\\n+\\n+ It may happen that this requirement contradicts the license\\n+restrictions of other proprietary libraries that do not normally\\n+accompany the operating system. Such a contradiction means you cannot\\n+use both them and the Library together in an executable that you\\n+distribute.\\n+\\f\\n+ 7. You may place library facilities that are a work based on the\\n+Library side-by-side in a single library together with other library\\n+facilities not covered by this License, and distribute such a combined\\n+library, provided that the separate distribution of the work based on\\n+the Library and of the other library facilities is otherwise\\n+permitted, and provided that you do these two things:\\n+\\n+ a) Accompany the combined library with a copy of the same work\\n+ based on the Library, uncombined with any other library\\n+ facilities. This must be distributed under the terms of the\\n+ Sections above.\\n+\\n+ b) Give prominent notice with the combined library of the fact\\n+ that part of it is a work based on the Library, and explaining\\n+ where to find the accompanying uncombined form of the same work.\\n+\\n+ 8. You may not copy, modify, sublicense, link with, or distribute\\n+the Library except as expressly provided under this License. Any\\n+attempt otherwise to copy, modify, sublicense, link with, or\\n+distribute the Library is void, and will automatically terminate your\\n+rights under this License. However, parties who have received copies,\\n+or rights, from you under this License will not have their licenses\\n+terminated so long as such parties remain in full compliance.\\n+\\n+ 9. You are not required to accept this License, since you have not\\n+signed it. However, nothing else grants you permission to modify or\\n+distribute the Library or its derivative works. These actions are\\n+prohibited by law if you do not accept this License. Therefore, by\\n+modifying or distributing the Library (or any work based on the\\n+Library), you indicate your acceptance of this License to do so, and\\n+all its terms and conditions for copying, distributing or modifying\\n+the Library or works based on it.\\n+\\n+ 10. Each time you redistribute the Library (or any work based on the\\n+Library), the recipient automatically receives a license from the\\n+original licensor to copy, distribute, link with or modify the Library\\n+subject to these terms and conditions. You may not impose any further\\n+restrictions on the recipients' exercise of the rights granted herein.\\n+You are not responsible for enforcing compliance by third parties with\\n+this License.\\n+\\f\\n+ 11. If, as a consequence of a court judgment or allegation of patent\\n+infringement or for any other reason (not limited to patent issues),\\n+conditions are imposed on you (whether by court order, agreement or\\n+otherwise) that contradict the conditions of this License, they do not\\n+excuse you from the conditions of this License. If you cannot\\n+distribute so as to satisfy simultaneously your obligations under this\\n+License and any other pertinent obligations, then as a consequence you\\n+may not distribute the Library at all. For example, if a patent\\n+license would not permit royalty-free redistribution of the Library by\\n+all those who receive copies directly or indirectly through you, then\\n+the only way you could satisfy both it and this License would be to\\n+refrain entirely from distribution of the Library.\\n+\\n+If any portion of this section is held invalid or unenforceable under any\\n+particular circumstance, the balance of the section is intended to apply,\\n+and the section as a whole is intended to apply in other circumstances.\\n+\\n+It is not the purpose of this section to induce you to infringe any\\n+patents or other property right claims or to contest validity of any\\n+such claims; this section has the sole purpose of protecting the\\n+integrity of the free software distribution system which is\\n+implemented by public license practices. Many people have made\\n+generous contributions to the wide range of software distributed\\n+through that system in reliance on consistent application of that\\n+system; it is up to the author/donor to decide if he or she is willing\\n+to distribute software through any other system and a licensee cannot\\n+impose that choice.\\n+\\n+This section is intended to make thoroughly clear what is believed to\\n+be a consequence of the rest of this License.\\n+\\n+ 12. If the distribution and/or use of the Library is restricted in\\n+certain countries either by patents or by copyrighted interfaces, the\\n+original copyright holder who places the Library under this License may add\\n+an explicit geographical distribution limitation excluding those countries,\\n+so that distribution is permitted only in or among countries not thus\\n+excluded. In such case, this License incorporates the limitation as if\\n+written in the body of this License.\\n+\\n+ 13. The Free Software Foundation may publish revised and/or new\\n+versions of the Lesser General Public License from time to time.\\n+Such new versions will be similar in spirit to the present version,\\n+but may differ in detail to address new problems or concerns.\\n+\\n+Each version is given a distinguishing version number. If the Library\\n+specifies a version number of this License which applies to it and\\n+\\\"any later version\\\", you have the option of following the terms and\\n+conditions either of that version or of any later version published by\\n+the Free Software Foundation. If the Library does not specify a\\n+license version number, you may choose any version ever published by\\n+the Free Software Foundation.\\n+\\f\\n+ 14. If you wish to incorporate parts of the Library into other free\\n+programs whose distribution conditions are incompatible with these,\\n+write to the author to ask for permission. For software which is\\n+copyrighted by the Free Software Foundation, write to the Free\\n+Software Foundation; we sometimes make exceptions for this. Our\\n+decision will be guided by the two goals of preserving the free status\\n+of all derivatives of our free software and of promoting the sharing\\n+and reuse of software generally.\\n+\\n+ NO WARRANTY\\n+\\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\\n+OTHER PARTIES PROVIDE THE LIBRARY \\\"AS IS\\\" WITHOUT WARRANTY OF ANY\\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\\n+\\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\\n+DAMAGES.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\f\\n+ How to Apply These Terms to Your New Libraries\\n+\\n+ If you develop a new library, and you want it to be of the greatest\\n+possible use to the public, we recommend making it free software that\\n+everyone can redistribute and change. You can do so by permitting\\n+redistribution under these terms (or, alternatively, under the terms of the\\n+ordinary General Public License).\\n+\\n+ To apply these terms, attach the following notices to the library. It is\\n+safest to attach them to the start of each source file to most effectively\\n+convey the exclusion of warranty; and each file should have at least the\\n+\\\"copyright\\\" line and a pointer to where the full notice is found.\\n+\\n+ <one line to give the library's name and a brief idea of what it does.>\\n+ Copyright (C) <year> <name of author>\\n+\\n+ This library is free software; you can redistribute it and/or\\n+ modify it under the terms of the GNU Lesser General Public\\n+ License as published by the Free Software Foundation; either\\n+ version 2.1 of the License, or (at your option) any later version.\\n+\\n+ This library is distributed in the hope that it will be useful,\\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\\n+ Lesser General Public License for more details.\\n+\\n+ You should have received a copy of the GNU Lesser General Public\\n+ License along with this library; if not, write to the Free Software\\n+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\\n+\\n+Also add information on how to contact you by electronic and paper mail.\\n+\\n+You should also get your employer (if you work as a programmer) or your\\n+school, if any, to sign a \\\"copyright disclaimer\\\" for the library, if\\n+necessary. Here is a sample; alter the names:\\n+\\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\\n+\\n+ <signature of Ty Coon>, 1 April 1990\\n+ Ty Coon, President of Vice\\n+\\n+That's all there is to it!\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+zstd | BSD-3-Clause\\n+Note: Only included in macOS builds\\n+URL: https://facebook.github.io/zstd/\\n+--------------------------------------------------------------------------------\\n+BSD License\\n+\\n+For Zstandard software\\n+\\n+Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without modification,\\n+are permitted provided that the following conditions are met:\\n+\\n+ * Redistributions of source code must retain the above copyright notice, this\\n+ list of conditions and the following disclaimer.\\n+\\n+ * Redistributions in binary form must reproduce the above copyright notice,\\n+ this list of conditions and the following disclaimer in the documentation\\n+ and/or other materials provided with the distribution.\\n+\\n+ * Neither the name Facebook, nor Meta, nor the names of its contributors may\\n+ be used to endorse or promote products derived from this software without\\n+ specific prior written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \\\"AS IS\\\" AND\\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR\\n+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+brotli | MIT\\n+URL: https://brotli.org/\\n+--------------------------------------------------------------------------------\\n+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in\\n+all copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\\n+THE SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+curl_cffi | MIT\\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\\n+URL: https://curl-cffi.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+MIT License\\n+\\n+\\n+Copyright (c) 2018 multippt\\n+Copyright (c) 2022 curl_cffi developers\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in all\\n+copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\\n+SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+curl-impersonate | MIT\\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\\n+URL: https://github.com/lexiforest/curl-impersonate\\n+--------------------------------------------------------------------------------\\n+MIT License\\n+\\n+Copyright (c) 2025 curl_cffi developers\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in all\\n+copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\\n+SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+cffi | MIT-0\\n+URL: https://cffi.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+Except when otherwise stated (look for LICENSE files in directories or\\n+information at the beginning of each file) all software and\\n+documentation is licensed as follows: \\n+\\n+ MIT No Attribution\\n+\\n+ Permission is hereby granted, free of charge, to any person \\n+ obtaining a copy of this software and associated documentation \\n+ files (the \\\"Software\\\"), to deal in the Software without \\n+ restriction, including without limitation the rights to use, \\n+ copy, modify, merge, publish, distribute, sublicense, and/or \\n+ sell copies of the Software, and to permit persons to whom the \\n+ Software is furnished to do so.\\n+\\n+ THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS \\n+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, \\n+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL \\n+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER \\n+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING \\n+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \\n+ DEALINGS IN THE SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+pycparser | BSD-3-Clause\\n+URL: https://github.com/eliben/pycparser\\n+--------------------------------------------------------------------------------\\n+pycparser -- A C parser in Python\\n+\\n+Copyright (c) 2008-2022, Eli Bendersky\\n+All rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without modification,\\n+are permitted provided that the following conditions are met:\\n+\\n+* Redistributions of source code must retain the above copyright notice, this \\n+ list of conditions and the following disclaimer.\\n+* Redistributions in binary form must reproduce the above copyright notice, \\n+ this list of conditions and the following disclaimer in the documentation \\n+ and/or other materials provided with the distribution.\\n+* Neither the name of the copyright holder nor the names of its contributors may \\n+ be used to endorse or promote products derived from this software without \\n+ specific prior written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \\\"AS IS\\\" AND \\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE \\n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \\n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE \\n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \\n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT \\n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT \\n+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+mutagen | GPL-2.0-or-later\\n+URL: https://mutagen.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+ GNU GENERAL PUBLIC LICENSE\\n+ Version 2, June 1991\\n+\\n+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\\n+ Everyone is permitted to copy and distribute verbatim copies\\n+ of this license document, but changing it is not allowed.\\n+\\n+ Preamble\\n+\\n+ The licenses for most software are designed to take away your\\n+freedom to share and change it. By contrast, the GNU General Public\\n+License is intended to guarantee your freedom to share and change free\\n+software--to make sure the software is free for all its users. This\\n+General Public License applies to most of the Free Software\\n+Foundation's software and to any other program whose authors commit to\\n+using it. (Some other Free Software Foundation software is covered by\\n+the GNU Lesser General Public License instead.) You can apply it to\\n+your programs, too.\\n+\\n+ When we speak of free software, we are referring to freedom, not\\n+price. Our General Public Licenses are designed to make sure that you\\n+have the freedom to distribute copies of free software (and charge for\\n+this service if you wish), that you receive source code or can get it\\n+if you want it, that you can change the software or use pieces of it\\n+in new free programs; and that you know you can do these things.\\n+\\n+ To protect your rights, we need to make restrictions that forbid\\n+anyone to deny you these rights or to ask you to surrender the rights.\\n+These restrictions translate to certain responsibilities for you if you\\n+distribute copies of the software, or if you modify it.\\n+\\n+ For example, if you distribute copies of such a program, whether\\n+gratis or for a fee, you must give the recipients all the rights that\\n+you have. You must make sure that they, too, receive or can get the\\n+source code. And you must show them these terms so they know their\\n+rights.\\n+\\n+ We protect your rights with two steps: (1) copyright the software, and\\n+(2) offer you this license which gives you legal permission to copy,\\n+distribute and/or modify the software.\\n+\\n+ Also, for each author's protection and ours, we want to make certain\\n+that everyone understands that there is no warranty for this free\\n+software. If the software is modified by someone else and passed on, we\\n+want its recipients to know that what they have is not the original, so\\n+that any problems introduced by others will not reflect on the original\\n+authors' reputations.\\n+\\n+ Finally, any free program is threatened constantly by software\\n+patents. We wish to avoid the danger that redistributors of a free\\n+program will individually obtain patent licenses, in effect making the\\n+program proprietary. To prevent this, we have made it clear that any\\n+patent must be licensed for everyone's free use or not licensed at all.\\n+\\n+ The precise terms and conditions for copying, distribution and\\n+modification follow.\\n+\\n+ GNU GENERAL PUBLIC LICENSE\\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\\n+\\n+ 0. This License applies to any program or other work which contains\\n+a notice placed by the copyright holder saying it may be distributed\\n+under the terms of this General Public License. The \\\"Program\\\", below,\\n+refers to any such program or work, and a \\\"work based on the Program\\\"\\n+means either the Program or any derivative work under copyright law:\\n+that is to say, a work containing the Program or a portion of it,\\n+either verbatim or with modifications and/or translated into another\\n+language. (Hereinafter, translation is included without limitation in\\n+the term \\\"modification\\\".) Each licensee is addressed as \\\"you\\\".\\n+\\n+Activities other than copying, distribution and modification are not\\n+covered by this License; they are outside its scope. The act of\\n+running the Program is not restricted, and the output from the Program\\n+is covered only if its contents constitute a work based on the\\n+Program (independent of having been made by running the Program).\\n+Whether that is true depends on what the Program does.\\n+\\n+ 1. You may copy and distribute verbatim copies of the Program's\\n+source code as you receive it, in any medium, provided that you\\n+conspicuously and appropriately publish on each copy an appropriate\\n+copyright notice and disclaimer of warranty; keep intact all the\\n+notices that refer to this License and to the absence of any warranty;\\n+and give any other recipients of the Program a copy of this License\\n+along with the Program.\\n+\\n+You may charge a fee for the physical act of transferring a copy, and\\n+you may at your option offer warranty protection in exchange for a fee.\\n+\\n+ 2. You may modify your copy or copies of the Program or any portion\\n+of it, thus forming a work based on the Program, and copy and\\n+distribute such modifications or work under the terms of Section 1\\n+above, provided that you also meet all of these conditions:\\n+\\n+ a) You must cause the modified files to carry prominent notices\\n+ stating that you changed the files and the date of any change.\\n+\\n+ b) You must cause any work that you distribute or publish, that in\\n+ whole or in part contains or is derived from the Program or any\\n+ part thereof, to be licensed as a whole at no charge to all third\\n+ parties under the terms of this License.\\n+\\n+ c) If the modified program normally reads commands interactively\\n+ when run, you must cause it, when started running for such\\n+ interactive use in the most ordinary way, to print or display an\\n+ announcement including an appropriate copyright notice and a\\n+ notice that there is no warranty (or else, saying that you provide\\n+ a warranty) and that users may redistribute the program under\\n+ these conditions, and telling the user how to view a copy of this\\n+ License. (Exception: if the Program itself is interactive but\\n+ does not normally print such an announcement, your work based on\\n+ the Program is not required to print an announcement.)\\n+\\n+These requirements apply to the modified work as a whole. If\\n+identifiable sections of that work are not derived from the Program,\\n+and can be reasonably considered independent and separate works in\\n+themselves, then this License, and its terms, do not apply to those\\n+sections when you distribute them as separate works. But when you\\n+distribute the same sections as part of a whole which is a work based\\n+on the Program, the distribution of the whole must be on the terms of\\n+this License, whose permissions for other licensees extend to the\\n+entire whole, and thus to each and every part regardless of who wrote it.\\n+\\n+Thus, it is not the intent of this section to claim rights or contest\\n+your rights to work written entirely by you; rather, the intent is to\\n+exercise the right to control the distribution of derivative or\\n+collective works based on the Program.\\n+\\n+In addition, mere aggregation of another work not based on the Program\\n+with the Program (or with a work based on the Program) on a volume of\\n+a storage or distribution medium does not bring the other work under\\n+the scope of this License.\\n+\\n+ 3. You may copy and distribute the Program (or a work based on it,\\n+under Section 2) in object code or executable form under the terms of\\n+Sections 1 and 2 above provided that you also do one of the following:\\n+\\n+ a) Accompany it with the complete corresponding machine-readable\\n+ source code, which must be distributed under the terms of Sections\\n+ 1 and 2 above on a medium customarily used for software interchange; or,\\n+\\n+ b) Accompany it with a written offer, valid for at least three\\n+ years, to give any third party, for a charge no more than your\\n+ cost of physically performing source distribution, a complete\\n+ machine-readable copy of the corresponding source code, to be\\n+ distributed under the terms of Sections 1 and 2 above on a medium\\n+ customarily used for software interchange; or,\\n+\\n+ c) Accompany it with the information you received as to the offer\\n+ to distribute corresponding source code. (This alternative is\\n+ allowed only for noncommercial distribution and only if you\\n+ received the program in object code or executable form with such\\n+ an offer, in accord with Subsection b above.)\\n+\\n+The source code for a work means the preferred form of the work for\\n+making modifications to it. For an executable work, complete source\\n+code means all the source code for all modules it contains, plus any\\n+associated interface definition files, plus the scripts used to\\n+control compilation and installation of the executable. However, as a\\n+special exception, the source code distributed need not include\\n+anything that is normally distributed (in either source or binary\\n+form) with the major components (compiler, kernel, and so on) of the\\n+operating system on which the executable runs, unless that component\\n+itself accompanies the executable.\\n+\\n+If distribution of executable or object code is made by offering\\n+access to copy from a designated place, then offering equivalent\\n+access to copy the source code from the same place counts as\\n+distribution of the source code, even though third parties are not\\n+compelled to copy the source along with the object code.\\n+\\n+ 4. You may not copy, modify, sublicense, or distribute the Program\\n+except as expressly provided under this License. Any attempt\\n+otherwise to copy, modify, sublicense or distribute the Program is\\n+void, and will automatically terminate your rights under this License.\\n+However, parties who have received copies, or rights, from you under\\n+this License will not have their licenses terminated so long as such\\n+parties remain in full compliance.\\n+\\n+ 5. You are not required to accept this License, since you have not\\n+signed it. However, nothing else grants you permission to modify or\\n+distribute the Program or its derivative works. These actions are\\n+prohibited by law if you do not accept this License. Therefore, by\\n+modifying or distributing the Program (or any work based on the\\n+Program), you indicate your acceptance of this License to do so, and\\n+all its terms and conditions for copying, distributing or modifying\\n+the Program or works based on it.\\n+\\n+ 6. Each time you redistribute the Program (or any work based on the\\n+Program), the recipient automatically receives a license from the\\n+original licensor to copy, distribute or modify the Program subject to\\n+these terms and conditions. You may not impose any further\\n+restrictions on the recipients' exercise of the rights granted herein.\\n+You are not responsible for enforcing compliance by third parties to\\n+this License.\\n+\\n+ 7. If, as a consequence of a court judgment or allegation of patent\\n+infringement or for any other reason (not limited to patent issues),\\n+conditions are imposed on you (whether by court order, agreement or\\n+otherwise) that contradict the conditions of this License, they do not\\n+excuse you from the conditions of this License. If you cannot\\n+distribute so as to satisfy simultaneously your obligations under this\\n+License and any other pertinent obligations, then as a consequence you\\n+may not distribute the Program at all. For example, if a patent\\n+license would not permit royalty-free redistribution of the Program by\\n+all those who receive copies directly or indirectly through you, then\\n+the only way you could satisfy both it and this License would be to\\n+refrain entirely from distribution of the Program.\\n+\\n+If any portion of this section is held invalid or unenforceable under\\n+any particular circumstance, the balance of the section is intended to\\n+apply and the section as a whole is intended to apply in other\\n+circumstances.\\n+\\n+It is not the purpose of this section to induce you to infringe any\\n+patents or other property right claims or to contest validity of any\\n+such claims; this section has the sole purpose of protecting the\\n+integrity of the free software distribution system, which is\\n+implemented by public license practices. Many people have made\\n+generous contributions to the wide range of software distributed\\n+through that system in reliance on consistent application of that\\n+system; it is up to the author/donor to decide if he or she is willing\\n+to distribute software through any other system and a licensee cannot\\n+impose that choice.\\n+\\n+This section is intended to make thoroughly clear what is believed to\\n+be a consequence of the rest of this License.\\n+\\n+ 8. If the distribution and/or use of the Program is restricted in\\n+certain countries either by patents or by copyrighted interfaces, the\\n+original copyright holder who places the Program under this License\\n+may add an explicit geographical distribution limitation excluding\\n+those countries, so that distribution is permitted only in or among\\n+countries not thus excluded. In such case, this License incorporates\\n+the limitation as if written in the body of this License.\\n+\\n+ 9. The Free Software Foundation may publish revised and/or new versions\\n+of the General Public License from time to time. Such new versions will\\n+be similar in spirit to the present version, but may differ in detail to\\n+address new problems or concerns.\\n+\\n+Each version is given a distinguishing version number. If the Program\\n+specifies a version number of this License which applies to it and \\\"any\\n+later version\\\", you have the option of following the terms and conditions\\n+either of that version or of any later version published by the Free\\n+Software Foundation. If the Program does not specify a version number of\\n+this License, you may choose any version ever published by the Free Software\\n+Foundation.\\n+\\n+ 10. If you wish to incorporate parts of the Program into other free\\n+programs whose distribution conditions are different, write to the author\\n+to ask for permission. For software which is copyrighted by the Free\\n+Software Foundation, write to the Free Software Foundation; we sometimes\\n+make exceptions for this. Our decision will be guided by the two goals\\n+of preserving the free status of all derivatives of our free software and\\n+of promoting the sharing and reuse of software generally.\\n+\\n+ NO WARRANTY\\n+\\n+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\\n+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\\n+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\\n+PROVIDE THE PROGRAM \\\"AS IS\\\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\\n+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\\n+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\\n+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\\n+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\\n+REPAIR OR CORRECTION.\\n+\\n+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\\n+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\\n+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\\n+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\\n+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\\n+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\\n+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\\n+POSSIBILITY OF SUCH DAMAGES.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\n+ How to Apply These Terms to Your New Programs\\n+\\n+ If you develop a new program, and you want it to be of the greatest\\n+possible use to the public, the best way to achieve this is to make it\\n+free software which everyone can redistribute and change under these terms.\\n+\\n+ To do so, attach the following notices to the program. It is safest\\n+to attach them to the start of each source file to most effectively\\n+convey the exclusion of warranty; and each file should have at least\\n+the \\\"copyright\\\" line and a pointer to where the full notice is found.\\n+\\n+ <one line to give the program's name and a brief idea of what it does.>\\n+ Copyright (C) <year> <name of author>\\n+\\n+ This program is free software; you can redistribute it and/or modify\\n+ it under the terms of the GNU General Public License as published by\\n+ the Free Software Foundation; either version 2 of the License, or\\n+ (at your option) any later version.\\n+\\n+ This program is distributed in the hope that it will be useful,\\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\\n+ GNU General Public License for more details.\\n+\\n+ You should have received a copy of the GNU General Public License along\\n+ with this program; if not, write to the Free Software Foundation, Inc.,\\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\\n+\\n+Also add information on how to contact you by electronic and paper mail.\\n+\\n+If the program is interactive, make it output a short notice like this\\n+when it starts in an interactive mode:\\n+\\n+ Gnomovision version 69, Copyright (C) year name of author\\n+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\\n+ This is free software, and you are welcome to redistribute it\\n+ under certain conditions; type `show c' for details.\\n+\\n+The hypothetical commands `show w' and `show c' should show the appropriate\\n+parts of the General Public License. Of course, the commands you use may\\n+be called something other than `show w' and `show c'; they could even be\\n+mouse-clicks or menu items--whatever suits your program.\\n+\\n+You should also get your employer (if you work as a programmer) or your\\n+school, if any, to sign a \\\"copyright disclaimer\\\" for the program, if\\n+necessary. Here is a sample; alter the names:\\n+\\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program\\n+ `Gnomovision' (which makes passes at compilers) written by James Hacker.\\n+\\n+ <signature of Ty Coon>, 1 April 1989\\n+ Ty Coon, President of Vice\\n+\\n+This General Public License does not permit incorporating your program into\\n+proprietary programs. If your program is a subroutine library, you may\\n+consider it more useful to permit linking proprietary applications with the\\n+library. If this is what you want to do, use the GNU Lesser General\\n+Public License instead of this License.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+PyCryptodome | Public Domain and BSD-2-Clause\\n+URL: https://www.pycryptodome.org/\\n+--------------------------------------------------------------------------------\\n+The source code in PyCryptodome is partially in the public domain\\n+and partially released under the BSD 2-Clause license.\\n+\\n+In either case, there are minimal if no restrictions on the redistribution,\\n+modification and usage of the software.\\n+\\n+Public domain\\n+=============\\n+\\n+All code originating from PyCrypto is free and unencumbered software\\n+released into the public domain.\\n+\\n+Anyone is free to copy, modify, publish, use, compile, sell, or\\n+distribute this software, either in source code form or as a compiled\\n+binary, for any purpose, commercial or non-commercial, and by any\\n+means.\\n+\\n+In jurisdictions that recognize copyright laws, the author or authors\\n+of this software dedicate any and all copyright interest in the\\n+software to the public domain. We make this dedication for the benefit\\n+of the public at large and to the detriment of our heirs and\\n+successors. We intend this dedication to be an overt act of\\n+relinquishment in perpetuity of all present and future rights to this\\n+software under copyright law.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND,\\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\\n+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\\n+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\\n+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\\n+OTHER DEALINGS IN THE SOFTWARE.\\n+\\n+For more information, please refer to <http://unlicense.org>\\n+\\n+BSD license\\n+===========\\n+\\n+All direct contributions to PyCryptodome are released under the following\\n+license. The copyright of each piece belongs to the respective author.\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions are met:\\n+\\n+1. Redistributions of source code must retain the above copyright notice,\\n+ this list of conditions and the following disclaimer.\\n+\\n+2. Redistributions in binary form must reproduce the above copyright notice,\\n+ this list of conditions and the following disclaimer in the documentation\\n+ and/or other materials provided with the distribution.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \\\"AS IS\\\"\\n+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+certifi | MPL-2.0\\n+URL: https://github.com/certifi/python-certifi\\n+--------------------------------------------------------------------------------\\n+This package contains a modified version of ca-bundle.crt:\\n+\\n+ca-bundle.crt -- Bundle of CA Root Certificates\\n+\\n+This is a bundle of X.509 certificates of public Certificate Authorities\\n+(CA). These were automatically extracted from Mozilla's root certificates\\n+file (certdata.txt). This file can be found in the mozilla source tree:\\n+https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt\\n+It contains the certificates in PEM format and therefore\\n+can be directly used with curl / libcurl / php_curl, or with\\n+an Apache+mod_ssl webserver for SSL client authentication.\\n+Just configure this file as the SSLCACertificateFile.#\\n+\\n+***** BEGIN LICENSE BLOCK *****\\n+This Source Code Form is subject to the terms of the Mozilla Public License,\\n+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain\\n+one at http://mozilla.org/MPL/2.0/.\\n+\\n+***** END LICENSE BLOCK *****\\n+@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+requests | Apache-2.0\\n+URL: https://requests.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+ Apache License\\n+ Version 2.0, January 2004\\n+ http://www.apache.org/licenses/\\n+\\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\\n+\\n+ 1. Definitions.\\n+\\n+ \\\"License\\\" shall mean the terms and conditions for use, reproduction,\\n+ and distribution as defined by Sections 1 through 9 of this document.\\n+\\n+ \\\"Licensor\\\" shall mean the copyright owner or entity authorized by\\n+ the copyright owner that is granting the License.\\n+\\n+ \\\"Legal Entity\\\" shall mean the union of the acting entity and all\\n+ other entities that control, are controlled by, or are under common\\n+ control with that entity. For the purposes of this definition,\\n+ \\\"control\\\" means (i) the power, direct or indirect, to cause the\\n+ direction or management of such entity, whether by contract or\\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\\n+ outstanding shares, or (iii) beneficial ownership of such entity.\\n+\\n+ \\\"You\\\" (or \\\"Your\\\") shall mean an individual or Legal Entity\\n+ exercising permissions granted by this License.\\n+\\n+ \\\"Source\\\" form shall mean the preferred form for making modifications,\\n+ including but not limited to software source code, documentation\\n+ source, and configuration files.\\n+\\n+ \\\"Object\\\" form shall mean any form resulting from mechanical\\n+ transformation or translation of a Source form, including but\\n+ not limited to compiled object code, generated documentation,\\n+ and conversions to other media types.\\n+\\n+ \\\"Work\\\" shall mean the work of authorship, whether in Source or\\n+ Object form, made available under the License, as indicated by a\\n+ copyright notice that is included in or attached to the work\\n+ (an example is provided in the Appendix below).\\n+\\n+ \\\"Derivative Works\\\" shall mean any work, whether in Source or Object\\n+ form, that is based on (or derived from) the Work and for which the\\n+ editorial revisions, annotations, elaborations, or other modifications\\n+ represent, as a whole, an original work of authorship. For the purposes\\n+ of this License, Derivative Works shall not include works that remain\\n+ separable from, or merely link (or bind by name) to the interfaces of,\\n+ the Work and Derivative Works thereof.\\n+\\n+ \\\"Contribution\\\" shall mean any work of authorship, including\\n+ the original version of the Work and any modifications or additions\\n+ to that Work or Derivative Works thereof, that is intentionally\\n+ submitted to Licensor for inclusion in the Work by the copyright owner\\n+ or by an individual or Legal Entity authorized to submit on behalf of\\n+ the copyright owner. For the purposes of this definition, \\\"submitted\\\"\\n+ means any form of electronic, verbal, or written communication sent\\n+ to the Licensor or its representatives, including but not limited to\\n+ communication on electronic mailing lists, source code control systems,\\n+ and issue tracking systems that are managed by, or on behalf of, the\\n+ Licensor for the purpose of discussing and improving the Work, but\\n+ excluding communication that is conspicuously marked or otherwise\\n+ designated in writing by the copyright owner as \\\"Not a Contribution.\\\"\\n+\\n+ \\\"Contributor\\\" shall mean Licensor and any individual or Legal Entity\\n+ on behalf of whom a Contribution has been received by Licensor and\\n+ subsequently incorporated within the Work.\\n+\\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ copyright license to reproduce, prepare Derivative Works of,\\n+ publicly display, publicly perform, sublicense, and distribute the\\n+ Work and such Derivative Works in Source or Object form.\\n+\\n+ 3. Grant of Patent License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ (except as stated in this section) patent license to make, have made,\\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\\n+ where such license applies only to those patent claims licensable\\n+ by such Contributor that are necessarily infringed by their\\n+ Contribution(s) alone or by combination of their Contribution(s)\\n+ with the Work to which such Contribution(s) was submitted. If You\\n+ institute patent litigation against any entity (including a\\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\\n+ or a Contribution incorporated within the Work constitutes direct\\n+ or contributory patent infringement, then any patent licenses\\n+ granted to You under this License for that Work shall terminate\\n+ as of the date such litigation is filed.\\n+\\n+ 4. Redistribution. You may reproduce and distribute copies of the\\n+ Work or Derivative Works thereof in any medium, with or without\\n+ modifications, and in Source or Object form, provided that You\\n+ meet the following conditions:\\n+\\n+ (a) You must give any other recipients of the Work or\\n+ Derivative Works a copy of this License; and\\n+\\n+ (b) You must cause any modified files to carry prominent notices\\n+ stating that You changed the files; and\\n+\\n+ (c) You must retain, in the Source form of any Derivative Works\\n+ that You distribute, all copyright, patent, trademark, and\\n+ attribution notices from the Source form of the Work,\\n+ excluding those notices that do not pertain to any part of\\n+ the Derivative Works; and\\n+\\n+ (d) If the Work includes a \\\"NOTICE\\\" text file as part of its\\n+ distribution, then any Derivative Works that You distribute must\\n+ include a readable copy of the attribution notices contained\\n+ within such NOTICE file, excluding those notices that do not\\n+ pertain to any part of the Derivative Works, in at least one\\n+ of the following places: within a NOTICE text file distributed\\n+ as part of the Derivative Works; within the Source form or\\n+ documentation, if provided along with the Derivative Works; or,\\n+ within a display generated by the Derivative Works, if and\\n+ wherever such third-party notices normally appear. The contents\\n+ of the NOTICE file are for informational purposes only and\\n+ do not modify the License. You may add Your own attribution\\n+ notices within Derivative Works that You distribute, alongside\\n+ or as an addendum to the NOTICE text from the Work, provided\\n+ that such additional attribution notices cannot be construed\\n+ as modifying the License.\\n+\\n+ You may add Your own copyright statement to Your modifications and\\n+ may provide additional or different license terms and conditions\\n+ for use, reproduction, or distribution of Your modifications, or\\n+ for any such Derivative Works as a whole, provided Your use,\\n+ reproduction, and distribution of the Work otherwise complies with\\n+ the conditions stated in this License.\\n+\\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\\n+ any Contribution intentionally submitted for inclusion in the Work\\n+ by You to the Licensor shall be under the terms and conditions of\\n+ this License, without any additional terms or conditions.\\n+ Notwithstanding the above, nothing herein shall supersede or modify\\n+ the terms of any separate license agreement you may have executed\\n+ with Licensor regarding such Contributions.\\n+\\n+ 6. Trademarks. This License does not grant permission to use the trade\\n+ names, trademarks, service marks, or product names of the Licensor,\\n+ except as required for reasonable and customary use in describing the\\n+ origin of the Work and reproducing the content of the NOTICE file.\\n+\\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\\n+ agreed to in writing, Licensor provides the Work (and each\\n+ Contributor provides its Contributions) on an \\\"AS IS\\\" BASIS,\\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\\n+ implied, including, without limitation, any warranties or conditions\\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\\n+ appropriateness of using or redistributing the Work and assume any\\n+ risks associated with Your exercise of permissions under this License.\\n+\\n+ 8. Limitation of Liability. In no event and under no legal theory,\\n+ whether in tort (including negligence), contract, or otherwise,\\n+ unless required by applicable law (such as deliberate and grossly\\n+ negligent acts) or agreed to in writing, shall any Contributor be\\n+ liable to You for damages, including any direct, indirect, special,\\n+ incidental, or consequential damages of any character arising as a\\n+ result of this License or out of the use or inability to use the\\n+ Work (including but not limited to damages for loss of goodwill,\\n+ work stoppage, computer failure or malfunction, or any and all\\n+ other commercial damages or losses), even if such Contributor\\n+ has been advised of the possibility of such damages.\\n+\\n+ 9. Accepting Warranty or Additional Liability. While redistributing\\n+ the Work or Derivative Works thereof, You may choose to offer,\\n+ and charge a fee for, acceptance of support, warranty, indemnity,\\n+ or other liability obligations and/or rights consistent with this\\n+ License. However, in accepting such obligations, You may act only\\n+ on Your own behalf and on Your sole responsibility, not on behalf\\n+ of any other Contributor, and only if You agree to indemnify,\\n+ defend, and hold each Contributor harmless for any liability\\n+ incurred by, or claims asserted against, such Contributor by reason\\n+ of your accepting any such warranty or additional liability.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+charset-normalizer | MIT\\n+URL: https://charset-normalizer.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+MIT License\\n+\\n+Copyright (c) 2025 TAHRI Ahmed R.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in all\\n+copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\\n+SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+idna | BSD-3-Clause\\n+URL: https://github.com/kjd/idna\\n+--------------------------------------------------------------------------------\\n+BSD 3-Clause License\\n+\\n+Copyright (c) 2013-2025, Kim Davies and contributors.\\n+All rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions are\\n+met:\\n+\\n+1. Redistributions of source code must retain the above copyright\\n+ notice, this list of conditions and the following disclaimer.\\n+\\n+2. Redistributions in binary form must reproduce the above copyright\\n+ notice, this list of conditions and the following disclaimer in the\\n+ documentation and/or other materials provided with the distribution.\\n+\\n+3. Neither the name of the copyright holder nor the names of its\\n+ contributors may be used to endorse or promote products derived from\\n+ this software without specific prior written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\n+\\\"AS IS\\\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\n+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\\n+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\\n+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+urllib3 | MIT\\n+URL: https://urllib3.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+MIT License\\n+\\n+Copyright (c) 2008-2020 Andrey Petrov and contributors.\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in all\\n+copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\\n+SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+SecretStorage | BSD-3-Clause\\n+Note: Only included in Linux builds\\n+URL: https://secretstorage.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+Copyright 2012-2018 Dmitry Shachnev <mitya57@gmail.com>\\n+All rights reserved.\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions are met:\\n+\\n+1. Redistributions of source code must retain the above copyright notice, this\\n+ list of conditions and the following disclaimer.\\n+2. Redistributions in binary form must reproduce the above copyright notice,\\n+ this list of conditions and the following disclaimer in the documentation\\n+ and/or other materials provided with the distribution.\\n+3. Neither the name of the University nor the names of its contributors may be\\n+ used to endorse or promote products derived from this software without\\n+ specific prior written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \\\"AS IS\\\" AND\\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\\n+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY\\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+cryptography | Apache-2.0\\n+Note: Only included in Linux builds\\n+URL: https://cryptography.io/\\n+--------------------------------------------------------------------------------\\n+ Apache License\\n+ Version 2.0, January 2004\\n+ https://www.apache.org/licenses/\\n+\\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\\n+\\n+ 1. Definitions.\\n+\\n+ \\\"License\\\" shall mean the terms and conditions for use, reproduction,\\n+ and distribution as defined by Sections 1 through 9 of this document.\\n+\\n+ \\\"Licensor\\\" shall mean the copyright owner or entity authorized by\\n+ the copyright owner that is granting the License.\\n+\\n+ \\\"Legal Entity\\\" shall mean the union of the acting entity and all\\n+ other entities that control, are controlled by, or are under common\\n+ control with that entity. For the purposes of this definition,\\n+ \\\"control\\\" means (i) the power, direct or indirect, to cause the\\n+ direction or management of such entity, whether by contract or\\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\\n+ outstanding shares, or (iii) beneficial ownership of such entity.\\n+\\n+ \\\"You\\\" (or \\\"Your\\\") shall mean an individual or Legal Entity\\n+ exercising permissions granted by this License.\\n+\\n+ \\\"Source\\\" form shall mean the preferred form for making modifications,\\n+ including but not limited to software source code, documentation\\n+ source, and configuration files.\\n+\\n+ \\\"Object\\\" form shall mean any form resulting from mechanical\\n+ transformation or translation of a Source form, including but\\n+ not limited to compiled object code, generated documentation,\\n+ and conversions to other media types.\\n+\\n+ \\\"Work\\\" shall mean the work of authorship, whether in Source or\\n+ Object form, made available under the License, as indicated by a\\n+ copyright notice that is included in or attached to the work\\n+ (an example is provided in the Appendix below).\\n+\\n+ \\\"Derivative Works\\\" shall mean any work, whether in Source or Object\\n+ form, that is based on (or derived from) the Work and for which the\\n+ editorial revisions, annotations, elaborations, or other modifications\\n+ represent, as a whole, an original work of authorship. For the purposes\\n+ of this License, Derivative Works shall not include works that remain\\n+ separable from, or merely link (or bind by name) to the interfaces of,\\n+ the Work and Derivative Works thereof.\\n+\\n+ \\\"Contribution\\\" shall mean any work of authorship, including\\n+ the original version of the Work and any modifications or additions\\n+ to that Work or Derivative Works thereof, that is intentionally\\n+ submitted to Licensor for inclusion in the Work by the copyright owner\\n+ or by an individual or Legal Entity authorized to submit on behalf of\\n+ the copyright owner. For the purposes of this definition, \\\"submitted\\\"\\n+ means any form of electronic, verbal, or written communication sent\\n+ to the Licensor or its representatives, including but not limited to\\n+ communication on electronic mailing lists, source code control systems,\\n+ and issue tracking systems that are managed by, or on behalf of, the\\n+ Licensor for the purpose of discussing and improving the Work, but\\n+ excluding communication that is conspicuously marked or otherwise\\n+ designated in writing by the copyright owner as \\\"Not a Contribution.\\\"\\n+\\n+ \\\"Contributor\\\" shall mean Licensor and any individual or Legal Entity\\n+ on behalf of whom a Contribution has been received by Licensor and\\n+ subsequently incorporated within the Work.\\n+\\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ copyright license to reproduce, prepare Derivative Works of,\\n+ publicly display, publicly perform, sublicense, and distribute the\\n+ Work and such Derivative Works in Source or Object form.\\n+\\n+ 3. Grant of Patent License. Subject to the terms and conditions of\\n+ this License, each Contributor hereby grants to You a perpetual,\\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\\n+ (except as stated in this section) patent license to make, have made,\\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\\n+ where such license applies only to those patent claims licensable\\n+ by such Contributor that are necessarily infringed by their\\n+ Contribution(s) alone or by combination of their Contribution(s)\\n+ with the Work to which such Contribution(s) was submitted. If You\\n+ institute patent litigation against any entity (including a\\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\\n+ or a Contribution incorporated within the Work constitutes direct\\n+ or contributory patent infringement, then any patent licenses\\n+ granted to You under this License for that Work shall terminate\\n+ as of the date such litigation is filed.\\n+\\n+ 4. Redistribution. You may reproduce and distribute copies of the\\n+ Work or Derivative Works thereof in any medium, with or without\\n+ modifications, and in Source or Object form, provided that You\\n+ meet the following conditions:\\n+\\n+ (a) You must give any other recipients of the Work or\\n+ Derivative Works a copy of this License; and\\n+\\n+ (b) You must cause any modified files to carry prominent notices\\n+ stating that You changed the files; and\\n+\\n+ (c) You must retain, in the Source form of any Derivative Works\\n+ that You distribute, all copyright, patent, trademark, and\\n+ attribution notices from the Source form of the Work,\\n+ excluding those notices that do not pertain to any part of\\n+ the Derivative Works; and\\n+\\n+ (d) If the Work includes a \\\"NOTICE\\\" text file as part of its\\n+ distribution, then any Derivative Works that You distribute must\\n+ include a readable copy of the attribution notices contained\\n+ within such NOTICE file, excluding those notices that do not\\n+ pertain to any part of the Derivative Works, in at least one\\n+ of the following places: within a NOTICE text file distributed\\n+ as part of the Derivative Works; within the Source form or\\n+ documentation, if provided along with the Derivative Works; or,\\n+ within a display generated by the Derivative Works, if and\\n+ wherever such third-party notices normally appear. The contents\\n+ of the NOTICE file are for informational purposes only and\\n+ do not modify the License. You may add Your own attribution\\n+ notices within Derivative Works that You distribute, alongside\\n+ or as an addendum to the NOTICE text from the Work, provided\\n+ that such additional attribution notices cannot be construed\\n+ as modifying the License.\\n+\\n+ You may add Your own copyright statement to Your modifications and\\n+ may provide additional or different license terms and conditions\\n+ for use, reproduction, or distribution of Your modifications, or\\n+ for any such Derivative Works as a whole, provided Your use,\\n+ reproduction, and distribution of the Work otherwise complies with\\n+ the conditions stated in this License.\\n+\\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\\n+ any Contribution intentionally submitted for inclusion in the Work\\n+ by You to the Licensor shall be under the terms and conditions of\\n+ this License, without any additional terms or conditions.\\n+ Notwithstanding the above, nothing herein shall supersede or modify\\n+ the terms of any separate license agreement you may have executed\\n+ with Licensor regarding such Contributions.\\n+\\n+ 6. Trademarks. This License does not grant permission to use the trade\\n+ names, trademarks, service marks, or product names of the Licensor,\\n+ except as required for reasonable and customary use in describing the\\n+ origin of the Work and reproducing the content of the NOTICE file.\\n+\\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\\n+ agreed to in writing, Licensor provides the Work (and each\\n+ Contributor provides its Contributions) on an \\\"AS IS\\\" BASIS,\\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\\n+ implied, including, without limitation, any warranties or conditions\\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\\n+ appropriateness of using or redistributing the Work and assume any\\n+ risks associated with Your exercise of permissions under this License.\\n+\\n+ 8. Limitation of Liability. In no event and under no legal theory,\\n+ whether in tort (including negligence), contract, or otherwise,\\n+ unless required by applicable law (such as deliberate and grossly\\n+ negligent acts) or agreed to in writing, shall any Contributor be\\n+ liable to You for damages, including any direct, indirect, special,\\n+ incidental, or consequential damages of any character arising as a\\n+ result of this License or out of the use or inability to use the\\n+ Work (including but not limited to damages for loss of goodwill,\\n+ work stoppage, computer failure or malfunction, or any and all\\n+ other commercial damages or losses), even if such Contributor\\n+ has been advised of the possibility of such damages.\\n+\\n+ 9. Accepting Warranty or Additional Liability. While redistributing\\n+ the Work or Derivative Works thereof, You may choose to offer,\\n+ and charge a fee for, acceptance of support, warranty, indemnity,\\n+ or other liability obligations and/or rights consistent with this\\n+ License. However, in accepting such obligations, You may act only\\n+ on Your own behalf and on Your sole responsibility, not on behalf\\n+ of any other Contributor, and only if You agree to indemnify,\\n+ defend, and hold each Contributor harmless for any liability\\n+ incurred by, or claims asserted against, such Contributor by reason\\n+ of your accepting any such warranty or additional liability.\\n+\\n+ END OF TERMS AND CONDITIONS\\n+\\n+ APPENDIX: How to apply the Apache License to your work.\\n+\\n+ To apply the Apache License to your work, attach the following\\n+ boilerplate notice, with the fields enclosed by brackets \\\"[]\\\"\\n+ replaced with your own identifying information. (Don't include\\n+ the brackets!) The text should be enclosed in the appropriate\\n+ comment syntax for the file format. We also recommend that a\\n+ file or class name and description of purpose be included on the\\n+ same \\\"printed page\\\" as the copyright notice for easier\\n+ identification within third-party archives.\\n+\\n+ Copyright [yyyy] [name of copyright owner]\\n+\\n+ Licensed under the Apache License, Version 2.0 (the \\\"License\\\");\\n+ you may not use this file except in compliance with the License.\\n+ You may obtain a copy of the License at\\n+\\n+ https://www.apache.org/licenses/LICENSE-2.0\\n+\\n+ Unless required by applicable law or agreed to in writing, software\\n+ distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n+ See the License for the specific language governing permissions and\\n+ limitations under the License.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+Jeepney | MIT\\n+Note: Only included in Linux builds\\n+URL: https://jeepney.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+The MIT License (MIT)\\n+\\n+Copyright (c) 2017 Thomas Kluyver\\n+\\n+Permission is hereby granted, free of charge, to any person obtaining a copy\\n+of this software and associated documentation files (the \\\"Software\\\"), to deal\\n+in the Software without restriction, including without limitation the rights\\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\\n+copies of the Software, and to permit persons to whom the Software is\\n+furnished to do so, subject to the following conditions:\\n+\\n+The above copyright notice and this permission notice shall be included in\\n+all copies or substantial portions of the Software.\\n+\\n+THE SOFTWARE IS PROVIDED \\\"AS IS\\\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\\n+THE SOFTWARE.\\n+\\n+\\n+\\n+--------------------------------------------------------------------------------\\n+websockets | BSD-3-Clause\\n+URL: https://websockets.readthedocs.io/\\n+--------------------------------------------------------------------------------\\n+Copyright (c) Aymeric Augustin and contributors\\n+\\n+Redistribution and use in source and binary forms, with or without\\n+modification, are permitted provided that the following conditions are met:\\n+\\n+ * Redistributions of source code must retain the above copyright notice,\\n+ this list of conditions and the following disclaimer.\\n+ * Redistributions in binary form must reproduce the above copyright notice,\\n+ this list of conditions and the following disclaimer in the documentation\\n+ and/or other materials provided with the distribution.\\n+ * Neither the name of the copyright holder nor the names of its contributors\\n+ may be used to endorse or promote products derived from this software\\n+ without specific prior written permission.\\n+\\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \\\"AS IS\\\" AND\\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\n\",\n \"summary\": \"Edited 2 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \".github/workflows/release.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\\nindex 911bdaf6afee..ab02f59beec8 100644\\n--- a/.github/workflows/release.yml\\n+++ b/.github/workflows/release.yml\\n@@ -269,12 +269,11 @@ jobs:\\n \\\"[]\\\" \\\\\\n \\\"(https://github.com/${MASTER_REPO}/releases/latest \\\\\\\"Master builds\\\\\\\")\\\" >> ./RELEASE_NOTES\\n fi\\n- printf '\\\\n\\\\n' >> ./RELEASE_NOTES\\n- cat >> ./RELEASE_NOTES << EOF\\n- #### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\\n- ---\\n- $(python ./devscripts/make_changelog.py -vv --collapsible)\\n- EOF\\n+ printf '\\\\n\\\\n%s\\\\n\\\\n%s%s\\\\n\\\\n---\\\\n' \\\\\\n+ \\\"#### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\\\" \\\\\\n+ \\\"The PyInstaller-bundled executables are subject to the licenses described in \\\" \\\\\\n+ \\\"[THIRD_PARTY_LICENSES.txt](https://github.com/${BASE_REPO}/blob/master/THIRD_PARTY_LICENSES.txt)\\\" >> ./RELEASE_NOTES\\n+ python ./devscripts/make_changelog.py -vv --collapsible >> ./RELEASE_NOTES\\n printf '%s\\\\n\\\\n' '**This is a pre-release build**' >> ./PRERELEASE_NOTES\\n cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES\\n printf '%s\\\\n\\\\n' \\\"Generated from: https://github.com/${REPOSITORY}/commit/${HEAD_SHA}\\\" >> ./ARCHIVE_NOTES\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"bundle/pyinstaller.py\"\n ],\n \"solution_diff\": \"diff --git a/bundle/pyinstaller.py b/bundle/pyinstaller.py\\nindex 8286f077abb2..422b9d0c741a 100755\\n--- a/bundle/pyinstaller.py\\n+++ b/bundle/pyinstaller.py\\n@@ -129,7 +129,6 @@ def windows_set_version(exe, version):\\n StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),\\n StringStruct('FileVersion', version),\\n StringStruct('InternalName', f'yt-dlp{suffix}'),\\n- StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),\\n StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),\\n StringStruct('ProductName', f'yt-dlp{suffix}'),\\n StringStruct(\\n\",\n \"summary\": \"Edited 1 file(s) in bundle/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"devscripts/generate_third_party_licenses.py\"\n ],\n \"solution_diff\": \"diff --git a/devscripts/generate_third_party_licenses.py b/devscripts/generate_third_party_licenses.py\\nnew file mode 100644\\nindex 000000000000..db615d2e352e\\n--- /dev/null\\n+++ b/devscripts/generate_third_party_licenses.py\\n@@ -0,0 +1,316 @@\\n+import requests\\n+from dataclasses import dataclass\\n+from pathlib import Path\\n+import hashlib\\n+\\n+DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'\\n+CACHE_LOCATION = '.license_cache'\\n+HEADER = '''THIRD-PARTY LICENSES\\n+\\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\\n+Source code for bundled third-party components is available from the original projects.\\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''\\n+\\n+\\n+@dataclass(frozen=True)\\n+class Dependency:\\n+ name: str\\n+ license_url: str\\n+ project_url: str = ''\\n+ license: str = ''\\n+ comment: str = ''\\n+\\n+\\n+DEPENDENCIES: list[Dependency] = [\\n+ # Core runtime environment components\\n+ Dependency(\\n+ name='Python',\\n+ license='PSF-2.0',\\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',\\n+ project_url='https://www.python.org/',\\n+ ),\\n+ Dependency(\\n+ name='Microsoft Distributable Code',\\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',\\n+ comment='Only included in Windows builds',\\n+ ),\\n+ Dependency(\\n+ name='bzip2',\\n+ license='bzip2-1.0.6',\\n+ license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',\\n+ project_url='https://sourceware.org/bzip2/',\\n+ ),\\n+ Dependency(\\n+ name='libffi',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',\\n+ project_url='https://sourceware.org/libffi/',\\n+ ),\\n+ Dependency(\\n+ name='OpenSSL 3.0+',\\n+ license='Apache-2.0',\\n+ license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',\\n+ project_url='https://www.openssl.org/',\\n+ ),\\n+ Dependency(\\n+ name='SQLite',\\n+ license='Public Domain', # Technically does not need to be included\\n+ license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',\\n+ project_url='https://www.sqlite.org/',\\n+ ),\\n+ Dependency(\\n+ name='liblzma',\\n+ license='0BSD', # Technically does not need to be included\\n+ license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',\\n+ project_url='https://tukaani.org/xz/',\\n+ ),\\n+ Dependency(\\n+ name='mpdecimal',\\n+ license='BSD-2-Clause',\\n+ # No official repo URL\\n+ license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',\\n+ project_url='https://www.bytereef.org/mpdecimal/',\\n+ ),\\n+ Dependency(\\n+ name='zlib',\\n+ license='zlib',\\n+ license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',\\n+ project_url='https://zlib.net/',\\n+ ),\\n+ Dependency(\\n+ name='Expat',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',\\n+ project_url='https://libexpat.github.io/',\\n+ ),\\n+ Dependency(\\n+ name='ncurses',\\n+ license='X11-distribute-modifications-variant',\\n+ license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',\\n+ comment='Only included in Linux/macOS builds',\\n+ project_url='https://invisible-island.net/ncurses/',\\n+ ),\\n+ Dependency(\\n+ name='GNU Readline',\\n+ license='GPL-3.0-or-later',\\n+ license_url='https://tiswww.case.edu/php/chet/readline/COPYING',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://www.gnu.org/software/readline/',\\n+ ),\\n+ Dependency(\\n+ name='libstdc++',\\n+ license='GPL-3.0-with-GCC-exception',\\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',\\n+ ),\\n+ Dependency(\\n+ name='libgcc',\\n+ license='GPL-3.0-with-GCC-exception',\\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://gcc.gnu.org/',\\n+ ),\\n+ Dependency(\\n+ name='libuuid',\\n+ license='BSD-3-Clause',\\n+ license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',\\n+ ),\\n+ Dependency(\\n+ name='libintl',\\n+ license='LGPL-2.1-or-later',\\n+ license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/gettext/',\\n+ ),\\n+ Dependency(\\n+ name='libidn2',\\n+ license='LGPL-3.0-or-later',\\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libidn/',\\n+ ),\\n+ Dependency(\\n+ name='libidn2 (Unicode character data files)',\\n+ license='Unicode-TOU AND Unicode-DFS-2016',\\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libidn/',\\n+ ),\\n+ Dependency(\\n+ name='libunistring',\\n+ license='LGPL-3.0-or-later',\\n+ license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libunistring/',\\n+ ),\\n+ Dependency(\\n+ name='librtmp',\\n+ license='LGPL-2.1-or-later',\\n+ # No official repo URL\\n+ license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://rtmpdump.mplayerhq.hu/',\\n+ ),\\n+ Dependency(\\n+ name='zstd',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://facebook.github.io/zstd/',\\n+ ),\\n+\\n+ # Python packages\\n+ Dependency(\\n+ name='brotli',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',\\n+ project_url='https://brotli.org/',\\n+ ),\\n+ Dependency(\\n+ name='curl_cffi',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',\\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\\n+ project_url='https://curl-cffi.readthedocs.io/',\\n+ ),\\n+ # Dependency of curl_cffi\\n+ Dependency(\\n+ name='curl-impersonate',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',\\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\\n+ project_url='https://github.com/lexiforest/curl-impersonate',\\n+ ),\\n+ Dependency(\\n+ name='cffi',\\n+ license='MIT-0', # Technically does not need to be included\\n+ license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',\\n+ project_url='https://cffi.readthedocs.io/',\\n+ ),\\n+ # Dependecy of cffi\\n+ Dependency(\\n+ name='pycparser',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',\\n+ project_url='https://github.com/eliben/pycparser',\\n+ ),\\n+ Dependency(\\n+ name='mutagen',\\n+ license='GPL-2.0-or-later',\\n+ license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',\\n+ project_url='https://mutagen.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='PyCryptodome',\\n+ license='Public Domain and BSD-2-Clause',\\n+ license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',\\n+ project_url='https://www.pycryptodome.org/',\\n+ ),\\n+ Dependency(\\n+ name='certifi',\\n+ license='MPL-2.0',\\n+ license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',\\n+ project_url='https://github.com/certifi/python-certifi',\\n+ ),\\n+ Dependency(\\n+ name='requests',\\n+ license='Apache-2.0',\\n+ license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',\\n+ project_url='https://requests.readthedocs.io/',\\n+ ),\\n+ # Dependency of requests\\n+ Dependency(\\n+ name='charset-normalizer',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',\\n+ project_url='https://charset-normalizer.readthedocs.io/',\\n+ ),\\n+ # Dependency of requests\\n+ Dependency(\\n+ name='idna',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',\\n+ project_url='https://github.com/kjd/idna',\\n+ ),\\n+ Dependency(\\n+ name='urllib3',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',\\n+ project_url='https://urllib3.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='SecretStorage',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://secretstorage.readthedocs.io/',\\n+ ),\\n+ # Dependency of SecretStorage\\n+ Dependency(\\n+ name='cryptography',\\n+ license='Apache-2.0', # Also available as BSD-3-Clause\\n+ license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://cryptography.io/',\\n+ ),\\n+ # Dependency of SecretStorage\\n+ Dependency(\\n+ name='Jeepney',\\n+ license='MIT',\\n+ license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://jeepney.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='websockets',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',\\n+ project_url='https://websockets.readthedocs.io/',\\n+ ),\\n+]\\n+\\n+\\n+def fetch_text(dep: Dependency) -> str:\\n+ cache_dir = Path(CACHE_LOCATION)\\n+ cache_dir.mkdir(exist_ok=True)\\n+ url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()\\n+ cache_file = cache_dir / f'{url_hash}.txt'\\n+\\n+ if cache_file.exists():\\n+ return cache_file.read_text()\\n+\\n+ # UA needed since some domains block requests default UA\\n+ req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})\\n+ req.raise_for_status()\\n+ text = req.text\\n+ cache_file.write_text(text)\\n+ return text\\n+\\n+\\n+def build_output() -> str:\\n+ lines = [HEADER]\\n+ for d in DEPENDENCIES:\\n+ lines.append('\\\\n')\\n+ lines.append('-' * 80)\\n+ header = f'{d.name}'\\n+ if d.license:\\n+ header += f' | {d.license}'\\n+ if d.comment:\\n+ header += f'\\\\nNote: {d.comment}'\\n+ if d.project_url:\\n+ header += f'\\\\nURL: {d.project_url}'\\n+ lines.append(header)\\n+ lines.append('-' * 80)\\n+\\n+ text = fetch_text(d)\\n+ lines.append(text.strip('\\\\n') + '\\\\n')\\n+ return '\\\\n'.join(lines)\\n+\\n+\\n+if __name__ == '__main__':\\n+ content = build_output()\\n+ Path(DEFAULT_OUTPUT).write_text(content)\\n\",\n \"summary\": \"Edited 1 file(s) in devscripts/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"```suggestion\r\nWhile yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\r\n\r\nMost notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\r\n\r\nSee [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\r\n\r\nThe zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\r\n```","revised_diff":"diff --git a/README.md b/README.md\nindex e582e1e53cbe..7be3266ea54c 100644\n--- a/README.md\n+++ b/README.md\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import\n gpg --verify SHA2-256SUMS.sig SHA2-256SUMS\n gpg --verify SHA2-512SUMS.sig SHA2-512SUMS\n ```\n+\n+#### Licensing\n+\n+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\n+\n+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\n+\n+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\n+\n+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\n+\n <!-- MANPAGE: END EXCLUDED SECTION -->\n \n **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)\n"},{"subtask_id":"s4","comment":"I would like to put the note and URL on their own lines to prevent very long lines\r\n```suggestion\r\n header = f'{d.name}'\r\n if d.license:\r\n header += f' | {d.license}'\r\n if d.comment:\r\n header += f'\\nNote: {d.comment}'\r\n if d.project_url:\r\n header += f'\\nURL: {d.project_url}'\r\n lines.append(header)\r\n```","revised_diff":"diff --git a/devscripts/generate_third_party_licenses.py b/devscripts/generate_third_party_licenses.py\nnew file mode 100644\nindex 000000000000..db615d2e352e\n--- /dev/null\n+++ b/devscripts/generate_third_party_licenses.py\n@@ -0,0 +1,316 @@\n+import requests\n+from dataclasses import dataclass\n+from pathlib import Path\n+import hashlib\n+\n+DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'\n+CACHE_LOCATION = '.license_cache'\n+HEADER = '''THIRD-PARTY LICENSES\n+\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\n+Source code for bundled third-party components is available from the original projects.\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''\n+\n+\n+@dataclass(frozen=True)\n+class Dependency:\n+ name: str\n+ license_url: str\n+ project_url: str = ''\n+ license: str = ''\n+ comment: str = ''\n+\n+\n+DEPENDENCIES: list[Dependency] = [\n+ # Core runtime environment components\n+ Dependency(\n+ name='Python',\n+ license='PSF-2.0',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',\n+ project_url='https://www.python.org/',\n+ ),\n+ Dependency(\n+ name='Microsoft Distributable Code',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',\n+ comment='Only included in Windows builds',\n+ ),\n+ Dependency(\n+ name='bzip2',\n+ license='bzip2-1.0.6',\n+ license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',\n+ project_url='https://sourceware.org/bzip2/',\n+ ),\n+ Dependency(\n+ name='libffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',\n+ project_url='https://sourceware.org/libffi/',\n+ ),\n+ Dependency(\n+ name='OpenSSL 3.0+',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',\n+ project_url='https://www.openssl.org/',\n+ ),\n+ Dependency(\n+ name='SQLite',\n+ license='Public Domain', # Technically does not need to be included\n+ license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',\n+ project_url='https://www.sqlite.org/',\n+ ),\n+ Dependency(\n+ name='liblzma',\n+ license='0BSD', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',\n+ project_url='https://tukaani.org/xz/',\n+ ),\n+ Dependency(\n+ name='mpdecimal',\n+ license='BSD-2-Clause',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',\n+ project_url='https://www.bytereef.org/mpdecimal/',\n+ ),\n+ Dependency(\n+ name='zlib',\n+ license='zlib',\n+ license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',\n+ project_url='https://zlib.net/',\n+ ),\n+ Dependency(\n+ name='Expat',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',\n+ project_url='https://libexpat.github.io/',\n+ ),\n+ Dependency(\n+ name='ncurses',\n+ license='X11-distribute-modifications-variant',\n+ license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',\n+ comment='Only included in Linux/macOS builds',\n+ project_url='https://invisible-island.net/ncurses/',\n+ ),\n+ Dependency(\n+ name='GNU Readline',\n+ license='GPL-3.0-or-later',\n+ license_url='https://tiswww.case.edu/php/chet/readline/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://www.gnu.org/software/readline/',\n+ ),\n+ Dependency(\n+ name='libstdc++',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',\n+ ),\n+ Dependency(\n+ name='libgcc',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/',\n+ ),\n+ Dependency(\n+ name='libuuid',\n+ license='BSD-3-Clause',\n+ license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',\n+ ),\n+ Dependency(\n+ name='libintl',\n+ license='LGPL-2.1-or-later',\n+ license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/gettext/',\n+ ),\n+ Dependency(\n+ name='libidn2',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libidn2 (Unicode character data files)',\n+ license='Unicode-TOU AND Unicode-DFS-2016',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libunistring',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libunistring/',\n+ ),\n+ Dependency(\n+ name='librtmp',\n+ license='LGPL-2.1-or-later',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',\n+ comment='Only included in macOS builds',\n+ project_url='https://rtmpdump.mplayerhq.hu/',\n+ ),\n+ Dependency(\n+ name='zstd',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',\n+ comment='Only included in macOS builds',\n+ project_url='https://facebook.github.io/zstd/',\n+ ),\n+\n+ # Python packages\n+ Dependency(\n+ name='brotli',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',\n+ project_url='https://brotli.org/',\n+ ),\n+ Dependency(\n+ name='curl_cffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://curl-cffi.readthedocs.io/',\n+ ),\n+ # Dependency of curl_cffi\n+ Dependency(\n+ name='curl-impersonate',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://github.com/lexiforest/curl-impersonate',\n+ ),\n+ Dependency(\n+ name='cffi',\n+ license='MIT-0', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',\n+ project_url='https://cffi.readthedocs.io/',\n+ ),\n+ # Dependecy of cffi\n+ Dependency(\n+ name='pycparser',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',\n+ project_url='https://github.com/eliben/pycparser',\n+ ),\n+ Dependency(\n+ name='mutagen',\n+ license='GPL-2.0-or-later',\n+ license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',\n+ project_url='https://mutagen.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='PyCryptodome',\n+ license='Public Domain and BSD-2-Clause',\n+ license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',\n+ project_url='https://www.pycryptodome.org/',\n+ ),\n+ Dependency(\n+ name='certifi',\n+ license='MPL-2.0',\n+ license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',\n+ project_url='https://github.com/certifi/python-certifi',\n+ ),\n+ Dependency(\n+ name='requests',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',\n+ project_url='https://requests.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='charset-normalizer',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',\n+ project_url='https://charset-normalizer.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='idna',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',\n+ project_url='https://github.com/kjd/idna',\n+ ),\n+ Dependency(\n+ name='urllib3',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',\n+ project_url='https://urllib3.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='SecretStorage',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://secretstorage.readthedocs.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='cryptography',\n+ license='Apache-2.0', # Also available as BSD-3-Clause\n+ license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',\n+ comment='Only included in Linux builds',\n+ project_url='https://cryptography.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='Jeepney',\n+ license='MIT',\n+ license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://jeepney.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='websockets',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',\n+ project_url='https://websockets.readthedocs.io/',\n+ ),\n+]\n+\n+\n+def fetch_text(dep: Dependency) -> str:\n+ cache_dir = Path(CACHE_LOCATION)\n+ cache_dir.mkdir(exist_ok=True)\n+ url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()\n+ cache_file = cache_dir / f'{url_hash}.txt'\n+\n+ if cache_file.exists():\n+ return cache_file.read_text()\n+\n+ # UA needed since some domains block requests default UA\n+ req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})\n+ req.raise_for_status()\n+ text = req.text\n+ cache_file.write_text(text)\n+ return text\n+\n+\n+def build_output() -> str:\n+ lines = [HEADER]\n+ for d in DEPENDENCIES:\n+ lines.append('\\n')\n+ lines.append('-' * 80)\n+ header = f'{d.name}'\n+ if d.license:\n+ header += f' | {d.license}'\n+ if d.comment:\n+ header += f'\\nNote: {d.comment}'\n+ if d.project_url:\n+ header += f'\\nURL: {d.project_url}'\n+ lines.append(header)\n+ lines.append('-' * 80)\n+\n+ text = fetch_text(d)\n+ lines.append(text.strip('\\n') + '\\n')\n+ return '\\n'.join(lines)\n+\n+\n+if __name__ == '__main__':\n+ content = build_output()\n+ Path(DEFAULT_OUTPUT).write_text(content)\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"```suggestion\\r\\nWhile yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\\r\\n\\r\\nMost notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\\r\\n\\r\\nSee [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\\r\\n\\r\\nThe zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\\r\\n```\",\n \"revised_diff\": \"diff --git a/README.md b/README.md\\nindex e582e1e53cbe..7be3266ea54c 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import\\n gpg --verify SHA2-256SUMS.sig SHA2-256SUMS\\n gpg --verify SHA2-512SUMS.sig SHA2-512SUMS\\n ```\\n+\\n+#### Licensing\\n+\\n+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\\n+\\n+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\\n+\\n+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\\n+\\n+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\\n+\\n <!-- MANPAGE: END EXCLUDED SECTION -->\\n \\n **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)\\n\"\n },\n {\n \"subtask_id\": \"s4\",\n \"comment\": \"I would like to put the note and URL on their own lines to prevent very long lines\\r\\n```suggestion\\r\\n header = f'{d.name}'\\r\\n if d.license:\\r\\n header += f' | {d.license}'\\r\\n if d.comment:\\r\\n header += f'\\\\nNote: {d.comment}'\\r\\n if d.project_url:\\r\\n header += f'\\\\nURL: {d.project_url}'\\r\\n lines.append(header)\\r\\n```\",\n \"revised_diff\": \"diff --git a/devscripts/generate_third_party_licenses.py b/devscripts/generate_third_party_licenses.py\\nnew file mode 100644\\nindex 000000000000..db615d2e352e\\n--- /dev/null\\n+++ b/devscripts/generate_third_party_licenses.py\\n@@ -0,0 +1,316 @@\\n+import requests\\n+from dataclasses import dataclass\\n+from pathlib import Path\\n+import hashlib\\n+\\n+DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'\\n+CACHE_LOCATION = '.license_cache'\\n+HEADER = '''THIRD-PARTY LICENSES\\n+\\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\\n+Source code for bundled third-party components is available from the original projects.\\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''\\n+\\n+\\n+@dataclass(frozen=True)\\n+class Dependency:\\n+ name: str\\n+ license_url: str\\n+ project_url: str = ''\\n+ license: str = ''\\n+ comment: str = ''\\n+\\n+\\n+DEPENDENCIES: list[Dependency] = [\\n+ # Core runtime environment components\\n+ Dependency(\\n+ name='Python',\\n+ license='PSF-2.0',\\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',\\n+ project_url='https://www.python.org/',\\n+ ),\\n+ Dependency(\\n+ name='Microsoft Distributable Code',\\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',\\n+ comment='Only included in Windows builds',\\n+ ),\\n+ Dependency(\\n+ name='bzip2',\\n+ license='bzip2-1.0.6',\\n+ license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',\\n+ project_url='https://sourceware.org/bzip2/',\\n+ ),\\n+ Dependency(\\n+ name='libffi',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',\\n+ project_url='https://sourceware.org/libffi/',\\n+ ),\\n+ Dependency(\\n+ name='OpenSSL 3.0+',\\n+ license='Apache-2.0',\\n+ license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',\\n+ project_url='https://www.openssl.org/',\\n+ ),\\n+ Dependency(\\n+ name='SQLite',\\n+ license='Public Domain', # Technically does not need to be included\\n+ license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',\\n+ project_url='https://www.sqlite.org/',\\n+ ),\\n+ Dependency(\\n+ name='liblzma',\\n+ license='0BSD', # Technically does not need to be included\\n+ license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',\\n+ project_url='https://tukaani.org/xz/',\\n+ ),\\n+ Dependency(\\n+ name='mpdecimal',\\n+ license='BSD-2-Clause',\\n+ # No official repo URL\\n+ license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',\\n+ project_url='https://www.bytereef.org/mpdecimal/',\\n+ ),\\n+ Dependency(\\n+ name='zlib',\\n+ license='zlib',\\n+ license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',\\n+ project_url='https://zlib.net/',\\n+ ),\\n+ Dependency(\\n+ name='Expat',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',\\n+ project_url='https://libexpat.github.io/',\\n+ ),\\n+ Dependency(\\n+ name='ncurses',\\n+ license='X11-distribute-modifications-variant',\\n+ license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',\\n+ comment='Only included in Linux/macOS builds',\\n+ project_url='https://invisible-island.net/ncurses/',\\n+ ),\\n+ Dependency(\\n+ name='GNU Readline',\\n+ license='GPL-3.0-or-later',\\n+ license_url='https://tiswww.case.edu/php/chet/readline/COPYING',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://www.gnu.org/software/readline/',\\n+ ),\\n+ Dependency(\\n+ name='libstdc++',\\n+ license='GPL-3.0-with-GCC-exception',\\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',\\n+ ),\\n+ Dependency(\\n+ name='libgcc',\\n+ license='GPL-3.0-with-GCC-exception',\\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://gcc.gnu.org/',\\n+ ),\\n+ Dependency(\\n+ name='libuuid',\\n+ license='BSD-3-Clause',\\n+ license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',\\n+ ),\\n+ Dependency(\\n+ name='libintl',\\n+ license='LGPL-2.1-or-later',\\n+ license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/gettext/',\\n+ ),\\n+ Dependency(\\n+ name='libidn2',\\n+ license='LGPL-3.0-or-later',\\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libidn/',\\n+ ),\\n+ Dependency(\\n+ name='libidn2 (Unicode character data files)',\\n+ license='Unicode-TOU AND Unicode-DFS-2016',\\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libidn/',\\n+ ),\\n+ Dependency(\\n+ name='libunistring',\\n+ license='LGPL-3.0-or-later',\\n+ license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://www.gnu.org/software/libunistring/',\\n+ ),\\n+ Dependency(\\n+ name='librtmp',\\n+ license='LGPL-2.1-or-later',\\n+ # No official repo URL\\n+ license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://rtmpdump.mplayerhq.hu/',\\n+ ),\\n+ Dependency(\\n+ name='zstd',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',\\n+ comment='Only included in macOS builds',\\n+ project_url='https://facebook.github.io/zstd/',\\n+ ),\\n+\\n+ # Python packages\\n+ Dependency(\\n+ name='brotli',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',\\n+ project_url='https://brotli.org/',\\n+ ),\\n+ Dependency(\\n+ name='curl_cffi',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',\\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\\n+ project_url='https://curl-cffi.readthedocs.io/',\\n+ ),\\n+ # Dependency of curl_cffi\\n+ Dependency(\\n+ name='curl-impersonate',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',\\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\\n+ project_url='https://github.com/lexiforest/curl-impersonate',\\n+ ),\\n+ Dependency(\\n+ name='cffi',\\n+ license='MIT-0', # Technically does not need to be included\\n+ license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',\\n+ project_url='https://cffi.readthedocs.io/',\\n+ ),\\n+ # Dependecy of cffi\\n+ Dependency(\\n+ name='pycparser',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',\\n+ project_url='https://github.com/eliben/pycparser',\\n+ ),\\n+ Dependency(\\n+ name='mutagen',\\n+ license='GPL-2.0-or-later',\\n+ license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',\\n+ project_url='https://mutagen.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='PyCryptodome',\\n+ license='Public Domain and BSD-2-Clause',\\n+ license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',\\n+ project_url='https://www.pycryptodome.org/',\\n+ ),\\n+ Dependency(\\n+ name='certifi',\\n+ license='MPL-2.0',\\n+ license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',\\n+ project_url='https://github.com/certifi/python-certifi',\\n+ ),\\n+ Dependency(\\n+ name='requests',\\n+ license='Apache-2.0',\\n+ license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',\\n+ project_url='https://requests.readthedocs.io/',\\n+ ),\\n+ # Dependency of requests\\n+ Dependency(\\n+ name='charset-normalizer',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',\\n+ project_url='https://charset-normalizer.readthedocs.io/',\\n+ ),\\n+ # Dependency of requests\\n+ Dependency(\\n+ name='idna',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',\\n+ project_url='https://github.com/kjd/idna',\\n+ ),\\n+ Dependency(\\n+ name='urllib3',\\n+ license='MIT',\\n+ license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',\\n+ project_url='https://urllib3.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='SecretStorage',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://secretstorage.readthedocs.io/',\\n+ ),\\n+ # Dependency of SecretStorage\\n+ Dependency(\\n+ name='cryptography',\\n+ license='Apache-2.0', # Also available as BSD-3-Clause\\n+ license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://cryptography.io/',\\n+ ),\\n+ # Dependency of SecretStorage\\n+ Dependency(\\n+ name='Jeepney',\\n+ license='MIT',\\n+ license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',\\n+ comment='Only included in Linux builds',\\n+ project_url='https://jeepney.readthedocs.io/',\\n+ ),\\n+ Dependency(\\n+ name='websockets',\\n+ license='BSD-3-Clause',\\n+ license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',\\n+ project_url='https://websockets.readthedocs.io/',\\n+ ),\\n+]\\n+\\n+\\n+def fetch_text(dep: Dependency) -> str:\\n+ cache_dir = Path(CACHE_LOCATION)\\n+ cache_dir.mkdir(exist_ok=True)\\n+ url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()\\n+ cache_file = cache_dir / f'{url_hash}.txt'\\n+\\n+ if cache_file.exists():\\n+ return cache_file.read_text()\\n+\\n+ # UA needed since some domains block requests default UA\\n+ req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})\\n+ req.raise_for_status()\\n+ text = req.text\\n+ cache_file.write_text(text)\\n+ return text\\n+\\n+\\n+def build_output() -> str:\\n+ lines = [HEADER]\\n+ for d in DEPENDENCIES:\\n+ lines.append('\\\\n')\\n+ lines.append('-' * 80)\\n+ header = f'{d.name}'\\n+ if d.license:\\n+ header += f' | {d.license}'\\n+ if d.comment:\\n+ header += f'\\\\nNote: {d.comment}'\\n+ if d.project_url:\\n+ header += f'\\\\nURL: {d.project_url}'\\n+ lines.append(header)\\n+ lines.append('-' * 80)\\n+\\n+ text = fetch_text(d)\\n+ lines.append(text.strip('\\\\n') + '\\\\n')\\n+ return '\\\\n'.join(lines)\\n+\\n+\\n+if __name__ == '__main__':\\n+ content = build_output()\\n+ Path(DEFAULT_OUTPUT).write_text(content)\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 911bdaf6afee..ab02f59beec8 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -269,12 +269,11 @@ jobs:\n \"[]\" \\\n \"(https://github.com/${MASTER_REPO}/releases/latest \\\"Master builds\\\")\" >> ./RELEASE_NOTES\n fi\n- printf '\\n\\n' >> ./RELEASE_NOTES\n- cat >> ./RELEASE_NOTES << EOF\n- #### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\n- ---\n- $(python ./devscripts/make_changelog.py -vv --collapsible)\n- EOF\n+ printf '\\n\\n%s\\n\\n%s%s\\n\\n---\\n' \\\n+ \"#### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)\" \\\n+ \"The PyInstaller-bundled executables are subject to the licenses described in \" \\\n+ \"[THIRD_PARTY_LICENSES.txt](https://github.com/${BASE_REPO}/blob/master/THIRD_PARTY_LICENSES.txt)\" >> ./RELEASE_NOTES\n+ python ./devscripts/make_changelog.py -vv --collapsible >> ./RELEASE_NOTES\n printf '%s\\n\\n' '**This is a pre-release build**' >> ./PRERELEASE_NOTES\n cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES\n printf '%s\\n\\n' \"Generated from: https://github.com/${REPOSITORY}/commit/${HEAD_SHA}\" >> ./ARCHIVE_NOTES\ndiff --git a/README.md b/README.md\nindex e582e1e53cbe..7be3266ea54c 100644\n--- a/README.md\n+++ b/README.md\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import\n gpg --verify SHA2-256SUMS.sig SHA2-256SUMS\n gpg --verify SHA2-512SUMS.sig SHA2-512SUMS\n ```\n+\n+#### Licensing\n+\n+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\n+\n+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).\n+\n+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.\n+\n+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).\n+\n <!-- MANPAGE: END EXCLUDED SECTION -->\n \n **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)\ndiff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt\nnew file mode 100644\nindex 000000000000..104004654119\n--- /dev/null\n+++ b/THIRD_PARTY_LICENSES.txt\n@@ -0,0 +1,4433 @@\n+THIRD-PARTY LICENSES\n+\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\n+Source code for bundled third-party components is available from the original projects.\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.\n+\n+\n+--------------------------------------------------------------------------------\n+Python | PSF-2.0\n+URL: https://www.python.org/\n+--------------------------------------------------------------------------------\n+A. HISTORY OF THE SOFTWARE\n+==========================\n+\n+Python was created in the early 1990s by Guido van Rossum at Stichting\n+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands\n+as a successor of a language called ABC. Guido remains Python's\n+principal author, although it includes many contributions from others.\n+\n+In 1995, Guido continued his work on Python at the Corporation for\n+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)\n+in Reston, Virginia where he released several versions of the\n+software.\n+\n+In May 2000, Guido and the Python core development team moved to\n+BeOpen.com to form the BeOpen PythonLabs team. In October of the same\n+year, the PythonLabs team moved to Digital Creations, which became\n+Zope Corporation. In 2001, the Python Software Foundation (PSF, see\n+https://www.python.org/psf/) was formed, a non-profit organization\n+created specifically to own Python-related Intellectual Property.\n+Zope Corporation was a sponsoring member of the PSF.\n+\n+All Python releases are Open Source (see https://opensource.org for\n+the Open Source Definition). Historically, most, but not all, Python\n+releases have also been GPL-compatible; the table below summarizes\n+the various releases.\n+\n+ Release Derived Year Owner GPL-\n+ from compatible? (1)\n+\n+ 0.9.0 thru 1.2 1991-1995 CWI yes\n+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\n+ 1.6 1.5.2 2000 CNRI no\n+ 2.0 1.6 2000 BeOpen.com no\n+ 1.6.1 1.6 2001 CNRI yes (2)\n+ 2.1 2.0+1.6.1 2001 PSF no\n+ 2.0.1 2.0+1.6.1 2001 PSF yes\n+ 2.1.1 2.1+2.0.1 2001 PSF yes\n+ 2.1.2 2.1.1 2002 PSF yes\n+ 2.1.3 2.1.2 2002 PSF yes\n+ 2.2 and above 2.1.1 2001-now PSF yes\n+\n+Footnotes:\n+\n+(1) GPL-compatible doesn't mean that we're distributing Python under\n+ the GPL. All Python licenses, unlike the GPL, let you distribute\n+ a modified version without making your changes open source. The\n+ GPL-compatible licenses make it possible to combine Python with\n+ other software that is released under the GPL; the others don't.\n+\n+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,\n+ because its license has a choice of law clause. According to\n+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1\n+ is \"not incompatible\" with the GPL.\n+\n+Thanks to the many outside volunteers who have worked under Guido's\n+direction to make these releases possible.\n+\n+\n+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n+===============================================================\n+\n+Python software and documentation are licensed under the\n+Python Software Foundation License Version 2.\n+\n+Starting with Python 3.8.6, examples, recipes, and other code in\n+the documentation are dual licensed under the PSF License Version 2\n+and the Zero-Clause BSD license.\n+\n+Some software incorporated into Python is under different licenses.\n+The licenses are listed with code falling under that license.\n+\n+\n+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n+--------------------------------------------\n+\n+1. This LICENSE AGREEMENT is between the Python Software Foundation\n+(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\n+otherwise using this software (\"Python\") in source or binary form and\n+its associated documentation.\n+\n+2. Subject to the terms and conditions of this License Agreement, PSF hereby\n+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,\n+analyze, test, perform and/or display publicly, prepare derivative works,\n+distribute, and otherwise use Python alone or in any derivative version,\n+provided, however, that PSF's License Agreement and PSF's notice of copyright,\n+i.e., \"Copyright (c) 2001 Python Software Foundation; All Rights Reserved\"\n+are retained in Python alone or in any derivative version prepared by Licensee.\n+\n+3. In the event Licensee prepares a derivative work that is based on\n+or incorporates Python or any part thereof, and wants to make\n+the derivative work available to others as provided herein, then\n+Licensee hereby agrees to include in any such work a brief summary of\n+the changes made to Python.\n+\n+4. PSF is making Python available to Licensee on an \"AS IS\"\n+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+6. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+7. Nothing in this License Agreement shall be deemed to create any\n+relationship of agency, partnership, or joint venture between PSF and\n+Licensee. This License Agreement does not grant permission to use PSF\n+trademarks or trade name in a trademark sense to endorse or promote\n+products or services of Licensee, or any third party.\n+\n+8. By copying, installing or otherwise using Python, Licensee\n+agrees to be bound by the terms and conditions of this License\n+Agreement.\n+\n+\n+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n+-------------------------------------------\n+\n+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n+\n+1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\n+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\n+Individual or Organization (\"Licensee\") accessing and otherwise using\n+this software in source or binary form and its associated\n+documentation (\"the Software\").\n+\n+2. Subject to the terms and conditions of this BeOpen Python License\n+Agreement, BeOpen hereby grants Licensee a non-exclusive,\n+royalty-free, world-wide license to reproduce, analyze, test, perform\n+and/or display publicly, prepare derivative works, distribute, and\n+otherwise use the Software alone or in any derivative version,\n+provided, however, that the BeOpen Python License is retained in the\n+Software, alone or in any derivative version prepared by Licensee.\n+\n+3. BeOpen is making the Software available to Licensee on an \"AS IS\"\n+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\n+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\n+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\n+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+5. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+6. This License Agreement shall be governed by and interpreted in all\n+respects by the law of the State of California, excluding conflict of\n+law provisions. Nothing in this License Agreement shall be deemed to\n+create any relationship of agency, partnership, or joint venture\n+between BeOpen and Licensee. This License Agreement does not grant\n+permission to use BeOpen trademarks or trade names in a trademark\n+sense to endorse or promote products or services of Licensee, or any\n+third party. As an exception, the \"BeOpen Python\" logos available at\n+http://www.pythonlabs.com/logos.html may be used according to the\n+permissions granted on that web page.\n+\n+7. By copying, installing or otherwise using the software, Licensee\n+agrees to be bound by the terms and conditions of this License\n+Agreement.\n+\n+\n+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n+---------------------------------------\n+\n+1. This LICENSE AGREEMENT is between the Corporation for National\n+Research Initiatives, having an office at 1895 Preston White Drive,\n+Reston, VA 20191 (\"CNRI\"), and the Individual or Organization\n+(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\n+source or binary form and its associated documentation.\n+\n+2. Subject to the terms and conditions of this License Agreement, CNRI\n+hereby grants Licensee a nonexclusive, royalty-free, world-wide\n+license to reproduce, analyze, test, perform and/or display publicly,\n+prepare derivative works, distribute, and otherwise use Python 1.6.1\n+alone or in any derivative version, provided, however, that CNRI's\n+License Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n+1995-2001 Corporation for National Research Initiatives; All Rights\n+Reserved\" are retained in Python 1.6.1 alone or in any derivative\n+version prepared by Licensee. Alternately, in lieu of CNRI's License\n+Agreement, Licensee may substitute the following text (omitting the\n+quotes): \"Python 1.6.1 is made available subject to the terms and\n+conditions in CNRI's License Agreement. This Agreement together with\n+Python 1.6.1 may be located on the internet using the following\n+unique, persistent identifier (known as a handle): 1895.22/1013. This\n+Agreement may also be obtained from a proxy server on the internet\n+using the following URL: http://hdl.handle.net/1895.22/1013\".\n+\n+3. In the event Licensee prepares a derivative work that is based on\n+or incorporates Python 1.6.1 or any part thereof, and wants to make\n+the derivative work available to others as provided herein, then\n+Licensee hereby agrees to include in any such work a brief summary of\n+the changes made to Python 1.6.1.\n+\n+4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\n+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\n+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\n+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\n+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\n+INFRINGE ANY THIRD PARTY RIGHTS.\n+\n+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\n+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\n+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n+\n+6. This License Agreement will automatically terminate upon a material\n+breach of its terms and conditions.\n+\n+7. This License Agreement shall be governed by the federal\n+intellectual property law of the United States, including without\n+limitation the federal copyright law, and, to the extent such\n+U.S. federal law does not apply, by the law of the Commonwealth of\n+Virginia, excluding Virginia's conflict of law provisions.\n+Notwithstanding the foregoing, with regard to derivative works based\n+on Python 1.6.1 that incorporate non-separable material that was\n+previously distributed under the GNU General Public License (GPL), the\n+law of the Commonwealth of Virginia shall govern this License\n+Agreement only as to issues arising under or with respect to\n+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this\n+License Agreement shall be deemed to create any relationship of\n+agency, partnership, or joint venture between CNRI and Licensee. This\n+License Agreement does not grant permission to use CNRI trademarks or\n+trade name in a trademark sense to endorse or promote products or\n+services of Licensee, or any third party.\n+\n+8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\n+installing or otherwise using Python 1.6.1, Licensee agrees to be\n+bound by the terms and conditions of this License Agreement.\n+\n+ ACCEPT\n+\n+\n+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n+--------------------------------------------------\n+\n+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\n+The Netherlands. All rights reserved.\n+\n+Permission to use, copy, modify, and distribute this software and its\n+documentation for any purpose and without fee is hereby granted,\n+provided that the above copyright notice appear in all copies and that\n+both that copyright notice and this permission notice appear in\n+supporting documentation, and that the name of Stichting Mathematisch\n+Centrum or CWI not be used in advertising or publicity pertaining to\n+distribution of the software without specific, written prior\n+permission.\n+\n+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\n+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\n+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\n+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\n+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\n+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\n+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n+\n+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION\n+----------------------------------------------------------------------\n+\n+Permission to use, copy, modify, and/or distribute this software for any\n+purpose with or without fee is hereby granted.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n+PERFORMANCE OF THIS SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Microsoft Distributable Code\n+Note: Only included in Windows builds\n+--------------------------------------------------------------------------------\n+Additional Conditions for this Windows binary build\n+---------------------------------------------------\n+\n+This program is linked with and uses Microsoft Distributable Code,\n+copyrighted by Microsoft Corporation. The Microsoft Distributable Code\n+is embedded in each .exe, .dll and .pyd file as a result of running\n+the code through a linker.\n+\n+If you further distribute programs that include the Microsoft\n+Distributable Code, you must comply with the restrictions on\n+distribution specified by Microsoft. In particular, you must require\n+distributors and external end users to agree to terms that protect the\n+Microsoft Distributable Code at least as much as Microsoft's own\n+requirements for the Distributable Code. See Microsoft's documentation\n+(included in its developer tools and on its website at microsoft.com)\n+for specific details.\n+\n+Redistribution of the Windows binary build of the Python interpreter\n+complies with this agreement, provided that you do not:\n+\n+- alter any copyright, trademark or patent notice in Microsoft's\n+Distributable Code;\n+\n+- use Microsoft's trademarks in your programs' names or in a way that\n+suggests your programs come from or are endorsed by Microsoft;\n+\n+- distribute Microsoft's Distributable Code to run on a platform other\n+than Microsoft operating systems, run-time technologies or application\n+platforms; or\n+\n+- include Microsoft Distributable Code in malicious, deceptive or\n+unlawful programs.\n+\n+These restrictions apply only to the Microsoft Distributable Code as\n+defined above, not to Python itself or any programs running on the\n+Python interpreter. The redistribution of the Python interpreter and\n+libraries is governed by the Python Software License included with this\n+file, or by other licenses as marked.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+bzip2 | bzip2-1.0.6\n+URL: https://sourceware.org/bzip2/\n+--------------------------------------------------------------------------------\n+--------------------------------------------------------------------------\n+\n+This program, \"bzip2\", the associated library \"libbzip2\", and all\n+documentation, are copyright (C) 1996-2010 Julian R Seward. All\n+rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+\n+2. The origin of this software must not be misrepresented; you must \n+ not claim that you wrote the original software. If you use this \n+ software in a product, an acknowledgment in the product \n+ documentation would be appreciated but is not required.\n+\n+3. Altered source versions must be plainly marked as such, and must\n+ not be misrepresented as being the original software.\n+\n+4. The name of the author may not be used to endorse or promote \n+ products derived from this software without specific prior written \n+ permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\n+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+Julian Seward, jseward@acm.org\n+bzip2/libbzip2 version 1.0.6 of 6 September 2010\n+\n+--------------------------------------------------------------------------\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libffi | MIT\n+URL: https://sourceware.org/libffi/\n+--------------------------------------------------------------------------------\n+libffi - Copyright (c) 1996-2025 Anthony Green, Red Hat, Inc and others.\n+See source files for details.\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of this software and associated documentation files (the\n+``Software''), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, sublicense, and/or sell copies of the Software, and to\n+permit persons to whom the Software is furnished to do so, subject to\n+the following conditions:\n+\n+The above copyright notice and this permission notice shall be\n+included in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+OpenSSL 3.0+ | Apache-2.0\n+URL: https://www.openssl.org/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ https://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+\n+\n+--------------------------------------------------------------------------------\n+SQLite | Public Domain\n+URL: https://www.sqlite.org/\n+--------------------------------------------------------------------------------\n+License Information\n+===================\n+\n+SQLite Is Public Domain\n+-----------------------\n+\n+The SQLite source code, including all of the files in the directories\n+listed in the bullets below are \n+[Public Domain](https://sqlite.org/copyright.html).\n+The authors have submitted written affidavits releasing their work to\n+the public for any use. Every byte of the public-domain code can be\n+traced back to the original authors. The files of this repository\n+that are public domain include the following:\n+\n+ * All of the primary SQLite source code files found in the\n+ [src/ directory](https://sqlite.org/src/tree/src?type=tree&expand)\n+ * All of the test cases and testing code in the\n+ [test/ directory](https://sqlite.org/src/tree/test?type=tree&expand)\n+ * All of the SQLite extension source code and test cases in the\n+ [ext/ directory](https://sqlite.org/src/tree/ext?type=tree&expand)\n+ * All code that ends up in the \"sqlite3.c\" and \"sqlite3.h\" build products\n+ that actually implement the SQLite RDBMS.\n+ * All of the code used to compile the\n+ [command-line interface](https://sqlite.org/cli.html)\n+ * All of the code used to build various utility programs such as\n+ \"sqldiff\", \"sqlite3_rsync\", and \"sqlite3_analyzer\".\n+\n+\n+The public domain source files usually contain a header comment\n+similar to the following to make it clear that the software is\n+public domain.\n+\n+> ~~~\n+The author disclaims copyright to this source code. In place of\n+a legal notice, here is a blessing:\n+\n+ * May you do good and not evil.\n+ * May you find forgiveness for yourself and forgive others.\n+ * May you share freely, never taking more than you give.\n+~~~\n+\n+Almost every file you find in this source repository will be\n+public domain. But there are a small number of exceptions:\n+\n+Non-Public-Domain Code Included With This Source Repository AS A Convenience\n+----------------------------------------------------------------------------\n+\n+This repository contains a (relatively) small amount of non-public-domain\n+code used to help implement the configuration and build logic. In other\n+words, there are some non-public-domain files used to implement:\n+\n+> ~~~\n+./configure && make\n+~~~\n+\n+In all cases, the non-public-domain files included with this\n+repository have generous BSD-style licenses. So anyone is free to\n+use any of the code in this source repository for any purpose, though\n+attribution may be required to reuse or republish the configure and\n+build scripts. None of the non-public-domain code ever actually reaches\n+the build products, such as \"sqlite3.c\", however, so no attribution is\n+required to use SQLite itself. The non-public-domain code consists of\n+scripts used to help compile SQLite. The non-public-domain code is\n+technically not part of SQLite. The non-public-domain code is\n+included in this repository as a convenience to developers, so that those\n+who want to build SQLite do not need to go download a bunch of\n+third-party build scripts in order to compile SQLite.\n+\n+Non-public-domain code included in this respository includes:\n+\n+ * The [\"autosetup\"](http://msteveb.github.io/autosetup/) configuration\n+ system that is contained (mostly) the autosetup/ directory, but also\n+ includes the \"./configure\" script at the top-level of this archive.\n+ Autosetup has a separate BSD-style license. See the\n+ [autosetup/LICENSE](http://msteveb.github.io/autosetup/license/)\n+ for details.\n+\n+ * There are BSD-style licenses on some of the configuration\n+ software found in the legacy autoconf/ directory and its\n+ subdirectories.\n+\n+The following unix shell command is can be run from the top-level\n+of this source repository in order to remove all non-public-domain\n+code:\n+\n+> ~~~\n+rm -rf configure autosetup autoconf\n+~~~\n+\n+If you unpack this source repository and then run the command above, what\n+is left will be 100% public domain.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+liblzma | 0BSD\n+URL: https://tukaani.org/xz/\n+--------------------------------------------------------------------------------\n+XZ Utils Licensing\n+==================\n+\n+ Different licenses apply to different files in this package. Here\n+ is a summary of which licenses apply to which parts of this package:\n+\n+ - liblzma is under the BSD Zero Clause License (0BSD).\n+\n+ - The command line tools xz, xzdec, lzmadec, and lzmainfo are\n+ under 0BSD except that, on systems that don't have a usable\n+ getopt_long, GNU getopt_long is compiled and linked in from the\n+ 'lib' directory. The getopt_long code is under GNU LGPLv2.1+.\n+\n+ - The scripts to grep, diff, and view compressed files have been\n+ adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless,\n+ and xzmore) are under GNU GPLv2+. The man pages of the scripts\n+ are under 0BSD; they aren't based on the man pages of GNU gzip.\n+\n+ - Most of the XZ Utils specific documentation that is in\n+ plain text files (like README, INSTALL, PACKAGERS, NEWS,\n+ and ChangeLog) are under 0BSD unless stated otherwise in\n+ the file itself. The files xz-file-format.txt and\n+ lzma-file-format.xt are in the public domain but may\n+ be distributed under the terms of 0BSD too.\n+\n+ - Translated messages and man pages are under 0BSD except that\n+ some old translations are in the public domain.\n+\n+ - Test files and test code in the 'tests' directory, and\n+ debugging utilities in the 'debug' directory are under\n+ the BSD Zero Clause License (0BSD).\n+\n+ - The GNU Autotools based build system contains files that are\n+ under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses.\n+ These files don't affect the licensing of the binaries being\n+ built.\n+\n+ - The 'extra' directory contains files that are under various\n+ free software licenses. These aren't built or installed as\n+ part of XZ Utils.\n+\n+ The following command may be helpful in finding per-file license\n+ information. It works on xz.git and on a clean file tree extracted\n+ from a release tarball.\n+\n+ sh build-aux/license-check.sh -v\n+\n+ For the files under the BSD Zero Clause License (0BSD), if\n+ a copyright notice is needed, the following is sufficient:\n+\n+ Copyright (C) The XZ Utils authors and contributors\n+\n+ If you copy significant amounts of 0BSD-licensed code from XZ Utils\n+ into your project, acknowledging this somewhere in your software is\n+ polite (especially if it is proprietary, non-free software), but\n+ it is not legally required by the license terms. Here is an example\n+ of a good notice to put into \"about box\" or into documentation:\n+\n+ This software includes code from XZ Utils <https://tukaani.org/xz/>.\n+\n+ The following license texts are included in the following files:\n+ - COPYING.0BSD: BSD Zero Clause License\n+ - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1\n+ - COPYING.GPLv2: GNU General Public License version 2\n+ - COPYING.GPLv3: GNU General Public License version 3\n+\n+ If you have questions, don't hesitate to ask for more information.\n+ The contact information is in the README file.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+mpdecimal | BSD-2-Clause\n+URL: https://www.bytereef.org/mpdecimal/\n+--------------------------------------------------------------------------------\n+Copyright (c) 2008-2025 Stefan Krah. All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+\n+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n+SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+zlib | zlib\n+URL: https://zlib.net/\n+--------------------------------------------------------------------------------\n+Copyright notice:\n+\n+ (C) 1995-2024 Jean-loup Gailly and Mark Adler\n+\n+ This software is provided 'as-is', without any express or implied\n+ warranty. In no event will the authors be held liable for any damages\n+ arising from the use of this software.\n+\n+ Permission is granted to anyone to use this software for any purpose,\n+ including commercial applications, and to alter it and redistribute it\n+ freely, subject to the following restrictions:\n+\n+ 1. The origin of this software must not be misrepresented; you must not\n+ claim that you wrote the original software. If you use this software\n+ in a product, an acknowledgment in the product documentation would be\n+ appreciated but is not required.\n+ 2. Altered source versions must be plainly marked as such, and must not be\n+ misrepresented as being the original software.\n+ 3. This notice may not be removed or altered from any source distribution.\n+\n+ Jean-loup Gailly Mark Adler\n+ jloup@gzip.org madler@alumni.caltech.edu\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Expat | MIT\n+URL: https://libexpat.github.io/\n+--------------------------------------------------------------------------------\n+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper\n+Copyright (c) 2001-2025 Expat maintainers\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of this software and associated documentation files (the\n+\"Software\"), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, sublicense, and/or sell copies of the Software, and to\n+permit persons to whom the Software is furnished to do so, subject to\n+the following conditions:\n+\n+The above copyright notice and this permission notice shall be included\n+in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+ncurses | X11-distribute-modifications-variant\n+Note: Only included in Linux/macOS builds\n+URL: https://invisible-island.net/ncurses/\n+--------------------------------------------------------------------------------\n+Copyright 2018-2022,2023 Thomas E. Dickey\n+Copyright 1998-2017,2018 Free Software Foundation, Inc.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a\n+copy of this software and associated documentation files (the\n+\"Software\"), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, distribute with modifications, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included\n+in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\n+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\n+THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+\n+Except as contained in this notice, the name(s) of the above copyright\n+holders shall not be used in advertising or otherwise to promote the\n+sale, use or other dealings in this Software without prior written\n+authorization.\n+\n+-- vile:txtmode fc=72\n+-- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $\n+\n+\n+\n+--------------------------------------------------------------------------------\n+GNU Readline | GPL-3.0-or-later\n+Note: Only included in Linux builds\n+URL: https://www.gnu.org/software/readline/\n+--------------------------------------------------------------------------------\n+ GNU GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+ Preamble\n+\n+ The GNU General Public License is a free, copyleft license for\n+software and other kinds of works.\n+\n+ The licenses for most software and other practical works are designed\n+to take away your freedom to share and change the works. By contrast,\n+the GNU General Public License is intended to guarantee your freedom to\n+share and change all versions of a program--to make sure it remains free\n+software for all its users. We, the Free Software Foundation, use the\n+GNU General Public License for most of our software; it applies also to\n+any other work released this way by its authors. You can apply it to\n+your programs, too.\n+\n+ When we speak of free software, we are referring to freedom, not\n+price. Our General Public Licenses are designed to make sure that you\n+have the freedom to distribute copies of free software (and charge for\n+them if you wish), that you receive source code or can get it if you\n+want it, that you can change the software or use pieces of it in new\n+free programs, and that you know you can do these things.\n+\n+ To protect your rights, we need to prevent others from denying you\n+these rights or asking you to surrender the rights. Therefore, you have\n+certain responsibilities if you distribute copies of the software, or if\n+you modify it: responsibilities to respect the freedom of others.\n+\n+ For example, if you distribute copies of such a program, whether\n+gratis or for a fee, you must pass on to the recipients the same\n+freedoms that you received. You must make sure that they, too, receive\n+or can get the source code. And you must show them these terms so they\n+know their rights.\n+\n+ Developers that use the GNU GPL protect your rights with two steps:\n+(1) assert copyright on the software, and (2) offer you this License\n+giving you legal permission to copy, distribute and/or modify it.\n+\n+ For the developers' and authors' protection, the GPL clearly explains\n+that there is no warranty for this free software. For both users' and\n+authors' sake, the GPL requires that modified versions be marked as\n+changed, so that their problems will not be attributed erroneously to\n+authors of previous versions.\n+\n+ Some devices are designed to deny users access to install or run\n+modified versions of the software inside them, although the manufacturer\n+can do so. This is fundamentally incompatible with the aim of\n+protecting users' freedom to change the software. The systematic\n+pattern of such abuse occurs in the area of products for individuals to\n+use, which is precisely where it is most unacceptable. Therefore, we\n+have designed this version of the GPL to prohibit the practice for those\n+products. If such problems arise substantially in other domains, we\n+stand ready to extend this provision to those domains in future versions\n+of the GPL, as needed to protect the freedom of users.\n+\n+ Finally, every program is threatened constantly by software patents.\n+States should not allow patents to restrict development and use of\n+software on general-purpose computers, but in those that do, we wish to\n+avoid the special danger that patents applied to a free program could\n+make it effectively proprietary. To prevent this, the GPL assures that\n+patents cannot be used to render the program non-free.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow.\n+\n+ TERMS AND CONDITIONS\n+\n+ 0. Definitions.\n+\n+ \"This License\" refers to version 3 of the GNU General Public License.\n+\n+ \"Copyright\" also means copyright-like laws that apply to other kinds of\n+works, such as semiconductor masks.\n+\n+ \"The Program\" refers to any copyrightable work licensed under this\n+License. Each licensee is addressed as \"you\". \"Licensees\" and\n+\"recipients\" may be individuals or organizations.\n+\n+ To \"modify\" a work means to copy from or adapt all or part of the work\n+in a fashion requiring copyright permission, other than the making of an\n+exact copy. The resulting work is called a \"modified version\" of the\n+earlier work or a work \"based on\" the earlier work.\n+\n+ A \"covered work\" means either the unmodified Program or a work based\n+on the Program.\n+\n+ To \"propagate\" a work means to do anything with it that, without\n+permission, would make you directly or secondarily liable for\n+infringement under applicable copyright law, except executing it on a\n+computer or modifying a private copy. Propagation includes copying,\n+distribution (with or without modification), making available to the\n+public, and in some countries other activities as well.\n+\n+ To \"convey\" a work means any kind of propagation that enables other\n+parties to make or receive copies. Mere interaction with a user through\n+a computer network, with no transfer of a copy, is not conveying.\n+\n+ An interactive user interface displays \"Appropriate Legal Notices\"\n+to the extent that it includes a convenient and prominently visible\n+feature that (1) displays an appropriate copyright notice, and (2)\n+tells the user that there is no warranty for the work (except to the\n+extent that warranties are provided), that licensees may convey the\n+work under this License, and how to view a copy of this License. If\n+the interface presents a list of user commands or options, such as a\n+menu, a prominent item in the list meets this criterion.\n+\n+ 1. Source Code.\n+\n+ The \"source code\" for a work means the preferred form of the work\n+for making modifications to it. \"Object code\" means any non-source\n+form of a work.\n+\n+ A \"Standard Interface\" means an interface that either is an official\n+standard defined by a recognized standards body, or, in the case of\n+interfaces specified for a particular programming language, one that\n+is widely used among developers working in that language.\n+\n+ The \"System Libraries\" of an executable work include anything, other\n+than the work as a whole, that (a) is included in the normal form of\n+packaging a Major Component, but which is not part of that Major\n+Component, and (b) serves only to enable use of the work with that\n+Major Component, or to implement a Standard Interface for which an\n+implementation is available to the public in source code form. A\n+\"Major Component\", in this context, means a major essential component\n+(kernel, window system, and so on) of the specific operating system\n+(if any) on which the executable work runs, or a compiler used to\n+produce the work, or an object code interpreter used to run it.\n+\n+ The \"Corresponding Source\" for a work in object code form means all\n+the source code needed to generate, install, and (for an executable\n+work) run the object code and to modify the work, including scripts to\n+control those activities. However, it does not include the work's\n+System Libraries, or general-purpose tools or generally available free\n+programs which are used unmodified in performing those activities but\n+which are not part of the work. For example, Corresponding Source\n+includes interface definition files associated with source files for\n+the work, and the source code for shared libraries and dynamically\n+linked subprograms that the work is specifically designed to require,\n+such as by intimate data communication or control flow between those\n+subprograms and other parts of the work.\n+\n+ The Corresponding Source need not include anything that users\n+can regenerate automatically from other parts of the Corresponding\n+Source.\n+\n+ The Corresponding Source for a work in source code form is that\n+same work.\n+\n+ 2. Basic Permissions.\n+\n+ All rights granted under this License are granted for the term of\n+copyright on the Program, and are irrevocable provided the stated\n+conditions are met. This License explicitly affirms your unlimited\n+permission to run the unmodified Program. The output from running a\n+covered work is covered by this License only if the output, given its\n+content, constitutes a covered work. This License acknowledges your\n+rights of fair use or other equivalent, as provided by copyright law.\n+\n+ You may make, run and propagate covered works that you do not\n+convey, without conditions so long as your license otherwise remains\n+in force. You may convey covered works to others for the sole purpose\n+of having them make modifications exclusively for you, or provide you\n+with facilities for running those works, provided that you comply with\n+the terms of this License in conveying all material for which you do\n+not control copyright. Those thus making or running the covered works\n+for you must do so exclusively on your behalf, under your direction\n+and control, on terms that prohibit them from making any copies of\n+your copyrighted material outside their relationship with you.\n+\n+ Conveying under any other circumstances is permitted solely under\n+the conditions stated below. Sublicensing is not allowed; section 10\n+makes it unnecessary.\n+\n+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n+\n+ No covered work shall be deemed part of an effective technological\n+measure under any applicable law fulfilling obligations under article\n+11 of the WIPO copyright treaty adopted on 20 December 1996, or\n+similar laws prohibiting or restricting circumvention of such\n+measures.\n+\n+ When you convey a covered work, you waive any legal power to forbid\n+circumvention of technological measures to the extent such circumvention\n+is effected by exercising rights under this License with respect to\n+the covered work, and you disclaim any intention to limit operation or\n+modification of the work as a means of enforcing, against the work's\n+users, your or third parties' legal rights to forbid circumvention of\n+technological measures.\n+\n+ 4. Conveying Verbatim Copies.\n+\n+ You may convey verbatim copies of the Program's source code as you\n+receive it, in any medium, provided that you conspicuously and\n+appropriately publish on each copy an appropriate copyright notice;\n+keep intact all notices stating that this License and any\n+non-permissive terms added in accord with section 7 apply to the code;\n+keep intact all notices of the absence of any warranty; and give all\n+recipients a copy of this License along with the Program.\n+\n+ You may charge any price or no price for each copy that you convey,\n+and you may offer support or warranty protection for a fee.\n+\n+ 5. Conveying Modified Source Versions.\n+\n+ You may convey a work based on the Program, or the modifications to\n+produce it from the Program, in the form of source code under the\n+terms of section 4, provided that you also meet all of these conditions:\n+\n+ a) The work must carry prominent notices stating that you modified\n+ it, and giving a relevant date.\n+\n+ b) The work must carry prominent notices stating that it is\n+ released under this License and any conditions added under section\n+ 7. This requirement modifies the requirement in section 4 to\n+ \"keep intact all notices\".\n+\n+ c) You must license the entire work, as a whole, under this\n+ License to anyone who comes into possession of a copy. This\n+ License will therefore apply, along with any applicable section 7\n+ additional terms, to the whole of the work, and all its parts,\n+ regardless of how they are packaged. This License gives no\n+ permission to license the work in any other way, but it does not\n+ invalidate such permission if you have separately received it.\n+\n+ d) If the work has interactive user interfaces, each must display\n+ Appropriate Legal Notices; however, if the Program has interactive\n+ interfaces that do not display Appropriate Legal Notices, your\n+ work need not make them do so.\n+\n+ A compilation of a covered work with other separate and independent\n+works, which are not by their nature extensions of the covered work,\n+and which are not combined with it such as to form a larger program,\n+in or on a volume of a storage or distribution medium, is called an\n+\"aggregate\" if the compilation and its resulting copyright are not\n+used to limit the access or legal rights of the compilation's users\n+beyond what the individual works permit. Inclusion of a covered work\n+in an aggregate does not cause this License to apply to the other\n+parts of the aggregate.\n+\n+ 6. Conveying Non-Source Forms.\n+\n+ You may convey a covered work in object code form under the terms\n+of sections 4 and 5, provided that you also convey the\n+machine-readable Corresponding Source under the terms of this License,\n+in one of these ways:\n+\n+ a) Convey the object code in, or embodied in, a physical product\n+ (including a physical distribution medium), accompanied by the\n+ Corresponding Source fixed on a durable physical medium\n+ customarily used for software interchange.\n+\n+ b) Convey the object code in, or embodied in, a physical product\n+ (including a physical distribution medium), accompanied by a\n+ written offer, valid for at least three years and valid for as\n+ long as you offer spare parts or customer support for that product\n+ model, to give anyone who possesses the object code either (1) a\n+ copy of the Corresponding Source for all the software in the\n+ product that is covered by this License, on a durable physical\n+ medium customarily used for software interchange, for a price no\n+ more than your reasonable cost of physically performing this\n+ conveying of source, or (2) access to copy the\n+ Corresponding Source from a network server at no charge.\n+\n+ c) Convey individual copies of the object code with a copy of the\n+ written offer to provide the Corresponding Source. This\n+ alternative is allowed only occasionally and noncommercially, and\n+ only if you received the object code with such an offer, in accord\n+ with subsection 6b.\n+\n+ d) Convey the object code by offering access from a designated\n+ place (gratis or for a charge), and offer equivalent access to the\n+ Corresponding Source in the same way through the same place at no\n+ further charge. You need not require recipients to copy the\n+ Corresponding Source along with the object code. If the place to\n+ copy the object code is a network server, the Corresponding Source\n+ may be on a different server (operated by you or a third party)\n+ that supports equivalent copying facilities, provided you maintain\n+ clear directions next to the object code saying where to find the\n+ Corresponding Source. Regardless of what server hosts the\n+ Corresponding Source, you remain obligated to ensure that it is\n+ available for as long as needed to satisfy these requirements.\n+\n+ e) Convey the object code using peer-to-peer transmission, provided\n+ you inform other peers where the object code and Corresponding\n+ Source of the work are being offered to the general public at no\n+ charge under subsection 6d.\n+\n+ A separable portion of the object code, whose source code is excluded\n+from the Corresponding Source as a System Library, need not be\n+included in conveying the object code work.\n+\n+ A \"User Product\" is either (1) a \"consumer product\", which means any\n+tangible personal property which is normally used for personal, family,\n+or household purposes, or (2) anything designed or sold for incorporation\n+into a dwelling. In determining whether a product is a consumer product,\n+doubtful cases shall be resolved in favor of coverage. For a particular\n+product received by a particular user, \"normally used\" refers to a\n+typical or common use of that class of product, regardless of the status\n+of the particular user or of the way in which the particular user\n+actually uses, or expects or is expected to use, the product. A product\n+is a consumer product regardless of whether the product has substantial\n+commercial, industrial or non-consumer uses, unless such uses represent\n+the only significant mode of use of the product.\n+\n+ \"Installation Information\" for a User Product means any methods,\n+procedures, authorization keys, or other information required to install\n+and execute modified versions of a covered work in that User Product from\n+a modified version of its Corresponding Source. The information must\n+suffice to ensure that the continued functioning of the modified object\n+code is in no case prevented or interfered with solely because\n+modification has been made.\n+\n+ If you convey an object code work under this section in, or with, or\n+specifically for use in, a User Product, and the conveying occurs as\n+part of a transaction in which the right of possession and use of the\n+User Product is transferred to the recipient in perpetuity or for a\n+fixed term (regardless of how the transaction is characterized), the\n+Corresponding Source conveyed under this section must be accompanied\n+by the Installation Information. But this requirement does not apply\n+if neither you nor any third party retains the ability to install\n+modified object code on the User Product (for example, the work has\n+been installed in ROM).\n+\n+ The requirement to provide Installation Information does not include a\n+requirement to continue to provide support service, warranty, or updates\n+for a work that has been modified or installed by the recipient, or for\n+the User Product in which it has been modified or installed. Access to a\n+network may be denied when the modification itself materially and\n+adversely affects the operation of the network or violates the rules and\n+protocols for communication across the network.\n+\n+ Corresponding Source conveyed, and Installation Information provided,\n+in accord with this section must be in a format that is publicly\n+documented (and with an implementation available to the public in\n+source code form), and must require no special password or key for\n+unpacking, reading or copying.\n+\n+ 7. Additional Terms.\n+\n+ \"Additional permissions\" are terms that supplement the terms of this\n+License by making exceptions from one or more of its conditions.\n+Additional permissions that are applicable to the entire Program shall\n+be treated as though they were included in this License, to the extent\n+that they are valid under applicable law. If additional permissions\n+apply only to part of the Program, that part may be used separately\n+under those permissions, but the entire Program remains governed by\n+this License without regard to the additional permissions.\n+\n+ When you convey a copy of a covered work, you may at your option\n+remove any additional permissions from that copy, or from any part of\n+it. (Additional permissions may be written to require their own\n+removal in certain cases when you modify the work.) You may place\n+additional permissions on material, added by you to a covered work,\n+for which you have or can give appropriate copyright permission.\n+\n+ Notwithstanding any other provision of this License, for material you\n+add to a covered work, you may (if authorized by the copyright holders of\n+that material) supplement the terms of this License with terms:\n+\n+ a) Disclaiming warranty or limiting liability differently from the\n+ terms of sections 15 and 16 of this License; or\n+\n+ b) Requiring preservation of specified reasonable legal notices or\n+ author attributions in that material or in the Appropriate Legal\n+ Notices displayed by works containing it; or\n+\n+ c) Prohibiting misrepresentation of the origin of that material, or\n+ requiring that modified versions of such material be marked in\n+ reasonable ways as different from the original version; or\n+\n+ d) Limiting the use for publicity purposes of names of licensors or\n+ authors of the material; or\n+\n+ e) Declining to grant rights under trademark law for use of some\n+ trade names, trademarks, or service marks; or\n+\n+ f) Requiring indemnification of licensors and authors of that\n+ material by anyone who conveys the material (or modified versions of\n+ it) with contractual assumptions of liability to the recipient, for\n+ any liability that these contractual assumptions directly impose on\n+ those licensors and authors.\n+\n+ All other non-permissive additional terms are considered \"further\n+restrictions\" within the meaning of section 10. If the Program as you\n+received it, or any part of it, contains a notice stating that it is\n+governed by this License along with a term that is a further\n+restriction, you may remove that term. If a license document contains\n+a further restriction but permits relicensing or conveying under this\n+License, you may add to a covered work material governed by the terms\n+of that license document, provided that the further restriction does\n+not survive such relicensing or conveying.\n+\n+ If you add terms to a covered work in accord with this section, you\n+must place, in the relevant source files, a statement of the\n+additional terms that apply to those files, or a notice indicating\n+where to find the applicable terms.\n+\n+ Additional terms, permissive or non-permissive, may be stated in the\n+form of a separately written license, or stated as exceptions;\n+the above requirements apply either way.\n+\n+ 8. Termination.\n+\n+ You may not propagate or modify a covered work except as expressly\n+provided under this License. Any attempt otherwise to propagate or\n+modify it is void, and will automatically terminate your rights under\n+this License (including any patent licenses granted under the third\n+paragraph of section 11).\n+\n+ However, if you cease all violation of this License, then your\n+license from a particular copyright holder is reinstated (a)\n+provisionally, unless and until the copyright holder explicitly and\n+finally terminates your license, and (b) permanently, if the copyright\n+holder fails to notify you of the violation by some reasonable means\n+prior to 60 days after the cessation.\n+\n+ Moreover, your license from a particular copyright holder is\n+reinstated permanently if the copyright holder notifies you of the\n+violation by some reasonable means, this is the first time you have\n+received notice of violation of this License (for any work) from that\n+copyright holder, and you cure the violation prior to 30 days after\n+your receipt of the notice.\n+\n+ Termination of your rights under this section does not terminate the\n+licenses of parties who have received copies or rights from you under\n+this License. If your rights have been terminated and not permanently\n+reinstated, you do not qualify to receive new licenses for the same\n+material under section 10.\n+\n+ 9. Acceptance Not Required for Having Copies.\n+\n+ You are not required to accept this License in order to receive or\n+run a copy of the Program. Ancillary propagation of a covered work\n+occurring solely as a consequence of using peer-to-peer transmission\n+to receive a copy likewise does not require acceptance. However,\n+nothing other than this License grants you permission to propagate or\n+modify any covered work. These actions infringe copyright if you do\n+not accept this License. Therefore, by modifying or propagating a\n+covered work, you indicate your acceptance of this License to do so.\n+\n+ 10. Automatic Licensing of Downstream Recipients.\n+\n+ Each time you convey a covered work, the recipient automatically\n+receives a license from the original licensors, to run, modify and\n+propagate that work, subject to this License. You are not responsible\n+for enforcing compliance by third parties with this License.\n+\n+ An \"entity transaction\" is a transaction transferring control of an\n+organization, or substantially all assets of one, or subdividing an\n+organization, or merging organizations. If propagation of a covered\n+work results from an entity transaction, each party to that\n+transaction who receives a copy of the work also receives whatever\n+licenses to the work the party's predecessor in interest had or could\n+give under the previous paragraph, plus a right to possession of the\n+Corresponding Source of the work from the predecessor in interest, if\n+the predecessor has it or can get it with reasonable efforts.\n+\n+ You may not impose any further restrictions on the exercise of the\n+rights granted or affirmed under this License. For example, you may\n+not impose a license fee, royalty, or other charge for exercise of\n+rights granted under this License, and you may not initiate litigation\n+(including a cross-claim or counterclaim in a lawsuit) alleging that\n+any patent claim is infringed by making, using, selling, offering for\n+sale, or importing the Program or any portion of it.\n+\n+ 11. Patents.\n+\n+ A \"contributor\" is a copyright holder who authorizes use under this\n+License of the Program or a work on which the Program is based. The\n+work thus licensed is called the contributor's \"contributor version\".\n+\n+ A contributor's \"essential patent claims\" are all patent claims\n+owned or controlled by the contributor, whether already acquired or\n+hereafter acquired, that would be infringed by some manner, permitted\n+by this License, of making, using, or selling its contributor version,\n+but do not include claims that would be infringed only as a\n+consequence of further modification of the contributor version. For\n+purposes of this definition, \"control\" includes the right to grant\n+patent sublicenses in a manner consistent with the requirements of\n+this License.\n+\n+ Each contributor grants you a non-exclusive, worldwide, royalty-free\n+patent license under the contributor's essential patent claims, to\n+make, use, sell, offer for sale, import and otherwise run, modify and\n+propagate the contents of its contributor version.\n+\n+ In the following three paragraphs, a \"patent license\" is any express\n+agreement or commitment, however denominated, not to enforce a patent\n+(such as an express permission to practice a patent or covenant not to\n+sue for patent infringement). To \"grant\" such a patent license to a\n+party means to make such an agreement or commitment not to enforce a\n+patent against the party.\n+\n+ If you convey a covered work, knowingly relying on a patent license,\n+and the Corresponding Source of the work is not available for anyone\n+to copy, free of charge and under the terms of this License, through a\n+publicly available network server or other readily accessible means,\n+then you must either (1) cause the Corresponding Source to be so\n+available, or (2) arrange to deprive yourself of the benefit of the\n+patent license for this particular work, or (3) arrange, in a manner\n+consistent with the requirements of this License, to extend the patent\n+license to downstream recipients. \"Knowingly relying\" means you have\n+actual knowledge that, but for the patent license, your conveying the\n+covered work in a country, or your recipient's use of the covered work\n+in a country, would infringe one or more identifiable patents in that\n+country that you have reason to believe are valid.\n+\n+ If, pursuant to or in connection with a single transaction or\n+arrangement, you convey, or propagate by procuring conveyance of, a\n+covered work, and grant a patent license to some of the parties\n+receiving the covered work authorizing them to use, propagate, modify\n+or convey a specific copy of the covered work, then the patent license\n+you grant is automatically extended to all recipients of the covered\n+work and works based on it.\n+\n+ A patent license is \"discriminatory\" if it does not include within\n+the scope of its coverage, prohibits the exercise of, or is\n+conditioned on the non-exercise of one or more of the rights that are\n+specifically granted under this License. You may not convey a covered\n+work if you are a party to an arrangement with a third party that is\n+in the business of distributing software, under which you make payment\n+to the third party based on the extent of your activity of conveying\n+the work, and under which the third party grants, to any of the\n+parties who would receive the covered work from you, a discriminatory\n+patent license (a) in connection with copies of the covered work\n+conveyed by you (or copies made from those copies), or (b) primarily\n+for and in connection with specific products or compilations that\n+contain the covered work, unless you entered into that arrangement,\n+or that patent license was granted, prior to 28 March 2007.\n+\n+ Nothing in this License shall be construed as excluding or limiting\n+any implied license or other defenses to infringement that may\n+otherwise be available to you under applicable patent law.\n+\n+ 12. No Surrender of Others' Freedom.\n+\n+ If conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot convey a\n+covered work so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you may\n+not convey it at all. For example, if you agree to terms that obligate you\n+to collect a royalty for further conveying from those to whom you convey\n+the Program, the only way you could satisfy both those terms and this\n+License would be to refrain entirely from conveying the Program.\n+\n+ 13. Use with the GNU Affero General Public License.\n+\n+ Notwithstanding any other provision of this License, you have\n+permission to link or combine any covered work with a work licensed\n+under version 3 of the GNU Affero General Public License into a single\n+combined work, and to convey the resulting work. The terms of this\n+License will continue to apply to the part which is the covered work,\n+but the special requirements of the GNU Affero General Public License,\n+section 13, concerning interaction through a network will apply to the\n+combination as such.\n+\n+ 14. Revised Versions of this License.\n+\n+ The Free Software Foundation may publish revised and/or new versions of\n+the GNU General Public License from time to time. Such new versions will\n+be similar in spirit to the present version, but may differ in detail to\n+address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Program specifies that a certain numbered version of the GNU General\n+Public License \"or any later version\" applies to it, you have the\n+option of following the terms and conditions either of that numbered\n+version or of any later version published by the Free Software\n+Foundation. If the Program does not specify a version number of the\n+GNU General Public License, you may choose any version ever published\n+by the Free Software Foundation.\n+\n+ If the Program specifies that a proxy can decide which future\n+versions of the GNU General Public License can be used, that proxy's\n+public statement of acceptance of a version permanently authorizes you\n+to choose that version for the Program.\n+\n+ Later license versions may give you additional or different\n+permissions. However, no additional obligations are imposed on any\n+author or copyright holder as a result of your choosing to follow a\n+later version.\n+\n+ 15. Disclaimer of Warranty.\n+\n+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\n+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\n+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\n+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\n+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\n+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\n+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. Limitation of Liability.\n+\n+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\n+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\n+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\n+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\n+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\n+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\n+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\n+SUCH DAMAGES.\n+\n+ 17. Interpretation of Sections 15 and 16.\n+\n+ If the disclaimer of warranty and limitation of liability provided\n+above cannot be given local legal effect according to their terms,\n+reviewing courts shall apply local law that most closely approximates\n+an absolute waiver of all civil liability in connection with the\n+Program, unless a warranty or assumption of liability accompanies a\n+copy of the Program in return for a fee.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ How to Apply These Terms to Your New Programs\n+\n+ If you develop a new program, and you want it to be of the greatest\n+possible use to the public, the best way to achieve this is to make it\n+free software which everyone can redistribute and change under these terms.\n+\n+ To do so, attach the following notices to the program. It is safest\n+to attach them to the start of each source file to most effectively\n+state the exclusion of warranty; and each file should have at least\n+the \"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the program's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This program is free software: you can redistribute it and/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation, either version 3 of the License, or\n+ (at your option) any later version.\n+\n+ This program is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License\n+ along with this program. If not, see <http://www.gnu.org/licenses/>.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+ If the program does terminal interaction, make it output a short\n+notice like this when it starts in an interactive mode:\n+\n+ <program> Copyright (C) <year> <name of author>\n+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n+ This is free software, and you are welcome to redistribute it\n+ under certain conditions; type `show c' for details.\n+\n+The hypothetical commands `show w' and `show c' should show the appropriate\n+parts of the General Public License. Of course, your program's commands\n+might be different; for a GUI interface, you would use an \"about box\".\n+\n+ You should also get your employer (if you work as a programmer) or school,\n+if any, to sign a \"copyright disclaimer\" for the program, if necessary.\n+For more information on this, and how to apply and follow the GNU GPL, see\n+<http://www.gnu.org/licenses/>.\n+\n+ The GNU General Public License does not permit incorporating your program\n+into proprietary programs. If your program is a subroutine library, you\n+may consider it more useful to permit linking proprietary applications with\n+the library. If this is what you want to do, use the GNU Lesser General\n+Public License instead of this License. But first, please read\n+<http://www.gnu.org/philosophy/why-not-lgpl.html>.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libstdc++ | GPL-3.0-with-GCC-exception\n+Note: Only included in Linux builds\n+URL: https://gcc.gnu.org/onlinedocs/libstdc++/\n+--------------------------------------------------------------------------------\n+GCC RUNTIME LIBRARY EXCEPTION\n+\n+Version 3.1, 31 March 2009\n+\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\n+\n+Everyone is permitted to copy and distribute verbatim copies of this\n+license document, but changing it is not allowed.\n+\n+This GCC Runtime Library Exception (\"Exception\") is an additional\n+permission under section 7 of the GNU General Public License, version\n+3 (\"GPLv3\"). It applies to a given file (the \"Runtime Library\") that\n+bears a notice placed by the copyright holder of the file stating that\n+the file is governed by GPLv3 along with this Exception.\n+\n+When you use GCC to compile a program, GCC may combine portions of\n+certain GCC header files and runtime libraries with the compiled\n+program. The purpose of this Exception is to allow compilation of\n+non-GPL (including proprietary) programs to use, in this way, the\n+header files and runtime libraries covered by this Exception.\n+\n+0. Definitions.\n+\n+A file is an \"Independent Module\" if it either requires the Runtime\n+Library for execution after a Compilation Process, or makes use of an\n+interface provided by the Runtime Library, but is not otherwise based\n+on the Runtime Library.\n+\n+\"GCC\" means a version of the GNU Compiler Collection, with or without\n+modifications, governed by version 3 (or a specified later version) of\n+the GNU General Public License (GPL) with the option of using any\n+subsequent versions published by the FSF.\n+\n+\"GPL-compatible Software\" is software whose conditions of propagation,\n+modification and use would permit combination with GCC in accord with\n+the license of GCC.\n+\n+\"Target Code\" refers to output from any compiler for a real or virtual\n+target processor architecture, in executable form or suitable for\n+input to an assembler, loader, linker and/or execution\n+phase. Notwithstanding that, Target Code does not include data in any\n+format that is used as a compiler intermediate representation, or used\n+for producing a compiler intermediate representation.\n+\n+The \"Compilation Process\" transforms code entirely represented in\n+non-intermediate languages designed for human-written code, and/or in\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\n+use of source code generators and preprocessors need not be considered\n+part of the Compilation Process, since the Compilation Process can be\n+understood as starting with the output of the generators or\n+preprocessors.\n+\n+A Compilation Process is \"Eligible\" if it is done using GCC, alone or\n+with other GPL-compatible software, or if it is done without using any\n+work based on GCC. For example, using non-GPL-compatible Software to\n+optimize any GCC intermediate representations would not qualify as an\n+Eligible Compilation Process.\n+\n+1. Grant of Additional Permission.\n+\n+You have permission to propagate a work of Target Code formed by\n+combining the Runtime Library with Independent Modules, even if such\n+propagation would otherwise violate the terms of GPLv3, provided that\n+all Target Code was generated by Eligible Compilation Processes. You\n+may then convey such a combination under terms of your choice,\n+consistent with the licensing of the Independent Modules.\n+\n+2. No Weakening of GCC Copyleft.\n+\n+The availability of this Exception does not imply any general\n+presumption that third-party software is unaffected by the copyleft\n+requirements of the license of GCC.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libgcc | GPL-3.0-with-GCC-exception\n+Note: Only included in Linux builds\n+URL: https://gcc.gnu.org/\n+--------------------------------------------------------------------------------\n+GCC RUNTIME LIBRARY EXCEPTION\n+\n+Version 3.1, 31 March 2009\n+\n+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>\n+\n+Everyone is permitted to copy and distribute verbatim copies of this\n+license document, but changing it is not allowed.\n+\n+This GCC Runtime Library Exception (\"Exception\") is an additional\n+permission under section 7 of the GNU General Public License, version\n+3 (\"GPLv3\"). It applies to a given file (the \"Runtime Library\") that\n+bears a notice placed by the copyright holder of the file stating that\n+the file is governed by GPLv3 along with this Exception.\n+\n+When you use GCC to compile a program, GCC may combine portions of\n+certain GCC header files and runtime libraries with the compiled\n+program. The purpose of this Exception is to allow compilation of\n+non-GPL (including proprietary) programs to use, in this way, the\n+header files and runtime libraries covered by this Exception.\n+\n+0. Definitions.\n+\n+A file is an \"Independent Module\" if it either requires the Runtime\n+Library for execution after a Compilation Process, or makes use of an\n+interface provided by the Runtime Library, but is not otherwise based\n+on the Runtime Library.\n+\n+\"GCC\" means a version of the GNU Compiler Collection, with or without\n+modifications, governed by version 3 (or a specified later version) of\n+the GNU General Public License (GPL) with the option of using any\n+subsequent versions published by the FSF.\n+\n+\"GPL-compatible Software\" is software whose conditions of propagation,\n+modification and use would permit combination with GCC in accord with\n+the license of GCC.\n+\n+\"Target Code\" refers to output from any compiler for a real or virtual\n+target processor architecture, in executable form or suitable for\n+input to an assembler, loader, linker and/or execution\n+phase. Notwithstanding that, Target Code does not include data in any\n+format that is used as a compiler intermediate representation, or used\n+for producing a compiler intermediate representation.\n+\n+The \"Compilation Process\" transforms code entirely represented in\n+non-intermediate languages designed for human-written code, and/or in\n+Java Virtual Machine byte code, into Target Code. Thus, for example,\n+use of source code generators and preprocessors need not be considered\n+part of the Compilation Process, since the Compilation Process can be\n+understood as starting with the output of the generators or\n+preprocessors.\n+\n+A Compilation Process is \"Eligible\" if it is done using GCC, alone or\n+with other GPL-compatible software, or if it is done without using any\n+work based on GCC. For example, using non-GPL-compatible Software to\n+optimize any GCC intermediate representations would not qualify as an\n+Eligible Compilation Process.\n+\n+1. Grant of Additional Permission.\n+\n+You have permission to propagate a work of Target Code formed by\n+combining the Runtime Library with Independent Modules, even if such\n+propagation would otherwise violate the terms of GPLv3, provided that\n+all Target Code was generated by Eligible Compilation Processes. You\n+may then convey such a combination under terms of your choice,\n+consistent with the licensing of the Independent Modules.\n+\n+2. No Weakening of GCC Copyleft.\n+\n+The availability of this Exception does not imply any general\n+presumption that third-party software is unaffected by the copyleft\n+requirements of the license of GCC.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libuuid | BSD-3-Clause\n+Note: Only included in Linux builds\n+URL: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid\n+--------------------------------------------------------------------------------\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions\n+are met:\n+1. Redistributions of source code must retain the above copyright\n+ notice, and the entire permission notice in its entirety,\n+ including the disclaimer of warranties.\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+3. The name of the author may not be used to endorse or promote\n+ products derived from this software without specific prior\n+ written permission.\n+\n+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED\n+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF\n+WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE\n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\n+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\n+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libintl | LGPL-2.1-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/gettext/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 2.1, February 1999\n+\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\n+ <https://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+[This is the first released version of the Lesser GPL. It also counts\n+ as the successor of the GNU Library Public License, version 2, hence\n+ the version number 2.1.]\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+Licenses are intended to guarantee your freedom to share and change\n+free software--to make sure the software is free for all its users.\n+\n+ This license, the Lesser General Public License, applies to some\n+specially designated software packages--typically libraries--of the\n+Free Software Foundation and other authors who decide to use it. You\n+can use it too, but we suggest you first think carefully about whether\n+this license or the ordinary General Public License is the better\n+strategy to use in any particular case, based on the explanations below.\n+\n+ When we speak of free software, we are referring to freedom of use,\n+not price. Our General Public Licenses are designed to make sure that\n+you have the freedom to distribute copies of free software (and charge\n+for this service if you wish); that you receive source code or can get\n+it if you want it; that you can change the software and use pieces of\n+it in new free programs; and that you are informed that you can do\n+these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+distributors to deny you these rights or to ask you to surrender these\n+rights. These restrictions translate to certain responsibilities for\n+you if you distribute copies of the library or if you modify it.\n+\n+ For example, if you distribute copies of the library, whether gratis\n+or for a fee, you must give the recipients all the rights that we gave\n+you. You must make sure that they, too, receive or can get the source\n+code. If you link other code with the library, you must provide\n+complete object files to the recipients, so that they can relink them\n+with the library after making changes to the library and recompiling\n+it. And you must show them these terms so they know their rights.\n+\n+ We protect your rights with a two-step method: (1) we copyright the\n+library, and (2) we offer you this license, which gives you legal\n+permission to copy, distribute and/or modify the library.\n+\n+ To protect each distributor, we want to make it very clear that\n+there is no warranty for the free library. Also, if the library is\n+modified by someone else and passed on, the recipients should know\n+that what they have is not the original version, so that the original\n+author's reputation will not be affected by problems that might be\n+introduced by others.\n+\f\n+ Finally, software patents pose a constant threat to the existence of\n+any free program. We wish to make sure that a company cannot\n+effectively restrict the users of a free program by obtaining a\n+restrictive license from a patent holder. Therefore, we insist that\n+any patent license obtained for a version of the library must be\n+consistent with the full freedom of use specified in this license.\n+\n+ Most GNU software, including some libraries, is covered by the\n+ordinary GNU General Public License. This license, the GNU Lesser\n+General Public License, applies to certain designated libraries, and\n+is quite different from the ordinary General Public License. We use\n+this license for certain libraries in order to permit linking those\n+libraries into non-free programs.\n+\n+ When a program is linked with a library, whether statically or using\n+a shared library, the combination of the two is legally speaking a\n+combined work, a derivative of the original library. The ordinary\n+General Public License therefore permits such linking only if the\n+entire combination fits its criteria of freedom. The Lesser General\n+Public License permits more lax criteria for linking other code with\n+the library.\n+\n+ We call this license the \"Lesser\" General Public License because it\n+does Less to protect the user's freedom than the ordinary General\n+Public License. It also provides other free software developers Less\n+of an advantage over competing non-free programs. These disadvantages\n+are the reason we use the ordinary General Public License for many\n+libraries. However, the Lesser license provides advantages in certain\n+special circumstances.\n+\n+ For example, on rare occasions, there may be a special need to\n+encourage the widest possible use of a certain library, so that it becomes\n+a de-facto standard. To achieve this, non-free programs must be\n+allowed to use the library. A more frequent case is that a free\n+library does the same job as widely used non-free libraries. In this\n+case, there is little to gain by limiting the free library to free\n+software only, so we use the Lesser General Public License.\n+\n+ In other cases, permission to use a particular library in non-free\n+programs enables a greater number of people to use a large body of\n+free software. For example, permission to use the GNU C Library in\n+non-free programs enables many more people to use the whole GNU\n+operating system, as well as its variant, the GNU/Linux operating\n+system.\n+\n+ Although the Lesser General Public License is Less protective of the\n+users' freedom, it does ensure that the user of a program that is\n+linked with the Library has the freedom and the wherewithal to run\n+that program using a modified version of the Library.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow. Pay close attention to the difference between a\n+\"work based on the library\" and a \"work that uses the library\". The\n+former contains code derived from the library, whereas the latter must\n+be combined with the library in order to run.\n+\f\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License Agreement applies to any software library or other\n+program which contains a notice placed by the copyright holder or\n+other authorized party saying it may be distributed under the terms of\n+this Lesser General Public License (also called \"this License\").\n+Each licensee is addressed as \"you\".\n+\n+ A \"library\" means a collection of software functions and/or data\n+prepared so as to be conveniently linked with application programs\n+(which use some of those functions and data) to form executables.\n+\n+ The \"Library\", below, refers to any such software library or work\n+which has been distributed under these terms. A \"work based on the\n+Library\" means either the Library or any derivative work under\n+copyright law: that is to say, a work containing the Library or a\n+portion of it, either verbatim or with modifications and/or translated\n+straightforwardly into another language. (Hereinafter, translation is\n+included without limitation in the term \"modification\".)\n+\n+ \"Source code\" for a work means the preferred form of the work for\n+making modifications to it. For a library, complete source code means\n+all the source code for all modules it contains, plus any associated\n+interface definition files, plus the scripts used to control compilation\n+and installation of the library.\n+\n+ Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running a program using the Library is not restricted, and output from\n+such a program is covered only if its contents constitute a work based\n+on the Library (independent of the use of the Library in a tool for\n+writing it). Whether that is true depends on what the Library does\n+and what the program that uses the Library does.\n+\n+ 1. You may copy and distribute verbatim copies of the Library's\n+complete source code as you receive it, in any medium, provided that\n+you conspicuously and appropriately publish on each copy an\n+appropriate copyright notice and disclaimer of warranty; keep intact\n+all the notices that refer to this License and to the absence of any\n+warranty; and distribute a copy of this License along with the\n+Library.\n+\n+ You may charge a fee for the physical act of transferring a copy,\n+and you may at your option offer warranty protection in exchange for a\n+fee.\n+\f\n+ 2. You may modify your copy or copies of the Library or any portion\n+of it, thus forming a work based on the Library, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) The modified work must itself be a software library.\n+\n+ b) You must cause the files modified to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ c) You must cause the whole of the work to be licensed at no\n+ charge to all third parties under the terms of this License.\n+\n+ d) If a facility in the modified Library refers to a function or a\n+ table of data to be supplied by an application program that uses\n+ the facility, other than as an argument passed when the facility\n+ is invoked, then you must make a good faith effort to ensure that,\n+ in the event an application does not supply such function or\n+ table, the facility still operates, and performs whatever part of\n+ its purpose remains meaningful.\n+\n+ (For example, a function in a library to compute square roots has\n+ a purpose that is entirely well-defined independent of the\n+ application. Therefore, Subsection 2d requires that any\n+ application-supplied function or table used by this function must\n+ be optional: if the application does not supply it, the square\n+ root function must still compute square roots.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Library,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Library, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote\n+it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Library.\n+\n+In addition, mere aggregation of another work not based on the Library\n+with the Library (or with a work based on the Library) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\n+License instead of this License to a given copy of the Library. To do\n+this, you must alter all the notices that refer to this License, so\n+that they refer to the ordinary GNU General Public License, version 2,\n+instead of to this License. (If a newer version than version 2 of the\n+ordinary GNU General Public License has appeared, then you can specify\n+that version instead if you wish.) Do not make any other change in\n+these notices.\n+\f\n+ Once this change is made in a given copy, it is irreversible for\n+that copy, so the ordinary GNU General Public License applies to all\n+subsequent copies and derivative works made from that copy.\n+\n+ This option is useful when you wish to copy part of the code of\n+the Library into a program that is not a library.\n+\n+ 4. You may copy and distribute the Library (or a portion or\n+derivative of it, under Section 2) in object code or executable form\n+under the terms of Sections 1 and 2 above provided that you accompany\n+it with the complete corresponding machine-readable source code, which\n+must be distributed under the terms of Sections 1 and 2 above on a\n+medium customarily used for software interchange.\n+\n+ If distribution of object code is made by offering access to copy\n+from a designated place, then offering equivalent access to copy the\n+source code from the same place satisfies the requirement to\n+distribute the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 5. A program that contains no derivative of any portion of the\n+Library, but is designed to work with the Library by being compiled or\n+linked with it, is called a \"work that uses the Library\". Such a\n+work, in isolation, is not a derivative work of the Library, and\n+therefore falls outside the scope of this License.\n+\n+ However, linking a \"work that uses the Library\" with the Library\n+creates an executable that is a derivative of the Library (because it\n+contains portions of the Library), rather than a \"work that uses the\n+library\". The executable is therefore covered by this License.\n+Section 6 states terms for distribution of such executables.\n+\n+ When a \"work that uses the Library\" uses material from a header file\n+that is part of the Library, the object code for the work may be a\n+derivative work of the Library even though the source code is not.\n+Whether this is true is especially significant if the work can be\n+linked without the Library, or if the work is itself a library. The\n+threshold for this to be true is not precisely defined by law.\n+\n+ If such an object file uses only numerical parameters, data\n+structure layouts and accessors, and small macros and small inline\n+functions (ten lines or less in length), then the use of the object\n+file is unrestricted, regardless of whether it is legally a derivative\n+work. (Executables containing this object code plus portions of the\n+Library will still fall under Section 6.)\n+\n+ Otherwise, if the work is a derivative of the Library, you may\n+distribute the object code for the work under the terms of Section 6.\n+Any executables containing that work also fall under Section 6,\n+whether or not they are linked directly with the Library itself.\n+\f\n+ 6. As an exception to the Sections above, you may also combine or\n+link a \"work that uses the Library\" with the Library to produce a\n+work containing portions of the Library, and distribute that work\n+under terms of your choice, provided that the terms permit\n+modification of the work for the customer's own use and reverse\n+engineering for debugging such modifications.\n+\n+ You must give prominent notice with each copy of the work that the\n+Library is used in it and that the Library and its use are covered by\n+this License. You must supply a copy of this License. If the work\n+during execution displays copyright notices, you must include the\n+copyright notice for the Library among them, as well as a reference\n+directing the user to the copy of this License. Also, you must do one\n+of these things:\n+\n+ a) Accompany the work with the complete corresponding\n+ machine-readable source code for the Library including whatever\n+ changes were used in the work (which must be distributed under\n+ Sections 1 and 2 above); and, if the work is an executable linked\n+ with the Library, with the complete machine-readable \"work that\n+ uses the Library\", as object code and/or source code, so that the\n+ user can modify the Library and then relink to produce a modified\n+ executable containing the modified Library. (It is understood\n+ that the user who changes the contents of definitions files in the\n+ Library will not necessarily be able to recompile the application\n+ to use the modified definitions.)\n+\n+ b) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (1) uses at run time a\n+ copy of the library already present on the user's computer system,\n+ rather than copying library functions into the executable, and (2)\n+ will operate properly with a modified version of the library, if\n+ the user installs one, as long as the modified version is\n+ interface-compatible with the version that the work was made with.\n+\n+ c) Accompany the work with a written offer, valid for at\n+ least three years, to give the same user the materials\n+ specified in Subsection 6a, above, for a charge no more\n+ than the cost of performing this distribution.\n+\n+ d) If distribution of the work is made by offering access to copy\n+ from a designated place, offer equivalent access to copy the above\n+ specified materials from the same place.\n+\n+ e) Verify that the user has already received a copy of these\n+ materials or that you have already sent this user a copy.\n+\n+ For an executable, the required form of the \"work that uses the\n+Library\" must include any data and utility programs needed for\n+reproducing the executable from it. However, as a special exception,\n+the materials to be distributed need not include anything that is\n+normally distributed (in either source or binary form) with the major\n+components (compiler, kernel, and so on) of the operating system on\n+which the executable runs, unless that component itself accompanies\n+the executable.\n+\n+ It may happen that this requirement contradicts the license\n+restrictions of other proprietary libraries that do not normally\n+accompany the operating system. Such a contradiction means you cannot\n+use both them and the Library together in an executable that you\n+distribute.\n+\f\n+ 7. You may place library facilities that are a work based on the\n+Library side-by-side in a single library together with other library\n+facilities not covered by this License, and distribute such a combined\n+library, provided that the separate distribution of the work based on\n+the Library and of the other library facilities is otherwise\n+permitted, and provided that you do these two things:\n+\n+ a) Accompany the combined library with a copy of the same work\n+ based on the Library, uncombined with any other library\n+ facilities. This must be distributed under the terms of the\n+ Sections above.\n+\n+ b) Give prominent notice with the combined library of the fact\n+ that part of it is a work based on the Library, and explaining\n+ where to find the accompanying uncombined form of the same work.\n+\n+ 8. You may not copy, modify, sublicense, link with, or distribute\n+the Library except as expressly provided under this License. Any\n+attempt otherwise to copy, modify, sublicense, link with, or\n+distribute the Library is void, and will automatically terminate your\n+rights under this License. However, parties who have received copies,\n+or rights, from you under this License will not have their licenses\n+terminated so long as such parties remain in full compliance.\n+\n+ 9. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Library or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Library (or any work based on the\n+Library), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Library or works based on it.\n+\n+ 10. Each time you redistribute the Library (or any work based on the\n+Library), the recipient automatically receives a license from the\n+original licensor to copy, distribute, link with or modify the Library\n+subject to these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties with\n+this License.\n+\f\n+ 11. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Library at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Library by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Library.\n+\n+If any portion of this section is held invalid or unenforceable under any\n+particular circumstance, the balance of the section is intended to apply,\n+and the section as a whole is intended to apply in other circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 12. If the distribution and/or use of the Library is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Library under this License may add\n+an explicit geographical distribution limitation excluding those countries,\n+so that distribution is permitted only in or among countries not thus\n+excluded. In such case, this License incorporates the limitation as if\n+written in the body of this License.\n+\n+ 13. The Free Software Foundation may publish revised and/or new\n+versions of the Lesser General Public License from time to time.\n+Such new versions will be similar in spirit to the present version,\n+but may differ in detail to address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Library\n+specifies a version number of this License which applies to it and\n+\"any later version\", you have the option of following the terms and\n+conditions either of that version or of any later version published by\n+the Free Software Foundation. If the Library does not specify a\n+license version number, you may choose any version ever published by\n+the Free Software Foundation.\n+\f\n+ 14. If you wish to incorporate parts of the Library into other free\n+programs whose distribution conditions are incompatible with these,\n+write to the author to ask for permission. For software which is\n+copyrighted by the Free Software Foundation, write to the Free\n+Software Foundation; we sometimes make exceptions for this. Our\n+decision will be guided by the two goals of preserving the free status\n+of all derivatives of our free software and of promoting the sharing\n+and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\n+OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\f\n+ How to Apply These Terms to Your New Libraries\n+\n+ If you develop a new library, and you want it to be of the greatest\n+possible use to the public, we recommend making it free software that\n+everyone can redistribute and change. You can do so by permitting\n+redistribution under these terms (or, alternatively, under the terms of the\n+ordinary General Public License).\n+\n+ To apply these terms, attach the following notices to the library. It is\n+safest to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least the\n+\"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the library's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This library is free software; you can redistribute it and/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with this library; if not, see <https://www.gnu.org/licenses/>.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the library, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\n+\n+ <signature of Moe Ghoul>, 1 April 1990\n+ Moe Ghoul, President of Vice\n+\n+That's all there is to it!\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libidn2 | LGPL-3.0-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libidn/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+\n+ This version of the GNU Lesser General Public License incorporates\n+the terms and conditions of version 3 of the GNU General Public\n+License, supplemented by the additional permissions listed below.\n+\n+ 0. Additional Definitions.\n+\n+ As used herein, \"this License\" refers to version 3 of the GNU Lesser\n+General Public License, and the \"GNU GPL\" refers to version 3 of the GNU\n+General Public License.\n+\n+ \"The Library\" refers to a covered work governed by this License,\n+other than an Application or a Combined Work as defined below.\n+\n+ An \"Application\" is any work that makes use of an interface provided\n+by the Library, but which is not otherwise based on the Library.\n+Defining a subclass of a class defined by the Library is deemed a mode\n+of using an interface provided by the Library.\n+\n+ A \"Combined Work\" is a work produced by combining or linking an\n+Application with the Library. The particular version of the Library\n+with which the Combined Work was made is also called the \"Linked\n+Version\".\n+\n+ The \"Minimal Corresponding Source\" for a Combined Work means the\n+Corresponding Source for the Combined Work, excluding any source code\n+for portions of the Combined Work that, considered in isolation, are\n+based on the Application, and not on the Linked Version.\n+\n+ The \"Corresponding Application Code\" for a Combined Work means the\n+object code and/or source code for the Application, including any data\n+and utility programs needed for reproducing the Combined Work from the\n+Application, but excluding the System Libraries of the Combined Work.\n+\n+ 1. Exception to Section 3 of the GNU GPL.\n+\n+ You may convey a covered work under sections 3 and 4 of this License\n+without being bound by section 3 of the GNU GPL.\n+\n+ 2. Conveying Modified Versions.\n+\n+ If you modify a copy of the Library, and, in your modifications, a\n+facility refers to a function or data to be supplied by an Application\n+that uses the facility (other than as an argument passed when the\n+facility is invoked), then you may convey a copy of the modified\n+version:\n+\n+ a) under this License, provided that you make a good faith effort to\n+ ensure that, in the event an Application does not supply the\n+ function or data, the facility still operates, and performs\n+ whatever part of its purpose remains meaningful, or\n+\n+ b) under the GNU GPL, with none of the additional permissions of\n+ this License applicable to that copy.\n+\n+ 3. Object Code Incorporating Material from Library Header Files.\n+\n+ The object code form of an Application may incorporate material from\n+a header file that is part of the Library. You may convey such object\n+code under terms of your choice, provided that, if the incorporated\n+material is not limited to numerical parameters, data structure\n+layouts and accessors, or small macros, inline functions and templates\n+(ten or fewer lines in length), you do both of the following:\n+\n+ a) Give prominent notice with each copy of the object code that the\n+ Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the object code with a copy of the GNU GPL and this license\n+ document.\n+\n+ 4. Combined Works.\n+\n+ You may convey a Combined Work under terms of your choice that,\n+taken together, effectively do not restrict modification of the\n+portions of the Library contained in the Combined Work and reverse\n+engineering for debugging such modifications, if you also do each of\n+the following:\n+\n+ a) Give prominent notice with each copy of the Combined Work that\n+ the Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\n+ document.\n+\n+ c) For a Combined Work that displays copyright notices during\n+ execution, include the copyright notice for the Library among\n+ these notices, as well as a reference directing the user to the\n+ copies of the GNU GPL and this license document.\n+\n+ d) Do one of the following:\n+\n+ 0) Convey the Minimal Corresponding Source under the terms of this\n+ License, and the Corresponding Application Code in a form\n+ suitable for, and under terms that permit, the user to\n+ recombine or relink the Application with a modified version of\n+ the Linked Version to produce a modified Combined Work, in the\n+ manner specified by section 6 of the GNU GPL for conveying\n+ Corresponding Source.\n+\n+ 1) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (a) uses at run time\n+ a copy of the Library already present on the user's computer\n+ system, and (b) will operate properly with a modified version\n+ of the Library that is interface-compatible with the Linked\n+ Version.\n+\n+ e) Provide Installation Information, but only if you would otherwise\n+ be required to provide such information under section 6 of the\n+ GNU GPL, and only to the extent that such information is\n+ necessary to install and execute a modified version of the\n+ Combined Work produced by recombining or relinking the\n+ Application with a modified version of the Linked Version. (If\n+ you use option 4d0, the Installation Information must accompany\n+ the Minimal Corresponding Source and Corresponding Application\n+ Code. If you use option 4d1, you must provide the Installation\n+ Information in the manner specified by section 6 of the GNU GPL\n+ for conveying Corresponding Source.)\n+\n+ 5. Combined Libraries.\n+\n+ You may place library facilities that are a work based on the\n+Library side by side in a single library together with other library\n+facilities that are not Applications and are not covered by this\n+License, and convey such a combined library under terms of your\n+choice, if you do both of the following:\n+\n+ a) Accompany the combined library with a copy of the same work based\n+ on the Library, uncombined with any other library facilities,\n+ conveyed under the terms of this License.\n+\n+ b) Give prominent notice with the combined library that part of it\n+ is a work based on the Library, and explaining where to find the\n+ accompanying uncombined form of the same work.\n+\n+ 6. Revised Versions of the GNU Lesser General Public License.\n+\n+ The Free Software Foundation may publish revised and/or new versions\n+of the GNU Lesser General Public License from time to time. Such new\n+versions will be similar in spirit to the present version, but may\n+differ in detail to address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Library as you received it specifies that a certain numbered version\n+of the GNU Lesser General Public License \"or any later version\"\n+applies to it, you have the option of following the terms and\n+conditions either of that published version or of any later version\n+published by the Free Software Foundation. If the Library as you\n+received it does not specify a version number of the GNU Lesser\n+General Public License, you may choose any version of the GNU Lesser\n+General Public License ever published by the Free Software Foundation.\n+\n+ If the Library as you received it specifies that a proxy can decide\n+whether future versions of the GNU Lesser General Public License shall\n+apply, that proxy's public statement of acceptance of any version is\n+permanent authorization for you to choose that version for the\n+Library.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libidn2 (Unicode character data files) | Unicode-TOU AND Unicode-DFS-2016\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libidn/\n+--------------------------------------------------------------------------------\n+A. Unicode Copyright.\n+\n+ Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\n+ Certain documents and files on this website contain a legend indicating that \"Modification is permitted.\" Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode๏ฟฝ Standard, subject to Terms and Conditions herein.\n+ Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein.\n+ Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the \"Unicode Character Database\" can be found in the License.\n+ Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.\n+ No license is granted to \"mirror\" the Unicode website where a fee is charged for access to the \"mirror\" site.\n+ Modification is not permitted with respect to this document. All copies of this document must be verbatim.\n+\n+B. Restricted Rights Legend.\n+ Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.\n+\n+C. Warranties and Disclaimers.\n+ This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.\n+ If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.\n+ EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED \"AS IS\" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.\n+\n+D. Waiver of Damages.\n+ In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.\n+\n+E. Trademarks & Logos.\n+ The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. ๏ฟฝThe Unicode Consortium๏ฟฝ and ๏ฟฝUnicode, Inc.๏ฟฝ are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.๏ฟฝs exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.\n+ The Unicode Consortium Name and Trademark Usage Policy (๏ฟฝTrademark Policy๏ฟฝ) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.\n+ All third party trademarks referenced herein are the property of their respective owners.\n+\n+F. Miscellaneous.\n+ Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.\n+ Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode๏ฟฝs prior written consent.\n+ Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode๏ฟฝs net income.\n+ Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.\n+ Entire Agreement. This Agreement constitutes the entire agreement between the parties.\n+\n+\n+\n+EXHIBIT 1\n+Unicode Data Files include all data files under the directories\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\n+http://www.unicode.org/utility/trac/browser/.\n+\n+Unicode Data Files do not include PDF online code charts under the\n+directory http://www.unicode.org/Public/.\n+\n+Software includes any source code published in the Unicode Standard\n+or under the directories\n+http://www.unicode.org/Public/, http://www.unicode.org/reports/,\n+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and\n+http://www.unicode.org/utility/trac/browser/.\n+\n+NOTICE TO USER: Carefully read the following legal agreement.\n+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S\n+DATA FILES (\"DATA FILES\"), AND/OR SOFTWARE (\"SOFTWARE\"),\n+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE\n+TERMS AND CONDITIONS OF THIS AGREEMENT.\n+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE\n+THE DATA FILES OR SOFTWARE.\n+\n+COPYRIGHT AND PERMISSION NOTICE\n+\n+Copyright ๏ฟฝ 1991-2016 Unicode, Inc. All rights reserved.\n+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of the Unicode data files and any associated documentation\n+(the \"Data Files\") or Unicode software and any associated documentation\n+(the \"Software\") to deal in the Data Files or Software\n+without restriction, including without limitation the rights to use,\n+copy, modify, merge, publish, distribute, and/or sell copies of\n+the Data Files or Software, and to permit persons to whom the Data Files\n+or Software are furnished to do so, provided that either\n+(a) this copyright and permission notice appear with all copies\n+of the Data Files or Software, or\n+(b) this copyright and permission notice appear in associated\n+Documentation.\n+\n+THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n+NONINFRINGEMENT OF THIRD PARTY RIGHTS.\n+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\n+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\n+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n+PERFORMANCE OF THE DATA FILES OR SOFTWARE.\n+\n+Except as contained in this notice, the name of a copyright holder\n+shall not be used in advertising or otherwise to promote the sale,\n+use or other dealings in these Data Files or Software without prior\n+written authorization of the copyright holder.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+libunistring | LGPL-3.0-or-later\n+Note: Only included in macOS builds\n+URL: https://www.gnu.org/software/libunistring/\n+--------------------------------------------------------------------------------\n+\t\t GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 3, 29 June 2007\n+\n+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+\n+ This version of the GNU Lesser General Public License incorporates\n+the terms and conditions of version 3 of the GNU General Public\n+License, supplemented by the additional permissions listed below.\n+\n+ 0. Additional Definitions. \n+\n+ As used herein, \"this License\" refers to version 3 of the GNU Lesser\n+General Public License, and the \"GNU GPL\" refers to version 3 of the GNU\n+General Public License.\n+\n+ \"The Library\" refers to a covered work governed by this License,\n+other than an Application or a Combined Work as defined below.\n+\n+ An \"Application\" is any work that makes use of an interface provided\n+by the Library, but which is not otherwise based on the Library.\n+Defining a subclass of a class defined by the Library is deemed a mode\n+of using an interface provided by the Library.\n+\n+ A \"Combined Work\" is a work produced by combining or linking an\n+Application with the Library. The particular version of the Library\n+with which the Combined Work was made is also called the \"Linked\n+Version\".\n+\n+ The \"Minimal Corresponding Source\" for a Combined Work means the\n+Corresponding Source for the Combined Work, excluding any source code\n+for portions of the Combined Work that, considered in isolation, are\n+based on the Application, and not on the Linked Version.\n+\n+ The \"Corresponding Application Code\" for a Combined Work means the\n+object code and/or source code for the Application, including any data\n+and utility programs needed for reproducing the Combined Work from the\n+Application, but excluding the System Libraries of the Combined Work.\n+\n+ 1. Exception to Section 3 of the GNU GPL.\n+\n+ You may convey a covered work under sections 3 and 4 of this License\n+without being bound by section 3 of the GNU GPL.\n+\n+ 2. Conveying Modified Versions.\n+\n+ If you modify a copy of the Library, and, in your modifications, a\n+facility refers to a function or data to be supplied by an Application\n+that uses the facility (other than as an argument passed when the\n+facility is invoked), then you may convey a copy of the modified\n+version:\n+\n+ a) under this License, provided that you make a good faith effort to\n+ ensure that, in the event an Application does not supply the\n+ function or data, the facility still operates, and performs\n+ whatever part of its purpose remains meaningful, or\n+\n+ b) under the GNU GPL, with none of the additional permissions of\n+ this License applicable to that copy.\n+\n+ 3. Object Code Incorporating Material from Library Header Files.\n+\n+ The object code form of an Application may incorporate material from\n+a header file that is part of the Library. You may convey such object\n+code under terms of your choice, provided that, if the incorporated\n+material is not limited to numerical parameters, data structure\n+layouts and accessors, or small macros, inline functions and templates\n+(ten or fewer lines in length), you do both of the following:\n+\n+ a) Give prominent notice with each copy of the object code that the\n+ Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the object code with a copy of the GNU GPL and this license\n+ document.\n+\n+ 4. Combined Works.\n+\n+ You may convey a Combined Work under terms of your choice that,\n+taken together, effectively do not restrict modification of the\n+portions of the Library contained in the Combined Work and reverse\n+engineering for debugging such modifications, if you also do each of\n+the following:\n+\n+ a) Give prominent notice with each copy of the Combined Work that\n+ the Library is used in it and that the Library and its use are\n+ covered by this License.\n+\n+ b) Accompany the Combined Work with a copy of the GNU GPL and this license\n+ document.\n+\n+ c) For a Combined Work that displays copyright notices during\n+ execution, include the copyright notice for the Library among\n+ these notices, as well as a reference directing the user to the\n+ copies of the GNU GPL and this license document.\n+\n+ d) Do one of the following:\n+\n+ 0) Convey the Minimal Corresponding Source under the terms of this\n+ License, and the Corresponding Application Code in a form\n+ suitable for, and under terms that permit, the user to\n+ recombine or relink the Application with a modified version of\n+ the Linked Version to produce a modified Combined Work, in the\n+ manner specified by section 6 of the GNU GPL for conveying\n+ Corresponding Source.\n+\n+ 1) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (a) uses at run time\n+ a copy of the Library already present on the user's computer\n+ system, and (b) will operate properly with a modified version\n+ of the Library that is interface-compatible with the Linked\n+ Version. \n+\n+ e) Provide Installation Information, but only if you would otherwise\n+ be required to provide such information under section 6 of the\n+ GNU GPL, and only to the extent that such information is\n+ necessary to install and execute a modified version of the\n+ Combined Work produced by recombining or relinking the\n+ Application with a modified version of the Linked Version. (If\n+ you use option 4d0, the Installation Information must accompany\n+ the Minimal Corresponding Source and Corresponding Application\n+ Code. If you use option 4d1, you must provide the Installation\n+ Information in the manner specified by section 6 of the GNU GPL\n+ for conveying Corresponding Source.)\n+\n+ 5. Combined Libraries.\n+\n+ You may place library facilities that are a work based on the\n+Library side by side in a single library together with other library\n+facilities that are not Applications and are not covered by this\n+License, and convey such a combined library under terms of your\n+choice, if you do both of the following:\n+\n+ a) Accompany the combined library with a copy of the same work based\n+ on the Library, uncombined with any other library facilities,\n+ conveyed under the terms of this License.\n+\n+ b) Give prominent notice with the combined library that part of it\n+ is a work based on the Library, and explaining where to find the\n+ accompanying uncombined form of the same work.\n+\n+ 6. Revised Versions of the GNU Lesser General Public License.\n+\n+ The Free Software Foundation may publish revised and/or new versions\n+of the GNU Lesser General Public License from time to time. Such new\n+versions will be similar in spirit to the present version, but may\n+differ in detail to address new problems or concerns.\n+\n+ Each version is given a distinguishing version number. If the\n+Library as you received it specifies that a certain numbered version\n+of the GNU Lesser General Public License \"or any later version\"\n+applies to it, you have the option of following the terms and\n+conditions either of that published version or of any later version\n+published by the Free Software Foundation. If the Library as you\n+received it does not specify a version number of the GNU Lesser\n+General Public License, you may choose any version of the GNU Lesser\n+General Public License ever published by the Free Software Foundation.\n+\n+ If the Library as you received it specifies that a proxy can decide\n+whether future versions of the GNU Lesser General Public License shall\n+apply, that proxy's public statement of acceptance of any version is\n+permanent authorization for you to choose that version for the\n+Library.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+librtmp | LGPL-2.1-or-later\n+Note: Only included in macOS builds\n+URL: https://rtmpdump.mplayerhq.hu/\n+--------------------------------------------------------------------------------\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ Version 2.1, February 1999\n+\n+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+[This is the first released version of the Lesser GPL. It also counts\n+ as the successor of the GNU Library Public License, version 2, hence\n+ the version number 2.1.]\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+Licenses are intended to guarantee your freedom to share and change\n+free software--to make sure the software is free for all its users.\n+\n+ This license, the Lesser General Public License, applies to some\n+specially designated software packages--typically libraries--of the\n+Free Software Foundation and other authors who decide to use it. You\n+can use it too, but we suggest you first think carefully about whether\n+this license or the ordinary General Public License is the better\n+strategy to use in any particular case, based on the explanations below.\n+\n+ When we speak of free software, we are referring to freedom of use,\n+not price. Our General Public Licenses are designed to make sure that\n+you have the freedom to distribute copies of free software (and charge\n+for this service if you wish); that you receive source code or can get\n+it if you want it; that you can change the software and use pieces of\n+it in new free programs; and that you are informed that you can do\n+these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+distributors to deny you these rights or to ask you to surrender these\n+rights. These restrictions translate to certain responsibilities for\n+you if you distribute copies of the library or if you modify it.\n+\n+ For example, if you distribute copies of the library, whether gratis\n+or for a fee, you must give the recipients all the rights that we gave\n+you. You must make sure that they, too, receive or can get the source\n+code. If you link other code with the library, you must provide\n+complete object files to the recipients, so that they can relink them\n+with the library after making changes to the library and recompiling\n+it. And you must show them these terms so they know their rights.\n+\n+ We protect your rights with a two-step method: (1) we copyright the\n+library, and (2) we offer you this license, which gives you legal\n+permission to copy, distribute and/or modify the library.\n+\n+ To protect each distributor, we want to make it very clear that\n+there is no warranty for the free library. Also, if the library is\n+modified by someone else and passed on, the recipients should know\n+that what they have is not the original version, so that the original\n+author's reputation will not be affected by problems that might be\n+introduced by others.\n+\f\n+ Finally, software patents pose a constant threat to the existence of\n+any free program. We wish to make sure that a company cannot\n+effectively restrict the users of a free program by obtaining a\n+restrictive license from a patent holder. Therefore, we insist that\n+any patent license obtained for a version of the library must be\n+consistent with the full freedom of use specified in this license.\n+\n+ Most GNU software, including some libraries, is covered by the\n+ordinary GNU General Public License. This license, the GNU Lesser\n+General Public License, applies to certain designated libraries, and\n+is quite different from the ordinary General Public License. We use\n+this license for certain libraries in order to permit linking those\n+libraries into non-free programs.\n+\n+ When a program is linked with a library, whether statically or using\n+a shared library, the combination of the two is legally speaking a\n+combined work, a derivative of the original library. The ordinary\n+General Public License therefore permits such linking only if the\n+entire combination fits its criteria of freedom. The Lesser General\n+Public License permits more lax criteria for linking other code with\n+the library.\n+\n+ We call this license the \"Lesser\" General Public License because it\n+does Less to protect the user's freedom than the ordinary General\n+Public License. It also provides other free software developers Less\n+of an advantage over competing non-free programs. These disadvantages\n+are the reason we use the ordinary General Public License for many\n+libraries. However, the Lesser license provides advantages in certain\n+special circumstances.\n+\n+ For example, on rare occasions, there may be a special need to\n+encourage the widest possible use of a certain library, so that it becomes\n+a de-facto standard. To achieve this, non-free programs must be\n+allowed to use the library. A more frequent case is that a free\n+library does the same job as widely used non-free libraries. In this\n+case, there is little to gain by limiting the free library to free\n+software only, so we use the Lesser General Public License.\n+\n+ In other cases, permission to use a particular library in non-free\n+programs enables a greater number of people to use a large body of\n+free software. For example, permission to use the GNU C Library in\n+non-free programs enables many more people to use the whole GNU\n+operating system, as well as its variant, the GNU/Linux operating\n+system.\n+\n+ Although the Lesser General Public License is Less protective of the\n+users' freedom, it does ensure that the user of a program that is\n+linked with the Library has the freedom and the wherewithal to run\n+that program using a modified version of the Library.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow. Pay close attention to the difference between a\n+\"work based on the library\" and a \"work that uses the library\". The\n+former contains code derived from the library, whereas the latter must\n+be combined with the library in order to run.\n+\f\n+ GNU LESSER GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License Agreement applies to any software library or other\n+program which contains a notice placed by the copyright holder or\n+other authorized party saying it may be distributed under the terms of\n+this Lesser General Public License (also called \"this License\").\n+Each licensee is addressed as \"you\".\n+\n+ A \"library\" means a collection of software functions and/or data\n+prepared so as to be conveniently linked with application programs\n+(which use some of those functions and data) to form executables.\n+\n+ The \"Library\", below, refers to any such software library or work\n+which has been distributed under these terms. A \"work based on the\n+Library\" means either the Library or any derivative work under\n+copyright law: that is to say, a work containing the Library or a\n+portion of it, either verbatim or with modifications and/or translated\n+straightforwardly into another language. (Hereinafter, translation is\n+included without limitation in the term \"modification\".)\n+\n+ \"Source code\" for a work means the preferred form of the work for\n+making modifications to it. For a library, complete source code means\n+all the source code for all modules it contains, plus any associated\n+interface definition files, plus the scripts used to control compilation\n+and installation of the library.\n+\n+ Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running a program using the Library is not restricted, and output from\n+such a program is covered only if its contents constitute a work based\n+on the Library (independent of the use of the Library in a tool for\n+writing it). Whether that is true depends on what the Library does\n+and what the program that uses the Library does.\n+\n+ 1. You may copy and distribute verbatim copies of the Library's\n+complete source code as you receive it, in any medium, provided that\n+you conspicuously and appropriately publish on each copy an\n+appropriate copyright notice and disclaimer of warranty; keep intact\n+all the notices that refer to this License and to the absence of any\n+warranty; and distribute a copy of this License along with the\n+Library.\n+\n+ You may charge a fee for the physical act of transferring a copy,\n+and you may at your option offer warranty protection in exchange for a\n+fee.\n+\f\n+ 2. You may modify your copy or copies of the Library or any portion\n+of it, thus forming a work based on the Library, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) The modified work must itself be a software library.\n+\n+ b) You must cause the files modified to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ c) You must cause the whole of the work to be licensed at no\n+ charge to all third parties under the terms of this License.\n+\n+ d) If a facility in the modified Library refers to a function or a\n+ table of data to be supplied by an application program that uses\n+ the facility, other than as an argument passed when the facility\n+ is invoked, then you must make a good faith effort to ensure that,\n+ in the event an application does not supply such function or\n+ table, the facility still operates, and performs whatever part of\n+ its purpose remains meaningful.\n+\n+ (For example, a function in a library to compute square roots has\n+ a purpose that is entirely well-defined independent of the\n+ application. Therefore, Subsection 2d requires that any\n+ application-supplied function or table used by this function must\n+ be optional: if the application does not supply it, the square\n+ root function must still compute square roots.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Library,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Library, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote\n+it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Library.\n+\n+In addition, mere aggregation of another work not based on the Library\n+with the Library (or with a work based on the Library) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may opt to apply the terms of the ordinary GNU General Public\n+License instead of this License to a given copy of the Library. To do\n+this, you must alter all the notices that refer to this License, so\n+that they refer to the ordinary GNU General Public License, version 2,\n+instead of to this License. (If a newer version than version 2 of the\n+ordinary GNU General Public License has appeared, then you can specify\n+that version instead if you wish.) Do not make any other change in\n+these notices.\n+\f\n+ Once this change is made in a given copy, it is irreversible for\n+that copy, so the ordinary GNU General Public License applies to all\n+subsequent copies and derivative works made from that copy.\n+\n+ This option is useful when you wish to copy part of the code of\n+the Library into a program that is not a library.\n+\n+ 4. You may copy and distribute the Library (or a portion or\n+derivative of it, under Section 2) in object code or executable form\n+under the terms of Sections 1 and 2 above provided that you accompany\n+it with the complete corresponding machine-readable source code, which\n+must be distributed under the terms of Sections 1 and 2 above on a\n+medium customarily used for software interchange.\n+\n+ If distribution of object code is made by offering access to copy\n+from a designated place, then offering equivalent access to copy the\n+source code from the same place satisfies the requirement to\n+distribute the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 5. A program that contains no derivative of any portion of the\n+Library, but is designed to work with the Library by being compiled or\n+linked with it, is called a \"work that uses the Library\". Such a\n+work, in isolation, is not a derivative work of the Library, and\n+therefore falls outside the scope of this License.\n+\n+ However, linking a \"work that uses the Library\" with the Library\n+creates an executable that is a derivative of the Library (because it\n+contains portions of the Library), rather than a \"work that uses the\n+library\". The executable is therefore covered by this License.\n+Section 6 states terms for distribution of such executables.\n+\n+ When a \"work that uses the Library\" uses material from a header file\n+that is part of the Library, the object code for the work may be a\n+derivative work of the Library even though the source code is not.\n+Whether this is true is especially significant if the work can be\n+linked without the Library, or if the work is itself a library. The\n+threshold for this to be true is not precisely defined by law.\n+\n+ If such an object file uses only numerical parameters, data\n+structure layouts and accessors, and small macros and small inline\n+functions (ten lines or less in length), then the use of the object\n+file is unrestricted, regardless of whether it is legally a derivative\n+work. (Executables containing this object code plus portions of the\n+Library will still fall under Section 6.)\n+\n+ Otherwise, if the work is a derivative of the Library, you may\n+distribute the object code for the work under the terms of Section 6.\n+Any executables containing that work also fall under Section 6,\n+whether or not they are linked directly with the Library itself.\n+\f\n+ 6. As an exception to the Sections above, you may also combine or\n+link a \"work that uses the Library\" with the Library to produce a\n+work containing portions of the Library, and distribute that work\n+under terms of your choice, provided that the terms permit\n+modification of the work for the customer's own use and reverse\n+engineering for debugging such modifications.\n+\n+ You must give prominent notice with each copy of the work that the\n+Library is used in it and that the Library and its use are covered by\n+this License. You must supply a copy of this License. If the work\n+during execution displays copyright notices, you must include the\n+copyright notice for the Library among them, as well as a reference\n+directing the user to the copy of this License. Also, you must do one\n+of these things:\n+\n+ a) Accompany the work with the complete corresponding\n+ machine-readable source code for the Library including whatever\n+ changes were used in the work (which must be distributed under\n+ Sections 1 and 2 above); and, if the work is an executable linked\n+ with the Library, with the complete machine-readable \"work that\n+ uses the Library\", as object code and/or source code, so that the\n+ user can modify the Library and then relink to produce a modified\n+ executable containing the modified Library. (It is understood\n+ that the user who changes the contents of definitions files in the\n+ Library will not necessarily be able to recompile the application\n+ to use the modified definitions.)\n+\n+ b) Use a suitable shared library mechanism for linking with the\n+ Library. A suitable mechanism is one that (1) uses at run time a\n+ copy of the library already present on the user's computer system,\n+ rather than copying library functions into the executable, and (2)\n+ will operate properly with a modified version of the library, if\n+ the user installs one, as long as the modified version is\n+ interface-compatible with the version that the work was made with.\n+\n+ c) Accompany the work with a written offer, valid for at\n+ least three years, to give the same user the materials\n+ specified in Subsection 6a, above, for a charge no more\n+ than the cost of performing this distribution.\n+\n+ d) If distribution of the work is made by offering access to copy\n+ from a designated place, offer equivalent access to copy the above\n+ specified materials from the same place.\n+\n+ e) Verify that the user has already received a copy of these\n+ materials or that you have already sent this user a copy.\n+\n+ For an executable, the required form of the \"work that uses the\n+Library\" must include any data and utility programs needed for\n+reproducing the executable from it. However, as a special exception,\n+the materials to be distributed need not include anything that is\n+normally distributed (in either source or binary form) with the major\n+components (compiler, kernel, and so on) of the operating system on\n+which the executable runs, unless that component itself accompanies\n+the executable.\n+\n+ It may happen that this requirement contradicts the license\n+restrictions of other proprietary libraries that do not normally\n+accompany the operating system. Such a contradiction means you cannot\n+use both them and the Library together in an executable that you\n+distribute.\n+\f\n+ 7. You may place library facilities that are a work based on the\n+Library side-by-side in a single library together with other library\n+facilities not covered by this License, and distribute such a combined\n+library, provided that the separate distribution of the work based on\n+the Library and of the other library facilities is otherwise\n+permitted, and provided that you do these two things:\n+\n+ a) Accompany the combined library with a copy of the same work\n+ based on the Library, uncombined with any other library\n+ facilities. This must be distributed under the terms of the\n+ Sections above.\n+\n+ b) Give prominent notice with the combined library of the fact\n+ that part of it is a work based on the Library, and explaining\n+ where to find the accompanying uncombined form of the same work.\n+\n+ 8. You may not copy, modify, sublicense, link with, or distribute\n+the Library except as expressly provided under this License. Any\n+attempt otherwise to copy, modify, sublicense, link with, or\n+distribute the Library is void, and will automatically terminate your\n+rights under this License. However, parties who have received copies,\n+or rights, from you under this License will not have their licenses\n+terminated so long as such parties remain in full compliance.\n+\n+ 9. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Library or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Library (or any work based on the\n+Library), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Library or works based on it.\n+\n+ 10. Each time you redistribute the Library (or any work based on the\n+Library), the recipient automatically receives a license from the\n+original licensor to copy, distribute, link with or modify the Library\n+subject to these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties with\n+this License.\n+\f\n+ 11. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Library at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Library by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Library.\n+\n+If any portion of this section is held invalid or unenforceable under any\n+particular circumstance, the balance of the section is intended to apply,\n+and the section as a whole is intended to apply in other circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 12. If the distribution and/or use of the Library is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Library under this License may add\n+an explicit geographical distribution limitation excluding those countries,\n+so that distribution is permitted only in or among countries not thus\n+excluded. In such case, this License incorporates the limitation as if\n+written in the body of this License.\n+\n+ 13. The Free Software Foundation may publish revised and/or new\n+versions of the Lesser General Public License from time to time.\n+Such new versions will be similar in spirit to the present version,\n+but may differ in detail to address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Library\n+specifies a version number of this License which applies to it and\n+\"any later version\", you have the option of following the terms and\n+conditions either of that version or of any later version published by\n+the Free Software Foundation. If the Library does not specify a\n+license version number, you may choose any version ever published by\n+the Free Software Foundation.\n+\f\n+ 14. If you wish to incorporate parts of the Library into other free\n+programs whose distribution conditions are incompatible with these,\n+write to the author to ask for permission. For software which is\n+copyrighted by the Free Software Foundation, write to the Free\n+Software Foundation; we sometimes make exceptions for this. Our\n+decision will be guided by the two goals of preserving the free status\n+of all derivatives of our free software and of promoting the sharing\n+and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\n+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\n+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\n+OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY\n+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\n+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\n+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n+\n+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\n+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\n+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\n+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\n+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\n+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\n+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\n+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\n+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n+DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\f\n+ How to Apply These Terms to Your New Libraries\n+\n+ If you develop a new library, and you want it to be of the greatest\n+possible use to the public, we recommend making it free software that\n+everyone can redistribute and change. You can do so by permitting\n+redistribution under these terms (or, alternatively, under the terms of the\n+ordinary General Public License).\n+\n+ To apply these terms, attach the following notices to the library. It is\n+safest to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least the\n+\"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the library's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This library is free software; you can redistribute it and/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with this library; if not, write to the Free Software\n+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the library, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the\n+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.\n+\n+ <signature of Ty Coon>, 1 April 1990\n+ Ty Coon, President of Vice\n+\n+That's all there is to it!\n+\n+\n+\n+--------------------------------------------------------------------------------\n+zstd | BSD-3-Clause\n+Note: Only included in macOS builds\n+URL: https://facebook.github.io/zstd/\n+--------------------------------------------------------------------------------\n+BSD License\n+\n+For Zstandard software\n+\n+Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without modification,\n+are permitted provided that the following conditions are met:\n+\n+ * Redistributions of source code must retain the above copyright notice, this\n+ list of conditions and the following disclaimer.\n+\n+ * Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+\n+ * Neither the name Facebook, nor Meta, nor the names of its contributors may\n+ be used to endorse or promote products derived from this software without\n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR\n+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+brotli | MIT\n+URL: https://brotli.org/\n+--------------------------------------------------------------------------------\n+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in\n+all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+curl_cffi | MIT\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\n+URL: https://curl-cffi.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+\n+Copyright (c) 2018 multippt\n+Copyright (c) 2022 curl_cffi developers\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+curl-impersonate | MIT\n+Note: Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds\n+URL: https://github.com/lexiforest/curl-impersonate\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2025 curl_cffi developers\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+cffi | MIT-0\n+URL: https://cffi.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Except when otherwise stated (look for LICENSE files in directories or\n+information at the beginning of each file) all software and\n+documentation is licensed as follows: \n+\n+ MIT No Attribution\n+\n+ Permission is hereby granted, free of charge, to any person \n+ obtaining a copy of this software and associated documentation \n+ files (the \"Software\"), to deal in the Software without \n+ restriction, including without limitation the rights to use, \n+ copy, modify, merge, publish, distribute, sublicense, and/or \n+ sell copies of the Software, and to permit persons to whom the \n+ Software is furnished to do so.\n+\n+ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS \n+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, \n+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL \n+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER \n+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING \n+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \n+ DEALINGS IN THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+pycparser | BSD-3-Clause\n+URL: https://github.com/eliben/pycparser\n+--------------------------------------------------------------------------------\n+pycparser -- A C parser in Python\n+\n+Copyright (c) 2008-2022, Eli Bendersky\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without modification,\n+are permitted provided that the following conditions are met:\n+\n+* Redistributions of source code must retain the above copyright notice, this \n+ list of conditions and the following disclaimer.\n+* Redistributions in binary form must reproduce the above copyright notice, \n+ this list of conditions and the following disclaimer in the documentation \n+ and/or other materials provided with the distribution.\n+* Neither the name of the copyright holder nor the names of its contributors may \n+ be used to endorse or promote products derived from this software without \n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE \n+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE \n+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \n+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT \n+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT \n+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+mutagen | GPL-2.0-or-later\n+URL: https://mutagen.readthedocs.io/\n+--------------------------------------------------------------------------------\n+ GNU GENERAL PUBLIC LICENSE\n+ Version 2, June 1991\n+\n+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+ Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+License is intended to guarantee your freedom to share and change free\n+software--to make sure the software is free for all its users. This\n+General Public License applies to most of the Free Software\n+Foundation's software and to any other program whose authors commit to\n+using it. (Some other Free Software Foundation software is covered by\n+the GNU Lesser General Public License instead.) You can apply it to\n+your programs, too.\n+\n+ When we speak of free software, we are referring to freedom, not\n+price. Our General Public Licenses are designed to make sure that you\n+have the freedom to distribute copies of free software (and charge for\n+this service if you wish), that you receive source code or can get it\n+if you want it, that you can change the software or use pieces of it\n+in new free programs; and that you know you can do these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+anyone to deny you these rights or to ask you to surrender the rights.\n+These restrictions translate to certain responsibilities for you if you\n+distribute copies of the software, or if you modify it.\n+\n+ For example, if you distribute copies of such a program, whether\n+gratis or for a fee, you must give the recipients all the rights that\n+you have. You must make sure that they, too, receive or can get the\n+source code. And you must show them these terms so they know their\n+rights.\n+\n+ We protect your rights with two steps: (1) copyright the software, and\n+(2) offer you this license which gives you legal permission to copy,\n+distribute and/or modify the software.\n+\n+ Also, for each author's protection and ours, we want to make certain\n+that everyone understands that there is no warranty for this free\n+software. If the software is modified by someone else and passed on, we\n+want its recipients to know that what they have is not the original, so\n+that any problems introduced by others will not reflect on the original\n+authors' reputations.\n+\n+ Finally, any free program is threatened constantly by software\n+patents. We wish to avoid the danger that redistributors of a free\n+program will individually obtain patent licenses, in effect making the\n+program proprietary. To prevent this, we have made it clear that any\n+patent must be licensed for everyone's free use or not licensed at all.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow.\n+\n+ GNU GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License applies to any program or other work which contains\n+a notice placed by the copyright holder saying it may be distributed\n+under the terms of this General Public License. The \"Program\", below,\n+refers to any such program or work, and a \"work based on the Program\"\n+means either the Program or any derivative work under copyright law:\n+that is to say, a work containing the Program or a portion of it,\n+either verbatim or with modifications and/or translated into another\n+language. (Hereinafter, translation is included without limitation in\n+the term \"modification\".) Each licensee is addressed as \"you\".\n+\n+Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running the Program is not restricted, and the output from the Program\n+is covered only if its contents constitute a work based on the\n+Program (independent of having been made by running the Program).\n+Whether that is true depends on what the Program does.\n+\n+ 1. You may copy and distribute verbatim copies of the Program's\n+source code as you receive it, in any medium, provided that you\n+conspicuously and appropriately publish on each copy an appropriate\n+copyright notice and disclaimer of warranty; keep intact all the\n+notices that refer to this License and to the absence of any warranty;\n+and give any other recipients of the Program a copy of this License\n+along with the Program.\n+\n+You may charge a fee for the physical act of transferring a copy, and\n+you may at your option offer warranty protection in exchange for a fee.\n+\n+ 2. You may modify your copy or copies of the Program or any portion\n+of it, thus forming a work based on the Program, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) You must cause the modified files to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ b) You must cause any work that you distribute or publish, that in\n+ whole or in part contains or is derived from the Program or any\n+ part thereof, to be licensed as a whole at no charge to all third\n+ parties under the terms of this License.\n+\n+ c) If the modified program normally reads commands interactively\n+ when run, you must cause it, when started running for such\n+ interactive use in the most ordinary way, to print or display an\n+ announcement including an appropriate copyright notice and a\n+ notice that there is no warranty (or else, saying that you provide\n+ a warranty) and that users may redistribute the program under\n+ these conditions, and telling the user how to view a copy of this\n+ License. (Exception: if the Program itself is interactive but\n+ does not normally print such an announcement, your work based on\n+ the Program is not required to print an announcement.)\n+\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Program,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Program, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Program.\n+\n+In addition, mere aggregation of another work not based on the Program\n+with the Program (or with a work based on the Program) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may copy and distribute the Program (or a work based on it,\n+under Section 2) in object code or executable form under the terms of\n+Sections 1 and 2 above provided that you also do one of the following:\n+\n+ a) Accompany it with the complete corresponding machine-readable\n+ source code, which must be distributed under the terms of Sections\n+ 1 and 2 above on a medium customarily used for software interchange; or,\n+\n+ b) Accompany it with a written offer, valid for at least three\n+ years, to give any third party, for a charge no more than your\n+ cost of physically performing source distribution, a complete\n+ machine-readable copy of the corresponding source code, to be\n+ distributed under the terms of Sections 1 and 2 above on a medium\n+ customarily used for software interchange; or,\n+\n+ c) Accompany it with the information you received as to the offer\n+ to distribute corresponding source code. (This alternative is\n+ allowed only for noncommercial distribution and only if you\n+ received the program in object code or executable form with such\n+ an offer, in accord with Subsection b above.)\n+\n+The source code for a work means the preferred form of the work for\n+making modifications to it. For an executable work, complete source\n+code means all the source code for all modules it contains, plus any\n+associated interface definition files, plus the scripts used to\n+control compilation and installation of the executable. However, as a\n+special exception, the source code distributed need not include\n+anything that is normally distributed (in either source or binary\n+form) with the major components (compiler, kernel, and so on) of the\n+operating system on which the executable runs, unless that component\n+itself accompanies the executable.\n+\n+If distribution of executable or object code is made by offering\n+access to copy from a designated place, then offering equivalent\n+access to copy the source code from the same place counts as\n+distribution of the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\n+ 4. You may not copy, modify, sublicense, or distribute the Program\n+except as expressly provided under this License. Any attempt\n+otherwise to copy, modify, sublicense or distribute the Program is\n+void, and will automatically terminate your rights under this License.\n+However, parties who have received copies, or rights, from you under\n+this License will not have their licenses terminated so long as such\n+parties remain in full compliance.\n+\n+ 5. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Program or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Program (or any work based on the\n+Program), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Program or works based on it.\n+\n+ 6. Each time you redistribute the Program (or any work based on the\n+Program), the recipient automatically receives a license from the\n+original licensor to copy, distribute or modify the Program subject to\n+these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties to\n+this License.\n+\n+ 7. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Program at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Program by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Program.\n+\n+If any portion of this section is held invalid or unenforceable under\n+any particular circumstance, the balance of the section is intended to\n+apply and the section as a whole is intended to apply in other\n+circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system, which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\n+ 8. If the distribution and/or use of the Program is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Program under this License\n+may add an explicit geographical distribution limitation excluding\n+those countries, so that distribution is permitted only in or among\n+countries not thus excluded. In such case, this License incorporates\n+the limitation as if written in the body of this License.\n+\n+ 9. The Free Software Foundation may publish revised and/or new versions\n+of the General Public License from time to time. Such new versions will\n+be similar in spirit to the present version, but may differ in detail to\n+address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Program\n+specifies a version number of this License which applies to it and \"any\n+later version\", you have the option of following the terms and conditions\n+either of that version or of any later version published by the Free\n+Software Foundation. If the Program does not specify a version number of\n+this License, you may choose any version ever published by the Free Software\n+Foundation.\n+\n+ 10. If you wish to incorporate parts of the Program into other free\n+programs whose distribution conditions are different, write to the author\n+to ask for permission. For software which is copyrighted by the Free\n+Software Foundation, write to the Free Software Foundation; we sometimes\n+make exceptions for this. Our decision will be guided by the two goals\n+of preserving the free status of all derivatives of our free software and\n+of promoting the sharing and reuse of software generally.\n+\n+ NO WARRANTY\n+\n+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n+REPAIR OR CORRECTION.\n+\n+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n+POSSIBILITY OF SUCH DAMAGES.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ How to Apply These Terms to Your New Programs\n+\n+ If you develop a new program, and you want it to be of the greatest\n+possible use to the public, the best way to achieve this is to make it\n+free software which everyone can redistribute and change under these terms.\n+\n+ To do so, attach the following notices to the program. It is safest\n+to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least\n+the \"copyright\" line and a pointer to where the full notice is found.\n+\n+ <one line to give the program's name and a brief idea of what it does.>\n+ Copyright (C) <year> <name of author>\n+\n+ This program is free software; you can redistribute it and/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation; either version 2 of the License, or\n+ (at your option) any later version.\n+\n+ This program is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License along\n+ with this program; if not, write to the Free Software Foundation, Inc.,\n+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+If the program is interactive, make it output a short notice like this\n+when it starts in an interactive mode:\n+\n+ Gnomovision version 69, Copyright (C) year name of author\n+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n+ This is free software, and you are welcome to redistribute it\n+ under certain conditions; type `show c' for details.\n+\n+The hypothetical commands `show w' and `show c' should show the appropriate\n+parts of the General Public License. Of course, the commands you use may\n+be called something other than `show w' and `show c'; they could even be\n+mouse-clicks or menu items--whatever suits your program.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the program, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n+ `Gnomovision' (which makes passes at compilers) written by James Hacker.\n+\n+ <signature of Ty Coon>, 1 April 1989\n+ Ty Coon, President of Vice\n+\n+This General Public License does not permit incorporating your program into\n+proprietary programs. If your program is a subroutine library, you may\n+consider it more useful to permit linking proprietary applications with the\n+library. If this is what you want to do, use the GNU Lesser General\n+Public License instead of this License.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+PyCryptodome | Public Domain and BSD-2-Clause\n+URL: https://www.pycryptodome.org/\n+--------------------------------------------------------------------------------\n+The source code in PyCryptodome is partially in the public domain\n+and partially released under the BSD 2-Clause license.\n+\n+In either case, there are minimal if no restrictions on the redistribution,\n+modification and usage of the software.\n+\n+Public domain\n+=============\n+\n+All code originating from PyCrypto is free and unencumbered software\n+released into the public domain.\n+\n+Anyone is free to copy, modify, publish, use, compile, sell, or\n+distribute this software, either in source code form or as a compiled\n+binary, for any purpose, commercial or non-commercial, and by any\n+means.\n+\n+In jurisdictions that recognize copyright laws, the author or authors\n+of this software dedicate any and all copyright interest in the\n+software to the public domain. We make this dedication for the benefit\n+of the public at large and to the detriment of our heirs and\n+successors. We intend this dedication to be an overt act of\n+relinquishment in perpetuity of all present and future rights to this\n+software under copyright law.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\n+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\n+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n+OTHER DEALINGS IN THE SOFTWARE.\n+\n+For more information, please refer to <http://unlicense.org>\n+\n+BSD license\n+===========\n+\n+All direct contributions to PyCryptodome are released under the following\n+license. The copyright of each piece belongs to the respective author.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+1. Redistributions of source code must retain the above copyright notice,\n+ this list of conditions and the following disclaimer.\n+\n+2. Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+certifi | MPL-2.0\n+URL: https://github.com/certifi/python-certifi\n+--------------------------------------------------------------------------------\n+This package contains a modified version of ca-bundle.crt:\n+\n+ca-bundle.crt -- Bundle of CA Root Certificates\n+\n+This is a bundle of X.509 certificates of public Certificate Authorities\n+(CA). These were automatically extracted from Mozilla's root certificates\n+file (certdata.txt). This file can be found in the mozilla source tree:\n+https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt\n+It contains the certificates in PEM format and therefore\n+can be directly used with curl / libcurl / php_curl, or with\n+an Apache+mod_ssl webserver for SSL client authentication.\n+Just configure this file as the SSLCACertificateFile.#\n+\n+***** BEGIN LICENSE BLOCK *****\n+This Source Code Form is subject to the terms of the Mozilla Public License,\n+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain\n+one at http://mozilla.org/MPL/2.0/.\n+\n+***** END LICENSE BLOCK *****\n+@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $\n+\n+\n+\n+--------------------------------------------------------------------------------\n+requests | Apache-2.0\n+URL: https://requests.readthedocs.io/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ http://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+charset-normalizer | MIT\n+URL: https://charset-normalizer.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2025 TAHRI Ahmed R.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+idna | BSD-3-Clause\n+URL: https://github.com/kjd/idna\n+--------------------------------------------------------------------------------\n+BSD 3-Clause License\n+\n+Copyright (c) 2013-2025, Kim Davies and contributors.\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+1. Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+\n+2. Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and/or other materials provided with the distribution.\n+\n+3. Neither the name of the copyright holder nor the names of its\n+ contributors may be used to endorse or promote products derived from\n+ this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\n+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+urllib3 | MIT\n+URL: https://urllib3.readthedocs.io/\n+--------------------------------------------------------------------------------\n+MIT License\n+\n+Copyright (c) 2008-2020 Andrey Petrov and contributors.\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+SecretStorage | BSD-3-Clause\n+Note: Only included in Linux builds\n+URL: https://secretstorage.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Copyright 2012-2018 Dmitry Shachnev <mitya57@gmail.com>\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+1. Redistributions of source code must retain the above copyright notice, this\n+ list of conditions and the following disclaimer.\n+2. Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+3. Neither the name of the University nor the names of its contributors may be\n+ used to endorse or promote products derived from this software without\n+ specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY\n+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+cryptography | Apache-2.0\n+Note: Only included in Linux builds\n+URL: https://cryptography.io/\n+--------------------------------------------------------------------------------\n+ Apache License\n+ Version 2.0, January 2004\n+ https://www.apache.org/licenses/\n+\n+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n+\n+ 1. Definitions.\n+\n+ \"License\" shall mean the terms and conditions for use, reproduction,\n+ and distribution as defined by Sections 1 through 9 of this document.\n+\n+ \"Licensor\" shall mean the copyright owner or entity authorized by\n+ the copyright owner that is granting the License.\n+\n+ \"Legal Entity\" shall mean the union of the acting entity and all\n+ other entities that control, are controlled by, or are under common\n+ control with that entity. For the purposes of this definition,\n+ \"control\" means (i) the power, direct or indirect, to cause the\n+ direction or management of such entity, whether by contract or\n+ otherwise, or (ii) ownership of fifty percent (50%) or more of the\n+ outstanding shares, or (iii) beneficial ownership of such entity.\n+\n+ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n+ exercising permissions granted by this License.\n+\n+ \"Source\" form shall mean the preferred form for making modifications,\n+ including but not limited to software source code, documentation\n+ source, and configuration files.\n+\n+ \"Object\" form shall mean any form resulting from mechanical\n+ transformation or translation of a Source form, including but\n+ not limited to compiled object code, generated documentation,\n+ and conversions to other media types.\n+\n+ \"Work\" shall mean the work of authorship, whether in Source or\n+ Object form, made available under the License, as indicated by a\n+ copyright notice that is included in or attached to the work\n+ (an example is provided in the Appendix below).\n+\n+ \"Derivative Works\" shall mean any work, whether in Source or Object\n+ form, that is based on (or derived from) the Work and for which the\n+ editorial revisions, annotations, elaborations, or other modifications\n+ represent, as a whole, an original work of authorship. For the purposes\n+ of this License, Derivative Works shall not include works that remain\n+ separable from, or merely link (or bind by name) to the interfaces of,\n+ the Work and Derivative Works thereof.\n+\n+ \"Contribution\" shall mean any work of authorship, including\n+ the original version of the Work and any modifications or additions\n+ to that Work or Derivative Works thereof, that is intentionally\n+ submitted to Licensor for inclusion in the Work by the copyright owner\n+ or by an individual or Legal Entity authorized to submit on behalf of\n+ the copyright owner. For the purposes of this definition, \"submitted\"\n+ means any form of electronic, verbal, or written communication sent\n+ to the Licensor or its representatives, including but not limited to\n+ communication on electronic mailing lists, source code control systems,\n+ and issue tracking systems that are managed by, or on behalf of, the\n+ Licensor for the purpose of discussing and improving the Work, but\n+ excluding communication that is conspicuously marked or otherwise\n+ designated in writing by the copyright owner as \"Not a Contribution.\"\n+\n+ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n+ on behalf of whom a Contribution has been received by Licensor and\n+ subsequently incorporated within the Work.\n+\n+ 2. Grant of Copyright License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ copyright license to reproduce, prepare Derivative Works of,\n+ publicly display, publicly perform, sublicense, and distribute the\n+ Work and such Derivative Works in Source or Object form.\n+\n+ 3. Grant of Patent License. Subject to the terms and conditions of\n+ this License, each Contributor hereby grants to You a perpetual,\n+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n+ (except as stated in this section) patent license to make, have made,\n+ use, offer to sell, sell, import, and otherwise transfer the Work,\n+ where such license applies only to those patent claims licensable\n+ by such Contributor that are necessarily infringed by their\n+ Contribution(s) alone or by combination of their Contribution(s)\n+ with the Work to which such Contribution(s) was submitted. If You\n+ institute patent litigation against any entity (including a\n+ cross-claim or counterclaim in a lawsuit) alleging that the Work\n+ or a Contribution incorporated within the Work constitutes direct\n+ or contributory patent infringement, then any patent licenses\n+ granted to You under this License for that Work shall terminate\n+ as of the date such litigation is filed.\n+\n+ 4. Redistribution. You may reproduce and distribute copies of the\n+ Work or Derivative Works thereof in any medium, with or without\n+ modifications, and in Source or Object form, provided that You\n+ meet the following conditions:\n+\n+ (a) You must give any other recipients of the Work or\n+ Derivative Works a copy of this License; and\n+\n+ (b) You must cause any modified files to carry prominent notices\n+ stating that You changed the files; and\n+\n+ (c) You must retain, in the Source form of any Derivative Works\n+ that You distribute, all copyright, patent, trademark, and\n+ attribution notices from the Source form of the Work,\n+ excluding those notices that do not pertain to any part of\n+ the Derivative Works; and\n+\n+ (d) If the Work includes a \"NOTICE\" text file as part of its\n+ distribution, then any Derivative Works that You distribute must\n+ include a readable copy of the attribution notices contained\n+ within such NOTICE file, excluding those notices that do not\n+ pertain to any part of the Derivative Works, in at least one\n+ of the following places: within a NOTICE text file distributed\n+ as part of the Derivative Works; within the Source form or\n+ documentation, if provided along with the Derivative Works; or,\n+ within a display generated by the Derivative Works, if and\n+ wherever such third-party notices normally appear. The contents\n+ of the NOTICE file are for informational purposes only and\n+ do not modify the License. You may add Your own attribution\n+ notices within Derivative Works that You distribute, alongside\n+ or as an addendum to the NOTICE text from the Work, provided\n+ that such additional attribution notices cannot be construed\n+ as modifying the License.\n+\n+ You may add Your own copyright statement to Your modifications and\n+ may provide additional or different license terms and conditions\n+ for use, reproduction, or distribution of Your modifications, or\n+ for any such Derivative Works as a whole, provided Your use,\n+ reproduction, and distribution of the Work otherwise complies with\n+ the conditions stated in this License.\n+\n+ 5. Submission of Contributions. Unless You explicitly state otherwise,\n+ any Contribution intentionally submitted for inclusion in the Work\n+ by You to the Licensor shall be under the terms and conditions of\n+ this License, without any additional terms or conditions.\n+ Notwithstanding the above, nothing herein shall supersede or modify\n+ the terms of any separate license agreement you may have executed\n+ with Licensor regarding such Contributions.\n+\n+ 6. Trademarks. This License does not grant permission to use the trade\n+ names, trademarks, service marks, or product names of the Licensor,\n+ except as required for reasonable and customary use in describing the\n+ origin of the Work and reproducing the content of the NOTICE file.\n+\n+ 7. Disclaimer of Warranty. Unless required by applicable law or\n+ agreed to in writing, Licensor provides the Work (and each\n+ Contributor provides its Contributions) on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ implied, including, without limitation, any warranties or conditions\n+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n+ PARTICULAR PURPOSE. You are solely responsible for determining the\n+ appropriateness of using or redistributing the Work and assume any\n+ risks associated with Your exercise of permissions under this License.\n+\n+ 8. Limitation of Liability. In no event and under no legal theory,\n+ whether in tort (including negligence), contract, or otherwise,\n+ unless required by applicable law (such as deliberate and grossly\n+ negligent acts) or agreed to in writing, shall any Contributor be\n+ liable to You for damages, including any direct, indirect, special,\n+ incidental, or consequential damages of any character arising as a\n+ result of this License or out of the use or inability to use the\n+ Work (including but not limited to damages for loss of goodwill,\n+ work stoppage, computer failure or malfunction, or any and all\n+ other commercial damages or losses), even if such Contributor\n+ has been advised of the possibility of such damages.\n+\n+ 9. Accepting Warranty or Additional Liability. While redistributing\n+ the Work or Derivative Works thereof, You may choose to offer,\n+ and charge a fee for, acceptance of support, warranty, indemnity,\n+ or other liability obligations and/or rights consistent with this\n+ License. However, in accepting such obligations, You may act only\n+ on Your own behalf and on Your sole responsibility, not on behalf\n+ of any other Contributor, and only if You agree to indemnify,\n+ defend, and hold each Contributor harmless for any liability\n+ incurred by, or claims asserted against, such Contributor by reason\n+ of your accepting any such warranty or additional liability.\n+\n+ END OF TERMS AND CONDITIONS\n+\n+ APPENDIX: How to apply the Apache License to your work.\n+\n+ To apply the Apache License to your work, attach the following\n+ boilerplate notice, with the fields enclosed by brackets \"[]\"\n+ replaced with your own identifying information. (Don't include\n+ the brackets!) The text should be enclosed in the appropriate\n+ comment syntax for the file format. We also recommend that a\n+ file or class name and description of purpose be included on the\n+ same \"printed page\" as the copyright notice for easier\n+ identification within third-party archives.\n+\n+ Copyright [yyyy] [name of copyright owner]\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ https://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+Jeepney | MIT\n+Note: Only included in Linux builds\n+URL: https://jeepney.readthedocs.io/\n+--------------------------------------------------------------------------------\n+The MIT License (MIT)\n+\n+Copyright (c) 2017 Thomas Kluyver\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in\n+all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+THE SOFTWARE.\n+\n+\n+\n+--------------------------------------------------------------------------------\n+websockets | BSD-3-Clause\n+URL: https://websockets.readthedocs.io/\n+--------------------------------------------------------------------------------\n+Copyright (c) Aymeric Augustin and contributors\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are met:\n+\n+ * Redistributions of source code must retain the above copyright notice,\n+ this list of conditions and the following disclaimer.\n+ * Redistributions in binary form must reproduce the above copyright notice,\n+ this list of conditions and the following disclaimer in the documentation\n+ and/or other materials provided with the distribution.\n+ * Neither the name of the copyright holder nor the names of its contributors\n+ may be used to endorse or promote products derived from this software\n+ without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\ndiff --git a/bundle/pyinstaller.py b/bundle/pyinstaller.py\nindex 8286f077abb2..422b9d0c741a 100755\n--- a/bundle/pyinstaller.py\n+++ b/bundle/pyinstaller.py\n@@ -129,7 +129,6 @@ def windows_set_version(exe, version):\n StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),\n StringStruct('FileVersion', version),\n StringStruct('InternalName', f'yt-dlp{suffix}'),\n- StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),\n StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),\n StringStruct('ProductName', f'yt-dlp{suffix}'),\n StringStruct(\ndiff --git a/devscripts/generate_third_party_licenses.py b/devscripts/generate_third_party_licenses.py\nnew file mode 100644\nindex 000000000000..db615d2e352e\n--- /dev/null\n+++ b/devscripts/generate_third_party_licenses.py\n@@ -0,0 +1,316 @@\n+import requests\n+from dataclasses import dataclass\n+from pathlib import Path\n+import hashlib\n+\n+DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'\n+CACHE_LOCATION = '.license_cache'\n+HEADER = '''THIRD-PARTY LICENSES\n+\n+This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.\n+yt-dlp itself is licensed under the Unlicense (see LICENSE file).\n+Source code for bundled third-party components is available from the original projects.\n+If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''\n+\n+\n+@dataclass(frozen=True)\n+class Dependency:\n+ name: str\n+ license_url: str\n+ project_url: str = ''\n+ license: str = ''\n+ comment: str = ''\n+\n+\n+DEPENDENCIES: list[Dependency] = [\n+ # Core runtime environment components\n+ Dependency(\n+ name='Python',\n+ license='PSF-2.0',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',\n+ project_url='https://www.python.org/',\n+ ),\n+ Dependency(\n+ name='Microsoft Distributable Code',\n+ license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',\n+ comment='Only included in Windows builds',\n+ ),\n+ Dependency(\n+ name='bzip2',\n+ license='bzip2-1.0.6',\n+ license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',\n+ project_url='https://sourceware.org/bzip2/',\n+ ),\n+ Dependency(\n+ name='libffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',\n+ project_url='https://sourceware.org/libffi/',\n+ ),\n+ Dependency(\n+ name='OpenSSL 3.0+',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',\n+ project_url='https://www.openssl.org/',\n+ ),\n+ Dependency(\n+ name='SQLite',\n+ license='Public Domain', # Technically does not need to be included\n+ license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',\n+ project_url='https://www.sqlite.org/',\n+ ),\n+ Dependency(\n+ name='liblzma',\n+ license='0BSD', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',\n+ project_url='https://tukaani.org/xz/',\n+ ),\n+ Dependency(\n+ name='mpdecimal',\n+ license='BSD-2-Clause',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',\n+ project_url='https://www.bytereef.org/mpdecimal/',\n+ ),\n+ Dependency(\n+ name='zlib',\n+ license='zlib',\n+ license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',\n+ project_url='https://zlib.net/',\n+ ),\n+ Dependency(\n+ name='Expat',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',\n+ project_url='https://libexpat.github.io/',\n+ ),\n+ Dependency(\n+ name='ncurses',\n+ license='X11-distribute-modifications-variant',\n+ license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',\n+ comment='Only included in Linux/macOS builds',\n+ project_url='https://invisible-island.net/ncurses/',\n+ ),\n+ Dependency(\n+ name='GNU Readline',\n+ license='GPL-3.0-or-later',\n+ license_url='https://tiswww.case.edu/php/chet/readline/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://www.gnu.org/software/readline/',\n+ ),\n+ Dependency(\n+ name='libstdc++',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',\n+ ),\n+ Dependency(\n+ name='libgcc',\n+ license='GPL-3.0-with-GCC-exception',\n+ license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',\n+ comment='Only included in Linux builds',\n+ project_url='https://gcc.gnu.org/',\n+ ),\n+ Dependency(\n+ name='libuuid',\n+ license='BSD-3-Clause',\n+ license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',\n+ comment='Only included in Linux builds',\n+ project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',\n+ ),\n+ Dependency(\n+ name='libintl',\n+ license='LGPL-2.1-or-later',\n+ license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/gettext/',\n+ ),\n+ Dependency(\n+ name='libidn2',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libidn2 (Unicode character data files)',\n+ license='Unicode-TOU AND Unicode-DFS-2016',\n+ license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libidn/',\n+ ),\n+ Dependency(\n+ name='libunistring',\n+ license='LGPL-3.0-or-later',\n+ license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',\n+ comment='Only included in macOS builds',\n+ project_url='https://www.gnu.org/software/libunistring/',\n+ ),\n+ Dependency(\n+ name='librtmp',\n+ license='LGPL-2.1-or-later',\n+ # No official repo URL\n+ license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',\n+ comment='Only included in macOS builds',\n+ project_url='https://rtmpdump.mplayerhq.hu/',\n+ ),\n+ Dependency(\n+ name='zstd',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',\n+ comment='Only included in macOS builds',\n+ project_url='https://facebook.github.io/zstd/',\n+ ),\n+\n+ # Python packages\n+ Dependency(\n+ name='brotli',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',\n+ project_url='https://brotli.org/',\n+ ),\n+ Dependency(\n+ name='curl_cffi',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://curl-cffi.readthedocs.io/',\n+ ),\n+ # Dependency of curl_cffi\n+ Dependency(\n+ name='curl-impersonate',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',\n+ comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',\n+ project_url='https://github.com/lexiforest/curl-impersonate',\n+ ),\n+ Dependency(\n+ name='cffi',\n+ license='MIT-0', # Technically does not need to be included\n+ license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',\n+ project_url='https://cffi.readthedocs.io/',\n+ ),\n+ # Dependecy of cffi\n+ Dependency(\n+ name='pycparser',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',\n+ project_url='https://github.com/eliben/pycparser',\n+ ),\n+ Dependency(\n+ name='mutagen',\n+ license='GPL-2.0-or-later',\n+ license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',\n+ project_url='https://mutagen.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='PyCryptodome',\n+ license='Public Domain and BSD-2-Clause',\n+ license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',\n+ project_url='https://www.pycryptodome.org/',\n+ ),\n+ Dependency(\n+ name='certifi',\n+ license='MPL-2.0',\n+ license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',\n+ project_url='https://github.com/certifi/python-certifi',\n+ ),\n+ Dependency(\n+ name='requests',\n+ license='Apache-2.0',\n+ license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',\n+ project_url='https://requests.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='charset-normalizer',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',\n+ project_url='https://charset-normalizer.readthedocs.io/',\n+ ),\n+ # Dependency of requests\n+ Dependency(\n+ name='idna',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',\n+ project_url='https://github.com/kjd/idna',\n+ ),\n+ Dependency(\n+ name='urllib3',\n+ license='MIT',\n+ license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',\n+ project_url='https://urllib3.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='SecretStorage',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://secretstorage.readthedocs.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='cryptography',\n+ license='Apache-2.0', # Also available as BSD-3-Clause\n+ license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',\n+ comment='Only included in Linux builds',\n+ project_url='https://cryptography.io/',\n+ ),\n+ # Dependency of SecretStorage\n+ Dependency(\n+ name='Jeepney',\n+ license='MIT',\n+ license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',\n+ comment='Only included in Linux builds',\n+ project_url='https://jeepney.readthedocs.io/',\n+ ),\n+ Dependency(\n+ name='websockets',\n+ license='BSD-3-Clause',\n+ license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',\n+ project_url='https://websockets.readthedocs.io/',\n+ ),\n+]\n+\n+\n+def fetch_text(dep: Dependency) -> str:\n+ cache_dir = Path(CACHE_LOCATION)\n+ cache_dir.mkdir(exist_ok=True)\n+ url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()\n+ cache_file = cache_dir / f'{url_hash}.txt'\n+\n+ if cache_file.exists():\n+ return cache_file.read_text()\n+\n+ # UA needed since some domains block requests default UA\n+ req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})\n+ req.raise_for_status()\n+ text = req.text\n+ cache_file.write_text(text)\n+ return text\n+\n+\n+def build_output() -> str:\n+ lines = [HEADER]\n+ for d in DEPENDENCIES:\n+ lines.append('\\n')\n+ lines.append('-' * 80)\n+ header = f'{d.name}'\n+ if d.license:\n+ header += f' | {d.license}'\n+ if d.comment:\n+ header += f'\\nNote: {d.comment}'\n+ if d.project_url:\n+ header += f'\\nURL: {d.project_url}'\n+ lines.append(header)\n+ lines.append('-' * 80)\n+\n+ text = fetch_text(d)\n+ lines.append(text.strip('\\n') + '\\n')\n+ return '\\n'.join(lines)\n+\n+\n+if __name__ == '__main__':\n+ content = build_output()\n+ Path(DEFAULT_OUTPUT).write_text(content)\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":5,"string":"5"}}},{"rowIdx":34291,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16269"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16269,"string":"16,269"},"base_sha":{"kind":"string","value":"18656b2f2af41a138793c7012a88f467c0d90274"},"head_sha":{"kind":"string","value":"86eb0f9030fcbd0ecabfef759cfd40f2e3730f7c"},"task":{"kind":"string","value":"[youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\n\n### Checklist\n\n- [x] I'm reporting that yt-dlp is broken on a **supported** site\n- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))\n- [x] I've checked that all provided URLs are playable in a browser with the same IP and same login details\n- [x] I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)\n- [x] I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates\n- [x] I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\n- [ ] I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required\n\n### Region\n\nFrench\n\n### Provide a description that is worded well enough to be understood\n\nyt-dlp no work anymore here since today for youtube \nanyone know how to solve please ? \n\n### Provide verbose output that clearly demonstrates the problem\n\n- [x] Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)\n- [ ] If using API, add `'verbose': True` to `YoutubeDL` params instead\n- [x] Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below\n\n### Complete Verbose Output\n\n```shell\n[debug] Command-line config: ['-vU', '--js-runtimes', 'deno', '--force-ipv4', '--cookies', '/cookies.txt', '-j', '--', 'https://www.youtube.com/watch?v=Itdv5IKN2P4']\n[debug] Encodings: locale utf-8, fs utf-8, pref utf-8, out utf-8, error utf-8, screen utf-8\n[debug] yt-dlp version stable@2026.03.13 from yt-dlp/yt-dlp (linux_exe)\n[debug] Python 3.13.12 (CPython x86_64 64bit) - Linux-5.15.158-2-pve-x86_64-with-glibc2.31 (OpenSSL 3.5.5 27 Jan 2026, glibc 2.31)\n[debug] exe versions: ffmpeg 7.0.2-static (setts), ffprobe 7.0.2-static, phantomjs broken\n[debug] Optional libraries: Cryptodome-3.23.0, brotli-1.2.0, certifi-2026.02.25, curl_cffi-0.13.0, mutagen-1.47.0, requests-2.32.5, secretstorage-3.5.0, sqlite3-3.51.2, urllib3-2.6.3, websockets-16.0, yt_dlp_ejs-0.7.0\n[debug] JS runtimes: deno-2.6.7\n[debug] Proxy map: {}\n[debug] Request Handlers: urllib, requests, websockets, curl_cffi\n[debug] Plugin directories: none\n[debug] Loaded 1864 extractors\n[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest\nLatest version: stable@2026.03.13 from yt-dlp/yt-dlp\nyt-dlp is up to date (stable@2026.03.13 from yt-dlp/yt-dlp)\n[debug] [youtube] Found YouTube account cookies\n[debug] [youtube] [pot] PO Token Providers: none\n[debug] [youtube] [pot] PO Token Cache Providers: memory\n[debug] [youtube] [pot] PO Token Cache Spec Providers: webpo\n[debug] [youtube] [jsc] JS Challenge Providers: bun (unavailable), deno, node (unavailable), quickjs (unavailable)\n[youtube] Extracting URL: https://www.youtube.com/watch?v=Itdv5IKN2P4\n[youtube] Itdv5IKN2P4: Downloading webpage\n[debug] [youtube] Forcing \"tv\" player JS variant for player 76ad2fe8\n original url = /s/player/76ad2fe8/player_es6.vflset/en_US/base.js\n[youtube] Itdv5IKN2P4: Downloading tv downgraded player API JSON\n[debug] [youtube] Itdv5IKN2P4: Detected a 355s ad skippable after 5s for web_safari\n[debug] [youtube] Itdv5IKN2P4: Detected a 154s ad skippable after 5s for web_safari\n[youtube] Itdv5IKN2P4: Downloading player 76ad2fe8-tv\n[youtube] [jsc:deno] Solving JS challenges using deno\n[debug] [youtube] [jsc:deno] Using challenge solver lib script v0.7.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Using challenge solver core script v0.7.0 (source: python package, variant: minified)\n[debug] [youtube] [jsc:deno] Running deno: deno run --ext=js --no-code-cache --no-prompt --no-remote --no-lock --node-modules-dir=none --no-config --no-npm --cached-only -\nWARNING: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Error running deno process (returncode: 1): error: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\n at eval (eval at <anonymous> (file:///root/$deno$stdin.js:58:6208), <anonymous>:22912:27)\n at eval (eval at <anonymous> (file:///root/$deno$stdin.js:58:6208), <anonymous>:89552:4)\n at file:///root/$deno$stdin.js:58:6229\n at file:///root/$deno$stdin.js:58:6235\n at file:///root/$deno$stdin.js:59:36.\n input = NChallengeInput(player_url='https://www.youtube.com/s/player/76ad2fe8/tv-player-ias.vflset/tv-player-ias.js', challenges=['hmngRotZKhbOddG1', 'E0Gm7akG3cvQtc8y', 'kYKUvdDwX3HwqJpj', 'EjJoWs0PgJGx-wLh'])\n Please report this issue on https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using yt-dlp -U\nWARNING: [youtube] Itdv5IKN2P4: n challenge solving failed: Some formats may be missing. Ensure you have a supported JavaScript runtime and challenge solver script distribution installed. Review any warnings presented before this message. For more details, refer to https://github.com/yt-dlp/yt-dlp/wiki/EJS\n[debug] [youtube] Itdv5IKN2P4: Detected experiment to bind GVS PO Token to video ID for web_safari client\n[debug] [youtube] Itdv5IKN2P4: Some web_safari client https formats have been skipped as they are missing a URL. YouTube is forcing SABR streaming for this client. See https://github.com/yt-dlp/yt-dlp/issues/12482 for more details\nWARNING: Only images are available for download. use --list-formats to see them\n[debug] Sort order given by extractor: quality, res, fps, hdr:12, source, vcodec, channels, acodec, lang, proto\n[debug] Formats sorted by: hasvid, ie_pref, quality, res, fps, hdr:12(7), source, vcodec, channels, acodec, lang, proto, size, br, asr, vext, aext, hasaud, id\n[debug] Default format spec: bestvideo*+bestaudio/best\nERROR: [youtube] Itdv5IKN2P4: Requested format is not available. Use --list-formats for a list of available formats\nTraceback (most recent call last):\n File \"yt_dlp/YoutubeDL.py\", line 1698, in wrapper\n File \"yt_dlp/YoutubeDL.py\", line 1854, in __extract_info\n File \"yt_dlp/YoutubeDL.py\", line 1913, in process_ie_result\n File \"yt_dlp/YoutubeDL.py\", line 3058, in process_video_result\nyt_dlp.utils.ExtractorError: [youtube] Itdv5IKN2P4: Requested format is not available. Use --list-formats for a list of available formats\n```\n\n[ie/youtube] Update ejs to 0.8.0\n\nCloses #16256\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Fix or improvement to an extractor (Make sure to add/update tests)\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `(root)/` needed for: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')","scope_files":["Makefile","README.md","pyproject.toml"]},{"subtask_id":"s2","goal":"Implement the changes under `test/test_jsc/` needed for: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')","scope_files":["test/test_jsc/test_ejs_integration.py"]},{"subtask_id":"s3","goal":"Implement the changes under `yt_dlp/extractor/youtube/` needed for: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')","scope_files":["yt_dlp/extractor/youtube/_video.py"]},{"subtask_id":"s4","goal":"Implement the changes under `yt_dlp/extractor/youtube/jsc/_builtin/vendor/` needed for: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')","scope_files":["yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py","yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `(root)/` needed for: [youtube] [jsc] Error solving n challenge request using \\\"deno\\\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\",\n \"scope_files\": [\n \"Makefile\",\n \"README.md\",\n \"pyproject.toml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `test/test_jsc/` needed for: [youtube] [jsc] Error solving n challenge request using \\\"deno\\\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\",\n \"scope_files\": [\n \"test/test_jsc/test_ejs_integration.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/youtube/` needed for: [youtube] [jsc] Error solving n challenge request using \\\"deno\\\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/_video.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `yt_dlp/extractor/youtube/jsc/_builtin/vendor/` needed for: [youtube] [jsc] Error solving n challenge request using \\\"deno\\\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\",\n \"yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["Makefile","README.md","pyproject.toml"],"solution_diff":"diff --git a/Makefile b/Makefile\nindex b4daeb88a419..de3eabd13b3b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\n \n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\n # DO NOT EDIT!\n-EJS_VERSION = 0.7.0\n-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none-any.whl\n-EJS_WHEEL_HASH = sha256:967e9cbe114ddfd046ff4668af18b1827b4597e2e47a83deea668a355828c798\n+EJS_VERSION = 0.8.0\n+EJS_WHEEL_NAME = yt_dlp_ejs-0.8.0-py3-none-any.whl\n+EJS_WHEEL_HASH = sha256:79300e5fca7f937a1eeede11f0456862c1b41107ce1d726871e0207424f4bdb4\n EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver\n EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py\n EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver\ndiff --git a/README.md b/README.md\nindex b404c277f530..ec64c029ed9e 100644\n--- a/README.md\n+++ b/README.md\n@@ -1865,7 +1865,7 @@ The following extractors use this feature:\n * `webpage_skip`: Skip extraction of embedded webpage data. One or both of `player_response`, `initial_data`. These options are for testing purposes and don't skip any network requests. Neither is skipped by default; however, if a `player_js_version` value other than `actual` is used, then `webpage_skip=player_response` is implied\n * `webpage_client`: Client to use for the video webpage request. One of `web` or `web_safari` (default)\n * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.\n-* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `tv`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\n+* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `main`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\n * `player_js_version`: The player javascript version to use for n/sig deciphering, in the format of `signature_timestamp@hash` (e.g. `20348@0004de42`). The default is to use what is prescribed by the site, and can be selected with `actual`. Using any other value will imply `webpage_skip=player_response`\n * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)\n * `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread,max-depth`. Default is `all,all,all,all,all`\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 8c8371f7830a..7feb7390962d 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -55,7 +55,7 @@ default = [\n \"requests>=2.32.2,<3\",\n \"urllib3>=2.0.2,<3\",\n \"websockets>=13.0\",\n- \"yt-dlp-ejs==0.7.0\",\n+ \"yt-dlp-ejs==0.8.0\",\n ]\n curl-cffi = [\n \"curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.15; implementation_name=='cpython'\",\n","summary":"Edited 3 file(s) in (root)/"},{"subtask_id":"s2","scope_files":["test/test_jsc/test_ejs_integration.py"],"solution_diff":"diff --git a/test/test_jsc/test_ejs_integration.py b/test/test_jsc/test_ejs_integration.py\nindex 30aee1b69496..b2150e369e4b 100644\n--- a/test/test_jsc/test_ejs_integration.py\n+++ b/test/test_jsc/test_ejs_integration.py\n@@ -53,50 +53,66 @@ def url(self, /):\n \n \n CHALLENGES: list[Challenge] = [\n- # 20518\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.N, {\n- 'BQoJvGBkC2nj1ZZLK-': '-m-se9fQVnvEofLx',\n- }),\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.SIG, {\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n- 'zwg=wgwCHlydB9zg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlh5mt5OX-8MB=tRPyyEdAM9MPM-kPfjgTxEK0IAhIgRwE0jiz',\n- }),\n- # 20521\n- Challenge('316b61b4', Variant.tv, JsChallengeType.N, {\n- 'IlLiA21ny7gqA2m4p37': 'GchRcsUC_WmnhOUVGV',\n- }),\n- Challenge('316b61b4', Variant.tv, JsChallengeType.SIG, {\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n- 'tJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRN=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwz',\n- }),\n # 20522\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.N, {\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.N, {\n 'IlLiA21ny7gqA2m4p37': '9nRTxrbM1f0yHg',\n 'eabGFpsUKuWHXGh6FR4': 'izmYqDEY6kl7Sg',\n 'eabGF/ps%UK=uWHXGh6FR4': 'LACmqlhaBpiPlgE-a',\n }),\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hzMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzl',\n '\\x00\\x01\\x02%\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49':\n '\\x00\\x01\\x02%\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x40\\x41\\x42\\x49\\x44\\x45\\x46\\x47\\x48\\x43',\n }),\n # 20523\n- Challenge('901741ab', Variant.tv, JsChallengeType.N, {\n+ Challenge('901741ab', Variant.main, JsChallengeType.N, {\n 'BQoJvGBkC2nj1ZZLK-': 'UMPovvBZRh-sjb',\n }),\n- Challenge('901741ab', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('901741ab', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'wgwCHlydB9Hg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlhwmt5ON-8MB=5RPyyzdAM9MPM-kPfjgTxEK0IAhIgRwE0jiEJA',\n }),\n # 20524\n- Challenge('e7573094', Variant.tv, JsChallengeType.N, {\n+ Challenge('e7573094', Variant.main, JsChallengeType.N, {\n 'IlLiA21ny7gqA2m4p37': '3KuQ3235dojTSjo4',\n }),\n- Challenge('e7573094', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('e7573094', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'yEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyNPRt=BM8-XO5tm5hlMCSVNAiEAvpeP3CURqZJSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=g',\n }),\n+ # 20525\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.N, {\n+ 'Dyc5ALyWiO0VqwCiT': 'H2PLmmAmJsYjKA',\n+ }),\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x6a\\x69\\x68\\x67\\x66\\x65\\x64\\x63\\x62\\x61\\x60\\x5f\\x5e\\x5d\\x5c\\x5b\\x5a\\x59\\x58\\x57\\x56\\x55\\x54\\x53\\x52\\x51\\x50\\x4f\\x4e\\x4d\\x4c\\x4b\\x4a\\x49\\x48\\x47\\x46\\x45\\x44\\x43\\x42\\x41\\x40\\x3f\\x3e\\x3d\\x3c\\x3b\\x3a\\x39\\x38\\x37\\x36\\x35\\x34\\x33\\x32\\x31\\x30\\x2f\\x2e\\x2d\\x2c\\x2b\\x2a\\x29\\x28\\x27\\x26\\x25\\x24\\x23\\x22\\x21\\x20\\x1f\\x1e\\x1d\\x1c\\x1b\\x1a\\x19\\x18\\x17\\x16\\x15\\x14\\x13\\x12\\x11\\x10\\x0f\\x0e\\x0d\\x0c\\x0b\\x03\\x09\\x08\\x07\\x06\\x05\\x04\\x0a',\n+ }),\n+ # 20527\n+ Challenge('21cd2156', Variant.main, JsChallengeType.N, {\n+ 'CiOxDbW1WEE8Ti4w': 'ZcBE4klItiC4rQ',\n+ }),\n+ Challenge('21cd2156', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x00\\x46\\x47\\x48\\x49\\x4a\\x4b\\x6a\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x4c',\n+ }),\n+ # 20528\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.N, {\n+ 'FgTvzyq4jKv482R7': 'l26nyYSotkzDxg',\n+ }),\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x46\\x66\\x65\\x64\\x63\\x62\\x61\\x60\\x5f\\x5e\\x67\\x6a\\x5b\\x5a\\x59\\x58\\x57\\x56\\x55\\x54\\x53\\x52\\x51\\x50\\x4f\\x4e\\x4d\\x4c\\x4b\\x4a\\x49\\x48\\x47\\x2c\\x45\\x44\\x43\\x42\\x41\\x40\\x3f\\x3e\\x3d\\x3c\\x3b\\x3a\\x39\\x38\\x13\\x36\\x35\\x34\\x33\\x32\\x31\\x30\\x2f\\x2e\\x2d\\x5d\\x2b\\x2a\\x29\\x28\\x27\\x26\\x25\\x24\\x23\\x22\\x21\\x20\\x1f\\x1e\\x1d\\x1c\\x1b\\x1a\\x19\\x18\\x17\\x16\\x15\\x14\\x0c\\x12\\x11\\x10\\x0f\\x0e\\x0d\\x00\\x0b\\x0a\\x09\\x08\\x07\\x06\\x05\\x04\\x03\\x02\\x01\\x37',\n+ }),\n+ # 20529\n+ Challenge('631d3938', Variant.main, JsChallengeType.N, {\n+ 'KBx1qz7jMhxELa8c': 'ttPvh7WIptsgSw',\n+ }),\n+ Challenge('631d3938', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66':\n+ '\\x19\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x00\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63',\n+ }),\n ]\n \n requests: list[JsChallengeRequest] = []\n","summary":"Edited 1 file(s) in test/test_jsc/"},{"subtask_id":"s3","scope_files":["yt_dlp/extractor/youtube/_video.py"],"solution_diff":"diff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py\nindex 174be9547150..f12636d8cf6f 100644\n--- a/yt_dlp/extractor/youtube/_video.py\n+++ b/yt_dlp/extractor/youtube/_video.py\n@@ -1876,7 +1876,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n }]\n \n _DEFAULT_PLAYER_JS_VERSION = 'actual'\n- _DEFAULT_PLAYER_JS_VARIANT = 'tv'\n+ _DEFAULT_PLAYER_JS_VARIANT = 'main'\n _PLAYER_JS_VARIANT_MAP = {\n 'main': 'player_ias.vflset/en_US/base.js',\n 'tcc': 'player_ias_tcc.vflset/en_US/base.js',\n","summary":"Edited 1 file(s) in yt_dlp/extractor/youtube/"},{"subtask_id":"s4","scope_files":["yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py","yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js"],"solution_diff":"diff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\nindex e23738eb2877..087543974b19 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\n@@ -1,10 +1,10 @@\n # This file is generated by devscripts/update_ejs.py. DO NOT MODIFY!\n \n-VERSION = '0.7.0'\n+VERSION = '0.8.0'\n HASHES = {\n 'yt.solver.bun.lib.js': '6ff45e94de9f0ea936a183c48173cfa9ce526ee4b7544cd556428427c1dd53c8073ef0174e79b320252bf0e7c64b0032cc1cf9c4358f3fda59033b7caa01c241',\n- 'yt.solver.core.js': '84e91a8ae91684272d11f1ef0970c757e9fec9ab277fb415b976c156163dde6ae2a9857c19c1ee21c9dcd01e2f89071098a1de2dc3072cf3ceeded84537db5e4',\n- 'yt.solver.core.min.js': 'd965ec01dcf44a0a9dea43f5935141c788471de9e8def5bf70d0b88ca656b79ca983d3e595f84b788d921dc98b900b7bf7380e9775ccb3b70a87c865482c71e3',\n+ 'yt.solver.core.js': 'c163a6f376db6ce3da47d516a28a8f2a0554ae95c58dc766f0a6e2b3894f2cef1ee07fa84beb442fa471aac4f300985added1657c7c94c4d1cfefe68920ab599',\n+ 'yt.solver.core.min.js': 'ee5b307d07f55e91e4723edf5ac205cc877a474187849d757dc1322e38427b157a9d706d510c1723d3670f98e5a3f8cbcde77874a80406bd7204bc9fea30f283',\n 'yt.solver.deno.lib.js': '9c8ee3ab6c23e443a5a951e3ac73c6b8c1c8fb34335e7058a07bf99d349be5573611de00536dcd03ecd3cf34014c4e9b536081de37af3637c5390c6a6fd6a0f0',\n 'yt.solver.lib.js': '1ee3753a8222fc855f5c39db30a9ccbb7967dbe1fb810e86dc9a89aa073a0907f294c720e9b65427d560a35aa1ce6af19ef854d9126a05ca00afe03f72047733',\n 'yt.solver.lib.min.js': '8420c259ad16e99ce004e4651ac1bcabb53b4457bf5668a97a9359be9a998a789fee8ab124ee17f91a2ea8fd84e0f2b2fc8eabcaf0b16a186ba734cf422ad053',\ndiff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\nindex 31a20a0ff60b..bbf5555dbff8 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\n@@ -175,7 +175,7 @@ var jsc = (function (meriyah, astring) {\n );\n }\n const setupNodes = meriyah.parse(\n- `\\nif (typeof globalThis.XMLHttpRequest === \"undefined\") {\\n globalThis.XMLHttpRequest = { prototype: {} };\\n}\\nconst window = Object.create(null);\\nif (typeof URL === \"undefined\") {\\n window.location = {\\n hash: \"\",\\n host: \"www.youtube.com\",\\n hostname: \"www.youtube.com\",\\n href: \"https://www.youtube.com/watch?v=yt-dlp-wins\",\\n origin: \"https://www.youtube.com\",\\n password: \"\",\\n pathname: \"/watch\",\\n port: \"\",\\n protocol: \"https:\",\\n search: \"?v=yt-dlp-wins\",\\n username: \"\",\\n };\\n} else {\\n window.location = new URL(\"https://www.youtube.com/watch?v=yt-dlp-wins\");\\n}\\nif (typeof globalThis.document === \"undefined\") {\\n globalThis.document = Object.create(null);\\n}\\nif (typeof globalThis.navigator === \"undefined\") {\\n globalThis.navigator = Object.create(null);\\n}\\nif (typeof globalThis.self === \"undefined\") {\\n globalThis.self = globalThis;\\n}\\n`,\n+ `\\nif (typeof globalThis.XMLHttpRequest === \"undefined\") {\\n globalThis.XMLHttpRequest = { prototype: {} };\\n}\\nif (typeof URL === \"undefined\") {\\n globalThis.location = {\\n hash: \"\",\\n host: \"www.youtube.com\",\\n hostname: \"www.youtube.com\",\\n href: \"https://www.youtube.com/watch?v=yt-dlp-wins\",\\n origin: \"https://www.youtube.com\",\\n password: \"\",\\n pathname: \"/watch\",\\n port: \"\",\\n protocol: \"https:\",\\n search: \"?v=yt-dlp-wins\",\\n username: \"\",\\n };\\n} else {\\n globalThis.location = new URL(\"https://www.youtube.com/watch?v=yt-dlp-wins\");\\n}\\nif (typeof globalThis.document === \"undefined\") {\\n globalThis.document = Object.create(null);\\n}\\nif (typeof globalThis.navigator === \"undefined\") {\\n globalThis.navigator = Object.create(null);\\n}\\nif (typeof globalThis.self === \"undefined\") {\\n globalThis.self = globalThis;\\n}\\nif (typeof globalThis.window === \"undefined\") {\\n globalThis.window = globalThis;\\n}\\n`,\n ).body;\n function _optionalChain(ops) {\n let lastAccessLHS = undefined;\n\n","summary":"Edited 2 file(s) in yt_dlp/extractor/youtube/jsc/_builtin/vendor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"Makefile\",\n \"README.md\",\n \"pyproject.toml\"\n ],\n \"solution_diff\": \"diff --git a/Makefile b/Makefile\\nindex b4daeb88a419..de3eabd13b3b 100644\\n--- a/Makefile\\n+++ b/Makefile\\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\\n \\n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\\n # DO NOT EDIT!\\n-EJS_VERSION = 0.7.0\\n-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none-any.whl\\n-EJS_WHEEL_HASH = sha256:967e9cbe114ddfd046ff4668af18b1827b4597e2e47a83deea668a355828c798\\n+EJS_VERSION = 0.8.0\\n+EJS_WHEEL_NAME = yt_dlp_ejs-0.8.0-py3-none-any.whl\\n+EJS_WHEEL_HASH = sha256:79300e5fca7f937a1eeede11f0456862c1b41107ce1d726871e0207424f4bdb4\\n EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver\\n EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py\\n EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver\\ndiff --git a/README.md b/README.md\\nindex b404c277f530..ec64c029ed9e 100644\\n--- a/README.md\\n+++ b/README.md\\n@@ -1865,7 +1865,7 @@ The following extractors use this feature:\\n * `webpage_skip`: Skip extraction of embedded webpage data. One or both of `player_response`, `initial_data`. These options are for testing purposes and don't skip any network requests. Neither is skipped by default; however, if a `player_js_version` value other than `actual` is used, then `webpage_skip=player_response` is implied\\n * `webpage_client`: Client to use for the video webpage request. One of `web` or `web_safari` (default)\\n * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.\\n-* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `tv`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\\n+* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `main`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\\n * `player_js_version`: The player javascript version to use for n/sig deciphering, in the format of `signature_timestamp@hash` (e.g. `20348@0004de42`). The default is to use what is prescribed by the site, and can be selected with `actual`. Using any other value will imply `webpage_skip=player_response`\\n * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)\\n * `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread,max-depth`. Default is `all,all,all,all,all`\\ndiff --git a/pyproject.toml b/pyproject.toml\\nindex 8c8371f7830a..7feb7390962d 100644\\n--- a/pyproject.toml\\n+++ b/pyproject.toml\\n@@ -55,7 +55,7 @@ default = [\\n \\\"requests>=2.32.2,<3\\\",\\n \\\"urllib3>=2.0.2,<3\\\",\\n \\\"websockets>=13.0\\\",\\n- \\\"yt-dlp-ejs==0.7.0\\\",\\n+ \\\"yt-dlp-ejs==0.8.0\\\",\\n ]\\n curl-cffi = [\\n \\\"curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.15; implementation_name=='cpython'\\\",\\n\",\n \"summary\": \"Edited 3 file(s) in (root)/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"test/test_jsc/test_ejs_integration.py\"\n ],\n \"solution_diff\": \"diff --git a/test/test_jsc/test_ejs_integration.py b/test/test_jsc/test_ejs_integration.py\\nindex 30aee1b69496..b2150e369e4b 100644\\n--- a/test/test_jsc/test_ejs_integration.py\\n+++ b/test/test_jsc/test_ejs_integration.py\\n@@ -53,50 +53,66 @@ def url(self, /):\\n \\n \\n CHALLENGES: list[Challenge] = [\\n- # 20518\\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.N, {\\n- 'BQoJvGBkC2nj1ZZLK-': '-m-se9fQVnvEofLx',\\n- }),\\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.SIG, {\\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\\n- 'zwg=wgwCHlydB9zg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlh5mt5OX-8MB=tRPyyEdAM9MPM-kPfjgTxEK0IAhIgRwE0jiz',\\n- }),\\n- # 20521\\n- Challenge('316b61b4', Variant.tv, JsChallengeType.N, {\\n- 'IlLiA21ny7gqA2m4p37': 'GchRcsUC_WmnhOUVGV',\\n- }),\\n- Challenge('316b61b4', Variant.tv, JsChallengeType.SIG, {\\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\\n- 'tJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRN=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwz',\\n- }),\\n # 20522\\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.N, {\\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.N, {\\n 'IlLiA21ny7gqA2m4p37': '9nRTxrbM1f0yHg',\\n 'eabGFpsUKuWHXGh6FR4': 'izmYqDEY6kl7Sg',\\n 'eabGF/ps%UK=uWHXGh6FR4': 'LACmqlhaBpiPlgE-a',\\n }),\\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.SIG, {\\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.SIG, {\\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hzMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzl',\\n '\\\\x00\\\\x01\\\\x02%\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49':\\n '\\\\x00\\\\x01\\\\x02%\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x40\\\\x41\\\\x42\\\\x49\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x43',\\n }),\\n # 20523\\n- Challenge('901741ab', Variant.tv, JsChallengeType.N, {\\n+ Challenge('901741ab', Variant.main, JsChallengeType.N, {\\n 'BQoJvGBkC2nj1ZZLK-': 'UMPovvBZRh-sjb',\\n }),\\n- Challenge('901741ab', Variant.tv, JsChallengeType.SIG, {\\n+ Challenge('901741ab', Variant.main, JsChallengeType.SIG, {\\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\\n 'wgwCHlydB9Hg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlhwmt5ON-8MB=5RPyyzdAM9MPM-kPfjgTxEK0IAhIgRwE0jiEJA',\\n }),\\n # 20524\\n- Challenge('e7573094', Variant.tv, JsChallengeType.N, {\\n+ Challenge('e7573094', Variant.main, JsChallengeType.N, {\\n 'IlLiA21ny7gqA2m4p37': '3KuQ3235dojTSjo4',\\n }),\\n- Challenge('e7573094', Variant.tv, JsChallengeType.SIG, {\\n+ Challenge('e7573094', Variant.main, JsChallengeType.SIG, {\\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\\n 'yEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyNPRt=BM8-XO5tm5hlMCSVNAiEAvpeP3CURqZJSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=g',\\n }),\\n+ # 20525\\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.N, {\\n+ 'Dyc5ALyWiO0VqwCiT': 'H2PLmmAmJsYjKA',\\n+ }),\\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.SIG, {\\n+ '\\\\x00\\\\x01\\\\x02\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x4c\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63\\\\x64\\\\x65\\\\x66\\\\x67\\\\x68\\\\x69\\\\x6a':\\n+ '\\\\x6a\\\\x69\\\\x68\\\\x67\\\\x66\\\\x65\\\\x64\\\\x63\\\\x62\\\\x61\\\\x60\\\\x5f\\\\x5e\\\\x5d\\\\x5c\\\\x5b\\\\x5a\\\\x59\\\\x58\\\\x57\\\\x56\\\\x55\\\\x54\\\\x53\\\\x52\\\\x51\\\\x50\\\\x4f\\\\x4e\\\\x4d\\\\x4c\\\\x4b\\\\x4a\\\\x49\\\\x48\\\\x47\\\\x46\\\\x45\\\\x44\\\\x43\\\\x42\\\\x41\\\\x40\\\\x3f\\\\x3e\\\\x3d\\\\x3c\\\\x3b\\\\x3a\\\\x39\\\\x38\\\\x37\\\\x36\\\\x35\\\\x34\\\\x33\\\\x32\\\\x31\\\\x30\\\\x2f\\\\x2e\\\\x2d\\\\x2c\\\\x2b\\\\x2a\\\\x29\\\\x28\\\\x27\\\\x26\\\\x25\\\\x24\\\\x23\\\\x22\\\\x21\\\\x20\\\\x1f\\\\x1e\\\\x1d\\\\x1c\\\\x1b\\\\x1a\\\\x19\\\\x18\\\\x17\\\\x16\\\\x15\\\\x14\\\\x13\\\\x12\\\\x11\\\\x10\\\\x0f\\\\x0e\\\\x0d\\\\x0c\\\\x0b\\\\x03\\\\x09\\\\x08\\\\x07\\\\x06\\\\x05\\\\x04\\\\x0a',\\n+ }),\\n+ # 20527\\n+ Challenge('21cd2156', Variant.main, JsChallengeType.N, {\\n+ 'CiOxDbW1WEE8Ti4w': 'ZcBE4klItiC4rQ',\\n+ }),\\n+ Challenge('21cd2156', Variant.main, JsChallengeType.SIG, {\\n+ '\\\\x00\\\\x01\\\\x02\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x4c\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63\\\\x64\\\\x65\\\\x66\\\\x67\\\\x68\\\\x69\\\\x6a':\\n+ '\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x00\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x6a\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63\\\\x64\\\\x65\\\\x66\\\\x67\\\\x68\\\\x69\\\\x4c',\\n+ }),\\n+ # 20528\\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.N, {\\n+ 'FgTvzyq4jKv482R7': 'l26nyYSotkzDxg',\\n+ }),\\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.SIG, {\\n+ '\\\\x00\\\\x01\\\\x02\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x4c\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63\\\\x64\\\\x65\\\\x66\\\\x67\\\\x68\\\\x69\\\\x6a':\\n+ '\\\\x46\\\\x66\\\\x65\\\\x64\\\\x63\\\\x62\\\\x61\\\\x60\\\\x5f\\\\x5e\\\\x67\\\\x6a\\\\x5b\\\\x5a\\\\x59\\\\x58\\\\x57\\\\x56\\\\x55\\\\x54\\\\x53\\\\x52\\\\x51\\\\x50\\\\x4f\\\\x4e\\\\x4d\\\\x4c\\\\x4b\\\\x4a\\\\x49\\\\x48\\\\x47\\\\x2c\\\\x45\\\\x44\\\\x43\\\\x42\\\\x41\\\\x40\\\\x3f\\\\x3e\\\\x3d\\\\x3c\\\\x3b\\\\x3a\\\\x39\\\\x38\\\\x13\\\\x36\\\\x35\\\\x34\\\\x33\\\\x32\\\\x31\\\\x30\\\\x2f\\\\x2e\\\\x2d\\\\x5d\\\\x2b\\\\x2a\\\\x29\\\\x28\\\\x27\\\\x26\\\\x25\\\\x24\\\\x23\\\\x22\\\\x21\\\\x20\\\\x1f\\\\x1e\\\\x1d\\\\x1c\\\\x1b\\\\x1a\\\\x19\\\\x18\\\\x17\\\\x16\\\\x15\\\\x14\\\\x0c\\\\x12\\\\x11\\\\x10\\\\x0f\\\\x0e\\\\x0d\\\\x00\\\\x0b\\\\x0a\\\\x09\\\\x08\\\\x07\\\\x06\\\\x05\\\\x04\\\\x03\\\\x02\\\\x01\\\\x37',\\n+ }),\\n+ # 20529\\n+ Challenge('631d3938', Variant.main, JsChallengeType.N, {\\n+ 'KBx1qz7jMhxELa8c': 'ttPvh7WIptsgSw',\\n+ }),\\n+ Challenge('631d3938', Variant.main, JsChallengeType.SIG, {\\n+ '\\\\x00\\\\x01\\\\x02\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x19\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x4c\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63\\\\x64\\\\x65\\\\x66':\\n+ '\\\\x19\\\\x01\\\\x02\\\\x03\\\\x04\\\\x05\\\\x06\\\\x07\\\\x08\\\\x09\\\\x0a\\\\x0b\\\\x0c\\\\x0d\\\\x0e\\\\x0f\\\\x10\\\\x11\\\\x12\\\\x13\\\\x14\\\\x15\\\\x16\\\\x17\\\\x18\\\\x00\\\\x1a\\\\x1b\\\\x1c\\\\x1d\\\\x1e\\\\x1f\\\\x20\\\\x21\\\\x22\\\\x23\\\\x24\\\\x25\\\\x26\\\\x27\\\\x28\\\\x29\\\\x2a\\\\x2b\\\\x2c\\\\x2d\\\\x2e\\\\x2f\\\\x30\\\\x31\\\\x32\\\\x33\\\\x34\\\\x35\\\\x36\\\\x37\\\\x38\\\\x39\\\\x3a\\\\x3b\\\\x3c\\\\x3d\\\\x3e\\\\x3f\\\\x40\\\\x41\\\\x42\\\\x43\\\\x44\\\\x45\\\\x46\\\\x47\\\\x48\\\\x49\\\\x4a\\\\x4b\\\\x4c\\\\x4d\\\\x4e\\\\x4f\\\\x50\\\\x51\\\\x52\\\\x53\\\\x54\\\\x55\\\\x56\\\\x57\\\\x58\\\\x59\\\\x5a\\\\x5b\\\\x5c\\\\x5d\\\\x5e\\\\x5f\\\\x60\\\\x61\\\\x62\\\\x63',\\n+ }),\\n ]\\n \\n requests: list[JsChallengeRequest] = []\\n\",\n \"summary\": \"Edited 1 file(s) in test/test_jsc/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/_video.py\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py\\nindex 174be9547150..f12636d8cf6f 100644\\n--- a/yt_dlp/extractor/youtube/_video.py\\n+++ b/yt_dlp/extractor/youtube/_video.py\\n@@ -1876,7 +1876,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\\n }]\\n \\n _DEFAULT_PLAYER_JS_VERSION = 'actual'\\n- _DEFAULT_PLAYER_JS_VARIANT = 'tv'\\n+ _DEFAULT_PLAYER_JS_VARIANT = 'main'\\n _PLAYER_JS_VARIANT_MAP = {\\n 'main': 'player_ias.vflset/en_US/base.js',\\n 'tcc': 'player_ias_tcc.vflset/en_US/base.js',\\n\",\n \"summary\": \"Edited 1 file(s) in yt_dlp/extractor/youtube/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\",\n \"yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\"\n ],\n \"solution_diff\": \"diff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\\nindex e23738eb2877..087543974b19 100644\\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\\n@@ -1,10 +1,10 @@\\n # This file is generated by devscripts/update_ejs.py. DO NOT MODIFY!\\n \\n-VERSION = '0.7.0'\\n+VERSION = '0.8.0'\\n HASHES = {\\n 'yt.solver.bun.lib.js': '6ff45e94de9f0ea936a183c48173cfa9ce526ee4b7544cd556428427c1dd53c8073ef0174e79b320252bf0e7c64b0032cc1cf9c4358f3fda59033b7caa01c241',\\n- 'yt.solver.core.js': '84e91a8ae91684272d11f1ef0970c757e9fec9ab277fb415b976c156163dde6ae2a9857c19c1ee21c9dcd01e2f89071098a1de2dc3072cf3ceeded84537db5e4',\\n- 'yt.solver.core.min.js': 'd965ec01dcf44a0a9dea43f5935141c788471de9e8def5bf70d0b88ca656b79ca983d3e595f84b788d921dc98b900b7bf7380e9775ccb3b70a87c865482c71e3',\\n+ 'yt.solver.core.js': 'c163a6f376db6ce3da47d516a28a8f2a0554ae95c58dc766f0a6e2b3894f2cef1ee07fa84beb442fa471aac4f300985added1657c7c94c4d1cfefe68920ab599',\\n+ 'yt.solver.core.min.js': 'ee5b307d07f55e91e4723edf5ac205cc877a474187849d757dc1322e38427b157a9d706d510c1723d3670f98e5a3f8cbcde77874a80406bd7204bc9fea30f283',\\n 'yt.solver.deno.lib.js': '9c8ee3ab6c23e443a5a951e3ac73c6b8c1c8fb34335e7058a07bf99d349be5573611de00536dcd03ecd3cf34014c4e9b536081de37af3637c5390c6a6fd6a0f0',\\n 'yt.solver.lib.js': '1ee3753a8222fc855f5c39db30a9ccbb7967dbe1fb810e86dc9a89aa073a0907f294c720e9b65427d560a35aa1ce6af19ef854d9126a05ca00afe03f72047733',\\n 'yt.solver.lib.min.js': '8420c259ad16e99ce004e4651ac1bcabb53b4457bf5668a97a9359be9a998a789fee8ab124ee17f91a2ea8fd84e0f2b2fc8eabcaf0b16a186ba734cf422ad053',\\ndiff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\\nindex 31a20a0ff60b..bbf5555dbff8 100644\\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\\n@@ -175,7 +175,7 @@ var jsc = (function (meriyah, astring) {\\n );\\n }\\n const setupNodes = meriyah.parse(\\n- `\\\\nif (typeof globalThis.XMLHttpRequest === \\\"undefined\\\") {\\\\n globalThis.XMLHttpRequest = { prototype: {} };\\\\n}\\\\nconst window = Object.create(null);\\\\nif (typeof URL === \\\"undefined\\\") {\\\\n window.location = {\\\\n hash: \\\"\\\",\\\\n host: \\\"www.youtube.com\\\",\\\\n hostname: \\\"www.youtube.com\\\",\\\\n href: \\\"https://www.youtube.com/watch?v=yt-dlp-wins\\\",\\\\n origin: \\\"https://www.youtube.com\\\",\\\\n password: \\\"\\\",\\\\n pathname: \\\"/watch\\\",\\\\n port: \\\"\\\",\\\\n protocol: \\\"https:\\\",\\\\n search: \\\"?v=yt-dlp-wins\\\",\\\\n username: \\\"\\\",\\\\n };\\\\n} else {\\\\n window.location = new URL(\\\"https://www.youtube.com/watch?v=yt-dlp-wins\\\");\\\\n}\\\\nif (typeof globalThis.document === \\\"undefined\\\") {\\\\n globalThis.document = Object.create(null);\\\\n}\\\\nif (typeof globalThis.navigator === \\\"undefined\\\") {\\\\n globalThis.navigator = Object.create(null);\\\\n}\\\\nif (typeof globalThis.self === \\\"undefined\\\") {\\\\n globalThis.self = globalThis;\\\\n}\\\\n`,\\n+ `\\\\nif (typeof globalThis.XMLHttpRequest === \\\"undefined\\\") {\\\\n globalThis.XMLHttpRequest = { prototype: {} };\\\\n}\\\\nif (typeof URL === \\\"undefined\\\") {\\\\n globalThis.location = {\\\\n hash: \\\"\\\",\\\\n host: \\\"www.youtube.com\\\",\\\\n hostname: \\\"www.youtube.com\\\",\\\\n href: \\\"https://www.youtube.com/watch?v=yt-dlp-wins\\\",\\\\n origin: \\\"https://www.youtube.com\\\",\\\\n password: \\\"\\\",\\\\n pathname: \\\"/watch\\\",\\\\n port: \\\"\\\",\\\\n protocol: \\\"https:\\\",\\\\n search: \\\"?v=yt-dlp-wins\\\",\\\\n username: \\\"\\\",\\\\n };\\\\n} else {\\\\n globalThis.location = new URL(\\\"https://www.youtube.com/watch?v=yt-dlp-wins\\\");\\\\n}\\\\nif (typeof globalThis.document === \\\"undefined\\\") {\\\\n globalThis.document = Object.create(null);\\\\n}\\\\nif (typeof globalThis.navigator === \\\"undefined\\\") {\\\\n globalThis.navigator = Object.create(null);\\\\n}\\\\nif (typeof globalThis.self === \\\"undefined\\\") {\\\\n globalThis.self = globalThis;\\\\n}\\\\nif (typeof globalThis.window === \\\"undefined\\\") {\\\\n globalThis.window = globalThis;\\\\n}\\\\n`,\\n ).body;\\n function _optionalChain(ops) {\\n let lastAccessLHS = undefined;\\n\\n\",\n \"summary\": \"Edited 2 file(s) in yt_dlp/extractor/youtube/jsc/_builtin/vendor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[{"subtask_id":"s1","comment":"1","revised_diff":"diff --git a/Makefile b/Makefile\nindex b4daeb88a419..de3eabd13b3b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\n \n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\n # DO NOT EDIT!\n-EJS_VERSION = 0.7.0\n-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none-any.whl\n-EJS_WHEEL_HASH = sha256:967e9cbe114ddfd046ff4668af18b1827b4597e2e47a83deea668a355828c798\n+EJS_VERSION = 0.8.0\n+EJS_WHEEL_NAME = yt_dlp_ejs-0.8.0-py3-none-any.whl\n+EJS_WHEEL_HASH = sha256:79300e5fca7f937a1eeede11f0456862c1b41107ce1d726871e0207424f4bdb4\n EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver\n EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py\n EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver\n"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"comment\": \"1\",\n \"revised_diff\": \"diff --git a/Makefile b/Makefile\\nindex b4daeb88a419..de3eabd13b3b 100644\\n--- a/Makefile\\n+++ b/Makefile\\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\\n \\n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\\n # DO NOT EDIT!\\n-EJS_VERSION = 0.7.0\\n-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none-any.whl\\n-EJS_WHEEL_HASH = sha256:967e9cbe114ddfd046ff4668af18b1827b4597e2e47a83deea668a355828c798\\n+EJS_VERSION = 0.8.0\\n+EJS_WHEEL_NAME = yt_dlp_ejs-0.8.0-py3-none-any.whl\\n+EJS_WHEEL_HASH = sha256:79300e5fca7f937a1eeede11f0456862c1b41107ce1d726871e0207424f4bdb4\\n EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver\\n EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py\\n EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver\\n\"\n }\n]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/Makefile b/Makefile\nindex b4daeb88a419..de3eabd13b3b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\n \n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\n # DO NOT EDIT!\n-EJS_VERSION = 0.7.0\n-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none-any.whl\n-EJS_WHEEL_HASH = sha256:967e9cbe114ddfd046ff4668af18b1827b4597e2e47a83deea668a355828c798\n+EJS_VERSION = 0.8.0\n+EJS_WHEEL_NAME = yt_dlp_ejs-0.8.0-py3-none-any.whl\n+EJS_WHEEL_HASH = sha256:79300e5fca7f937a1eeede11f0456862c1b41107ce1d726871e0207424f4bdb4\n EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver\n EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py\n EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver\ndiff --git a/README.md b/README.md\nindex b404c277f530..ec64c029ed9e 100644\n--- a/README.md\n+++ b/README.md\n@@ -1865,7 +1865,7 @@ The following extractors use this feature:\n * `webpage_skip`: Skip extraction of embedded webpage data. One or both of `player_response`, `initial_data`. These options are for testing purposes and don't skip any network requests. Neither is skipped by default; however, if a `player_js_version` value other than `actual` is used, then `webpage_skip=player_response` is implied\n * `webpage_client`: Client to use for the video webpage request. One of `web` or `web_safari` (default)\n * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.\n-* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `tv`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\n+* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `es6_tcc`, `es6_tce`, `tv`, `tv_es6`, `phone`, `house`. The default is `main`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site\n * `player_js_version`: The player javascript version to use for n/sig deciphering, in the format of `signature_timestamp@hash` (e.g. `20348@0004de42`). The default is to use what is prescribed by the site, and can be selected with `actual`. Using any other value will imply `webpage_skip=player_response`\n * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)\n * `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread,max-depth`. Default is `all,all,all,all,all`\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 8c8371f7830a..7feb7390962d 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -55,7 +55,7 @@ default = [\n \"requests>=2.32.2,<3\",\n \"urllib3>=2.0.2,<3\",\n \"websockets>=13.0\",\n- \"yt-dlp-ejs==0.7.0\",\n+ \"yt-dlp-ejs==0.8.0\",\n ]\n curl-cffi = [\n \"curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.15; implementation_name=='cpython'\",\ndiff --git a/yt_dlp/extractor/youtube/_video.py b/yt_dlp/extractor/youtube/_video.py\nindex 174be9547150..f12636d8cf6f 100644\n--- a/yt_dlp/extractor/youtube/_video.py\n+++ b/yt_dlp/extractor/youtube/_video.py\n@@ -1876,7 +1876,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n }]\n \n _DEFAULT_PLAYER_JS_VERSION = 'actual'\n- _DEFAULT_PLAYER_JS_VARIANT = 'tv'\n+ _DEFAULT_PLAYER_JS_VARIANT = 'main'\n _PLAYER_JS_VARIANT_MAP = {\n 'main': 'player_ias.vflset/en_US/base.js',\n 'tcc': 'player_ias_tcc.vflset/en_US/base.js',\ndiff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\nindex e23738eb2877..087543974b19 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/_info.py\n@@ -1,10 +1,10 @@\n # This file is generated by devscripts/update_ejs.py. DO NOT MODIFY!\n \n-VERSION = '0.7.0'\n+VERSION = '0.8.0'\n HASHES = {\n 'yt.solver.bun.lib.js': '6ff45e94de9f0ea936a183c48173cfa9ce526ee4b7544cd556428427c1dd53c8073ef0174e79b320252bf0e7c64b0032cc1cf9c4358f3fda59033b7caa01c241',\n- 'yt.solver.core.js': '84e91a8ae91684272d11f1ef0970c757e9fec9ab277fb415b976c156163dde6ae2a9857c19c1ee21c9dcd01e2f89071098a1de2dc3072cf3ceeded84537db5e4',\n- 'yt.solver.core.min.js': 'd965ec01dcf44a0a9dea43f5935141c788471de9e8def5bf70d0b88ca656b79ca983d3e595f84b788d921dc98b900b7bf7380e9775ccb3b70a87c865482c71e3',\n+ 'yt.solver.core.js': 'c163a6f376db6ce3da47d516a28a8f2a0554ae95c58dc766f0a6e2b3894f2cef1ee07fa84beb442fa471aac4f300985added1657c7c94c4d1cfefe68920ab599',\n+ 'yt.solver.core.min.js': 'ee5b307d07f55e91e4723edf5ac205cc877a474187849d757dc1322e38427b157a9d706d510c1723d3670f98e5a3f8cbcde77874a80406bd7204bc9fea30f283',\n 'yt.solver.deno.lib.js': '9c8ee3ab6c23e443a5a951e3ac73c6b8c1c8fb34335e7058a07bf99d349be5573611de00536dcd03ecd3cf34014c4e9b536081de37af3637c5390c6a6fd6a0f0',\n 'yt.solver.lib.js': '1ee3753a8222fc855f5c39db30a9ccbb7967dbe1fb810e86dc9a89aa073a0907f294c720e9b65427d560a35aa1ce6af19ef854d9126a05ca00afe03f72047733',\n 'yt.solver.lib.min.js': '8420c259ad16e99ce004e4651ac1bcabb53b4457bf5668a97a9359be9a998a789fee8ab124ee17f91a2ea8fd84e0f2b2fc8eabcaf0b16a186ba734cf422ad053',\ndiff --git a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\nindex 31a20a0ff60b..bbf5555dbff8 100644\n--- a/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\n+++ b/yt_dlp/extractor/youtube/jsc/_builtin/vendor/yt.solver.core.js\n@@ -175,7 +175,7 @@ var jsc = (function (meriyah, astring) {\n );\n }\n const setupNodes = meriyah.parse(\n- `\\nif (typeof globalThis.XMLHttpRequest === \"undefined\") {\\n globalThis.XMLHttpRequest = { prototype: {} };\\n}\\nconst window = Object.create(null);\\nif (typeof URL === \"undefined\") {\\n window.location = {\\n hash: \"\",\\n host: \"www.youtube.com\",\\n hostname: \"www.youtube.com\",\\n href: \"https://www.youtube.com/watch?v=yt-dlp-wins\",\\n origin: \"https://www.youtube.com\",\\n password: \"\",\\n pathname: \"/watch\",\\n port: \"\",\\n protocol: \"https:\",\\n search: \"?v=yt-dlp-wins\",\\n username: \"\",\\n };\\n} else {\\n window.location = new URL(\"https://www.youtube.com/watch?v=yt-dlp-wins\");\\n}\\nif (typeof globalThis.document === \"undefined\") {\\n globalThis.document = Object.create(null);\\n}\\nif (typeof globalThis.navigator === \"undefined\") {\\n globalThis.navigator = Object.create(null);\\n}\\nif (typeof globalThis.self === \"undefined\") {\\n globalThis.self = globalThis;\\n}\\n`,\n+ `\\nif (typeof globalThis.XMLHttpRequest === \"undefined\") {\\n globalThis.XMLHttpRequest = { prototype: {} };\\n}\\nif (typeof URL === \"undefined\") {\\n globalThis.location = {\\n hash: \"\",\\n host: \"www.youtube.com\",\\n hostname: \"www.youtube.com\",\\n href: \"https://www.youtube.com/watch?v=yt-dlp-wins\",\\n origin: \"https://www.youtube.com\",\\n password: \"\",\\n pathname: \"/watch\",\\n port: \"\",\\n protocol: \"https:\",\\n search: \"?v=yt-dlp-wins\",\\n username: \"\",\\n };\\n} else {\\n globalThis.location = new URL(\"https://www.youtube.com/watch?v=yt-dlp-wins\");\\n}\\nif (typeof globalThis.document === \"undefined\") {\\n globalThis.document = Object.create(null);\\n}\\nif (typeof globalThis.navigator === \"undefined\") {\\n globalThis.navigator = Object.create(null);\\n}\\nif (typeof globalThis.self === \"undefined\") {\\n globalThis.self = globalThis;\\n}\\nif (typeof globalThis.window === \"undefined\") {\\n globalThis.window = globalThis;\\n}\\n`,\n ).body;\n function _optionalChain(ops) {\n let lastAccessLHS = undefined;\n\ndiff --git a/test/test_jsc/test_ejs_integration.py b/test/test_jsc/test_ejs_integration.py\nindex 30aee1b69496..b2150e369e4b 100644\n--- a/test/test_jsc/test_ejs_integration.py\n+++ b/test/test_jsc/test_ejs_integration.py\n@@ -53,50 +53,66 @@ def url(self, /):\n \n \n CHALLENGES: list[Challenge] = [\n- # 20518\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.N, {\n- 'BQoJvGBkC2nj1ZZLK-': '-m-se9fQVnvEofLx',\n- }),\n- Challenge('edc3ba07', Variant.tv, JsChallengeType.SIG, {\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n- 'zwg=wgwCHlydB9zg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlh5mt5OX-8MB=tRPyyEdAM9MPM-kPfjgTxEK0IAhIgRwE0jiz',\n- }),\n- # 20521\n- Challenge('316b61b4', Variant.tv, JsChallengeType.N, {\n- 'IlLiA21ny7gqA2m4p37': 'GchRcsUC_WmnhOUVGV',\n- }),\n- Challenge('316b61b4', Variant.tv, JsChallengeType.SIG, {\n- 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n- 'tJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRN=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwz',\n- }),\n # 20522\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.N, {\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.N, {\n 'IlLiA21ny7gqA2m4p37': '9nRTxrbM1f0yHg',\n 'eabGFpsUKuWHXGh6FR4': 'izmYqDEY6kl7Sg',\n 'eabGF/ps%UK=uWHXGh6FR4': 'LACmqlhaBpiPlgE-a',\n }),\n- Challenge('74edf1a3', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('74edf1a3', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hzMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzl',\n '\\x00\\x01\\x02%\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49':\n '\\x00\\x01\\x02%\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x40\\x41\\x42\\x49\\x44\\x45\\x46\\x47\\x48\\x43',\n }),\n # 20523\n- Challenge('901741ab', Variant.tv, JsChallengeType.N, {\n+ Challenge('901741ab', Variant.main, JsChallengeType.N, {\n 'BQoJvGBkC2nj1ZZLK-': 'UMPovvBZRh-sjb',\n }),\n- Challenge('901741ab', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('901741ab', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'wgwCHlydB9Hg7PMegXoVzaoAXXB8woPSNZqRUC3Pe7vAEiApVSCMlhwmt5ON-8MB=5RPyyzdAM9MPM-kPfjgTxEK0IAhIgRwE0jiEJA',\n }),\n # 20524\n- Challenge('e7573094', Variant.tv, JsChallengeType.N, {\n+ Challenge('e7573094', Variant.main, JsChallengeType.N, {\n 'IlLiA21ny7gqA2m4p37': '3KuQ3235dojTSjo4',\n }),\n- Challenge('e7573094', Variant.tv, JsChallengeType.SIG, {\n+ Challenge('e7573094', Variant.main, JsChallengeType.SIG, {\n 'NJAJEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyyPRt=BM8-XO5tm5hlMCSVpAiEAv7eP3CURqZNSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=gwzz':\n 'yEij0EwRgIhAI0KExTgjfPk-MPM9MAdzyNPRt=BM8-XO5tm5hlMCSVNAiEAvpeP3CURqZJSPow8BXXAoazVoXgeMP7gH9BdylHCwgw=g',\n }),\n+ # 20525\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.N, {\n+ 'Dyc5ALyWiO0VqwCiT': 'H2PLmmAmJsYjKA',\n+ }),\n+ Challenge('9fcf08e8', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x6a\\x69\\x68\\x67\\x66\\x65\\x64\\x63\\x62\\x61\\x60\\x5f\\x5e\\x5d\\x5c\\x5b\\x5a\\x59\\x58\\x57\\x56\\x55\\x54\\x53\\x52\\x51\\x50\\x4f\\x4e\\x4d\\x4c\\x4b\\x4a\\x49\\x48\\x47\\x46\\x45\\x44\\x43\\x42\\x41\\x40\\x3f\\x3e\\x3d\\x3c\\x3b\\x3a\\x39\\x38\\x37\\x36\\x35\\x34\\x33\\x32\\x31\\x30\\x2f\\x2e\\x2d\\x2c\\x2b\\x2a\\x29\\x28\\x27\\x26\\x25\\x24\\x23\\x22\\x21\\x20\\x1f\\x1e\\x1d\\x1c\\x1b\\x1a\\x19\\x18\\x17\\x16\\x15\\x14\\x13\\x12\\x11\\x10\\x0f\\x0e\\x0d\\x0c\\x0b\\x03\\x09\\x08\\x07\\x06\\x05\\x04\\x0a',\n+ }),\n+ # 20527\n+ Challenge('21cd2156', Variant.main, JsChallengeType.N, {\n+ 'CiOxDbW1WEE8Ti4w': 'ZcBE4klItiC4rQ',\n+ }),\n+ Challenge('21cd2156', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x00\\x46\\x47\\x48\\x49\\x4a\\x4b\\x6a\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x4c',\n+ }),\n+ # 20528\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.N, {\n+ 'FgTvzyq4jKv482R7': 'l26nyYSotkzDxg',\n+ }),\n+ Challenge('5e55da5a', Variant.tv, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66\\x67\\x68\\x69\\x6a':\n+ '\\x46\\x66\\x65\\x64\\x63\\x62\\x61\\x60\\x5f\\x5e\\x67\\x6a\\x5b\\x5a\\x59\\x58\\x57\\x56\\x55\\x54\\x53\\x52\\x51\\x50\\x4f\\x4e\\x4d\\x4c\\x4b\\x4a\\x49\\x48\\x47\\x2c\\x45\\x44\\x43\\x42\\x41\\x40\\x3f\\x3e\\x3d\\x3c\\x3b\\x3a\\x39\\x38\\x13\\x36\\x35\\x34\\x33\\x32\\x31\\x30\\x2f\\x2e\\x2d\\x5d\\x2b\\x2a\\x29\\x28\\x27\\x26\\x25\\x24\\x23\\x22\\x21\\x20\\x1f\\x1e\\x1d\\x1c\\x1b\\x1a\\x19\\x18\\x17\\x16\\x15\\x14\\x0c\\x12\\x11\\x10\\x0f\\x0e\\x0d\\x00\\x0b\\x0a\\x09\\x08\\x07\\x06\\x05\\x04\\x03\\x02\\x01\\x37',\n+ }),\n+ # 20529\n+ Challenge('631d3938', Variant.main, JsChallengeType.N, {\n+ 'KBx1qz7jMhxELa8c': 'ttPvh7WIptsgSw',\n+ }),\n+ Challenge('631d3938', Variant.main, JsChallengeType.SIG, {\n+ '\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63\\x64\\x65\\x66':\n+ '\\x19\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x00\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f\\x20\\x21\\x22\\x23\\x24\\x25\\x26\\x27\\x28\\x29\\x2a\\x2b\\x2c\\x2d\\x2e\\x2f\\x30\\x31\\x32\\x33\\x34\\x35\\x36\\x37\\x38\\x39\\x3a\\x3b\\x3c\\x3d\\x3e\\x3f\\x40\\x41\\x42\\x43\\x44\\x45\\x46\\x47\\x48\\x49\\x4a\\x4b\\x4c\\x4d\\x4e\\x4f\\x50\\x51\\x52\\x53\\x54\\x55\\x56\\x57\\x58\\x59\\x5a\\x5b\\x5c\\x5d\\x5e\\x5f\\x60\\x61\\x62\\x63',\n+ }),\n ]\n \n requests: list[JsChallengeRequest] = []\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":7,"string":"7"}}},{"rowIdx":34292,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16743"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16743,"string":"16,743"},"base_sha":{"kind":"string","value":"32f1671a906bf375e5b5d39433dd13f917a8dfa7"},"head_sha":{"kind":"string","value":"e728d6290852c7c5fa1c911d1f684b79faaa7dc4"},"task":{"kind":"string","value":"[ci] Update 2 actions in 2 workflows\n\n<!-- BEGIN dlp-bot generated section -->\n\nUpdated with `--exclude-newer 2026-05-19T01:54:28.178549+00:00`\n\naction | old | new | diff\n-------|-----|-----|-----\n[**`github/codeql-action`**](<https://github.com/github/codeql-action>) | [v4.35.***2***](<https://github.com/github/codeql-action/releases/tag/v4.35.2>) | [v4.35.***5***](<https://github.com/github/codeql-action/releases/tag/v4.35.5>) | [`95e58e9...9e0d7b8`](<https://github.com/github/codeql-action/compare/95e58e9a2cdfd71adc6e0353d5c52f41a045d225...9e0d7b8d25671d64c341c19c0152d693099fb5ba>)\n[**`zizmorcore/zizmor-action`**](<https://github.com/zizmorcore/zizmor-action>) | [v0.5.***3***](<https://github.com/zizmorcore/zizmor-action/releases/tag/v0.5.3>) | [v0.5.***6***](<https://github.com/zizmorcore/zizmor-action/releases/tag/v0.5.6>) | [`b1d7e1f...5f14fd0`](<https://github.com/zizmorcore/zizmor-action/compare/b1d7e1fb5de872772f31590499237e7cce841e8e...5f14fd08f7cf1cb1609c1e344975f152c7ee938d>)\n\nworkflow | updates\n---------|--------\n**`codeql.yml`** | `github/codeql-action`\n**`test-workflows.yml`** | `zizmorcore/zizmor-action`\n\n```\n[ci] Update 2 actions in 2 workflows\n\n* Bump github/codeql-action v4.35.2 => v4.35.5\n* Bump zizmorcore/zizmor-action v0.5.3 => v0.5.6\n\nAuthored by: dlp-bot\n\n```\n\n<!-- END dlp-bot generated section -->\n\n\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\n\n\n### Before submitting a *pull request* make sure you have:\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\n\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/): This pull request was created by a bot that was written by the maintainers of this project\n\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\n- [x] Automated maintenance\n\n</details>\n\n\n---\n\n*This pull request is the product of [this GitHub Actions workflow run](https://github.com/bashonly/dlp-bot/actions/runs/26071393012).*"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [ci] Update 2 actions in 2 workflows","scope_files":[".github/workflows/codeql.yml",".github/workflows/test-workflows.yml"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [ci] Update 2 actions in 2 workflows\",\n \"scope_files\": [\n \".github/workflows/codeql.yml\",\n \".github/workflows/test-workflows.yml\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/codeql.yml",".github/workflows/test-workflows.yml"],"solution_diff":"diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 7a048015d8f5..4bc3a63be85e 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -36,12 +36,12 @@ jobs:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n+ uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n+ uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex ada6ffa24052..9332b69fbac9 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -83,7 +83,7 @@ jobs:\n persist-credentials: false\n \n - name: Run zizmor\n- uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\n+ uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6\n with:\n advanced-security: false\n persona: pedantic\n","summary":"Edited 2 file(s) in .github/workflows/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/codeql.yml\",\n \".github/workflows/test-workflows.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\\nindex 7a048015d8f5..4bc3a63be85e 100644\\n--- a/.github/workflows/codeql.yml\\n+++ b/.github/workflows/codeql.yml\\n@@ -36,12 +36,12 @@ jobs:\\n persist-credentials: false\\n \\n - name: Initialize CodeQL\\n- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\\n+ uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\\n with:\\n languages: ${{ matrix.language }}\\n build-mode: none\\n \\n - name: Perform CodeQL Analysis\\n- uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\\n+ uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\\n with:\\n category: \\\"/language:${{matrix.language}}\\\"\\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\\nindex ada6ffa24052..9332b69fbac9 100644\\n--- a/.github/workflows/test-workflows.yml\\n+++ b/.github/workflows/test-workflows.yml\\n@@ -83,7 +83,7 @@ jobs:\\n persist-credentials: false\\n \\n - name: Run zizmor\\n- uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\\n+ uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6\\n with:\\n advanced-security: false\\n persona: pedantic\\n\",\n \"summary\": \"Edited 2 file(s) in .github/workflows/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 7a048015d8f5..4bc3a63be85e 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -36,12 +36,12 @@ jobs:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n+ uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n+ uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex ada6ffa24052..9332b69fbac9 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -83,7 +83,7 @@ jobs:\n persist-credentials: false\n \n - name: Run zizmor\n- uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\n+ uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6\n with:\n advanced-security: false\n persona: pedantic\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34293,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16740"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16740,"string":"16,740"},"base_sha":{"kind":"string","value":"410e0af5379c5fc5f2acb6abaa8965637f80ad76"},"head_sha":{"kind":"string","value":"a282538776726d08d8b6c0d6b25b5b0dddac6ccc"},"task":{"kind":"string","value":"[build] Rename requirements files to clean up dependency graph\n\nWe have GitHub's dependency graph and dependabot security scanning enabled for the repo, and dependabot seems to be very confused by the presence of both a `uv.lock` file and a `requirements-dev.txt` file.\r\n\r\nThe result is a buggy dependabot code path being reached that causes run failures:\r\n\r\n- https://github.com/yt-dlp/yt-dlp/actions/runs/25406755818\r\n- https://github.com/dependabot/dependabot-core/issues/14946\r\n\r\n...and also duplicate dependencies listed in our dependency graph and dependabot alerts:\r\n- https://github.com/yt-dlp/yt-dlp/network/dependencies\r\n- https://github.com/yt-dlp/yt-dlp/security/dependabot\r\n\r\nWe can avoid both issues by simply removing the redundant `requirements-` prefix in our requirements files.\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Cleaning up dependabot's mess\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [build] Rename requirements files to clean up dependency graph","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/core.yml",".github/workflows/quick-test.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `bundle/docker/linux/` needed for: [build] Rename requirements files to clean up dependency graph","scope_files":["bundle/docker/linux/build.sh"]},{"subtask_id":"s3","goal":"Implement the changes under `bundle/requirements/` needed for: [build] Rename requirements files to clean up dependency graph","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/delocate.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos-curl_cffi.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/pyflakes.txt","bundle/requirements/pyinstaller.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt","bundle/requirements/win-arm64-pyinstaller.txt","bundle/requirements/win-x64-pyinstaller.txt","bundle/requirements/win-x86-pyinstaller.txt"]},{"subtask_id":"s4","goal":"Implement the changes under `devscripts/` needed for: [build] Rename requirements files to clean up dependency graph","scope_files":["devscripts/update_requirements.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [build] Rename requirements files to clean up dependency graph\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/core.yml\",\n \".github/workflows/quick-test.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `bundle/docker/linux/` needed for: [build] Rename requirements files to clean up dependency graph\",\n \"scope_files\": [\n \"bundle/docker/linux/build.sh\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `bundle/requirements/` needed for: [build] Rename requirements files to clean up dependency graph\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/delocate.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos-curl_cffi.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/pyflakes.txt\",\n \"bundle/requirements/pyinstaller.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\",\n \"bundle/requirements/win-arm64-pyinstaller.txt\",\n \"bundle/requirements/win-x64-pyinstaller.txt\",\n \"bundle/requirements/win-x86-pyinstaller.txt\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `devscripts/` needed for: [build] Rename requirements files to clean up dependency graph\",\n \"scope_files\": [\n \"devscripts/update_requirements.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/core.yml",".github/workflows/quick-test.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml"],"solution_diff":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex ecb335433747..a45a4b4e158f 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -325,7 +325,7 @@ jobs:\n brew uninstall --ignore-dependencies python3\n python3 -m venv ~/yt-dlp-build-venv\n source ~/yt-dlp-build-venv/bin/activate\n- python3 -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n+ python3 -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n rm -rf build\n # Only directly install wheels for \"macosx_10_15_universal2\" and \"any\" platforms\n mkdir -p build/wheels\n@@ -335,7 +335,7 @@ jobs:\n --platform=any \\\n -d build/wheels \\\n --require-hashes \\\n- -r \"bundle/requirements/requirements-macos.txt\"\n+ -r \"bundle/requirements/macos.txt\"\n python3 -m pip install --force-reinstall --no-deps -U build/wheels/*.whl\n rm -rf build/wheels/*\n # We need to fuse our own universal2 wheels for curl_cffi and cffi\n@@ -347,7 +347,7 @@ jobs:\n --platform \"${platform}\" \\\n -d build/wheels \\\n --require-hashes \\\n- -r \"bundle/requirements/requirements-macos-curl_cffi.txt\"\n+ -r \"bundle/requirements/macos-curl_cffi.txt\"\n done\n python3 -m delocate.cmd.delocate_merge build/wheels/curl_cffi-*.whl -w build/universal2\n python3 -m delocate.cmd.delocate_merge build/wheels/cffi-*.whl -w build/universal2\n@@ -456,12 +456,12 @@ jobs:\n $PSNativeCommandUseErrorActionPreference = $true\n python -m venv /yt-dlp-build-venv\n /yt-dlp-build-venv/Scripts/Activate.ps1\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-win-${Env:ARCH}-pyinstaller.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/win-${Env:ARCH}-pyinstaller.txt\"\n if (${Env:ARCH} -eq \"x86\") {\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n } else {\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-curl-cffi.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/curl-cffi.txt\"\n }\n \n - name: Prepare\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex b58b82cb32b0..287a115bd10d 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -79,9 +79,9 @@ jobs:\n - name: Install test requirements\n shell: bash\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n - name: Run tests\n timeout-minutes: 15\n shell: bash\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex ea212d8b45e1..256d1877986f 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -75,16 +75,16 @@ jobs:\n - name: Install test requirements (cpython)\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-curl-cffi.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/curl-cffi.txt\"\n \n - name: Install test requirements (PyPy)\n if: ${{ startsWith(matrix.python-version, 'pypy') }}\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n \n - name: Run tests\n timeout-minutes: 15\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\nindex 908c967f8225..653971d8e79f 100644\n--- a/.github/workflows/quick-test.yml\n+++ b/.github/workflows/quick-test.yml\n@@ -31,8 +31,8 @@ jobs:\n - name: Install test requirements\n shell: bash\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n - name: Run tests\n timeout-minutes: 15\n shell: bash\n@@ -56,8 +56,8 @@ jobs:\n python-version: '3.14'\n - name: Install dev dependencies\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-static-analysis.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/static-analysis.txt\"\n - name: Make lazy extractors\n run: python ./devscripts/make_lazy_extractors.py\n - name: Run ruff\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 84082cc03223..9d926d9d349b 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -185,8 +185,8 @@ jobs:\n - name: Install Requirements\n run: |\n sudo apt -y install pandoc man\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-build.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/build.txt\"\n \n - name: Prepare\n env:\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 248b5a16c0fd..ada6ffa24052 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -36,9 +36,9 @@ jobs:\n \n - name: Install Python dependencies\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pyflakes.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pyflakes.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n \n - name: Install requirements\n env:\n","summary":"Edited 6 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["bundle/docker/linux/build.sh"],"solution_diff":"diff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\nindex 195ab89c8c72..f576865cb845 100755\n--- a/bundle/docker/linux/build.sh\n+++ b/bundle/docker/linux/build.sh\n@@ -14,8 +14,8 @@ export PYTHONPATH\n # shellcheck disable=SC1091\n source .venv/bin/activate\n \n-python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pyinstaller.txt\"\n-python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-${REQUIREMENTS}.txt\"\n+python -m pip install -U --require-hashes -r \"bundle/requirements/pyinstaller.txt\"\n+python -m pip install -U --require-hashes -r \"bundle/requirements/${REQUIREMENTS}.txt\"\n python -m devscripts.make_lazy_extractors\n python devscripts/update-version.py -c \"${CHANNEL}\" -r \"${ORIGIN}\" \"${VERSION}\"\n \n","summary":"Edited 1 file(s) in bundle/docker/linux/"},{"subtask_id":"s3","scope_files":["bundle/requirements/build.txt","bundle/requirements/curl-cffi.txt","bundle/requirements/default.txt","bundle/requirements/delocate.txt","bundle/requirements/dev.txt","bundle/requirements/linux.txt","bundle/requirements/macos-curl_cffi.txt","bundle/requirements/macos.txt","bundle/requirements/pip.txt","bundle/requirements/pyflakes.txt","bundle/requirements/pyinstaller.txt","bundle/requirements/static-analysis.txt","bundle/requirements/test.txt","bundle/requirements/uv.txt","bundle/requirements/win-arm64-pyinstaller.txt","bundle/requirements/win-x64-pyinstaller.txt","bundle/requirements/win-x86-pyinstaller.txt"],"solution_diff":"diff --git a/bundle/requirements/requirements-build.txt b/bundle/requirements/build.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-build.txt\nrename to bundle/requirements/build.txt\ndiff --git a/bundle/requirements/requirements-curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-curl-cffi.txt\nrename to bundle/requirements/curl-cffi.txt\ndiff --git a/bundle/requirements/requirements-default.txt b/bundle/requirements/default.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-default.txt\nrename to bundle/requirements/default.txt\ndiff --git a/bundle/requirements/requirements-delocate.txt b/bundle/requirements/delocate.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-delocate.txt\nrename to bundle/requirements/delocate.txt\ndiff --git a/bundle/requirements/requirements-dev.txt b/bundle/requirements/dev.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-dev.txt\nrename to bundle/requirements/dev.txt\ndiff --git a/bundle/requirements/requirements-linux.txt b/bundle/requirements/linux.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-linux.txt\nrename to bundle/requirements/linux.txt\ndiff --git a/bundle/requirements/requirements-macos-curl_cffi.txt b/bundle/requirements/macos-curl_cffi.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-macos-curl_cffi.txt\nrename to bundle/requirements/macos-curl_cffi.txt\ndiff --git a/bundle/requirements/requirements-macos.txt b/bundle/requirements/macos.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-macos.txt\nrename to bundle/requirements/macos.txt\ndiff --git a/bundle/requirements/requirements-pip.txt b/bundle/requirements/pip.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pip.txt\nrename to bundle/requirements/pip.txt\ndiff --git a/bundle/requirements/requirements-pyflakes.txt b/bundle/requirements/pyflakes.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pyflakes.txt\nrename to bundle/requirements/pyflakes.txt\ndiff --git a/bundle/requirements/requirements-pyinstaller.txt b/bundle/requirements/pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pyinstaller.txt\nrename to bundle/requirements/pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-static-analysis.txt b/bundle/requirements/static-analysis.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-static-analysis.txt\nrename to bundle/requirements/static-analysis.txt\ndiff --git a/bundle/requirements/requirements-test.txt b/bundle/requirements/test.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-test.txt\nrename to bundle/requirements/test.txt\ndiff --git a/bundle/requirements/requirements-uv.txt b/bundle/requirements/uv.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-uv.txt\nrename to bundle/requirements/uv.txt\ndiff --git a/bundle/requirements/requirements-win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-arm64-pyinstaller.txt\nrename to bundle/requirements/win-arm64-pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-x64-pyinstaller.txt\nrename to bundle/requirements/win-x64-pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-x86-pyinstaller.txt\nrename to bundle/requirements/win-x86-pyinstaller.txt\n","summary":"Edited 17 file(s) in bundle/requirements/"},{"subtask_id":"s4","scope_files":["devscripts/update_requirements.py"],"solution_diff":"diff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\nindex b1e430eb065f..7231e8bdafaa 100755\n--- a/devscripts/update_requirements.py\n+++ b/devscripts/update_requirements.py\n@@ -34,7 +34,7 @@\n MAKEFILE_PATH = BASE_PATH / 'Makefile'\n LOCKFILE_PATH = BASE_PATH / 'uv.lock'\n REQUIREMENTS_PATH = BASE_PATH / 'bundle/requirements'\n-REQS_OUTPUT_TMPL = 'requirements-{}.txt'\n+REQS_OUTPUT_TMPL = '{}.txt'\n \n EXTRAS_TABLE = 'project.optional-dependencies'\n GROUPS_TABLE = 'dependency-groups'\n@@ -544,11 +544,11 @@ def package_diff_dict(\n return ret_dict\n \n \n-def get_lock_packages(lock: dict[str, typing.Any]) -> dict[str, str]:\n+def get_lock_packages(lock: dict[str, typing.Any], ignore_names: list[str] | None = None) -> dict[str, str]:\n return {\n package['name']: package['version']\n for package in lock['package']\n- if package.get('version')\n+ if package.get('version') and package['name'] not in (ignore_names or [])\n }\n \n \n@@ -578,6 +578,7 @@ def update_requirements(\n \n pyproject_text = PYPROJECT_PATH.read_text()\n pyproject_toml = parse_toml(pyproject_text)\n+ package_name = pyproject_toml['project']['name']\n extras = get_extras(pyproject_toml)\n \n # Remove pinned extras so they don't muck up the lockfile during generation/upgrade\n@@ -603,8 +604,8 @@ def update_requirements(\n run_process('uv', 'lock', upgrade_arg, env=env)\n \n # Record diff in uv.lock packages\n- old_packages = get_lock_packages(old_lock) if old_lock else {}\n- new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()))\n+ old_packages = get_lock_packages(old_lock, [package_name]) if old_lock else {}\n+ new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()), [package_name])\n all_updates = package_diff_dict(old_packages, new_packages)\n \n # Update Windows PyInstaller requirements; need to compare before & after .txt's for reporting\n","summary":"Edited 1 file(s) in devscripts/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/core.yml\",\n \".github/workflows/quick-test.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\\nindex ecb335433747..a45a4b4e158f 100644\\n--- a/.github/workflows/build.yml\\n+++ b/.github/workflows/build.yml\\n@@ -325,7 +325,7 @@ jobs:\\n brew uninstall --ignore-dependencies python3\\n python3 -m venv ~/yt-dlp-build-venv\\n source ~/yt-dlp-build-venv/bin/activate\\n- python3 -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n+ python3 -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n rm -rf build\\n # Only directly install wheels for \\\"macosx_10_15_universal2\\\" and \\\"any\\\" platforms\\n mkdir -p build/wheels\\n@@ -335,7 +335,7 @@ jobs:\\n --platform=any \\\\\\n -d build/wheels \\\\\\n --require-hashes \\\\\\n- -r \\\"bundle/requirements/requirements-macos.txt\\\"\\n+ -r \\\"bundle/requirements/macos.txt\\\"\\n python3 -m pip install --force-reinstall --no-deps -U build/wheels/*.whl\\n rm -rf build/wheels/*\\n # We need to fuse our own universal2 wheels for curl_cffi and cffi\\n@@ -347,7 +347,7 @@ jobs:\\n --platform \\\"${platform}\\\" \\\\\\n -d build/wheels \\\\\\n --require-hashes \\\\\\n- -r \\\"bundle/requirements/requirements-macos-curl_cffi.txt\\\"\\n+ -r \\\"bundle/requirements/macos-curl_cffi.txt\\\"\\n done\\n python3 -m delocate.cmd.delocate_merge build/wheels/curl_cffi-*.whl -w build/universal2\\n python3 -m delocate.cmd.delocate_merge build/wheels/cffi-*.whl -w build/universal2\\n@@ -456,12 +456,12 @@ jobs:\\n $PSNativeCommandUseErrorActionPreference = $true\\n python -m venv /yt-dlp-build-venv\\n /yt-dlp-build-venv/Scripts/Activate.ps1\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-win-${Env:ARCH}-pyinstaller.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/win-${Env:ARCH}-pyinstaller.txt\\\"\\n if (${Env:ARCH} -eq \\\"x86\\\") {\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-default.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/default.txt\\\"\\n } else {\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-curl-cffi.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/curl-cffi.txt\\\"\\n }\\n \\n - name: Prepare\\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex b58b82cb32b0..287a115bd10d 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -79,9 +79,9 @@ jobs:\\n - name: Install test requirements\\n shell: bash\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-test.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-default.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/test.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/default.txt\\\"\\n - name: Run tests\\n timeout-minutes: 15\\n shell: bash\\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\\nindex ea212d8b45e1..256d1877986f 100644\\n--- a/.github/workflows/core.yml\\n+++ b/.github/workflows/core.yml\\n@@ -75,16 +75,16 @@ jobs:\\n - name: Install test requirements (cpython)\\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-test.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-curl-cffi.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/test.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/curl-cffi.txt\\\"\\n \\n - name: Install test requirements (PyPy)\\n if: ${{ startsWith(matrix.python-version, 'pypy') }}\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-test.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-default.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/test.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/default.txt\\\"\\n \\n - name: Run tests\\n timeout-minutes: 15\\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\\nindex 908c967f8225..653971d8e79f 100644\\n--- a/.github/workflows/quick-test.yml\\n+++ b/.github/workflows/quick-test.yml\\n@@ -31,8 +31,8 @@ jobs:\\n - name: Install test requirements\\n shell: bash\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-test.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/test.txt\\\"\\n - name: Run tests\\n timeout-minutes: 15\\n shell: bash\\n@@ -56,8 +56,8 @@ jobs:\\n python-version: '3.14'\\n - name: Install dev dependencies\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-static-analysis.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/static-analysis.txt\\\"\\n - name: Make lazy extractors\\n run: python ./devscripts/make_lazy_extractors.py\\n - name: Run ruff\\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\\nindex 84082cc03223..9d926d9d349b 100644\\n--- a/.github/workflows/release.yml\\n+++ b/.github/workflows/release.yml\\n@@ -185,8 +185,8 @@ jobs:\\n - name: Install Requirements\\n run: |\\n sudo apt -y install pandoc man\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-build.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/build.txt\\\"\\n \\n - name: Prepare\\n env:\\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\\nindex 248b5a16c0fd..ada6ffa24052 100644\\n--- a/.github/workflows/test-workflows.yml\\n+++ b/.github/workflows/test-workflows.yml\\n@@ -36,9 +36,9 @@ jobs:\\n \\n - name: Install Python dependencies\\n run: |\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pip.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pyflakes.txt\\\"\\n- python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-test.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pip.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/pyflakes.txt\\\"\\n+ python -m pip install -U --require-hashes -r \\\"bundle/requirements/test.txt\\\"\\n \\n - name: Install requirements\\n env:\\n\",\n \"summary\": \"Edited 6 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"bundle/docker/linux/build.sh\"\n ],\n \"solution_diff\": \"diff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\\nindex 195ab89c8c72..f576865cb845 100755\\n--- a/bundle/docker/linux/build.sh\\n+++ b/bundle/docker/linux/build.sh\\n@@ -14,8 +14,8 @@ export PYTHONPATH\\n # shellcheck disable=SC1091\\n source .venv/bin/activate\\n \\n-python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-pyinstaller.txt\\\"\\n-python -m pip install -U --require-hashes -r \\\"bundle/requirements/requirements-${REQUIREMENTS}.txt\\\"\\n+python -m pip install -U --require-hashes -r \\\"bundle/requirements/pyinstaller.txt\\\"\\n+python -m pip install -U --require-hashes -r \\\"bundle/requirements/${REQUIREMENTS}.txt\\\"\\n python -m devscripts.make_lazy_extractors\\n python devscripts/update-version.py -c \\\"${CHANNEL}\\\" -r \\\"${ORIGIN}\\\" \\\"${VERSION}\\\"\\n \\n\",\n \"summary\": \"Edited 1 file(s) in bundle/docker/linux/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"bundle/requirements/build.txt\",\n \"bundle/requirements/curl-cffi.txt\",\n \"bundle/requirements/default.txt\",\n \"bundle/requirements/delocate.txt\",\n \"bundle/requirements/dev.txt\",\n \"bundle/requirements/linux.txt\",\n \"bundle/requirements/macos-curl_cffi.txt\",\n \"bundle/requirements/macos.txt\",\n \"bundle/requirements/pip.txt\",\n \"bundle/requirements/pyflakes.txt\",\n \"bundle/requirements/pyinstaller.txt\",\n \"bundle/requirements/static-analysis.txt\",\n \"bundle/requirements/test.txt\",\n \"bundle/requirements/uv.txt\",\n \"bundle/requirements/win-arm64-pyinstaller.txt\",\n \"bundle/requirements/win-x64-pyinstaller.txt\",\n \"bundle/requirements/win-x86-pyinstaller.txt\"\n ],\n \"solution_diff\": \"diff --git a/bundle/requirements/requirements-build.txt b/bundle/requirements/build.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-build.txt\\nrename to bundle/requirements/build.txt\\ndiff --git a/bundle/requirements/requirements-curl-cffi.txt b/bundle/requirements/curl-cffi.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-curl-cffi.txt\\nrename to bundle/requirements/curl-cffi.txt\\ndiff --git a/bundle/requirements/requirements-default.txt b/bundle/requirements/default.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-default.txt\\nrename to bundle/requirements/default.txt\\ndiff --git a/bundle/requirements/requirements-delocate.txt b/bundle/requirements/delocate.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-delocate.txt\\nrename to bundle/requirements/delocate.txt\\ndiff --git a/bundle/requirements/requirements-dev.txt b/bundle/requirements/dev.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-dev.txt\\nrename to bundle/requirements/dev.txt\\ndiff --git a/bundle/requirements/requirements-linux.txt b/bundle/requirements/linux.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-linux.txt\\nrename to bundle/requirements/linux.txt\\ndiff --git a/bundle/requirements/requirements-macos-curl_cffi.txt b/bundle/requirements/macos-curl_cffi.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-macos-curl_cffi.txt\\nrename to bundle/requirements/macos-curl_cffi.txt\\ndiff --git a/bundle/requirements/requirements-macos.txt b/bundle/requirements/macos.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-macos.txt\\nrename to bundle/requirements/macos.txt\\ndiff --git a/bundle/requirements/requirements-pip.txt b/bundle/requirements/pip.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-pip.txt\\nrename to bundle/requirements/pip.txt\\ndiff --git a/bundle/requirements/requirements-pyflakes.txt b/bundle/requirements/pyflakes.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-pyflakes.txt\\nrename to bundle/requirements/pyflakes.txt\\ndiff --git a/bundle/requirements/requirements-pyinstaller.txt b/bundle/requirements/pyinstaller.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-pyinstaller.txt\\nrename to bundle/requirements/pyinstaller.txt\\ndiff --git a/bundle/requirements/requirements-static-analysis.txt b/bundle/requirements/static-analysis.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-static-analysis.txt\\nrename to bundle/requirements/static-analysis.txt\\ndiff --git a/bundle/requirements/requirements-test.txt b/bundle/requirements/test.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-test.txt\\nrename to bundle/requirements/test.txt\\ndiff --git a/bundle/requirements/requirements-uv.txt b/bundle/requirements/uv.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-uv.txt\\nrename to bundle/requirements/uv.txt\\ndiff --git a/bundle/requirements/requirements-win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-win-arm64-pyinstaller.txt\\nrename to bundle/requirements/win-arm64-pyinstaller.txt\\ndiff --git a/bundle/requirements/requirements-win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-win-x64-pyinstaller.txt\\nrename to bundle/requirements/win-x64-pyinstaller.txt\\ndiff --git a/bundle/requirements/requirements-win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\\nsimilarity index 100%\\nrename from bundle/requirements/requirements-win-x86-pyinstaller.txt\\nrename to bundle/requirements/win-x86-pyinstaller.txt\\n\",\n \"summary\": \"Edited 17 file(s) in bundle/requirements/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"devscripts/update_requirements.py\"\n ],\n \"solution_diff\": \"diff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\\nindex b1e430eb065f..7231e8bdafaa 100755\\n--- a/devscripts/update_requirements.py\\n+++ b/devscripts/update_requirements.py\\n@@ -34,7 +34,7 @@\\n MAKEFILE_PATH = BASE_PATH / 'Makefile'\\n LOCKFILE_PATH = BASE_PATH / 'uv.lock'\\n REQUIREMENTS_PATH = BASE_PATH / 'bundle/requirements'\\n-REQS_OUTPUT_TMPL = 'requirements-{}.txt'\\n+REQS_OUTPUT_TMPL = '{}.txt'\\n \\n EXTRAS_TABLE = 'project.optional-dependencies'\\n GROUPS_TABLE = 'dependency-groups'\\n@@ -544,11 +544,11 @@ def package_diff_dict(\\n return ret_dict\\n \\n \\n-def get_lock_packages(lock: dict[str, typing.Any]) -> dict[str, str]:\\n+def get_lock_packages(lock: dict[str, typing.Any], ignore_names: list[str] | None = None) -> dict[str, str]:\\n return {\\n package['name']: package['version']\\n for package in lock['package']\\n- if package.get('version')\\n+ if package.get('version') and package['name'] not in (ignore_names or [])\\n }\\n \\n \\n@@ -578,6 +578,7 @@ def update_requirements(\\n \\n pyproject_text = PYPROJECT_PATH.read_text()\\n pyproject_toml = parse_toml(pyproject_text)\\n+ package_name = pyproject_toml['project']['name']\\n extras = get_extras(pyproject_toml)\\n \\n # Remove pinned extras so they don't muck up the lockfile during generation/upgrade\\n@@ -603,8 +604,8 @@ def update_requirements(\\n run_process('uv', 'lock', upgrade_arg, env=env)\\n \\n # Record diff in uv.lock packages\\n- old_packages = get_lock_packages(old_lock) if old_lock else {}\\n- new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()))\\n+ old_packages = get_lock_packages(old_lock, [package_name]) if old_lock else {}\\n+ new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()), [package_name])\\n all_updates = package_diff_dict(old_packages, new_packages)\\n \\n # Update Windows PyInstaller requirements; need to compare before & after .txt's for reporting\\n\",\n \"summary\": \"Edited 1 file(s) in devscripts/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex ecb335433747..a45a4b4e158f 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -325,7 +325,7 @@ jobs:\n brew uninstall --ignore-dependencies python3\n python3 -m venv ~/yt-dlp-build-venv\n source ~/yt-dlp-build-venv/bin/activate\n- python3 -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n+ python3 -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n rm -rf build\n # Only directly install wheels for \"macosx_10_15_universal2\" and \"any\" platforms\n mkdir -p build/wheels\n@@ -335,7 +335,7 @@ jobs:\n --platform=any \\\n -d build/wheels \\\n --require-hashes \\\n- -r \"bundle/requirements/requirements-macos.txt\"\n+ -r \"bundle/requirements/macos.txt\"\n python3 -m pip install --force-reinstall --no-deps -U build/wheels/*.whl\n rm -rf build/wheels/*\n # We need to fuse our own universal2 wheels for curl_cffi and cffi\n@@ -347,7 +347,7 @@ jobs:\n --platform \"${platform}\" \\\n -d build/wheels \\\n --require-hashes \\\n- -r \"bundle/requirements/requirements-macos-curl_cffi.txt\"\n+ -r \"bundle/requirements/macos-curl_cffi.txt\"\n done\n python3 -m delocate.cmd.delocate_merge build/wheels/curl_cffi-*.whl -w build/universal2\n python3 -m delocate.cmd.delocate_merge build/wheels/cffi-*.whl -w build/universal2\n@@ -456,12 +456,12 @@ jobs:\n $PSNativeCommandUseErrorActionPreference = $true\n python -m venv /yt-dlp-build-venv\n /yt-dlp-build-venv/Scripts/Activate.ps1\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-win-${Env:ARCH}-pyinstaller.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/win-${Env:ARCH}-pyinstaller.txt\"\n if (${Env:ARCH} -eq \"x86\") {\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n } else {\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-curl-cffi.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/curl-cffi.txt\"\n }\n \n - name: Prepare\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex b58b82cb32b0..287a115bd10d 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -79,9 +79,9 @@ jobs:\n - name: Install test requirements\n shell: bash\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n - name: Run tests\n timeout-minutes: 15\n shell: bash\ndiff --git a/.github/workflows/core.yml b/.github/workflows/core.yml\nindex ea212d8b45e1..256d1877986f 100644\n--- a/.github/workflows/core.yml\n+++ b/.github/workflows/core.yml\n@@ -75,16 +75,16 @@ jobs:\n - name: Install test requirements (cpython)\n if: ${{ !startsWith(matrix.python-version, 'pypy') }}\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-curl-cffi.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/curl-cffi.txt\"\n \n - name: Install test requirements (PyPy)\n if: ${{ startsWith(matrix.python-version, 'pypy') }}\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-default.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/default.txt\"\n \n - name: Run tests\n timeout-minutes: 15\ndiff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml\nindex 908c967f8225..653971d8e79f 100644\n--- a/.github/workflows/quick-test.yml\n+++ b/.github/workflows/quick-test.yml\n@@ -31,8 +31,8 @@ jobs:\n - name: Install test requirements\n shell: bash\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n - name: Run tests\n timeout-minutes: 15\n shell: bash\n@@ -56,8 +56,8 @@ jobs:\n python-version: '3.14'\n - name: Install dev dependencies\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-static-analysis.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/static-analysis.txt\"\n - name: Make lazy extractors\n run: python ./devscripts/make_lazy_extractors.py\n - name: Run ruff\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 84082cc03223..9d926d9d349b 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -185,8 +185,8 @@ jobs:\n - name: Install Requirements\n run: |\n sudo apt -y install pandoc man\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-build.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/build.txt\"\n \n - name: Prepare\n env:\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 248b5a16c0fd..ada6ffa24052 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -36,9 +36,9 @@ jobs:\n \n - name: Install Python dependencies\n run: |\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pip.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pyflakes.txt\"\n- python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-test.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pip.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/pyflakes.txt\"\n+ python -m pip install -U --require-hashes -r \"bundle/requirements/test.txt\"\n \n - name: Install requirements\n env:\ndiff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\nindex 195ab89c8c72..f576865cb845 100755\n--- a/bundle/docker/linux/build.sh\n+++ b/bundle/docker/linux/build.sh\n@@ -14,8 +14,8 @@ export PYTHONPATH\n # shellcheck disable=SC1091\n source .venv/bin/activate\n \n-python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-pyinstaller.txt\"\n-python -m pip install -U --require-hashes -r \"bundle/requirements/requirements-${REQUIREMENTS}.txt\"\n+python -m pip install -U --require-hashes -r \"bundle/requirements/pyinstaller.txt\"\n+python -m pip install -U --require-hashes -r \"bundle/requirements/${REQUIREMENTS}.txt\"\n python -m devscripts.make_lazy_extractors\n python devscripts/update-version.py -c \"${CHANNEL}\" -r \"${ORIGIN}\" \"${VERSION}\"\n \ndiff --git a/bundle/requirements/requirements-build.txt b/bundle/requirements/build.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-build.txt\nrename to bundle/requirements/build.txt\ndiff --git a/bundle/requirements/requirements-curl-cffi.txt b/bundle/requirements/curl-cffi.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-curl-cffi.txt\nrename to bundle/requirements/curl-cffi.txt\ndiff --git a/bundle/requirements/requirements-default.txt b/bundle/requirements/default.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-default.txt\nrename to bundle/requirements/default.txt\ndiff --git a/bundle/requirements/requirements-delocate.txt b/bundle/requirements/delocate.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-delocate.txt\nrename to bundle/requirements/delocate.txt\ndiff --git a/bundle/requirements/requirements-dev.txt b/bundle/requirements/dev.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-dev.txt\nrename to bundle/requirements/dev.txt\ndiff --git a/bundle/requirements/requirements-linux.txt b/bundle/requirements/linux.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-linux.txt\nrename to bundle/requirements/linux.txt\ndiff --git a/bundle/requirements/requirements-macos-curl_cffi.txt b/bundle/requirements/macos-curl_cffi.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-macos-curl_cffi.txt\nrename to bundle/requirements/macos-curl_cffi.txt\ndiff --git a/bundle/requirements/requirements-macos.txt b/bundle/requirements/macos.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-macos.txt\nrename to bundle/requirements/macos.txt\ndiff --git a/bundle/requirements/requirements-pip.txt b/bundle/requirements/pip.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pip.txt\nrename to bundle/requirements/pip.txt\ndiff --git a/bundle/requirements/requirements-pyflakes.txt b/bundle/requirements/pyflakes.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pyflakes.txt\nrename to bundle/requirements/pyflakes.txt\ndiff --git a/bundle/requirements/requirements-pyinstaller.txt b/bundle/requirements/pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-pyinstaller.txt\nrename to bundle/requirements/pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-static-analysis.txt b/bundle/requirements/static-analysis.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-static-analysis.txt\nrename to bundle/requirements/static-analysis.txt\ndiff --git a/bundle/requirements/requirements-test.txt b/bundle/requirements/test.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-test.txt\nrename to bundle/requirements/test.txt\ndiff --git a/bundle/requirements/requirements-uv.txt b/bundle/requirements/uv.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-uv.txt\nrename to bundle/requirements/uv.txt\ndiff --git a/bundle/requirements/requirements-win-arm64-pyinstaller.txt b/bundle/requirements/win-arm64-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-arm64-pyinstaller.txt\nrename to bundle/requirements/win-arm64-pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-win-x64-pyinstaller.txt b/bundle/requirements/win-x64-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-x64-pyinstaller.txt\nrename to bundle/requirements/win-x64-pyinstaller.txt\ndiff --git a/bundle/requirements/requirements-win-x86-pyinstaller.txt b/bundle/requirements/win-x86-pyinstaller.txt\nsimilarity index 100%\nrename from bundle/requirements/requirements-win-x86-pyinstaller.txt\nrename to bundle/requirements/win-x86-pyinstaller.txt\ndiff --git a/devscripts/update_requirements.py b/devscripts/update_requirements.py\nindex b1e430eb065f..7231e8bdafaa 100755\n--- a/devscripts/update_requirements.py\n+++ b/devscripts/update_requirements.py\n@@ -34,7 +34,7 @@\n MAKEFILE_PATH = BASE_PATH / 'Makefile'\n LOCKFILE_PATH = BASE_PATH / 'uv.lock'\n REQUIREMENTS_PATH = BASE_PATH / 'bundle/requirements'\n-REQS_OUTPUT_TMPL = 'requirements-{}.txt'\n+REQS_OUTPUT_TMPL = '{}.txt'\n \n EXTRAS_TABLE = 'project.optional-dependencies'\n GROUPS_TABLE = 'dependency-groups'\n@@ -544,11 +544,11 @@ def package_diff_dict(\n return ret_dict\n \n \n-def get_lock_packages(lock: dict[str, typing.Any]) -> dict[str, str]:\n+def get_lock_packages(lock: dict[str, typing.Any], ignore_names: list[str] | None = None) -> dict[str, str]:\n return {\n package['name']: package['version']\n for package in lock['package']\n- if package.get('version')\n+ if package.get('version') and package['name'] not in (ignore_names or [])\n }\n \n \n@@ -578,6 +578,7 @@ def update_requirements(\n \n pyproject_text = PYPROJECT_PATH.read_text()\n pyproject_toml = parse_toml(pyproject_text)\n+ package_name = pyproject_toml['project']['name']\n extras = get_extras(pyproject_toml)\n \n # Remove pinned extras so they don't muck up the lockfile during generation/upgrade\n@@ -603,8 +604,8 @@ def update_requirements(\n run_process('uv', 'lock', upgrade_arg, env=env)\n \n # Record diff in uv.lock packages\n- old_packages = get_lock_packages(old_lock) if old_lock else {}\n- new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()))\n+ old_packages = get_lock_packages(old_lock, [package_name]) if old_lock else {}\n+ new_packages = get_lock_packages(parse_toml(LOCKFILE_PATH.read_text()), [package_name])\n all_updates = package_diff_dict(old_packages, new_packages)\n \n # Update Windows PyInstaller requirements; need to compare before & after .txt's for reporting\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":25,"string":"25"}}},{"rowIdx":34294,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16738"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16738,"string":"16,738"},"base_sha":{"kind":"string","value":"a85b38621286903b9124fdb05d177983d8273ec7"},"head_sha":{"kind":"string","value":"99a66bd7960e8eb7ad5570eec7d562e036649302"},"task":{"kind":"string","value":"[build] Upgrade all Linux binaries to Python 3.14\n\nPer https://www.python.org/downloads/release/python-3145/ :\r\n\r\n> Notably, the garbage collector (GC) has changed in Python 3.14.5.\r\n> \r\n> The incremental garbage collector shipped in Python 3.14.0-3.14.4 has been reverted back to the generational garbage collector from 3.13, due to a number of [reports](https://github.com/python/cpython/issues/142516) of significant memory pressure in production environments.\r\n\r\nThe above-referenced GC issue is why I had been hesitant to move most of our binaries to Python 3.14.x. Now that the problem has been solved (by reverting to the generational GC), I feel confident in bumping all of the `_linux*` binaries.\r\n\r\nRef:\r\n\r\n- https://github.com/yt-dlp/manylinux-shared/commit/a42da7942908877b8ca7579c020e6d6aba7d18c6\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Build maintenance\r\n\r\n</details>\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [build] Upgrade all Linux binaries to Python 3.14","scope_files":[".github/workflows/build.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `bundle/docker/linux/` needed for: [build] Upgrade all Linux binaries to Python 3.14","scope_files":["bundle/docker/linux/build.sh"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [build] Upgrade all Linux binaries to Python 3.14\",\n \"scope_files\": [\n \".github/workflows/build.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `bundle/docker/linux/` needed for: [build] Upgrade all Linux binaries to Python 3.14\",\n \"scope_files\": [\n \"bundle/docker/linux/build.sh\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/build.yml"],"solution_diff":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex 2f76e0494d4a..ecb335433747 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -124,7 +124,7 @@ jobs:\n id: linux_matrix\n env:\n INPUTS: ${{ toJSON(inputs) }}\n- PYTHON_VERSION: '3.13'\n+ PYTHON_VERSION: '3.14'\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n shell: python\n run: |\n@@ -152,12 +152,10 @@ jobs:\n 'os': 'musllinux',\n 'arch': 'x86_64',\n 'runner': 'ubuntu-24.04',\n- 'python_version': '3.14',\n }, {\n 'os': 'musllinux',\n 'arch': 'aarch64',\n 'runner': 'ubuntu-24.04-arm',\n- 'python_version': '3.14',\n }],\n }\n INPUTS = json.loads(os.environ['INPUTS'])\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["bundle/docker/linux/build.sh"],"solution_diff":"diff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\nindex e36976db4187..195ab89c8c72 100755\n--- a/bundle/docker/linux/build.sh\n+++ b/bundle/docker/linux/build.sh\n@@ -2,7 +2,7 @@\n set -exuo pipefail\n \n if [[ -z \"${PYTHON_VERSION:-}\" ]]; then\n- PYTHON_VERSION=\"3.13\"\n+ PYTHON_VERSION=\"3.14\"\n echo \"Defaulting to using Python ${PYTHON_VERSION}\"\n fi\n \n","summary":"Edited 1 file(s) in bundle/docker/linux/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/build.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\\nindex 2f76e0494d4a..ecb335433747 100644\\n--- a/.github/workflows/build.yml\\n+++ b/.github/workflows/build.yml\\n@@ -124,7 +124,7 @@ jobs:\\n id: linux_matrix\\n env:\\n INPUTS: ${{ toJSON(inputs) }}\\n- PYTHON_VERSION: '3.13'\\n+ PYTHON_VERSION: '3.14'\\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\\n shell: python\\n run: |\\n@@ -152,12 +152,10 @@ jobs:\\n 'os': 'musllinux',\\n 'arch': 'x86_64',\\n 'runner': 'ubuntu-24.04',\\n- 'python_version': '3.14',\\n }, {\\n 'os': 'musllinux',\\n 'arch': 'aarch64',\\n 'runner': 'ubuntu-24.04-arm',\\n- 'python_version': '3.14',\\n }],\\n }\\n INPUTS = json.loads(os.environ['INPUTS'])\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"bundle/docker/linux/build.sh\"\n ],\n \"solution_diff\": \"diff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\\nindex e36976db4187..195ab89c8c72 100755\\n--- a/bundle/docker/linux/build.sh\\n+++ b/bundle/docker/linux/build.sh\\n@@ -2,7 +2,7 @@\\n set -exuo pipefail\\n \\n if [[ -z \\\"${PYTHON_VERSION:-}\\\" ]]; then\\n- PYTHON_VERSION=\\\"3.13\\\"\\n+ PYTHON_VERSION=\\\"3.14\\\"\\n echo \\\"Defaulting to using Python ${PYTHON_VERSION}\\\"\\n fi\\n \\n\",\n \"summary\": \"Edited 1 file(s) in bundle/docker/linux/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex 2f76e0494d4a..ecb335433747 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -124,7 +124,7 @@ jobs:\n id: linux_matrix\n env:\n INPUTS: ${{ toJSON(inputs) }}\n- PYTHON_VERSION: '3.13'\n+ PYTHON_VERSION: '3.14'\n UPDATE_TO: yt-dlp/yt-dlp@2025.09.05\n shell: python\n run: |\n@@ -152,12 +152,10 @@ jobs:\n 'os': 'musllinux',\n 'arch': 'x86_64',\n 'runner': 'ubuntu-24.04',\n- 'python_version': '3.14',\n }, {\n 'os': 'musllinux',\n 'arch': 'aarch64',\n 'runner': 'ubuntu-24.04-arm',\n- 'python_version': '3.14',\n }],\n }\n INPUTS = json.loads(os.environ['INPUTS'])\ndiff --git a/bundle/docker/linux/build.sh b/bundle/docker/linux/build.sh\nindex e36976db4187..195ab89c8c72 100755\n--- a/bundle/docker/linux/build.sh\n+++ b/bundle/docker/linux/build.sh\n@@ -2,7 +2,7 @@\n set -exuo pipefail\n \n if [[ -z \"${PYTHON_VERSION:-}\" ]]; then\n- PYTHON_VERSION=\"3.13\"\n+ PYTHON_VERSION=\"3.14\"\n echo \"Defaulting to using Python ${PYTHON_VERSION}\"\n fi\n \n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34295,"cells":{"task_id":{"kind":"string","value":"yt-dlp/yt-dlp#16384"},"repo":{"kind":"string","value":"yt-dlp/yt-dlp"},"pr_number":{"kind":"number","value":16384,"string":"16,384"},"base_sha":{"kind":"string","value":"c8695f52a91f0d2aabbba7b7200c1099bfa9a3e5"},"head_sha":{"kind":"string","value":"ddc22504a056fd7f7729a9e532cee3c830ccb53d"},"task":{"kind":"string","value":"[ci] Update 8 actions in 7 workflows\n\n<!--\r\n\r\n[ci] Update 8 actions in 7 workflows\r\n\r\n* Bump actions/cache v5.0.3 => v5.0.5\r\n* Bump actions/setup-node v6.3.0 => v6.4.0\r\n* Bump actions/upload-artifact v7.0.0 => v7.0.1\r\n* Bump denoland/setup-deno v2.0.3 => v2.0.4\r\n* Bump github/codeql-action v4.33.0 => v4.35.2\r\n* Bump pypa/gh-action-pypi-publish v1.13.0 => v1.14.0\r\n* Bump rhysd/actionlint 1.7.11 => 1.7.12\r\n* Bump zizmorcore/zizmor-action v0.5.2 => v0.5.3\r\n\r\nAuthored by: bashonly\r\n\r\n\r\n-->\r\n\r\n<!-- BEGIN dlp-bot generated section -->\r\n\r\naction | old | new | diff\r\n-------|-----|-----|-----\r\n[**`actions/cache`**](<https://github.com/actions/cache>) | [v5.0.***3***](<https://github.com/actions/cache/releases/tag/v5.0.3>) | [v5.0.***5***](<https://github.com/actions/cache/releases/tag/v5.0.5>) | [`cdf6c1f...27d5ce7`](<https://github.com/actions/cache/compare/cdf6c1fa76f9f475f3d7449005a359c84ca0f306...27d5ce7f107fe9357f9df03efb73ab90386fccae>)\r\n[**`actions/setup-node`**](<https://github.com/actions/setup-node>) | [v6.***3.0***](<https://github.com/actions/setup-node/releases/tag/v6.3.0>) | [v6.***4.0***](<https://github.com/actions/setup-node/releases/tag/v6.4.0>) | [`53b8394...48b55a0`](<https://github.com/actions/setup-node/compare/53b83947a5a98c8d113130e565377fae1a50d02f...48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e>)\r\n[**`actions/upload-artifact`**](<https://github.com/actions/upload-artifact>) | [v7.0.***0***](<https://github.com/actions/upload-artifact/releases/tag/v7.0.0>) | [v7.0.***1***](<https://github.com/actions/upload-artifact/releases/tag/v7.0.1>) | [`bbbca2d...043fb46`](<https://github.com/actions/upload-artifact/compare/bbbca2ddaa5d8feaa63e36b76fdaad77386f024f...043fb46d1a93c77aae656e7c1c64a875d1fc6a0a>)\r\n[**`denoland/setup-deno`**](<https://github.com/denoland/setup-deno>) | [v2.0.***3***](<https://github.com/denoland/setup-deno/releases/tag/v2.0.3>) | [v2.0.***4***](<https://github.com/denoland/setup-deno/releases/tag/v2.0.4>) | [`e95548e...667a34c`](<https://github.com/denoland/setup-deno/compare/e95548e56dfa95d4e1a28d6f422fafe75c4c26fb...667a34cdef165d8d2b2e98dde39547c9daac7282>)\r\n[**`github/codeql-action`**](<https://github.com/github/codeql-action>) | [v4.***33.0***](<https://github.com/github/codeql-action/releases/tag/v4.33.0>) | [v4.***35.2***](<https://github.com/github/codeql-action/releases/tag/v4.35.2>) | [`b1bff81...95e58e9`](<https://github.com/github/codeql-action/compare/b1bff81932f5cdfc8695c7752dcee935dcd061c8...95e58e9a2cdfd71adc6e0353d5c52f41a045d225>)\r\n[**`pypa/gh-action-pypi-publish`**](<https://github.com/pypa/gh-action-pypi-publish>) | [v1.***13.0***](<https://github.com/pypa/gh-action-pypi-publish/releases/tag/v1.13.0>) | [v1.***14.0***](<https://github.com/pypa/gh-action-pypi-publish/releases/tag/v1.14.0>) | [`ed0c539...cef2210`](<https://github.com/pypa/gh-action-pypi-publish/compare/ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e...cef221092ed1bacb1cc03d23a2d87d1d172e277b>)\r\n[**`rhysd/actionlint`**](<https://github.com/rhysd/actionlint>) | [v1.7.***11***](<https://github.com/rhysd/actionlint/releases/tag/v1.7.11>) | [v1.7.***12***](<https://github.com/rhysd/actionlint/releases/tag/v1.7.12>) | [`v1.7.11...v1.7.12`](<https://github.com/rhysd/actionlint/compare/v1.7.11...v1.7.12>)\r\n[**`zizmorcore/zizmor-action`**](<https://github.com/zizmorcore/zizmor-action>) | [v0.5.***2***](<https://github.com/zizmorcore/zizmor-action/releases/tag/v0.5.2>) | [v0.5.***3***](<https://github.com/zizmorcore/zizmor-action/releases/tag/v0.5.3>) | [`71321a2...b1d7e1f`](<https://github.com/zizmorcore/zizmor-action/compare/71321a20a9ded102f6e9ce5718a2fcec2c4f70d8...b1d7e1fb5de872772f31590499237e7cce841e8e>)\r\n\r\nworkflow | updates\r\n---------|--------\r\n**`build.yml`** | `actions/upload-artifact`\r\n**`challenge-tests.yml`** | `denoland/setup-deno`, `actions/setup-node`\r\n**`codeql.yml`** | `github/codeql-action`\r\n**`release-master.yml`** | `pypa/gh-action-pypi-publish`\r\n**`release-nightly.yml`** | `pypa/gh-action-pypi-publish`, `actions/cache`\r\n**`release.yml`** | `actions/upload-artifact`, `pypa/gh-action-pypi-publish`\r\n**`test-workflows.yml`** | `zizmorcore/zizmor-action`, `rhysd/actionlint`\r\n\r\n<!-- END dlp-bot generated section -->\r\n\r\n\r\n\r\n<details open><summary>Template</summary> <!-- OPEN is intentional -->\r\n\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)\r\n- [x] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n\r\n### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:\r\n- [x] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)\r\n- [x] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/): This pull request was created by a bot that was written by the maintainers of this project\r\n\r\n### What is the purpose of your *pull request*? Check those that apply and remove the others:\r\n- [x] Automated maintenance\r\n\r\n</details>"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [ci] Update 8 actions in 7 workflows","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/codeql.yml",".github/workflows/release-master.yml",".github/workflows/release-nightly.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [ci] Update 8 actions in 7 workflows\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/codeql.yml\",\n \".github/workflows/release-master.yml\",\n \".github/workflows/release-nightly.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/build.yml",".github/workflows/challenge-tests.yml",".github/workflows/codeql.yml",".github/workflows/release-master.yml",".github/workflows/release-nightly.yml",".github/workflows/release.yml",".github/workflows/test-workflows.yml"],"solution_diff":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex b02c7280aa31..2f76e0494d4a 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -231,7 +231,7 @@ jobs:\n [[ \"${version}\" != \"${downgraded_version}\" ]]\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}\n path: |\n@@ -293,7 +293,7 @@ jobs:\n docker compose up --build --exit-code-from \"${SERVICE}\" \"${SERVICE}\"\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ matrix.os }}_${{ matrix.arch }}\n path: |\n@@ -378,7 +378,7 @@ jobs:\n [[ \"$version\" != \"$downgraded_version\" ]]\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}\n path: |\n@@ -500,7 +500,7 @@ jobs:\n }\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}-${{ matrix.arch }}\n path: |\n@@ -590,7 +590,7 @@ jobs:\n done\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-${{ github.job }}\n path: |\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 1ceba11380b2..b58b82cb32b0 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -48,7 +48,7 @@ jobs:\n with:\n python-version: ${{ matrix.python-version }}\n - name: Install Deno\n- uses: denoland/setup-deno@e95548e56dfa95d4e1a28d6f422fafe75c4c26fb # v2.0.3\n+ uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\n deno-version: '2.0.0' # minimum supported version\n - name: Install Bun\n@@ -58,7 +58,7 @@ jobs:\n bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\n no-cache: true\n - name: Install Node\n- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0\n+ uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\n with:\n node-version: '20.0' # minimum supported version\n - name: Install QuickJS (Linux)\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 44b1623a154d..7a048015d8f5 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -36,12 +36,12 @@ jobs:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\n+ uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\n+ uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml\nindex 6e7fa43edef8..eb75a72159da 100644\n--- a/.github/workflows/release-master.yml\n+++ b/.github/workflows/release-master.yml\n@@ -47,6 +47,6 @@ jobs:\n path: dist\n name: build-pypi\n - name: Publish to PyPI\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\nindex 14ac9bfc5318..a91e3a43bce5 100644\n--- a/.github/workflows/release-nightly.yml\n+++ b/.github/workflows/release-nightly.yml\n@@ -27,7 +27,7 @@ jobs:\n run: echo \"head=$(git rev-parse HEAD)\" | tee -a \"${GITHUB_OUTPUT}\"\n \n - name: Cache nightly commit hash\n- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3\n+ uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5\n env:\n SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1\n with:\n@@ -100,6 +100,6 @@ jobs:\n name: build-pypi\n \n - name: Publish to PyPI\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 3c92dac3ca22..84082cc03223 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -215,7 +215,7 @@ jobs:\n \n - name: Upload artifacts\n if: github.event.workflow != '.github/workflows/release.yml' # Reusable workflow_call\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-pypi\n path: |\n@@ -224,7 +224,7 @@ jobs:\n \n - name: Publish to PyPI\n if: github.event.workflow == '.github/workflows/release.yml' # Direct workflow_dispatch\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\n \ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 28832a3abe1c..248b5a16c0fd 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -13,8 +13,8 @@ concurrency:\n cancel-in-progress: ${{ github.event_name == 'pull_request' }}\n \n env:\n- ACTIONLINT_VERSION: \"1.7.11\"\n- ACTIONLINT_SHA256SUM: 900919a84f2229bac68ca9cd4103ea297abc35e9689ebb842c6e34a3d1b01b0a\n+ ACTIONLINT_VERSION: \"1.7.12\"\n+ ACTIONLINT_SHA256SUM: 8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8\n ACTIONLINT_REPO: rhysd/actionlint\n GH_TELEMETRY: \"false\"\n \n@@ -83,7 +83,7 @@ jobs:\n persist-credentials: false\n \n - name: Run zizmor\n- uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2\n+ uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\n with:\n advanced-security: false\n persona: pedantic\n","summary":"Edited 7 file(s) in .github/workflows/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/build.yml\",\n \".github/workflows/challenge-tests.yml\",\n \".github/workflows/codeql.yml\",\n \".github/workflows/release-master.yml\",\n \".github/workflows/release-nightly.yml\",\n \".github/workflows/release.yml\",\n \".github/workflows/test-workflows.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\\nindex b02c7280aa31..2f76e0494d4a 100644\\n--- a/.github/workflows/build.yml\\n+++ b/.github/workflows/build.yml\\n@@ -231,7 +231,7 @@ jobs:\\n [[ \\\"${version}\\\" != \\\"${downgraded_version}\\\" ]]\\n \\n - name: Upload artifacts\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-bin-${{ github.job }}\\n path: |\\n@@ -293,7 +293,7 @@ jobs:\\n docker compose up --build --exit-code-from \\\"${SERVICE}\\\" \\\"${SERVICE}\\\"\\n \\n - name: Upload artifacts\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-bin-${{ matrix.os }}_${{ matrix.arch }}\\n path: |\\n@@ -378,7 +378,7 @@ jobs:\\n [[ \\\"$version\\\" != \\\"$downgraded_version\\\" ]]\\n \\n - name: Upload artifacts\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-bin-${{ github.job }}\\n path: |\\n@@ -500,7 +500,7 @@ jobs:\\n }\\n \\n - name: Upload artifacts\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-bin-${{ github.job }}-${{ matrix.arch }}\\n path: |\\n@@ -590,7 +590,7 @@ jobs:\\n done\\n \\n - name: Upload artifacts\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-${{ github.job }}\\n path: |\\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\\nindex 1ceba11380b2..b58b82cb32b0 100644\\n--- a/.github/workflows/challenge-tests.yml\\n+++ b/.github/workflows/challenge-tests.yml\\n@@ -48,7 +48,7 @@ jobs:\\n with:\\n python-version: ${{ matrix.python-version }}\\n - name: Install Deno\\n- uses: denoland/setup-deno@e95548e56dfa95d4e1a28d6f422fafe75c4c26fb # v2.0.3\\n+ uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\\n with:\\n deno-version: '2.0.0' # minimum supported version\\n - name: Install Bun\\n@@ -58,7 +58,7 @@ jobs:\\n bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\\n no-cache: true\\n - name: Install Node\\n- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0\\n+ uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\\n with:\\n node-version: '20.0' # minimum supported version\\n - name: Install QuickJS (Linux)\\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\\nindex 44b1623a154d..7a048015d8f5 100644\\n--- a/.github/workflows/codeql.yml\\n+++ b/.github/workflows/codeql.yml\\n@@ -36,12 +36,12 @@ jobs:\\n persist-credentials: false\\n \\n - name: Initialize CodeQL\\n- uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\\n+ uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\\n with:\\n languages: ${{ matrix.language }}\\n build-mode: none\\n \\n - name: Perform CodeQL Analysis\\n- uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\\n+ uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\\n with:\\n category: \\\"/language:${{matrix.language}}\\\"\\ndiff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml\\nindex 6e7fa43edef8..eb75a72159da 100644\\n--- a/.github/workflows/release-master.yml\\n+++ b/.github/workflows/release-master.yml\\n@@ -47,6 +47,6 @@ jobs:\\n path: dist\\n name: build-pypi\\n - name: Publish to PyPI\\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\\n with:\\n verbose: true\\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\\nindex 14ac9bfc5318..a91e3a43bce5 100644\\n--- a/.github/workflows/release-nightly.yml\\n+++ b/.github/workflows/release-nightly.yml\\n@@ -27,7 +27,7 @@ jobs:\\n run: echo \\\"head=$(git rev-parse HEAD)\\\" | tee -a \\\"${GITHUB_OUTPUT}\\\"\\n \\n - name: Cache nightly commit hash\\n- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3\\n+ uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5\\n env:\\n SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1\\n with:\\n@@ -100,6 +100,6 @@ jobs:\\n name: build-pypi\\n \\n - name: Publish to PyPI\\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\\n with:\\n verbose: true\\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\\nindex 3c92dac3ca22..84082cc03223 100644\\n--- a/.github/workflows/release.yml\\n+++ b/.github/workflows/release.yml\\n@@ -215,7 +215,7 @@ jobs:\\n \\n - name: Upload artifacts\\n if: github.event.workflow != '.github/workflows/release.yml' # Reusable workflow_call\\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\\n with:\\n name: build-pypi\\n path: |\\n@@ -224,7 +224,7 @@ jobs:\\n \\n - name: Publish to PyPI\\n if: github.event.workflow == '.github/workflows/release.yml' # Direct workflow_dispatch\\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\\n with:\\n verbose: true\\n \\ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\\nindex 28832a3abe1c..248b5a16c0fd 100644\\n--- a/.github/workflows/test-workflows.yml\\n+++ b/.github/workflows/test-workflows.yml\\n@@ -13,8 +13,8 @@ concurrency:\\n cancel-in-progress: ${{ github.event_name == 'pull_request' }}\\n \\n env:\\n- ACTIONLINT_VERSION: \\\"1.7.11\\\"\\n- ACTIONLINT_SHA256SUM: 900919a84f2229bac68ca9cd4103ea297abc35e9689ebb842c6e34a3d1b01b0a\\n+ ACTIONLINT_VERSION: \\\"1.7.12\\\"\\n+ ACTIONLINT_SHA256SUM: 8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8\\n ACTIONLINT_REPO: rhysd/actionlint\\n GH_TELEMETRY: \\\"false\\\"\\n \\n@@ -83,7 +83,7 @@ jobs:\\n persist-credentials: false\\n \\n - name: Run zizmor\\n- uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2\\n+ uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\\n with:\\n advanced-security: false\\n persona: pedantic\\n\",\n \"summary\": \"Edited 7 file(s) in .github/workflows/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex b02c7280aa31..2f76e0494d4a 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -231,7 +231,7 @@ jobs:\n [[ \"${version}\" != \"${downgraded_version}\" ]]\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}\n path: |\n@@ -293,7 +293,7 @@ jobs:\n docker compose up --build --exit-code-from \"${SERVICE}\" \"${SERVICE}\"\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ matrix.os }}_${{ matrix.arch }}\n path: |\n@@ -378,7 +378,7 @@ jobs:\n [[ \"$version\" != \"$downgraded_version\" ]]\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}\n path: |\n@@ -500,7 +500,7 @@ jobs:\n }\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-bin-${{ github.job }}-${{ matrix.arch }}\n path: |\n@@ -590,7 +590,7 @@ jobs:\n done\n \n - name: Upload artifacts\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-${{ github.job }}\n path: |\ndiff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 1ceba11380b2..b58b82cb32b0 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/workflows/challenge-tests.yml\n@@ -48,7 +48,7 @@ jobs:\n with:\n python-version: ${{ matrix.python-version }}\n - name: Install Deno\n- uses: denoland/setup-deno@e95548e56dfa95d4e1a28d6f422fafe75c4c26fb # v2.0.3\n+ uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2.0.4\n with:\n deno-version: '2.0.0' # minimum supported version\n - name: Install Bun\n@@ -58,7 +58,7 @@ jobs:\n bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}\n no-cache: true\n - name: Install Node\n- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0\n+ uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0\n with:\n node-version: '20.0' # minimum supported version\n - name: Install QuickJS (Linux)\ndiff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 44b1623a154d..7a048015d8f5 100644\n--- a/.github/workflows/codeql.yml\n+++ b/.github/workflows/codeql.yml\n@@ -36,12 +36,12 @@ jobs:\n persist-credentials: false\n \n - name: Initialize CodeQL\n- uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\n+ uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n with:\n languages: ${{ matrix.language }}\n build-mode: none\n \n - name: Perform CodeQL Analysis\n- uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0\n+ uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2\n with:\n category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml\nindex 6e7fa43edef8..eb75a72159da 100644\n--- a/.github/workflows/release-master.yml\n+++ b/.github/workflows/release-master.yml\n@@ -47,6 +47,6 @@ jobs:\n path: dist\n name: build-pypi\n - name: Publish to PyPI\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\ndiff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml\nindex 14ac9bfc5318..a91e3a43bce5 100644\n--- a/.github/workflows/release-nightly.yml\n+++ b/.github/workflows/release-nightly.yml\n@@ -27,7 +27,7 @@ jobs:\n run: echo \"head=$(git rev-parse HEAD)\" | tee -a \"${GITHUB_OUTPUT}\"\n \n - name: Cache nightly commit hash\n- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3\n+ uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5\n env:\n SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1\n with:\n@@ -100,6 +100,6 @@ jobs:\n name: build-pypi\n \n - name: Publish to PyPI\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\ndiff --git a/.github/workflows/release.yml b/.github/workflows/release.yml\nindex 3c92dac3ca22..84082cc03223 100644\n--- a/.github/workflows/release.yml\n+++ b/.github/workflows/release.yml\n@@ -215,7 +215,7 @@ jobs:\n \n - name: Upload artifacts\n if: github.event.workflow != '.github/workflows/release.yml' # Reusable workflow_call\n- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0\n+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1\n with:\n name: build-pypi\n path: |\n@@ -224,7 +224,7 @@ jobs:\n \n - name: Publish to PyPI\n if: github.event.workflow == '.github/workflows/release.yml' # Direct workflow_dispatch\n- uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0\n+ uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0\n with:\n verbose: true\n \ndiff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml\nindex 28832a3abe1c..248b5a16c0fd 100644\n--- a/.github/workflows/test-workflows.yml\n+++ b/.github/workflows/test-workflows.yml\n@@ -13,8 +13,8 @@ concurrency:\n cancel-in-progress: ${{ github.event_name == 'pull_request' }}\n \n env:\n- ACTIONLINT_VERSION: \"1.7.11\"\n- ACTIONLINT_SHA256SUM: 900919a84f2229bac68ca9cd4103ea297abc35e9689ebb842c6e34a3d1b01b0a\n+ ACTIONLINT_VERSION: \"1.7.12\"\n+ ACTIONLINT_SHA256SUM: 8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8\n ACTIONLINT_REPO: rhysd/actionlint\n GH_TELEMETRY: \"false\"\n \n@@ -83,7 +83,7 @@ jobs:\n persist-credentials: false\n \n - name: Run zizmor\n- uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2\n+ uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3\n with:\n advanced-security: false\n persona: pedantic\n"},"num_subtasks":{"kind":"number","value":1,"string":"1"},"num_changed_files":{"kind":"number","value":7,"string":"7"}}},{"rowIdx":34296,"cells":{"task_id":{"kind":"string","value":"ytdl-org/youtube-dl#33227"},"repo":{"kind":"string","value":"ytdl-org/youtube-dl"},"pr_number":{"kind":"number","value":33227,"string":"33,227"},"base_sha":{"kind":"string","value":"d0283f5385acd21dd51afa2102844c8cb2fe6b62"},"head_sha":{"kind":"string","value":"fc469aace7097887c353d6a28fc3dc75ed7acba1"},"task":{"kind":"string","value":"no videos returned when trying to download youtube playlist\n\n<!--\n\n######################################################################\n WARNING!\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\n######################################################################\n\n-->\n\n\n## Checklist\n\n<!--\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:\n- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.\n- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.\n- Finally, put x into all relevant boxes (like this [x])\n-->\n\n- [X] I'm reporting a broken site support\n- [X] I've verified that I'm running youtube-dl version **2021.12.17**\n- [X] I've checked that all provided URLs are alive and playable in a browser\n- [X] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [X] I've searched the bugtracker for similar issues including closed ones\n\n\n## Verbose log\n\n<!--\nProvide the complete verbose output of youtube-dl that clearly demonstrates the problem.\nAdd the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\n [debug] System config: []\n [debug] User config: []\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\n [debug] youtube-dl version 2021.12.17\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\n [debug] Proxy map: {}\n <more lines>\n-->\n\n```\nyoutube-dl -v PLR-K8lW4EfsLJOA_JkaYQzogjprWJXsVL\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: ['-v', 'PLR-K8lW4EfsLJOA_JkaYQzogjprWJXsVL']\n[debug] Encodings: locale cp1252, fs mbcs, out cp850, pref cp1252\n[debug] youtube-dl version 2025.11.21 [d0283f538] (single file build)\n[debug] ** This version was built from the latest master code at https://github.com/ytdl-org/youtube-dl.\n[debug] ** For support, visit the main site.\n[debug] Python 3.4.4 (CPython AMD64 32bit) - Windows-10-10.0.26100 - OpenSSL 1.0.2d 9 Jul 2015\n[debug] exe versions: ffmpeg n5.1.6-9-gdcdfd7fb62-20241109, ffprobe n5.1.6-9-gdcdfd7fb62-20241109\n[debug] Proxy map: {}\n[youtube:tab] PLR-K8lW4EfsLJOA_JkaYQzogjprWJXsVL: Downloading webpage\n[download] Downloading playlist: Patrick for 10 hours\n[youtube:tab] Downloading page 1\n[youtube:tab] playlist Patrick for 10 hours: Downloading 0 videos\n[download] Finished downloading playlist: Patrick for 10 hours\n```\n\n\n## Description\n\n<!--\nProvide an explanation of your issue in an arbitrary form. Provide any additional information, suggested solution and as much context and examples as possible.\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\n-->\n\nNo videos were returned when trying to download youtube playlist. Expected it to return roughly 17.\n\n[YouTube] YouTube etc, pt 2\n\n<details><summary>Boilerplate: own+yt-dlp code, bugfix+improvement</summary> \r\n\r\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] [Searched](https://github.com/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)\r\n- [x] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them\r\n- [x] Covered the code with tests (note that PRs without tests will be REJECTED)\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/), except for yt-dlp code for which this or the below were already asserted\r\n- [x] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\n### What is the purpose of your *pull request*?\r\n- [x] Bug fix\r\n- [x] Improvement\r\n- [ ] New extractor\r\n- [ ] New feature\r\n\r\n---\r\n\r\n</details>\r\n\r\n### Description of your *pull request* and other information\r\n\r\nSee commit text.\r\nFixes #33226.\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `youtube_dl/` needed for: no videos returned when trying to download youtube playlist","scope_files":["youtube_dl/YoutubeDL.py"]},{"subtask_id":"s2","goal":"Implement the changes under `youtube_dl/extractor/` needed for: no videos returned when trying to download youtube playlist","scope_files":["youtube_dl/extractor/youtube.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `youtube_dl/` needed for: no videos returned when trying to download youtube playlist\",\n \"scope_files\": [\n \"youtube_dl/YoutubeDL.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `youtube_dl/extractor/` needed for: no videos returned when trying to download youtube playlist\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["youtube_dl/YoutubeDL.py"],"solution_diff":"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\nindex ec1d35c3aca..4c762bf2ccd 100755\n--- a/youtube_dl/YoutubeDL.py\n+++ b/youtube_dl/YoutubeDL.py\n@@ -2404,60 +2404,52 @@ def format_resolution(format, default='unknown'):\n return res\n \n def _format_note(self, fdict):\n- res = ''\n- if fdict.get('ext') in ['f4f', 'f4m']:\n- res += '(unsupported) '\n- if fdict.get('language'):\n- if res:\n- res += ' '\n- res += '[%s] ' % fdict['language']\n- if fdict.get('format_note') is not None:\n- res += fdict['format_note'] + ' '\n- if fdict.get('tbr') is not None:\n- res += '%4dk ' % fdict['tbr']\n+\n+ def simplified_codec(f, field):\n+ assert field in ('acodec', 'vcodec')\n+ codec = f.get(field)\n+ return (\n+ 'unknown' if not codec\n+ else '.'.join(codec.split('.')[:4]) if codec != 'none'\n+ else 'images' if field == 'vcodec' and f.get('acodec') == 'none'\n+ else None if field == 'acodec' and f.get('vcodec') == 'none'\n+ else 'audio only' if field == 'vcodec'\n+ else 'video only')\n+\n+ res = join_nonempty(\n+ fdict.get('ext') in ('f4f', 'f4m') and '(unsupported)',\n+ fdict.get('language') and ('[%s]' % (fdict['language'],)),\n+ fdict.get('format_note') is not None and fdict['format_note'],\n+ fdict.get('tbr') is not None and ('%4dk' % fdict['tbr']),\n+ delim=' ')\n+ res = [res] if res else []\n if fdict.get('container') is not None:\n- if res:\n- res += ', '\n- res += '%s container' % fdict['container']\n- if (fdict.get('vcodec') is not None\n- and fdict.get('vcodec') != 'none'):\n- if res:\n- res += ', '\n- res += fdict['vcodec']\n- if fdict.get('vbr') is not None:\n- res += '@'\n+ res.append('%s container' % (fdict['container'],))\n+ if fdict.get('vcodec') not in (None, 'none'):\n+ codec = simplified_codec(fdict, 'vcodec')\n+ if codec and fdict.get('vbr') is not None:\n+ codec += '@'\n elif fdict.get('vbr') is not None and fdict.get('abr') is not None:\n- res += 'video@'\n- if fdict.get('vbr') is not None:\n- res += '%4dk' % fdict['vbr']\n+ codec = 'video@'\n+ else:\n+ codec = None\n+ codec = join_nonempty(codec, fdict.get('vbr') is not None and ('%4dk' % fdict['vbr']))\n+ if codec:\n+ res.append(codec)\n if fdict.get('fps') is not None:\n- if res:\n- res += ', '\n- res += '%sfps' % fdict['fps']\n- if fdict.get('acodec') is not None:\n- if res:\n- res += ', '\n- if fdict['acodec'] == 'none':\n- res += 'video only'\n- else:\n- res += '%-5s' % fdict['acodec']\n- elif fdict.get('abr') is not None:\n- if res:\n- res += ', '\n- res += 'audio'\n- if fdict.get('abr') is not None:\n- res += '@%3dk' % fdict['abr']\n- if fdict.get('asr') is not None:\n- res += ' (%5dHz)' % fdict['asr']\n+ res.append('%sfps' % (fdict['fps'],))\n+ codec = (\n+ simplified_codec(fdict, 'acodec') if fdict.get('acodec') is not None\n+ else 'audio' if fdict.get('abr') is not None else None)\n+ if codec:\n+ res.append(join_nonempty(\n+ '%-4s' % (codec + (('@%3dk' % fdict['abr']) if fdict.get('abr') else ''),),\n+ fdict.get('asr') and '(%5dHz)' % fdict['asr'], delim=' '))\n if fdict.get('filesize') is not None:\n- if res:\n- res += ', '\n- res += format_bytes(fdict['filesize'])\n+ res.append(format_bytes(fdict['filesize']))\n elif fdict.get('filesize_approx') is not None:\n- if res:\n- res += ', '\n- res += '~' + format_bytes(fdict['filesize_approx'])\n- return res\n+ res.append('~' + format_bytes(fdict['filesize_approx']))\n+ return ', '.join(res)\n \n def list_formats(self, info_dict):\n formats = info_dict.get('formats', [info_dict])\n","summary":"Edited 1 file(s) in youtube_dl/"},{"subtask_id":"s2","scope_files":["youtube_dl/extractor/youtube.py"],"solution_diff":"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex 7965fa08a28..81a01914378 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -1669,10 +1669,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n '_rtmp': {'protocol': 'rtmp'},\n \n # av01 video only formats sometimes served with \"unknown\" codecs\n- '394': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '395': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '396': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '397': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n+ '394': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\n+ '395': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\n+ '396': {'acodec': 'none', 'vcodec': 'av01.0.01M.08'},\n+ '397': {'acodec': 'none', 'vcodec': 'av01.0.04M.08'},\n+ '398': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n+ '399': {'acodec': 'none', 'vcodec': 'av01.0.08M.08'},\n }\n \n _PLAYER_JS_VARIANT_MAP = (\n@@ -3811,7 +3813,7 @@ def _entries(self, tab, item_id, webpage):\n continuation = None\n for is_renderer in traverse_obj(slr_renderer, (\n 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\n- for isr_content in traverse_obj(slr_renderer, (\n+ for isr_content in traverse_obj(is_renderer, (\n 'contents', Ellipsis, T(dict))):\n renderer = isr_content.get('playlistVideoListRenderer')\n if renderer:\n","summary":"Edited 1 file(s) in youtube_dl/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"youtube_dl/YoutubeDL.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\\nindex ec1d35c3aca..4c762bf2ccd 100755\\n--- a/youtube_dl/YoutubeDL.py\\n+++ b/youtube_dl/YoutubeDL.py\\n@@ -2404,60 +2404,52 @@ def format_resolution(format, default='unknown'):\\n return res\\n \\n def _format_note(self, fdict):\\n- res = ''\\n- if fdict.get('ext') in ['f4f', 'f4m']:\\n- res += '(unsupported) '\\n- if fdict.get('language'):\\n- if res:\\n- res += ' '\\n- res += '[%s] ' % fdict['language']\\n- if fdict.get('format_note') is not None:\\n- res += fdict['format_note'] + ' '\\n- if fdict.get('tbr') is not None:\\n- res += '%4dk ' % fdict['tbr']\\n+\\n+ def simplified_codec(f, field):\\n+ assert field in ('acodec', 'vcodec')\\n+ codec = f.get(field)\\n+ return (\\n+ 'unknown' if not codec\\n+ else '.'.join(codec.split('.')[:4]) if codec != 'none'\\n+ else 'images' if field == 'vcodec' and f.get('acodec') == 'none'\\n+ else None if field == 'acodec' and f.get('vcodec') == 'none'\\n+ else 'audio only' if field == 'vcodec'\\n+ else 'video only')\\n+\\n+ res = join_nonempty(\\n+ fdict.get('ext') in ('f4f', 'f4m') and '(unsupported)',\\n+ fdict.get('language') and ('[%s]' % (fdict['language'],)),\\n+ fdict.get('format_note') is not None and fdict['format_note'],\\n+ fdict.get('tbr') is not None and ('%4dk' % fdict['tbr']),\\n+ delim=' ')\\n+ res = [res] if res else []\\n if fdict.get('container') is not None:\\n- if res:\\n- res += ', '\\n- res += '%s container' % fdict['container']\\n- if (fdict.get('vcodec') is not None\\n- and fdict.get('vcodec') != 'none'):\\n- if res:\\n- res += ', '\\n- res += fdict['vcodec']\\n- if fdict.get('vbr') is not None:\\n- res += '@'\\n+ res.append('%s container' % (fdict['container'],))\\n+ if fdict.get('vcodec') not in (None, 'none'):\\n+ codec = simplified_codec(fdict, 'vcodec')\\n+ if codec and fdict.get('vbr') is not None:\\n+ codec += '@'\\n elif fdict.get('vbr') is not None and fdict.get('abr') is not None:\\n- res += 'video@'\\n- if fdict.get('vbr') is not None:\\n- res += '%4dk' % fdict['vbr']\\n+ codec = 'video@'\\n+ else:\\n+ codec = None\\n+ codec = join_nonempty(codec, fdict.get('vbr') is not None and ('%4dk' % fdict['vbr']))\\n+ if codec:\\n+ res.append(codec)\\n if fdict.get('fps') is not None:\\n- if res:\\n- res += ', '\\n- res += '%sfps' % fdict['fps']\\n- if fdict.get('acodec') is not None:\\n- if res:\\n- res += ', '\\n- if fdict['acodec'] == 'none':\\n- res += 'video only'\\n- else:\\n- res += '%-5s' % fdict['acodec']\\n- elif fdict.get('abr') is not None:\\n- if res:\\n- res += ', '\\n- res += 'audio'\\n- if fdict.get('abr') is not None:\\n- res += '@%3dk' % fdict['abr']\\n- if fdict.get('asr') is not None:\\n- res += ' (%5dHz)' % fdict['asr']\\n+ res.append('%sfps' % (fdict['fps'],))\\n+ codec = (\\n+ simplified_codec(fdict, 'acodec') if fdict.get('acodec') is not None\\n+ else 'audio' if fdict.get('abr') is not None else None)\\n+ if codec:\\n+ res.append(join_nonempty(\\n+ '%-4s' % (codec + (('@%3dk' % fdict['abr']) if fdict.get('abr') else ''),),\\n+ fdict.get('asr') and '(%5dHz)' % fdict['asr'], delim=' '))\\n if fdict.get('filesize') is not None:\\n- if res:\\n- res += ', '\\n- res += format_bytes(fdict['filesize'])\\n+ res.append(format_bytes(fdict['filesize']))\\n elif fdict.get('filesize_approx') is not None:\\n- if res:\\n- res += ', '\\n- res += '~' + format_bytes(fdict['filesize_approx'])\\n- return res\\n+ res.append('~' + format_bytes(fdict['filesize_approx']))\\n+ return ', '.join(res)\\n \\n def list_formats(self, info_dict):\\n formats = info_dict.get('formats', [info_dict])\\n\",\n \"summary\": \"Edited 1 file(s) in youtube_dl/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\\nindex 7965fa08a28..81a01914378 100644\\n--- a/youtube_dl/extractor/youtube.py\\n+++ b/youtube_dl/extractor/youtube.py\\n@@ -1669,10 +1669,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\\n '_rtmp': {'protocol': 'rtmp'},\\n \\n # av01 video only formats sometimes served with \\\"unknown\\\" codecs\\n- '394': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\\n- '395': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\\n- '396': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\\n- '397': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\\n+ '394': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\\n+ '395': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\\n+ '396': {'acodec': 'none', 'vcodec': 'av01.0.01M.08'},\\n+ '397': {'acodec': 'none', 'vcodec': 'av01.0.04M.08'},\\n+ '398': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\\n+ '399': {'acodec': 'none', 'vcodec': 'av01.0.08M.08'},\\n }\\n \\n _PLAYER_JS_VARIANT_MAP = (\\n@@ -3811,7 +3813,7 @@ def _entries(self, tab, item_id, webpage):\\n continuation = None\\n for is_renderer in traverse_obj(slr_renderer, (\\n 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\\n- for isr_content in traverse_obj(slr_renderer, (\\n+ for isr_content in traverse_obj(is_renderer, (\\n 'contents', Ellipsis, T(dict))):\\n renderer = isr_content.get('playlistVideoListRenderer')\\n if renderer:\\n\",\n \"summary\": \"Edited 1 file(s) in youtube_dl/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\nindex ec1d35c3aca..4c762bf2ccd 100755\n--- a/youtube_dl/YoutubeDL.py\n+++ b/youtube_dl/YoutubeDL.py\n@@ -2404,60 +2404,52 @@ def format_resolution(format, default='unknown'):\n return res\n \n def _format_note(self, fdict):\n- res = ''\n- if fdict.get('ext') in ['f4f', 'f4m']:\n- res += '(unsupported) '\n- if fdict.get('language'):\n- if res:\n- res += ' '\n- res += '[%s] ' % fdict['language']\n- if fdict.get('format_note') is not None:\n- res += fdict['format_note'] + ' '\n- if fdict.get('tbr') is not None:\n- res += '%4dk ' % fdict['tbr']\n+\n+ def simplified_codec(f, field):\n+ assert field in ('acodec', 'vcodec')\n+ codec = f.get(field)\n+ return (\n+ 'unknown' if not codec\n+ else '.'.join(codec.split('.')[:4]) if codec != 'none'\n+ else 'images' if field == 'vcodec' and f.get('acodec') == 'none'\n+ else None if field == 'acodec' and f.get('vcodec') == 'none'\n+ else 'audio only' if field == 'vcodec'\n+ else 'video only')\n+\n+ res = join_nonempty(\n+ fdict.get('ext') in ('f4f', 'f4m') and '(unsupported)',\n+ fdict.get('language') and ('[%s]' % (fdict['language'],)),\n+ fdict.get('format_note') is not None and fdict['format_note'],\n+ fdict.get('tbr') is not None and ('%4dk' % fdict['tbr']),\n+ delim=' ')\n+ res = [res] if res else []\n if fdict.get('container') is not None:\n- if res:\n- res += ', '\n- res += '%s container' % fdict['container']\n- if (fdict.get('vcodec') is not None\n- and fdict.get('vcodec') != 'none'):\n- if res:\n- res += ', '\n- res += fdict['vcodec']\n- if fdict.get('vbr') is not None:\n- res += '@'\n+ res.append('%s container' % (fdict['container'],))\n+ if fdict.get('vcodec') not in (None, 'none'):\n+ codec = simplified_codec(fdict, 'vcodec')\n+ if codec and fdict.get('vbr') is not None:\n+ codec += '@'\n elif fdict.get('vbr') is not None and fdict.get('abr') is not None:\n- res += 'video@'\n- if fdict.get('vbr') is not None:\n- res += '%4dk' % fdict['vbr']\n+ codec = 'video@'\n+ else:\n+ codec = None\n+ codec = join_nonempty(codec, fdict.get('vbr') is not None and ('%4dk' % fdict['vbr']))\n+ if codec:\n+ res.append(codec)\n if fdict.get('fps') is not None:\n- if res:\n- res += ', '\n- res += '%sfps' % fdict['fps']\n- if fdict.get('acodec') is not None:\n- if res:\n- res += ', '\n- if fdict['acodec'] == 'none':\n- res += 'video only'\n- else:\n- res += '%-5s' % fdict['acodec']\n- elif fdict.get('abr') is not None:\n- if res:\n- res += ', '\n- res += 'audio'\n- if fdict.get('abr') is not None:\n- res += '@%3dk' % fdict['abr']\n- if fdict.get('asr') is not None:\n- res += ' (%5dHz)' % fdict['asr']\n+ res.append('%sfps' % (fdict['fps'],))\n+ codec = (\n+ simplified_codec(fdict, 'acodec') if fdict.get('acodec') is not None\n+ else 'audio' if fdict.get('abr') is not None else None)\n+ if codec:\n+ res.append(join_nonempty(\n+ '%-4s' % (codec + (('@%3dk' % fdict['abr']) if fdict.get('abr') else ''),),\n+ fdict.get('asr') and '(%5dHz)' % fdict['asr'], delim=' '))\n if fdict.get('filesize') is not None:\n- if res:\n- res += ', '\n- res += format_bytes(fdict['filesize'])\n+ res.append(format_bytes(fdict['filesize']))\n elif fdict.get('filesize_approx') is not None:\n- if res:\n- res += ', '\n- res += '~' + format_bytes(fdict['filesize_approx'])\n- return res\n+ res.append('~' + format_bytes(fdict['filesize_approx']))\n+ return ', '.join(res)\n \n def list_formats(self, info_dict):\n formats = info_dict.get('formats', [info_dict])\ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex 7965fa08a28..81a01914378 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -1669,10 +1669,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n '_rtmp': {'protocol': 'rtmp'},\n \n # av01 video only formats sometimes served with \"unknown\" codecs\n- '394': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '395': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '396': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n- '397': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n+ '394': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\n+ '395': {'acodec': 'none', 'vcodec': 'av01.0.00M.08'},\n+ '396': {'acodec': 'none', 'vcodec': 'av01.0.01M.08'},\n+ '397': {'acodec': 'none', 'vcodec': 'av01.0.04M.08'},\n+ '398': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},\n+ '399': {'acodec': 'none', 'vcodec': 'av01.0.08M.08'},\n }\n \n _PLAYER_JS_VARIANT_MAP = (\n@@ -3811,7 +3813,7 @@ def _entries(self, tab, item_id, webpage):\n continuation = None\n for is_renderer in traverse_obj(slr_renderer, (\n 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\n- for isr_content in traverse_obj(slr_renderer, (\n+ for isr_content in traverse_obj(is_renderer, (\n 'contents', Ellipsis, T(dict))):\n renderer = isr_content.get('playlistVideoListRenderer')\n if renderer:\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34297,"cells":{"task_id":{"kind":"string","value":"ytdl-org/youtube-dl#33216"},"repo":{"kind":"string","value":"ytdl-org/youtube-dl"},"pr_number":{"kind":"number","value":33216,"string":"33,216"},"base_sha":{"kind":"string","value":"1e109aaee13a30e2a23f982410ffb3e4f73913df"},"head_sha":{"kind":"string","value":"2486fbbae152f689f5d538fa55d964173101a110"},"task":{"kind":"string","value":"[YouTube] Unable to download API page: HTTP Error 400: Bad Request\n\n<!--\n\n######################################################################\n WARNING!\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\n######################################################################\n\n-->\n\n\n## Checklist\n\n<!--\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:\n- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.\n- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.\n- Finally, put x into all relevant boxes (like this [x])\n-->\n\n- [x] I'm reporting a broken site support\n- [x] I've verified that I'm running youtube-dl version **2025.10.18**\n- [x] I've checked that all provided URLs are alive and playable in a browser\n- [x] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [x] I've searched the bugtracker for similar issues including closed ones\n\n\n## Verbose log\n\n<!--\nProvide the complete verbose output of youtube-dl that clearly demonstrates the problem.\nAdd the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\n [debug] System config: []\n [debug] User config: []\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\n [debug] youtube-dl version 2021.12.17\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\n [debug] Proxy map: {}\n <more lines>\n-->\n\n```bash\n./youtube-dl -v --cookies cookies.txt --user-agent \"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36\" https://www.youtube.com/watch?v=KNZxDBG4k_Y\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: ['-v', '--cookies', 'cookies.txt', '--user-agent', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36', 'https://www.youtube.com/watch?v=KNZxDBG4k_Y']\n[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8\n[debug] youtube-dl version 2025.10.18\n[debug] Lazy loading extractors enabled\n[debug] Single file build\n[debug] Python 3.10.12 (CPython x86_64 64bit) - Linux-5.15.0-160-generic-x86_64-with-glibc2.35 - OpenSSL 3.0.2 15 Mar 2022 - glibc 2.35\n[debug] exe versions: ffmpeg N-121253-g8a34faa250-Nico-20250928, ffprobe N-121253-g8a34faa250-Nico-20250928, rtmpdump 2.4\n[debug] Proxy map: {}\n[youtube] KNZxDBG4k_Y: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 0004de42\n original url = https://www.youtube.com/s/player/bcd893b3/player_ias.vflset/nl_NL/base.js\n[debug] [youtube] Extracted SAPISID cookie\n[youtube] KNZxDBG4k_Y: Downloading IOS API JSON\nWARNING: [youtube] Unable to download API page: HTTP Error 400: Bad Request\nERROR: No video formats found; please report this issue on https://github.com/ytdl-org/youtube-dl/issues , using the appropriate issue template. Make sure you are using the latest version; type youtube-dl -U to update. Be sure to call youtube-dl with the --verbose option and include the complete output.\nTraceback (most recent call last):\n File \"/home/nico/Desktop/./youtube-dl/youtube_dl/YoutubeDL.py\", line 882, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/nico/Desktop/./youtube-dl/youtube_dl/YoutubeDL.py\", line 978, in __extract_info\n ie_result = ie.extract(url)\n File \"/home/nico/Desktop/./youtube-dl/youtube_dl/extractor/common.py\", line 573, in extract\n ie_result = self._real_extract(url)\n File \"/home/nico/Desktop/./youtube-dl/youtube_dl/extractor/youtube.py\", line 2673, in _real_extract\n self._sort_formats(formats)\n File \"/home/nico/Desktop/./youtube-dl/youtube_dl/extractor/common.py\", line 1550, in _sort_formats\n raise ExtractorError('No video formats found')\nyoutube_dl.utils.ExtractorError: No video formats found; please report this issue on https://github.com/ytdl-org/youtube-dl/issues , using the appropriate issue template. Make sure you are using the latest version; type youtube-dl -U to update. Be sure to call youtube-dl with the --verbose option and include the complete output.\n\n```\n\n\n## Description\n\n<!--\nProvide an explanation of your issue in an arbitrary form. Provide any additional information, suggested solution and as much context and examples as possible.\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\n-->\n\nAfter building from the latest source, I first got 403 errors, so I provided cookies.\nBut the download still fails.\n\n[Youtube] error 403 downloading format on git master\n\n<!--\n\n######################################################################\n WARNING!\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\n######################################################################\n\n-->\n\n\n## Checklist\n\n<!--\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:\n- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.\n- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.\n- Read bugs section in FAQ: http://yt-dl.org/reporting\n- Finally, put x into all relevant boxes (like this [x])\n-->\n\n- [X] I'm reporting a broken site support issue\n- [X] I've verified that I'm running youtube-dl version **git master**\n- [X] I've checked that all provided URLs are alive and playable in a browser\n- [X] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [X] I've searched the bugtracker for similar bug reports including closed ones\n- [X] I've read bugs section in FAQ\n\n\n## Verbose log\n\n<!--\nProvide the complete verbose output of youtube-dl that clearly demonstrates the problem.\nAdd the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\n [debug] System config: []\n [debug] User config: []\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\n [debug] youtube-dl version 2021.12.17\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\n [debug] Proxy map: {}\n <more lines>\n-->\n\n```\n$ python3 -m youtube_dl --verbose 'https://www.youtube.com/watch?v=iA8oMbtB0MA'\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: ['--verbose', 'https://www.youtube.com/watch?v=iA8oMbtB0MA']\n[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8\n[debug] youtube-dl version 2025.04.07\n[debug] Git HEAD: 1e109aaee\n[debug] Python 3.11.2 (CPython x86_64 64bit) - Linux-6.1.0-40-amd64-x86_64-with-glibc2.36 - OpenSSL 3.0.17 1 Jul 2025 - glibc 2.36\n[debug] exe versions: ffmpeg 5.1.7-0, ffprobe 5.1.7-0\n[debug] Proxy map: {}\n[youtube] iA8oMbtB0MA: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 0004de42\n original url = https://www.youtube.com/s/player/5cf6312f/player_ias.vflset/en_US/base.js\n[youtube] iA8oMbtB0MA: Downloading IOS API JSON\n[youtube] iA8oMbtB0MA: Downloading m3u8 information\n[debug] Default format spec: bestvideo+bestaudio/best\n[debug] Invoking downloader on 'https://rr2---sn-25ge7nzr.googlevideo.com/videoplayback?expire=1761707163&ei=OzABaYCvNqfkxN8P8Je8gAw&ip=185.3.128.181&id=o-APRNtlzGwmp7ZtMANkXPFmdL6UHoB3c-torTMKpBJfmV&itag=134&source=youtube&requiressl=yes&xpc=EgVo2aDSNQ%3D%3D&met=1761685563%2C&mh=ug&mm=31%2C26&mn=sn-25ge7nzr%2Csn-h5q7kned&ms=au%2Conr&mv=u&mvi=2&pl=22&rms=au%2Cau&bui=AdEuB5SpkXh988_FUFuqZ_bQ4XP4zcuO5PR3VR_KRvK03d34jTHniVyXq-7X9i-gYnLVxKcvnrDXyTs_&spc=6b0G_I_JsSlpkB7dGkQgQIv_a95mfQh98SHbfggcjAPpLAPHbrUyFO-4PCiHGQ&vprv=1&svpuc=1&mime=video%2Fmp4&rqh=1&gir=yes&clen=90437492&dur=2886.216&lmt=1737100515032914&mt=1761684552&fvip=3&keepalive=yes&fexp=51552689%2C51565116%2C51565681%2C51580968&c=IOS&txp=8208224&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cxpc%2Cbui%2Cspc%2Cvprv%2Csvpuc%2Cmime%2Crqh%2Cgir%2Cclen%2Cdur%2Clmt&sig=AJfQdSswRQIgbpSkrZ50-Vk9ylxUn1KvSoCeJ8ceppYxZYWMD2gIemoCIQDCtUEIwDg_9x816WwliPeYUckBO1r_08HuQpPcXV9AKg%3D%3D&lsparams=met%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Crms&lsig=APaTxxMwRQIhANfexCjE-87qOdwis8-SQszbpch6e1aavCq4WGAu6_l7AiAvqJ8hYQFAaHTgKPvw85c3rFl0OFmZFnbV6lzwvesAgw%3D%3D'\n[download] Sleeping 4.00 seconds as required by the site...\n[dashsegments] Total fragments: 9\n[download] Destination: Les Chevaliers du Ciel 1988 - Le Mystรจre de l'A.S.L.P.-iA8oMbtB0MA.f134.mp4\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 1 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 2 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 3 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 4 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 5 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 6 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 7 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 8 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 9 of 10)...\n[download] Got server HTTP error: HTTP Error 403: Forbidden. Retrying fragment 1 (attempt 10 of 10)...\nERROR: giving up after 10 fragment retries\n File \"<frozen runpy>\", line 198, in _run_module_as_main\n File \"<frozen runpy>\", line 88, in _run_code\n File \"/home/youtube-dl/youtube-dl/youtube_dl/__main__.py\", line 19, in <module>\n youtube_dl.main()\n File \"/home/youtube-dl/youtube-dl/youtube_dl/__init__.py\", line 479, in main\n _real_main(argv)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/__init__.py\", line 469, in _real_main\n retcode = ydl.download(all_urls)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 2260, in download\n res = self.extract_info(\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 875, in extract_info\n return self.__extract_info(url, ie, download, extra_info, process)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 882, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 989, in __extract_info\n return self.process_ie_result(ie_result, download, extra_info)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 1023, in process_ie_result\n return self.process_video_result(ie_result, download=download)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 1867, in process_video_result\n self.process_info(new_info)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 138, in wrapper\n return func(self, *args, **kwargs)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 2159, in process_info\n partial_success = dl(fname, new_info)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 2095, in dl\n return fd.download(name, new_info)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/downloader/common.py\", line 394, in download\n return self.real_download(filename, info_dict)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/downloader/dash.py\", line 78, in real_download\n self.report_error('giving up after %s fragment retries' % count)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/downloader/common.py\", line 176, in report_error\n self.ydl.report_error(*args, **kargs)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 675, in report_error\n self.trouble(*args, **kwargs)\n File \"/home/youtube-dl/youtube-dl/youtube_dl/YoutubeDL.py\", line 634, in trouble\n tb_data = traceback.format_list(traceback.extract_stack())\n```\n\n\n## Description\n\n<!--\nProvide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\n-->\n\nyoutube-dl gives 503 error on a video that plays correctly via a browser. Tried on two different IP, one with a ublock browser and on one without any human. Same thing.\n\nI tried looking at issues, it seems that it's a js player trouble. Relaunching the command several times yield the same results.\n\nERROR: WARNING: unable to obtain file audio codec with ffprobe\n\n## Checklist\n\n- [ ] I'm reporting a broken site support issue\n- [x] I've verified that I'm running youtube-dl version **2025.10.19**\n- [x] I've checked that all provided URLs are alive and playable in a browser\n- [x] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [x] I've searched the bugtracker for similar bug reports including closed ones\n- [x] I've read bugs section in FAQ\n\n\n## Verbose log\n\nFull log attached as VerboseLog.txt, otherwise I get **Body can not be longer than 65536 characters**\n[VerboseLog.txt](https://github.com/user-attachments/files/23539233/VerboseLog.txt)\n```\nyoutube-dl --extract-audio --audio-format mp3 --user-agent \"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36\" https://www.youtube.com/watch?v=PqUenEMwsdQ&list=PL_tjt9sD4AP252A4D51sLRT11fuW3EhQL -v\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: ['--extract-audio', '--audio-format', 'mp3', '--user-agent', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36', 'https://www.youtube.com/watch?v=PqUenEMwsdQ&list=PL_tjt9sD4AP252A4D51sLRT11fuW3EhQL', '-v']\n[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8\n[debug] youtube-dl version 2025.10.19 [1e109aaee]\n[debug] ** This version was built from the latest master code at https://github.com/ytdl-org/youtube-dl.\n[debug] ** For support, visit the main site.\n[debug] Python 3.9.6 (CPython arm64 64bit) - macOS-15.6.1-arm64-arm-64bit - LibreSSL 2.8.3\n[debug] exe versions: ffmpeg 8.0, ffprobe 8.0\n[debug] Proxy map: {}\n[youtube:tab] Downloading playlist PL_tjt9sD4AP252A4D51sLRT11fuW3EhQL - add --no-playlist to just download video PqUenEMwsdQ\n[youtube:tab] PL_tjt9sD4AP252A4D51sLRT11fuW3EhQL: Downloading webpage\n[download] Downloading playlist: Fun Times\n[youtube:tab] playlist Fun Times: Downloading 200 videos\n[download] Downloading video 1 of 200\n[youtube] PqUenEMwsdQ: Downloading webpage\n[debug] [youtube] Forcing \"main\" player JS variant for player 0004de42\n original url = https://www.youtube.com/s/player/ef5f17ca/player_ias.vflset/en_US/base.js\n[youtube] PqUenEMwsdQ: Downloading IOS API JSON\nWARNING: Unknown codec vp09.00.40.08\nWARNING: Unknown codec vp09.00.31.08\nWARNING: Unknown codec vp09.00.30.08\nWARNING: Unknown codec vp09.00.21.08\nWARNING: Unknown codec vp09.00.20.08\nWARNING: Unknown codec vp09.00.11.08\n[youtube] PqUenEMwsdQ: Downloading m3u8 information\nWARNING: Unknown codec vp09.00.11.08\nWARNING: Unknown codec vp09.00.20.08\nWARNING: Unknown codec vp09.00.20.08\nWARNING: Unknown codec vp09.00.21.08\nWARNING: Unknown codec vp09.00.30.08\nWARNING: Unknown codec vp09.00.31.08\nWARNING: Unknown codec vp09.00.40.08\n[debug] Invoking downloader on 'https://manifest.googlevideo.com/api/manifest/hls_playlist/expire/1763114584/ei/-KkWafSdAraLsfIP7cLJsA0/ip/2600:382:b192:e830:64d2:a620:68f0:aa47/id/3ea51e9c4330b1d4/itag/614/source/youtube/requiressl/yes/ratebypass/yes/pfa/1/wft/1/sgovp/clen%3D4578367%3Bdur%3D214.640%3Bgir%3Dyes%3Bitag%3D248%3Blmt%3D1586028917929782/rqh/1/hls_chunk_host/rr2---sn-n4v7snll.googlevideo.com/xpc/EgVo2aDSNQ%3D%3D/cps/348/met/1763092984,/mh/bg/mm/31,29/mn/sn-n4v7snll,sn-o097znzr/ms/au,rdu/mv/m/mvi/2/pl/38/rms/au,au/gcr/us/initcwndbps/2211250/bui/AdEuB5QT-6iaXGZZjQsFQ8ZuRQagE2aGNIqQfWA1AKyACBtZZKtzyGKfsKMXLbkTZmq8pGQWEQeWKpkW/spc/6b0G_FDLx8DzfxMHuf_u0nvJVuNnyDMSVpQLvbDO9KTLKsm-xPO7sZEhgBFFE6XJ/vprv/1/playlist_type/DVR/dover/13/txp/5531432/mt/1763092673/fvip/4/short_key/1/keepalive/yes/fexp/51552689,51565116,51565681,51580968/sparams/expire,ei,ip,id,itag,source,requiressl,ratebypass,pfa,wft,sgovp,rqh,xpc,gcr,bui,spc,vprv,playlist_type/sig/AJfQdSswRQIhAP2A8ls6wvmXFX-jKuNgC00AZx-ccs-ImXKqhQxeNV75AiByzwQbtjb7u3UsEQm8xl-Dp4vhN1GHYFiZKf6a9WPyPg%3D%3D/lsparams/hls_chunk_host,cps,met,mh,mm,mn,ms,mv,mvi,pl,rms,initcwndbps/lsig/APaTxxMwRQIgQ1J0tyg7jyTPcem1pMXm_AaJvKU0tmB2Z7CMOiB66q8CIQDWITK5OQamzr6QlRMkyDf0mHE32p0WhGCe8X0KszlStw%3D%3D/playlist/index.m3u8'\n[hlsnative] Downloading m3u8 manifest\nWARNING: hlsnative has detected features it does not support, extraction will be delegated to ffmpeg\n[download] Destination: Another One Bites The Dust (Remastered 2011)-PqUenEMwsdQ.mp4\n[debug] ffmpeg command line: ffmpeg -y -loglevel verbose -headers 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\n.\n.\n.\nExiting with exit code 0\n[ffmpeg] Downloaded 4567201 bytes\n[download] 100% of 4.36MiB in 00:04\n[download] 100% of 4.36MiB in 00:04\n[debug] ffmpeg command line: ffprobe -show_streams 'file:Another One Bites The Dust (Remastered 2011)-PqUenEMwsdQ.mp4'\n[debug] ffmpeg command line: ffprobe -show_streams 'file:Another One Bites The Dust (Remastered 2011)-PqUenEMwsdQ.mp4'\nERROR: WARNING: unable to obtain file audio codec with ffprobe\nTraceback (most recent call last):\n File \"/Users/bk/wb/py/youtube-dl/lib/python3.9/site-packages/youtube_dl/YoutubeDL.py\", line 2334, in post_process\n files_to_delete, info = pp.run(info)\n File \"/Users/bk/wb/py/youtube-dl/lib/python3.9/site-packages/youtube_dl/postprocessor/ffmpeg.py\", line 270, in run\n raise PostProcessingError('WARNING: unable to obtain file audio codec with ffprobe')\nyoutube_dl.utils.PostProcessingError: WARNING: unable to obtain file audio codec with ffprobe\n```\n\n## Description\n\nGetting **ERROR: WARNING: unable to obtain file audio codec with ffprobe**. Have tried this with multiple URL's and eve ones that have worked previously and get the same error on all of them. I did see similar issues (all 2+ years ago), however they did not offer a fix that worked for me. Most seem to indicate that ffprobe is broken, but when I run the command I see in the debug seems execute just fine.\n\n[YouTube,etc]\n\n<details>\r\n<summary>Boilerplate: own+yt-dlp code, bug fix+improvement</summary>\r\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] [Searched](https://github.com/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)\r\n- [x] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them\r\n- [x] Covered the code with tests (note that PRs without tests will be REJECTED)\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/), except code from yt-dlp, for which this or the below has been asserted\r\n- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\n### What is the purpose of your *pull request*?\r\n- [x] Bug fix\r\n- [x] Improvement\r\n- [ ] New extractor\r\n- [ ] New feature\r\n\r\n</details>\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\nThis PR updates the YT extractor to use different clients for video extraction, for as long as that works without some equivalent of yt-dlp/yt-dlp#14157, and makes the selection stable across supported Pythons.\r\n\r\nUnder the hood\r\n* adds `partial_application` decorator function from _yt-dlp_ and applies it to relevant `utils` function \r\n* adds new `compat` definitions: `compat_filter_fns`, `compat_thread`, `compat_abc_ABC`\r\n* adds `compat_dict` and `compat_dict_items` to support insertion-order-preserving dicts in all supported Pythons\r\n* uses this to make traversal results stable\r\n* adds `filter` traversal key and further traversal helper functions (`require`, `value`, `unpack`, `subs_list_to_dict`) from _yt-dlp_ with consequent test updates\r\n* aligns `parse_duration()` behaviour with yt-dlp\r\n* also fixes a few subsidiary YT-related bugs\r\n - completes the definition of `available_at`\r\n - targets pre-roll wait better\r\n - avoids spurious chapter extraction\r\n - improves mark_watched\r\n - improves detection of geo-restriction\r\n - fixes playlist thumbnail extraction\r\n - adds more codecs and dynamic range support - fixes #33217.\r\n\r\nResolves #33200.\r\nResolves #33212."},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `test/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request","scope_files":["test/helper.py","test/test_traversal.py","test/test_utils.py"]},{"subtask_id":"s2","goal":"Implement the changes under `youtube_dl/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request","scope_files":["youtube_dl/YoutubeDL.py","youtube_dl/compat.py","youtube_dl/options.py","youtube_dl/traversal.py","youtube_dl/utils.py"]},{"subtask_id":"s3","goal":"Implement the changes under `youtube_dl/extractor/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request","scope_files":["youtube_dl/extractor/common.py","youtube_dl/extractor/youtube.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `test/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request\",\n \"scope_files\": [\n \"test/helper.py\",\n \"test/test_traversal.py\",\n \"test/test_utils.py\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `youtube_dl/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request\",\n \"scope_files\": [\n \"youtube_dl/YoutubeDL.py\",\n \"youtube_dl/compat.py\",\n \"youtube_dl/options.py\",\n \"youtube_dl/traversal.py\",\n \"youtube_dl/utils.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `youtube_dl/extractor/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request\",\n \"scope_files\": [\n \"youtube_dl/extractor/common.py\",\n \"youtube_dl/extractor/youtube.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":["test/helper.py","test/test_traversal.py","test/test_utils.py"],"solution_diff":"diff --git a/test/helper.py b/test/helper.py\nindex 6f2129efff3..fac069d25c9 100644\n--- a/test/helper.py\n+++ b/test/helper.py\n@@ -85,10 +85,10 @@ def expect_warning(self, regex):\n # Silence an expected warning matching a regex\n old_report_warning = self.report_warning\n \n- def report_warning(self, message):\n+ def report_warning(self, message, *args, **kwargs):\n if re.match(regex, message):\n return\n- old_report_warning(message)\n+ old_report_warning(message, *args, **kwargs)\n self.report_warning = types.MethodType(report_warning, self)\n \n \n@@ -265,11 +265,11 @@ def assertRegexpMatches(self, text, regexp, msg=None):\n def expect_warnings(ydl, warnings_re):\n real_warning = ydl.report_warning\n \n- def _report_warning(w):\n+ def _report_warning(self, w, *args, **kwargs):\n if not any(re.search(w_re, w) for w_re in warnings_re):\n real_warning(w)\n \n- ydl.report_warning = _report_warning\n+ ydl.report_warning = types.MethodType(_report_warning, ydl)\n \n \n def http_server_port(httpd):\ndiff --git a/test/test_traversal.py b/test/test_traversal.py\nindex 00a428edb7b..504cdee372d 100644\n--- a/test/test_traversal.py\n+++ b/test/test_traversal.py\n@@ -9,21 +9,32 @@\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\n \n \n+import itertools\n import re\n \n from youtube_dl.traversal import (\n dict_get,\n get_first,\n+ require,\n+ subs_list_to_dict,\n T,\n traverse_obj,\n+ unpack,\n+ value,\n )\n from youtube_dl.compat import (\n+ compat_chr as chr,\n compat_etree_fromstring,\n compat_http_cookies,\n+ compat_map as map,\n compat_str,\n+ compat_zip as zip,\n )\n from youtube_dl.utils import (\n+ determine_ext,\n+ ExtractorError,\n int_or_none,\n+ join_nonempty,\n str_or_none,\n )\n \n@@ -446,42 +457,164 @@ def test_traversal_unbranching(self):\n msg='`any` should allow further branching')\n \n def test_traversal_morsel(self):\n- values = {\n- 'expires': 'a',\n- 'path': 'b',\n- 'comment': 'c',\n- 'domain': 'd',\n- 'max-age': 'e',\n- 'secure': 'f',\n- 'httponly': 'g',\n- 'version': 'h',\n- 'samesite': 'i',\n- }\n- # SameSite added in Py3.8, breaks .update for 3.5-3.7\n- if sys.version_info < (3, 8):\n- del values['samesite']\n morsel = compat_http_cookies.Morsel()\n+ # SameSite added in Py3.8, breaks .update for 3.5-3.7\n+ # Similarly Partitioned, Py3.14, thx Grub4k\n+ values = dict(zip(morsel, map(chr, itertools.count(ord('a')))))\n morsel.set(str('item_key'), 'item_value', 'coded_value')\n morsel.update(values)\n- values['key'] = str('item_key')\n- values['value'] = 'item_value'\n+ values.update({\n+ 'key': str('item_key'),\n+ 'value': 'item_value',\n+ }),\n values = dict((str(k), v) for k, v in values.items())\n- # make test pass even without ordered dict\n- value_set = set(values.values())\n \n- for key, value in values.items():\n- self.assertEqual(traverse_obj(morsel, key), value,\n+ for key, val in values.items():\n+ self.assertEqual(traverse_obj(morsel, key), val,\n msg='Morsel should provide access to all values')\n- self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,\n- msg='`...` should yield all values')\n- self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,\n- msg='function key should yield all values')\n+ values = list(values.values())\n+ self.assertMaybeCountEqual(traverse_obj(morsel, Ellipsis), values,\n+ msg='`...` should yield all values')\n+ self.assertMaybeCountEqual(traverse_obj(morsel, lambda k, v: True), values,\n+ msg='function key should yield all values')\n self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,\n msg='Morsel should not be implicitly changed to dict on usage')\n \n- def test_get_first(self):\n- self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\n-\n+ def test_traversal_filter(self):\n+ data = [None, False, True, 0, 1, 0.0, 1.1, '', 'str', {}, {0: 0}, [], [1]]\n+\n+ self.assertEqual(\n+ traverse_obj(data, (Ellipsis, filter)),\n+ [True, 1, 1.1, 'str', {0: 0}, [1]],\n+ '`filter` should filter falsy values')\n+\n+\n+class TestTraversalHelpers(_TestCase):\n+ def test_traversal_require(self):\n+ with self.assertRaises(ExtractorError, msg='Missing `value` should raise'):\n+ traverse_obj(_TEST_DATA, ('None', T(require('value'))))\n+ self.assertEqual(\n+ traverse_obj(_TEST_DATA, ('str', T(require('value')))), 'str',\n+ '`require` should pass through non-`None` values')\n+\n+ def test_subs_list_to_dict(self):\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.vtt'},\n+ {'name': 'en', 'url': 'https://example.com/subs/en1.ass'},\n+ {'name': 'en', 'url': 'https://example.com/subs/en2.ass'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict)]), {\n+ 'de': [{'url': 'https://example.com/subs/de.vtt'}],\n+ 'en': [\n+ {'url': 'https://example.com/subs/en1.ass'},\n+ {'url': 'https://example.com/subs/en2.ass'},\n+ ],\n+ }, 'function should build subtitle dict from list of subtitles')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\n+ {'name': 'de'},\n+ {'name': 'en', 'content': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'data': 'content',\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(lang=None))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\n+ 'en': [{'data': 'content'}],\n+ }, 'subs with mandatory items missing should be filtered')\n+ self.assertEqual(traverse_obj([\n+ {'url': 'https://example.com/subs/de.ass', 'name': 'de'},\n+ {'url': 'https://example.com/subs/en', 'name': 'en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'ext': ['url', T(determine_ext(default_ext=None))],\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass', 'ext': 'ass'}],\n+ 'en': [{'url': 'https://example.com/subs/en', 'ext': 'ext'}],\n+ }, '`ext` should set default ext but leave existing value untouched')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'en', 'url': 'https://example.com/subs/en2', 'prio': True},\n+ {'name': 'en', 'url': 'https://example.com/subs/en1', 'prio': False},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'quality': ['prio', T(int)],\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {'en': [\n+ {'url': 'https://example.com/subs/en1', 'ext': 'ext'},\n+ {'url': 'https://example.com/subs/en2', 'ext': 'ext'},\n+ ]}, '`quality` key should sort subtitle list accordingly')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\n+ {'name': 'de'},\n+ {'name': 'en', 'content': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'data': 'content',\n+ }, all, T(subs_list_to_dict(lang='en'))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\n+ 'en': [\n+ {'data': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ],\n+ }, 'optionally provided lang should be used if no id available')\n+ self.assertEqual(traverse_obj([\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'ext': 'ext',\n+ }, all, T(subs_list_to_dict(lang=None))]), {\n+ 'de': [\n+ {'url': 'https://example.com/subs/de3'},\n+ {'url': 'https://example.com/subs/de4'},\n+ ],\n+ }, 'non str types should be ignored for id and ext')\n+ self.assertEqual(traverse_obj([\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'ext': 'ext',\n+ }, all, T(subs_list_to_dict(lang='de'))]), {\n+ 'de': [\n+ {'url': 'https://example.com/subs/de1'},\n+ {'url': 'https://example.com/subs/de2'},\n+ {'url': 'https://example.com/subs/de3'},\n+ {'url': 'https://example.com/subs/de4'},\n+ ],\n+ }, 'non str types should be replaced by default id')\n+\n+ def test_unpack(self):\n+ self.assertEqual(\n+ unpack(lambda *x: ''.join(map(compat_str, x)))([1, 2, 3]), '123')\n+ self.assertEqual(\n+ unpack(join_nonempty)([1, 2, 3]), '1-2-3')\n+ self.assertEqual(\n+ unpack(join_nonempty, delim=' ')([1, 2, 3]), '1 2 3')\n+ with self.assertRaises(TypeError):\n+ unpack(join_nonempty)()\n+ with self.assertRaises(TypeError):\n+ unpack()\n+\n+ def test_value(self):\n+ self.assertEqual(\n+ traverse_obj(_TEST_DATA, ('str', T(value('other')))), 'other',\n+ '`value` should substitute specified value')\n+\n+\n+class TestDictGet(_TestCase):\n def test_dict_get(self):\n FALSE_VALUES = {\n 'none': None,\n@@ -504,6 +637,9 @@ def test_dict_get(self):\n self.assertEqual(dict_get(d, ('b', 'c', key, )), None)\n self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)\n \n+ def test_get_first(self):\n+ self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\n+\n \n if __name__ == '__main__':\n unittest.main()\ndiff --git a/test/test_utils.py b/test/test_utils.py\nindex 2947cce7eb3..1106f2819b8 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -69,6 +69,7 @@\n parse_iso8601,\n parse_resolution,\n parse_qs,\n+ partial_application,\n pkcs1pad,\n prepend_extension,\n read_batch_urls,\n@@ -664,6 +665,8 @@ def test_parse_duration(self):\n self.assertEqual(parse_duration('3h 11m 53s'), 11513)\n self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)\n self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)\n+ self.assertEqual(parse_duration('3 hours, 11 minutes, 53 seconds'), 11513)\n+ self.assertEqual(parse_duration('3 hours, 11 mins, 53 secs'), 11513)\n self.assertEqual(parse_duration('62m45s'), 3765)\n self.assertEqual(parse_duration('6m59s'), 419)\n self.assertEqual(parse_duration('49s'), 49)\n@@ -682,6 +685,10 @@ def test_parse_duration(self):\n self.assertEqual(parse_duration('PT1H0.040S'), 3600.04)\n self.assertEqual(parse_duration('PT00H03M30SZ'), 210)\n self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)\n+ self.assertEqual(parse_duration('01:02:03:050'), 3723.05)\n+ self.assertEqual(parse_duration('103:050'), 103.05)\n+ self.assertEqual(parse_duration('1HR 3MIN'), 3780)\n+ self.assertEqual(parse_duration('2hrs 3mins'), 7380)\n \n def test_fix_xml_ampersands(self):\n self.assertEqual(\n@@ -895,6 +902,30 @@ def test_parse_codecs(self):\n 'vcodec': 'av01.0.05M.08',\n 'acodec': 'none',\n })\n+ self.assertEqual(parse_codecs('vp9.2'), {\n+ 'vcodec': 'vp9.2',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('vp09.02.50.10.01.09.18.09.00'), {\n+ 'vcodec': 'vp09.02.50.10.01.09.18.09.00',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('av01.0.12M.10.0.110.09.16.09.0'), {\n+ 'vcodec': 'av01.0.12M.10.0.110.09.16.09.0',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('dvhe'), {\n+ 'vcodec': 'dvhe',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'DV',\n+ })\n+ self.assertEqual(parse_codecs('fLaC'), {\n+ 'vcodec': 'none',\n+ 'acodec': 'flac',\n+ })\n self.assertEqual(parse_codecs('theora, vorbis'), {\n 'vcodec': 'theora',\n 'acodec': 'vorbis',\n@@ -1723,6 +1754,21 @@ def test_join_nonempty(self):\n 'a', 'b', 'c', 'd',\n from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')\n \n+ def test_partial_application(self):\n+ test_fn = partial_application(lambda x, kwarg=None: '{0}, kwarg={1!r}'.format(x, kwarg))\n+ self.assertTrue(\n+ callable(test_fn(kwarg=10)),\n+ 'missing positional parameter should apply partially')\n+ self.assertEqual(\n+ test_fn(10, kwarg=42), '10, kwarg=42',\n+ 'positionally passed argument should call function')\n+ self.assertEqual(\n+ test_fn(x=10), '10, kwarg=None',\n+ 'keyword passed positional should call function')\n+ self.assertEqual(\n+ test_fn(kwarg=42)(10), '10, kwarg=42',\n+ 'call after partial application should call the function')\n+\n \n if __name__ == '__main__':\n unittest.main()\n","summary":"Edited 3 file(s) in test/"},{"subtask_id":"s2","scope_files":["youtube_dl/YoutubeDL.py","youtube_dl/compat.py","youtube_dl/options.py","youtube_dl/traversal.py","youtube_dl/utils.py"],"solution_diff":"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\nindex 8367b6e5345..ec1d35c3aca 100755\n--- a/youtube_dl/YoutubeDL.py\n+++ b/youtube_dl/YoutubeDL.py\n@@ -357,7 +357,7 @@ class YoutubeDL(object):\n \n _NUMERIC_FIELDS = set((\n 'width', 'height', 'tbr', 'abr', 'asr', 'vbr', 'fps', 'filesize', 'filesize_approx',\n- 'timestamp', 'upload_year', 'upload_month', 'upload_day',\n+ 'timestamp', 'upload_year', 'upload_month', 'upload_day', 'available_at',\n 'duration', 'view_count', 'like_count', 'dislike_count', 'repost_count',\n 'average_rating', 'comment_count', 'age_limit',\n 'start_time', 'end_time',\ndiff --git a/youtube_dl/compat.py b/youtube_dl/compat.py\nindex ebe22bdf9d1..a985cb03e84 100644\n--- a/youtube_dl/compat.py\n+++ b/youtube_dl/compat.py\n@@ -55,7 +55,7 @@\n try:\n import collections.abc as compat_collections_abc\n except ImportError:\n- import collections as compat_collections_abc\n+ compat_collections_abc = collections\n \n \n # compat_urllib_request\n@@ -3452,6 +3452,8 @@ def unpack(self, string):\n except ImportError:\n compat_map = map\n \n+\n+# compat_filter, compat_filter_fns\n try:\n from future_builtins import filter as compat_filter\n except ImportError:\n@@ -3459,6 +3461,9 @@ def unpack(self, string):\n from itertools import ifilter as compat_filter\n except ImportError:\n compat_filter = filter\n+# \"Is this function one or maybe the other filter()?\"\n+compat_filter_fns = tuple(set((filter, compat_filter)))\n+\n \n # compat_zip\n try:\n@@ -3478,6 +3483,40 @@ def unpack(self, string):\n from itertools import izip_longest as compat_itertools_zip_longest\n \n \n+# compat_abc_ABC\n+try:\n+ from abc import ABC as compat_abc_ABC\n+except ImportError:\n+ # Py < 3.4\n+ from abc import ABCMeta as _ABCMeta\n+ compat_abc_ABC = _ABCMeta(str('ABC'), (object,), {})\n+\n+\n+# dict mixin used here\n+# like UserDict.DictMixin, without methods created by MutableMapping\n+class _DictMixin(compat_abc_ABC):\n+ def has_key(self, key):\n+ return key in self\n+\n+ # get(), clear(), setdefault() in MM\n+\n+ def iterkeys(self):\n+ return (k for k in self)\n+\n+ def itervalues(self):\n+ return (self[k] for k in self)\n+\n+ def iteritems(self):\n+ return ((k, self[k]) for k in self)\n+\n+ # pop(), popitem() in MM\n+\n+ def copy(self):\n+ return type(self)(self)\n+\n+ # update() in MM\n+\n+\n # compat_collections_chain_map\n # collections.ChainMap: new class\n try:\n@@ -3632,6 +3671,129 @@ def compat_datetime_timedelta_total_seconds(td):\n compat_zstandard = None\n \n \n+# compat_thread\n+try:\n+ import _thread as compat_thread\n+except ImportError:\n+ try:\n+ import thread as compat_thread\n+ except ImportError:\n+ import dummy_thread as compat_thread\n+\n+\n+# compat_dict\n+# compat_builtins_dict\n+# compat_dict_items\n+if sys.version_info >= (3, 6):\n+ compat_dict = compat_builtins_dict = dict\n+ compat_dict_items = dict.items\n+else:\n+ _get_ident = compat_thread.get_ident\n+\n+ class compat_dict(compat_collections_abc.MutableMapping, _DictMixin, dict):\n+ \"\"\"`dict` that preserves insertion order with interface like Py3.7+\"\"\"\n+\n+ _order = [] # default that should never be used\n+\n+ def __init__(self, *mappings_or_iterables, **kwargs):\n+ # order an unordered dict using a list of keys: actual Py 2.7+\n+ # OrderedDict uses a doubly linked list for better performance\n+ self._order = []\n+ for arg in mappings_or_iterables:\n+ self.__update(arg)\n+ if kwargs:\n+ self.__update(kwargs)\n+\n+ def __getitem__(self, key):\n+ return dict.__getitem__(self, key)\n+\n+ def __setitem__(self, key, value):\n+ try:\n+ if key not in self._order:\n+ self._order.append(key)\n+ dict.__setitem__(self, key, value)\n+ except Exception:\n+ if key in self._order[-1:] and key not in self:\n+ del self._order[-1]\n+ raise\n+\n+ def __len__(self):\n+ return dict.__len__(self)\n+\n+ def __delitem__(self, key):\n+ dict.__delitem__(self, key)\n+ try:\n+ # expected case, O(len(self)), but who dels anyway?\n+ self._order.remove(key)\n+ except ValueError:\n+ pass\n+\n+ def __iter__(self):\n+ for from_ in self._order:\n+ if from_ in self:\n+ yield from_\n+\n+ def __del__(self):\n+ for attr in ('_order',):\n+ try:\n+ delattr(self, attr)\n+ except Exception:\n+ pass\n+\n+ def __repr__(self, _repr_running={}):\n+ # skip recursive items ...\n+ call_key = id(self), _get_ident()\n+ if _repr_running.get(call_key):\n+ return '...'\n+ _repr_running[call_key] = True\n+ try:\n+ return '%s({%s})' % (\n+ type(self).__name__,\n+ ','.join('%r: %r' % k_v for k_v in self.items()))\n+ finally:\n+ del _repr_running[call_key]\n+\n+ # merge/update (PEP 584)\n+\n+ def __or__(self, other):\n+ if not isinstance(other, compat_collections_abc.Mapping):\n+ return NotImplemented\n+ new = type(self)(self)\n+ new.update(other)\n+ return new\n+\n+ def __ror__(self, other):\n+ if not isinstance(other, compat_collections_abc.Mapping):\n+ return NotImplemented\n+ new = type(other)(other)\n+ new.update(self)\n+ return new\n+\n+ def __ior__(self, other):\n+ self.update(other)\n+ return self\n+\n+ # optimisations\n+\n+ def __reversed__(self):\n+ for from_ in reversed(self._order):\n+ if from_ in self:\n+ yield from_\n+\n+ def __contains__(self, item):\n+ return dict.__contains__(self, item)\n+\n+ # allow overriding update without breaking __init__\n+ def __update(self, *args, **kwargs):\n+ super(compat_dict, self).update(*args, **kwargs)\n+\n+ compat_builtins_dict = dict\n+ # Using the object's method, not dict's:\n+ # an ordered dict's items can be returned unstably by unordered\n+ # dict.items as if the method was not ((k, self[k]) for k in self)\n+ compat_dict_items = lambda d: d.items()\n+\n+\n legacy = [\n 'compat_HTMLParseError',\n 'compat_HTMLParser',\n@@ -3662,9 +3824,11 @@ def compat_datetime_timedelta_total_seconds(td):\n \n __all__ = [\n 'compat_Struct',\n+ 'compat_abc_ABC',\n 'compat_base64_b64decode',\n 'compat_basestring',\n 'compat_brotli',\n+ 'compat_builtins_dict',\n 'compat_casefold',\n 'compat_chr',\n 'compat_collections_abc',\n@@ -3672,9 +3836,12 @@ def compat_datetime_timedelta_total_seconds(td):\n 'compat_contextlib_suppress',\n 'compat_ctypes_WINFUNCTYPE',\n 'compat_datetime_timedelta_total_seconds',\n+ 'compat_dict',\n+ 'compat_dict_items',\n 'compat_etree_fromstring',\n 'compat_etree_iterfind',\n 'compat_filter',\n+ 'compat_filter_fns',\n 'compat_get_terminal_size',\n 'compat_getenv',\n 'compat_getpass_getpass',\n@@ -3716,6 +3883,7 @@ def compat_datetime_timedelta_total_seconds(td):\n 'compat_struct_unpack',\n 'compat_subprocess_get_DEVNULL',\n 'compat_subprocess_Popen',\n+ 'compat_thread',\n 'compat_tokenize_tokenize',\n 'compat_urllib_error',\n 'compat_urllib_parse',\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\nindex ce3633c418e..9b0d77a236f 100644\n--- a/youtube_dl/options.py\n+++ b/youtube_dl/options.py\n@@ -421,12 +421,12 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n action='store', dest='youtube_player_js_variant',\n help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\n choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\n- default='main', metavar='VARIANT')\n+ default='actual', metavar='VARIANT')\n video_format.add_option(\n '--youtube-player-js-version',\n action='store', dest='youtube_player_js_version',\n help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\n- default='20348@0004de42', metavar='STS@HASH')\n+ default='actual', metavar='STS@HASH')\n video_format.add_option(\n '--merge-output-format',\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\ndiff --git a/youtube_dl/traversal.py b/youtube_dl/traversal.py\nindex 834cfef7fab..1de48b145a5 100644\n--- a/youtube_dl/traversal.py\n+++ b/youtube_dl/traversal.py\n@@ -5,6 +5,10 @@\n from .utils import (\n dict_get,\n get_first,\n+ require,\n+ subs_list_to_dict,\n T,\n traverse_obj,\n+ unpack,\n+ value,\n )\ndiff --git a/youtube_dl/utils.py b/youtube_dl/utils.py\nindex c4262936e0b..02a49ff49c3 100644\n--- a/youtube_dl/utils.py\n+++ b/youtube_dl/utils.py\n@@ -53,6 +53,8 @@\n compat_etree_fromstring,\n compat_etree_iterfind,\n compat_expanduser,\n+ compat_filter as filter,\n+ compat_filter_fns,\n compat_html_entities,\n compat_html_entities_html5,\n compat_http_client,\n@@ -1859,6 +1861,39 @@ def write_json_file(obj, fn):\n raise\n \n \n+class partial_application(object):\n+ \"\"\"Allow a function to use pre-set argument values\"\"\"\n+\n+ # see _try_bind_args()\n+ try:\n+ inspect.signature\n+\n+ @staticmethod\n+ def required_args(fn):\n+ return [\n+ param.name for param in inspect.signature(fn).parameters.values()\n+ if (param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)\n+ and param.default is inspect.Parameter.empty)]\n+\n+ except AttributeError:\n+\n+ # Py < 3.3\n+ @staticmethod\n+ def required_args(fn):\n+ fn_args = inspect.getargspec(fn)\n+ n_defaults = len(fn_args.defaults or [])\n+ return (fn_args.args or [])[:-n_defaults if n_defaults > 0 else None]\n+\n+ def __new__(cls, func):\n+ @functools.wraps(func)\n+ def wrapped(*args, **kwargs):\n+ if set(cls.required_args(func)[len(args):]).difference(kwargs):\n+ return functools.partial(func, *args, **kwargs)\n+ return func(*args, **kwargs)\n+\n+ return wrapped\n+\n+\n if sys.version_info >= (2, 7):\n def find_xpath_attr(node, xpath, key, val=None):\n \"\"\" Find the xpath xpath[@key=val] \"\"\"\n@@ -3152,6 +3187,7 @@ def extract_timezone(date_str):\n return timezone, date_str\n \n \n+@partial_application\n def parse_iso8601(date_str, delimiter='T', timezone=None):\n \"\"\" Return a UNIX timestamp from the given date \"\"\"\n \n@@ -3229,6 +3265,7 @@ def unified_timestamp(date_str, day_first=True):\n return calendar.timegm(timetuple) + pm_delta * 3600 - compat_datetime_timedelta_total_seconds(timezone)\n \n \n+@partial_application\n def determine_ext(url, default_ext='unknown_video'):\n if url is None or '.' not in url:\n return default_ext\n@@ -3807,6 +3844,7 @@ def base_url(url):\n return re.match(r'https?://[^?#&]+/', url).group()\n \n \n+@partial_application\n def urljoin(base, path):\n path = _decode_compat_str(path, encoding='utf-8', or_none=True)\n if not path:\n@@ -3831,6 +3869,7 @@ def get_method(self):\n return 'PUT'\n \n \n+@partial_application\n def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):\n if get_attr:\n if v is not None:\n@@ -3857,6 +3896,7 @@ def str_to_int(int_str):\n return int_or_none(int_str)\n \n \n+@partial_application\n def float_or_none(v, scale=1, invscale=1, default=None):\n if v is None:\n return default\n@@ -3891,38 +3931,46 @@ def parse_duration(s):\n return None\n \n s = s.strip()\n+ if not s:\n+ return None\n \n days, hours, mins, secs, ms = [None] * 5\n- m = re.match(r'(?:(?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?(?P<mins>[0-9]+):)?(?P<secs>[0-9]+)(?P<ms>\\.[0-9]+)?Z?$', s)\n+ m = re.match(r'''(?x)\n+ (?P<before_secs>\n+ (?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?\n+ (?P<mins>[0-9]+):)?\n+ (?P<secs>(?(before_secs)[0-9]{1,2}|[0-9]+))\n+ (?:[.:](?P<ms>[0-9]+))?Z?$\n+ ''', s)\n if m:\n- days, hours, mins, secs, ms = m.groups()\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\n else:\n m = re.match(\n r'''(?ix)(?:P?\n (?:\n- [0-9]+\\s*y(?:ears?)?\\s*\n+ [0-9]+\\s*y(?:ears?)?,?\\s*\n )?\n (?:\n- [0-9]+\\s*m(?:onths?)?\\s*\n+ [0-9]+\\s*m(?:onths?)?,?\\s*\n )?\n (?:\n- [0-9]+\\s*w(?:eeks?)?\\s*\n+ [0-9]+\\s*w(?:eeks?)?,?\\s*\n )?\n (?:\n- (?P<days>[0-9]+)\\s*d(?:ays?)?\\s*\n+ (?P<days>[0-9]+)\\s*d(?:ays?)?,?\\s*\n )?\n T)?\n (?:\n- (?P<hours>[0-9]+)\\s*h(?:ours?)?\\s*\n+ (?P<hours>[0-9]+)\\s*h(?:(?:ou)?rs?)?,?\\s*\n )?\n (?:\n- (?P<mins>[0-9]+)\\s*m(?:in(?:ute)?s?)?\\s*\n+ (?P<mins>[0-9]+)\\s*m(?:in(?:ute)?s?)?,?\\s*\n )?\n (?:\n- (?P<secs>[0-9]+)(?P<ms>\\.[0-9]+)?\\s*s(?:ec(?:ond)?s?)?\\s*\n+ (?P<secs>[0-9]+)(?:\\.(?P<ms>[0-9]+))?\\s*s(?:ec(?:ond)?s?)?\\s*\n )?Z?$''', s)\n if m:\n- days, hours, mins, secs, ms = m.groups()\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\n else:\n m = re.match(r'(?i)(?:(?P<hours>[0-9.]+)\\s*(?:hours?)|(?P<mins>[0-9.]+)\\s*(?:mins?\\.?|minutes?)\\s*)Z?$', s)\n if m:\n@@ -3930,17 +3978,13 @@ def parse_duration(s):\n else:\n return None\n \n- duration = 0\n- if secs:\n- duration += float(secs)\n- if mins:\n- duration += float(mins) * 60\n- if hours:\n- duration += float(hours) * 60 * 60\n- if days:\n- duration += float(days) * 24 * 60 * 60\n- if ms:\n- duration += float(ms)\n+ duration = (\n+ ((((float(days) * 24) if days else 0)\n+ + (float(hours) if hours else 0)) * 60\n+ + (float(mins) if mins else 0)) * 60\n+ + (float(secs) if secs else 0)\n+ + (float(ms) / 10 ** len(ms) if ms else 0))\n+\n return duration\n \n \n@@ -4251,6 +4295,7 @@ def urlencode_postdata(*args, **kargs):\n return compat_urllib_parse_urlencode(*args, **kargs).encode('ascii')\n \n \n+@partial_application\n def update_url(url, **kwargs):\n \"\"\"Replace URL components specified by kwargs\n url: compat_str or parsed URL tuple\n@@ -4272,6 +4317,7 @@ def update_url(url, **kwargs):\n return compat_urllib_parse.urlunparse(url._replace(**kwargs))\n \n \n+@partial_application\n def update_url_query(url, query):\n return update_url(url, query_update=query)\n \n@@ -4698,30 +4744,45 @@ def parse_codecs(codecs_str):\n if not codecs_str:\n return {}\n split_codecs = list(filter(None, map(\n- lambda str: str.strip(), codecs_str.strip().strip(',').split(','))))\n- vcodec, acodec = None, None\n+ lambda s: s.strip(), codecs_str.strip().split(','))))\n+ vcodec, acodec, hdr = None, None, None\n for full_codec in split_codecs:\n- codec = full_codec.split('.')[0]\n- if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2', 'h263', 'h264', 'mp4v', 'hvc1', 'av01', 'theora'):\n- if not vcodec:\n- vcodec = full_codec\n- elif codec in ('mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\n+ codec, rest = full_codec.partition('.')[::2]\n+ codec = codec.lower()\n+ full_codec = '.'.join((codec, rest)) if rest else codec\n+ codec = re.sub(r'0+(?=\\d)', '', codec)\n+ if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2',\n+ 'h263', 'h264', 'mp4v', 'hvc1', 'av1', 'theora', 'dvh1', 'dvhe'):\n+ if vcodec:\n+ continue\n+ vcodec = full_codec\n+ if codec in ('dvh1', 'dvhe'):\n+ hdr = 'DV'\n+ elif codec in ('av1', 'vp9'):\n+ n, m = {\n+ 'av1': (2, '10'),\n+ 'vp9': (0, '2'),\n+ }[codec]\n+ if (rest.split('.', n + 1)[n:] or [''])[0].lstrip('0') == m:\n+ hdr = 'HDR10'\n+ elif codec in ('flac', 'mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-4',\n+ 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\n if not acodec:\n acodec = full_codec\n else:\n- write_string('WARNING: Unknown codec %s\\n' % full_codec, sys.stderr)\n- if not vcodec and not acodec:\n- if len(split_codecs) == 2:\n- return {\n- 'vcodec': split_codecs[0],\n- 'acodec': split_codecs[1],\n- }\n- else:\n- return {\n+ write_string('WARNING: Unknown codec %s\\n' % (full_codec,), sys.stderr)\n+\n+ return (\n+ filter_dict({\n 'vcodec': vcodec or 'none',\n 'acodec': acodec or 'none',\n- }\n- return {}\n+ 'dynamic_range': hdr,\n+ }) if vcodec or acodec\n+ else {\n+ 'vcodec': split_codecs[0],\n+ 'acodec': split_codecs[1],\n+ } if len(split_codecs) == 2\n+ else {})\n \n \n def urlhandle_detect_ext(url_handle):\n@@ -6283,6 +6344,7 @@ def traverse_obj(obj, *paths, **kwargs):\n Read as: `{key: traverse_obj(obj, path) for key, path in dct.items()}`.\n - `any`-builtin: Take the first matching object and return it, resetting branching.\n - `all`-builtin: Take all matching objects and return them as a list, resetting branching.\n+ - `filter`-builtin: Return the value if it is truthy, `None` otherwise.\n \n `tuple`, `list`, and `dict` all support nested paths and branches.\n \n@@ -6324,6 +6386,11 @@ def traverse_obj(obj, *paths, **kwargs):\n # instant compat\n str = compat_str\n \n+ from .compat import (\n+ compat_builtins_dict as dict_, # the basic dict type\n+ compat_dict as dict, # dict preserving imsertion order\n+ )\n+\n casefold = lambda k: compat_casefold(k) if isinstance(k, str) else k\n \n if isinstance(expected_type, type):\n@@ -6406,7 +6473,7 @@ def apply_key(key, obj, is_last):\n if not branching: # string traversal\n result = ''.join(result)\n \n- elif isinstance(key, dict):\n+ elif isinstance(key, dict_):\n iter_obj = ((k, _traverse_obj(obj, v, False, is_last)) for k, v in key.items())\n result = dict((k, v if v is not None else default) for k, v in iter_obj\n if v is not None or default is not NO_DEFAULT) or None\n@@ -6484,7 +6551,7 @@ def apply_path(start_obj, path, test_type):\n has_branched = False\n \n key = None\n- for last, key in lazy_last(variadic(path, (str, bytes, dict, set))):\n+ for last, key in lazy_last(variadic(path, (str, bytes, dict_, set))):\n if not casesense and isinstance(key, str):\n key = compat_casefold(key)\n \n@@ -6497,6 +6564,11 @@ def apply_path(start_obj, path, test_type):\n objs = (list(filtered_objs),)\n continue\n \n+ # filter might be from __builtin__, future_builtins, or itertools.ifilter\n+ if key in compat_filter_fns:\n+ objs = filter(None, objs)\n+ continue\n+\n if __debug__ and callable(key):\n # Verify function signature\n _try_bind_args(key, None, None)\n@@ -6509,10 +6581,10 @@ def apply_path(start_obj, path, test_type):\n \n objs = from_iterable(new_objs)\n \n- if test_type and not isinstance(key, (dict, list, tuple)):\n+ if test_type and not isinstance(key, (dict_, list, tuple)):\n objs = map(type_test, objs)\n \n- return objs, has_branched, isinstance(key, dict)\n+ return objs, has_branched, isinstance(key, dict_)\n \n def _traverse_obj(obj, path, allow_empty, test_type):\n results, has_branched, is_dict = apply_path(obj, path, test_type)\n@@ -6535,6 +6607,76 @@ def _traverse_obj(obj, path, allow_empty, test_type):\n return None if default is NO_DEFAULT else default\n \n \n+def value(value):\n+ return lambda _: value\n+\n+\n+class require(ExtractorError):\n+ def __init__(self, name, expected=False):\n+ super(require, self).__init__(\n+ 'Unable to extract {0}'.format(name), expected=expected)\n+\n+ def __call__(self, value):\n+ if value is None:\n+ raise self\n+\n+ return value\n+\n+\n+@partial_application\n+# typing: (subs: list[dict], /, *, lang='und', ext=None) -> dict[str, list[dict]\n+def subs_list_to_dict(subs, lang='und', ext=None):\n+ \"\"\"\n+ Convert subtitles from a traversal into a subtitle dict.\n+ The path should have an `all` immediately before this function.\n+\n+ Arguments:\n+ `lang` The default language tag for subtitle dicts with no\n+ `lang` (`und`: undefined)\n+ `ext` The default value for `ext` in the subtitle dicts\n+\n+ In the dict you can set the following additional items:\n+ `id` The language tag to which the subtitle dict should be added\n+ `quality` The sort order for each subtitle dict\n+ \"\"\"\n+\n+ result = collections.defaultdict(list)\n+\n+ for sub in subs:\n+ tn_url = url_or_none(sub.pop('url', None))\n+ if tn_url:\n+ sub['url'] = tn_url\n+ elif not sub.get('data'):\n+ continue\n+ sub_lang = sub.pop('id', None)\n+ if not isinstance(sub_lang, compat_str):\n+ if not lang:\n+ continue\n+ sub_lang = lang\n+ sub_ext = sub.get('ext')\n+ if not isinstance(sub_ext, compat_str):\n+ if not ext:\n+ sub.pop('ext', None)\n+ else:\n+ sub['ext'] = ext\n+ result[sub_lang].append(sub)\n+ result = dict(result)\n+\n+ for subs in result.values():\n+ subs.sort(key=lambda x: x.pop('quality', 0) or 0)\n+\n+ return result\n+\n+\n+def unpack(func, **kwargs):\n+ \"\"\"Make a function that applies `partial(func, **kwargs)` to its argument as *args\"\"\"\n+ @functools.wraps(func)\n+ def inner(items):\n+ return func(*items, **kwargs)\n+\n+ return inner\n+\n+\n def T(*x):\n \"\"\" For use in yt-dl instead of {type, ...} or set((type, ...)) \"\"\"\n return set(x)\n\n","summary":"Edited 5 file(s) in youtube_dl/"},{"subtask_id":"s3","scope_files":["youtube_dl/extractor/common.py","youtube_dl/extractor/youtube.py"],"solution_diff":"diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py\nindex a64fcfccc35..a0901dab5ab 100644\n--- a/youtube_dl/extractor/common.py\n+++ b/youtube_dl/extractor/common.py\n@@ -214,6 +214,7 @@ class InfoExtractor(object):\n width : height ratio as float.\n * no_resume The server does not support resuming the\n (HTTP or RTMP) download. Boolean.\n+ * available_at Unix timestamp of when a format will be available to download\n * downloader_options A dictionary of downloader options as\n described in FileDownloader\n \ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex c045bc8bc24..7965fa08a28 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -17,6 +17,8 @@\n compat_chr,\n compat_HTTPError,\n compat_map as map,\n+ compat_dict as o_dict,\n+ compat_dict_items as dict_items,\n compat_str,\n compat_urllib_parse,\n compat_urllib_parse_parse_qs as compat_parse_qs,\n@@ -86,8 +88,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n \n _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM)'\n \n- _INNERTUBE_CLIENTS = {\n- 'ios': {\n+ # priority order for now\n+ _INNERTUBE_CLIENTS = o_dict((\n+ # Doesn't require a PoToken for some reason: thx yt-dlp/yt-dlp#14693\n+ ('android_sdkless', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'ANDROID',\n+ 'clientVersion': '20.10.38',\n+ 'userAgent': 'com.google.android.youtube/20.10.38 (Linux; U; Android 11) gzip',\n+ 'osName': 'Android',\n+ 'osVersion': '11',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 3,\n+ 'REQUIRE_JS_PLAYER': False,\n+ 'WITH_COOKIES': False,\n+ }),\n+ ('ios', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'IOS',\n@@ -100,12 +118,13 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\n- 'REQUIRE_PO_TOKEN': False,\n+ 'REQUIRE_PO_TOKEN': True,\n 'REQUIRE_JS_PLAYER': False,\n- },\n+ 'WITH_COOKIES': False,\n+ }),\n # mweb has 'ultralow' formats\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\n- 'mweb': {\n+ ('mweb', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'MWEB',\n@@ -116,9 +135,19 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 2,\n 'REQUIRE_PO_TOKEN': True,\n+ }),\n+ ('tv_downgraded', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'TVHTML5',\n+ 'clientVersion': '4', # avoids SABR formats, thx yt-dlp/yt-dlp#14887\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n 'SUPPORTS_COOKIES': True,\n- },\n- 'tv': {\n+ }),\n+ ('tv', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'TVHTML5',\n@@ -128,10 +157,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n- 'SUPPORTS_COOKIES': True,\n- },\n-\n- 'web': {\n+ }),\n+ ('web', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n@@ -141,10 +168,20 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n 'REQUIRE_PO_TOKEN': True,\n+ }),\n+ ('web_embedded', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB_EMBEDDED_PLAYER',\n+ 'clientVersion': '1.20250923.21.00',\n+ 'embedUrl': 'https://www.youtube.com/', # Can be any valid URL\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 56,\n 'SUPPORTS_COOKIES': True,\n- },\n+ }),\n # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\n- 'web_safari': {\n+ ('web_safari', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n@@ -152,8 +189,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\n },\n },\n- },\n- }\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n+ 'SUPPORTS_COOKIES': True,\n+ 'REQUIRE_PO': True,\n+ }),\n+ # This client now requires sign-in for every video\n+ ('web_creator', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB_CREATOR',\n+ 'clientVersion': '1.20250922.03.00',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 62,\n+ 'REQUIRE_AUTH': True,\n+ 'SUPPORTS_COOKIES': True,\n+ 'WITH_COOKIES': True,\n+ }),\n+ ))\n \n def _login(self):\n \"\"\"\n@@ -430,6 +483,12 @@ def _extract_visitor_data(self, *args):\n ('responseContext', 'visitorData')),\n T(compat_str)))\n \n+ # @functools.cached_property\n+ def is_authenticated(self, _cache={}):\n+ if self not in _cache:\n+ _cache[self] = bool(self._generate_sapisidhash_header())\n+ return _cache[self]\n+\n def _extract_ytcfg(self, video_id, webpage):\n ytcfg = self._search_json(\n r'ytcfg\\.set\\s*\\(', webpage, 'ytcfg', video_id,\n@@ -474,6 +533,27 @@ def _extract_video(self, renderer):\n 'uploader': uploader,\n }\n \n+ @staticmethod\n+ def _get_text(data, *path_list, **kw_max_runs):\n+ max_runs = kw_max_runs.get('max_runs')\n+\n+ for path in path_list or [None]:\n+ if path is None:\n+ obj = [data] # shortcut\n+ else:\n+ obj = traverse_obj(data, tuple(variadic(path) + (all,)))\n+ for runs in traverse_obj(\n+ obj, ('simpleText', {'text': T(compat_str)}, all, filter),\n+ ('runs', lambda _, r: isinstance(r.get('text'), compat_str), all, filter),\n+ (T(list), lambda _, r: isinstance(r.get('text'), compat_str)),\n+ default=[]):\n+ max_runs = int_or_none(max_runs, default=len(runs))\n+ if max_runs < len(runs):\n+ runs = runs[:max_runs]\n+ text = ''.join(traverse_obj(runs, (Ellipsis, 'text')))\n+ if text:\n+ return text\n+\n @staticmethod\n def _extract_thumbnails(data, *path_list, **kw_final_key):\n \"\"\"\n@@ -1619,16 +1699,17 @@ def __init__(self, *args, **kwargs):\n self._player_cache = {}\n \n def _get_player_js_version(self):\n- player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\n- sts_hash = self._search_regex(\n- ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n- player_js_version, 'player_js_version', group=(1, 2), default=None)\n- if sts_hash:\n- return sts_hash\n- self.report_warning(\n- 'Invalid player JS version \"{0}\" specified. '\n- 'It should be \"{1}\" or in the format of {2}'.format(\n- player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n+ player_js_version = self.get_param('youtube_player_js_version')\n+ if player_js_version:\n+ sts_hash = self._search_regex(\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\n+ if sts_hash:\n+ return sts_hash\n+ self.report_warning(\n+ 'Invalid player JS version \"{0}\" specified. '\n+ 'It should be \"{1}\" or in the format of {2}'.format(\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n return None, None\n \n # *ytcfgs, webpage=None\n@@ -1643,18 +1724,18 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\n player_url = traverse_obj(\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\n- get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\n+ get_all=False, expected_type=self._yt_urljoin)\n \n- player_id_override = self._get_player_js_version()[1]\n-\n- requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\n+ requested_js_variant = self.get_param('youtube_player_js_variant')\n variant_js = next(\n (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\n None)\n if variant_js:\n+ player_id_override = self._get_player_js_version()[1]\n player_id = player_id_override or self._extract_player_info(player_url)\n original_url = player_url\n- player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\n+ player_url = self._yt_urljoin(\n+ '/s/player/{0}/{1}'.format(player_id, variant_js))\n if original_url != player_url:\n self.write_debug(\n 'Forcing \"{0}\" player JS variant for player {1}\\n'\n@@ -1668,7 +1749,7 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\n only_once=True)\n \n- return urljoin('https://www.youtube.com', player_url)\n+ return player_url\n \n def _download_player_url(self, video_id, fatal=False):\n res = self._download_webpage(\n@@ -2048,8 +2129,7 @@ def decrypt_nsig(n):\n return self._cached(self._decrypt_nsig, 'nsig', n, player_url)\n \n for fmt in formats:\n- parsed_fmt_url = compat_urllib_parse.urlparse(fmt['url'])\n- n_param = compat_parse_qs(parsed_fmt_url.query).get('n')\n+ n_param = parse_qs(fmt['url']).get('n')\n if not n_param:\n continue\n n_param = n_param[-1]\n@@ -2098,32 +2178,35 @@ def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=F\n return sts\n \n def _mark_watched(self, video_id, player_response):\n- playback_url = url_or_none(try_get(\n- player_response,\n- lambda x: x['playbackTracking']['videostatsPlaybackUrl']['baseUrl']))\n- if not playback_url:\n- return\n-\n # cpn generation algorithm is reverse engineered from base.js.\n # In fact it works even with dummy cpn.\n CPN_ALPHABET = string.ascii_letters + string.digits + '-_'\n cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(16))\n \n- # more consistent results setting it to right before the end\n- qs = parse_qs(playback_url)\n- video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\n+ for is_full, key in enumerate(('videostatsPlaybackUrl', 'videostatsWatchtimeUrl')):\n+ label = 'fully ' if is_full > 0 else ''\n \n- playback_url = update_url_query(\n- playback_url, {\n- 'ver': '2',\n- 'cpn': cpn,\n- 'cmt': video_length,\n- 'el': 'detailpage', # otherwise defaults to \"shorts\"\n- })\n+ playback_url = traverse_obj(player_response, (\n+ 'playbackTracking'. key, 'baseUrl', T(url_or_none)))\n+ if not playback_url:\n+ self.report_warning('Unable to mark {0}watched'.format(label))\n+ continue\n+\n+ # more consistent results setting it to right before the end\n+ qs = parse_qs(playback_url)\n+ video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\n+\n+ playback_url = update_url_query(\n+ playback_url, {\n+ 'ver': '2',\n+ 'cpn': cpn,\n+ 'cmt': video_length,\n+ 'el': 'detailpage', # otherwise defaults to \"shorts\"\n+ })\n \n- self._download_webpage(\n- playback_url, video_id, 'Marking watched',\n- 'Unable to mark watched', fatal=False)\n+ self._download_webpage(\n+ playback_url, video_id, 'Marking {0}watched'.format(label),\n+ 'Unable to mark watched', fatal=False)\n \n @staticmethod\n def _extract_urls(webpage):\n@@ -2215,6 +2298,49 @@ def _extract_yt_initial_variable(self, webpage, regex, video_id, name):\n (r'%s\\s*%s' % (regex, self._YT_INITIAL_BOUNDARY_RE),\n regex), webpage, name, default='{}'), video_id, fatal=False)\n \n+ def _get_preroll_length(self, ad_slot_lists):\n+\n+ def parse_instream_ad_renderer(instream_renderer):\n+ for skippable, path in (\n+ ('', ('skipOffsetMilliseconds', T(int))),\n+ ('non-', ('playerVars', T(compat_parse_qs),\n+ 'length_seconds', -1, T(int_or_none(invscale=1000))))):\n+ length_ms = traverse_obj(instream_renderer, path)\n+ if length_ms is not None:\n+ self.write_debug('Detected a %ds %sskippable ad' % (\n+ length_ms // 1000, skippable))\n+ break\n+ return length_ms\n+\n+ for slot_renderer in traverse_obj(ad_slot_lists, ('adSlots', Ellipsis, 'adSlotRenderer', T(dict))):\n+ if traverse_obj(slot_renderer, ('adSlotMetadata', 'triggerEvent')) != 'SLOT_TRIGGER_EVENT_BEFORE_CONTENT':\n+ continue\n+ rendering_content = traverse_obj(slot_renderer, (\n+ 'fulfillmentContent', 'fulfilledLayout', 'playerBytesAdLayoutRenderer',\n+ 'renderingContent', 'instreamVideoAdRenderer', T(dict)))\n+ length_ms = parse_instream_ad_renderer(rendering_content)\n+ if length_ms is not None:\n+ return length_ms\n+ times = traverse_obj(rendering_content, ((\n+ ('playerBytesSequentialLayoutRenderer', 'sequentialLayouts'),\n+ None), any, Ellipsis, 'playerBytesAdLayoutRenderer',\n+ 'renderingContent', 'instreamVideoAdRenderer',\n+ T(parse_instream_ad_renderer)))\n+ if times:\n+ return sum(times)\n+ return 0\n+\n+ def _is_premium_subscriber(self, initial_data):\n+ if not self.is_authenticated or not initial_data:\n+ return False\n+\n+ tlr = traverse_obj(\n+ initial_data, ('topbar', 'desktopTopbarRenderer', 'logo', 'topbarLogoRenderer'))\n+ return (\n+ traverse_obj(tlr, ('iconImage', 'iconType')) == 'YOUTUBE_PREMIUM_LOGO'\n+ or 'premium' in (self._get_text(tlr, 'tooltipText') or '').lower()\n+ )\n+\n def _real_extract(self, url):\n url, smuggled_data = unsmuggle_url(url, {})\n video_id = self._match_id(url)\n@@ -2242,32 +2368,36 @@ def _real_extract(self, url):\n if True or not player_response:\n origin = 'https://www.youtube.com'\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\n- fetched_timestamp = int(time.time())\n-\n player_url = self._extract_player_url(webpage)\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\n sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)\n if sts:\n pb_context['signatureTimestamp'] = sts\n \n- client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n- T(dict.items), lambda _, k_v: not k_v[1].get('REQUIRE_PO_TOKEN'),\n- 0))[:1]\n+ auth = self._generate_sapisidhash_header(origin)\n+\n+ client_names = []\n+ if auth or self._is_premium_subscriber(player_response):\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ T(dict_items), lambda _, k_v: k_v[0] == 'web_safari', 0))[:1]\n+ if not client_names:\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ T(dict_items), lambda _, k_v: not (\n+ k_v[1].get('REQUIRE_PO_TOKEN')\n+ or (bool(k_v[1].get('WITH_COOKIES', auth)) ^ bool(auth))\n+ ), 0))[:1]\n if 'web' not in client_names:\n- # webpage links won't download: ignore links and playability\n+ # only live HLS webpage links will download: ignore playability\n player_response = filter_dict(\n player_response or {},\n- lambda k, _: k not in ('streamingData', 'playabilityStatus'))\n-\n- if is_live and 'ios' not in client_names:\n- client_names.append('ios')\n+ lambda k, _: k != 'playabilityStatus')\n \n headers = {\n 'Sec-Fetch-Mode': 'navigate',\n 'Origin': origin,\n 'X-Goog-Visitor-Id': self._extract_visitor_data(ytcfg) or '',\n }\n- auth = self._generate_sapisidhash_header(origin)\n+\n if auth is not None:\n headers['Authorization'] = auth\n headers['X-Origin'] = origin\n@@ -2297,7 +2427,7 @@ def _real_extract(self, url):\n 'INNERTUBE_CONTEXT', 'client', 'clientVersion'),\n 'User-Agent': (\n 'INNERTUBE_CONTEXT', 'client', 'userAgent'),\n- }))\n+ }) or {})\n \n api_player_response = self._call_api(\n 'player', query, video_id, fatal=False, headers=api_headers,\n@@ -2306,19 +2436,22 @@ def _real_extract(self, url):\n 'context', 'client', 'clientName')),\n 'API JSON', delim=' '))\n \n- hls = traverse_obj(\n- (player_response, api_player_response),\n- (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n+ # be sure to find HLS in case of is_live\n+ hls = traverse_obj(player_response, (\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n fetched_timestamp = int(time.time())\n- if len(hls) == 2 and not hls[0] and hls[1]:\n- player_response['streamingData']['hlsManifestUrl'] = hls[1]\n- else:\n- video_details = merge_dicts(*traverse_obj(\n- (player_response, api_player_response),\n- (Ellipsis, 'videoDetails', T(dict))))\n- player_response.update(filter_dict(\n- api_player_response or {}, cndn=lambda k, _: k != 'captions'))\n- player_response['videoDetails'] = video_details\n+ preroll_length_ms = (\n+ self._get_preroll_length(api_player_response)\n+ or self._get_preroll_length(player_response))\n+ video_details = merge_dicts(*traverse_obj(\n+ (player_response, api_player_response),\n+ (Ellipsis, 'videoDetails', T(dict))))\n+ player_response.update(filter_dict(\n+ api_player_response or {}, cndn=lambda k, _: k != 'captions'))\n+ player_response['videoDetails'] = video_details\n+ if hls and not traverse_obj(player_response, (\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none))):\n+ player_response['streamingData']['hlsManifestUrl'] = hls\n \n def is_agegated(playability):\n # playability: dict\n@@ -2385,10 +2518,7 @@ def get_playability_status(response):\n return self.url_result(\n trailer_video_id, self.ie_key(), trailer_video_id)\n \n- def get_text(x):\n- return ''.join(traverse_obj(\n- x, (('simpleText',),), ('runs', Ellipsis, 'text'),\n- expected_type=compat_str))\n+ get_text = lambda x: self._get_text(x) or ''\n \n search_meta = (\n (lambda x: self._html_search_meta(x, webpage, default=None))\n@@ -2476,7 +2606,7 @@ def build_fragments(f):\n elif fetched_timestamp is not None:\n # Handle preroll waiting period\n preroll_sleep = self.get_param('youtube_preroll_sleep')\n- preroll_sleep = int_or_none(preroll_sleep, default=6)\n+ preroll_sleep = min(6, int_or_none(preroll_sleep, default=preroll_length_ms / 1000))\n fetched_timestamp += preroll_sleep\n \n for fmt in streaming_formats:\n@@ -2522,6 +2652,10 @@ def build_fragments(f):\n self.write_debug(error_to_compat_str(e), only_once=True)\n continue\n \n+ if parse_qs(fmt_url).get('n'):\n+ # this and (we assume) all the formats here are n-scrambled\n+ break\n+\n language_preference = (\n 10 if audio_track.get('audioIsDefault')\n else -10 if 'descriptive' in (traverse_obj(audio_track, ('displayName', T(lower))) or '')\n@@ -2654,7 +2788,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n subreason = pemr.get('subreason')\n if subreason:\n subreason = clean_html(get_text(subreason))\n- if subreason == 'The uploader has not made this video available in your country.':\n+ if subreason.startswith('The uploader has not made this video available in your country'):\n countries = microformat.get('availableCountries')\n if not countries:\n regions_allowed = search_meta('regionsAllowed')\n@@ -2848,24 +2982,21 @@ def process_subtitles():\n chapters = self._extract_chapters_from_json(\n initial_data, video_id, duration)\n if not chapters:\n- for engagment_pannel in (initial_data.get('engagementPanels') or []):\n- contents = try_get(\n- engagment_pannel, lambda x: x['engagementPanelSectionListRenderer']['content']['macroMarkersListRenderer']['contents'],\n- list)\n- if not contents:\n- continue\n+ def chapter_time(mmlir):\n+ return parse_duration(\n+ get_text(mmlir.get('timeDescription')))\n \n- def chapter_time(mmlir):\n- return parse_duration(\n- get_text(mmlir.get('timeDescription')))\n+ for markers in traverse_obj(initial_data, (\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n+ 'content', 'macroMarkersListRenderer', 'contents', T(list))):\n \n chapters = []\n- for next_num, content in enumerate(contents, start=1):\n+ for next_num, content in enumerate(markers, start=1):\n mmlir = content.get('macroMarkersListItemRenderer') or {}\n start_time = chapter_time(mmlir)\n- end_time = (traverse_obj(\n- contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n- if next_num < len(contents) else duration)\n+ end_time = (traverse_obj(markers, (\n+ next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n+ if next_num < len(markers) else duration)\n if start_time is None or end_time is None:\n continue\n chapters.append({\n@@ -3424,12 +3555,6 @@ def _extract_grid_item_renderer(item):\n T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\n 1, T(dict)), get_all=False)\n \n- @staticmethod\n- def _get_text(r, k):\n- return traverse_obj(\n- r, (k, 'runs', 0, 'text'), (k, 'simpleText'),\n- expected_type=txt_or_none)\n-\n def _grid_entries(self, grid_renderer):\n for item in traverse_obj(grid_renderer, ('items', Ellipsis, T(dict))):\n lockup_view_model = traverse_obj(item, ('lockupViewModel', T(dict)))\n@@ -3540,15 +3665,25 @@ def _extract_lockup_view_model(self, view_model):\n 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()),\n only_once=True)\n return\n+\n thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\n+\n return merge_dicts(self.url_result(\n- url, ie=ie.ie_key(), video_id=content_id), {\n- 'title': traverse_obj(view_model, (\n- 'metadata', 'lockupMetadataViewModel', 'title',\n- 'content', T(compat_str))),\n- 'thumbnails': self._extract_thumbnails(\n- view_model, thumb_keys, final_key='sources'),\n- })\n+ url, ie=ie.ie_key(), video_id=content_id),\n+ traverse_obj(view_model, {\n+ 'title': ('metadata', 'lockupMetadataViewModel', 'title',\n+ 'content', T(compat_str)),\n+ 'thumbnails': T(lambda vm: self._extract_thumbnails(\n+ vm, thumb_keys, final_key='sources')),\n+ 'duration': (\n+ 'contentImage', 'thumbnailViewModel', 'overlays',\n+ Ellipsis, (\n+ ('thumbnailBottomOverlayViewModel', 'badges'),\n+ ('thumbnailOverlayBadgeViewModel', 'thumbnailBadges')\n+ ), Ellipsis, 'thumbnailBadgeViewModel', 'text',\n+ T(parse_duration), any),\n+ })\n+ )\n \n def _extract_shorts_lockup_view_model(self, view_model):\n content_id = traverse_obj(view_model, (\n","summary":"Edited 2 file(s) in youtube_dl/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \"test/helper.py\",\n \"test/test_traversal.py\",\n \"test/test_utils.py\"\n ],\n \"solution_diff\": \"diff --git a/test/helper.py b/test/helper.py\\nindex 6f2129efff3..fac069d25c9 100644\\n--- a/test/helper.py\\n+++ b/test/helper.py\\n@@ -85,10 +85,10 @@ def expect_warning(self, regex):\\n # Silence an expected warning matching a regex\\n old_report_warning = self.report_warning\\n \\n- def report_warning(self, message):\\n+ def report_warning(self, message, *args, **kwargs):\\n if re.match(regex, message):\\n return\\n- old_report_warning(message)\\n+ old_report_warning(message, *args, **kwargs)\\n self.report_warning = types.MethodType(report_warning, self)\\n \\n \\n@@ -265,11 +265,11 @@ def assertRegexpMatches(self, text, regexp, msg=None):\\n def expect_warnings(ydl, warnings_re):\\n real_warning = ydl.report_warning\\n \\n- def _report_warning(w):\\n+ def _report_warning(self, w, *args, **kwargs):\\n if not any(re.search(w_re, w) for w_re in warnings_re):\\n real_warning(w)\\n \\n- ydl.report_warning = _report_warning\\n+ ydl.report_warning = types.MethodType(_report_warning, ydl)\\n \\n \\n def http_server_port(httpd):\\ndiff --git a/test/test_traversal.py b/test/test_traversal.py\\nindex 00a428edb7b..504cdee372d 100644\\n--- a/test/test_traversal.py\\n+++ b/test/test_traversal.py\\n@@ -9,21 +9,32 @@\\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\\n \\n \\n+import itertools\\n import re\\n \\n from youtube_dl.traversal import (\\n dict_get,\\n get_first,\\n+ require,\\n+ subs_list_to_dict,\\n T,\\n traverse_obj,\\n+ unpack,\\n+ value,\\n )\\n from youtube_dl.compat import (\\n+ compat_chr as chr,\\n compat_etree_fromstring,\\n compat_http_cookies,\\n+ compat_map as map,\\n compat_str,\\n+ compat_zip as zip,\\n )\\n from youtube_dl.utils import (\\n+ determine_ext,\\n+ ExtractorError,\\n int_or_none,\\n+ join_nonempty,\\n str_or_none,\\n )\\n \\n@@ -446,42 +457,164 @@ def test_traversal_unbranching(self):\\n msg='`any` should allow further branching')\\n \\n def test_traversal_morsel(self):\\n- values = {\\n- 'expires': 'a',\\n- 'path': 'b',\\n- 'comment': 'c',\\n- 'domain': 'd',\\n- 'max-age': 'e',\\n- 'secure': 'f',\\n- 'httponly': 'g',\\n- 'version': 'h',\\n- 'samesite': 'i',\\n- }\\n- # SameSite added in Py3.8, breaks .update for 3.5-3.7\\n- if sys.version_info < (3, 8):\\n- del values['samesite']\\n morsel = compat_http_cookies.Morsel()\\n+ # SameSite added in Py3.8, breaks .update for 3.5-3.7\\n+ # Similarly Partitioned, Py3.14, thx Grub4k\\n+ values = dict(zip(morsel, map(chr, itertools.count(ord('a')))))\\n morsel.set(str('item_key'), 'item_value', 'coded_value')\\n morsel.update(values)\\n- values['key'] = str('item_key')\\n- values['value'] = 'item_value'\\n+ values.update({\\n+ 'key': str('item_key'),\\n+ 'value': 'item_value',\\n+ }),\\n values = dict((str(k), v) for k, v in values.items())\\n- # make test pass even without ordered dict\\n- value_set = set(values.values())\\n \\n- for key, value in values.items():\\n- self.assertEqual(traverse_obj(morsel, key), value,\\n+ for key, val in values.items():\\n+ self.assertEqual(traverse_obj(morsel, key), val,\\n msg='Morsel should provide access to all values')\\n- self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,\\n- msg='`...` should yield all values')\\n- self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,\\n- msg='function key should yield all values')\\n+ values = list(values.values())\\n+ self.assertMaybeCountEqual(traverse_obj(morsel, Ellipsis), values,\\n+ msg='`...` should yield all values')\\n+ self.assertMaybeCountEqual(traverse_obj(morsel, lambda k, v: True), values,\\n+ msg='function key should yield all values')\\n self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,\\n msg='Morsel should not be implicitly changed to dict on usage')\\n \\n- def test_get_first(self):\\n- self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\\n-\\n+ def test_traversal_filter(self):\\n+ data = [None, False, True, 0, 1, 0.0, 1.1, '', 'str', {}, {0: 0}, [], [1]]\\n+\\n+ self.assertEqual(\\n+ traverse_obj(data, (Ellipsis, filter)),\\n+ [True, 1, 1.1, 'str', {0: 0}, [1]],\\n+ '`filter` should filter falsy values')\\n+\\n+\\n+class TestTraversalHelpers(_TestCase):\\n+ def test_traversal_require(self):\\n+ with self.assertRaises(ExtractorError, msg='Missing `value` should raise'):\\n+ traverse_obj(_TEST_DATA, ('None', T(require('value'))))\\n+ self.assertEqual(\\n+ traverse_obj(_TEST_DATA, ('str', T(require('value')))), 'str',\\n+ '`require` should pass through non-`None` values')\\n+\\n+ def test_subs_list_to_dict(self):\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 'de', 'url': 'https://example.com/subs/de.vtt'},\\n+ {'name': 'en', 'url': 'https://example.com/subs/en1.ass'},\\n+ {'name': 'en', 'url': 'https://example.com/subs/en2.ass'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'url': 'url',\\n+ }, all, T(subs_list_to_dict)]), {\\n+ 'de': [{'url': 'https://example.com/subs/de.vtt'}],\\n+ 'en': [\\n+ {'url': 'https://example.com/subs/en1.ass'},\\n+ {'url': 'https://example.com/subs/en2.ass'},\\n+ ],\\n+ }, 'function should build subtitle dict from list of subtitles')\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\\n+ {'name': 'de'},\\n+ {'name': 'en', 'content': 'content'},\\n+ {'url': 'https://example.com/subs/en'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'data': 'content',\\n+ 'url': 'url',\\n+ }, all, T(subs_list_to_dict(lang=None))]), {\\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\\n+ 'en': [{'data': 'content'}],\\n+ }, 'subs with mandatory items missing should be filtered')\\n+ self.assertEqual(traverse_obj([\\n+ {'url': 'https://example.com/subs/de.ass', 'name': 'de'},\\n+ {'url': 'https://example.com/subs/en', 'name': 'en'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'ext': ['url', T(determine_ext(default_ext=None))],\\n+ 'url': 'url',\\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {\\n+ 'de': [{'url': 'https://example.com/subs/de.ass', 'ext': 'ass'}],\\n+ 'en': [{'url': 'https://example.com/subs/en', 'ext': 'ext'}],\\n+ }, '`ext` should set default ext but leave existing value untouched')\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 'en', 'url': 'https://example.com/subs/en2', 'prio': True},\\n+ {'name': 'en', 'url': 'https://example.com/subs/en1', 'prio': False},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'quality': ['prio', T(int)],\\n+ 'url': 'url',\\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {'en': [\\n+ {'url': 'https://example.com/subs/en1', 'ext': 'ext'},\\n+ {'url': 'https://example.com/subs/en2', 'ext': 'ext'},\\n+ ]}, '`quality` key should sort subtitle list accordingly')\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\\n+ {'name': 'de'},\\n+ {'name': 'en', 'content': 'content'},\\n+ {'url': 'https://example.com/subs/en'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'url': 'url',\\n+ 'data': 'content',\\n+ }, all, T(subs_list_to_dict(lang='en'))]), {\\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\\n+ 'en': [\\n+ {'data': 'content'},\\n+ {'url': 'https://example.com/subs/en'},\\n+ ],\\n+ }, 'optionally provided lang should be used if no id available')\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'url': 'url',\\n+ 'ext': 'ext',\\n+ }, all, T(subs_list_to_dict(lang=None))]), {\\n+ 'de': [\\n+ {'url': 'https://example.com/subs/de3'},\\n+ {'url': 'https://example.com/subs/de4'},\\n+ ],\\n+ }, 'non str types should be ignored for id and ext')\\n+ self.assertEqual(traverse_obj([\\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\\n+ ], [Ellipsis, {\\n+ 'id': 'name',\\n+ 'url': 'url',\\n+ 'ext': 'ext',\\n+ }, all, T(subs_list_to_dict(lang='de'))]), {\\n+ 'de': [\\n+ {'url': 'https://example.com/subs/de1'},\\n+ {'url': 'https://example.com/subs/de2'},\\n+ {'url': 'https://example.com/subs/de3'},\\n+ {'url': 'https://example.com/subs/de4'},\\n+ ],\\n+ }, 'non str types should be replaced by default id')\\n+\\n+ def test_unpack(self):\\n+ self.assertEqual(\\n+ unpack(lambda *x: ''.join(map(compat_str, x)))([1, 2, 3]), '123')\\n+ self.assertEqual(\\n+ unpack(join_nonempty)([1, 2, 3]), '1-2-3')\\n+ self.assertEqual(\\n+ unpack(join_nonempty, delim=' ')([1, 2, 3]), '1 2 3')\\n+ with self.assertRaises(TypeError):\\n+ unpack(join_nonempty)()\\n+ with self.assertRaises(TypeError):\\n+ unpack()\\n+\\n+ def test_value(self):\\n+ self.assertEqual(\\n+ traverse_obj(_TEST_DATA, ('str', T(value('other')))), 'other',\\n+ '`value` should substitute specified value')\\n+\\n+\\n+class TestDictGet(_TestCase):\\n def test_dict_get(self):\\n FALSE_VALUES = {\\n 'none': None,\\n@@ -504,6 +637,9 @@ def test_dict_get(self):\\n self.assertEqual(dict_get(d, ('b', 'c', key, )), None)\\n self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)\\n \\n+ def test_get_first(self):\\n+ self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\\n+\\n \\n if __name__ == '__main__':\\n unittest.main()\\ndiff --git a/test/test_utils.py b/test/test_utils.py\\nindex 2947cce7eb3..1106f2819b8 100644\\n--- a/test/test_utils.py\\n+++ b/test/test_utils.py\\n@@ -69,6 +69,7 @@\\n parse_iso8601,\\n parse_resolution,\\n parse_qs,\\n+ partial_application,\\n pkcs1pad,\\n prepend_extension,\\n read_batch_urls,\\n@@ -664,6 +665,8 @@ def test_parse_duration(self):\\n self.assertEqual(parse_duration('3h 11m 53s'), 11513)\\n self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)\\n self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)\\n+ self.assertEqual(parse_duration('3 hours, 11 minutes, 53 seconds'), 11513)\\n+ self.assertEqual(parse_duration('3 hours, 11 mins, 53 secs'), 11513)\\n self.assertEqual(parse_duration('62m45s'), 3765)\\n self.assertEqual(parse_duration('6m59s'), 419)\\n self.assertEqual(parse_duration('49s'), 49)\\n@@ -682,6 +685,10 @@ def test_parse_duration(self):\\n self.assertEqual(parse_duration('PT1H0.040S'), 3600.04)\\n self.assertEqual(parse_duration('PT00H03M30SZ'), 210)\\n self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)\\n+ self.assertEqual(parse_duration('01:02:03:050'), 3723.05)\\n+ self.assertEqual(parse_duration('103:050'), 103.05)\\n+ self.assertEqual(parse_duration('1HR 3MIN'), 3780)\\n+ self.assertEqual(parse_duration('2hrs 3mins'), 7380)\\n \\n def test_fix_xml_ampersands(self):\\n self.assertEqual(\\n@@ -895,6 +902,30 @@ def test_parse_codecs(self):\\n 'vcodec': 'av01.0.05M.08',\\n 'acodec': 'none',\\n })\\n+ self.assertEqual(parse_codecs('vp9.2'), {\\n+ 'vcodec': 'vp9.2',\\n+ 'acodec': 'none',\\n+ 'dynamic_range': 'HDR10',\\n+ })\\n+ self.assertEqual(parse_codecs('vp09.02.50.10.01.09.18.09.00'), {\\n+ 'vcodec': 'vp09.02.50.10.01.09.18.09.00',\\n+ 'acodec': 'none',\\n+ 'dynamic_range': 'HDR10',\\n+ })\\n+ self.assertEqual(parse_codecs('av01.0.12M.10.0.110.09.16.09.0'), {\\n+ 'vcodec': 'av01.0.12M.10.0.110.09.16.09.0',\\n+ 'acodec': 'none',\\n+ 'dynamic_range': 'HDR10',\\n+ })\\n+ self.assertEqual(parse_codecs('dvhe'), {\\n+ 'vcodec': 'dvhe',\\n+ 'acodec': 'none',\\n+ 'dynamic_range': 'DV',\\n+ })\\n+ self.assertEqual(parse_codecs('fLaC'), {\\n+ 'vcodec': 'none',\\n+ 'acodec': 'flac',\\n+ })\\n self.assertEqual(parse_codecs('theora, vorbis'), {\\n 'vcodec': 'theora',\\n 'acodec': 'vorbis',\\n@@ -1723,6 +1754,21 @@ def test_join_nonempty(self):\\n 'a', 'b', 'c', 'd',\\n from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')\\n \\n+ def test_partial_application(self):\\n+ test_fn = partial_application(lambda x, kwarg=None: '{0}, kwarg={1!r}'.format(x, kwarg))\\n+ self.assertTrue(\\n+ callable(test_fn(kwarg=10)),\\n+ 'missing positional parameter should apply partially')\\n+ self.assertEqual(\\n+ test_fn(10, kwarg=42), '10, kwarg=42',\\n+ 'positionally passed argument should call function')\\n+ self.assertEqual(\\n+ test_fn(x=10), '10, kwarg=None',\\n+ 'keyword passed positional should call function')\\n+ self.assertEqual(\\n+ test_fn(kwarg=42)(10), '10, kwarg=42',\\n+ 'call after partial application should call the function')\\n+\\n \\n if __name__ == '__main__':\\n unittest.main()\\n\",\n \"summary\": \"Edited 3 file(s) in test/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"youtube_dl/YoutubeDL.py\",\n \"youtube_dl/compat.py\",\n \"youtube_dl/options.py\",\n \"youtube_dl/traversal.py\",\n \"youtube_dl/utils.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\\nindex 8367b6e5345..ec1d35c3aca 100755\\n--- a/youtube_dl/YoutubeDL.py\\n+++ b/youtube_dl/YoutubeDL.py\\n@@ -357,7 +357,7 @@ class YoutubeDL(object):\\n \\n _NUMERIC_FIELDS = set((\\n 'width', 'height', 'tbr', 'abr', 'asr', 'vbr', 'fps', 'filesize', 'filesize_approx',\\n- 'timestamp', 'upload_year', 'upload_month', 'upload_day',\\n+ 'timestamp', 'upload_year', 'upload_month', 'upload_day', 'available_at',\\n 'duration', 'view_count', 'like_count', 'dislike_count', 'repost_count',\\n 'average_rating', 'comment_count', 'age_limit',\\n 'start_time', 'end_time',\\ndiff --git a/youtube_dl/compat.py b/youtube_dl/compat.py\\nindex ebe22bdf9d1..a985cb03e84 100644\\n--- a/youtube_dl/compat.py\\n+++ b/youtube_dl/compat.py\\n@@ -55,7 +55,7 @@\\n try:\\n import collections.abc as compat_collections_abc\\n except ImportError:\\n- import collections as compat_collections_abc\\n+ compat_collections_abc = collections\\n \\n \\n # compat_urllib_request\\n@@ -3452,6 +3452,8 @@ def unpack(self, string):\\n except ImportError:\\n compat_map = map\\n \\n+\\n+# compat_filter, compat_filter_fns\\n try:\\n from future_builtins import filter as compat_filter\\n except ImportError:\\n@@ -3459,6 +3461,9 @@ def unpack(self, string):\\n from itertools import ifilter as compat_filter\\n except ImportError:\\n compat_filter = filter\\n+# \\\"Is this function one or maybe the other filter()?\\\"\\n+compat_filter_fns = tuple(set((filter, compat_filter)))\\n+\\n \\n # compat_zip\\n try:\\n@@ -3478,6 +3483,40 @@ def unpack(self, string):\\n from itertools import izip_longest as compat_itertools_zip_longest\\n \\n \\n+# compat_abc_ABC\\n+try:\\n+ from abc import ABC as compat_abc_ABC\\n+except ImportError:\\n+ # Py < 3.4\\n+ from abc import ABCMeta as _ABCMeta\\n+ compat_abc_ABC = _ABCMeta(str('ABC'), (object,), {})\\n+\\n+\\n+# dict mixin used here\\n+# like UserDict.DictMixin, without methods created by MutableMapping\\n+class _DictMixin(compat_abc_ABC):\\n+ def has_key(self, key):\\n+ return key in self\\n+\\n+ # get(), clear(), setdefault() in MM\\n+\\n+ def iterkeys(self):\\n+ return (k for k in self)\\n+\\n+ def itervalues(self):\\n+ return (self[k] for k in self)\\n+\\n+ def iteritems(self):\\n+ return ((k, self[k]) for k in self)\\n+\\n+ # pop(), popitem() in MM\\n+\\n+ def copy(self):\\n+ return type(self)(self)\\n+\\n+ # update() in MM\\n+\\n+\\n # compat_collections_chain_map\\n # collections.ChainMap: new class\\n try:\\n@@ -3632,6 +3671,129 @@ def compat_datetime_timedelta_total_seconds(td):\\n compat_zstandard = None\\n \\n \\n+# compat_thread\\n+try:\\n+ import _thread as compat_thread\\n+except ImportError:\\n+ try:\\n+ import thread as compat_thread\\n+ except ImportError:\\n+ import dummy_thread as compat_thread\\n+\\n+\\n+# compat_dict\\n+# compat_builtins_dict\\n+# compat_dict_items\\n+if sys.version_info >= (3, 6):\\n+ compat_dict = compat_builtins_dict = dict\\n+ compat_dict_items = dict.items\\n+else:\\n+ _get_ident = compat_thread.get_ident\\n+\\n+ class compat_dict(compat_collections_abc.MutableMapping, _DictMixin, dict):\\n+ \\\"\\\"\\\"`dict` that preserves insertion order with interface like Py3.7+\\\"\\\"\\\"\\n+\\n+ _order = [] # default that should never be used\\n+\\n+ def __init__(self, *mappings_or_iterables, **kwargs):\\n+ # order an unordered dict using a list of keys: actual Py 2.7+\\n+ # OrderedDict uses a doubly linked list for better performance\\n+ self._order = []\\n+ for arg in mappings_or_iterables:\\n+ self.__update(arg)\\n+ if kwargs:\\n+ self.__update(kwargs)\\n+\\n+ def __getitem__(self, key):\\n+ return dict.__getitem__(self, key)\\n+\\n+ def __setitem__(self, key, value):\\n+ try:\\n+ if key not in self._order:\\n+ self._order.append(key)\\n+ dict.__setitem__(self, key, value)\\n+ except Exception:\\n+ if key in self._order[-1:] and key not in self:\\n+ del self._order[-1]\\n+ raise\\n+\\n+ def __len__(self):\\n+ return dict.__len__(self)\\n+\\n+ def __delitem__(self, key):\\n+ dict.__delitem__(self, key)\\n+ try:\\n+ # expected case, O(len(self)), but who dels anyway?\\n+ self._order.remove(key)\\n+ except ValueError:\\n+ pass\\n+\\n+ def __iter__(self):\\n+ for from_ in self._order:\\n+ if from_ in self:\\n+ yield from_\\n+\\n+ def __del__(self):\\n+ for attr in ('_order',):\\n+ try:\\n+ delattr(self, attr)\\n+ except Exception:\\n+ pass\\n+\\n+ def __repr__(self, _repr_running={}):\\n+ # skip recursive items ...\\n+ call_key = id(self), _get_ident()\\n+ if _repr_running.get(call_key):\\n+ return '...'\\n+ _repr_running[call_key] = True\\n+ try:\\n+ return '%s({%s})' % (\\n+ type(self).__name__,\\n+ ','.join('%r: %r' % k_v for k_v in self.items()))\\n+ finally:\\n+ del _repr_running[call_key]\\n+\\n+ # merge/update (PEP 584)\\n+\\n+ def __or__(self, other):\\n+ if not isinstance(other, compat_collections_abc.Mapping):\\n+ return NotImplemented\\n+ new = type(self)(self)\\n+ new.update(other)\\n+ return new\\n+\\n+ def __ror__(self, other):\\n+ if not isinstance(other, compat_collections_abc.Mapping):\\n+ return NotImplemented\\n+ new = type(other)(other)\\n+ new.update(self)\\n+ return new\\n+\\n+ def __ior__(self, other):\\n+ self.update(other)\\n+ return self\\n+\\n+ # optimisations\\n+\\n+ def __reversed__(self):\\n+ for from_ in reversed(self._order):\\n+ if from_ in self:\\n+ yield from_\\n+\\n+ def __contains__(self, item):\\n+ return dict.__contains__(self, item)\\n+\\n+ # allow overriding update without breaking __init__\\n+ def __update(self, *args, **kwargs):\\n+ super(compat_dict, self).update(*args, **kwargs)\\n+\\n+ compat_builtins_dict = dict\\n+ # Using the object's method, not dict's:\\n+ # an ordered dict's items can be returned unstably by unordered\\n+ # dict.items as if the method was not ((k, self[k]) for k in self)\\n+ compat_dict_items = lambda d: d.items()\\n+\\n+\\n legacy = [\\n 'compat_HTMLParseError',\\n 'compat_HTMLParser',\\n@@ -3662,9 +3824,11 @@ def compat_datetime_timedelta_total_seconds(td):\\n \\n __all__ = [\\n 'compat_Struct',\\n+ 'compat_abc_ABC',\\n 'compat_base64_b64decode',\\n 'compat_basestring',\\n 'compat_brotli',\\n+ 'compat_builtins_dict',\\n 'compat_casefold',\\n 'compat_chr',\\n 'compat_collections_abc',\\n@@ -3672,9 +3836,12 @@ def compat_datetime_timedelta_total_seconds(td):\\n 'compat_contextlib_suppress',\\n 'compat_ctypes_WINFUNCTYPE',\\n 'compat_datetime_timedelta_total_seconds',\\n+ 'compat_dict',\\n+ 'compat_dict_items',\\n 'compat_etree_fromstring',\\n 'compat_etree_iterfind',\\n 'compat_filter',\\n+ 'compat_filter_fns',\\n 'compat_get_terminal_size',\\n 'compat_getenv',\\n 'compat_getpass_getpass',\\n@@ -3716,6 +3883,7 @@ def compat_datetime_timedelta_total_seconds(td):\\n 'compat_struct_unpack',\\n 'compat_subprocess_get_DEVNULL',\\n 'compat_subprocess_Popen',\\n+ 'compat_thread',\\n 'compat_tokenize_tokenize',\\n 'compat_urllib_error',\\n 'compat_urllib_parse',\\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\\nindex ce3633c418e..9b0d77a236f 100644\\n--- a/youtube_dl/options.py\\n+++ b/youtube_dl/options.py\\n@@ -421,12 +421,12 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\\n action='store', dest='youtube_player_js_variant',\\n help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\\n choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\\n- default='main', metavar='VARIANT')\\n+ default='actual', metavar='VARIANT')\\n video_format.add_option(\\n '--youtube-player-js-version',\\n action='store', dest='youtube_player_js_version',\\n help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\\n- default='20348@0004de42', metavar='STS@HASH')\\n+ default='actual', metavar='STS@HASH')\\n video_format.add_option(\\n '--merge-output-format',\\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\\ndiff --git a/youtube_dl/traversal.py b/youtube_dl/traversal.py\\nindex 834cfef7fab..1de48b145a5 100644\\n--- a/youtube_dl/traversal.py\\n+++ b/youtube_dl/traversal.py\\n@@ -5,6 +5,10 @@\\n from .utils import (\\n dict_get,\\n get_first,\\n+ require,\\n+ subs_list_to_dict,\\n T,\\n traverse_obj,\\n+ unpack,\\n+ value,\\n )\\ndiff --git a/youtube_dl/utils.py b/youtube_dl/utils.py\\nindex c4262936e0b..02a49ff49c3 100644\\n--- a/youtube_dl/utils.py\\n+++ b/youtube_dl/utils.py\\n@@ -53,6 +53,8 @@\\n compat_etree_fromstring,\\n compat_etree_iterfind,\\n compat_expanduser,\\n+ compat_filter as filter,\\n+ compat_filter_fns,\\n compat_html_entities,\\n compat_html_entities_html5,\\n compat_http_client,\\n@@ -1859,6 +1861,39 @@ def write_json_file(obj, fn):\\n raise\\n \\n \\n+class partial_application(object):\\n+ \\\"\\\"\\\"Allow a function to use pre-set argument values\\\"\\\"\\\"\\n+\\n+ # see _try_bind_args()\\n+ try:\\n+ inspect.signature\\n+\\n+ @staticmethod\\n+ def required_args(fn):\\n+ return [\\n+ param.name for param in inspect.signature(fn).parameters.values()\\n+ if (param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)\\n+ and param.default is inspect.Parameter.empty)]\\n+\\n+ except AttributeError:\\n+\\n+ # Py < 3.3\\n+ @staticmethod\\n+ def required_args(fn):\\n+ fn_args = inspect.getargspec(fn)\\n+ n_defaults = len(fn_args.defaults or [])\\n+ return (fn_args.args or [])[:-n_defaults if n_defaults > 0 else None]\\n+\\n+ def __new__(cls, func):\\n+ @functools.wraps(func)\\n+ def wrapped(*args, **kwargs):\\n+ if set(cls.required_args(func)[len(args):]).difference(kwargs):\\n+ return functools.partial(func, *args, **kwargs)\\n+ return func(*args, **kwargs)\\n+\\n+ return wrapped\\n+\\n+\\n if sys.version_info >= (2, 7):\\n def find_xpath_attr(node, xpath, key, val=None):\\n \\\"\\\"\\\" Find the xpath xpath[@key=val] \\\"\\\"\\\"\\n@@ -3152,6 +3187,7 @@ def extract_timezone(date_str):\\n return timezone, date_str\\n \\n \\n+@partial_application\\n def parse_iso8601(date_str, delimiter='T', timezone=None):\\n \\\"\\\"\\\" Return a UNIX timestamp from the given date \\\"\\\"\\\"\\n \\n@@ -3229,6 +3265,7 @@ def unified_timestamp(date_str, day_first=True):\\n return calendar.timegm(timetuple) + pm_delta * 3600 - compat_datetime_timedelta_total_seconds(timezone)\\n \\n \\n+@partial_application\\n def determine_ext(url, default_ext='unknown_video'):\\n if url is None or '.' not in url:\\n return default_ext\\n@@ -3807,6 +3844,7 @@ def base_url(url):\\n return re.match(r'https?://[^?#&]+/', url).group()\\n \\n \\n+@partial_application\\n def urljoin(base, path):\\n path = _decode_compat_str(path, encoding='utf-8', or_none=True)\\n if not path:\\n@@ -3831,6 +3869,7 @@ def get_method(self):\\n return 'PUT'\\n \\n \\n+@partial_application\\n def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):\\n if get_attr:\\n if v is not None:\\n@@ -3857,6 +3896,7 @@ def str_to_int(int_str):\\n return int_or_none(int_str)\\n \\n \\n+@partial_application\\n def float_or_none(v, scale=1, invscale=1, default=None):\\n if v is None:\\n return default\\n@@ -3891,38 +3931,46 @@ def parse_duration(s):\\n return None\\n \\n s = s.strip()\\n+ if not s:\\n+ return None\\n \\n days, hours, mins, secs, ms = [None] * 5\\n- m = re.match(r'(?:(?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?(?P<mins>[0-9]+):)?(?P<secs>[0-9]+)(?P<ms>\\\\.[0-9]+)?Z?$', s)\\n+ m = re.match(r'''(?x)\\n+ (?P<before_secs>\\n+ (?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?\\n+ (?P<mins>[0-9]+):)?\\n+ (?P<secs>(?(before_secs)[0-9]{1,2}|[0-9]+))\\n+ (?:[.:](?P<ms>[0-9]+))?Z?$\\n+ ''', s)\\n if m:\\n- days, hours, mins, secs, ms = m.groups()\\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\\n else:\\n m = re.match(\\n r'''(?ix)(?:P?\\n (?:\\n- [0-9]+\\\\s*y(?:ears?)?\\\\s*\\n+ [0-9]+\\\\s*y(?:ears?)?,?\\\\s*\\n )?\\n (?:\\n- [0-9]+\\\\s*m(?:onths?)?\\\\s*\\n+ [0-9]+\\\\s*m(?:onths?)?,?\\\\s*\\n )?\\n (?:\\n- [0-9]+\\\\s*w(?:eeks?)?\\\\s*\\n+ [0-9]+\\\\s*w(?:eeks?)?,?\\\\s*\\n )?\\n (?:\\n- (?P<days>[0-9]+)\\\\s*d(?:ays?)?\\\\s*\\n+ (?P<days>[0-9]+)\\\\s*d(?:ays?)?,?\\\\s*\\n )?\\n T)?\\n (?:\\n- (?P<hours>[0-9]+)\\\\s*h(?:ours?)?\\\\s*\\n+ (?P<hours>[0-9]+)\\\\s*h(?:(?:ou)?rs?)?,?\\\\s*\\n )?\\n (?:\\n- (?P<mins>[0-9]+)\\\\s*m(?:in(?:ute)?s?)?\\\\s*\\n+ (?P<mins>[0-9]+)\\\\s*m(?:in(?:ute)?s?)?,?\\\\s*\\n )?\\n (?:\\n- (?P<secs>[0-9]+)(?P<ms>\\\\.[0-9]+)?\\\\s*s(?:ec(?:ond)?s?)?\\\\s*\\n+ (?P<secs>[0-9]+)(?:\\\\.(?P<ms>[0-9]+))?\\\\s*s(?:ec(?:ond)?s?)?\\\\s*\\n )?Z?$''', s)\\n if m:\\n- days, hours, mins, secs, ms = m.groups()\\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\\n else:\\n m = re.match(r'(?i)(?:(?P<hours>[0-9.]+)\\\\s*(?:hours?)|(?P<mins>[0-9.]+)\\\\s*(?:mins?\\\\.?|minutes?)\\\\s*)Z?$', s)\\n if m:\\n@@ -3930,17 +3978,13 @@ def parse_duration(s):\\n else:\\n return None\\n \\n- duration = 0\\n- if secs:\\n- duration += float(secs)\\n- if mins:\\n- duration += float(mins) * 60\\n- if hours:\\n- duration += float(hours) * 60 * 60\\n- if days:\\n- duration += float(days) * 24 * 60 * 60\\n- if ms:\\n- duration += float(ms)\\n+ duration = (\\n+ ((((float(days) * 24) if days else 0)\\n+ + (float(hours) if hours else 0)) * 60\\n+ + (float(mins) if mins else 0)) * 60\\n+ + (float(secs) if secs else 0)\\n+ + (float(ms) / 10 ** len(ms) if ms else 0))\\n+\\n return duration\\n \\n \\n@@ -4251,6 +4295,7 @@ def urlencode_postdata(*args, **kargs):\\n return compat_urllib_parse_urlencode(*args, **kargs).encode('ascii')\\n \\n \\n+@partial_application\\n def update_url(url, **kwargs):\\n \\\"\\\"\\\"Replace URL components specified by kwargs\\n url: compat_str or parsed URL tuple\\n@@ -4272,6 +4317,7 @@ def update_url(url, **kwargs):\\n return compat_urllib_parse.urlunparse(url._replace(**kwargs))\\n \\n \\n+@partial_application\\n def update_url_query(url, query):\\n return update_url(url, query_update=query)\\n \\n@@ -4698,30 +4744,45 @@ def parse_codecs(codecs_str):\\n if not codecs_str:\\n return {}\\n split_codecs = list(filter(None, map(\\n- lambda str: str.strip(), codecs_str.strip().strip(',').split(','))))\\n- vcodec, acodec = None, None\\n+ lambda s: s.strip(), codecs_str.strip().split(','))))\\n+ vcodec, acodec, hdr = None, None, None\\n for full_codec in split_codecs:\\n- codec = full_codec.split('.')[0]\\n- if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2', 'h263', 'h264', 'mp4v', 'hvc1', 'av01', 'theora'):\\n- if not vcodec:\\n- vcodec = full_codec\\n- elif codec in ('mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\\n+ codec, rest = full_codec.partition('.')[::2]\\n+ codec = codec.lower()\\n+ full_codec = '.'.join((codec, rest)) if rest else codec\\n+ codec = re.sub(r'0+(?=\\\\d)', '', codec)\\n+ if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2',\\n+ 'h263', 'h264', 'mp4v', 'hvc1', 'av1', 'theora', 'dvh1', 'dvhe'):\\n+ if vcodec:\\n+ continue\\n+ vcodec = full_codec\\n+ if codec in ('dvh1', 'dvhe'):\\n+ hdr = 'DV'\\n+ elif codec in ('av1', 'vp9'):\\n+ n, m = {\\n+ 'av1': (2, '10'),\\n+ 'vp9': (0, '2'),\\n+ }[codec]\\n+ if (rest.split('.', n + 1)[n:] or [''])[0].lstrip('0') == m:\\n+ hdr = 'HDR10'\\n+ elif codec in ('flac', 'mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-4',\\n+ 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\\n if not acodec:\\n acodec = full_codec\\n else:\\n- write_string('WARNING: Unknown codec %s\\\\n' % full_codec, sys.stderr)\\n- if not vcodec and not acodec:\\n- if len(split_codecs) == 2:\\n- return {\\n- 'vcodec': split_codecs[0],\\n- 'acodec': split_codecs[1],\\n- }\\n- else:\\n- return {\\n+ write_string('WARNING: Unknown codec %s\\\\n' % (full_codec,), sys.stderr)\\n+\\n+ return (\\n+ filter_dict({\\n 'vcodec': vcodec or 'none',\\n 'acodec': acodec or 'none',\\n- }\\n- return {}\\n+ 'dynamic_range': hdr,\\n+ }) if vcodec or acodec\\n+ else {\\n+ 'vcodec': split_codecs[0],\\n+ 'acodec': split_codecs[1],\\n+ } if len(split_codecs) == 2\\n+ else {})\\n \\n \\n def urlhandle_detect_ext(url_handle):\\n@@ -6283,6 +6344,7 @@ def traverse_obj(obj, *paths, **kwargs):\\n Read as: `{key: traverse_obj(obj, path) for key, path in dct.items()}`.\\n - `any`-builtin: Take the first matching object and return it, resetting branching.\\n - `all`-builtin: Take all matching objects and return them as a list, resetting branching.\\n+ - `filter`-builtin: Return the value if it is truthy, `None` otherwise.\\n \\n `tuple`, `list`, and `dict` all support nested paths and branches.\\n \\n@@ -6324,6 +6386,11 @@ def traverse_obj(obj, *paths, **kwargs):\\n # instant compat\\n str = compat_str\\n \\n+ from .compat import (\\n+ compat_builtins_dict as dict_, # the basic dict type\\n+ compat_dict as dict, # dict preserving imsertion order\\n+ )\\n+\\n casefold = lambda k: compat_casefold(k) if isinstance(k, str) else k\\n \\n if isinstance(expected_type, type):\\n@@ -6406,7 +6473,7 @@ def apply_key(key, obj, is_last):\\n if not branching: # string traversal\\n result = ''.join(result)\\n \\n- elif isinstance(key, dict):\\n+ elif isinstance(key, dict_):\\n iter_obj = ((k, _traverse_obj(obj, v, False, is_last)) for k, v in key.items())\\n result = dict((k, v if v is not None else default) for k, v in iter_obj\\n if v is not None or default is not NO_DEFAULT) or None\\n@@ -6484,7 +6551,7 @@ def apply_path(start_obj, path, test_type):\\n has_branched = False\\n \\n key = None\\n- for last, key in lazy_last(variadic(path, (str, bytes, dict, set))):\\n+ for last, key in lazy_last(variadic(path, (str, bytes, dict_, set))):\\n if not casesense and isinstance(key, str):\\n key = compat_casefold(key)\\n \\n@@ -6497,6 +6564,11 @@ def apply_path(start_obj, path, test_type):\\n objs = (list(filtered_objs),)\\n continue\\n \\n+ # filter might be from __builtin__, future_builtins, or itertools.ifilter\\n+ if key in compat_filter_fns:\\n+ objs = filter(None, objs)\\n+ continue\\n+\\n if __debug__ and callable(key):\\n # Verify function signature\\n _try_bind_args(key, None, None)\\n@@ -6509,10 +6581,10 @@ def apply_path(start_obj, path, test_type):\\n \\n objs = from_iterable(new_objs)\\n \\n- if test_type and not isinstance(key, (dict, list, tuple)):\\n+ if test_type and not isinstance(key, (dict_, list, tuple)):\\n objs = map(type_test, objs)\\n \\n- return objs, has_branched, isinstance(key, dict)\\n+ return objs, has_branched, isinstance(key, dict_)\\n \\n def _traverse_obj(obj, path, allow_empty, test_type):\\n results, has_branched, is_dict = apply_path(obj, path, test_type)\\n@@ -6535,6 +6607,76 @@ def _traverse_obj(obj, path, allow_empty, test_type):\\n return None if default is NO_DEFAULT else default\\n \\n \\n+def value(value):\\n+ return lambda _: value\\n+\\n+\\n+class require(ExtractorError):\\n+ def __init__(self, name, expected=False):\\n+ super(require, self).__init__(\\n+ 'Unable to extract {0}'.format(name), expected=expected)\\n+\\n+ def __call__(self, value):\\n+ if value is None:\\n+ raise self\\n+\\n+ return value\\n+\\n+\\n+@partial_application\\n+# typing: (subs: list[dict], /, *, lang='und', ext=None) -> dict[str, list[dict]\\n+def subs_list_to_dict(subs, lang='und', ext=None):\\n+ \\\"\\\"\\\"\\n+ Convert subtitles from a traversal into a subtitle dict.\\n+ The path should have an `all` immediately before this function.\\n+\\n+ Arguments:\\n+ `lang` The default language tag for subtitle dicts with no\\n+ `lang` (`und`: undefined)\\n+ `ext` The default value for `ext` in the subtitle dicts\\n+\\n+ In the dict you can set the following additional items:\\n+ `id` The language tag to which the subtitle dict should be added\\n+ `quality` The sort order for each subtitle dict\\n+ \\\"\\\"\\\"\\n+\\n+ result = collections.defaultdict(list)\\n+\\n+ for sub in subs:\\n+ tn_url = url_or_none(sub.pop('url', None))\\n+ if tn_url:\\n+ sub['url'] = tn_url\\n+ elif not sub.get('data'):\\n+ continue\\n+ sub_lang = sub.pop('id', None)\\n+ if not isinstance(sub_lang, compat_str):\\n+ if not lang:\\n+ continue\\n+ sub_lang = lang\\n+ sub_ext = sub.get('ext')\\n+ if not isinstance(sub_ext, compat_str):\\n+ if not ext:\\n+ sub.pop('ext', None)\\n+ else:\\n+ sub['ext'] = ext\\n+ result[sub_lang].append(sub)\\n+ result = dict(result)\\n+\\n+ for subs in result.values():\\n+ subs.sort(key=lambda x: x.pop('quality', 0) or 0)\\n+\\n+ return result\\n+\\n+\\n+def unpack(func, **kwargs):\\n+ \\\"\\\"\\\"Make a function that applies `partial(func, **kwargs)` to its argument as *args\\\"\\\"\\\"\\n+ @functools.wraps(func)\\n+ def inner(items):\\n+ return func(*items, **kwargs)\\n+\\n+ return inner\\n+\\n+\\n def T(*x):\\n \\\"\\\"\\\" For use in yt-dl instead of {type, ...} or set((type, ...)) \\\"\\\"\\\"\\n return set(x)\\n\\n\",\n \"summary\": \"Edited 5 file(s) in youtube_dl/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"youtube_dl/extractor/common.py\",\n \"youtube_dl/extractor/youtube.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py\\nindex a64fcfccc35..a0901dab5ab 100644\\n--- a/youtube_dl/extractor/common.py\\n+++ b/youtube_dl/extractor/common.py\\n@@ -214,6 +214,7 @@ class InfoExtractor(object):\\n width : height ratio as float.\\n * no_resume The server does not support resuming the\\n (HTTP or RTMP) download. Boolean.\\n+ * available_at Unix timestamp of when a format will be available to download\\n * downloader_options A dictionary of downloader options as\\n described in FileDownloader\\n \\ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\\nindex c045bc8bc24..7965fa08a28 100644\\n--- a/youtube_dl/extractor/youtube.py\\n+++ b/youtube_dl/extractor/youtube.py\\n@@ -17,6 +17,8 @@\\n compat_chr,\\n compat_HTTPError,\\n compat_map as map,\\n+ compat_dict as o_dict,\\n+ compat_dict_items as dict_items,\\n compat_str,\\n compat_urllib_parse,\\n compat_urllib_parse_parse_qs as compat_parse_qs,\\n@@ -86,8 +88,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n \\n _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM)'\\n \\n- _INNERTUBE_CLIENTS = {\\n- 'ios': {\\n+ # priority order for now\\n+ _INNERTUBE_CLIENTS = o_dict((\\n+ # Doesn't require a PoToken for some reason: thx yt-dlp/yt-dlp#14693\\n+ ('android_sdkless', {\\n+ 'INNERTUBE_CONTEXT': {\\n+ 'client': {\\n+ 'clientName': 'ANDROID',\\n+ 'clientVersion': '20.10.38',\\n+ 'userAgent': 'com.google.android.youtube/20.10.38 (Linux; U; Android 11) gzip',\\n+ 'osName': 'Android',\\n+ 'osVersion': '11',\\n+ },\\n+ },\\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 3,\\n+ 'REQUIRE_JS_PLAYER': False,\\n+ 'WITH_COOKIES': False,\\n+ }),\\n+ ('ios', {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'IOS',\\n@@ -100,12 +118,13 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n },\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\\n- 'REQUIRE_PO_TOKEN': False,\\n+ 'REQUIRE_PO_TOKEN': True,\\n 'REQUIRE_JS_PLAYER': False,\\n- },\\n+ 'WITH_COOKIES': False,\\n+ }),\\n # mweb has 'ultralow' formats\\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\\n- 'mweb': {\\n+ ('mweb', {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'MWEB',\\n@@ -116,9 +135,19 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 2,\\n 'REQUIRE_PO_TOKEN': True,\\n+ }),\\n+ ('tv_downgraded', {\\n+ 'INNERTUBE_CONTEXT': {\\n+ 'client': {\\n+ 'clientName': 'TVHTML5',\\n+ 'clientVersion': '4', # avoids SABR formats, thx yt-dlp/yt-dlp#14887\\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\\n+ },\\n+ },\\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\\n 'SUPPORTS_COOKIES': True,\\n- },\\n- 'tv': {\\n+ }),\\n+ ('tv', {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'TVHTML5',\\n@@ -128,10 +157,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n },\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\\n- 'SUPPORTS_COOKIES': True,\\n- },\\n-\\n- 'web': {\\n+ }),\\n+ ('web', {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'WEB',\\n@@ -141,10 +168,20 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\\n 'REQUIRE_PO_TOKEN': True,\\n+ }),\\n+ ('web_embedded', {\\n+ 'INNERTUBE_CONTEXT': {\\n+ 'client': {\\n+ 'clientName': 'WEB_EMBEDDED_PLAYER',\\n+ 'clientVersion': '1.20250923.21.00',\\n+ 'embedUrl': 'https://www.youtube.com/', # Can be any valid URL\\n+ },\\n+ },\\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 56,\\n 'SUPPORTS_COOKIES': True,\\n- },\\n+ }),\\n # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\\n- 'web_safari': {\\n+ ('web_safari', {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'WEB',\\n@@ -152,8 +189,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\\n },\\n },\\n- },\\n- }\\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\\n+ 'SUPPORTS_COOKIES': True,\\n+ 'REQUIRE_PO': True,\\n+ }),\\n+ # This client now requires sign-in for every video\\n+ ('web_creator', {\\n+ 'INNERTUBE_CONTEXT': {\\n+ 'client': {\\n+ 'clientName': 'WEB_CREATOR',\\n+ 'clientVersion': '1.20250922.03.00',\\n+ },\\n+ },\\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 62,\\n+ 'REQUIRE_AUTH': True,\\n+ 'SUPPORTS_COOKIES': True,\\n+ 'WITH_COOKIES': True,\\n+ }),\\n+ ))\\n \\n def _login(self):\\n \\\"\\\"\\\"\\n@@ -430,6 +483,12 @@ def _extract_visitor_data(self, *args):\\n ('responseContext', 'visitorData')),\\n T(compat_str)))\\n \\n+ # @functools.cached_property\\n+ def is_authenticated(self, _cache={}):\\n+ if self not in _cache:\\n+ _cache[self] = bool(self._generate_sapisidhash_header())\\n+ return _cache[self]\\n+\\n def _extract_ytcfg(self, video_id, webpage):\\n ytcfg = self._search_json(\\n r'ytcfg\\\\.set\\\\s*\\\\(', webpage, 'ytcfg', video_id,\\n@@ -474,6 +533,27 @@ def _extract_video(self, renderer):\\n 'uploader': uploader,\\n }\\n \\n+ @staticmethod\\n+ def _get_text(data, *path_list, **kw_max_runs):\\n+ max_runs = kw_max_runs.get('max_runs')\\n+\\n+ for path in path_list or [None]:\\n+ if path is None:\\n+ obj = [data] # shortcut\\n+ else:\\n+ obj = traverse_obj(data, tuple(variadic(path) + (all,)))\\n+ for runs in traverse_obj(\\n+ obj, ('simpleText', {'text': T(compat_str)}, all, filter),\\n+ ('runs', lambda _, r: isinstance(r.get('text'), compat_str), all, filter),\\n+ (T(list), lambda _, r: isinstance(r.get('text'), compat_str)),\\n+ default=[]):\\n+ max_runs = int_or_none(max_runs, default=len(runs))\\n+ if max_runs < len(runs):\\n+ runs = runs[:max_runs]\\n+ text = ''.join(traverse_obj(runs, (Ellipsis, 'text')))\\n+ if text:\\n+ return text\\n+\\n @staticmethod\\n def _extract_thumbnails(data, *path_list, **kw_final_key):\\n \\\"\\\"\\\"\\n@@ -1619,16 +1699,17 @@ def __init__(self, *args, **kwargs):\\n self._player_cache = {}\\n \\n def _get_player_js_version(self):\\n- player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\\n- sts_hash = self._search_regex(\\n- ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\\n- player_js_version, 'player_js_version', group=(1, 2), default=None)\\n- if sts_hash:\\n- return sts_hash\\n- self.report_warning(\\n- 'Invalid player JS version \\\"{0}\\\" specified. '\\n- 'It should be \\\"{1}\\\" or in the format of {2}'.format(\\n- player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\\n+ player_js_version = self.get_param('youtube_player_js_version')\\n+ if player_js_version:\\n+ sts_hash = self._search_regex(\\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\\n+ if sts_hash:\\n+ return sts_hash\\n+ self.report_warning(\\n+ 'Invalid player JS version \\\"{0}\\\" specified. '\\n+ 'It should be \\\"{1}\\\" or in the format of {2}'.format(\\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\\n return None, None\\n \\n # *ytcfgs, webpage=None\\n@@ -1643,18 +1724,18 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\\n player_url = traverse_obj(\\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\\n- get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\\n+ get_all=False, expected_type=self._yt_urljoin)\\n \\n- player_id_override = self._get_player_js_version()[1]\\n-\\n- requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\\n+ requested_js_variant = self.get_param('youtube_player_js_variant')\\n variant_js = next(\\n (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\\n None)\\n if variant_js:\\n+ player_id_override = self._get_player_js_version()[1]\\n player_id = player_id_override or self._extract_player_info(player_url)\\n original_url = player_url\\n- player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\\n+ player_url = self._yt_urljoin(\\n+ '/s/player/{0}/{1}'.format(player_id, variant_js))\\n if original_url != player_url:\\n self.write_debug(\\n 'Forcing \\\"{0}\\\" player JS variant for player {1}\\\\n'\\n@@ -1668,7 +1749,7 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\\n requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\\n only_once=True)\\n \\n- return urljoin('https://www.youtube.com', player_url)\\n+ return player_url\\n \\n def _download_player_url(self, video_id, fatal=False):\\n res = self._download_webpage(\\n@@ -2048,8 +2129,7 @@ def decrypt_nsig(n):\\n return self._cached(self._decrypt_nsig, 'nsig', n, player_url)\\n \\n for fmt in formats:\\n- parsed_fmt_url = compat_urllib_parse.urlparse(fmt['url'])\\n- n_param = compat_parse_qs(parsed_fmt_url.query).get('n')\\n+ n_param = parse_qs(fmt['url']).get('n')\\n if not n_param:\\n continue\\n n_param = n_param[-1]\\n@@ -2098,32 +2178,35 @@ def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=F\\n return sts\\n \\n def _mark_watched(self, video_id, player_response):\\n- playback_url = url_or_none(try_get(\\n- player_response,\\n- lambda x: x['playbackTracking']['videostatsPlaybackUrl']['baseUrl']))\\n- if not playback_url:\\n- return\\n-\\n # cpn generation algorithm is reverse engineered from base.js.\\n # In fact it works even with dummy cpn.\\n CPN_ALPHABET = string.ascii_letters + string.digits + '-_'\\n cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(16))\\n \\n- # more consistent results setting it to right before the end\\n- qs = parse_qs(playback_url)\\n- video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\\n+ for is_full, key in enumerate(('videostatsPlaybackUrl', 'videostatsWatchtimeUrl')):\\n+ label = 'fully ' if is_full > 0 else ''\\n \\n- playback_url = update_url_query(\\n- playback_url, {\\n- 'ver': '2',\\n- 'cpn': cpn,\\n- 'cmt': video_length,\\n- 'el': 'detailpage', # otherwise defaults to \\\"shorts\\\"\\n- })\\n+ playback_url = traverse_obj(player_response, (\\n+ 'playbackTracking'. key, 'baseUrl', T(url_or_none)))\\n+ if not playback_url:\\n+ self.report_warning('Unable to mark {0}watched'.format(label))\\n+ continue\\n+\\n+ # more consistent results setting it to right before the end\\n+ qs = parse_qs(playback_url)\\n+ video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\\n+\\n+ playback_url = update_url_query(\\n+ playback_url, {\\n+ 'ver': '2',\\n+ 'cpn': cpn,\\n+ 'cmt': video_length,\\n+ 'el': 'detailpage', # otherwise defaults to \\\"shorts\\\"\\n+ })\\n \\n- self._download_webpage(\\n- playback_url, video_id, 'Marking watched',\\n- 'Unable to mark watched', fatal=False)\\n+ self._download_webpage(\\n+ playback_url, video_id, 'Marking {0}watched'.format(label),\\n+ 'Unable to mark watched', fatal=False)\\n \\n @staticmethod\\n def _extract_urls(webpage):\\n@@ -2215,6 +2298,49 @@ def _extract_yt_initial_variable(self, webpage, regex, video_id, name):\\n (r'%s\\\\s*%s' % (regex, self._YT_INITIAL_BOUNDARY_RE),\\n regex), webpage, name, default='{}'), video_id, fatal=False)\\n \\n+ def _get_preroll_length(self, ad_slot_lists):\\n+\\n+ def parse_instream_ad_renderer(instream_renderer):\\n+ for skippable, path in (\\n+ ('', ('skipOffsetMilliseconds', T(int))),\\n+ ('non-', ('playerVars', T(compat_parse_qs),\\n+ 'length_seconds', -1, T(int_or_none(invscale=1000))))):\\n+ length_ms = traverse_obj(instream_renderer, path)\\n+ if length_ms is not None:\\n+ self.write_debug('Detected a %ds %sskippable ad' % (\\n+ length_ms // 1000, skippable))\\n+ break\\n+ return length_ms\\n+\\n+ for slot_renderer in traverse_obj(ad_slot_lists, ('adSlots', Ellipsis, 'adSlotRenderer', T(dict))):\\n+ if traverse_obj(slot_renderer, ('adSlotMetadata', 'triggerEvent')) != 'SLOT_TRIGGER_EVENT_BEFORE_CONTENT':\\n+ continue\\n+ rendering_content = traverse_obj(slot_renderer, (\\n+ 'fulfillmentContent', 'fulfilledLayout', 'playerBytesAdLayoutRenderer',\\n+ 'renderingContent', 'instreamVideoAdRenderer', T(dict)))\\n+ length_ms = parse_instream_ad_renderer(rendering_content)\\n+ if length_ms is not None:\\n+ return length_ms\\n+ times = traverse_obj(rendering_content, ((\\n+ ('playerBytesSequentialLayoutRenderer', 'sequentialLayouts'),\\n+ None), any, Ellipsis, 'playerBytesAdLayoutRenderer',\\n+ 'renderingContent', 'instreamVideoAdRenderer',\\n+ T(parse_instream_ad_renderer)))\\n+ if times:\\n+ return sum(times)\\n+ return 0\\n+\\n+ def _is_premium_subscriber(self, initial_data):\\n+ if not self.is_authenticated or not initial_data:\\n+ return False\\n+\\n+ tlr = traverse_obj(\\n+ initial_data, ('topbar', 'desktopTopbarRenderer', 'logo', 'topbarLogoRenderer'))\\n+ return (\\n+ traverse_obj(tlr, ('iconImage', 'iconType')) == 'YOUTUBE_PREMIUM_LOGO'\\n+ or 'premium' in (self._get_text(tlr, 'tooltipText') or '').lower()\\n+ )\\n+\\n def _real_extract(self, url):\\n url, smuggled_data = unsmuggle_url(url, {})\\n video_id = self._match_id(url)\\n@@ -2242,32 +2368,36 @@ def _real_extract(self, url):\\n if True or not player_response:\\n origin = 'https://www.youtube.com'\\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\\n- fetched_timestamp = int(time.time())\\n-\\n player_url = self._extract_player_url(webpage)\\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\\n sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)\\n if sts:\\n pb_context['signatureTimestamp'] = sts\\n \\n- client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\\n- T(dict.items), lambda _, k_v: not k_v[1].get('REQUIRE_PO_TOKEN'),\\n- 0))[:1]\\n+ auth = self._generate_sapisidhash_header(origin)\\n+\\n+ client_names = []\\n+ if auth or self._is_premium_subscriber(player_response):\\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\\n+ T(dict_items), lambda _, k_v: k_v[0] == 'web_safari', 0))[:1]\\n+ if not client_names:\\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\\n+ T(dict_items), lambda _, k_v: not (\\n+ k_v[1].get('REQUIRE_PO_TOKEN')\\n+ or (bool(k_v[1].get('WITH_COOKIES', auth)) ^ bool(auth))\\n+ ), 0))[:1]\\n if 'web' not in client_names:\\n- # webpage links won't download: ignore links and playability\\n+ # only live HLS webpage links will download: ignore playability\\n player_response = filter_dict(\\n player_response or {},\\n- lambda k, _: k not in ('streamingData', 'playabilityStatus'))\\n-\\n- if is_live and 'ios' not in client_names:\\n- client_names.append('ios')\\n+ lambda k, _: k != 'playabilityStatus')\\n \\n headers = {\\n 'Sec-Fetch-Mode': 'navigate',\\n 'Origin': origin,\\n 'X-Goog-Visitor-Id': self._extract_visitor_data(ytcfg) or '',\\n }\\n- auth = self._generate_sapisidhash_header(origin)\\n+\\n if auth is not None:\\n headers['Authorization'] = auth\\n headers['X-Origin'] = origin\\n@@ -2297,7 +2427,7 @@ def _real_extract(self, url):\\n 'INNERTUBE_CONTEXT', 'client', 'clientVersion'),\\n 'User-Agent': (\\n 'INNERTUBE_CONTEXT', 'client', 'userAgent'),\\n- }))\\n+ }) or {})\\n \\n api_player_response = self._call_api(\\n 'player', query, video_id, fatal=False, headers=api_headers,\\n@@ -2306,19 +2436,22 @@ def _real_extract(self, url):\\n 'context', 'client', 'clientName')),\\n 'API JSON', delim=' '))\\n \\n- hls = traverse_obj(\\n- (player_response, api_player_response),\\n- (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\\n+ # be sure to find HLS in case of is_live\\n+ hls = traverse_obj(player_response, (\\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none)))\\n fetched_timestamp = int(time.time())\\n- if len(hls) == 2 and not hls[0] and hls[1]:\\n- player_response['streamingData']['hlsManifestUrl'] = hls[1]\\n- else:\\n- video_details = merge_dicts(*traverse_obj(\\n- (player_response, api_player_response),\\n- (Ellipsis, 'videoDetails', T(dict))))\\n- player_response.update(filter_dict(\\n- api_player_response or {}, cndn=lambda k, _: k != 'captions'))\\n- player_response['videoDetails'] = video_details\\n+ preroll_length_ms = (\\n+ self._get_preroll_length(api_player_response)\\n+ or self._get_preroll_length(player_response))\\n+ video_details = merge_dicts(*traverse_obj(\\n+ (player_response, api_player_response),\\n+ (Ellipsis, 'videoDetails', T(dict))))\\n+ player_response.update(filter_dict(\\n+ api_player_response or {}, cndn=lambda k, _: k != 'captions'))\\n+ player_response['videoDetails'] = video_details\\n+ if hls and not traverse_obj(player_response, (\\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none))):\\n+ player_response['streamingData']['hlsManifestUrl'] = hls\\n \\n def is_agegated(playability):\\n # playability: dict\\n@@ -2385,10 +2518,7 @@ def get_playability_status(response):\\n return self.url_result(\\n trailer_video_id, self.ie_key(), trailer_video_id)\\n \\n- def get_text(x):\\n- return ''.join(traverse_obj(\\n- x, (('simpleText',),), ('runs', Ellipsis, 'text'),\\n- expected_type=compat_str))\\n+ get_text = lambda x: self._get_text(x) or ''\\n \\n search_meta = (\\n (lambda x: self._html_search_meta(x, webpage, default=None))\\n@@ -2476,7 +2606,7 @@ def build_fragments(f):\\n elif fetched_timestamp is not None:\\n # Handle preroll waiting period\\n preroll_sleep = self.get_param('youtube_preroll_sleep')\\n- preroll_sleep = int_or_none(preroll_sleep, default=6)\\n+ preroll_sleep = min(6, int_or_none(preroll_sleep, default=preroll_length_ms / 1000))\\n fetched_timestamp += preroll_sleep\\n \\n for fmt in streaming_formats:\\n@@ -2522,6 +2652,10 @@ def build_fragments(f):\\n self.write_debug(error_to_compat_str(e), only_once=True)\\n continue\\n \\n+ if parse_qs(fmt_url).get('n'):\\n+ # this and (we assume) all the formats here are n-scrambled\\n+ break\\n+\\n language_preference = (\\n 10 if audio_track.get('audioIsDefault')\\n else -10 if 'descriptive' in (traverse_obj(audio_track, ('displayName', T(lower))) or '')\\n@@ -2654,7 +2788,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n subreason = pemr.get('subreason')\\n if subreason:\\n subreason = clean_html(get_text(subreason))\\n- if subreason == 'The uploader has not made this video available in your country.':\\n+ if subreason.startswith('The uploader has not made this video available in your country'):\\n countries = microformat.get('availableCountries')\\n if not countries:\\n regions_allowed = search_meta('regionsAllowed')\\n@@ -2848,24 +2982,21 @@ def process_subtitles():\\n chapters = self._extract_chapters_from_json(\\n initial_data, video_id, duration)\\n if not chapters:\\n- for engagment_pannel in (initial_data.get('engagementPanels') or []):\\n- contents = try_get(\\n- engagment_pannel, lambda x: x['engagementPanelSectionListRenderer']['content']['macroMarkersListRenderer']['contents'],\\n- list)\\n- if not contents:\\n- continue\\n+ def chapter_time(mmlir):\\n+ return parse_duration(\\n+ get_text(mmlir.get('timeDescription')))\\n \\n- def chapter_time(mmlir):\\n- return parse_duration(\\n- get_text(mmlir.get('timeDescription')))\\n+ for markers in traverse_obj(initial_data, (\\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\\n+ 'content', 'macroMarkersListRenderer', 'contents', T(list))):\\n \\n chapters = []\\n- for next_num, content in enumerate(contents, start=1):\\n+ for next_num, content in enumerate(markers, start=1):\\n mmlir = content.get('macroMarkersListItemRenderer') or {}\\n start_time = chapter_time(mmlir)\\n- end_time = (traverse_obj(\\n- contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\\n- if next_num < len(contents) else duration)\\n+ end_time = (traverse_obj(markers, (\\n+ next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\\n+ if next_num < len(markers) else duration)\\n if start_time is None or end_time is None:\\n continue\\n chapters.append({\\n@@ -3424,12 +3555,6 @@ def _extract_grid_item_renderer(item):\\n T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\\n 1, T(dict)), get_all=False)\\n \\n- @staticmethod\\n- def _get_text(r, k):\\n- return traverse_obj(\\n- r, (k, 'runs', 0, 'text'), (k, 'simpleText'),\\n- expected_type=txt_or_none)\\n-\\n def _grid_entries(self, grid_renderer):\\n for item in traverse_obj(grid_renderer, ('items', Ellipsis, T(dict))):\\n lockup_view_model = traverse_obj(item, ('lockupViewModel', T(dict)))\\n@@ -3540,15 +3665,25 @@ def _extract_lockup_view_model(self, view_model):\\n 'Unsupported lockup view model content type \\\"{0}\\\"{1}'.format(content_type, bug_reports_message()),\\n only_once=True)\\n return\\n+\\n thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\\n+\\n return merge_dicts(self.url_result(\\n- url, ie=ie.ie_key(), video_id=content_id), {\\n- 'title': traverse_obj(view_model, (\\n- 'metadata', 'lockupMetadataViewModel', 'title',\\n- 'content', T(compat_str))),\\n- 'thumbnails': self._extract_thumbnails(\\n- view_model, thumb_keys, final_key='sources'),\\n- })\\n+ url, ie=ie.ie_key(), video_id=content_id),\\n+ traverse_obj(view_model, {\\n+ 'title': ('metadata', 'lockupMetadataViewModel', 'title',\\n+ 'content', T(compat_str)),\\n+ 'thumbnails': T(lambda vm: self._extract_thumbnails(\\n+ vm, thumb_keys, final_key='sources')),\\n+ 'duration': (\\n+ 'contentImage', 'thumbnailViewModel', 'overlays',\\n+ Ellipsis, (\\n+ ('thumbnailBottomOverlayViewModel', 'badges'),\\n+ ('thumbnailOverlayBadgeViewModel', 'thumbnailBadges')\\n+ ), Ellipsis, 'thumbnailBadgeViewModel', 'text',\\n+ T(parse_duration), any),\\n+ })\\n+ )\\n \\n def _extract_shorts_lockup_view_model(self, view_model):\\n content_id = traverse_obj(view_model, (\\n\",\n \"summary\": \"Edited 2 file(s) in youtube_dl/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\nindex 8367b6e5345..ec1d35c3aca 100755\n--- a/youtube_dl/YoutubeDL.py\n+++ b/youtube_dl/YoutubeDL.py\n@@ -357,7 +357,7 @@ class YoutubeDL(object):\n \n _NUMERIC_FIELDS = set((\n 'width', 'height', 'tbr', 'abr', 'asr', 'vbr', 'fps', 'filesize', 'filesize_approx',\n- 'timestamp', 'upload_year', 'upload_month', 'upload_day',\n+ 'timestamp', 'upload_year', 'upload_month', 'upload_day', 'available_at',\n 'duration', 'view_count', 'like_count', 'dislike_count', 'repost_count',\n 'average_rating', 'comment_count', 'age_limit',\n 'start_time', 'end_time',\ndiff --git a/youtube_dl/compat.py b/youtube_dl/compat.py\nindex ebe22bdf9d1..a985cb03e84 100644\n--- a/youtube_dl/compat.py\n+++ b/youtube_dl/compat.py\n@@ -55,7 +55,7 @@\n try:\n import collections.abc as compat_collections_abc\n except ImportError:\n- import collections as compat_collections_abc\n+ compat_collections_abc = collections\n \n \n # compat_urllib_request\n@@ -3452,6 +3452,8 @@ def unpack(self, string):\n except ImportError:\n compat_map = map\n \n+\n+# compat_filter, compat_filter_fns\n try:\n from future_builtins import filter as compat_filter\n except ImportError:\n@@ -3459,6 +3461,9 @@ def unpack(self, string):\n from itertools import ifilter as compat_filter\n except ImportError:\n compat_filter = filter\n+# \"Is this function one or maybe the other filter()?\"\n+compat_filter_fns = tuple(set((filter, compat_filter)))\n+\n \n # compat_zip\n try:\n@@ -3478,6 +3483,40 @@ def unpack(self, string):\n from itertools import izip_longest as compat_itertools_zip_longest\n \n \n+# compat_abc_ABC\n+try:\n+ from abc import ABC as compat_abc_ABC\n+except ImportError:\n+ # Py < 3.4\n+ from abc import ABCMeta as _ABCMeta\n+ compat_abc_ABC = _ABCMeta(str('ABC'), (object,), {})\n+\n+\n+# dict mixin used here\n+# like UserDict.DictMixin, without methods created by MutableMapping\n+class _DictMixin(compat_abc_ABC):\n+ def has_key(self, key):\n+ return key in self\n+\n+ # get(), clear(), setdefault() in MM\n+\n+ def iterkeys(self):\n+ return (k for k in self)\n+\n+ def itervalues(self):\n+ return (self[k] for k in self)\n+\n+ def iteritems(self):\n+ return ((k, self[k]) for k in self)\n+\n+ # pop(), popitem() in MM\n+\n+ def copy(self):\n+ return type(self)(self)\n+\n+ # update() in MM\n+\n+\n # compat_collections_chain_map\n # collections.ChainMap: new class\n try:\n@@ -3632,6 +3671,129 @@ def compat_datetime_timedelta_total_seconds(td):\n compat_zstandard = None\n \n \n+# compat_thread\n+try:\n+ import _thread as compat_thread\n+except ImportError:\n+ try:\n+ import thread as compat_thread\n+ except ImportError:\n+ import dummy_thread as compat_thread\n+\n+\n+# compat_dict\n+# compat_builtins_dict\n+# compat_dict_items\n+if sys.version_info >= (3, 6):\n+ compat_dict = compat_builtins_dict = dict\n+ compat_dict_items = dict.items\n+else:\n+ _get_ident = compat_thread.get_ident\n+\n+ class compat_dict(compat_collections_abc.MutableMapping, _DictMixin, dict):\n+ \"\"\"`dict` that preserves insertion order with interface like Py3.7+\"\"\"\n+\n+ _order = [] # default that should never be used\n+\n+ def __init__(self, *mappings_or_iterables, **kwargs):\n+ # order an unordered dict using a list of keys: actual Py 2.7+\n+ # OrderedDict uses a doubly linked list for better performance\n+ self._order = []\n+ for arg in mappings_or_iterables:\n+ self.__update(arg)\n+ if kwargs:\n+ self.__update(kwargs)\n+\n+ def __getitem__(self, key):\n+ return dict.__getitem__(self, key)\n+\n+ def __setitem__(self, key, value):\n+ try:\n+ if key not in self._order:\n+ self._order.append(key)\n+ dict.__setitem__(self, key, value)\n+ except Exception:\n+ if key in self._order[-1:] and key not in self:\n+ del self._order[-1]\n+ raise\n+\n+ def __len__(self):\n+ return dict.__len__(self)\n+\n+ def __delitem__(self, key):\n+ dict.__delitem__(self, key)\n+ try:\n+ # expected case, O(len(self)), but who dels anyway?\n+ self._order.remove(key)\n+ except ValueError:\n+ pass\n+\n+ def __iter__(self):\n+ for from_ in self._order:\n+ if from_ in self:\n+ yield from_\n+\n+ def __del__(self):\n+ for attr in ('_order',):\n+ try:\n+ delattr(self, attr)\n+ except Exception:\n+ pass\n+\n+ def __repr__(self, _repr_running={}):\n+ # skip recursive items ...\n+ call_key = id(self), _get_ident()\n+ if _repr_running.get(call_key):\n+ return '...'\n+ _repr_running[call_key] = True\n+ try:\n+ return '%s({%s})' % (\n+ type(self).__name__,\n+ ','.join('%r: %r' % k_v for k_v in self.items()))\n+ finally:\n+ del _repr_running[call_key]\n+\n+ # merge/update (PEP 584)\n+\n+ def __or__(self, other):\n+ if not isinstance(other, compat_collections_abc.Mapping):\n+ return NotImplemented\n+ new = type(self)(self)\n+ new.update(other)\n+ return new\n+\n+ def __ror__(self, other):\n+ if not isinstance(other, compat_collections_abc.Mapping):\n+ return NotImplemented\n+ new = type(other)(other)\n+ new.update(self)\n+ return new\n+\n+ def __ior__(self, other):\n+ self.update(other)\n+ return self\n+\n+ # optimisations\n+\n+ def __reversed__(self):\n+ for from_ in reversed(self._order):\n+ if from_ in self:\n+ yield from_\n+\n+ def __contains__(self, item):\n+ return dict.__contains__(self, item)\n+\n+ # allow overriding update without breaking __init__\n+ def __update(self, *args, **kwargs):\n+ super(compat_dict, self).update(*args, **kwargs)\n+\n+ compat_builtins_dict = dict\n+ # Using the object's method, not dict's:\n+ # an ordered dict's items can be returned unstably by unordered\n+ # dict.items as if the method was not ((k, self[k]) for k in self)\n+ compat_dict_items = lambda d: d.items()\n+\n+\n legacy = [\n 'compat_HTMLParseError',\n 'compat_HTMLParser',\n@@ -3662,9 +3824,11 @@ def compat_datetime_timedelta_total_seconds(td):\n \n __all__ = [\n 'compat_Struct',\n+ 'compat_abc_ABC',\n 'compat_base64_b64decode',\n 'compat_basestring',\n 'compat_brotli',\n+ 'compat_builtins_dict',\n 'compat_casefold',\n 'compat_chr',\n 'compat_collections_abc',\n@@ -3672,9 +3836,12 @@ def compat_datetime_timedelta_total_seconds(td):\n 'compat_contextlib_suppress',\n 'compat_ctypes_WINFUNCTYPE',\n 'compat_datetime_timedelta_total_seconds',\n+ 'compat_dict',\n+ 'compat_dict_items',\n 'compat_etree_fromstring',\n 'compat_etree_iterfind',\n 'compat_filter',\n+ 'compat_filter_fns',\n 'compat_get_terminal_size',\n 'compat_getenv',\n 'compat_getpass_getpass',\n@@ -3716,6 +3883,7 @@ def compat_datetime_timedelta_total_seconds(td):\n 'compat_struct_unpack',\n 'compat_subprocess_get_DEVNULL',\n 'compat_subprocess_Popen',\n+ 'compat_thread',\n 'compat_tokenize_tokenize',\n 'compat_urllib_error',\n 'compat_urllib_parse',\ndiff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py\nindex a64fcfccc35..a0901dab5ab 100644\n--- a/youtube_dl/extractor/common.py\n+++ b/youtube_dl/extractor/common.py\n@@ -214,6 +214,7 @@ class InfoExtractor(object):\n width : height ratio as float.\n * no_resume The server does not support resuming the\n (HTTP or RTMP) download. Boolean.\n+ * available_at Unix timestamp of when a format will be available to download\n * downloader_options A dictionary of downloader options as\n described in FileDownloader\n \ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex c045bc8bc24..7965fa08a28 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -17,6 +17,8 @@\n compat_chr,\n compat_HTTPError,\n compat_map as map,\n+ compat_dict as o_dict,\n+ compat_dict_items as dict_items,\n compat_str,\n compat_urllib_parse,\n compat_urllib_parse_parse_qs as compat_parse_qs,\n@@ -86,8 +88,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n \n _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM)'\n \n- _INNERTUBE_CLIENTS = {\n- 'ios': {\n+ # priority order for now\n+ _INNERTUBE_CLIENTS = o_dict((\n+ # Doesn't require a PoToken for some reason: thx yt-dlp/yt-dlp#14693\n+ ('android_sdkless', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'ANDROID',\n+ 'clientVersion': '20.10.38',\n+ 'userAgent': 'com.google.android.youtube/20.10.38 (Linux; U; Android 11) gzip',\n+ 'osName': 'Android',\n+ 'osVersion': '11',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 3,\n+ 'REQUIRE_JS_PLAYER': False,\n+ 'WITH_COOKIES': False,\n+ }),\n+ ('ios', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'IOS',\n@@ -100,12 +118,13 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\n- 'REQUIRE_PO_TOKEN': False,\n+ 'REQUIRE_PO_TOKEN': True,\n 'REQUIRE_JS_PLAYER': False,\n- },\n+ 'WITH_COOKIES': False,\n+ }),\n # mweb has 'ultralow' formats\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\n- 'mweb': {\n+ ('mweb', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'MWEB',\n@@ -116,9 +135,19 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 2,\n 'REQUIRE_PO_TOKEN': True,\n+ }),\n+ ('tv_downgraded', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'TVHTML5',\n+ 'clientVersion': '4', # avoids SABR formats, thx yt-dlp/yt-dlp#14887\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n 'SUPPORTS_COOKIES': True,\n- },\n- 'tv': {\n+ }),\n+ ('tv', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'TVHTML5',\n@@ -128,10 +157,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n- 'SUPPORTS_COOKIES': True,\n- },\n-\n- 'web': {\n+ }),\n+ ('web', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n@@ -141,10 +168,20 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n 'REQUIRE_PO_TOKEN': True,\n+ }),\n+ ('web_embedded', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB_EMBEDDED_PLAYER',\n+ 'clientVersion': '1.20250923.21.00',\n+ 'embedUrl': 'https://www.youtube.com/', # Can be any valid URL\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 56,\n 'SUPPORTS_COOKIES': True,\n- },\n+ }),\n # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\n- 'web_safari': {\n+ ('web_safari', {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n@@ -152,8 +189,24 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\n },\n },\n- },\n- }\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n+ 'SUPPORTS_COOKIES': True,\n+ 'REQUIRE_PO': True,\n+ }),\n+ # This client now requires sign-in for every video\n+ ('web_creator', {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB_CREATOR',\n+ 'clientVersion': '1.20250922.03.00',\n+ },\n+ },\n+ 'INNERTUBE_CONTEXT_CLIENT_NAME': 62,\n+ 'REQUIRE_AUTH': True,\n+ 'SUPPORTS_COOKIES': True,\n+ 'WITH_COOKIES': True,\n+ }),\n+ ))\n \n def _login(self):\n \"\"\"\n@@ -430,6 +483,12 @@ def _extract_visitor_data(self, *args):\n ('responseContext', 'visitorData')),\n T(compat_str)))\n \n+ # @functools.cached_property\n+ def is_authenticated(self, _cache={}):\n+ if self not in _cache:\n+ _cache[self] = bool(self._generate_sapisidhash_header())\n+ return _cache[self]\n+\n def _extract_ytcfg(self, video_id, webpage):\n ytcfg = self._search_json(\n r'ytcfg\\.set\\s*\\(', webpage, 'ytcfg', video_id,\n@@ -474,6 +533,27 @@ def _extract_video(self, renderer):\n 'uploader': uploader,\n }\n \n+ @staticmethod\n+ def _get_text(data, *path_list, **kw_max_runs):\n+ max_runs = kw_max_runs.get('max_runs')\n+\n+ for path in path_list or [None]:\n+ if path is None:\n+ obj = [data] # shortcut\n+ else:\n+ obj = traverse_obj(data, tuple(variadic(path) + (all,)))\n+ for runs in traverse_obj(\n+ obj, ('simpleText', {'text': T(compat_str)}, all, filter),\n+ ('runs', lambda _, r: isinstance(r.get('text'), compat_str), all, filter),\n+ (T(list), lambda _, r: isinstance(r.get('text'), compat_str)),\n+ default=[]):\n+ max_runs = int_or_none(max_runs, default=len(runs))\n+ if max_runs < len(runs):\n+ runs = runs[:max_runs]\n+ text = ''.join(traverse_obj(runs, (Ellipsis, 'text')))\n+ if text:\n+ return text\n+\n @staticmethod\n def _extract_thumbnails(data, *path_list, **kw_final_key):\n \"\"\"\n@@ -1619,16 +1699,17 @@ def __init__(self, *args, **kwargs):\n self._player_cache = {}\n \n def _get_player_js_version(self):\n- player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\n- sts_hash = self._search_regex(\n- ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n- player_js_version, 'player_js_version', group=(1, 2), default=None)\n- if sts_hash:\n- return sts_hash\n- self.report_warning(\n- 'Invalid player JS version \"{0}\" specified. '\n- 'It should be \"{1}\" or in the format of {2}'.format(\n- player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n+ player_js_version = self.get_param('youtube_player_js_version')\n+ if player_js_version:\n+ sts_hash = self._search_regex(\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\n+ if sts_hash:\n+ return sts_hash\n+ self.report_warning(\n+ 'Invalid player JS version \"{0}\" specified. '\n+ 'It should be \"{1}\" or in the format of {2}'.format(\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n return None, None\n \n # *ytcfgs, webpage=None\n@@ -1643,18 +1724,18 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\n player_url = traverse_obj(\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\n- get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\n+ get_all=False, expected_type=self._yt_urljoin)\n \n- player_id_override = self._get_player_js_version()[1]\n-\n- requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\n+ requested_js_variant = self.get_param('youtube_player_js_variant')\n variant_js = next(\n (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\n None)\n if variant_js:\n+ player_id_override = self._get_player_js_version()[1]\n player_id = player_id_override or self._extract_player_info(player_url)\n original_url = player_url\n- player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\n+ player_url = self._yt_urljoin(\n+ '/s/player/{0}/{1}'.format(player_id, variant_js))\n if original_url != player_url:\n self.write_debug(\n 'Forcing \"{0}\" player JS variant for player {1}\\n'\n@@ -1668,7 +1749,7 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\n only_once=True)\n \n- return urljoin('https://www.youtube.com', player_url)\n+ return player_url\n \n def _download_player_url(self, video_id, fatal=False):\n res = self._download_webpage(\n@@ -2048,8 +2129,7 @@ def decrypt_nsig(n):\n return self._cached(self._decrypt_nsig, 'nsig', n, player_url)\n \n for fmt in formats:\n- parsed_fmt_url = compat_urllib_parse.urlparse(fmt['url'])\n- n_param = compat_parse_qs(parsed_fmt_url.query).get('n')\n+ n_param = parse_qs(fmt['url']).get('n')\n if not n_param:\n continue\n n_param = n_param[-1]\n@@ -2098,32 +2178,35 @@ def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=F\n return sts\n \n def _mark_watched(self, video_id, player_response):\n- playback_url = url_or_none(try_get(\n- player_response,\n- lambda x: x['playbackTracking']['videostatsPlaybackUrl']['baseUrl']))\n- if not playback_url:\n- return\n-\n # cpn generation algorithm is reverse engineered from base.js.\n # In fact it works even with dummy cpn.\n CPN_ALPHABET = string.ascii_letters + string.digits + '-_'\n cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(16))\n \n- # more consistent results setting it to right before the end\n- qs = parse_qs(playback_url)\n- video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\n+ for is_full, key in enumerate(('videostatsPlaybackUrl', 'videostatsWatchtimeUrl')):\n+ label = 'fully ' if is_full > 0 else ''\n \n- playback_url = update_url_query(\n- playback_url, {\n- 'ver': '2',\n- 'cpn': cpn,\n- 'cmt': video_length,\n- 'el': 'detailpage', # otherwise defaults to \"shorts\"\n- })\n+ playback_url = traverse_obj(player_response, (\n+ 'playbackTracking'. key, 'baseUrl', T(url_or_none)))\n+ if not playback_url:\n+ self.report_warning('Unable to mark {0}watched'.format(label))\n+ continue\n+\n+ # more consistent results setting it to right before the end\n+ qs = parse_qs(playback_url)\n+ video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)\n+\n+ playback_url = update_url_query(\n+ playback_url, {\n+ 'ver': '2',\n+ 'cpn': cpn,\n+ 'cmt': video_length,\n+ 'el': 'detailpage', # otherwise defaults to \"shorts\"\n+ })\n \n- self._download_webpage(\n- playback_url, video_id, 'Marking watched',\n- 'Unable to mark watched', fatal=False)\n+ self._download_webpage(\n+ playback_url, video_id, 'Marking {0}watched'.format(label),\n+ 'Unable to mark watched', fatal=False)\n \n @staticmethod\n def _extract_urls(webpage):\n@@ -2215,6 +2298,49 @@ def _extract_yt_initial_variable(self, webpage, regex, video_id, name):\n (r'%s\\s*%s' % (regex, self._YT_INITIAL_BOUNDARY_RE),\n regex), webpage, name, default='{}'), video_id, fatal=False)\n \n+ def _get_preroll_length(self, ad_slot_lists):\n+\n+ def parse_instream_ad_renderer(instream_renderer):\n+ for skippable, path in (\n+ ('', ('skipOffsetMilliseconds', T(int))),\n+ ('non-', ('playerVars', T(compat_parse_qs),\n+ 'length_seconds', -1, T(int_or_none(invscale=1000))))):\n+ length_ms = traverse_obj(instream_renderer, path)\n+ if length_ms is not None:\n+ self.write_debug('Detected a %ds %sskippable ad' % (\n+ length_ms // 1000, skippable))\n+ break\n+ return length_ms\n+\n+ for slot_renderer in traverse_obj(ad_slot_lists, ('adSlots', Ellipsis, 'adSlotRenderer', T(dict))):\n+ if traverse_obj(slot_renderer, ('adSlotMetadata', 'triggerEvent')) != 'SLOT_TRIGGER_EVENT_BEFORE_CONTENT':\n+ continue\n+ rendering_content = traverse_obj(slot_renderer, (\n+ 'fulfillmentContent', 'fulfilledLayout', 'playerBytesAdLayoutRenderer',\n+ 'renderingContent', 'instreamVideoAdRenderer', T(dict)))\n+ length_ms = parse_instream_ad_renderer(rendering_content)\n+ if length_ms is not None:\n+ return length_ms\n+ times = traverse_obj(rendering_content, ((\n+ ('playerBytesSequentialLayoutRenderer', 'sequentialLayouts'),\n+ None), any, Ellipsis, 'playerBytesAdLayoutRenderer',\n+ 'renderingContent', 'instreamVideoAdRenderer',\n+ T(parse_instream_ad_renderer)))\n+ if times:\n+ return sum(times)\n+ return 0\n+\n+ def _is_premium_subscriber(self, initial_data):\n+ if not self.is_authenticated or not initial_data:\n+ return False\n+\n+ tlr = traverse_obj(\n+ initial_data, ('topbar', 'desktopTopbarRenderer', 'logo', 'topbarLogoRenderer'))\n+ return (\n+ traverse_obj(tlr, ('iconImage', 'iconType')) == 'YOUTUBE_PREMIUM_LOGO'\n+ or 'premium' in (self._get_text(tlr, 'tooltipText') or '').lower()\n+ )\n+\n def _real_extract(self, url):\n url, smuggled_data = unsmuggle_url(url, {})\n video_id = self._match_id(url)\n@@ -2242,32 +2368,36 @@ def _real_extract(self, url):\n if True or not player_response:\n origin = 'https://www.youtube.com'\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\n- fetched_timestamp = int(time.time())\n-\n player_url = self._extract_player_url(webpage)\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\n sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)\n if sts:\n pb_context['signatureTimestamp'] = sts\n \n- client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n- T(dict.items), lambda _, k_v: not k_v[1].get('REQUIRE_PO_TOKEN'),\n- 0))[:1]\n+ auth = self._generate_sapisidhash_header(origin)\n+\n+ client_names = []\n+ if auth or self._is_premium_subscriber(player_response):\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ T(dict_items), lambda _, k_v: k_v[0] == 'web_safari', 0))[:1]\n+ if not client_names:\n+ client_names = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ T(dict_items), lambda _, k_v: not (\n+ k_v[1].get('REQUIRE_PO_TOKEN')\n+ or (bool(k_v[1].get('WITH_COOKIES', auth)) ^ bool(auth))\n+ ), 0))[:1]\n if 'web' not in client_names:\n- # webpage links won't download: ignore links and playability\n+ # only live HLS webpage links will download: ignore playability\n player_response = filter_dict(\n player_response or {},\n- lambda k, _: k not in ('streamingData', 'playabilityStatus'))\n-\n- if is_live and 'ios' not in client_names:\n- client_names.append('ios')\n+ lambda k, _: k != 'playabilityStatus')\n \n headers = {\n 'Sec-Fetch-Mode': 'navigate',\n 'Origin': origin,\n 'X-Goog-Visitor-Id': self._extract_visitor_data(ytcfg) or '',\n }\n- auth = self._generate_sapisidhash_header(origin)\n+\n if auth is not None:\n headers['Authorization'] = auth\n headers['X-Origin'] = origin\n@@ -2297,7 +2427,7 @@ def _real_extract(self, url):\n 'INNERTUBE_CONTEXT', 'client', 'clientVersion'),\n 'User-Agent': (\n 'INNERTUBE_CONTEXT', 'client', 'userAgent'),\n- }))\n+ }) or {})\n \n api_player_response = self._call_api(\n 'player', query, video_id, fatal=False, headers=api_headers,\n@@ -2306,19 +2436,22 @@ def _real_extract(self, url):\n 'context', 'client', 'clientName')),\n 'API JSON', delim=' '))\n \n- hls = traverse_obj(\n- (player_response, api_player_response),\n- (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n+ # be sure to find HLS in case of is_live\n+ hls = traverse_obj(player_response, (\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n fetched_timestamp = int(time.time())\n- if len(hls) == 2 and not hls[0] and hls[1]:\n- player_response['streamingData']['hlsManifestUrl'] = hls[1]\n- else:\n- video_details = merge_dicts(*traverse_obj(\n- (player_response, api_player_response),\n- (Ellipsis, 'videoDetails', T(dict))))\n- player_response.update(filter_dict(\n- api_player_response or {}, cndn=lambda k, _: k != 'captions'))\n- player_response['videoDetails'] = video_details\n+ preroll_length_ms = (\n+ self._get_preroll_length(api_player_response)\n+ or self._get_preroll_length(player_response))\n+ video_details = merge_dicts(*traverse_obj(\n+ (player_response, api_player_response),\n+ (Ellipsis, 'videoDetails', T(dict))))\n+ player_response.update(filter_dict(\n+ api_player_response or {}, cndn=lambda k, _: k != 'captions'))\n+ player_response['videoDetails'] = video_details\n+ if hls and not traverse_obj(player_response, (\n+ 'streamingData', 'hlsManifestUrl', T(url_or_none))):\n+ player_response['streamingData']['hlsManifestUrl'] = hls\n \n def is_agegated(playability):\n # playability: dict\n@@ -2385,10 +2518,7 @@ def get_playability_status(response):\n return self.url_result(\n trailer_video_id, self.ie_key(), trailer_video_id)\n \n- def get_text(x):\n- return ''.join(traverse_obj(\n- x, (('simpleText',),), ('runs', Ellipsis, 'text'),\n- expected_type=compat_str))\n+ get_text = lambda x: self._get_text(x) or ''\n \n search_meta = (\n (lambda x: self._html_search_meta(x, webpage, default=None))\n@@ -2476,7 +2606,7 @@ def build_fragments(f):\n elif fetched_timestamp is not None:\n # Handle preroll waiting period\n preroll_sleep = self.get_param('youtube_preroll_sleep')\n- preroll_sleep = int_or_none(preroll_sleep, default=6)\n+ preroll_sleep = min(6, int_or_none(preroll_sleep, default=preroll_length_ms / 1000))\n fetched_timestamp += preroll_sleep\n \n for fmt in streaming_formats:\n@@ -2522,6 +2652,10 @@ def build_fragments(f):\n self.write_debug(error_to_compat_str(e), only_once=True)\n continue\n \n+ if parse_qs(fmt_url).get('n'):\n+ # this and (we assume) all the formats here are n-scrambled\n+ break\n+\n language_preference = (\n 10 if audio_track.get('audioIsDefault')\n else -10 if 'descriptive' in (traverse_obj(audio_track, ('displayName', T(lower))) or '')\n@@ -2654,7 +2788,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n subreason = pemr.get('subreason')\n if subreason:\n subreason = clean_html(get_text(subreason))\n- if subreason == 'The uploader has not made this video available in your country.':\n+ if subreason.startswith('The uploader has not made this video available in your country'):\n countries = microformat.get('availableCountries')\n if not countries:\n regions_allowed = search_meta('regionsAllowed')\n@@ -2848,24 +2982,21 @@ def process_subtitles():\n chapters = self._extract_chapters_from_json(\n initial_data, video_id, duration)\n if not chapters:\n- for engagment_pannel in (initial_data.get('engagementPanels') or []):\n- contents = try_get(\n- engagment_pannel, lambda x: x['engagementPanelSectionListRenderer']['content']['macroMarkersListRenderer']['contents'],\n- list)\n- if not contents:\n- continue\n+ def chapter_time(mmlir):\n+ return parse_duration(\n+ get_text(mmlir.get('timeDescription')))\n \n- def chapter_time(mmlir):\n- return parse_duration(\n- get_text(mmlir.get('timeDescription')))\n+ for markers in traverse_obj(initial_data, (\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n+ 'content', 'macroMarkersListRenderer', 'contents', T(list))):\n \n chapters = []\n- for next_num, content in enumerate(contents, start=1):\n+ for next_num, content in enumerate(markers, start=1):\n mmlir = content.get('macroMarkersListItemRenderer') or {}\n start_time = chapter_time(mmlir)\n- end_time = (traverse_obj(\n- contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n- if next_num < len(contents) else duration)\n+ end_time = (traverse_obj(markers, (\n+ next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n+ if next_num < len(markers) else duration)\n if start_time is None or end_time is None:\n continue\n chapters.append({\n@@ -3424,12 +3555,6 @@ def _extract_grid_item_renderer(item):\n T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\n 1, T(dict)), get_all=False)\n \n- @staticmethod\n- def _get_text(r, k):\n- return traverse_obj(\n- r, (k, 'runs', 0, 'text'), (k, 'simpleText'),\n- expected_type=txt_or_none)\n-\n def _grid_entries(self, grid_renderer):\n for item in traverse_obj(grid_renderer, ('items', Ellipsis, T(dict))):\n lockup_view_model = traverse_obj(item, ('lockupViewModel', T(dict)))\n@@ -3540,15 +3665,25 @@ def _extract_lockup_view_model(self, view_model):\n 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()),\n only_once=True)\n return\n+\n thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\n+\n return merge_dicts(self.url_result(\n- url, ie=ie.ie_key(), video_id=content_id), {\n- 'title': traverse_obj(view_model, (\n- 'metadata', 'lockupMetadataViewModel', 'title',\n- 'content', T(compat_str))),\n- 'thumbnails': self._extract_thumbnails(\n- view_model, thumb_keys, final_key='sources'),\n- })\n+ url, ie=ie.ie_key(), video_id=content_id),\n+ traverse_obj(view_model, {\n+ 'title': ('metadata', 'lockupMetadataViewModel', 'title',\n+ 'content', T(compat_str)),\n+ 'thumbnails': T(lambda vm: self._extract_thumbnails(\n+ vm, thumb_keys, final_key='sources')),\n+ 'duration': (\n+ 'contentImage', 'thumbnailViewModel', 'overlays',\n+ Ellipsis, (\n+ ('thumbnailBottomOverlayViewModel', 'badges'),\n+ ('thumbnailOverlayBadgeViewModel', 'thumbnailBadges')\n+ ), Ellipsis, 'thumbnailBadgeViewModel', 'text',\n+ T(parse_duration), any),\n+ })\n+ )\n \n def _extract_shorts_lockup_view_model(self, view_model):\n content_id = traverse_obj(view_model, (\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\nindex ce3633c418e..9b0d77a236f 100644\n--- a/youtube_dl/options.py\n+++ b/youtube_dl/options.py\n@@ -421,12 +421,12 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n action='store', dest='youtube_player_js_variant',\n help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\n choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\n- default='main', metavar='VARIANT')\n+ default='actual', metavar='VARIANT')\n video_format.add_option(\n '--youtube-player-js-version',\n action='store', dest='youtube_player_js_version',\n help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\n- default='20348@0004de42', metavar='STS@HASH')\n+ default='actual', metavar='STS@HASH')\n video_format.add_option(\n '--merge-output-format',\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\ndiff --git a/youtube_dl/traversal.py b/youtube_dl/traversal.py\nindex 834cfef7fab..1de48b145a5 100644\n--- a/youtube_dl/traversal.py\n+++ b/youtube_dl/traversal.py\n@@ -5,6 +5,10 @@\n from .utils import (\n dict_get,\n get_first,\n+ require,\n+ subs_list_to_dict,\n T,\n traverse_obj,\n+ unpack,\n+ value,\n )\ndiff --git a/youtube_dl/utils.py b/youtube_dl/utils.py\nindex c4262936e0b..02a49ff49c3 100644\n--- a/youtube_dl/utils.py\n+++ b/youtube_dl/utils.py\n@@ -53,6 +53,8 @@\n compat_etree_fromstring,\n compat_etree_iterfind,\n compat_expanduser,\n+ compat_filter as filter,\n+ compat_filter_fns,\n compat_html_entities,\n compat_html_entities_html5,\n compat_http_client,\n@@ -1859,6 +1861,39 @@ def write_json_file(obj, fn):\n raise\n \n \n+class partial_application(object):\n+ \"\"\"Allow a function to use pre-set argument values\"\"\"\n+\n+ # see _try_bind_args()\n+ try:\n+ inspect.signature\n+\n+ @staticmethod\n+ def required_args(fn):\n+ return [\n+ param.name for param in inspect.signature(fn).parameters.values()\n+ if (param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)\n+ and param.default is inspect.Parameter.empty)]\n+\n+ except AttributeError:\n+\n+ # Py < 3.3\n+ @staticmethod\n+ def required_args(fn):\n+ fn_args = inspect.getargspec(fn)\n+ n_defaults = len(fn_args.defaults or [])\n+ return (fn_args.args or [])[:-n_defaults if n_defaults > 0 else None]\n+\n+ def __new__(cls, func):\n+ @functools.wraps(func)\n+ def wrapped(*args, **kwargs):\n+ if set(cls.required_args(func)[len(args):]).difference(kwargs):\n+ return functools.partial(func, *args, **kwargs)\n+ return func(*args, **kwargs)\n+\n+ return wrapped\n+\n+\n if sys.version_info >= (2, 7):\n def find_xpath_attr(node, xpath, key, val=None):\n \"\"\" Find the xpath xpath[@key=val] \"\"\"\n@@ -3152,6 +3187,7 @@ def extract_timezone(date_str):\n return timezone, date_str\n \n \n+@partial_application\n def parse_iso8601(date_str, delimiter='T', timezone=None):\n \"\"\" Return a UNIX timestamp from the given date \"\"\"\n \n@@ -3229,6 +3265,7 @@ def unified_timestamp(date_str, day_first=True):\n return calendar.timegm(timetuple) + pm_delta * 3600 - compat_datetime_timedelta_total_seconds(timezone)\n \n \n+@partial_application\n def determine_ext(url, default_ext='unknown_video'):\n if url is None or '.' not in url:\n return default_ext\n@@ -3807,6 +3844,7 @@ def base_url(url):\n return re.match(r'https?://[^?#&]+/', url).group()\n \n \n+@partial_application\n def urljoin(base, path):\n path = _decode_compat_str(path, encoding='utf-8', or_none=True)\n if not path:\n@@ -3831,6 +3869,7 @@ def get_method(self):\n return 'PUT'\n \n \n+@partial_application\n def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):\n if get_attr:\n if v is not None:\n@@ -3857,6 +3896,7 @@ def str_to_int(int_str):\n return int_or_none(int_str)\n \n \n+@partial_application\n def float_or_none(v, scale=1, invscale=1, default=None):\n if v is None:\n return default\n@@ -3891,38 +3931,46 @@ def parse_duration(s):\n return None\n \n s = s.strip()\n+ if not s:\n+ return None\n \n days, hours, mins, secs, ms = [None] * 5\n- m = re.match(r'(?:(?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?(?P<mins>[0-9]+):)?(?P<secs>[0-9]+)(?P<ms>\\.[0-9]+)?Z?$', s)\n+ m = re.match(r'''(?x)\n+ (?P<before_secs>\n+ (?:(?:(?P<days>[0-9]+):)?(?P<hours>[0-9]+):)?\n+ (?P<mins>[0-9]+):)?\n+ (?P<secs>(?(before_secs)[0-9]{1,2}|[0-9]+))\n+ (?:[.:](?P<ms>[0-9]+))?Z?$\n+ ''', s)\n if m:\n- days, hours, mins, secs, ms = m.groups()\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\n else:\n m = re.match(\n r'''(?ix)(?:P?\n (?:\n- [0-9]+\\s*y(?:ears?)?\\s*\n+ [0-9]+\\s*y(?:ears?)?,?\\s*\n )?\n (?:\n- [0-9]+\\s*m(?:onths?)?\\s*\n+ [0-9]+\\s*m(?:onths?)?,?\\s*\n )?\n (?:\n- [0-9]+\\s*w(?:eeks?)?\\s*\n+ [0-9]+\\s*w(?:eeks?)?,?\\s*\n )?\n (?:\n- (?P<days>[0-9]+)\\s*d(?:ays?)?\\s*\n+ (?P<days>[0-9]+)\\s*d(?:ays?)?,?\\s*\n )?\n T)?\n (?:\n- (?P<hours>[0-9]+)\\s*h(?:ours?)?\\s*\n+ (?P<hours>[0-9]+)\\s*h(?:(?:ou)?rs?)?,?\\s*\n )?\n (?:\n- (?P<mins>[0-9]+)\\s*m(?:in(?:ute)?s?)?\\s*\n+ (?P<mins>[0-9]+)\\s*m(?:in(?:ute)?s?)?,?\\s*\n )?\n (?:\n- (?P<secs>[0-9]+)(?P<ms>\\.[0-9]+)?\\s*s(?:ec(?:ond)?s?)?\\s*\n+ (?P<secs>[0-9]+)(?:\\.(?P<ms>[0-9]+))?\\s*s(?:ec(?:ond)?s?)?\\s*\n )?Z?$''', s)\n if m:\n- days, hours, mins, secs, ms = m.groups()\n+ days, hours, mins, secs, ms = m.group('days', 'hours', 'mins', 'secs', 'ms')\n else:\n m = re.match(r'(?i)(?:(?P<hours>[0-9.]+)\\s*(?:hours?)|(?P<mins>[0-9.]+)\\s*(?:mins?\\.?|minutes?)\\s*)Z?$', s)\n if m:\n@@ -3930,17 +3978,13 @@ def parse_duration(s):\n else:\n return None\n \n- duration = 0\n- if secs:\n- duration += float(secs)\n- if mins:\n- duration += float(mins) * 60\n- if hours:\n- duration += float(hours) * 60 * 60\n- if days:\n- duration += float(days) * 24 * 60 * 60\n- if ms:\n- duration += float(ms)\n+ duration = (\n+ ((((float(days) * 24) if days else 0)\n+ + (float(hours) if hours else 0)) * 60\n+ + (float(mins) if mins else 0)) * 60\n+ + (float(secs) if secs else 0)\n+ + (float(ms) / 10 ** len(ms) if ms else 0))\n+\n return duration\n \n \n@@ -4251,6 +4295,7 @@ def urlencode_postdata(*args, **kargs):\n return compat_urllib_parse_urlencode(*args, **kargs).encode('ascii')\n \n \n+@partial_application\n def update_url(url, **kwargs):\n \"\"\"Replace URL components specified by kwargs\n url: compat_str or parsed URL tuple\n@@ -4272,6 +4317,7 @@ def update_url(url, **kwargs):\n return compat_urllib_parse.urlunparse(url._replace(**kwargs))\n \n \n+@partial_application\n def update_url_query(url, query):\n return update_url(url, query_update=query)\n \n@@ -4698,30 +4744,45 @@ def parse_codecs(codecs_str):\n if not codecs_str:\n return {}\n split_codecs = list(filter(None, map(\n- lambda str: str.strip(), codecs_str.strip().strip(',').split(','))))\n- vcodec, acodec = None, None\n+ lambda s: s.strip(), codecs_str.strip().split(','))))\n+ vcodec, acodec, hdr = None, None, None\n for full_codec in split_codecs:\n- codec = full_codec.split('.')[0]\n- if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2', 'h263', 'h264', 'mp4v', 'hvc1', 'av01', 'theora'):\n- if not vcodec:\n- vcodec = full_codec\n- elif codec in ('mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\n+ codec, rest = full_codec.partition('.')[::2]\n+ codec = codec.lower()\n+ full_codec = '.'.join((codec, rest)) if rest else codec\n+ codec = re.sub(r'0+(?=\\d)', '', codec)\n+ if codec in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2',\n+ 'h263', 'h264', 'mp4v', 'hvc1', 'av1', 'theora', 'dvh1', 'dvhe'):\n+ if vcodec:\n+ continue\n+ vcodec = full_codec\n+ if codec in ('dvh1', 'dvhe'):\n+ hdr = 'DV'\n+ elif codec in ('av1', 'vp9'):\n+ n, m = {\n+ 'av1': (2, '10'),\n+ 'vp9': (0, '2'),\n+ }[codec]\n+ if (rest.split('.', n + 1)[n:] or [''])[0].lstrip('0') == m:\n+ hdr = 'HDR10'\n+ elif codec in ('flac', 'mp4a', 'opus', 'vorbis', 'mp3', 'aac', 'ac-4',\n+ 'ac-3', 'ec-3', 'eac3', 'dtsc', 'dtse', 'dtsh', 'dtsl'):\n if not acodec:\n acodec = full_codec\n else:\n- write_string('WARNING: Unknown codec %s\\n' % full_codec, sys.stderr)\n- if not vcodec and not acodec:\n- if len(split_codecs) == 2:\n- return {\n- 'vcodec': split_codecs[0],\n- 'acodec': split_codecs[1],\n- }\n- else:\n- return {\n+ write_string('WARNING: Unknown codec %s\\n' % (full_codec,), sys.stderr)\n+\n+ return (\n+ filter_dict({\n 'vcodec': vcodec or 'none',\n 'acodec': acodec or 'none',\n- }\n- return {}\n+ 'dynamic_range': hdr,\n+ }) if vcodec or acodec\n+ else {\n+ 'vcodec': split_codecs[0],\n+ 'acodec': split_codecs[1],\n+ } if len(split_codecs) == 2\n+ else {})\n \n \n def urlhandle_detect_ext(url_handle):\n@@ -6283,6 +6344,7 @@ def traverse_obj(obj, *paths, **kwargs):\n Read as: `{key: traverse_obj(obj, path) for key, path in dct.items()}`.\n - `any`-builtin: Take the first matching object and return it, resetting branching.\n - `all`-builtin: Take all matching objects and return them as a list, resetting branching.\n+ - `filter`-builtin: Return the value if it is truthy, `None` otherwise.\n \n `tuple`, `list`, and `dict` all support nested paths and branches.\n \n@@ -6324,6 +6386,11 @@ def traverse_obj(obj, *paths, **kwargs):\n # instant compat\n str = compat_str\n \n+ from .compat import (\n+ compat_builtins_dict as dict_, # the basic dict type\n+ compat_dict as dict, # dict preserving imsertion order\n+ )\n+\n casefold = lambda k: compat_casefold(k) if isinstance(k, str) else k\n \n if isinstance(expected_type, type):\n@@ -6406,7 +6473,7 @@ def apply_key(key, obj, is_last):\n if not branching: # string traversal\n result = ''.join(result)\n \n- elif isinstance(key, dict):\n+ elif isinstance(key, dict_):\n iter_obj = ((k, _traverse_obj(obj, v, False, is_last)) for k, v in key.items())\n result = dict((k, v if v is not None else default) for k, v in iter_obj\n if v is not None or default is not NO_DEFAULT) or None\n@@ -6484,7 +6551,7 @@ def apply_path(start_obj, path, test_type):\n has_branched = False\n \n key = None\n- for last, key in lazy_last(variadic(path, (str, bytes, dict, set))):\n+ for last, key in lazy_last(variadic(path, (str, bytes, dict_, set))):\n if not casesense and isinstance(key, str):\n key = compat_casefold(key)\n \n@@ -6497,6 +6564,11 @@ def apply_path(start_obj, path, test_type):\n objs = (list(filtered_objs),)\n continue\n \n+ # filter might be from __builtin__, future_builtins, or itertools.ifilter\n+ if key in compat_filter_fns:\n+ objs = filter(None, objs)\n+ continue\n+\n if __debug__ and callable(key):\n # Verify function signature\n _try_bind_args(key, None, None)\n@@ -6509,10 +6581,10 @@ def apply_path(start_obj, path, test_type):\n \n objs = from_iterable(new_objs)\n \n- if test_type and not isinstance(key, (dict, list, tuple)):\n+ if test_type and not isinstance(key, (dict_, list, tuple)):\n objs = map(type_test, objs)\n \n- return objs, has_branched, isinstance(key, dict)\n+ return objs, has_branched, isinstance(key, dict_)\n \n def _traverse_obj(obj, path, allow_empty, test_type):\n results, has_branched, is_dict = apply_path(obj, path, test_type)\n@@ -6535,6 +6607,76 @@ def _traverse_obj(obj, path, allow_empty, test_type):\n return None if default is NO_DEFAULT else default\n \n \n+def value(value):\n+ return lambda _: value\n+\n+\n+class require(ExtractorError):\n+ def __init__(self, name, expected=False):\n+ super(require, self).__init__(\n+ 'Unable to extract {0}'.format(name), expected=expected)\n+\n+ def __call__(self, value):\n+ if value is None:\n+ raise self\n+\n+ return value\n+\n+\n+@partial_application\n+# typing: (subs: list[dict], /, *, lang='und', ext=None) -> dict[str, list[dict]\n+def subs_list_to_dict(subs, lang='und', ext=None):\n+ \"\"\"\n+ Convert subtitles from a traversal into a subtitle dict.\n+ The path should have an `all` immediately before this function.\n+\n+ Arguments:\n+ `lang` The default language tag for subtitle dicts with no\n+ `lang` (`und`: undefined)\n+ `ext` The default value for `ext` in the subtitle dicts\n+\n+ In the dict you can set the following additional items:\n+ `id` The language tag to which the subtitle dict should be added\n+ `quality` The sort order for each subtitle dict\n+ \"\"\"\n+\n+ result = collections.defaultdict(list)\n+\n+ for sub in subs:\n+ tn_url = url_or_none(sub.pop('url', None))\n+ if tn_url:\n+ sub['url'] = tn_url\n+ elif not sub.get('data'):\n+ continue\n+ sub_lang = sub.pop('id', None)\n+ if not isinstance(sub_lang, compat_str):\n+ if not lang:\n+ continue\n+ sub_lang = lang\n+ sub_ext = sub.get('ext')\n+ if not isinstance(sub_ext, compat_str):\n+ if not ext:\n+ sub.pop('ext', None)\n+ else:\n+ sub['ext'] = ext\n+ result[sub_lang].append(sub)\n+ result = dict(result)\n+\n+ for subs in result.values():\n+ subs.sort(key=lambda x: x.pop('quality', 0) or 0)\n+\n+ return result\n+\n+\n+def unpack(func, **kwargs):\n+ \"\"\"Make a function that applies `partial(func, **kwargs)` to its argument as *args\"\"\"\n+ @functools.wraps(func)\n+ def inner(items):\n+ return func(*items, **kwargs)\n+\n+ return inner\n+\n+\n def T(*x):\n \"\"\" For use in yt-dl instead of {type, ...} or set((type, ...)) \"\"\"\n return set(x)\n\ndiff --git a/test/helper.py b/test/helper.py\nindex 6f2129efff3..fac069d25c9 100644\n--- a/test/helper.py\n+++ b/test/helper.py\n@@ -85,10 +85,10 @@ def expect_warning(self, regex):\n # Silence an expected warning matching a regex\n old_report_warning = self.report_warning\n \n- def report_warning(self, message):\n+ def report_warning(self, message, *args, **kwargs):\n if re.match(regex, message):\n return\n- old_report_warning(message)\n+ old_report_warning(message, *args, **kwargs)\n self.report_warning = types.MethodType(report_warning, self)\n \n \n@@ -265,11 +265,11 @@ def assertRegexpMatches(self, text, regexp, msg=None):\n def expect_warnings(ydl, warnings_re):\n real_warning = ydl.report_warning\n \n- def _report_warning(w):\n+ def _report_warning(self, w, *args, **kwargs):\n if not any(re.search(w_re, w) for w_re in warnings_re):\n real_warning(w)\n \n- ydl.report_warning = _report_warning\n+ ydl.report_warning = types.MethodType(_report_warning, ydl)\n \n \n def http_server_port(httpd):\ndiff --git a/test/test_traversal.py b/test/test_traversal.py\nindex 00a428edb7b..504cdee372d 100644\n--- a/test/test_traversal.py\n+++ b/test/test_traversal.py\n@@ -9,21 +9,32 @@\n sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))\n \n \n+import itertools\n import re\n \n from youtube_dl.traversal import (\n dict_get,\n get_first,\n+ require,\n+ subs_list_to_dict,\n T,\n traverse_obj,\n+ unpack,\n+ value,\n )\n from youtube_dl.compat import (\n+ compat_chr as chr,\n compat_etree_fromstring,\n compat_http_cookies,\n+ compat_map as map,\n compat_str,\n+ compat_zip as zip,\n )\n from youtube_dl.utils import (\n+ determine_ext,\n+ ExtractorError,\n int_or_none,\n+ join_nonempty,\n str_or_none,\n )\n \n@@ -446,42 +457,164 @@ def test_traversal_unbranching(self):\n msg='`any` should allow further branching')\n \n def test_traversal_morsel(self):\n- values = {\n- 'expires': 'a',\n- 'path': 'b',\n- 'comment': 'c',\n- 'domain': 'd',\n- 'max-age': 'e',\n- 'secure': 'f',\n- 'httponly': 'g',\n- 'version': 'h',\n- 'samesite': 'i',\n- }\n- # SameSite added in Py3.8, breaks .update for 3.5-3.7\n- if sys.version_info < (3, 8):\n- del values['samesite']\n morsel = compat_http_cookies.Morsel()\n+ # SameSite added in Py3.8, breaks .update for 3.5-3.7\n+ # Similarly Partitioned, Py3.14, thx Grub4k\n+ values = dict(zip(morsel, map(chr, itertools.count(ord('a')))))\n morsel.set(str('item_key'), 'item_value', 'coded_value')\n morsel.update(values)\n- values['key'] = str('item_key')\n- values['value'] = 'item_value'\n+ values.update({\n+ 'key': str('item_key'),\n+ 'value': 'item_value',\n+ }),\n values = dict((str(k), v) for k, v in values.items())\n- # make test pass even without ordered dict\n- value_set = set(values.values())\n \n- for key, value in values.items():\n- self.assertEqual(traverse_obj(morsel, key), value,\n+ for key, val in values.items():\n+ self.assertEqual(traverse_obj(morsel, key), val,\n msg='Morsel should provide access to all values')\n- self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,\n- msg='`...` should yield all values')\n- self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,\n- msg='function key should yield all values')\n+ values = list(values.values())\n+ self.assertMaybeCountEqual(traverse_obj(morsel, Ellipsis), values,\n+ msg='`...` should yield all values')\n+ self.assertMaybeCountEqual(traverse_obj(morsel, lambda k, v: True), values,\n+ msg='function key should yield all values')\n self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,\n msg='Morsel should not be implicitly changed to dict on usage')\n \n- def test_get_first(self):\n- self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\n-\n+ def test_traversal_filter(self):\n+ data = [None, False, True, 0, 1, 0.0, 1.1, '', 'str', {}, {0: 0}, [], [1]]\n+\n+ self.assertEqual(\n+ traverse_obj(data, (Ellipsis, filter)),\n+ [True, 1, 1.1, 'str', {0: 0}, [1]],\n+ '`filter` should filter falsy values')\n+\n+\n+class TestTraversalHelpers(_TestCase):\n+ def test_traversal_require(self):\n+ with self.assertRaises(ExtractorError, msg='Missing `value` should raise'):\n+ traverse_obj(_TEST_DATA, ('None', T(require('value'))))\n+ self.assertEqual(\n+ traverse_obj(_TEST_DATA, ('str', T(require('value')))), 'str',\n+ '`require` should pass through non-`None` values')\n+\n+ def test_subs_list_to_dict(self):\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.vtt'},\n+ {'name': 'en', 'url': 'https://example.com/subs/en1.ass'},\n+ {'name': 'en', 'url': 'https://example.com/subs/en2.ass'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict)]), {\n+ 'de': [{'url': 'https://example.com/subs/de.vtt'}],\n+ 'en': [\n+ {'url': 'https://example.com/subs/en1.ass'},\n+ {'url': 'https://example.com/subs/en2.ass'},\n+ ],\n+ }, 'function should build subtitle dict from list of subtitles')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\n+ {'name': 'de'},\n+ {'name': 'en', 'content': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'data': 'content',\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(lang=None))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\n+ 'en': [{'data': 'content'}],\n+ }, 'subs with mandatory items missing should be filtered')\n+ self.assertEqual(traverse_obj([\n+ {'url': 'https://example.com/subs/de.ass', 'name': 'de'},\n+ {'url': 'https://example.com/subs/en', 'name': 'en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'ext': ['url', T(determine_ext(default_ext=None))],\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass', 'ext': 'ass'}],\n+ 'en': [{'url': 'https://example.com/subs/en', 'ext': 'ext'}],\n+ }, '`ext` should set default ext but leave existing value untouched')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'en', 'url': 'https://example.com/subs/en2', 'prio': True},\n+ {'name': 'en', 'url': 'https://example.com/subs/en1', 'prio': False},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'quality': ['prio', T(int)],\n+ 'url': 'url',\n+ }, all, T(subs_list_to_dict(ext='ext'))]), {'en': [\n+ {'url': 'https://example.com/subs/en1', 'ext': 'ext'},\n+ {'url': 'https://example.com/subs/en2', 'ext': 'ext'},\n+ ]}, '`quality` key should sort subtitle list accordingly')\n+ self.assertEqual(traverse_obj([\n+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},\n+ {'name': 'de'},\n+ {'name': 'en', 'content': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'data': 'content',\n+ }, all, T(subs_list_to_dict(lang='en'))]), {\n+ 'de': [{'url': 'https://example.com/subs/de.ass'}],\n+ 'en': [\n+ {'data': 'content'},\n+ {'url': 'https://example.com/subs/en'},\n+ ],\n+ }, 'optionally provided lang should be used if no id available')\n+ self.assertEqual(traverse_obj([\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'ext': 'ext',\n+ }, all, T(subs_list_to_dict(lang=None))]), {\n+ 'de': [\n+ {'url': 'https://example.com/subs/de3'},\n+ {'url': 'https://example.com/subs/de4'},\n+ ],\n+ }, 'non str types should be ignored for id and ext')\n+ self.assertEqual(traverse_obj([\n+ {'name': 1, 'url': 'https://example.com/subs/de1'},\n+ {'name': {}, 'url': 'https://example.com/subs/de2'},\n+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},\n+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},\n+ ], [Ellipsis, {\n+ 'id': 'name',\n+ 'url': 'url',\n+ 'ext': 'ext',\n+ }, all, T(subs_list_to_dict(lang='de'))]), {\n+ 'de': [\n+ {'url': 'https://example.com/subs/de1'},\n+ {'url': 'https://example.com/subs/de2'},\n+ {'url': 'https://example.com/subs/de3'},\n+ {'url': 'https://example.com/subs/de4'},\n+ ],\n+ }, 'non str types should be replaced by default id')\n+\n+ def test_unpack(self):\n+ self.assertEqual(\n+ unpack(lambda *x: ''.join(map(compat_str, x)))([1, 2, 3]), '123')\n+ self.assertEqual(\n+ unpack(join_nonempty)([1, 2, 3]), '1-2-3')\n+ self.assertEqual(\n+ unpack(join_nonempty, delim=' ')([1, 2, 3]), '1 2 3')\n+ with self.assertRaises(TypeError):\n+ unpack(join_nonempty)()\n+ with self.assertRaises(TypeError):\n+ unpack()\n+\n+ def test_value(self):\n+ self.assertEqual(\n+ traverse_obj(_TEST_DATA, ('str', T(value('other')))), 'other',\n+ '`value` should substitute specified value')\n+\n+\n+class TestDictGet(_TestCase):\n def test_dict_get(self):\n FALSE_VALUES = {\n 'none': None,\n@@ -504,6 +637,9 @@ def test_dict_get(self):\n self.assertEqual(dict_get(d, ('b', 'c', key, )), None)\n self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)\n \n+ def test_get_first(self):\n+ self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')\n+\n \n if __name__ == '__main__':\n unittest.main()\ndiff --git a/test/test_utils.py b/test/test_utils.py\nindex 2947cce7eb3..1106f2819b8 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -69,6 +69,7 @@\n parse_iso8601,\n parse_resolution,\n parse_qs,\n+ partial_application,\n pkcs1pad,\n prepend_extension,\n read_batch_urls,\n@@ -664,6 +665,8 @@ def test_parse_duration(self):\n self.assertEqual(parse_duration('3h 11m 53s'), 11513)\n self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)\n self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)\n+ self.assertEqual(parse_duration('3 hours, 11 minutes, 53 seconds'), 11513)\n+ self.assertEqual(parse_duration('3 hours, 11 mins, 53 secs'), 11513)\n self.assertEqual(parse_duration('62m45s'), 3765)\n self.assertEqual(parse_duration('6m59s'), 419)\n self.assertEqual(parse_duration('49s'), 49)\n@@ -682,6 +685,10 @@ def test_parse_duration(self):\n self.assertEqual(parse_duration('PT1H0.040S'), 3600.04)\n self.assertEqual(parse_duration('PT00H03M30SZ'), 210)\n self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)\n+ self.assertEqual(parse_duration('01:02:03:050'), 3723.05)\n+ self.assertEqual(parse_duration('103:050'), 103.05)\n+ self.assertEqual(parse_duration('1HR 3MIN'), 3780)\n+ self.assertEqual(parse_duration('2hrs 3mins'), 7380)\n \n def test_fix_xml_ampersands(self):\n self.assertEqual(\n@@ -895,6 +902,30 @@ def test_parse_codecs(self):\n 'vcodec': 'av01.0.05M.08',\n 'acodec': 'none',\n })\n+ self.assertEqual(parse_codecs('vp9.2'), {\n+ 'vcodec': 'vp9.2',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('vp09.02.50.10.01.09.18.09.00'), {\n+ 'vcodec': 'vp09.02.50.10.01.09.18.09.00',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('av01.0.12M.10.0.110.09.16.09.0'), {\n+ 'vcodec': 'av01.0.12M.10.0.110.09.16.09.0',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'HDR10',\n+ })\n+ self.assertEqual(parse_codecs('dvhe'), {\n+ 'vcodec': 'dvhe',\n+ 'acodec': 'none',\n+ 'dynamic_range': 'DV',\n+ })\n+ self.assertEqual(parse_codecs('fLaC'), {\n+ 'vcodec': 'none',\n+ 'acodec': 'flac',\n+ })\n self.assertEqual(parse_codecs('theora, vorbis'), {\n 'vcodec': 'theora',\n 'acodec': 'vorbis',\n@@ -1723,6 +1754,21 @@ def test_join_nonempty(self):\n 'a', 'b', 'c', 'd',\n from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')\n \n+ def test_partial_application(self):\n+ test_fn = partial_application(lambda x, kwarg=None: '{0}, kwarg={1!r}'.format(x, kwarg))\n+ self.assertTrue(\n+ callable(test_fn(kwarg=10)),\n+ 'missing positional parameter should apply partially')\n+ self.assertEqual(\n+ test_fn(10, kwarg=42), '10, kwarg=42',\n+ 'positionally passed argument should call function')\n+ self.assertEqual(\n+ test_fn(x=10), '10, kwarg=None',\n+ 'keyword passed positional should call function')\n+ self.assertEqual(\n+ test_fn(kwarg=42)(10), '10, kwarg=42',\n+ 'call after partial application should call the function')\n+\n \n if __name__ == '__main__':\n unittest.main()\n"},"num_subtasks":{"kind":"number","value":3,"string":"3"},"num_changed_files":{"kind":"number","value":10,"string":"10"}}},{"rowIdx":34298,"cells":{"task_id":{"kind":"string","value":"ytdl-org/youtube-dl#33198"},"repo":{"kind":"string","value":"ytdl-org/youtube-dl"},"pr_number":{"kind":"number","value":33198,"string":"33,198"},"base_sha":{"kind":"string","value":"82552faba6f29ced4914cd670ccd80836364fd45"},"head_sha":{"kind":"string","value":"49a4d31e59ddbee3603c762e9d3c56a02cacdaf3"},"task":{"kind":"string","value":"Crash in dev mode when trying to download private YouTube-playlist\n\n<!--\n\n######################################################################\n WARNING!\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\n######################################################################\n\n-->\n\n\n## Checklist\n\n<!--\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:\n- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.\n- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.\n- Read bugs section in FAQ: http://yt-dl.org/reporting\n- Finally, put x into all relevant boxes (like this [x])\n-->\n\n- [ ] I'm reporting a broken site support issue\n- [x] I've verified that I'm running youtube-dl version **2021.12.17**\n- [x] I've checked that all provided URLs are alive and playable in a browser\n- [x] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [x] I've searched the bugtracker for similar bug reports including closed ones\n- [x] I've read bugs section in FAQ\n\n\n## Verbose log\n\n<!--\nProvide the complete verbose output of youtube-dl that clearly demonstrates the problem.\nAdd the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\n [debug] System config: []\n [debug] User config: []\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\n [debug] youtube-dl version 2021.12.17\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\n [debug] Proxy map: {}\n <more lines>\n-->\n\n```\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: ['-v', 'https://www.youtube.com/playlist?list=PLCAMnp1m9t7yqIw61fleLs6SvP8nfcaYh']\n[debug] Encodings: locale cp1252, fs utf-8, out utf-8, pref cp1252\n[debug] youtube-dl version 2025.09.29 [82552faba]\n[debug] ** This version was built from the latest master code at https://github.com/ytdl-org/youtube-dl.\n[debug] ** For support, visit the main site.\n[debug] Git HEAD: e67b3a937\n[debug] Python 3.13.7 (CPython AMD64 64bit) - Windows-11-10.0.26100-SP0 - OpenSSL 3.0.16 11 Feb 2025\n[debug] exe versions: none\n[debug] Proxy map: {}\n[youtube:tab] PLCAMnp1m9t7yqIw61fleLs6SvP8nfcaYh: Downloading webpage\nTraceback (most recent call last):\n File \"<frozen runpy>\", line 198, in _run_module_as_main\n File \"<frozen runpy>\", line 88, in _run_code\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\__main__.py\", line 19, in <module>\n youtube_dl.main()\n ~~~~~~~~~~~~~~~^^\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\__init__.py\", line 479, in main\n _real_main(argv)\n ~~~~~~~~~~^^^^^^\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\__init__.py\", line 469, in _real_main\n retcode = ydl.download(all_urls)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\YoutubeDL.py\", line 2264, in download\n res = self.extract_info(\n url, force_generic_extractor=self.params.get('force_generic_extractor', False))\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\YoutubeDL.py\", line 879, in extract_info\n return self.__extract_info(url, ie, download, extra_info, process)\n ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\YoutubeDL.py\", line 886, in wrapper\n return func(self, *args, **kwargs)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\YoutubeDL.py\", line 982, in __extract_info\n ie_result = ie.extract(url)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\extractor\\common.py\", line 573, in extract\n ie_result = self._real_extract(url)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\extractor\\youtube.py\", line 4009, in _real_extract\n alert = self._extract_alert(data)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\extractor\\youtube.py\", line 3901, in _extract_alert\n alert_text = traverse_obj(\n alert, (None, lambda x: x['alertRenderer']['text']), get_all=False)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\utils.py\", line 6531, in traverse_obj\n result = _traverse_obj(obj, path, index == len(paths), True)\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\utils.py\", line 6518, in _traverse_obj\n results, has_branched, is_dict = apply_path(obj, path, test_type)\n ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\utils.py\", line 6502, in apply_path\n _try_bind_args(key, None, None)\n ~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^\n File \"C:\\Users\\aaror\\ytdl-nightly\\youtube_dl\\utils.py\", line 6225, in _try_bind_args\n inspect.signature(fn).bind(*args, **kwargs)\n ~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^\n File \"C:\\Users\\aaror\\AppData\\Local\\Programs\\Python\\Python313\\Lib\\inspect.py\", line 3295, in bind\n return self._bind(args, kwargs)\n ~~~~~~~~~~^^^^^^^^^^^^^^\n File \"C:\\Users\\aaror\\AppData\\Local\\Programs\\Python\\Python313\\Lib\\inspect.py\", line 3214, in _bind\n raise TypeError('too many positional arguments') from None\nTypeError: too many positional arguments\n```\n\n\n## Description\n\n<!--\nProvide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\n-->\n\nWhen trying to download a private YouTube-playlist in developer mode (with python -m youtube_dl within repo), the program crashes and doesn't produce the same expected output as the release executable, which is\n```\n[youtube:tab] PLCAMnp1m9t7yqIw61fleLs6SvP8nfcaYh: Downloading webpage\nERROR: Unable to recognize tab page; please report this issue on https://github.com/ytdl-org/youtube-dl/issues , using the appropriate issue template. Make sure you are using the latest version; type youtube-dl -U to update. Be sure to call youtube-dl with the --verbose option and include the complete output.\n```\n\n[YouTube] Rework alert handling, etc\n\n<details>\r\n<summary>Boilerplate: own+yt-dlp code, bug fix+improvement</summary>\r\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] [Searched](https://github.com/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)\r\n- [x] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them\r\n- [x] Covered the code with tests (note that PRs without tests will be REJECTED)\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/), except code from yt-dlp, for which this or the below has been asserted\r\n- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)\r\n\r\n### What is the purpose of your *pull request*?\r\n- [x] Bug fix\r\n- [x] Improvement\r\n- [ ] New extractor\r\n- [ ] New feature\r\n\r\n</details>\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\n* Reworks alert handling: fixes #33196\r\n* Corrects some latent typos from #33189\r\n* Modernises and simplifies some traversals.\r\n\r\nAs usual, (presumably) undependable dependencies caused the previously functional commit workflow to break, so now _wheel_ (whose installation from Python3.4's _pip-19.1_ began to fail) and _setuptools_ are always omitted when installing _pip_."},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: Crash in dev mode when trying to download private YouTube-playlist","scope_files":[".github/workflows/ci.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `youtube_dl/extractor/` needed for: Crash in dev mode when trying to download private YouTube-playlist","scope_files":["youtube_dl/extractor/youtube.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: Crash in dev mode when trying to download private YouTube-playlist\",\n \"scope_files\": [\n \".github/workflows/ci.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `youtube_dl/extractor/` needed for: Crash in dev mode when trying to download private YouTube-playlist\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/ci.yml"],"solution_diff":"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex c7a8fff8449..073c4458c1d 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -365,7 +365,7 @@ jobs:\n python -m ensurepip || python -m pip --version || { \\\n get_pip=\"${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}\"; \\\n curl -L -O \"https://bootstrap.pypa.io/pip/${get_pip}get-pip.py\"; \\\n- python get-pip.py; }\n+ python get-pip.py --no-setuptools --no-wheel; }\n - name: Set up Python 2.6 pip\n if: ${{ matrix.python-version == '2.6' }}\n shell: bash\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["youtube_dl/extractor/youtube.py"],"solution_diff":"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex 0b802351d22..c045bc8bc24 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -100,8 +100,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\n+ 'REQUIRE_PO_TOKEN': False,\n 'REQUIRE_JS_PLAYER': False,\n- 'REQUIRE_PO_TOKEN': True,\n },\n # mweb has 'ultralow' formats\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\n@@ -478,6 +478,7 @@ def _extract_video(self, renderer):\n def _extract_thumbnails(data, *path_list, **kw_final_key):\n \"\"\"\n Extract thumbnails from thumbnails dict\n+\n @param path_list: path list to level that contains 'thumbnails' key\n \"\"\"\n final_key = kw_final_key.get('final_key', 'thumbnails')\n@@ -520,34 +521,26 @@ def _search_results(self, query, params):\n headers={'content-type': 'application/json'})\n if not search:\n break\n- slr_contents = try_get(\n+ slr_contents = traverse_obj(\n search,\n- (lambda x: x['contents']['twoColumnSearchResultsRenderer']['primaryContents']['sectionListRenderer']['contents'],\n- lambda x: x['onResponseReceivedCommands'][0]['appendContinuationItemsAction']['continuationItems']),\n- list)\n+ ('contents', 'twoColumnSearchResultsRenderer', 'primaryContents',\n+ 'sectionListRenderer', 'contents'),\n+ ('onResponseReceivedCommands', 0, 'appendContinuationItemsAction',\n+ 'continuationItems'),\n+ expected_type=list)\n if not slr_contents:\n break\n- for slr_content in slr_contents:\n- isr_contents = try_get(\n- slr_content,\n- lambda x: x['itemSectionRenderer']['contents'],\n- list)\n- if not isr_contents:\n- continue\n- for content in isr_contents:\n- if not isinstance(content, dict):\n- continue\n- video = content.get('videoRenderer')\n- if not isinstance(video, dict):\n- continue\n- video_id = video.get('videoId')\n- if not video_id:\n- continue\n- yield self._extract_video(video)\n- token = try_get(\n+ for video in traverse_obj(\n+ slr_contents,\n+ (Ellipsis, 'itemSectionRenderer', 'contents',\n+ Ellipsis, 'videoRenderer',\n+ T(lambda v: v if v.get('videoId') else None))):\n+ yield self._extract_video(video)\n+\n+ token = traverse_obj(\n slr_contents,\n- lambda x: x[-1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'],\n- compat_str)\n+ (-1, 'continuationItemRenderer', 'continuationEndpoint',\n+ 'continuationCommand', 'token', T(compat_str)))\n if not token:\n break\n data['continuation'] = token\n@@ -2176,7 +2169,8 @@ def extract_id(cls, url):\n raise ExtractorError('Invalid URL: %s' % url)\n return mobj.group(2)\n \n- def _extract_chapters_from_json(self, data, video_id, duration):\n+ @staticmethod\n+ def _extract_chapters_from_json(data, video_id, duration):\n chapters_list = try_get(\n data,\n lambda x: x['playerOverlays']\n@@ -2472,7 +2466,7 @@ def build_fragments(f):\n return LazyList({\n 'url': update_url_query(f['url'], {\n 'range': '{0}-{1}'.format(range_start, min(range_start + CHUNK_SIZE - 1, f['filesize'])),\n- })\n+ }),\n } for range_start in range(0, f['filesize'], CHUNK_SIZE))\n \n lower = lambda s: s.lower()\n@@ -2778,7 +2772,7 @@ def process_language(container, base_url, lang_code, query):\n 'fmt': fmt,\n # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\n # See: https://github.com/yt-dlp/yt-dlp/issues/13654\n- 'xosf': []\n+ 'xosf': [],\n })\n lang_subs.append({\n 'ext': fmt,\n@@ -3426,13 +3420,9 @@ def suitable(cls, url):\n \n @staticmethod\n def _extract_grid_item_renderer(item):\n- assert isinstance(item, dict)\n- for key, renderer in item.items():\n- if not key.startswith('grid') or not key.endswith('Renderer'):\n- continue\n- if not isinstance(renderer, dict):\n- continue\n- return renderer\n+ return traverse_obj(item, (\n+ T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\n+ 1, T(dict)), get_all=False)\n \n @staticmethod\n def _get_text(r, k):\n@@ -3515,8 +3505,8 @@ def _shelf_entries(self, shelf_renderer, skip_channels=False):\n shelf_renderer, lambda x: x['title']['runs'][0]['text'], compat_str)\n yield self.url_result(shelf_url, video_title=title)\n # Shelf may not contain shelf URL, fallback to extraction from content\n- for entry in self._shelf_entries_from_content(shelf_renderer):\n- yield entry\n+ for from_ in self._shelf_entries_from_content(shelf_renderer):\n+ yield from_\n \n def _playlist_entries(self, video_list_renderer):\n for content in video_list_renderer['contents']:\n@@ -3538,12 +3528,12 @@ def _extract_lockup_view_model(self, view_model):\n if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\n ie = YoutubeIE\n url = update_url_query(\n- 'https://www.youtube.com/watch', {'v': content_id}),\n+ 'https://www.youtube.com/watch', {'v': content_id})\n thumb_keys = (None,)\n elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n ie = YoutubeTabIE\n url = update_url_query(\n- 'https://www.youtube.com/playlist', {'list': content_id}),\n+ 'https://www.youtube.com/playlist', {'list': content_id})\n thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\n else:\n self.report_warning(\n@@ -3606,15 +3596,10 @@ def _post_thread_entries(self, post_thread_renderer):\n yield self.url_result(ep_url, ie=YoutubeIE.ie_key(), video_id=video_id)\n \n def _post_thread_continuation_entries(self, post_thread_continuation):\n- contents = post_thread_continuation.get('contents')\n- if not isinstance(contents, list):\n- return\n- for content in contents:\n- renderer = content.get('backstagePostThreadRenderer')\n- if not isinstance(renderer, dict):\n- continue\n- for entry in self._post_thread_entries(renderer):\n- yield entry\n+ for renderer in traverse_obj(post_thread_continuation, (\n+ 'contents', Ellipsis, 'backstagePostThreadRenderer', T(dict))):\n+ for from_ in self._post_thread_entries(renderer):\n+ yield from_\n \n def _rich_grid_entries(self, contents):\n for content in traverse_obj(\n@@ -3689,17 +3674,10 @@ def _entries(self, tab, item_id, webpage):\n if slr_renderer:\n is_channels_tab = tab.get('title') == 'Channels'\n continuation = None\n- slr_contents = try_get(slr_renderer, lambda x: x['contents'], list) or []\n- for slr_content in slr_contents:\n- if not isinstance(slr_content, dict):\n- continue\n- is_renderer = try_get(slr_content, lambda x: x['itemSectionRenderer'], dict)\n- if not is_renderer:\n- continue\n- isr_contents = try_get(is_renderer, lambda x: x['contents'], list) or []\n- for isr_content in isr_contents:\n- if not isinstance(isr_content, dict):\n- continue\n+ for is_renderer in traverse_obj(slr_renderer, (\n+ 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\n+ for isr_content in traverse_obj(slr_renderer, (\n+ 'contents', Ellipsis, T(dict))):\n renderer = isr_content.get('playlistVideoListRenderer')\n if renderer:\n for entry in self._playlist_entries(renderer):\n@@ -3894,18 +3872,34 @@ def _extract_uploader(self, metadata, data):\n uploader['channel'] = uploader['uploader']\n return uploader\n \n- @classmethod\n- def _extract_alert(cls, data):\n- alerts = []\n- for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\n- alert_text = traverse_obj(\n- alert, (None, lambda x: x['alertRenderer']['text']), get_all=False)\n- if not alert_text:\n- continue\n- text = cls._get_text(alert_text, 'text')\n- if text:\n- alerts.append(text)\n- return '\\n'.join(alerts)\n+ def _extract_and_report_alerts(self, data, expected=True, fatal=True, only_once=False):\n+\n+ def alerts():\n+ for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\n+ alert_dict = traverse_obj(\n+ alert, 'alertRenderer', None, expected_type=dict, get_all=False)\n+ alert_type = traverse_obj(alert_dict, 'type')\n+ if not alert_type:\n+ continue\n+ message = self._get_text(alert_dict, 'text')\n+ if message:\n+ yield alert_type, message\n+\n+ errors, warnings = [], []\n+ _IGNORED_WARNINGS = T('Unavailable videos will be hidden during playback')\n+ for alert_type, alert_message in alerts():\n+ if alert_type.lower() == 'error' and fatal:\n+ errors.append([alert_type, alert_message])\n+ elif alert_message not in _IGNORED_WARNINGS:\n+ warnings.append([alert_type, alert_message])\n+\n+ for alert_type, alert_message in itertools.chain(warnings, errors[:-1]):\n+ self.report_warning(\n+ 'YouTube said: %s - %s' % (alert_type, alert_message),\n+ only_once=only_once)\n+ if errors:\n+ raise ExtractorError(\n+ 'YouTube said: %s' % (errors[-1][1],), expected=expected)\n \n def _extract_from_tabs(self, item_id, webpage, data, tabs):\n selected_tab = self._extract_selected_tab(tabs)\n@@ -4005,10 +3999,10 @@ def qs_get(key, default=None):\n compat_str) or video_id\n if video_id:\n return self.url_result(video_id, ie=YoutubeIE.ie_key(), video_id=video_id)\n+\n # Capture and output alerts\n- alert = self._extract_alert(data)\n- if alert:\n- raise ExtractorError(alert, expected=True)\n+ self._extract_and_report_alerts(data)\n+\n # Failed to recognize\n raise ExtractorError('Unable to recognize tab page')\n \n@@ -4162,7 +4156,7 @@ class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/playlist?list=LL',\n ie=YoutubeTabIE.ie_key())\n@@ -4244,7 +4238,7 @@ def IE_NAME(self):\n def _real_initialize(self):\n self._login()\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/feed/%s' % self._FEED_NAME,\n ie=YoutubeTabIE.ie_key())\n@@ -4259,7 +4253,7 @@ class YoutubeWatchLaterIE(InfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/playlist?list=WL', ie=YoutubeTabIE.ie_key())\n \n@@ -4339,7 +4333,7 @@ class YoutubeTruncatedURLIE(InfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n raise ExtractorError(\n 'Did you forget to quote the URL? Remember that & is a meta '\n 'character in most shells, so you want to put the URL in quotes, '\n","summary":"Edited 1 file(s) in youtube_dl/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/ci.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\\nindex c7a8fff8449..073c4458c1d 100644\\n--- a/.github/workflows/ci.yml\\n+++ b/.github/workflows/ci.yml\\n@@ -365,7 +365,7 @@ jobs:\\n python -m ensurepip || python -m pip --version || { \\\\\\n get_pip=\\\"${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}\\\"; \\\\\\n curl -L -O \\\"https://bootstrap.pypa.io/pip/${get_pip}get-pip.py\\\"; \\\\\\n- python get-pip.py; }\\n+ python get-pip.py --no-setuptools --no-wheel; }\\n - name: Set up Python 2.6 pip\\n if: ${{ matrix.python-version == '2.6' }}\\n shell: bash\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\\nindex 0b802351d22..c045bc8bc24 100644\\n--- a/youtube_dl/extractor/youtube.py\\n+++ b/youtube_dl/extractor/youtube.py\\n@@ -100,8 +100,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n },\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\\n+ 'REQUIRE_PO_TOKEN': False,\\n 'REQUIRE_JS_PLAYER': False,\\n- 'REQUIRE_PO_TOKEN': True,\\n },\\n # mweb has 'ultralow' formats\\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\\n@@ -478,6 +478,7 @@ def _extract_video(self, renderer):\\n def _extract_thumbnails(data, *path_list, **kw_final_key):\\n \\\"\\\"\\\"\\n Extract thumbnails from thumbnails dict\\n+\\n @param path_list: path list to level that contains 'thumbnails' key\\n \\\"\\\"\\\"\\n final_key = kw_final_key.get('final_key', 'thumbnails')\\n@@ -520,34 +521,26 @@ def _search_results(self, query, params):\\n headers={'content-type': 'application/json'})\\n if not search:\\n break\\n- slr_contents = try_get(\\n+ slr_contents = traverse_obj(\\n search,\\n- (lambda x: x['contents']['twoColumnSearchResultsRenderer']['primaryContents']['sectionListRenderer']['contents'],\\n- lambda x: x['onResponseReceivedCommands'][0]['appendContinuationItemsAction']['continuationItems']),\\n- list)\\n+ ('contents', 'twoColumnSearchResultsRenderer', 'primaryContents',\\n+ 'sectionListRenderer', 'contents'),\\n+ ('onResponseReceivedCommands', 0, 'appendContinuationItemsAction',\\n+ 'continuationItems'),\\n+ expected_type=list)\\n if not slr_contents:\\n break\\n- for slr_content in slr_contents:\\n- isr_contents = try_get(\\n- slr_content,\\n- lambda x: x['itemSectionRenderer']['contents'],\\n- list)\\n- if not isr_contents:\\n- continue\\n- for content in isr_contents:\\n- if not isinstance(content, dict):\\n- continue\\n- video = content.get('videoRenderer')\\n- if not isinstance(video, dict):\\n- continue\\n- video_id = video.get('videoId')\\n- if not video_id:\\n- continue\\n- yield self._extract_video(video)\\n- token = try_get(\\n+ for video in traverse_obj(\\n+ slr_contents,\\n+ (Ellipsis, 'itemSectionRenderer', 'contents',\\n+ Ellipsis, 'videoRenderer',\\n+ T(lambda v: v if v.get('videoId') else None))):\\n+ yield self._extract_video(video)\\n+\\n+ token = traverse_obj(\\n slr_contents,\\n- lambda x: x[-1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'],\\n- compat_str)\\n+ (-1, 'continuationItemRenderer', 'continuationEndpoint',\\n+ 'continuationCommand', 'token', T(compat_str)))\\n if not token:\\n break\\n data['continuation'] = token\\n@@ -2176,7 +2169,8 @@ def extract_id(cls, url):\\n raise ExtractorError('Invalid URL: %s' % url)\\n return mobj.group(2)\\n \\n- def _extract_chapters_from_json(self, data, video_id, duration):\\n+ @staticmethod\\n+ def _extract_chapters_from_json(data, video_id, duration):\\n chapters_list = try_get(\\n data,\\n lambda x: x['playerOverlays']\\n@@ -2472,7 +2466,7 @@ def build_fragments(f):\\n return LazyList({\\n 'url': update_url_query(f['url'], {\\n 'range': '{0}-{1}'.format(range_start, min(range_start + CHUNK_SIZE - 1, f['filesize'])),\\n- })\\n+ }),\\n } for range_start in range(0, f['filesize'], CHUNK_SIZE))\\n \\n lower = lambda s: s.lower()\\n@@ -2778,7 +2772,7 @@ def process_language(container, base_url, lang_code, query):\\n 'fmt': fmt,\\n # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\\n # See: https://github.com/yt-dlp/yt-dlp/issues/13654\\n- 'xosf': []\\n+ 'xosf': [],\\n })\\n lang_subs.append({\\n 'ext': fmt,\\n@@ -3426,13 +3420,9 @@ def suitable(cls, url):\\n \\n @staticmethod\\n def _extract_grid_item_renderer(item):\\n- assert isinstance(item, dict)\\n- for key, renderer in item.items():\\n- if not key.startswith('grid') or not key.endswith('Renderer'):\\n- continue\\n- if not isinstance(renderer, dict):\\n- continue\\n- return renderer\\n+ return traverse_obj(item, (\\n+ T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\\n+ 1, T(dict)), get_all=False)\\n \\n @staticmethod\\n def _get_text(r, k):\\n@@ -3515,8 +3505,8 @@ def _shelf_entries(self, shelf_renderer, skip_channels=False):\\n shelf_renderer, lambda x: x['title']['runs'][0]['text'], compat_str)\\n yield self.url_result(shelf_url, video_title=title)\\n # Shelf may not contain shelf URL, fallback to extraction from content\\n- for entry in self._shelf_entries_from_content(shelf_renderer):\\n- yield entry\\n+ for from_ in self._shelf_entries_from_content(shelf_renderer):\\n+ yield from_\\n \\n def _playlist_entries(self, video_list_renderer):\\n for content in video_list_renderer['contents']:\\n@@ -3538,12 +3528,12 @@ def _extract_lockup_view_model(self, view_model):\\n if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\\n ie = YoutubeIE\\n url = update_url_query(\\n- 'https://www.youtube.com/watch', {'v': content_id}),\\n+ 'https://www.youtube.com/watch', {'v': content_id})\\n thumb_keys = (None,)\\n elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\\n ie = YoutubeTabIE\\n url = update_url_query(\\n- 'https://www.youtube.com/playlist', {'list': content_id}),\\n+ 'https://www.youtube.com/playlist', {'list': content_id})\\n thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\\n else:\\n self.report_warning(\\n@@ -3606,15 +3596,10 @@ def _post_thread_entries(self, post_thread_renderer):\\n yield self.url_result(ep_url, ie=YoutubeIE.ie_key(), video_id=video_id)\\n \\n def _post_thread_continuation_entries(self, post_thread_continuation):\\n- contents = post_thread_continuation.get('contents')\\n- if not isinstance(contents, list):\\n- return\\n- for content in contents:\\n- renderer = content.get('backstagePostThreadRenderer')\\n- if not isinstance(renderer, dict):\\n- continue\\n- for entry in self._post_thread_entries(renderer):\\n- yield entry\\n+ for renderer in traverse_obj(post_thread_continuation, (\\n+ 'contents', Ellipsis, 'backstagePostThreadRenderer', T(dict))):\\n+ for from_ in self._post_thread_entries(renderer):\\n+ yield from_\\n \\n def _rich_grid_entries(self, contents):\\n for content in traverse_obj(\\n@@ -3689,17 +3674,10 @@ def _entries(self, tab, item_id, webpage):\\n if slr_renderer:\\n is_channels_tab = tab.get('title') == 'Channels'\\n continuation = None\\n- slr_contents = try_get(slr_renderer, lambda x: x['contents'], list) or []\\n- for slr_content in slr_contents:\\n- if not isinstance(slr_content, dict):\\n- continue\\n- is_renderer = try_get(slr_content, lambda x: x['itemSectionRenderer'], dict)\\n- if not is_renderer:\\n- continue\\n- isr_contents = try_get(is_renderer, lambda x: x['contents'], list) or []\\n- for isr_content in isr_contents:\\n- if not isinstance(isr_content, dict):\\n- continue\\n+ for is_renderer in traverse_obj(slr_renderer, (\\n+ 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\\n+ for isr_content in traverse_obj(slr_renderer, (\\n+ 'contents', Ellipsis, T(dict))):\\n renderer = isr_content.get('playlistVideoListRenderer')\\n if renderer:\\n for entry in self._playlist_entries(renderer):\\n@@ -3894,18 +3872,34 @@ def _extract_uploader(self, metadata, data):\\n uploader['channel'] = uploader['uploader']\\n return uploader\\n \\n- @classmethod\\n- def _extract_alert(cls, data):\\n- alerts = []\\n- for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\\n- alert_text = traverse_obj(\\n- alert, (None, lambda x: x['alertRenderer']['text']), get_all=False)\\n- if not alert_text:\\n- continue\\n- text = cls._get_text(alert_text, 'text')\\n- if text:\\n- alerts.append(text)\\n- return '\\\\n'.join(alerts)\\n+ def _extract_and_report_alerts(self, data, expected=True, fatal=True, only_once=False):\\n+\\n+ def alerts():\\n+ for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\\n+ alert_dict = traverse_obj(\\n+ alert, 'alertRenderer', None, expected_type=dict, get_all=False)\\n+ alert_type = traverse_obj(alert_dict, 'type')\\n+ if not alert_type:\\n+ continue\\n+ message = self._get_text(alert_dict, 'text')\\n+ if message:\\n+ yield alert_type, message\\n+\\n+ errors, warnings = [], []\\n+ _IGNORED_WARNINGS = T('Unavailable videos will be hidden during playback')\\n+ for alert_type, alert_message in alerts():\\n+ if alert_type.lower() == 'error' and fatal:\\n+ errors.append([alert_type, alert_message])\\n+ elif alert_message not in _IGNORED_WARNINGS:\\n+ warnings.append([alert_type, alert_message])\\n+\\n+ for alert_type, alert_message in itertools.chain(warnings, errors[:-1]):\\n+ self.report_warning(\\n+ 'YouTube said: %s - %s' % (alert_type, alert_message),\\n+ only_once=only_once)\\n+ if errors:\\n+ raise ExtractorError(\\n+ 'YouTube said: %s' % (errors[-1][1],), expected=expected)\\n \\n def _extract_from_tabs(self, item_id, webpage, data, tabs):\\n selected_tab = self._extract_selected_tab(tabs)\\n@@ -4005,10 +3999,10 @@ def qs_get(key, default=None):\\n compat_str) or video_id\\n if video_id:\\n return self.url_result(video_id, ie=YoutubeIE.ie_key(), video_id=video_id)\\n+\\n # Capture and output alerts\\n- alert = self._extract_alert(data)\\n- if alert:\\n- raise ExtractorError(alert, expected=True)\\n+ self._extract_and_report_alerts(data)\\n+\\n # Failed to recognize\\n raise ExtractorError('Unable to recognize tab page')\\n \\n@@ -4162,7 +4156,7 @@ class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):\\n 'only_matching': True,\\n }]\\n \\n- def _real_extract(self, url):\\n+ def _real_extract(self, _):\\n return self.url_result(\\n 'https://www.youtube.com/playlist?list=LL',\\n ie=YoutubeTabIE.ie_key())\\n@@ -4244,7 +4238,7 @@ def IE_NAME(self):\\n def _real_initialize(self):\\n self._login()\\n \\n- def _real_extract(self, url):\\n+ def _real_extract(self, _):\\n return self.url_result(\\n 'https://www.youtube.com/feed/%s' % self._FEED_NAME,\\n ie=YoutubeTabIE.ie_key())\\n@@ -4259,7 +4253,7 @@ class YoutubeWatchLaterIE(InfoExtractor):\\n 'only_matching': True,\\n }]\\n \\n- def _real_extract(self, url):\\n+ def _real_extract(self, _):\\n return self.url_result(\\n 'https://www.youtube.com/playlist?list=WL', ie=YoutubeTabIE.ie_key())\\n \\n@@ -4339,7 +4333,7 @@ class YoutubeTruncatedURLIE(InfoExtractor):\\n 'only_matching': True,\\n }]\\n \\n- def _real_extract(self, url):\\n+ def _real_extract(self, _):\\n raise ExtractorError(\\n 'Did you forget to quote the URL? Remember that & is a meta '\\n 'character in most shells, so you want to put the URL in quotes, '\\n\",\n \"summary\": \"Edited 1 file(s) in youtube_dl/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex c7a8fff8449..073c4458c1d 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -365,7 +365,7 @@ jobs:\n python -m ensurepip || python -m pip --version || { \\\n get_pip=\"${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}\"; \\\n curl -L -O \"https://bootstrap.pypa.io/pip/${get_pip}get-pip.py\"; \\\n- python get-pip.py; }\n+ python get-pip.py --no-setuptools --no-wheel; }\n - name: Set up Python 2.6 pip\n if: ${{ matrix.python-version == '2.6' }}\n shell: bash\ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex 0b802351d22..c045bc8bc24 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -100,8 +100,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 5,\n+ 'REQUIRE_PO_TOKEN': False,\n 'REQUIRE_JS_PLAYER': False,\n- 'REQUIRE_PO_TOKEN': True,\n },\n # mweb has 'ultralow' formats\n # See: https://github.com/yt-dlp/yt-dlp/pull/557\n@@ -478,6 +478,7 @@ def _extract_video(self, renderer):\n def _extract_thumbnails(data, *path_list, **kw_final_key):\n \"\"\"\n Extract thumbnails from thumbnails dict\n+\n @param path_list: path list to level that contains 'thumbnails' key\n \"\"\"\n final_key = kw_final_key.get('final_key', 'thumbnails')\n@@ -520,34 +521,26 @@ def _search_results(self, query, params):\n headers={'content-type': 'application/json'})\n if not search:\n break\n- slr_contents = try_get(\n+ slr_contents = traverse_obj(\n search,\n- (lambda x: x['contents']['twoColumnSearchResultsRenderer']['primaryContents']['sectionListRenderer']['contents'],\n- lambda x: x['onResponseReceivedCommands'][0]['appendContinuationItemsAction']['continuationItems']),\n- list)\n+ ('contents', 'twoColumnSearchResultsRenderer', 'primaryContents',\n+ 'sectionListRenderer', 'contents'),\n+ ('onResponseReceivedCommands', 0, 'appendContinuationItemsAction',\n+ 'continuationItems'),\n+ expected_type=list)\n if not slr_contents:\n break\n- for slr_content in slr_contents:\n- isr_contents = try_get(\n- slr_content,\n- lambda x: x['itemSectionRenderer']['contents'],\n- list)\n- if not isr_contents:\n- continue\n- for content in isr_contents:\n- if not isinstance(content, dict):\n- continue\n- video = content.get('videoRenderer')\n- if not isinstance(video, dict):\n- continue\n- video_id = video.get('videoId')\n- if not video_id:\n- continue\n- yield self._extract_video(video)\n- token = try_get(\n+ for video in traverse_obj(\n+ slr_contents,\n+ (Ellipsis, 'itemSectionRenderer', 'contents',\n+ Ellipsis, 'videoRenderer',\n+ T(lambda v: v if v.get('videoId') else None))):\n+ yield self._extract_video(video)\n+\n+ token = traverse_obj(\n slr_contents,\n- lambda x: x[-1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'],\n- compat_str)\n+ (-1, 'continuationItemRenderer', 'continuationEndpoint',\n+ 'continuationCommand', 'token', T(compat_str)))\n if not token:\n break\n data['continuation'] = token\n@@ -2176,7 +2169,8 @@ def extract_id(cls, url):\n raise ExtractorError('Invalid URL: %s' % url)\n return mobj.group(2)\n \n- def _extract_chapters_from_json(self, data, video_id, duration):\n+ @staticmethod\n+ def _extract_chapters_from_json(data, video_id, duration):\n chapters_list = try_get(\n data,\n lambda x: x['playerOverlays']\n@@ -2472,7 +2466,7 @@ def build_fragments(f):\n return LazyList({\n 'url': update_url_query(f['url'], {\n 'range': '{0}-{1}'.format(range_start, min(range_start + CHUNK_SIZE - 1, f['filesize'])),\n- })\n+ }),\n } for range_start in range(0, f['filesize'], CHUNK_SIZE))\n \n lower = lambda s: s.lower()\n@@ -2778,7 +2772,7 @@ def process_language(container, base_url, lang_code, query):\n 'fmt': fmt,\n # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\n # See: https://github.com/yt-dlp/yt-dlp/issues/13654\n- 'xosf': []\n+ 'xosf': [],\n })\n lang_subs.append({\n 'ext': fmt,\n@@ -3426,13 +3420,9 @@ def suitable(cls, url):\n \n @staticmethod\n def _extract_grid_item_renderer(item):\n- assert isinstance(item, dict)\n- for key, renderer in item.items():\n- if not key.startswith('grid') or not key.endswith('Renderer'):\n- continue\n- if not isinstance(renderer, dict):\n- continue\n- return renderer\n+ return traverse_obj(item, (\n+ T(dict.items), lambda _, k_v: k_v[0].startswith('grid') and k_v[0].endswith('Renderer'),\n+ 1, T(dict)), get_all=False)\n \n @staticmethod\n def _get_text(r, k):\n@@ -3515,8 +3505,8 @@ def _shelf_entries(self, shelf_renderer, skip_channels=False):\n shelf_renderer, lambda x: x['title']['runs'][0]['text'], compat_str)\n yield self.url_result(shelf_url, video_title=title)\n # Shelf may not contain shelf URL, fallback to extraction from content\n- for entry in self._shelf_entries_from_content(shelf_renderer):\n- yield entry\n+ for from_ in self._shelf_entries_from_content(shelf_renderer):\n+ yield from_\n \n def _playlist_entries(self, video_list_renderer):\n for content in video_list_renderer['contents']:\n@@ -3538,12 +3528,12 @@ def _extract_lockup_view_model(self, view_model):\n if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\n ie = YoutubeIE\n url = update_url_query(\n- 'https://www.youtube.com/watch', {'v': content_id}),\n+ 'https://www.youtube.com/watch', {'v': content_id})\n thumb_keys = (None,)\n elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n ie = YoutubeTabIE\n url = update_url_query(\n- 'https://www.youtube.com/playlist', {'list': content_id}),\n+ 'https://www.youtube.com/playlist', {'list': content_id})\n thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\n else:\n self.report_warning(\n@@ -3606,15 +3596,10 @@ def _post_thread_entries(self, post_thread_renderer):\n yield self.url_result(ep_url, ie=YoutubeIE.ie_key(), video_id=video_id)\n \n def _post_thread_continuation_entries(self, post_thread_continuation):\n- contents = post_thread_continuation.get('contents')\n- if not isinstance(contents, list):\n- return\n- for content in contents:\n- renderer = content.get('backstagePostThreadRenderer')\n- if not isinstance(renderer, dict):\n- continue\n- for entry in self._post_thread_entries(renderer):\n- yield entry\n+ for renderer in traverse_obj(post_thread_continuation, (\n+ 'contents', Ellipsis, 'backstagePostThreadRenderer', T(dict))):\n+ for from_ in self._post_thread_entries(renderer):\n+ yield from_\n \n def _rich_grid_entries(self, contents):\n for content in traverse_obj(\n@@ -3689,17 +3674,10 @@ def _entries(self, tab, item_id, webpage):\n if slr_renderer:\n is_channels_tab = tab.get('title') == 'Channels'\n continuation = None\n- slr_contents = try_get(slr_renderer, lambda x: x['contents'], list) or []\n- for slr_content in slr_contents:\n- if not isinstance(slr_content, dict):\n- continue\n- is_renderer = try_get(slr_content, lambda x: x['itemSectionRenderer'], dict)\n- if not is_renderer:\n- continue\n- isr_contents = try_get(is_renderer, lambda x: x['contents'], list) or []\n- for isr_content in isr_contents:\n- if not isinstance(isr_content, dict):\n- continue\n+ for is_renderer in traverse_obj(slr_renderer, (\n+ 'contents', Ellipsis, 'itemSectionRenderer', T(dict))):\n+ for isr_content in traverse_obj(slr_renderer, (\n+ 'contents', Ellipsis, T(dict))):\n renderer = isr_content.get('playlistVideoListRenderer')\n if renderer:\n for entry in self._playlist_entries(renderer):\n@@ -3894,18 +3872,34 @@ def _extract_uploader(self, metadata, data):\n uploader['channel'] = uploader['uploader']\n return uploader\n \n- @classmethod\n- def _extract_alert(cls, data):\n- alerts = []\n- for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\n- alert_text = traverse_obj(\n- alert, (None, lambda x: x['alertRenderer']['text']), get_all=False)\n- if not alert_text:\n- continue\n- text = cls._get_text(alert_text, 'text')\n- if text:\n- alerts.append(text)\n- return '\\n'.join(alerts)\n+ def _extract_and_report_alerts(self, data, expected=True, fatal=True, only_once=False):\n+\n+ def alerts():\n+ for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):\n+ alert_dict = traverse_obj(\n+ alert, 'alertRenderer', None, expected_type=dict, get_all=False)\n+ alert_type = traverse_obj(alert_dict, 'type')\n+ if not alert_type:\n+ continue\n+ message = self._get_text(alert_dict, 'text')\n+ if message:\n+ yield alert_type, message\n+\n+ errors, warnings = [], []\n+ _IGNORED_WARNINGS = T('Unavailable videos will be hidden during playback')\n+ for alert_type, alert_message in alerts():\n+ if alert_type.lower() == 'error' and fatal:\n+ errors.append([alert_type, alert_message])\n+ elif alert_message not in _IGNORED_WARNINGS:\n+ warnings.append([alert_type, alert_message])\n+\n+ for alert_type, alert_message in itertools.chain(warnings, errors[:-1]):\n+ self.report_warning(\n+ 'YouTube said: %s - %s' % (alert_type, alert_message),\n+ only_once=only_once)\n+ if errors:\n+ raise ExtractorError(\n+ 'YouTube said: %s' % (errors[-1][1],), expected=expected)\n \n def _extract_from_tabs(self, item_id, webpage, data, tabs):\n selected_tab = self._extract_selected_tab(tabs)\n@@ -4005,10 +3999,10 @@ def qs_get(key, default=None):\n compat_str) or video_id\n if video_id:\n return self.url_result(video_id, ie=YoutubeIE.ie_key(), video_id=video_id)\n+\n # Capture and output alerts\n- alert = self._extract_alert(data)\n- if alert:\n- raise ExtractorError(alert, expected=True)\n+ self._extract_and_report_alerts(data)\n+\n # Failed to recognize\n raise ExtractorError('Unable to recognize tab page')\n \n@@ -4162,7 +4156,7 @@ class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/playlist?list=LL',\n ie=YoutubeTabIE.ie_key())\n@@ -4244,7 +4238,7 @@ def IE_NAME(self):\n def _real_initialize(self):\n self._login()\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/feed/%s' % self._FEED_NAME,\n ie=YoutubeTabIE.ie_key())\n@@ -4259,7 +4253,7 @@ class YoutubeWatchLaterIE(InfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n return self.url_result(\n 'https://www.youtube.com/playlist?list=WL', ie=YoutubeTabIE.ie_key())\n \n@@ -4339,7 +4333,7 @@ class YoutubeTruncatedURLIE(InfoExtractor):\n 'only_matching': True,\n }]\n \n- def _real_extract(self, url):\n+ def _real_extract(self, _):\n raise ExtractorError(\n 'Did you forget to quote the URL? Remember that & is a meta '\n 'character in most shells, so you want to put the URL in quotes, '\n"},"num_subtasks":{"kind":"number","value":2,"string":"2"},"num_changed_files":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":34299,"cells":{"task_id":{"kind":"string","value":"ytdl-org/youtube-dl#33189"},"repo":{"kind":"string","value":"ytdl-org/youtube-dl"},"pr_number":{"kind":"number","value":33189,"string":"33,189"},"base_sha":{"kind":"string","value":"a084c80f7bac9ae343075a97cc0fb2c1c96ade89"},"head_sha":{"kind":"string","value":"59da256324073e03d0fd2e36947790376e283957"},"task":{"kind":"string","value":"[YouTube] unable to extract player URL, Sign in to confirm you're not a bot\n\n<!--\n\n######################################################################\n WARNING!\n IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE\n######################################################################\n\n-->\n\n\n## Checklist\n\n<!--\nCarefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:\n- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.\n- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.\n- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.\n- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.\n- Finally, put x into all relevant boxes (like this [x])\n-->\n\n- [x] I'm reporting a broken site support\n- [x] I've verified that I'm running youtube-dl version **2025-05-05**\n- [x] I've checked that all provided URLs are alive and playable in a browser\n- [x] I've checked that all URLs and arguments with special characters are properly quoted or escaped\n- [x] I've searched the bugtracker for similar issues including closed ones\n\n\n## Verbose log\n\n<!--\nProvide the complete verbose output of youtube-dl that clearly demonstrates the problem.\nAdd the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:\n [debug] System config: []\n [debug] User config: []\n [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']\n [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251\n [debug] youtube-dl version 2021.12.17\n [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2\n [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4\n [debug] Proxy map: {}\n <more lines>\n-->\n\nFor few days now, I constantly get this (title) error.\nSometimes, when I change IP, it works once or twice, and then fails again. And then stays this way for good.\n\n\n```\n$ youtube-dl-2025.05.05 --version\n2025.05.05\n$ youtube-dl-2025.05.05 -v https://www.youtube.com/watch?v=uLpknfbhv7Y\n\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=uLpknfbhv7Y']\n[debug] Encodings: locale UTF-8, fs UTF-8, out UTF-8, pref UTF-8\n[debug] youtube-dl version 2025.05.05 [a084c80f7] (single file build)\n[debug] ** This version was built from the latest master code at https://github.com/ytdl-org/youtube-dl.\n[debug] ** For support, visit the main site.\n[debug] Python 2.7.11 (CPython i686 32bit) - OpenSSL 1.0.1e 11 Feb 2013 - glibc 2.0\n[debug] exe versions: none\n[debug] Proxy map: {}\n[youtube] uLpknfbhv7Y: Downloading webpage\nWARNING: [youtube] unable to extract player URL; please report this issue on https://github.com/ytdl-org/youtube-dl/issues , using the appropriate issue template. Make sure you are using the latest version; type youtube-dl -U to update. Be sure to call youtube-dl with the --verbose option and include the complete output.\nWARNING: [youtube] Cannot extract signature timestamp without player url\n[youtube] uLpknfbhv7Y: Downloading TVHTML5 API JSON\nWARNING: [youtube] unable to extract player URL; please report this issue on https://github.com/ytdl-org/youtube-dl/issues , using the appropriate issue template. Make sure you are using the latest version; type youtube-dl -U to update. Be sure to call youtube-dl with the --verbose option and include the complete output.\nERROR: Sign in to confirm youโre not a bot\nThis helps protect our community. Learn more\nTraceback (most recent call last):\n File \"./youtube-dl-2025.05.05/youtube_dl/YoutubeDL.py\", line 886, in wrapper\n return func(self, *args, **kwargs)\n File \"./youtube-dl-2025.05.05/youtube_dl/YoutubeDL.py\", line 982, in __extract_info\n ie_result = ie.extract(url)\n File \"./youtube-dl-2025.05.05/youtube_dl/extractor/common.py\", line 573, in extract\n ie_result = self._real_extract(url)\n File \"./youtube-dl-2025.05.05/youtube_dl/extractor/youtube.py\", line 2592, in _real_extract\n raise ExtractorError(reason, expected=True)\nExtractorError: Sign in to confirm you\\u2019re not a bot\nThis helps protect our community. Learn more\n```\n\nThis failure 'expands' to all other operationf like \\`--format', \\`--get-description', etc.\n\n\nHere is successful attempt:\n\n```\n$ youtube-dl-2025.05.05 -v https://www.youtube.com/watch?v=uLpknfbhv7Y\n\n[debug] System config: []\n[debug] User config: []\n[debug] Custom config: []\n[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=uLpknfbhv7Y']\n[debug] Encodings: locale UTF-8, fs UTF-8, out UTF-8, pref UTF-8\n[debug] youtube-dl version 2025.05.05 [a084c80f7] (single file build)\n[debug] ** This version was built from the latest master code at https://github.com/ytdl-org/youtube-dl.\n[debug] ** For support, visit the main site.\n[debug] Python 2.7.11 (CPython i686 32bit) - OpenSSL 1.0.1e 11 Feb 2013 - glibc 2.0\n[debug] exe versions: none\n[debug] Proxy map: {}\n[youtube] uLpknfbhv7Y: Downloading webpage\n[youtube] uLpknfbhv7Y: Downloading TVHTML5 API JSON\n[youtube] uLpknfbhv7Y: Downloading player 612f74a3-main\n[debug] Saving youtube-nsig.612f74a3-main to cache\n[debug] [youtube] Decrypted nsig VQTX9tHu606H3C7YC => HLrZJNLv821jzw\n[debug] [youtube] Decrypted nsig lt-jo7vihWoDX7PG_ => JpsD599LIpt8Pw\n[debug] Default format spec: best/bestvideo+bestaudio\n[debug] Invoking downloader on u'https://rr1---sn-u2oxu-3ufs.googlevideo.com/videoplayback?rms=au%2Cau&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cxpc%2Cbui%2Cvprv%2Csvpuc%2Cmime%2Cns%2Crqh%2Ccnr%2Cratebypass%2Cdur%2Clmt&ei=TMFBaP72IuL-i9oPotXu0AI&ip=2a00%3Af41%3A283e%3Ae37b%3A21f%3A3cff%3Afe31%3Af779&id=o-AGc0-K5X-sCt4OLIIaLtFQLjk6-_oNKpGInNUepCA9LX&txp=5538434&svpuc=1&lsig=APaTxxMwRAIgal-OnmhZPKB5xAXTAT6oL9Iv-dH6Kn9tM47bEGKCmmACIDn4MsF_-3RjpRFYCbIt8D-fywUQFtGGWFxrs9jD1L9D&cnr=14&xpc=EgVo2aDSNQ%3D%3D&requiressl=yes&ratebypass=yes&source=youtube&sig=AJfQdSswRgIhAINk2-_ETZHYHJUg_7avy_Z65-g5Mh4peW0xYJP35ZN2AiEA8Yp49sZzqmtfTZ-P5T7nd0nXqWuP-KQ9L7xYi8BLCmw%3D&bui=AY1jyLOgsKIaN4soJRaQF3j5A5XH94sKD78ML6vYHV52abY7C7hneC_0-81ImNFl1V7H27M_65kc4fv_&ns=sn_FhgjnQkE1xkWQXOfeXLEQ&initcwndbps=726250&vprv=1&itag=18&lsparams=met%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Crms%2Cinitcwndbps&lmt=1665396717084014&lmw=1&met=1749139788%2C&expire=1749161388&mime=video%2Fmp4&fvip=3&dur=70.611&rqh=1&c=TVHTML5&sefc=1&mm=31%2C29&mn=sn-u2oxu-3ufs%2Csn-u2oxu-f5fe7&mh=qx&n=HLrZJNLv821jzw&mt=1749139524&mv=m&pl=44&ms=au%2Crdu&mvi=1'\n[download] Destination: Giant METEOR flashes over UK rooftops โlike a fireworkโ-uLpknfbhv7Y.mp4\n[download] 100% of 1.66MiB in 00:02\n```\n\n## Description\n\n<!--\nProvide an explanation of your issue in an arbitrary form. Provide any additional information, suggested solution and as much context and examples as possible.\nIf work on your issue requires account credentials please provide them or explain how one can obtain them.\n-->\n\nAs described above.\n\n[YouTube] ERROR: Unable to extract nsig function code in release 2025.05.05\n\nRunning 2025.05.05 on Ubuntu:\n\nERROR: Unable to extract nsig function code (caused by RegexNotFoundError(u'Unable to extract Initial JS player n function name; please report this issue on https://github.com/ytdl-org/youtube-dl/issues\n\n[YouTube, misc] Back-ports from yt-dlp for broken YT player `2b83d2e0` and later\n\n## Please follow the guide below\r\n<details>\r\n<summary>Boilerplate: yt-dlp+own code, bug fix+new features</summary>\r\n## Please follow the guide below\r\n\r\n- You will be asked some questions, please read them **carefully** and answer honestly\r\n- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])\r\n- Use *Preview* tab to see how your *pull request* will actually look like\r\n\r\n---\r\n\r\n### Before submitting a *pull request* make sure you have:\r\n- [x] [Searched](https://github.com/ytdl-org/youtube-dl/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests\r\n- [x] Read [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site)\r\n- [x] Read [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) and adjusted the code to meet them\r\n- [x] Covered the code with tests (note that PRs without tests will be REJECTED)\r\n- [x] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)\r\n\r\n### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:\r\n- [x] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/), except for:\r\n- [x] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence): code from yt-dlp under Unlicense\r\n\r\n### What is the purpose of your *pull request*?\r\n- [x] Bug fix\r\n- [ ] Improvement\r\n- [ ] New extractor\r\n- [x] New feature\r\n\r\n</details>\r\n\r\n---\r\n\r\n### Description of your *pull request* and other information\r\n\r\nThis PR primarily addresses the problem of #33186. It includes a version of the interim fix from yt-dlp/yt-dlp#14398 (fixes #33187): thx @seproDev.\r\n\r\nThe PR also includes these changes:\r\n* updates relevant YT player data: thx yt-dlp devs severally\r\n* some YT extractor code clean-ups prompted by linting\r\n* define a WEB user agent and force its use for video page downloads: fixes #33142\r\n* add downloader support for the `available_at` (timestamp) format key and use it to implement the now required preroll waiting period for YT, as in yt-dlp/yt-dlp#14081: thx @bashonly\r\n* fix YT subtitles extraction per yt-dlp/yt-dlp#13659: thx @bashonly\r\n* extract srt subtitles for YT from yt-dlp/yt-dlp#13411: thx @gamer191\r\n* extract fallback title and description from YT initial data, per yt-dlp/yt-dlp#14078: thx @bashonly\r\n* support extracting LOCKUP_CONTENT_TYPE_VIDEO from YT subscriptions feed, per yt-dlp/yt-dlp#13665: thx @bashonly\r\n* support the missing option --no-list-formats, as requested in yt-dlp/yt-dlp#14378\r\n* and now we have to run the Windows stuff in Windows Server 2022, which apparently still supports our Py3.4 build.\r\n\r\n\r\n"},"plan":{"kind":"list like","value":[{"subtask_id":"s1","goal":"Implement the changes under `.github/workflows/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot","scope_files":[".github/workflows/ci.yml"]},{"subtask_id":"s2","goal":"Implement the changes under `youtube_dl/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot","scope_files":["youtube_dl/__init__.py","youtube_dl/options.py"]},{"subtask_id":"s3","goal":"Implement the changes under `youtube_dl/downloader/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot","scope_files":["youtube_dl/downloader/common.py"]},{"subtask_id":"s4","goal":"Implement the changes under `youtube_dl/extractor/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot","scope_files":["youtube_dl/extractor/youtube.py"]}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"goal\": \"Implement the changes under `.github/workflows/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot\",\n \"scope_files\": [\n \".github/workflows/ci.yml\"\n ]\n },\n {\n \"subtask_id\": \"s2\",\n \"goal\": \"Implement the changes under `youtube_dl/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot\",\n \"scope_files\": [\n \"youtube_dl/__init__.py\",\n \"youtube_dl/options.py\"\n ]\n },\n {\n \"subtask_id\": \"s3\",\n \"goal\": \"Implement the changes under `youtube_dl/downloader/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot\",\n \"scope_files\": [\n \"youtube_dl/downloader/common.py\"\n ]\n },\n {\n \"subtask_id\": \"s4\",\n \"goal\": \"Implement the changes under `youtube_dl/extractor/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ]\n }\n]","isConversational":false},"subagents":{"kind":"list like","value":[{"subtask_id":"s1","scope_files":[".github/workflows/ci.yml"],"solution_diff":"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex 8234e0ccb6d..c7a8fff8449 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -122,12 +122,12 @@ jobs:\n ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}\n run-tests-ext: [sh]\n include:\n- - os: windows-2019\n+ - os: windows-2022\n python-version: 3.4\n python-impl: cpython\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}\n run-tests-ext: bat\n- - os: windows-2019\n+ - os: windows-2022\n python-version: 3.4\n python-impl: cpython\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download' || 'nodownload' }}\n","summary":"Edited 1 file(s) in .github/workflows/"},{"subtask_id":"s2","scope_files":["youtube_dl/__init__.py","youtube_dl/options.py"],"solution_diff":"diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py\nindex 3c1272e7b05..202f2c9b9a7 100644\n--- a/youtube_dl/__init__.py\n+++ b/youtube_dl/__init__.py\n@@ -409,6 +409,8 @@ def parse_retries(retries):\n 'include_ads': opts.include_ads,\n 'default_search': opts.default_search,\n 'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,\n+ 'youtube_player_js_version': opts.youtube_player_js_version,\n+ 'youtube_player_js_variant': opts.youtube_player_js_variant,\n 'encoding': opts.encoding,\n 'extract_flat': opts.extract_flat,\n 'mark_watched': opts.mark_watched,\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\nindex 61705d1f023..ce3633c418e 100644\n--- a/youtube_dl/options.py\n+++ b/youtube_dl/options.py\n@@ -404,6 +404,10 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n '-F', '--list-formats',\n action='store_true', dest='listformats',\n help='List all available formats of requested videos')\n+ video_format.add_option(\n+ '--no-list-formats',\n+ action='store_false', dest='listformats',\n+ help='Do not list available formats of requested videos (default)')\n video_format.add_option(\n '--youtube-include-dash-manifest',\n action='store_true', dest='youtube_include_dash_manifest', default=True,\n@@ -412,6 +416,17 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n '--youtube-skip-dash-manifest',\n action='store_false', dest='youtube_include_dash_manifest',\n help='Do not download the DASH manifests and related data on YouTube videos')\n+ video_format.add_option(\n+ '--youtube-player-js-variant',\n+ action='store', dest='youtube_player_js_variant',\n+ help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\n+ choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\n+ default='main', metavar='VARIANT')\n+ video_format.add_option(\n+ '--youtube-player-js-version',\n+ action='store', dest='youtube_player_js_version',\n+ help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\n+ default='20348@0004de42', metavar='STS@HASH')\n video_format.add_option(\n '--merge-output-format',\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\n","summary":"Edited 2 file(s) in youtube_dl/"},{"subtask_id":"s3","scope_files":["youtube_dl/downloader/common.py"],"solution_diff":"diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py\nindex 91e691776b1..8354030a9fa 100644\n--- a/youtube_dl/downloader/common.py\n+++ b/youtube_dl/downloader/common.py\n@@ -11,6 +11,7 @@\n decodeArgument,\n encodeFilename,\n error_to_compat_str,\n+ float_or_none,\n format_bytes,\n shell_quote,\n timeconvert,\n@@ -367,14 +368,27 @@ def download(self, filename, info_dict):\n })\n return True\n \n- min_sleep_interval = self.params.get('sleep_interval')\n- if min_sleep_interval:\n- max_sleep_interval = self.params.get('max_sleep_interval', min_sleep_interval)\n- sleep_interval = random.uniform(min_sleep_interval, max_sleep_interval)\n+ min_sleep_interval, max_sleep_interval = (\n+ float_or_none(self.params.get(interval), default=0)\n+ for interval in ('sleep_interval', 'max_sleep_interval'))\n+\n+ sleep_note = ''\n+ available_at = info_dict.get('available_at')\n+ if available_at:\n+ forced_sleep_interval = available_at - int(time.time())\n+ if forced_sleep_interval > min_sleep_interval:\n+ sleep_note = 'as required by the site'\n+ min_sleep_interval = forced_sleep_interval\n+ if forced_sleep_interval > max_sleep_interval:\n+ max_sleep_interval = forced_sleep_interval\n+\n+ sleep_interval = random.uniform(\n+ min_sleep_interval, max_sleep_interval or min_sleep_interval)\n+\n+ if sleep_interval > 0:\n self.to_screen(\n- '[download] Sleeping %s seconds...' % (\n- int(sleep_interval) if sleep_interval.is_integer()\n- else '%.2f' % sleep_interval))\n+ '[download] Sleeping %.2f seconds %s...' % (\n+ sleep_interval, sleep_note))\n time.sleep(sleep_interval)\n \n return self.real_download(filename, info_dict)\n","summary":"Edited 1 file(s) in youtube_dl/downloader/"},{"subtask_id":"s4","scope_files":["youtube_dl/extractor/youtube.py"],"solution_diff":"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex b31798729e9..0b802351d22 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -1,5 +1,4 @@\n # coding: utf-8\n-\n from __future__ import unicode_literals\n \n import collections\n@@ -110,7 +109,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'MWEB',\n- 'clientVersion': '2.20250311.03.00',\n+ 'clientVersion': '2.2.20250925.01.00',\n # mweb previously did not require PO Token with this UA\n 'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',\n },\n@@ -124,23 +123,36 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'client': {\n 'clientName': 'TVHTML5',\n 'clientVersion': '7.20250312.16.00',\n- 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\n+ # See: https://github.com/youtube/cobalt/blob/main/cobalt/browser/user_agent/user_agent_platform_info.cc#L506\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/25.lts.30.1034943-gold (unlike Gecko), Unknown_TV_Unknown_0/Unknown (Unknown, Unknown)',\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n 'SUPPORTS_COOKIES': True,\n },\n+\n 'web': {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n- 'clientVersion': '2.20250312.04.00',\n+ 'clientVersion': '2.20250925.01.00',\n+ 'userAgent': 'Mozilla/5.0',\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n 'REQUIRE_PO_TOKEN': True,\n 'SUPPORTS_COOKIES': True,\n },\n+ # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\n+ 'web_safari': {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB',\n+ 'clientVersion': '2.20250925.01.00',\n+ 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\n+ },\n+ },\n+ },\n }\n \n def _login(self):\n@@ -419,10 +431,15 @@ def _extract_visitor_data(self, *args):\n T(compat_str)))\n \n def _extract_ytcfg(self, video_id, webpage):\n- return self._parse_json(\n- self._search_regex(\n- r'ytcfg\\.set\\s*\\(\\s*({.+?})\\s*\\)\\s*;', webpage, 'ytcfg',\n- default='{}'), video_id, fatal=False) or {}\n+ ytcfg = self._search_json(\n+ r'ytcfg\\.set\\s*\\(', webpage, 'ytcfg', video_id,\n+ end_pattern=r'\\)\\s*;', default={})\n+\n+ traverse_obj(ytcfg, (\n+ 'INNERTUBE_CONTEXT', 'client', 'configInfo',\n+ T(lambda x: x.pop('appInstallData', None))))\n+\n+ return ytcfg\n \n def _extract_video(self, renderer):\n video_id = renderer['videoId']\n@@ -694,7 +711,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias(?:_tce)?\\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\\.vflset)/base\\.js$',\n r'\\b(?P<id>vfl[a-zA-Z0-9_-]{6,})\\b.*?\\.js$',\n )\n- _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')\n+ _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'srt', 'vtt')\n \n _GEO_BYPASS = False\n \n@@ -1587,7 +1604,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n \n _PLAYER_JS_VARIANT_MAP = (\n ('main', 'player_ias.vflset/en_US/base.js'),\n+ ('tcc', 'player_ias_tcc.vflset/en_US/base.js'),\n ('tce', 'player_ias_tce.vflset/en_US/base.js'),\n+ ('es5', 'player_es5.vflset/en_US/base.js'),\n+ ('es6', 'player_es6.vflset/en_US/base.js'),\n ('tv', 'tv-player-ias.vflset/tv-player-ias.js'),\n ('tv_es6', 'tv-player-es6.vflset/tv-player-es6.js'),\n ('phone', 'player-plasma-ias-phone-en_US.vflset/base.js'),\n@@ -1605,6 +1625,19 @@ def __init__(self, *args, **kwargs):\n self._code_cache = {}\n self._player_cache = {}\n \n+ def _get_player_js_version(self):\n+ player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\n+ sts_hash = self._search_regex(\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\n+ if sts_hash:\n+ return sts_hash\n+ self.report_warning(\n+ 'Invalid player JS version \"{0}\" specified. '\n+ 'It should be \"{1}\" or in the format of {2}'.format(\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n+ return None, None\n+\n # *ytcfgs, webpage=None\n def _extract_player_url(self, *ytcfgs, **kw_webpage):\n if ytcfgs and not isinstance(ytcfgs[0], dict):\n@@ -1615,19 +1648,43 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n webpage or '', 'player URL', fatal=False)\n if player_url:\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\n- return traverse_obj(\n+ player_url = traverse_obj(\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\n get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\n \n+ player_id_override = self._get_player_js_version()[1]\n+\n+ requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\n+ variant_js = next(\n+ (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\n+ None)\n+ if variant_js:\n+ player_id = player_id_override or self._extract_player_info(player_url)\n+ original_url = player_url\n+ player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\n+ if original_url != player_url:\n+ self.write_debug(\n+ 'Forcing \"{0}\" player JS variant for player {1}\\n'\n+ ' original url = {2}'.format(\n+ requested_js_variant, player_id, original_url),\n+ only_once=True)\n+ elif requested_js_variant != 'actual':\n+ self.report_warning(\n+ 'Invalid player JS variant name \"{0}\" requested. '\n+ 'Valid choices are: {1}'.format(\n+ requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\n+ only_once=True)\n+\n+ return urljoin('https://www.youtube.com', player_url)\n+\n def _download_player_url(self, video_id, fatal=False):\n res = self._download_webpage(\n 'https://www.youtube.com/iframe_api',\n note='Downloading iframe API JS', video_id=video_id, fatal=fatal)\n player_version = self._search_regex(\n r'player\\\\?/([0-9a-fA-F]{8})\\\\?/', res or '', 'player version', fatal=fatal,\n- default=NO_DEFAULT if res else None)\n- if player_version:\n- return 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\n+ default=NO_DEFAULT if res else None) or None\n+ return player_version and 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\n \n def _signature_cache_id(self, example_sig):\n \"\"\" Return a string representation of a signature \"\"\"\n@@ -2014,9 +2071,15 @@ def decrypt_nsig(n):\n def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):\n \"\"\"\n Extract signatureTimestamp (sts)\n+\n Required to tell API what sig/player version is in use.\n \"\"\"\n- sts = traverse_obj(ytcfg, 'STS', expected_type=int)\n+ sts = traverse_obj(\n+ (self._get_player_js_version(), ytcfg),\n+ (0, 0),\n+ (1, 'STS'),\n+ expected_type=int_or_none)\n+\n if sts:\n return sts\n \n@@ -2163,8 +2226,12 @@ def _real_extract(self, url):\n video_id = self._match_id(url)\n base_url = self.http_scheme() + '//www.youtube.com/'\n webpage_url = base_url + 'watch?v=' + video_id\n+ ua = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ 'web', 'INNERTUBE_CONTEXT', 'client', 'userAgent'))\n+ headers = {'User-Agent': ua} if ua else None\n webpage = self._download_webpage(\n- webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False)\n+ webpage_url + '&bpctr=9999999999&has_verified=1', video_id,\n+ headers=headers, fatal=False)\n \n player_response = None\n player_url = None\n@@ -2174,12 +2241,14 @@ def _real_extract(self, url):\n video_id, 'initial player response')\n is_live = traverse_obj(player_response, ('videoDetails', 'isLive'))\n \n+ fetched_timestamp = None\n if False and not player_response:\n player_response = self._call_api(\n 'player', {'videoId': video_id}, video_id)\n if True or not player_response:\n origin = 'https://www.youtube.com'\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\n+ fetched_timestamp = int(time.time())\n \n player_url = self._extract_player_url(webpage)\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\n@@ -2246,6 +2315,7 @@ def _real_extract(self, url):\n hls = traverse_obj(\n (player_response, api_player_response),\n (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n+ fetched_timestamp = int(time.time())\n if len(hls) == 2 and not hls[0] and hls[1]:\n player_response['streamingData']['hlsManifestUrl'] = hls[1]\n else:\n@@ -2257,13 +2327,14 @@ def _real_extract(self, url):\n player_response['videoDetails'] = video_details\n \n def is_agegated(playability):\n- if not isinstance(playability, dict):\n- return\n+ # playability: dict\n+ if not playability:\n+ return False\n \n if playability.get('desktopLegacyAgeGateReason'):\n return True\n \n- reasons = filter(None, (playability.get(r) for r in ('status', 'reason')))\n+ reasons = traverse_obj(playability, (('status', 'reason'),))\n AGE_GATE_REASONS = (\n 'confirm your age', 'age-restricted', 'inappropriate', # reason\n 'age_verification_required', 'age_check_required', # status\n@@ -2321,15 +2392,9 @@ def get_playability_status(response):\n trailer_video_id, self.ie_key(), trailer_video_id)\n \n def get_text(x):\n- if not x:\n- return\n- text = x.get('simpleText')\n- if text and isinstance(text, compat_str):\n- return text\n- runs = x.get('runs')\n- if not isinstance(runs, list):\n- return\n- return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])\n+ return ''.join(traverse_obj(\n+ x, (('simpleText',),), ('runs', Ellipsis, 'text'),\n+ expected_type=compat_str))\n \n search_meta = (\n (lambda x: self._html_search_meta(x, webpage, default=None))\n@@ -2412,6 +2477,14 @@ def build_fragments(f):\n \n lower = lambda s: s.lower()\n \n+ if is_live:\n+ fetched_timestamp = None\n+ elif fetched_timestamp is not None:\n+ # Handle preroll waiting period\n+ preroll_sleep = self.get_param('youtube_preroll_sleep')\n+ preroll_sleep = int_or_none(preroll_sleep, default=6)\n+ fetched_timestamp += preroll_sleep\n+\n for fmt in streaming_formats:\n if fmt.get('targetDurationSec'):\n continue\n@@ -2508,6 +2581,9 @@ def build_fragments(f):\n 'downloader_options': {'http_chunk_size': CHUNK_SIZE}, # No longer useful?\n })\n \n+ if fetched_timestamp:\n+ dct['available_at'] = fetched_timestamp\n+\n formats.append(dct)\n \n def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n@@ -2525,6 +2601,10 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n if f.get('source_preference') is None:\n f['source_preference'] = -1\n \n+ # Deprioritize since its pre-merged m3u8 formats may have lower quality audio streams\n+ if client_name == 'web_safari' and proto == 'hls' and not is_live:\n+ f['source_preference'] -= 1\n+\n if itag in ('616', '235'):\n f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')\n f['source_preference'] += 100\n@@ -2541,15 +2621,15 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n \n hls_manifest_url = streaming_data.get('hlsManifestUrl')\n if hls_manifest_url:\n- for f in self._extract_m3u8_formats(\n+ formats.extend(\n+ f for f in self._extract_m3u8_formats(\n hls_manifest_url, video_id, 'mp4',\n- entry_protocol='m3u8_native', live=is_live, fatal=False):\n+ entry_protocol='m3u8_native', live=is_live, fatal=False)\n if process_manifest_format(\n- f, 'hls', None, self._search_regex(\n- r'/itag/(\\d+)', f['url'], 'itag', default=None)):\n- formats.append(f)\n+ f, 'hls', None, self._search_regex(\n+ r'/itag/(\\d+)', f['url'], 'itag', default=None)))\n \n- if self._downloader.params.get('youtube_include_dash_manifest', True):\n+ if self.get_param('youtube_include_dash_manifest', True):\n dash_manifest_url = streaming_data.get('dashManifestUrl')\n if dash_manifest_url:\n for f in self._extract_mpd_formats(\n@@ -2576,7 +2656,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n playability_status,\n lambda x: x['errorScreen']['playerErrorMessageRenderer'],\n dict) or {}\n- reason = get_text(pemr.get('reason')) or playability_status.get('reason')\n+ reason = get_text(pemr.get('reason')) or playability_status.get('reason') or ''\n subreason = pemr.get('subreason')\n if subreason:\n subreason = clean_html(get_text(subreason))\n@@ -2588,7 +2668,12 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n self.raise_geo_restricted(\n subreason, countries)\n reason += '\\n' + subreason\n+\n if reason:\n+ if 'sign in' in reason.lower():\n+ self.raise_login_required(remove_end(reason, 'This helps protect our community. Learn more'))\n+ elif traverse_obj(playability_status, ('errorScreen', 'playerCaptchaViewModel', T(dict))):\n+ reason += '. YouTube is requiring a captcha challenge before playback'\n raise ExtractorError(reason, expected=True)\n \n self._sort_formats(formats)\n@@ -2691,6 +2776,9 @@ def process_language(container, base_url, lang_code, query):\n for fmt in self._SUBTITLE_FORMATS:\n query.update({\n 'fmt': fmt,\n+ # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\n+ # See: https://github.com/yt-dlp/yt-dlp/issues/13654\n+ 'xosf': []\n })\n lang_subs.append({\n 'ext': fmt,\n@@ -2732,7 +2820,7 @@ def process_subtitles():\n for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:\n d_k += '_time'\n if d_k not in info and k in s_ks:\n- info[d_k] = parse_duration(query[k][0])\n+ info[d_k] = parse_duration(v[0])\n \n if video_description:\n # Youtube Music Auto-generated description\n@@ -2761,6 +2849,7 @@ def process_subtitles():\n initial_data = self._call_api(\n 'next', {'videoId': video_id}, video_id, fatal=False)\n \n+ initial_sdcr = None\n if initial_data:\n chapters = self._extract_chapters_from_json(\n initial_data, video_id, duration)\n@@ -2780,9 +2869,9 @@ def chapter_time(mmlir):\n for next_num, content in enumerate(contents, start=1):\n mmlir = content.get('macroMarkersListItemRenderer') or {}\n start_time = chapter_time(mmlir)\n- end_time = chapter_time(try_get(\n- contents, lambda x: x[next_num]['macroMarkersListItemRenderer'])) \\\n- if next_num < len(contents) else duration\n+ end_time = (traverse_obj(\n+ contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n+ if next_num < len(contents) else duration)\n if start_time is None or end_time is None:\n continue\n chapters.append({\n@@ -2888,12 +2977,13 @@ def chapter_time(mmlir):\n info['track'] = mrr_contents_text\n \n # this is not extraction but spelunking!\n- carousel_lockups = traverse_obj(\n- initial_data,\n- ('engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n- 'content', 'structuredDescriptionContentRenderer', 'items', Ellipsis,\n- 'videoDescriptionMusicSectionRenderer', 'carouselLockups', Ellipsis),\n- expected_type=dict) or []\n+ initial_sdcr = traverse_obj(initial_data, (\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n+ 'content', 'structuredDescriptionContentRenderer', T(dict)),\n+ get_all=False)\n+ carousel_lockups = traverse_obj(initial_sdcr, (\n+ 'items', Ellipsis, 'videoDescriptionMusicSectionRenderer',\n+ 'carouselLockups', Ellipsis, T(dict))) or []\n # try to reproduce logic from metadataRowContainerRenderer above (if it still is)\n fields = (('ALBUM', 'album'), ('ARTIST', 'artist'), ('SONG', 'track'), ('LICENSES', 'license'))\n # multiple_songs ?\n@@ -2918,6 +3008,23 @@ def chapter_time(mmlir):\n \n self.mark_watched(video_id, player_response)\n \n+ # Fallbacks for missing metadata\n+ if initial_sdcr:\n+ if info.get('description') is None:\n+ info['description'] = traverse_obj(initial_sdcr, (\n+ 'items', Ellipsis, 'expandableVideoDescriptionBodyRenderer',\n+ 'attributedDescriptionBodyText', 'content', T(compat_str)),\n+ get_all=False)\n+ # videoDescriptionHeaderRenderer also has publishDate/channel/handle/ucid, but not needed\n+ if info.get('title') is None:\n+ info['title'] = traverse_obj(\n+ (initial_sdcr, initial_data),\n+ (0, 'items', Ellipsis, 'videoDescriptionHeaderRenderer', T(dict)),\n+ (1, 'playerOverlays', 'playerOverlayRenderer', 'videoDetails',\n+ 'playerOverlayVideoDetailsRenderer', T(dict)),\n+ expected_type=lambda x: self._get_text(x, 'title'),\n+ get_all=False)\n+\n return merge_dicts(\n info, {\n 'uploader_id': self._extract_uploader_id(owner_profile_url),\n@@ -3428,38 +3535,46 @@ def _extract_lockup_view_model(self, view_model):\n if not content_id:\n return\n content_type = view_model.get('contentType')\n- if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n+ if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\n+ ie = YoutubeIE\n+ url = update_url_query(\n+ 'https://www.youtube.com/watch', {'v': content_id}),\n+ thumb_keys = (None,)\n+ elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n+ ie = YoutubeTabIE\n+ url = update_url_query(\n+ 'https://www.youtube.com/playlist', {'list': content_id}),\n+ thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\n+ else:\n self.report_warning(\n- 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()), only_once=True)\n+ 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()),\n+ only_once=True)\n return\n+ thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\n return merge_dicts(self.url_result(\n- update_url_query('https://www.youtube.com/playlist', {'list': content_id}),\n- ie=YoutubeTabIE.ie_key(), video_id=content_id), {\n+ url, ie=ie.ie_key(), video_id=content_id), {\n 'title': traverse_obj(view_model, (\n- 'metadata', 'lockupMetadataViewModel', 'title', 'content', T(compat_str))),\n- 'thumbnails': self._extract_thumbnails(view_model, (\n- 'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail',\n- 'thumbnailViewModel', 'image'), final_key='sources'),\n+ 'metadata', 'lockupMetadataViewModel', 'title',\n+ 'content', T(compat_str))),\n+ 'thumbnails': self._extract_thumbnails(\n+ view_model, thumb_keys, final_key='sources'),\n })\n \n def _extract_shorts_lockup_view_model(self, view_model):\n content_id = traverse_obj(view_model, (\n 'onTap', 'innertubeCommand', 'reelWatchEndpoint', 'videoId',\n T(lambda v: v if YoutubeIE.suitable(v) else None)))\n- if not content_id:\n- return\n return merge_dicts(self.url_result(\n content_id, ie=YoutubeIE.ie_key(), video_id=content_id), {\n 'title': traverse_obj(view_model, (\n 'overlayMetadata', 'primaryText', 'content', T(compat_str))),\n 'thumbnails': self._extract_thumbnails(\n view_model, 'thumbnail', final_key='sources'),\n- })\n+ }) if content_id else None\n \n def _video_entry(self, video_renderer):\n video_id = video_renderer.get('videoId')\n- if video_id:\n- return self._extract_video(video_renderer)\n+ return self._extract_video(video_renderer) if video_id else None\n \n def _post_thread_entries(self, post_thread_renderer):\n post_renderer = try_get(\n@@ -4119,6 +4234,7 @@ class YoutubeFeedsInfoExtractor(YoutubeTabIE):\n \n Subclasses must define the _FEED_NAME property.\n \"\"\"\n+\n _LOGIN_REQUIRED = True\n \n @property\n","summary":"Edited 1 file(s) in youtube_dl/extractor/"}],"string":"[\n {\n \"subtask_id\": \"s1\",\n \"scope_files\": [\n \".github/workflows/ci.yml\"\n ],\n \"solution_diff\": \"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\\nindex 8234e0ccb6d..c7a8fff8449 100644\\n--- a/.github/workflows/ci.yml\\n+++ b/.github/workflows/ci.yml\\n@@ -122,12 +122,12 @@ jobs:\\n ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}\\n run-tests-ext: [sh]\\n include:\\n- - os: windows-2019\\n+ - os: windows-2022\\n python-version: 3.4\\n python-impl: cpython\\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}\\n run-tests-ext: bat\\n- - os: windows-2019\\n+ - os: windows-2022\\n python-version: 3.4\\n python-impl: cpython\\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download' || 'nodownload' }}\\n\",\n \"summary\": \"Edited 1 file(s) in .github/workflows/\"\n },\n {\n \"subtask_id\": \"s2\",\n \"scope_files\": [\n \"youtube_dl/__init__.py\",\n \"youtube_dl/options.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py\\nindex 3c1272e7b05..202f2c9b9a7 100644\\n--- a/youtube_dl/__init__.py\\n+++ b/youtube_dl/__init__.py\\n@@ -409,6 +409,8 @@ def parse_retries(retries):\\n 'include_ads': opts.include_ads,\\n 'default_search': opts.default_search,\\n 'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,\\n+ 'youtube_player_js_version': opts.youtube_player_js_version,\\n+ 'youtube_player_js_variant': opts.youtube_player_js_variant,\\n 'encoding': opts.encoding,\\n 'extract_flat': opts.extract_flat,\\n 'mark_watched': opts.mark_watched,\\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\\nindex 61705d1f023..ce3633c418e 100644\\n--- a/youtube_dl/options.py\\n+++ b/youtube_dl/options.py\\n@@ -404,6 +404,10 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\\n '-F', '--list-formats',\\n action='store_true', dest='listformats',\\n help='List all available formats of requested videos')\\n+ video_format.add_option(\\n+ '--no-list-formats',\\n+ action='store_false', dest='listformats',\\n+ help='Do not list available formats of requested videos (default)')\\n video_format.add_option(\\n '--youtube-include-dash-manifest',\\n action='store_true', dest='youtube_include_dash_manifest', default=True,\\n@@ -412,6 +416,17 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\\n '--youtube-skip-dash-manifest',\\n action='store_false', dest='youtube_include_dash_manifest',\\n help='Do not download the DASH manifests and related data on YouTube videos')\\n+ video_format.add_option(\\n+ '--youtube-player-js-variant',\\n+ action='store', dest='youtube_player_js_variant',\\n+ help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\\n+ choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\\n+ default='main', metavar='VARIANT')\\n+ video_format.add_option(\\n+ '--youtube-player-js-version',\\n+ action='store', dest='youtube_player_js_version',\\n+ help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\\n+ default='20348@0004de42', metavar='STS@HASH')\\n video_format.add_option(\\n '--merge-output-format',\\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\\n\",\n \"summary\": \"Edited 2 file(s) in youtube_dl/\"\n },\n {\n \"subtask_id\": \"s3\",\n \"scope_files\": [\n \"youtube_dl/downloader/common.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py\\nindex 91e691776b1..8354030a9fa 100644\\n--- a/youtube_dl/downloader/common.py\\n+++ b/youtube_dl/downloader/common.py\\n@@ -11,6 +11,7 @@\\n decodeArgument,\\n encodeFilename,\\n error_to_compat_str,\\n+ float_or_none,\\n format_bytes,\\n shell_quote,\\n timeconvert,\\n@@ -367,14 +368,27 @@ def download(self, filename, info_dict):\\n })\\n return True\\n \\n- min_sleep_interval = self.params.get('sleep_interval')\\n- if min_sleep_interval:\\n- max_sleep_interval = self.params.get('max_sleep_interval', min_sleep_interval)\\n- sleep_interval = random.uniform(min_sleep_interval, max_sleep_interval)\\n+ min_sleep_interval, max_sleep_interval = (\\n+ float_or_none(self.params.get(interval), default=0)\\n+ for interval in ('sleep_interval', 'max_sleep_interval'))\\n+\\n+ sleep_note = ''\\n+ available_at = info_dict.get('available_at')\\n+ if available_at:\\n+ forced_sleep_interval = available_at - int(time.time())\\n+ if forced_sleep_interval > min_sleep_interval:\\n+ sleep_note = 'as required by the site'\\n+ min_sleep_interval = forced_sleep_interval\\n+ if forced_sleep_interval > max_sleep_interval:\\n+ max_sleep_interval = forced_sleep_interval\\n+\\n+ sleep_interval = random.uniform(\\n+ min_sleep_interval, max_sleep_interval or min_sleep_interval)\\n+\\n+ if sleep_interval > 0:\\n self.to_screen(\\n- '[download] Sleeping %s seconds...' % (\\n- int(sleep_interval) if sleep_interval.is_integer()\\n- else '%.2f' % sleep_interval))\\n+ '[download] Sleeping %.2f seconds %s...' % (\\n+ sleep_interval, sleep_note))\\n time.sleep(sleep_interval)\\n \\n return self.real_download(filename, info_dict)\\n\",\n \"summary\": \"Edited 1 file(s) in youtube_dl/downloader/\"\n },\n {\n \"subtask_id\": \"s4\",\n \"scope_files\": [\n \"youtube_dl/extractor/youtube.py\"\n ],\n \"solution_diff\": \"diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\\nindex b31798729e9..0b802351d22 100644\\n--- a/youtube_dl/extractor/youtube.py\\n+++ b/youtube_dl/extractor/youtube.py\\n@@ -1,5 +1,4 @@\\n # coding: utf-8\\n-\\n from __future__ import unicode_literals\\n \\n import collections\\n@@ -110,7 +109,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'MWEB',\\n- 'clientVersion': '2.20250311.03.00',\\n+ 'clientVersion': '2.2.20250925.01.00',\\n # mweb previously did not require PO Token with this UA\\n 'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',\\n },\\n@@ -124,23 +123,36 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\\n 'client': {\\n 'clientName': 'TVHTML5',\\n 'clientVersion': '7.20250312.16.00',\\n- 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\\n+ # See: https://github.com/youtube/cobalt/blob/main/cobalt/browser/user_agent/user_agent_platform_info.cc#L506\\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/25.lts.30.1034943-gold (unlike Gecko), Unknown_TV_Unknown_0/Unknown (Unknown, Unknown)',\\n },\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\\n 'SUPPORTS_COOKIES': True,\\n },\\n+\\n 'web': {\\n 'INNERTUBE_CONTEXT': {\\n 'client': {\\n 'clientName': 'WEB',\\n- 'clientVersion': '2.20250312.04.00',\\n+ 'clientVersion': '2.20250925.01.00',\\n+ 'userAgent': 'Mozilla/5.0',\\n },\\n },\\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\\n 'REQUIRE_PO_TOKEN': True,\\n 'SUPPORTS_COOKIES': True,\\n },\\n+ # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\\n+ 'web_safari': {\\n+ 'INNERTUBE_CONTEXT': {\\n+ 'client': {\\n+ 'clientName': 'WEB',\\n+ 'clientVersion': '2.20250925.01.00',\\n+ 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\\n+ },\\n+ },\\n+ },\\n }\\n \\n def _login(self):\\n@@ -419,10 +431,15 @@ def _extract_visitor_data(self, *args):\\n T(compat_str)))\\n \\n def _extract_ytcfg(self, video_id, webpage):\\n- return self._parse_json(\\n- self._search_regex(\\n- r'ytcfg\\\\.set\\\\s*\\\\(\\\\s*({.+?})\\\\s*\\\\)\\\\s*;', webpage, 'ytcfg',\\n- default='{}'), video_id, fatal=False) or {}\\n+ ytcfg = self._search_json(\\n+ r'ytcfg\\\\.set\\\\s*\\\\(', webpage, 'ytcfg', video_id,\\n+ end_pattern=r'\\\\)\\\\s*;', default={})\\n+\\n+ traverse_obj(ytcfg, (\\n+ 'INNERTUBE_CONTEXT', 'client', 'configInfo',\\n+ T(lambda x: x.pop('appInstallData', None))))\\n+\\n+ return ytcfg\\n \\n def _extract_video(self, renderer):\\n video_id = renderer['videoId']\\n@@ -694,7 +711,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\\n r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias(?:_tce)?\\\\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\\\\.vflset)/base\\\\.js$',\\n r'\\\\b(?P<id>vfl[a-zA-Z0-9_-]{6,})\\\\b.*?\\\\.js$',\\n )\\n- _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')\\n+ _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'srt', 'vtt')\\n \\n _GEO_BYPASS = False\\n \\n@@ -1587,7 +1604,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\\n \\n _PLAYER_JS_VARIANT_MAP = (\\n ('main', 'player_ias.vflset/en_US/base.js'),\\n+ ('tcc', 'player_ias_tcc.vflset/en_US/base.js'),\\n ('tce', 'player_ias_tce.vflset/en_US/base.js'),\\n+ ('es5', 'player_es5.vflset/en_US/base.js'),\\n+ ('es6', 'player_es6.vflset/en_US/base.js'),\\n ('tv', 'tv-player-ias.vflset/tv-player-ias.js'),\\n ('tv_es6', 'tv-player-es6.vflset/tv-player-es6.js'),\\n ('phone', 'player-plasma-ias-phone-en_US.vflset/base.js'),\\n@@ -1605,6 +1625,19 @@ def __init__(self, *args, **kwargs):\\n self._code_cache = {}\\n self._player_cache = {}\\n \\n+ def _get_player_js_version(self):\\n+ player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\\n+ sts_hash = self._search_regex(\\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\\n+ if sts_hash:\\n+ return sts_hash\\n+ self.report_warning(\\n+ 'Invalid player JS version \\\"{0}\\\" specified. '\\n+ 'It should be \\\"{1}\\\" or in the format of {2}'.format(\\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\\n+ return None, None\\n+\\n # *ytcfgs, webpage=None\\n def _extract_player_url(self, *ytcfgs, **kw_webpage):\\n if ytcfgs and not isinstance(ytcfgs[0], dict):\\n@@ -1615,19 +1648,43 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\\n webpage or '', 'player URL', fatal=False)\\n if player_url:\\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\\n- return traverse_obj(\\n+ player_url = traverse_obj(\\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\\n get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\\n \\n+ player_id_override = self._get_player_js_version()[1]\\n+\\n+ requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\\n+ variant_js = next(\\n+ (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\\n+ None)\\n+ if variant_js:\\n+ player_id = player_id_override or self._extract_player_info(player_url)\\n+ original_url = player_url\\n+ player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\\n+ if original_url != player_url:\\n+ self.write_debug(\\n+ 'Forcing \\\"{0}\\\" player JS variant for player {1}\\\\n'\\n+ ' original url = {2}'.format(\\n+ requested_js_variant, player_id, original_url),\\n+ only_once=True)\\n+ elif requested_js_variant != 'actual':\\n+ self.report_warning(\\n+ 'Invalid player JS variant name \\\"{0}\\\" requested. '\\n+ 'Valid choices are: {1}'.format(\\n+ requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\\n+ only_once=True)\\n+\\n+ return urljoin('https://www.youtube.com', player_url)\\n+\\n def _download_player_url(self, video_id, fatal=False):\\n res = self._download_webpage(\\n 'https://www.youtube.com/iframe_api',\\n note='Downloading iframe API JS', video_id=video_id, fatal=fatal)\\n player_version = self._search_regex(\\n r'player\\\\\\\\?/([0-9a-fA-F]{8})\\\\\\\\?/', res or '', 'player version', fatal=fatal,\\n- default=NO_DEFAULT if res else None)\\n- if player_version:\\n- return 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\\n+ default=NO_DEFAULT if res else None) or None\\n+ return player_version and 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\\n \\n def _signature_cache_id(self, example_sig):\\n \\\"\\\"\\\" Return a string representation of a signature \\\"\\\"\\\"\\n@@ -2014,9 +2071,15 @@ def decrypt_nsig(n):\\n def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):\\n \\\"\\\"\\\"\\n Extract signatureTimestamp (sts)\\n+\\n Required to tell API what sig/player version is in use.\\n \\\"\\\"\\\"\\n- sts = traverse_obj(ytcfg, 'STS', expected_type=int)\\n+ sts = traverse_obj(\\n+ (self._get_player_js_version(), ytcfg),\\n+ (0, 0),\\n+ (1, 'STS'),\\n+ expected_type=int_or_none)\\n+\\n if sts:\\n return sts\\n \\n@@ -2163,8 +2226,12 @@ def _real_extract(self, url):\\n video_id = self._match_id(url)\\n base_url = self.http_scheme() + '//www.youtube.com/'\\n webpage_url = base_url + 'watch?v=' + video_id\\n+ ua = traverse_obj(self._INNERTUBE_CLIENTS, (\\n+ 'web', 'INNERTUBE_CONTEXT', 'client', 'userAgent'))\\n+ headers = {'User-Agent': ua} if ua else None\\n webpage = self._download_webpage(\\n- webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False)\\n+ webpage_url + '&bpctr=9999999999&has_verified=1', video_id,\\n+ headers=headers, fatal=False)\\n \\n player_response = None\\n player_url = None\\n@@ -2174,12 +2241,14 @@ def _real_extract(self, url):\\n video_id, 'initial player response')\\n is_live = traverse_obj(player_response, ('videoDetails', 'isLive'))\\n \\n+ fetched_timestamp = None\\n if False and not player_response:\\n player_response = self._call_api(\\n 'player', {'videoId': video_id}, video_id)\\n if True or not player_response:\\n origin = 'https://www.youtube.com'\\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\\n+ fetched_timestamp = int(time.time())\\n \\n player_url = self._extract_player_url(webpage)\\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\\n@@ -2246,6 +2315,7 @@ def _real_extract(self, url):\\n hls = traverse_obj(\\n (player_response, api_player_response),\\n (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\\n+ fetched_timestamp = int(time.time())\\n if len(hls) == 2 and not hls[0] and hls[1]:\\n player_response['streamingData']['hlsManifestUrl'] = hls[1]\\n else:\\n@@ -2257,13 +2327,14 @@ def _real_extract(self, url):\\n player_response['videoDetails'] = video_details\\n \\n def is_agegated(playability):\\n- if not isinstance(playability, dict):\\n- return\\n+ # playability: dict\\n+ if not playability:\\n+ return False\\n \\n if playability.get('desktopLegacyAgeGateReason'):\\n return True\\n \\n- reasons = filter(None, (playability.get(r) for r in ('status', 'reason')))\\n+ reasons = traverse_obj(playability, (('status', 'reason'),))\\n AGE_GATE_REASONS = (\\n 'confirm your age', 'age-restricted', 'inappropriate', # reason\\n 'age_verification_required', 'age_check_required', # status\\n@@ -2321,15 +2392,9 @@ def get_playability_status(response):\\n trailer_video_id, self.ie_key(), trailer_video_id)\\n \\n def get_text(x):\\n- if not x:\\n- return\\n- text = x.get('simpleText')\\n- if text and isinstance(text, compat_str):\\n- return text\\n- runs = x.get('runs')\\n- if not isinstance(runs, list):\\n- return\\n- return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])\\n+ return ''.join(traverse_obj(\\n+ x, (('simpleText',),), ('runs', Ellipsis, 'text'),\\n+ expected_type=compat_str))\\n \\n search_meta = (\\n (lambda x: self._html_search_meta(x, webpage, default=None))\\n@@ -2412,6 +2477,14 @@ def build_fragments(f):\\n \\n lower = lambda s: s.lower()\\n \\n+ if is_live:\\n+ fetched_timestamp = None\\n+ elif fetched_timestamp is not None:\\n+ # Handle preroll waiting period\\n+ preroll_sleep = self.get_param('youtube_preroll_sleep')\\n+ preroll_sleep = int_or_none(preroll_sleep, default=6)\\n+ fetched_timestamp += preroll_sleep\\n+\\n for fmt in streaming_formats:\\n if fmt.get('targetDurationSec'):\\n continue\\n@@ -2508,6 +2581,9 @@ def build_fragments(f):\\n 'downloader_options': {'http_chunk_size': CHUNK_SIZE}, # No longer useful?\\n })\\n \\n+ if fetched_timestamp:\\n+ dct['available_at'] = fetched_timestamp\\n+\\n formats.append(dct)\\n \\n def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n@@ -2525,6 +2601,10 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n if f.get('source_preference') is None:\\n f['source_preference'] = -1\\n \\n+ # Deprioritize since its pre-merged m3u8 formats may have lower quality audio streams\\n+ if client_name == 'web_safari' and proto == 'hls' and not is_live:\\n+ f['source_preference'] -= 1\\n+\\n if itag in ('616', '235'):\\n f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')\\n f['source_preference'] += 100\\n@@ -2541,15 +2621,15 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n \\n hls_manifest_url = streaming_data.get('hlsManifestUrl')\\n if hls_manifest_url:\\n- for f in self._extract_m3u8_formats(\\n+ formats.extend(\\n+ f for f in self._extract_m3u8_formats(\\n hls_manifest_url, video_id, 'mp4',\\n- entry_protocol='m3u8_native', live=is_live, fatal=False):\\n+ entry_protocol='m3u8_native', live=is_live, fatal=False)\\n if process_manifest_format(\\n- f, 'hls', None, self._search_regex(\\n- r'/itag/(\\\\d+)', f['url'], 'itag', default=None)):\\n- formats.append(f)\\n+ f, 'hls', None, self._search_regex(\\n+ r'/itag/(\\\\d+)', f['url'], 'itag', default=None)))\\n \\n- if self._downloader.params.get('youtube_include_dash_manifest', True):\\n+ if self.get_param('youtube_include_dash_manifest', True):\\n dash_manifest_url = streaming_data.get('dashManifestUrl')\\n if dash_manifest_url:\\n for f in self._extract_mpd_formats(\\n@@ -2576,7 +2656,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n playability_status,\\n lambda x: x['errorScreen']['playerErrorMessageRenderer'],\\n dict) or {}\\n- reason = get_text(pemr.get('reason')) or playability_status.get('reason')\\n+ reason = get_text(pemr.get('reason')) or playability_status.get('reason') or ''\\n subreason = pemr.get('subreason')\\n if subreason:\\n subreason = clean_html(get_text(subreason))\\n@@ -2588,7 +2668,12 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\\n self.raise_geo_restricted(\\n subreason, countries)\\n reason += '\\\\n' + subreason\\n+\\n if reason:\\n+ if 'sign in' in reason.lower():\\n+ self.raise_login_required(remove_end(reason, 'This helps protect our community. Learn more'))\\n+ elif traverse_obj(playability_status, ('errorScreen', 'playerCaptchaViewModel', T(dict))):\\n+ reason += '. YouTube is requiring a captcha challenge before playback'\\n raise ExtractorError(reason, expected=True)\\n \\n self._sort_formats(formats)\\n@@ -2691,6 +2776,9 @@ def process_language(container, base_url, lang_code, query):\\n for fmt in self._SUBTITLE_FORMATS:\\n query.update({\\n 'fmt': fmt,\\n+ # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\\n+ # See: https://github.com/yt-dlp/yt-dlp/issues/13654\\n+ 'xosf': []\\n })\\n lang_subs.append({\\n 'ext': fmt,\\n@@ -2732,7 +2820,7 @@ def process_subtitles():\\n for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:\\n d_k += '_time'\\n if d_k not in info and k in s_ks:\\n- info[d_k] = parse_duration(query[k][0])\\n+ info[d_k] = parse_duration(v[0])\\n \\n if video_description:\\n # Youtube Music Auto-generated description\\n@@ -2761,6 +2849,7 @@ def process_subtitles():\\n initial_data = self._call_api(\\n 'next', {'videoId': video_id}, video_id, fatal=False)\\n \\n+ initial_sdcr = None\\n if initial_data:\\n chapters = self._extract_chapters_from_json(\\n initial_data, video_id, duration)\\n@@ -2780,9 +2869,9 @@ def chapter_time(mmlir):\\n for next_num, content in enumerate(contents, start=1):\\n mmlir = content.get('macroMarkersListItemRenderer') or {}\\n start_time = chapter_time(mmlir)\\n- end_time = chapter_time(try_get(\\n- contents, lambda x: x[next_num]['macroMarkersListItemRenderer'])) \\\\\\n- if next_num < len(contents) else duration\\n+ end_time = (traverse_obj(\\n+ contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\\n+ if next_num < len(contents) else duration)\\n if start_time is None or end_time is None:\\n continue\\n chapters.append({\\n@@ -2888,12 +2977,13 @@ def chapter_time(mmlir):\\n info['track'] = mrr_contents_text\\n \\n # this is not extraction but spelunking!\\n- carousel_lockups = traverse_obj(\\n- initial_data,\\n- ('engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\\n- 'content', 'structuredDescriptionContentRenderer', 'items', Ellipsis,\\n- 'videoDescriptionMusicSectionRenderer', 'carouselLockups', Ellipsis),\\n- expected_type=dict) or []\\n+ initial_sdcr = traverse_obj(initial_data, (\\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\\n+ 'content', 'structuredDescriptionContentRenderer', T(dict)),\\n+ get_all=False)\\n+ carousel_lockups = traverse_obj(initial_sdcr, (\\n+ 'items', Ellipsis, 'videoDescriptionMusicSectionRenderer',\\n+ 'carouselLockups', Ellipsis, T(dict))) or []\\n # try to reproduce logic from metadataRowContainerRenderer above (if it still is)\\n fields = (('ALBUM', 'album'), ('ARTIST', 'artist'), ('SONG', 'track'), ('LICENSES', 'license'))\\n # multiple_songs ?\\n@@ -2918,6 +3008,23 @@ def chapter_time(mmlir):\\n \\n self.mark_watched(video_id, player_response)\\n \\n+ # Fallbacks for missing metadata\\n+ if initial_sdcr:\\n+ if info.get('description') is None:\\n+ info['description'] = traverse_obj(initial_sdcr, (\\n+ 'items', Ellipsis, 'expandableVideoDescriptionBodyRenderer',\\n+ 'attributedDescriptionBodyText', 'content', T(compat_str)),\\n+ get_all=False)\\n+ # videoDescriptionHeaderRenderer also has publishDate/channel/handle/ucid, but not needed\\n+ if info.get('title') is None:\\n+ info['title'] = traverse_obj(\\n+ (initial_sdcr, initial_data),\\n+ (0, 'items', Ellipsis, 'videoDescriptionHeaderRenderer', T(dict)),\\n+ (1, 'playerOverlays', 'playerOverlayRenderer', 'videoDetails',\\n+ 'playerOverlayVideoDetailsRenderer', T(dict)),\\n+ expected_type=lambda x: self._get_text(x, 'title'),\\n+ get_all=False)\\n+\\n return merge_dicts(\\n info, {\\n 'uploader_id': self._extract_uploader_id(owner_profile_url),\\n@@ -3428,38 +3535,46 @@ def _extract_lockup_view_model(self, view_model):\\n if not content_id:\\n return\\n content_type = view_model.get('contentType')\\n- if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\\n+ if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\\n+ ie = YoutubeIE\\n+ url = update_url_query(\\n+ 'https://www.youtube.com/watch', {'v': content_id}),\\n+ thumb_keys = (None,)\\n+ elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\\n+ ie = YoutubeTabIE\\n+ url = update_url_query(\\n+ 'https://www.youtube.com/playlist', {'list': content_id}),\\n+ thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\\n+ else:\\n self.report_warning(\\n- 'Unsupported lockup view model content type \\\"{0}\\\"{1}'.format(content_type, bug_reports_message()), only_once=True)\\n+ 'Unsupported lockup view model content type \\\"{0}\\\"{1}'.format(content_type, bug_reports_message()),\\n+ only_once=True)\\n return\\n+ thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\\n return merge_dicts(self.url_result(\\n- update_url_query('https://www.youtube.com/playlist', {'list': content_id}),\\n- ie=YoutubeTabIE.ie_key(), video_id=content_id), {\\n+ url, ie=ie.ie_key(), video_id=content_id), {\\n 'title': traverse_obj(view_model, (\\n- 'metadata', 'lockupMetadataViewModel', 'title', 'content', T(compat_str))),\\n- 'thumbnails': self._extract_thumbnails(view_model, (\\n- 'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail',\\n- 'thumbnailViewModel', 'image'), final_key='sources'),\\n+ 'metadata', 'lockupMetadataViewModel', 'title',\\n+ 'content', T(compat_str))),\\n+ 'thumbnails': self._extract_thumbnails(\\n+ view_model, thumb_keys, final_key='sources'),\\n })\\n \\n def _extract_shorts_lockup_view_model(self, view_model):\\n content_id = traverse_obj(view_model, (\\n 'onTap', 'innertubeCommand', 'reelWatchEndpoint', 'videoId',\\n T(lambda v: v if YoutubeIE.suitable(v) else None)))\\n- if not content_id:\\n- return\\n return merge_dicts(self.url_result(\\n content_id, ie=YoutubeIE.ie_key(), video_id=content_id), {\\n 'title': traverse_obj(view_model, (\\n 'overlayMetadata', 'primaryText', 'content', T(compat_str))),\\n 'thumbnails': self._extract_thumbnails(\\n view_model, 'thumbnail', final_key='sources'),\\n- })\\n+ }) if content_id else None\\n \\n def _video_entry(self, video_renderer):\\n video_id = video_renderer.get('videoId')\\n- if video_id:\\n- return self._extract_video(video_renderer)\\n+ return self._extract_video(video_renderer) if video_id else None\\n \\n def _post_thread_entries(self, post_thread_renderer):\\n post_renderer = try_get(\\n@@ -4119,6 +4234,7 @@ class YoutubeFeedsInfoExtractor(YoutubeTabIE):\\n \\n Subclasses must define the _FEED_NAME property.\\n \\\"\\\"\\\"\\n+\\n _LOGIN_REQUIRED = True\\n \\n @property\\n\",\n \"summary\": \"Edited 1 file(s) in youtube_dl/extractor/\"\n }\n]","isConversational":false},"revisions":{"kind":"list like","value":[],"string":"[]","isConversational":false},"final_diff":{"kind":"string","value":"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex 8234e0ccb6d..c7a8fff8449 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -122,12 +122,12 @@ jobs:\n ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}\n run-tests-ext: [sh]\n include:\n- - os: windows-2019\n+ - os: windows-2022\n python-version: 3.4\n python-impl: cpython\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}\n run-tests-ext: bat\n- - os: windows-2019\n+ - os: windows-2022\n python-version: 3.4\n python-impl: cpython\n ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download' || 'nodownload' }}\ndiff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py\nindex 3c1272e7b05..202f2c9b9a7 100644\n--- a/youtube_dl/__init__.py\n+++ b/youtube_dl/__init__.py\n@@ -409,6 +409,8 @@ def parse_retries(retries):\n 'include_ads': opts.include_ads,\n 'default_search': opts.default_search,\n 'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,\n+ 'youtube_player_js_version': opts.youtube_player_js_version,\n+ 'youtube_player_js_variant': opts.youtube_player_js_variant,\n 'encoding': opts.encoding,\n 'extract_flat': opts.extract_flat,\n 'mark_watched': opts.mark_watched,\ndiff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py\nindex 91e691776b1..8354030a9fa 100644\n--- a/youtube_dl/downloader/common.py\n+++ b/youtube_dl/downloader/common.py\n@@ -11,6 +11,7 @@\n decodeArgument,\n encodeFilename,\n error_to_compat_str,\n+ float_or_none,\n format_bytes,\n shell_quote,\n timeconvert,\n@@ -367,14 +368,27 @@ def download(self, filename, info_dict):\n })\n return True\n \n- min_sleep_interval = self.params.get('sleep_interval')\n- if min_sleep_interval:\n- max_sleep_interval = self.params.get('max_sleep_interval', min_sleep_interval)\n- sleep_interval = random.uniform(min_sleep_interval, max_sleep_interval)\n+ min_sleep_interval, max_sleep_interval = (\n+ float_or_none(self.params.get(interval), default=0)\n+ for interval in ('sleep_interval', 'max_sleep_interval'))\n+\n+ sleep_note = ''\n+ available_at = info_dict.get('available_at')\n+ if available_at:\n+ forced_sleep_interval = available_at - int(time.time())\n+ if forced_sleep_interval > min_sleep_interval:\n+ sleep_note = 'as required by the site'\n+ min_sleep_interval = forced_sleep_interval\n+ if forced_sleep_interval > max_sleep_interval:\n+ max_sleep_interval = forced_sleep_interval\n+\n+ sleep_interval = random.uniform(\n+ min_sleep_interval, max_sleep_interval or min_sleep_interval)\n+\n+ if sleep_interval > 0:\n self.to_screen(\n- '[download] Sleeping %s seconds...' % (\n- int(sleep_interval) if sleep_interval.is_integer()\n- else '%.2f' % sleep_interval))\n+ '[download] Sleeping %.2f seconds %s...' % (\n+ sleep_interval, sleep_note))\n time.sleep(sleep_interval)\n \n return self.real_download(filename, info_dict)\ndiff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py\nindex b31798729e9..0b802351d22 100644\n--- a/youtube_dl/extractor/youtube.py\n+++ b/youtube_dl/extractor/youtube.py\n@@ -1,5 +1,4 @@\n # coding: utf-8\n-\n from __future__ import unicode_literals\n \n import collections\n@@ -110,7 +109,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'MWEB',\n- 'clientVersion': '2.20250311.03.00',\n+ 'clientVersion': '2.2.20250925.01.00',\n # mweb previously did not require PO Token with this UA\n 'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',\n },\n@@ -124,23 +123,36 @@ class YoutubeBaseInfoExtractor(InfoExtractor):\n 'client': {\n 'clientName': 'TVHTML5',\n 'clientVersion': '7.20250312.16.00',\n- 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',\n+ # See: https://github.com/youtube/cobalt/blob/main/cobalt/browser/user_agent/user_agent_platform_info.cc#L506\n+ 'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/25.lts.30.1034943-gold (unlike Gecko), Unknown_TV_Unknown_0/Unknown (Unknown, Unknown)',\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 7,\n 'SUPPORTS_COOKIES': True,\n },\n+\n 'web': {\n 'INNERTUBE_CONTEXT': {\n 'client': {\n 'clientName': 'WEB',\n- 'clientVersion': '2.20250312.04.00',\n+ 'clientVersion': '2.20250925.01.00',\n+ 'userAgent': 'Mozilla/5.0',\n },\n },\n 'INNERTUBE_CONTEXT_CLIENT_NAME': 1,\n 'REQUIRE_PO_TOKEN': True,\n 'SUPPORTS_COOKIES': True,\n },\n+ # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats\n+ 'web_safari': {\n+ 'INNERTUBE_CONTEXT': {\n+ 'client': {\n+ 'clientName': 'WEB',\n+ 'clientVersion': '2.20250925.01.00',\n+ 'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',\n+ },\n+ },\n+ },\n }\n \n def _login(self):\n@@ -419,10 +431,15 @@ def _extract_visitor_data(self, *args):\n T(compat_str)))\n \n def _extract_ytcfg(self, video_id, webpage):\n- return self._parse_json(\n- self._search_regex(\n- r'ytcfg\\.set\\s*\\(\\s*({.+?})\\s*\\)\\s*;', webpage, 'ytcfg',\n- default='{}'), video_id, fatal=False) or {}\n+ ytcfg = self._search_json(\n+ r'ytcfg\\.set\\s*\\(', webpage, 'ytcfg', video_id,\n+ end_pattern=r'\\)\\s*;', default={})\n+\n+ traverse_obj(ytcfg, (\n+ 'INNERTUBE_CONTEXT', 'client', 'configInfo',\n+ T(lambda x: x.pop('appInstallData', None))))\n+\n+ return ytcfg\n \n def _extract_video(self, renderer):\n video_id = renderer['videoId']\n@@ -694,7 +711,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias(?:_tce)?\\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\\.vflset)/base\\.js$',\n r'\\b(?P<id>vfl[a-zA-Z0-9_-]{6,})\\b.*?\\.js$',\n )\n- _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')\n+ _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'srt', 'vtt')\n \n _GEO_BYPASS = False\n \n@@ -1587,7 +1604,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):\n \n _PLAYER_JS_VARIANT_MAP = (\n ('main', 'player_ias.vflset/en_US/base.js'),\n+ ('tcc', 'player_ias_tcc.vflset/en_US/base.js'),\n ('tce', 'player_ias_tce.vflset/en_US/base.js'),\n+ ('es5', 'player_es5.vflset/en_US/base.js'),\n+ ('es6', 'player_es6.vflset/en_US/base.js'),\n ('tv', 'tv-player-ias.vflset/tv-player-ias.js'),\n ('tv_es6', 'tv-player-es6.vflset/tv-player-es6.js'),\n ('phone', 'player-plasma-ias-phone-en_US.vflset/base.js'),\n@@ -1605,6 +1625,19 @@ def __init__(self, *args, **kwargs):\n self._code_cache = {}\n self._player_cache = {}\n \n+ def _get_player_js_version(self):\n+ player_js_version = self.get_param('youtube_player_js_version') or '20348@0004de42'\n+ sts_hash = self._search_regex(\n+ ('^actual$(^)?(^)?', r'^([0-9]{5,})@([0-9a-f]{8,})$'),\n+ player_js_version, 'player_js_version', group=(1, 2), default=None)\n+ if sts_hash:\n+ return sts_hash\n+ self.report_warning(\n+ 'Invalid player JS version \"{0}\" specified. '\n+ 'It should be \"{1}\" or in the format of {2}'.format(\n+ player_js_version, 'actual', 'SignatureTimeStamp@Hash'), only_once=True)\n+ return None, None\n+\n # *ytcfgs, webpage=None\n def _extract_player_url(self, *ytcfgs, **kw_webpage):\n if ytcfgs and not isinstance(ytcfgs[0], dict):\n@@ -1615,19 +1648,43 @@ def _extract_player_url(self, *ytcfgs, **kw_webpage):\n webpage or '', 'player URL', fatal=False)\n if player_url:\n ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)\n- return traverse_obj(\n+ player_url = traverse_obj(\n ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),\n get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))\n \n+ player_id_override = self._get_player_js_version()[1]\n+\n+ requested_js_variant = self.get_param('youtube_player_js_variant') or 'main'\n+ variant_js = next(\n+ (v for k, v in self._PLAYER_JS_VARIANT_MAP if k == requested_js_variant),\n+ None)\n+ if variant_js:\n+ player_id = player_id_override or self._extract_player_info(player_url)\n+ original_url = player_url\n+ player_url = '/s/player/{0}/{1}'.format(player_id, variant_js)\n+ if original_url != player_url:\n+ self.write_debug(\n+ 'Forcing \"{0}\" player JS variant for player {1}\\n'\n+ ' original url = {2}'.format(\n+ requested_js_variant, player_id, original_url),\n+ only_once=True)\n+ elif requested_js_variant != 'actual':\n+ self.report_warning(\n+ 'Invalid player JS variant name \"{0}\" requested. '\n+ 'Valid choices are: {1}'.format(\n+ requested_js_variant, ','.join(k for k, _ in self._PLAYER_JS_VARIANT_MAP)),\n+ only_once=True)\n+\n+ return urljoin('https://www.youtube.com', player_url)\n+\n def _download_player_url(self, video_id, fatal=False):\n res = self._download_webpage(\n 'https://www.youtube.com/iframe_api',\n note='Downloading iframe API JS', video_id=video_id, fatal=fatal)\n player_version = self._search_regex(\n r'player\\\\?/([0-9a-fA-F]{8})\\\\?/', res or '', 'player version', fatal=fatal,\n- default=NO_DEFAULT if res else None)\n- if player_version:\n- return 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\n+ default=NO_DEFAULT if res else None) or None\n+ return player_version and 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)\n \n def _signature_cache_id(self, example_sig):\n \"\"\" Return a string representation of a signature \"\"\"\n@@ -2014,9 +2071,15 @@ def decrypt_nsig(n):\n def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):\n \"\"\"\n Extract signatureTimestamp (sts)\n+\n Required to tell API what sig/player version is in use.\n \"\"\"\n- sts = traverse_obj(ytcfg, 'STS', expected_type=int)\n+ sts = traverse_obj(\n+ (self._get_player_js_version(), ytcfg),\n+ (0, 0),\n+ (1, 'STS'),\n+ expected_type=int_or_none)\n+\n if sts:\n return sts\n \n@@ -2163,8 +2226,12 @@ def _real_extract(self, url):\n video_id = self._match_id(url)\n base_url = self.http_scheme() + '//www.youtube.com/'\n webpage_url = base_url + 'watch?v=' + video_id\n+ ua = traverse_obj(self._INNERTUBE_CLIENTS, (\n+ 'web', 'INNERTUBE_CONTEXT', 'client', 'userAgent'))\n+ headers = {'User-Agent': ua} if ua else None\n webpage = self._download_webpage(\n- webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False)\n+ webpage_url + '&bpctr=9999999999&has_verified=1', video_id,\n+ headers=headers, fatal=False)\n \n player_response = None\n player_url = None\n@@ -2174,12 +2241,14 @@ def _real_extract(self, url):\n video_id, 'initial player response')\n is_live = traverse_obj(player_response, ('videoDetails', 'isLive'))\n \n+ fetched_timestamp = None\n if False and not player_response:\n player_response = self._call_api(\n 'player', {'videoId': video_id}, video_id)\n if True or not player_response:\n origin = 'https://www.youtube.com'\n pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}\n+ fetched_timestamp = int(time.time())\n \n player_url = self._extract_player_url(webpage)\n ytcfg = self._extract_ytcfg(video_id, webpage or '')\n@@ -2246,6 +2315,7 @@ def _real_extract(self, url):\n hls = traverse_obj(\n (player_response, api_player_response),\n (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))\n+ fetched_timestamp = int(time.time())\n if len(hls) == 2 and not hls[0] and hls[1]:\n player_response['streamingData']['hlsManifestUrl'] = hls[1]\n else:\n@@ -2257,13 +2327,14 @@ def _real_extract(self, url):\n player_response['videoDetails'] = video_details\n \n def is_agegated(playability):\n- if not isinstance(playability, dict):\n- return\n+ # playability: dict\n+ if not playability:\n+ return False\n \n if playability.get('desktopLegacyAgeGateReason'):\n return True\n \n- reasons = filter(None, (playability.get(r) for r in ('status', 'reason')))\n+ reasons = traverse_obj(playability, (('status', 'reason'),))\n AGE_GATE_REASONS = (\n 'confirm your age', 'age-restricted', 'inappropriate', # reason\n 'age_verification_required', 'age_check_required', # status\n@@ -2321,15 +2392,9 @@ def get_playability_status(response):\n trailer_video_id, self.ie_key(), trailer_video_id)\n \n def get_text(x):\n- if not x:\n- return\n- text = x.get('simpleText')\n- if text and isinstance(text, compat_str):\n- return text\n- runs = x.get('runs')\n- if not isinstance(runs, list):\n- return\n- return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])\n+ return ''.join(traverse_obj(\n+ x, (('simpleText',),), ('runs', Ellipsis, 'text'),\n+ expected_type=compat_str))\n \n search_meta = (\n (lambda x: self._html_search_meta(x, webpage, default=None))\n@@ -2412,6 +2477,14 @@ def build_fragments(f):\n \n lower = lambda s: s.lower()\n \n+ if is_live:\n+ fetched_timestamp = None\n+ elif fetched_timestamp is not None:\n+ # Handle preroll waiting period\n+ preroll_sleep = self.get_param('youtube_preroll_sleep')\n+ preroll_sleep = int_or_none(preroll_sleep, default=6)\n+ fetched_timestamp += preroll_sleep\n+\n for fmt in streaming_formats:\n if fmt.get('targetDurationSec'):\n continue\n@@ -2508,6 +2581,9 @@ def build_fragments(f):\n 'downloader_options': {'http_chunk_size': CHUNK_SIZE}, # No longer useful?\n })\n \n+ if fetched_timestamp:\n+ dct['available_at'] = fetched_timestamp\n+\n formats.append(dct)\n \n def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n@@ -2525,6 +2601,10 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n if f.get('source_preference') is None:\n f['source_preference'] = -1\n \n+ # Deprioritize since its pre-merged m3u8 formats may have lower quality audio streams\n+ if client_name == 'web_safari' and proto == 'hls' and not is_live:\n+ f['source_preference'] -= 1\n+\n if itag in ('616', '235'):\n f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')\n f['source_preference'] += 100\n@@ -2541,15 +2621,15 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n \n hls_manifest_url = streaming_data.get('hlsManifestUrl')\n if hls_manifest_url:\n- for f in self._extract_m3u8_formats(\n+ formats.extend(\n+ f for f in self._extract_m3u8_formats(\n hls_manifest_url, video_id, 'mp4',\n- entry_protocol='m3u8_native', live=is_live, fatal=False):\n+ entry_protocol='m3u8_native', live=is_live, fatal=False)\n if process_manifest_format(\n- f, 'hls', None, self._search_regex(\n- r'/itag/(\\d+)', f['url'], 'itag', default=None)):\n- formats.append(f)\n+ f, 'hls', None, self._search_regex(\n+ r'/itag/(\\d+)', f['url'], 'itag', default=None)))\n \n- if self._downloader.params.get('youtube_include_dash_manifest', True):\n+ if self.get_param('youtube_include_dash_manifest', True):\n dash_manifest_url = streaming_data.get('dashManifestUrl')\n if dash_manifest_url:\n for f in self._extract_mpd_formats(\n@@ -2576,7 +2656,7 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n playability_status,\n lambda x: x['errorScreen']['playerErrorMessageRenderer'],\n dict) or {}\n- reason = get_text(pemr.get('reason')) or playability_status.get('reason')\n+ reason = get_text(pemr.get('reason')) or playability_status.get('reason') or ''\n subreason = pemr.get('subreason')\n if subreason:\n subreason = clean_html(get_text(subreason))\n@@ -2588,7 +2668,12 @@ def process_manifest_format(f, proto, client_name, itag, all_formats=False):\n self.raise_geo_restricted(\n subreason, countries)\n reason += '\\n' + subreason\n+\n if reason:\n+ if 'sign in' in reason.lower():\n+ self.raise_login_required(remove_end(reason, 'This helps protect our community. Learn more'))\n+ elif traverse_obj(playability_status, ('errorScreen', 'playerCaptchaViewModel', T(dict))):\n+ reason += '. YouTube is requiring a captcha challenge before playback'\n raise ExtractorError(reason, expected=True)\n \n self._sort_formats(formats)\n@@ -2691,6 +2776,9 @@ def process_language(container, base_url, lang_code, query):\n for fmt in self._SUBTITLE_FORMATS:\n query.update({\n 'fmt': fmt,\n+ # xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles\n+ # See: https://github.com/yt-dlp/yt-dlp/issues/13654\n+ 'xosf': []\n })\n lang_subs.append({\n 'ext': fmt,\n@@ -2732,7 +2820,7 @@ def process_subtitles():\n for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:\n d_k += '_time'\n if d_k not in info and k in s_ks:\n- info[d_k] = parse_duration(query[k][0])\n+ info[d_k] = parse_duration(v[0])\n \n if video_description:\n # Youtube Music Auto-generated description\n@@ -2761,6 +2849,7 @@ def process_subtitles():\n initial_data = self._call_api(\n 'next', {'videoId': video_id}, video_id, fatal=False)\n \n+ initial_sdcr = None\n if initial_data:\n chapters = self._extract_chapters_from_json(\n initial_data, video_id, duration)\n@@ -2780,9 +2869,9 @@ def chapter_time(mmlir):\n for next_num, content in enumerate(contents, start=1):\n mmlir = content.get('macroMarkersListItemRenderer') or {}\n start_time = chapter_time(mmlir)\n- end_time = chapter_time(try_get(\n- contents, lambda x: x[next_num]['macroMarkersListItemRenderer'])) \\\n- if next_num < len(contents) else duration\n+ end_time = (traverse_obj(\n+ contents, (next_num, 'macroMarkersListItemRenderer', T(chapter_time)))\n+ if next_num < len(contents) else duration)\n if start_time is None or end_time is None:\n continue\n chapters.append({\n@@ -2888,12 +2977,13 @@ def chapter_time(mmlir):\n info['track'] = mrr_contents_text\n \n # this is not extraction but spelunking!\n- carousel_lockups = traverse_obj(\n- initial_data,\n- ('engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n- 'content', 'structuredDescriptionContentRenderer', 'items', Ellipsis,\n- 'videoDescriptionMusicSectionRenderer', 'carouselLockups', Ellipsis),\n- expected_type=dict) or []\n+ initial_sdcr = traverse_obj(initial_data, (\n+ 'engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',\n+ 'content', 'structuredDescriptionContentRenderer', T(dict)),\n+ get_all=False)\n+ carousel_lockups = traverse_obj(initial_sdcr, (\n+ 'items', Ellipsis, 'videoDescriptionMusicSectionRenderer',\n+ 'carouselLockups', Ellipsis, T(dict))) or []\n # try to reproduce logic from metadataRowContainerRenderer above (if it still is)\n fields = (('ALBUM', 'album'), ('ARTIST', 'artist'), ('SONG', 'track'), ('LICENSES', 'license'))\n # multiple_songs ?\n@@ -2918,6 +3008,23 @@ def chapter_time(mmlir):\n \n self.mark_watched(video_id, player_response)\n \n+ # Fallbacks for missing metadata\n+ if initial_sdcr:\n+ if info.get('description') is None:\n+ info['description'] = traverse_obj(initial_sdcr, (\n+ 'items', Ellipsis, 'expandableVideoDescriptionBodyRenderer',\n+ 'attributedDescriptionBodyText', 'content', T(compat_str)),\n+ get_all=False)\n+ # videoDescriptionHeaderRenderer also has publishDate/channel/handle/ucid, but not needed\n+ if info.get('title') is None:\n+ info['title'] = traverse_obj(\n+ (initial_sdcr, initial_data),\n+ (0, 'items', Ellipsis, 'videoDescriptionHeaderRenderer', T(dict)),\n+ (1, 'playerOverlays', 'playerOverlayRenderer', 'videoDetails',\n+ 'playerOverlayVideoDetailsRenderer', T(dict)),\n+ expected_type=lambda x: self._get_text(x, 'title'),\n+ get_all=False)\n+\n return merge_dicts(\n info, {\n 'uploader_id': self._extract_uploader_id(owner_profile_url),\n@@ -3428,38 +3535,46 @@ def _extract_lockup_view_model(self, view_model):\n if not content_id:\n return\n content_type = view_model.get('contentType')\n- if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n+ if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':\n+ ie = YoutubeIE\n+ url = update_url_query(\n+ 'https://www.youtube.com/watch', {'v': content_id}),\n+ thumb_keys = (None,)\n+ elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):\n+ ie = YoutubeTabIE\n+ url = update_url_query(\n+ 'https://www.youtube.com/playlist', {'list': content_id}),\n+ thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')\n+ else:\n self.report_warning(\n- 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()), only_once=True)\n+ 'Unsupported lockup view model content type \"{0}\"{1}'.format(content_type, bug_reports_message()),\n+ only_once=True)\n return\n+ thumb_keys = ('contentImage',) + thumb_keys + ('thumbnailViewModel', 'image')\n return merge_dicts(self.url_result(\n- update_url_query('https://www.youtube.com/playlist', {'list': content_id}),\n- ie=YoutubeTabIE.ie_key(), video_id=content_id), {\n+ url, ie=ie.ie_key(), video_id=content_id), {\n 'title': traverse_obj(view_model, (\n- 'metadata', 'lockupMetadataViewModel', 'title', 'content', T(compat_str))),\n- 'thumbnails': self._extract_thumbnails(view_model, (\n- 'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail',\n- 'thumbnailViewModel', 'image'), final_key='sources'),\n+ 'metadata', 'lockupMetadataViewModel', 'title',\n+ 'content', T(compat_str))),\n+ 'thumbnails': self._extract_thumbnails(\n+ view_model, thumb_keys, final_key='sources'),\n })\n \n def _extract_shorts_lockup_view_model(self, view_model):\n content_id = traverse_obj(view_model, (\n 'onTap', 'innertubeCommand', 'reelWatchEndpoint', 'videoId',\n T(lambda v: v if YoutubeIE.suitable(v) else None)))\n- if not content_id:\n- return\n return merge_dicts(self.url_result(\n content_id, ie=YoutubeIE.ie_key(), video_id=content_id), {\n 'title': traverse_obj(view_model, (\n 'overlayMetadata', 'primaryText', 'content', T(compat_str))),\n 'thumbnails': self._extract_thumbnails(\n view_model, 'thumbnail', final_key='sources'),\n- })\n+ }) if content_id else None\n \n def _video_entry(self, video_renderer):\n video_id = video_renderer.get('videoId')\n- if video_id:\n- return self._extract_video(video_renderer)\n+ return self._extract_video(video_renderer) if video_id else None\n \n def _post_thread_entries(self, post_thread_renderer):\n post_renderer = try_get(\n@@ -4119,6 +4234,7 @@ class YoutubeFeedsInfoExtractor(YoutubeTabIE):\n \n Subclasses must define the _FEED_NAME property.\n \"\"\"\n+\n _LOGIN_REQUIRED = True\n \n @property\ndiff --git a/youtube_dl/options.py b/youtube_dl/options.py\nindex 61705d1f023..ce3633c418e 100644\n--- a/youtube_dl/options.py\n+++ b/youtube_dl/options.py\n@@ -404,6 +404,10 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n '-F', '--list-formats',\n action='store_true', dest='listformats',\n help='List all available formats of requested videos')\n+ video_format.add_option(\n+ '--no-list-formats',\n+ action='store_false', dest='listformats',\n+ help='Do not list available formats of requested videos (default)')\n video_format.add_option(\n '--youtube-include-dash-manifest',\n action='store_true', dest='youtube_include_dash_manifest', default=True,\n@@ -412,6 +416,17 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):\n '--youtube-skip-dash-manifest',\n action='store_false', dest='youtube_include_dash_manifest',\n help='Do not download the DASH manifests and related data on YouTube videos')\n+ video_format.add_option(\n+ '--youtube-player-js-variant',\n+ action='store', dest='youtube_player_js_variant',\n+ help='For YouTube, the player javascript variant to use for n/sig deciphering; `actual` to follow the site; default `%default`.',\n+ choices=('actual', 'main', 'tcc', 'tce', 'es5', 'es6', 'tv', 'tv_es6', 'phone', 'tablet'),\n+ default='main', metavar='VARIANT')\n+ video_format.add_option(\n+ '--youtube-player-js-version',\n+ action='store', dest='youtube_player_js_version',\n+ help='For YouTube, the player javascript version to use for n/sig deciphering, specified as `signature_timestamp@hash`, or `actual` to follow the site; default `%default`',\n+ default='20348@0004de42', metavar='STS@HASH')\n video_format.add_option(\n '--merge-output-format',\n action='store', dest='merge_output_format', metavar='FORMAT', default=None,\n"},"num_subtasks":{"kind":"number","value":4,"string":"4"},"num_changed_files":{"kind":"number","value":5,"string":"5"}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":342,"numItemsPerPage":100,"numTotalItems":34696,"offset":34200,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6Im1sR1pFYktIVHRVSGRhX1RRdEczQ0N1S3k5ME9Qd25DNHY5elRjM3FVYzgifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4MzQwOTY4NSwianRpIjoiOGQxZGI2ODItODAyNi00MTg5LWFiNDEtOGJlNjUxMWQ2NGY4Iiwic3ViIjoiL2RhdGFzZXRzL1BvdGF0b0hEL2dpdGh1Yi1wci1hZ2VudC10cmFqZWN0b3JpZXMiLCJleHAiOjE3ODM0MTMyODUsImlzcyI6Imh0dHBzOi8vaHVnZ2luZ2ZhY2UuY28ifQ.g0da3tywMRfFciSNbcybe9kfgPWwWusnr7y_CLOR44vw9qJzH074BmzG8-f06FTj0OCtwt14PM00SGvoSptzBw","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"train","numRows":34696,"numBytesParquet":2326027093}]},"discussionsStats":{"closed":0,"open":0,"total":0},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
task_id stringlengths 10 58 | repo stringclasses 854
values | pr_number int32 1 321k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | task stringlengths 2 105k | plan listlengths 1 100 | subagents listlengths 1 100 | revisions listlengths 0 100 | final_diff stringlengths 256 202M | num_subtasks int32 1 100 | num_changed_files int32 2 100 |
|---|---|---|---|---|---|---|---|---|---|---|---|
yhirose/cpp-httplib#2463 | yhirose/cpp-httplib | 2,463 | 44215e23e92c473a3553d24ae634aed6eefc7dd0 | e0c548b0380c28d550f962563c9820a080150bad | add set_hostname_addr_map to WebSocketClient
WebSockets also need the set_hostname_addr_map function when connecting. | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: add set_hostname_addr_map to WebSocketClient",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: add set_hostname_addr_map to WebSocketCli... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 8eb86a36e0..80da0f275f 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -3842,6 +3842,7 @@ class WebSocketClient {\n void set_socket_options(SocketOptions socket_options);\n void s... | [
{
"subtask_id": "s2",
"comment": "Implementation looks good โ faithfully mirrors `ClientImpl::set_hostname_addr_map` ๐\n\nOne issue in this test: `0.0.0.0` will likely fail on the Linux CI. There, `connect(2)` to `0.0.0.0` is treated as `127.0.0.1`, so it reaches the server bound above โ `connect()` succee... | diff --git a/httplib.h b/httplib.h
index 8eb86a36e0..80da0f275f 100644
--- a/httplib.h
+++ b/httplib.h
@@ -3842,6 +3842,7 @@ class WebSocketClient {
void set_socket_options(SocketOptions socket_options);
void set_connection_timeout(time_t sec, time_t usec = 0);
void set_interface(const std::string &intf);
+ v... | 2 | 2 |
yhirose/cpp-httplib#2465 | yhirose/cpp-httplib | 2,465 | 44215e23e92c473a3553d24ae634aed6eefc7dd0 | d6fbf942a568abf3c8ce9df9245ea2f51f484c23 | Ignore range requests for unknown-length streaming responses
Clients like ffmpeg/browser-like clients may send `Range: bytes=0-` for live multipart streams. A concrete example is a live MJPEG stream served as multipart/x-mixed-replace.
In such a scenario the resource is not meaningfully byte-range addressable: ther... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Ignore range requests for unknown-length streaming responses",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Ignore range requests for... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 439b3facef..557d532909 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -8362,6 +8362,14 @@ inline void coalesce_ranges(Ranges &ranges, size_t content_length) {\n \n inline bool range_... | [] | diff --git a/httplib.h b/httplib.h
index 439b3facef..557d532909 100644
--- a/httplib.h
+++ b/httplib.h
@@ -8362,6 +8362,14 @@ inline void coalesce_ranges(Ranges &ranges, size_t content_length) {
inline bool range_error(Request &req, Response &res) {
if (!req.ranges.empty() && 200 <= res.status && res.status < 300... | 2 | 2 |
yhirose/cpp-httplib#2448 | yhirose/cpp-httplib | 2,448 | b1792ef29ca66f8dcb44b1678e597676a33a3f1b | 2ad877322b3528afd55a40df4e22f6d065afb384 | Feature 2446 no proxy env
The primary goal of this pull request is to provide a reference implementation with Opus 4.7 (#2446), focusing not only on functionality but also on security by ensuring there are no vulnerabilities. | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Feature 2446 no proxy env",
"scope_files": [
"README.md",
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `docs-src/pages/en/cookbook/` needed for: Feature 2446 no pro... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md",
"httplib.h"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex 1037ab2e36..d4bbb2e5c2 100644\n--- a/README.md\n+++ b/README.md\n@@ -1181,6 +1181,17 @@ cli.set_proxy_bearer_token_auth(\"pass\");\n > [!NOTE]\n > OpenSSL is req... | [] | diff --git a/README.md b/README.md
index 1037ab2e36..d4bbb2e5c2 100644
--- a/README.md
+++ b/README.md
@@ -1181,6 +1181,17 @@ cli.set_proxy_bearer_token_auth("pass");
> [!NOTE]
> OpenSSL is required for Digest Authentication.
+#### Bypass the proxy for specific hosts (`NO_PROXY`)
+
+```cpp
+cli.set_no_proxy({"inter... | 4 | 5 |
yhirose/cpp-httplib#2460 | yhirose/cpp-httplib | 2,460 | c86c192f3e86ab2ccb5062c070274102a64780c3 | 25622658093bdfc1aed9fa254e999980fe3c132f | Fix #2458: send body when no 100 Continue arrives over TLS
## Problem
`Client::Put`/`Post` with a body of at least `CPPHTTPLIB_EXPECT_100_THRESHOLD` (1024) bytes auto-adds `Expect: 100-continue`. Over TLS, this could fail with `Failed to read connection` (#2458): the server received the request but the client never s... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Fix #2458: send body when no 100 Continue arrives over TLS",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Fix #2458: send body when n... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 0e7e2aaceb..66d4c2fd84 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -13810,13 +13810,28 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,\n }\n #endif\n \n- ... | [] | diff --git a/httplib.h b/httplib.h
index 0e7e2aaceb..66d4c2fd84 100644
--- a/httplib.h
+++ b/httplib.h
@@ -13810,13 +13810,28 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
}
#endif
- // Handle Expect: 100-continue with timeout
- if (expect_100_continue && CPPHTTPLIB_EXPECT_100_TIMEOUT_M... | 2 | 2 |
yhirose/cpp-httplib#2455 | yhirose/cpp-httplib | 2,455 | b1cc8095a8feca1b99e296ef78eddd312e80d2c6 | 88a92152d343cbad5b5b6bc6f25221d966f828b5 | Fix iOS build break and modernize macOS Keychain cert loading
## Summary
- Replace deprecated `SecTrustCopyAnchorCertificates` with `SecTrustSettingsCopyCertificates`, iterating over the System/Admin/User trust domains
- Restrict the `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN` auto-enable and `Security.h` include guar... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Fix iOS build break and modernize macOS Keychain cert loading",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `.github/workflows/` needed for: Fix iOS bui... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 7c924e6a65..2af1f507c5 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -339,16 +339,26 @@ using socket_t = int;\n #include <utility>\n \n // On macOS with a TLS backend, enable Keycha... | [] | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 38787cc214..d0e41c38c9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -250,6 +250,54 @@ jobs:
- name: build and run ThreadPool test
run: cd test && make test_thread_pool && ./test_thread_pool
+ ... | 2 | 2 |
yhirose/cpp-httplib#2456 | yhirose/cpp-httplib | 2,456 | 0d7d6374666956c9f5e2767573fb7be0d4477d16 | 9b67c9833a11f63168e0eeef59f3489cb4753e1e | ci: add best-effort BoringSSL job
## Summary
Adds first-class CI coverage for BoringSSL as a best-effort TLS backend, on both Linux and macOS, plus the small code/test/docs adjustments that fall out of supporting it.
## What's in the PR
**CI jobs** (`.github/workflows/test.yaml`)
- `ubuntu-boringssl` and `macos-bor... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: ci: add best-effort BoringSSL job",
"scope_files": [
"README.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `.github/workflows/` needed for: ci: add best-effort BoringSSL job",
... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex f1fd63a7e7..1037ab2e36 100644\n--- a/README.md\n+++ b/README.md\n@@ -73,6 +73,9 @@ cpp-httplib supports multiple TLS backends through an abstraction layer:\n > [!NOTE]\n > **Mbed T... | [] | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d0e41c38c9..ea50f94cd3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -120,6 +120,155 @@ jobs:
- name: build and run ThreadPool test
run: cd test && make test_thread_pool && ./test_thread_pool
+... | 3 | 3 |
yhirose/cpp-httplib#2445 | yhirose/cpp-httplib | 2,445 | a1fdc07f34ef4788b24c7be3c3fb41a402409662 | 0e02c8de71983b7d7fa43d9ac4b8372fc07e2650 | ThreadPool constructor might fail when pthread_create fails leaving threads unjoined
We are using httplib in duckdb, and we are super happy with it.
In an experimental branch, I try to use `httplib`'s `ThreadPool`, but I found out that when (due to resource exhaustion in the system I was running the tests) pthread_cr... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: ThreadPool constructor might fail when pthread_create fails leaving threads unjoined",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: T... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex d400c7bca8..f68ad84961 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -10047,9 +10047,29 @@ inline ThreadPool::ThreadPool(size_t n, size_t max_n, size_t mqr)\n #endif\n max_thread_... | [] | diff --git a/httplib.h b/httplib.h
index d400c7bca8..f68ad84961 100644
--- a/httplib.h
+++ b/httplib.h
@@ -10047,9 +10047,29 @@ inline ThreadPool::ThreadPool(size_t n, size_t max_n, size_t mqr)
#endif
max_thread_count_ = max_n == 0 ? n : max_n;
threads_.reserve(base_thread_count_);
- for (size_t i = 0; i < base... | 2 | 3 |
yhirose/cpp-httplib#2438 | yhirose/cpp-httplib | 2,438 | 0cbeafe6a4026e0ebf890d8e779dca65d8e0a3b9 | a838ccf4dbe2d66564d5f1d3b8ba182354713813 | mmap CreateFile2 without FILE_SHARE_WRITE
Hi,
I have the following issue using the httplib server on win32. When using Server::set_mount_point, httplib opens the file in mmap with the following line:
`File_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, NULL);`
- GENERIC_READ the right ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: mmap CreateFile2 without FILE_SHARE_WRITE",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: mmap CreateFile2 without FILE_SHARE_WRITE",
... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 7cf8c45471..d69c007996 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -5319,8 +5319,9 @@ inline bool mmap::open(const char *path) {\n auto wpath = u8string_to_wstring(path);\n if... | [] | diff --git a/httplib.h b/httplib.h
index 7cf8c45471..d69c007996 100644
--- a/httplib.h
+++ b/httplib.h
@@ -5319,8 +5319,9 @@ inline bool mmap::open(const char *path) {
auto wpath = u8string_to_wstring(path);
if (wpath.empty()) { return false; }
- hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_R... | 2 | 2 |
yhirose/cpp-httplib#2437 | yhirose/cpp-httplib | 2,437 | 5ebbfeef0bf8e26b41036a2033fd391e05d5639f | a2f1538e8290b45a1fd7948f99843d21267356e3 | Add client fuzzing harness
Cover client request processing logic. The goal is to enable this running on OSS-Fuzz. | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/fuzzing/` needed for: Add client fuzzing harness",
"scope_files": [
"test/fuzzing/Makefile",
"test/fuzzing/client_fuzzer.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"test/fuzzing/Makefile",
"test/fuzzing/client_fuzzer.cc"
],
"solution_diff": "diff --git a/test/fuzzing/Makefile b/test/fuzzing/Makefile\nindex 7f0b4dab71..da5d696825 100644\n--- a/test/fuzzing/Makefile\n+++ b/test/fuzzing/Makefile\n@@ -13,7 +13,7 @... | [] |
diff --git a/test/fuzzing/Makefile b/test/fuzzing/Makefile
index 7f0b4dab71..da5d696825 100644
--- a/test/fuzzing/Makefile
+++ b/test/fuzzing/Makefile
@@ -13,7 +13,7 @@ ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
BROTLI_DIR = /usr/local/opt/brotli
# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/inclu... | 1 | 2 |
yhirose/cpp-httplib#2433 | yhirose/cpp-httplib | 2,433 | 33bc1df930363e73fb1fd97f8d475e4272b1f221 | aec17168b204ba4685ad8d96fc0413a04e2334ca | Reproducer test for #2431 (getaddrinfo_a use-after-free)
## Summary
Adds a CI-gated reproducer for #2431 โ the use-after-free in `detail::getaddrinfo_with_timeout()` on Linux/glibc when `gai_suspend()` hits the connection timeout and the non-blocking `gai_cancel()` returns `EAI_NOTCANCELED`, leaving the resolver work... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: Reproducer test for #2431 (getaddrinfo_a use-after-free)",
"scope_files": [
".github/workflows/test.yaml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: ... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/test.yaml"
],
"solution_diff": "diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml\nindex 69cc8d7463..12bee95bb9 100644\n--- a/.github/workflows/test.yaml\n+++ b/.github/workflows/test.yaml\n@@ -114,6 +114,92 @@ jobs... | [] | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 69cc8d7463..12bee95bb9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -114,6 +114,92 @@ jobs:
- name: build and run ThreadPool test
run: cd test && make test_thread_pool && ./test_thread_pool
+ ... | 2 | 4 |
yhirose/cpp-httplib#2428 | yhirose/cpp-httplib | 2,428 | b045ee7f6b434a85fd011e96e28c6d4abfb18788 | 0e989162b19586f24365bab065b82c2a0b6f57b5 | Fix #2427
This pull request improves the reliability of the HTTP server in the test suite by ensuring that the server reads the entire HTTP request from the client before sending a response. This change prevents connection resets that can occur if the server closes the socket while unread request data remains in the k... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: Fix #2427",
"scope_files": [
"test/Makefile",
"test/test.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"test/Makefile",
"test/test.cc"
],
"solution_diff": "diff --git a/test/Makefile b/test/Makefile\nindex 40b208874a..eb32bf1ebb 100644\n--- a/test/Makefile\n+++ b/test/Makefile\n@@ -18,6 +18,8 @@ ifneq ($(OS), Windows_NT)\n \t\tOPENSSL_SUPPORT = -DCPP... | [] |
diff --git a/test/Makefile b/test/Makefile
index 40b208874a..eb32bf1ebb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -18,6 +18,8 @@ ifneq ($(OS), Windows_NT)
OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -lssl -lcrypto
MBEDTLS_SUPPORT = -DCPPHTTPLIB_MBEDTLS_SUPPORT -lmbedtls -lmbedx509 -lmbedcrypto
WOLF... | 1 | 2 |
yhirose/cpp-httplib#2430 | yhirose/cpp-httplib | 2,430 | b045ee7f6b434a85fd011e96e28c6d4abfb18788 | f066189b23a5b7461536759bbf22b57ee540d2b0 | fix #2429
When SSL_read() returns 0 after receiving a close_notify alert, tls::read() incorrectly returned -1, making clean peer shutdown indistinguishable from a read error. This broke HTTP responses using Connection: close without Content-Length, where the connection close signals end-of-body. Return 0 for PeerClose... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: fix #2429",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: fix #2429",
"scope_files": [
"test/test.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex c5ae2c8a0e..e2236879ed 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -16766,6 +16766,9 @@ inline ssize_t read(session_t session, void *buf, size_t len, TlsError &err) {\n \n auto ... | [] | diff --git a/httplib.h b/httplib.h
index c5ae2c8a0e..e2236879ed 100644
--- a/httplib.h
+++ b/httplib.h
@@ -16766,6 +16766,9 @@ inline ssize_t read(session_t session, void *buf, size_t len, TlsError &err) {
auto ssl_err = SSL_get_error(ssl, ret);
err.code = impl::map_ssl_error(ssl_err, err.sys_errno);
+ if (err... | 2 | 2 |
yhirose/cpp-httplib#2423 | yhirose/cpp-httplib | 2,423 | c0248ff7fc1506c1bdd12a57cef4e2c5026032a7 | 6f375c47b3d003fe3c89d6ce4b70ca91cdb15078 | Removed deprecated APIs
This pull request primarily removes documentation and test references to deprecated APIs, specifically those related to SSL error handling and deprecated constructors. It also updates example code to use the current API for reporting SSL backend errors. The changes help clean up the codebase an... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Removed deprecated APIs",
"scope_files": [
"README.md",
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `docs-src/pages/en/cookbook/` needed for: Removed deprecated AP... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md",
"httplib.h"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex f6134a112d..5df1ce529e 100644\n--- a/README.md\n+++ b/README.md\n@@ -1564,10 +1564,6 @@ Include `httplib.h` before `Windows.h` or include `Windows.h` by defining... | [] | diff --git a/README.md b/README.md
index f6134a112d..5df1ce529e 100644
--- a/README.md
+++ b/README.md
@@ -1564,10 +1564,6 @@ Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32
> [!NOTE]
> cpp-httplib officially supports only the latest Visual Studio. It might work with former versions o... | 5 | 6 |
yhirose/cpp-httplib#2412 | yhirose/cpp-httplib | 2,412 | 32c82492dec964b6192f77ca47da86e284aa4a72 | c57c247ff286f40c7b7b399c6b679b360b57ee1c | Add two new fuzzers
The goal is to increase code coverage by way of OSS-Fuzz. A recent code coverage report is available at
https://storage.googleapis.com/oss-fuzz-coverage/cpp-httplib/reports/20260326/linux/report.html | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/fuzzing/` needed for: Add two new fuzzers",
"scope_files": [
"test/fuzzing/Makefile",
"test/fuzzing/header_parser_fuzzer.cc",
"test/fuzzing/url_parser_fuzzer.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"test/fuzzing/Makefile",
"test/fuzzing/header_parser_fuzzer.cc",
"test/fuzzing/url_parser_fuzzer.cc"
],
"solution_diff": "diff --git a/test/fuzzing/Makefile b/test/fuzzing/Makefile\nindex b08ecd0848..7f0b4dab71 100644\n--- a/test/fuzzing/Makef... | [] |
diff --git a/test/fuzzing/Makefile b/test/fuzzing/Makefile
index b08ecd0848..7f0b4dab71 100644
--- a/test/fuzzing/Makefile
+++ b/test/fuzzing/Makefile
@@ -13,8 +13,10 @@ ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
BROTLI_DIR = /usr/local/opt/brotli
# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/incl... | 1 | 3 |
yhirose/cpp-httplib#2403 | yhirose/cpp-httplib | 2,403 | c2bdb1c5c15adb8ffcf398702084eb52aed3757f | 94a7e335f9e3ae5bfcc101613f4820ba4c6ab0c9 | "Building a Desktop LLM App with cpp-httplib" | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: \"Building a Desktop LLM App with cpp-httplib\"",
"scope_files": [
"justfile"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `docs-src/pages/en/` needed for: \"Building a Desktop LLM A... | [
{
"subtask_id": "s1",
"scope_files": [
"justfile"
],
"solution_diff": "diff --git a/justfile b/justfile\nindex 6a2a7b404e..7ba7909a13 100644\n--- a/justfile\n+++ b/justfile\n@@ -46,11 +46,8 @@ build:\n bench:\n @(cd benchmark && make bench-all)\n \n-docs:\n- @cargo build --release --man... | [] | diff --git a/docs-src/pages/en/index.md b/docs-src/pages/en/index.md
index 3fbfcb6e8d..90a3ebf1c4 100644
--- a/docs-src/pages/en/index.md
+++ b/docs-src/pages/en/index.md
@@ -18,8 +18,8 @@ Under the hood, it uses blocking I/O with a thread pool. It's not built for hand
## Documentation
- [A Tour of cpp-httplib](tou... | 6 | 35 |
yhirose/cpp-httplib#2388 | yhirose/cpp-httplib | 2,388 | ab3098f18bd78da2b67c135c18cf48702ea979cd | 5be1d2c5e4def65695c0a8f125d568fa36046cf0 | Remove 32-bit limitation | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Remove 32-bit limitation",
"scope_files": [
"CMakeLists.txt",
"README.md",
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `.github/workflows/` needed for: Remov... | [
{
"subtask_id": "s1",
"scope_files": [
"CMakeLists.txt",
"README.md",
"httplib.h"
],
"solution_diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex ae236c3767..1874e36be0 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -173,9 +173,6 @@ if(CMAKE_SYSTEM_NAME MATCHES \"W... | [] | diff --git a/.github/workflows/test-32bit.yml b/.github/workflows/test-32bit.yml
new file mode 100644
index 0000000000..2fa0337152
--- /dev/null
+++ b/.github/workflows/test-32bit.yml
@@ -0,0 +1,36 @@
+name: 32-bit Build Test
+
+on:
+ push:
+ branches: [master]
+ pull_request:
+ branches: [master]
+ workflow_d... | 3 | 6 |
yhirose/cpp-httplib#2376 | yhirose/cpp-httplib | 2,376 | 85b18a9c6431877188a706ba3c61679fa9de3e27 | f88387dccf33fddf2a36946d5f2a4feed538aeda | Documentation Site on GitHub Pages | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Documentation Site on GitHub Pages",
"scope_files": [
".gitignore",
"justfile"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `docs/` needed for: Documentation Site on GitHub Pag... | [
{
"subtask_id": "s1",
"scope_files": [
".gitignore",
"justfile"
],
"solution_diff": "diff --git a/.gitignore b/.gitignore\nindex 1ea2142f62..40930943d4 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -57,6 +57,7 @@ test/*.log\n test/_build_*\n work/\n benchmark/server*\n+docs-gen/target/\... | [] | diff --git a/.gitignore b/.gitignore
index 1ea2142f62..40930943d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ test/*.log
test/_build_*
work/
benchmark/server*
+docs-gen/target/
*.swp
diff --git a/docs-gen/Cargo.lock b/docs-gen/Cargo.lock
new file mode 100644
index 0000000000..6d12b6715b
--- /dev/... | 40 | 66 |
yhirose/cpp-httplib#2360 | yhirose/cpp-httplib | 2,360 | a9fc9359196210a7b5d81c20a77ed2f5501c0840 | 08c87be3fc9c08c326160baf2a1e033bb88ec326 | CMake component `MbedTLS`
I think that [this pull request](https://github.com/yhirose/cpp-httplib/pull/2342) requires a small update of `CMakeLists.txt`. Probably a new component like `MbedTLS` to set the macro `CPPHTTPLIB_MBEDTLS_SUPPORT`.
Overall conidition via `CPPHTTPLIB_SSL_ENABLED`.
Sets macro `CPPHTTPLIB_OPEN... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: CMake component `MbedTLS`",
"scope_files": [
"CMakeLists.txt"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `cmake/` needed for: CMake component `MbedTLS`",
"scope_files": [
... | [
{
"subtask_id": "s1",
"scope_files": [
"CMakeLists.txt"
],
"solution_diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex 96ede135d7..ae236c3767 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -2,11 +2,15 @@\n \tBuild options:\n \t* Standard BUILD_SHARED_LIBS is supported and set... | [
{
"subtask_id": "s2",
"comment": "typo",
"revised_diff": "diff --git a/cmake/httplibConfig.cmake.in b/cmake/httplibConfig.cmake.in\nindex 8ca8b991a2..933862a5e0 100644\n--- a/cmake/httplibConfig.cmake.in\n+++ b/cmake/httplibConfig.cmake.in\n@@ -4,6 +4,8 @@\n # Setting these here so they're accessible af... | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96ede135d7..ae236c3767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,15 @@
Build options:
* Standard BUILD_SHARED_LIBS is supported and sets HTTPLIB_SHARED default value.
* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
+ * HTTPLIB_USE_WOLFSSL_IF_AV... | 2 | 2 |
yhirose/cpp-httplib#2377 | yhirose/cpp-httplib | 2,377 | 7c33fd47bf3ab74fe968e31c5e585598373e2d8c | f09894708592fd4d2cfb2b9100eb25d41f096148 | Make loading system certificates from the Keychain on macOS an opt-out feature | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Make loading system certificates from the Keychain on macOS an opt-out feature",
"scope_files": [
"CMakeLists.txt",
"README.md",
"httplib.h",
"meson.build",
"meson_options.txt"
]
},
{
... | [
{
"subtask_id": "s1",
"scope_files": [
"CMakeLists.txt",
"README.md",
"httplib.h",
"meson.build",
"meson_options.txt"
],
"solution_diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex 45a0e16b98..96ede135d7 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -... | [] | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45a0e16b98..96ede135d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
* HTTPLIB_REQUIRE_ZLIB (default off)
* HTTPLIB_REQUIRE_BROTLI (default off)
* HTTPLIB_REQUIRE_ZSTD (default off)
- * HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
+ * ... | 2 | 6 |
yhirose/cpp-httplib#2370 | yhirose/cpp-httplib | 2,370 | 718d7d92b993d8fdf6a74d82af8572b96787a909 | dc5adc01852b532cbac598f6d7412364e06913d8 | Add wolfSSL support
woflSSL support | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Add wolfSSL support",
"scope_files": [
".gitignore",
"README.md",
"httplib.h",
"justfile"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `.github/workflows/` needed f... | [
{
"subtask_id": "s1",
"scope_files": [
".gitignore",
"README.md",
"httplib.h",
"justfile"
],
"solution_diff": "diff --git a/.gitignore b/.gitignore\nindex 04d7498fd9..01cc6cfd54 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -36,12 +36,14 @@ test/httplib.cc\n test/httplib.h\n... | [] | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 69158d3f7d..378c0ce3d9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -77,7 +77,7 @@ jobs:
(github.event_name == 'workflow_dispatch' && github.event.inputs.test_linux == 'true')
strategy:
matri... | 3 | 6 |
yhirose/cpp-httplib#1612 | yhirose/cpp-httplib | 1,612 | 82acdca638b64e0c00b43e2b192fbce0a4de9567 | 28e34136e0ab52a31e1c9e020426e2cd5926d393 | Fix successful decompress reported as Error::Read
Streams less than 4096 bytes are sometimes reported as failed reads because stream_.avail_in is not reduced to 0. The next iteration of the loop finds `prev_avail_in == strm_.avail_in` and return false. `ret = inflate(...)` returns `Z_STREAM_END` on the first iteration... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Fix successful decompress reported as Error::Read",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Fix successful decompress reported a... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 9753439abb..4691b7354b 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -3384,16 +3384,12 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,\n data ... | [] | diff --git a/httplib.h b/httplib.h
index 9753439abb..4691b7354b 100644
--- a/httplib.h
+++ b/httplib.h
@@ -3384,16 +3384,12 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
data += strm_.avail_in;
std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
- while (strm_.ava... | 2 | 2 |
yhirose/cpp-httplib#1046 | yhirose/cpp-httplib | 1,046 | e3e28c623165f9965efd2abbb7a31891c0fad684 | 40c2abb68a296a984144c31995349cf327b3d06b | Read buffer | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Read buffer",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Read buffer",
"scope_files": [
"test/test.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex b65a89a72a..fae47fa75e 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -1671,6 +1671,10 @@ bool parse_range_header(const std::string &s, Ranges &ranges);\n \n int close_socket(socket_... | [] | diff --git a/httplib.h b/httplib.h
index b65a89a72a..fae47fa75e 100644
--- a/httplib.h
+++ b/httplib.h
@@ -1671,6 +1671,10 @@ bool parse_range_header(const std::string &s, Ranges &ranges);
int close_socket(socket_t sock);
+ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
+
+ssize_t read... | 2 | 2 |
yhirose/cpp-httplib#845 | yhirose/cpp-httplib | 845 | ae6cf70bc459ffc0f0f4c710b6c050f3b5d60cf2 | 9be81a62ea7a25299c75829eac1b65b698222b6a | Add exception handler
This pull request adds the option to handle C++ exceptions caused by user handlers when routing. This allows users to react to exceptions globally by logging them and restarting safely. This may be used over try/catch's within the handlers to avoid repetition in error messages: an API might retur... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Add exception handler",
"scope_files": [
"README.md",
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Add exception handler",
"scope_files": [
... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md",
"httplib.h"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex 952a757dd3..37d2db119e 100644\n--- a/README.md\n+++ b/README.md\n@@ -177,6 +177,19 @@ svr.set_error_handler([](const auto& req, auto& res) {\n });\n ```\n \n+###... | [
{
"subtask_id": "s1",
"comment": "missing `, std::exception &e` in the argument list?",
"revised_diff": "diff --git a/README.md b/README.md\nindex 952a757dd3..37d2db119e 100644\n--- a/README.md\n+++ b/README.md\n@@ -177,6 +177,19 @@ svr.set_error_handler([](const auto& req, auto& res) {\n });\n ```\n \n... | diff --git a/README.md b/README.md
index 952a757dd3..37d2db119e 100644
--- a/README.md
+++ b/README.md
@@ -177,6 +177,19 @@ svr.set_error_handler([](const auto& req, auto& res) {
});
```
+### Exception handler
+The exception handler gets called if a user routing handler throws an error.
+
+```cpp
+svr.set_exception... | 2 | 3 |
yhirose/cpp-httplib#2166 | yhirose/cpp-httplib | 2,166 | 696c02f2bcc494011239e666ae46f5fde7d3260d | 8561b6f6ac92c1e572cb475bc09088eae31479c5 | Cleaner API | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Cleaner API",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Cleaner API",
"scope_files": [
"test/test.cc"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex e7fe9efe6e..27c4501ffa 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -126,6 +126,10 @@\n #define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)\n #endif\n \n+#ifndef CPPHTTPLIB_SEND_BUFSIZ\n... | [] | diff --git a/httplib.h b/httplib.h
index e7fe9efe6e..27c4501ffa 100644
--- a/httplib.h
+++ b/httplib.h
@@ -126,6 +126,10 @@
#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
#endif
+#ifndef CPPHTTPLIB_SEND_BUFSIZ
+#define CPPHTTPLIB_SEND_BUFSIZ size_t(16384u)
+#endif
+
#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
#define CP... | 2 | 2 |
yhirose/cpp-httplib#2268 | yhirose/cpp-httplib | 2,268 | 1acf18876fdbd1a4f3ff91f43cf21495af357850 | 2214859dc2ceb74940853a4d391bfad5800769c0 | Add Client methods with both content provider and receiver
Add most `Post` overloads for `Client`, with both content provider and content receiver.
* Result Post(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, ContentReceiver content_receiver, Uploa... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Add Client methods with both content provider and receiver",
"scope_files": [
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Add Client methods with bot... | [
{
"subtask_id": "s1",
"scope_files": [
"httplib.h"
],
"solution_diff": "diff --git a/httplib.h b/httplib.h\nindex 8411c8c93b..8ed840efd7 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -1421,14 +1421,18 @@ class ClientImpl {\n Result Post(const std::string &path, const char *body, size_t conten... | [
{
"subtask_id": "s1",
"comment": "Could you explain why these lines need to be added? These are already added at line 3842 and 3843.",
"revised_diff": "diff --git a/httplib.h b/httplib.h\nindex 8411c8c93b..8ed840efd7 100644\n--- a/httplib.h\n+++ b/httplib.h\n@@ -1421,14 +1421,18 @@ class ClientImpl {\n ... | diff --git a/httplib.h b/httplib.h
index 8411c8c93b..8ed840efd7 100644
--- a/httplib.h
+++ b/httplib.h
@@ -1421,14 +1421,18 @@ class ClientImpl {
Result Post(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
Result Post(const std... | 2 | 2 |
yhirose/cpp-httplib#2368 | yhirose/cpp-httplib | 2,368 | d4180e923f846b44a3d30acd938438d6e64fc9f6 | 81cbc42b7d469a3222f41b30f6a29c25531cb3f6 | WebSocket and Dynamic Thread Pool support
Long waited features are finally supported!
- WebSocket support
- Dynamic Thread Pool support
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: WebSocket and Dynamic Thread Pool support",
"scope_files": [
".gitignore",
"README-websocket.md",
"README.md",
"httplib.h"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes un... | [
{
"subtask_id": "s1",
"scope_files": [
".gitignore",
"README-websocket.md",
"README.md",
"httplib.h"
],
"solution_diff": "diff --git a/.gitignore b/.gitignore\nindex c2590a0e28..04d7498fd9 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -29,6 +29,8 @@ example/server_and_client... | [] | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 027eda56e7..69158d3f7d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -103,6 +103,11 @@ jobs:
- name: run fuzz test target
if: matrix.tls_backend == 'openssl'
run: cd test && make fuzz_te... | 4 | 11 |
yhirose/cpp-httplib#2364 | yhirose/cpp-httplib | 2,364 | c1ee85d89ea2d857509164df6b759e36342ef2e4 | 45ed6c0ba9bfea00b3453ab2aecaa5c565771807 | Parallel test on CI | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Parallel test on CI",
"scope_files": [
".gitignore",
"justfile"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `.github/workflows/` needed for: Parallel test on CI",
"scope_f... | [
{
"subtask_id": "s1",
"scope_files": [
".gitignore",
"justfile"
],
"solution_diff": "diff --git a/.gitignore b/.gitignore\nindex 80278dc2d0..c2590a0e28 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -46,6 +46,7 @@ test/test.xcodeproj/*/xcuser*\n test/*.o\n test/*.pem\n test/*.srl\n+test/... | [
{
"subtask_id": "s3",
"comment": "https://github.com/google/gtest-parallel may be useful here",
"revised_diff": "diff --git a/test/Makefile b/test/Makefile\nindex 9b2d1e75cf..b8f5babee0 100644\n--- a/test/Makefile\n+++ b/test/Makefile\n@@ -56,6 +56,42 @@ STYLE_CHECK_FILES = $(filter-out httplib.h httpli... | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 31459e863d..027eda56e7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -94,12 +94,12 @@ jobs:
run: sudo apt-get install -y libmbedtls-dev
- name: build and run tests (OpenSSL)
if: matrix.t... | 3 | 7 |
yhirose/cpp-httplib#2363 | yhirose/cpp-httplib | 2,363 | 14e37bd75b52a31d7e68ccd20bc4e1b505257b6e | 630eee8bd9180a6e192208448bdc2fd948da2596 | Use iptables to disable network | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: Use iptables to disable network",
"scope_files": [
".github/workflows/test_offline.yaml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: Use iptables to d... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/test_offline.yaml"
],
"solution_diff": "diff --git a/.github/workflows/test_offline.yaml b/.github/workflows/test_offline.yaml\nindex 64e86177b1..8814877e61 100644\n--- a/.github/workflows/test_offline.yaml\n+++ b/.github/workflows/test... | [] |
diff --git a/.github/workflows/test_offline.yaml b/.github/workflows/test_offline.yaml
index 64e86177b1..8814877e61 100644
--- a/.github/workflows/test_offline.yaml
+++ b/.github/workflows/test_offline.yaml
@@ -40,7 +40,13 @@ jobs:
if: matrix.tls_backend == 'openssl'
run: sudo apt-get install -y libs... | 2 | 2 |
yiisoft/yii2#20944 | yiisoft/yii2 | 20,944 | 58a18a87bfd8e79a3a61f2b1757f77b2629623a1 | 9893aea1042cd67f661fe0cdb70e90fb4914a1c1 | Fix MSSQL `QueryBuilder::renameColumn()` to pass `sp_rename` named arguments and a one-part new column name.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix MSSQL `QueryBuilder::renameColumn()` to pass `sp_rename` named arguments and a one-part new column name.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 2ef5a57ccc7..f7177f83287 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -95,6 +95,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 2ef5a57ccc7..f7177f83287 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -95,6 +95,7 @@ Yii Framework 2 Change Log
- Enh #20941: Modernize MSSQL `yii\db\mssql\Schema` internals and remove dead `unsigned` detection (terabytesoftw)
-... | 4 | 6 |
yiisoft/yii2#20943 | yiisoft/yii2 | 20,943 | d649d0b90101e76e0265a558bc67e6f73af9985b | 9d25e787f6dc05ccbbec81aca9a9599f8fd3d8bd | Fix MSSQL `QueryBuilder::renameTable()` to call `sp_rename` with string parameters and one-part new table names.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix MSSQL `QueryBuilder::renameTable()` to call `sp_rename` with string parameters and one-part new table names.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Imple... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex f4ca42bbda6..2ef5a57ccc7 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -94,6 +94,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_๐ฏ Functional Correctness_ | _๐ Major_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Web query:\n\n`In SQL Server `sp_rename`, for `@objtype = 'OBJECT'`, must `@newname` be provided as a one-part string value (not a multipart/qualified name)?`\n\n๐ก Result:\n\n... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index f4ca42bbda6..2ef5a57ccc7 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -94,6 +94,7 @@ Yii Framework 2 Change Log
- Enh #20939: Replace `strpos()` with `str_contains()` in `yii\db\Schema` quoting methods and fix `quoteValue()` `@pa... | 4 | 6 |
yiisoft/yii2#20942 | yiisoft/yii2 | 20,942 | f7cf36e0e55871ad9f34f400540941e03c58cc57 | acd1ae3f18a74ea0c8ab0cf0265b8c862f85cf45 | Fix MSSQL `yii\db\mssql\QueryBuilder::alterColumn()` to drop column default, check, and unique constraints before the `ALTER COLUMN` statement, allowing column redefinition on constrained columns without duplicate constraint name errors.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix MSSQL `yii\\db\\mssql\\QueryBuilder::alterColumn()` to drop column default, check, and unique constraints before the `ALTER COLUMN` statement, allowing column ",
"scope_files": [
"framework/CHANGELOG.md"
]
... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b746d6500a0..f4ca42bbda6 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -92,7 +92,8 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Drop the same constraint types you recreate.**\n\nLine 156 removes only default constraints, but Lines 178-193 always append new `CHECK`/`UNIQUE` constraints when the builder still carries those modifiers. An `alterColu... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index b746d6500a0..f4ca42bbda6 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -92,7 +92,8 @@ Yii Framework 2 Change Log
- Bug #20937: Exclude configurable system schema names from MSSQL `yii\db\Schema::getSchemaNames()` to match the non-... | 4 | 7 |
yiisoft/yii2#20941 | yiisoft/yii2 | 20,941 | eb6de08ff4a6aa63e4f0f5f02c24c6074738a9e1 | 1cf903c5ce6584aa4a4bcca350191593c150a31d | Modernize MSSQL `yii\db\mssql\Schema` internals and remove dead `unsigned` detection.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Modernize MSSQL `yii\\db\\mssql\\Schema` internals and remove dead `unsigned` detection.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 8d00eb9e8da..b746d6500a0 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -92,6 +92,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 8d00eb9e8da..b746d6500a0 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -92,6 +92,7 @@ Yii Framework 2 Change Log
- Bug #20937: Exclude configurable system schema names from MSSQL `yii\db\Schema::getSchemaNames()` to match the non-... | 2 | 2 |
yiisoft/yii2#20939 | yiisoft/yii2 | 20,939 | 733998b2a863e6c39e6389f35a2ab873957009a5 | 97bbd044b9a83e97ebfb0aa8ae339006afbdd1d0 | Replace `strpos()` with `str_contains()` in `yii\db\Schema` quoting methods and fix `quoteValue()` `@param` to `mixed`.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Replace `strpos()` with `str_contains()` in `yii\\db\\Schema` quoting methods and fix `quoteValue()` `@param` to `mixed`.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 6a59bb7b534..8d00eb9e8da 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -91,6 +91,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Missing `str_starts_with` import for consistency.**\n\n`str_starts_with()` is used at line 513 but is not included in the function imports. While it will work as a global function in PHP 8+, adding it would maintain consisten... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 6a59bb7b534..8d00eb9e8da 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -91,6 +91,7 @@ Yii Framework 2 Change Log
- Chg #20936: Remove redundant `resolveTableNames()` from MSSQL, MySQL, PostgreSQL, and Oracle schema classes; `loadT... | 14 | 16 |
yiisoft/yii2#20938 | yiisoft/yii2 | 20,938 | e67b0c44e8b227b2a5e597c34669b00f66d8cfb4 | 83366023c601e9f3e6325f87d340d60007c6f707 | Fix MSSQL `QueryBuilder::dropConstraintsForColumn()` to drop primary key, foreign key, and table-level check constraints, replacing deprecated `sys.sysconstraints` with modern catalog views.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix MSSQL `QueryBuilder::dropConstraintsForColumn()` to drop primary key, foreign key, and table-level check constraints, replacing deprecated `sys.sysconstrain",
"scope_files": [
"framework/CHANGELOG.md"
]
}... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 0d5fa53829e..6a59bb7b534 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -90,6 +90,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Use changelog convention and correct change type on Line 93.**\n\nLine 93 should follow the sectionโs `<Type> #<id>:` format and be marked as a bugfix, not enhancement, to match PR `#20938` intent and keep changelog tra... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 0d5fa53829e..6a59bb7b534 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -90,6 +90,7 @@ Yii Framework 2 Change Log
- Bug #20935: Fix MSSQL index, foreign key, and constraint metadata lookups for catalog-qualified table names (teraby... | 4 | 4 |
yiisoft/yii2#20937 | yiisoft/yii2 | 20,937 | dce74588f25e6f3f221b571c0466c5787afa5172 | 7e1b4595c880d4cd677039cc7f82018e8fd19d71 | Exclude configurable system schema names from MSSQL `yii\db\Schema::getSchemaNames()` to match the non-system schema contract.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Exclude configurable system schema names from MSSQL `yii\\db\\Schema::getSchemaNames()` to match the non-system schema contract.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex cecbaa5351b..0d5fa53829e 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -89,6 +89,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index cecbaa5351b..0d5fa53829e 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -89,6 +89,7 @@ Yii Framework 2 Change Log
- Enh #20934: Replace MSSQL `INFORMATION_SCHEMA.TABLES` in `Schema::findTableNames()` and `Schema::findViewNames()` w... | 5 | 5 |
yiisoft/yii2#20936 | yiisoft/yii2 | 20,936 | 5c2419a3be165643175da71cb1387e936af772c3 | 2f6e6dc3aa6b6dace4c62c08db1f6ae5bd350e90 | Remove redundant `resolveTableNames()` from MSSQL, MySQL, PostgreSQL, and Oracle schema classes; `loadTableSchema()` now uses `resolveTableName()`.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ๏ธ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Remove redundant `resolveTableNames()` from MSSQL, MySQL, PostgreSQL, and Oracle schema classes; `loadTableSchema()` now uses `resolveTableName()`.",
"scope_files": [
"framework/CHANGELOG.md",
"framework/UPGR... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md",
"framework/UPGRADE-22.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 0143d15d653..cecbaa5351b 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -88,6 +88,7 ... | [
{
"subtask_id": "s5",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Use the quote-stripped single-part name here.**\n\nLine 86 falls back to `$name` instead of `$parts[0]`. For unqualified quoted input like `\"MyTable\"`, `TableSchema::$name` keeps the quotes, so the later `ALL_TAB_COLU... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 0143d15d653..cecbaa5351b 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -88,6 +88,7 @@ Yii Framework 2 Change Log
- Enh #20933: Replace MSSQL `INFORMATION_SCHEMA.KEY_COLUMN_USAGE` and `TABLE_CONSTRAINTS` in `Schema::findTableConstr... | 8 | 9 |
yiisoft/yii2#20935 | yiisoft/yii2 | 20,935 | 2a68575dc822bdbef5795c9a726544dc9afc4b58 | a2b067dc4dcd0cfd3df3e9531a0d945d8ec0ab64 | Fix MSSQL index, foreign key, and constraint metadata lookups for catalog-qualified table names.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix MSSQL index, foreign key, and constraint metadata lookups for catalog-qualified table names.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex fd5dc0b4840..0143d15d653 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -87,6 +87,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s3",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Ensure fixture cleanup runs on assertion failures.**\n\nCleanup currently runs only on the success path (e.g., Line 216, Line 266, Line 324, Line 366, Line 413, Line 460). If an assertion fails earlier, test tables are ... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index fd5dc0b4840..0143d15d653 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -87,6 +87,7 @@ Yii Framework 2 Change Log
- Bug #20931: Fix `yii\caching\DbCache` MSSQL reference schema using the invalid `BLOB` type instead of `varbinary(ma... | 4 | 4 |
yiisoft/yii2#20934 | yiisoft/yii2 | 20,934 | 5f5756712dabfb7ab5d9e69d2fc57888dd47aa6a | 6634313dcb113c7491801279e38c9010c1a72e65 | Replace MSSQL `INFORMATION_SCHEMA.TABLES` in `Schema::findTableNames()` and `Schema::findViewNames()` with catalog-qualified `sys.objects` and `sys.views` catalog views.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Replace MSSQL `INFORMATION_SCHEMA.TABLES` in `Schema::findTableNames()` and `Schema::findViewNames()` with catalog-qualified `sys.objects` and `sys.views` catal",
"scope_files": [
"framework/CHANGELOG.md"
]
}... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 9717090f1ce..fd5dc0b4840 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -86,6 +86,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 9717090f1ce..fd5dc0b4840 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -86,6 +86,7 @@ Yii Framework 2 Change Log
- Bug #20931: Fix `yii\caching\DbCache` reading PostgreSQL `bytea` cached data as a stream by converting it in `yii\d... | 4 | 4 |
yiisoft/yii2#20933 | yiisoft/yii2 | 20,933 | 97bbf066daeb5b3965712bf6bd15f2a5932d7f1a | e0714e7d61706fe9cb1b06655f52c06d454cb617 | Replace MSSQL `INFORMATION_SCHEMA.KEY_COLUMN_USAGE` and `TABLE_CONSTRAINTS` in `Schema::findTableConstraints()` with `sys.key_constraints`, and preserve composite key column order with `sys.index_columns.key_ordinal`.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Replace MSSQL `INFORMATION_SCHEMA.KEY_COLUMN_USAGE` and `TABLE_CONSTRAINTS` in `Schema::findTableConstraints()` with `sys.key_constraints`, and preserve composi",
"scope_files": [
"framework/CHANGELOG.md"
]
}... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex cf5efb0b09b..9717090f1ce 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -85,6 +85,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index cf5efb0b09b..9717090f1ce 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -85,6 +85,7 @@ Yii Framework 2 Change Log
- Chg #19595: Store `yii\web\DbSession` `data` as `varbinary(max)` on MSSQL and cast it through `yii\db\mssql\ColumnS... | 4 | 5 |
yiisoft/yii2#20932 | yiisoft/yii2 | 20,932 | 49d41252e91b37aea87054bb5ca00993941d8e24 | 7329d0eeb9eac513c5de3fadb00034184096be96 | Sync to master brach.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `docs/guide/` needed for: Sync to master brach.",
"scope_files": [
"docs/guide/caching-data.md",
"docs/guide/security-authorization.md",
"docs/guide/security-best-practices.md"
]
},
{
"subtask_id": "s2",
"goal":... | [
{
"subtask_id": "s1",
"scope_files": [
"docs/guide/caching-data.md",
"docs/guide/security-authorization.md",
"docs/guide/security-best-practices.md"
],
"solution_diff": "diff --git a/docs/guide/caching-data.md b/docs/guide/caching-data.md\nindex 89b1e54506b..6add029880c 100644\n---... | [] | diff --git a/docs/guide/caching-data.md b/docs/guide/caching-data.md
index 89b1e54506b..6add029880c 100644
--- a/docs/guide/caching-data.md
+++ b/docs/guide/caching-data.md
@@ -281,6 +281,11 @@ Below is a summary of the available cache dependencies:
the dependency associated with the cached data, if there is any, ha... | 5 | 7 |
yiisoft/yii2#20931 | yiisoft/yii2 | 20,931 | bbd8de9c1b01fac1691264230eb4cbe96b52aec4 | a8b50ef58f83e149535587b4b05cab39f00479b5 | MSSql schema getting identity column fails when crossing databases
### Problem
Active record schema inspection fails to identify MSSql identity columns in a specific circumstance.
### What steps will reproduce the problem?
Using a CActiveRecord model with MSSql where tableName is something like
```
class Blah... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: MSSql schema getting identity column fails when crossing databases",
"scope_files": [
"framework/CHANGELOG.md",
"framework/UPGRADE-22.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the chan... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md",
"framework/UPGRADE-22.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex df16c938709..a376426c642 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -81,6 +81,10... | [
{
"subtask_id": "s5",
"comment": "_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Consider explicit handling of stream read failures.**\n\nIf `stream_get_contents()` fails and returns `false`, the current code falls through to `parent::phpTypecast($value)`, which would likely convert `false` to an empty st... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index df16c938709..a376426c642 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -81,6 +81,10 @@ Yii Framework 2 Change Log
- Enh #20923: Add explicit default values to `ColumnSchema` properties in `yii\db`, `yii\db\mssql`, and `yii\db\pgsq... | 16 | 24 |
yiisoft/yii2#20888 | yiisoft/yii2 | 20,888 | d77f4bb160c3a405a91f66da9893b7f617d79093 | 53ca5c032828766d3b4de391490dc97881cbcbcf | Fix #20261: Preserve modification time when rotating log files
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Tests added? | โ๏ธ
| Breaks BC? | โ
| Fixed issues | #20261
## What does this PR do?
Preserves the modification time of a log file when `yii\log\FileTarget`... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix #20261: Preserve modification time when rotating log files",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/log/` needed for... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 9b8f2906284..eecb82c2708 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -18,6 +18,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "`@touch($newFile, $mtime)` runs even when `@copy()` fails. Since `touch()` creates the file when it doesn't exist, a failed copy (I/O error, or a concurrent rotation that unlinks the destination) could leave behind an empty\nrotated file. Gating the touch on a successful co... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 9b8f2906284..eecb82c2708 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -18,6 +18,7 @@ Yii Framework 2 Change Log
- Bug #20891: Fix `@property` annotation for `Request::$bodyParams` (mspirkov)
- Bug #20889: Remove unreachable PHP ... | 3 | 3 |
yiisoft/yii2#20930 | yiisoft/yii2 | 20,930 | 139635be2d0ad344811aedb901655430d8022cb6 | e37a601487433ddf6117292d7911bef850954f8a | Add schema providers and enhance schema tests for across databases.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Add schema providers and enhance schema tests for across databases.",
"scope_files": [
"composer.lock",
"phpstan-baseline.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `te... | [
{
"subtask_id": "s1",
"scope_files": [
"composer.lock",
"phpstan-baseline.neon"
],
"solution_diff": "diff --git a/composer.lock b/composer.lock\nindex 2ba14915eb7..73fba923ac7 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -389,16 +389,16 @@\n },\n {\n \... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ด Critical_ | _โก Quick win_\n\n**Incorrect parameter in refreshTableSchema call.**\n\nLine 222 passes `$testTablePrefix` (a prefix like `\"ty\"`) to `refreshTableSchema()`, but the method expects a table name, not a prefix. This should be `$testTabl... | diff --git a/composer.lock b/composer.lock
index 2ba14915eb7..73fba923ac7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -389,16 +389,16 @@
},
{
"name": "composer/composer",
- "version": "2.10.0",
+ "version": "2.10.1",
"source": {
"t... | 19 | 70 |
yiisoft/yii2#20929 | yiisoft/yii2 | 20,929 | 3cbf93b4b003f27438e0d16ef1a121f3ac5da329 | 36459e36083b06ecf1974a4425371811f02b201f | Fix `yii\db\oci\Schema::insert()` returning only the first primary key value for composite keys, caused by a reused `foreach` reference.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix `yii\\db\\oci\\Schema::insert()` returning only the first primary key value for composite keys, caused by a reused `foreach` reference.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex c8d49bd0d9e..df16c938709 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -80,6 +80,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index c8d49bd0d9e..df16c938709 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -80,6 +80,7 @@ Yii Framework 2 Change Log
- Enh #20922: Consolidate SQLite data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `DEFAULT NULL... | 4 | 4 |
yiisoft/yii2#20928 | yiisoft/yii2 | 20,928 | 3ca89c7b91f2dcfb99f43622566674e83ec736d2 | 3a91ee3753d901c6b9f3e69761e5cefb6741a444 | Remove legacy MySQL version support code from `yii\db\mysql\Schema`.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ๏ธ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `docs/guide/` needed for: Remove legacy MySQL version support code from `yii\\db\\mysql\\Schema`.",
"scope_files": [
"docs/guide/db-dao.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/` needed... | [
{
"subtask_id": "s1",
"scope_files": [
"docs/guide/db-dao.md"
],
"solution_diff": "diff --git a/docs/guide/db-dao.md b/docs/guide/db-dao.md\nindex 4249a03157a..2e7519583bf 100644\n--- a/docs/guide/db-dao.md\n+++ b/docs/guide/db-dao.md\n@@ -11,16 +11,12 @@ you have to take extra effort to creat... | [] | diff --git a/docs/guide/db-dao.md b/docs/guide/db-dao.md
index 4249a03157a..2e7519583bf 100644
--- a/docs/guide/db-dao.md
+++ b/docs/guide/db-dao.md
@@ -11,16 +11,12 @@ you have to take extra effort to create a database-agnostic application.
In Yii 2.0, DAO supports the following databases out of the box:
-- [MySQ... | 4 | 5 |
yiisoft/yii2#20913 | yiisoft/yii2 | 20,913 | a560bc87616ce4334b05ce4619122dd872bd8696 | 40df4d9f060bd741d97b15a9be191c3e598ed0a7 | Hardening: consider safer serialization formats for cache and RBAC storage
Yii2 currently uses PHP serialization for some trusted persistence formats, including cache entries with dependencies and RBAC item/rule data. This is expected behavior today and is not directly exploitable through normal Yii APIs: an attacker ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `docs/guide/` needed for: Hardening: consider safer serialization formats for cache and RBAC storage",
"scope_files": [
"docs/guide/caching-data.md",
"docs/guide/security-authorization.md",
"docs/guide/security-best-practices.m... | [
{
"subtask_id": "s1",
"scope_files": [
"docs/guide/caching-data.md",
"docs/guide/security-authorization.md",
"docs/guide/security-best-practices.md"
],
"solution_diff": "diff --git a/docs/guide/caching-data.md b/docs/guide/caching-data.md\nindex 89b1e54506b..6add029880c 100644\n---... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\nset -euo pipefail\n\necho \"== Cache serializer API ==\"\nrg -n -C3 '\\$serializer|serialize\\(|unserialize\\(' framework do... | diff --git a/docs/guide/caching-data.md b/docs/guide/caching-data.md
index 89b1e54506b..6add029880c 100644
--- a/docs/guide/caching-data.md
+++ b/docs/guide/caching-data.md
@@ -281,6 +281,11 @@ Below is a summary of the available cache dependencies:
the dependency associated with the cached data, if there is any, ha... | 3 | 5 |
yiisoft/yii2#20923 | yiisoft/yii2 | 20,923 | ba34f48ec0600011280fd5a47149a086c2990ce0 | 7248b49ef0e89838d4fcce74bc34c1cb722288b0 | Add explicit default values to `ColumnSchema` properties in `yii\db`, `yii\db\mssql`, and `yii\db\pgsql`.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Add explicit default values to `ColumnSchema` properties in `yii\\db`, `yii\\db\\mssql`, and `yii\\db\\pgsql`.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Impleme... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 4dab8855cc8..a55f8f17121 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -78,6 +78,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 4dab8855cc8..a55f8f17121 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -78,6 +78,7 @@ Yii Framework 2 Change Log
- Enh #20920: Consolidate Oracle data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `CURRENT_TIME... | 6 | 6 |
yiisoft/yii2#20922 | yiisoft/yii2 | 20,922 | 8580d5e073fe8f487cc4e82fcb759d80c02fecf1 | 484ddedb10d9733c58c456bf70ab66db605a71e4 | Consolidate SQLite data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `DEFAULT NULL` and escaped-quote defaults.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Consolidate SQLite data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `DEFAULT NULL` and escaped-quote defaults.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2"... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 239d235bd84..4dab8855cc8 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -77,6 +77,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Preserve non-string defaults before coercing to SQLite text.**\n\nThis override string-casts every non-null input, so the public `defaultPhpTypecast()` API no longer behaves like the base class for already-typed values ... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 239d235bd84..4dab8855cc8 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -77,6 +77,7 @@ Yii Framework 2 Change Log
- Enh #20919: Consolidate MySQL data-type conversion into `ColumnSchema::defaultPhpTypecast()` and preserve explicit ... | 4 | 6 |
yiisoft/yii2#20921 | yiisoft/yii2 | 20,921 | f768e13701ba32a6d557a26e2ba3b9c301c0b122 | 5bd44e31fb7caa46c6f27fab2190b6927b43e1cb | Consolidate PostgreSQL data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `phpTypecastValue()` for native boolean value.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Consolidate PostgreSQL data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `phpTypecastValue()` for native boolean value.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_i... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex ce362f02035..239d235bd84 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -33,49 +33,50 @@ Yii Framework 2 Change Log\n... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Add the PR reference in this changelog item.**\n\nPlease include the PR number (e.g., `Enh #<PR_NUMBER>:`) for consistency and traceability in `framework/CHANGELOG.md`. \n \n\nBased on learnings, `framework/CHANGELOG.m... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index ce362f02035..239d235bd84 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -33,49 +33,50 @@ Yii Framework 2 Change Log
- Enh #20801: Update PHP `8.3` and PHPUnit `11.5` compatibility (terabytesoftw)
- Chg #20804: Remove Yii runtime a... | 7 | 9 |
yiisoft/yii2#20882 | yiisoft/yii2 | 20,882 | fa9bd28bebb2da0540a516cd5e903a5f4b3583c0 | b76577b1b0ca285bac4fe7ec39d84c19696b2207 | Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$actionNamespace`.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting standalone actions discovered through `Module::$acti",
"scope_files": [
"composer.lock"
]
},
{
"s... | [
{
"subtask_id": "s1",
"scope_files": [
"composer.lock"
],
"solution_diff": "diff --git a/composer.lock b/composer.lock\nindex 595956640b4..48ea4d43e72 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -1426,11 +1426,11 @@\n },\n {\n \"name\": \"phpstan/phpstan\",... | [
{
"subtask_id": "s3",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\nset -euo pipefail\n\n# Verify whether the repo already contains subclasses of Pagination\n# or additional resolveRoute() dec... | diff --git a/composer.lock b/composer.lock
index 595956640b4..48ea4d43e72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1426,11 +1426,11 @@
},
{
"name": "phpstan/phpstan",
- "version": "2.1.54",
+ "version": "2.1.55",
"dist": {
"typ... | 4 | 6 |
yiisoft/yii2#20920 | yiisoft/yii2 | 20,920 | dd4ad5da511cc181a308e33134be805ac60ff92a | 68cc9b7726f29ce7f9c38f10ece38d0417221487 | Consolidate Oracle data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `CURRENT_TIMESTAMP` defaults returned as `null`.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Consolidate Oracle data-type conversion into `ColumnSchema::defaultPhpTypecast()` and fix `CURRENT_TIMESTAMP` defaults returned as `null`.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id"... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex ed7fa663cfd..ce362f02035 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -75,6 +75,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s4",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Make the `NULL` literal check case-insensitive.**\n\nOracle stores `DATA_DEFAULT` text verbatim, so a column defined with lowercase `DEFAULT null` arrives here as `'null'` and bypasses this guard. It then falls through ... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index ed7fa663cfd..ce362f02035 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -75,6 +75,7 @@ Yii Framework 2 Change Log
- Bug: Fix `yii\helpers\Url::current()` and `yii\helpers\Url::canonical()` to fall back to `Application::$requestedRo... | 9 | 11 |
yiisoft/yii2#20919 | yiisoft/yii2 | 20,919 | 07d7a582d5f29295a341688fa607d9229e8f473b | 507ac9e31afbbc08f7b49016195c6d4b1be0da24 | Consolidate MySQL data-type conversion into `ColumnSchema::defaultPhpTypecast()` and preserve explicit `CURRENT_TIMESTAMP(0)` default precision.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Consolidate MySQL data-type conversion into `ColumnSchema::defaultPhpTypecast()` and preserve explicit `CURRENT_TIMESTAMP(0)` default precision.",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subta... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 7dda5e33deb..ed7fa663cfd 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -74,6 +74,7 @@ Yii Framework 2 Change Log\n -... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 7dda5e33deb..ed7fa663cfd 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -74,6 +74,7 @@ Yii Framework 2 Change Log
- Bug: Fix `Sort::createUrl()` and `Pagination::createUrl()` to fall back when no controller is active, supporting st... | 4 | 6 |
yiisoft/yii2#20918 | yiisoft/yii2 | 20,918 | bb89a9d0526e9286d4559a8e51d43cb51dd66cba | bd90ac83e38cf4a96f5c4985aed2b65f999c4033 | Consolidate MSSQL data-type conversion into `ColumnSchema`: harden `defaultPhpTypecast()` for unicode (`N'...'`), escaped quotes, and expression defaults; add `getOutputColumnDeclaration()` used by `QueryBuilder::insert()`.
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Consolidate MSSQL data-type conversion into `ColumnSchema`: harden `defaultPhpTypecast()` for unicode (`N'...'`), escaped quotes, and expression defaults; add `",
"scope_files": [
"composer.lock",
"phpstan-basel... | [
{
"subtask_id": "s1",
"scope_files": [
"composer.lock",
"phpstan-baseline.neon"
],
"solution_diff": "diff --git a/composer.lock b/composer.lock\nindex 48ea4d43e72..2ba14915eb7 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -248,16 +248,16 @@\n },\n {\n \... | [
{
"subtask_id": "s5",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Add a combined unicode + escaped-quote default case**\n\nThe hardening target includes unicode literals and escaped quotes; add a single case such as `(N'it''s') => \"it's\"` to cover the combined parsing path and preve... | diff --git a/composer.lock b/composer.lock
index 48ea4d43e72..2ba14915eb7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -248,16 +248,16 @@
},
{
"name": "composer/ca-bundle",
- "version": "1.5.11",
+ "version": "1.5.12",
"source": {
"... | 5 | 9 |
yiisoft/yii2#20917 | yiisoft/yii2 | 20,917 | 066e168d674268637bb568cd40c31a106a4e1412 | 32151face43e1e9fb2dcfd65def3161cc1cf458c | Sync to master brach.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `build/controllers/` needed for: Sync to master brach.",
"scope_files": [
"build/controllers/ReleaseController.php"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/` needed for: Sync to master bra... | [
{
"subtask_id": "s1",
"scope_files": [
"build/controllers/ReleaseController.php"
],
"solution_diff": "diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/buil... | [] | diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index 4ffa7142f05..e7c36cf436a 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)
protected function ... | 6 | 6 |
yiisoft/yii2#20895 | yiisoft/yii2 | 20,895 | 3dea6d59b9a54e1eaa599081ae30bfd4a976d69a | 1f4fb57bd147ea7b4870ed260d14197da4da3770 | Harden PhpMessageSource category path handling
`yii\i18n\PhpMessageSource` builds message file paths from the translation category. Category names intentionally support slash-separated namespaces such as `app/error`, `modules/users/validation`, and `widgets/menu/messages`, but unsafe path segments are currently not re... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Harden PhpMessageSource category path handling",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/i18n/` needed for: Harden PhpMes... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 4bba8cbfa39..3a9a40dca30 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -16,6 +16,7 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Don't overconstrain the first category segment.**\n\nThis regex now rejects safe relative categories whose first segment starts with `.` or `-` (for example, `.messages`), even though they still resolve under `basePath`... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 4bba8cbfa39..3a9a40dca30 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -16,6 +16,7 @@ Yii Framework 2 Change Log
- Bug #20891: Fix `@return` annotation for `RequestParserInterface::parse()`, `JsonParser::parse()`, `Request::getBod... | 4 | 4 |
yiisoft/yii2#20911 | yiisoft/yii2 | 20,911 | 540c7de68aad91907481f8cb34ba97ae91aec973 | 2ebf83509323de04076ddf5d9ca9552741595a93 | Fix release changelog version detection
## Summary
- keep the release command's selected version authoritative
- update the active CHANGELOG `under development` section to the selected version before sorting
- normalize invalid `Fix #...` changelog entries to canonical `Bug #...` before sorting
- fail loudly when no m... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `build/controllers/` needed for: Fix release changelog version detection",
"scope_files": [
"build/controllers/ReleaseController.php"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `tests/framework/` needed... | [
{
"subtask_id": "s1",
"scope_files": [
"build/controllers/ReleaseController.php"
],
"solution_diff": "diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex b5f53881186..e7c36cf436a 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/buil... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Use exact version-boundary matching when locating the changelog section.**\n\n`splitChangelog()` still uses substring matching for headings. A requested version like `2.0.5` can incorrectly match `2.0.50 ...`, mark the ... | diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index b5f53881186..e7c36cf436a 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -854,6 +854,7 @@ protected function openChangelogs($what, $version)
protected function ... | 2 | 2 |
yiisoft/yii2#20910 | yiisoft/yii2 | 20,910 | dc66de6f7af49927aace4bd778cb1761eba19087 | 640f803e40ae12a75adbe18ee12c140bb68af05e | Fix changelog sorting when there are fix intries instead of bug
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | -
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `build/controllers/` needed for: Fix changelog sorting when there are fix intries instead of bug",
"scope_files": [
"build/controllers/ReleaseController.php"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `... | [
{
"subtask_id": "s1",
"scope_files": [
"build/controllers/ReleaseController.php"
],
"solution_diff": "diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php\nindex 4ffa7142f05..b5f53881186 100644\n--- a/build/controllers/ReleaseController.php\n+++ b/buil... | [] | diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index 4ffa7142f05..b5f53881186 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -913,6 +913,7 @@ protected function resortChangelog($changelog)
// cleanup whitespa... | 2 | 2 |
yiisoft/yii2#20903 | yiisoft/yii2 | 20,903 | 04bb96d928c06b3e12e87ab8100cdefeb0905212 | 15ddf5a4235ef05fc20e8d4396ec4674556b9db7 | Fix `yii\helpers\Url::current()` and `yii\helpers\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting standalone actions.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix `yii\\helpers\\Url::current()` and `yii\\helpers\\Url::canonical()` to fall back to `Application::$requestedRoute` when no controller is active, supporting stan",
"scope_files": [
"framework/CHANGELOG.md",
... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md",
"framework/UPGRADE-22.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 31153757114..b500b9a0520 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -72,6 +72,7 ... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Use PHP method-call syntax in the route example.**\n\n`parent.runAction('child/ping')` is not valid PHP notation and may mislead readers during migration. Prefer a PHP-style call or explicitly mark it as pseudocode.\n\n... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 31153757114..b500b9a0520 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -72,6 +72,7 @@ Yii Framework 2 Change Log
- Chg: Drop dead SQL Server `< 2017` branches from MSSQL `Schema::loadColumnSchema()` (terabytesoftw)
- Chg: Drop de... | 8 | 13 |
yiisoft/yii2#20892 | yiisoft/yii2 | 20,892 | 1b37da4fd1d4bfd0ab1a23eee5618efd45dbaf96 | 446ae2532595144a53d3205825e9f5f953f230f6 | Sync to master brach.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `build/controllers/` needed for: Sync to master brach.",
"scope_files": [
"build/controllers/MimeTypeController.php"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/` needed for: Sync to master br... | [
{
"subtask_id": "s1",
"scope_files": [
"build/controllers/MimeTypeController.php"
],
"solution_diff": "diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/... | [] | diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php
index d8709cdca6e..2549f67ea23 100644
--- a/build/controllers/MimeTypeController.php
+++ b/build/controllers/MimeTypeController.php
@@ -47,6 +47,7 @@ class MimeTypeController extends Controller
'application/bmp' =>... | 5 | 7 |
yiisoft/yii2#20891 | yiisoft/yii2 | 20,891 | 1b2fc6812bae97674d885021c64b20f8616710e3 | 7c76543e65eb30ff3603c7ab6d9133c6b478888c | Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix the types in the PHPDoc annotations for `JsonParser`, `Request`, and `RequestParserInterface`",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the change... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex b355f2e7d36..4bba8cbfa39 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -13,6 +13,9 @@ Yii Framework 2 Change Log\n -... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Complete the type-doc update for `bodyParams` to avoid conflicting contracts.**\n\nThese new `mixed` annotations conflict with existing docs that still state `array|object` (Line 44 `@property $bodyParams`, Line 595 `ge... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index b355f2e7d36..4bba8cbfa39 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -13,6 +13,9 @@ Yii Framework 2 Change Log
- Bug #20878: Fix `@var` annotation for `yii\db\Query::$from` (mspirkov)
- Enh #7616: Add `yii\web\ErrorHandler::EVE... | 2 | 4 |
yiisoft/yii2#20884 | yiisoft/yii2 | 20,884 | 7d6cf45aeb1f119cc4e23132190437ce5391cf7f | 029a8d30920a8287478561eade0d9ee39c016ab7 | Can we add an additional mime-type for RAR?
The list of mime-types at https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types and in the framework only includes the `application/x-rar-compressed` type.
https://github.com/yiisoft/yii2/blob/22889d314ab4ea20df00e594d4ef7fb09fa55f5a/framework/helpers/mim... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `build/controllers/` needed for: Can we add an additional mime-type for RAR?",
"scope_files": [
"build/controllers/MimeTypeController.php"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/` needed ... | [
{
"subtask_id": "s1",
"scope_files": [
"build/controllers/MimeTypeController.php"
],
"solution_diff": "diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php\nindex d8709cdca6e..2549f67ea23 100644\n--- a/build/controllers/MimeTypeController.php\n+++ b/... | [
{
"subtask_id": "s4",
"comment": "_๐งน Nitpick_ | _๐ต Trivial_ | _๐ค Low value_\n\n**Consider adding test cases with `preferShort=true` for completeness.**\n\nWhile the current test cases with `preferShort=false` are correct, adding test cases with `preferShort=true` would provide more comprehensive coverage... | diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php
index d8709cdca6e..2549f67ea23 100644
--- a/build/controllers/MimeTypeController.php
+++ b/build/controllers/MimeTypeController.php
@@ -47,6 +47,7 @@ class MimeTypeController extends Controller
'application/bmp' =>... | 4 | 4 |
yiisoft/yii2#20881 | yiisoft/yii2 | 20,881 | 2ab8eaf777bff2ba6c942f4d1b77a5929d4246ee | 645d7d54f0a1570a0e88e72844141e4a684c6558 | Sync to master brach.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Sync to master brach.",
"scope_files": [
"composer.lock",
"phpstan-baseline.neon",
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `docs/guide/` needed f... | [
{
"subtask_id": "s1",
"scope_files": [
"composer.lock",
"phpstan-baseline.neon",
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/composer.lock b/composer.lock\nindex f9f75af4753..595956640b4 100644\n--- a/composer.lock\n+++ b/composer.lock\n@@ -389,16 +389,16 @@\n },\... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n<details>\n<summary>๐งฉ Analysis chain</summary>\n\n๐ Script executed:\n\n```shell\n#!/bin/bash\n# Verify where isMariaDb() is called and what static type is used nearby.\nrg -n -C3 '\\bisMariaDb\\s*\\(' tests/framework/d... | diff --git a/composer.lock b/composer.lock
index f9f75af4753..595956640b4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -389,16 +389,16 @@
},
{
"name": "composer/composer",
- "version": "2.9.7",
+ "version": "2.9.8",
"source": {
"typ... | 13 | 39 |
yiisoft/yii2#20878 | yiisoft/yii2 | 20,878 | ff66e6a8548034043c416b71cbd572ce811e8f23 | a75e4ce0bade2864f790126a6aa2b83099167c9e | Analyze the `yiiunit\framework\db` namespace using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ๏ธ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\db` namespace using PHPStan",
"scope_files": [
"phpstan-baseline-7x.neon",
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `fr... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan-baseline-7x.neon",
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon\nindex 13be3e5bae1..6be48e7c140 100644\n--- a/phpstan-baseline-7x.neon\n+++ b/phpstan-baseline-7x.neon\n@@ -77,3 +7... | [
{
"subtask_id": "s4",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Fix PHPDoc type mismatch for `orderItems2`.**\n\nLine 37 documents `@property-read Item[] $orderItems2`, but `getOrderItems2()` (Line 104-108) returns `hasMany(OrderItem::class, ...)`. This gives wrong type info to PHPS... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index a1ae1155dc9..d220536ddb5 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,11 +4,13 @@ Yii Framework 2 Change Log
2.0.56 under development
------------------------
-- Bug #20783: Fix PHPDoc annotations for the `yii\log\Target::$... | 12 | 37 |
yiisoft/yii2#20877 | yiisoft/yii2 | 20,877 | 95d8df577f6d0e49b2b3539b67cbbf8fc8de0514 | c360844a44762d80f3c92151e0b136a84a1b6987 | Fix #7616: Add `yii\web\ErrorHandler::EVENT_AFTER_RENDER` and `yii\web\ErrorHandlerRenderEvent` to post-process rendered HTML error output
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ๏ธ
| Breaks BC? | โ
| Fixed issues | #7616
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `framework/` needed for: Fix #7616: Add `yii\\web\\ErrorHandler::EVENT_AFTER_RENDER` and `yii\\web\\ErrorHandlerRenderEvent` to post-process rendered HTML error output",
"scope_files": [
"framework/CHANGELOG.md"
]
},
{
"subtask... | [
{
"subtask_id": "s1",
"scope_files": [
"framework/CHANGELOG.md"
],
"solution_diff": "diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md\nindex 0d83c0d7557..a1ae1155dc9 100644\n--- a/framework/CHANGELOG.md\n+++ b/framework/CHANGELOG.md\n@@ -9,6 +9,7 @@ Yii Framework 2 Change Log\n - B... | [] | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 0d83c0d7557..a1ae1155dc9 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -9,6 +9,7 @@ Yii Framework 2 Change Log
- Bug #20785: Fix `@return` annotation for `yii\base\Model::getErrors()` (mspirkov)
- Bug #20785: Fix `@var` annotatio... | 3 | 4 |
yiisoft/yii2#20876 | yiisoft/yii2 | 20,876 | 532d02f22f4df59ec9cec3a3c8ae27b4585841fa | fd73f904838fd358b2920a4f171d6997545858d5 | Sync to master brach.
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Sync to master brach.",
"scope_files": [
".git-blame-ignore-revs",
"composer.lock",
"phpstan-baseline.neon",
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the chan... | [
{
"subtask_id": "s1",
"scope_files": [
".git-blame-ignore-revs",
"composer.lock",
"phpstan-baseline.neon",
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs\nindex ce85e65af96..881b51a65e3 100644\n--- a/.git-blame-ignore-rev... | [
{
"subtask_id": "s19",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Harden savepoint test cleanup to avoid state leakage on failure.**\n\nThis test only deletes inserted data on the happy path. If an assertion/DB call fails earlier, rows can leak and destabilize later tests.\n\n \n<det... | diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index ce85e65af96..881b51a65e3 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -24,3 +24,5 @@ da20adc82aef3eb5ae0bad3889fe6695e6424f06
7a7d2a9c06c099de8064729ca3fc95fb24241b75
# Fixed error PHPCS latest version in `PHP 8.5`
f66d5c886471... | 35 | 90 |
yiisoft/yii2#20875 | yiisoft/yii2 | 20,875 | 0f5774ae62b22c9724a12e520cea8adb7ac83785 | 280fd066b1c55490d88bf3e3a72a8ee143dfa4f9 | Analyze the `yiiunit\framework\validators` namespace using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ๏ธ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\validators` namespace using PHPStan",
"scope_files": [
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `build/controllers/` needed f... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex c369f29ed19..608efda39af 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -5,6 +5,8 @@ includes:\n parameters:\n level: 3\n \n+ reportIgn... | [
{
"subtask_id": "s6",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Document `attr_image` and `attr_images` too for PHPStan completeness.**\n\nThe docblock omits two dynamic `attr*` fields that are actively used in `rules()` (`attr_image`, `attr_images`). Adding them keeps the dynamic-p... | diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index b0da27b75ad..bc4f3ea5f09 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -713,13 +713,14 @@ protected function updateDocComment($doc, $properties, $className)
... | 9 | 25 |
yiisoft/yii2#20874 | yiisoft/yii2 | 20,874 | fad5fd58eb61e4bf937db4646bf2389f7f32f1dd | 98c8351236517d49aba592befd3e20c520c87d8f | Analyze more tests using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan",
"scope_files": [
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `tests/framework/grid/` needed for: Analyze more tests using PHPS... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 51e87b57398..c369f29ed19 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -17,9 +17,6 @@ parameters:\n - tests/framework/*/mocks/*\n... | [
{
"subtask_id": "s4",
"comment": "_๐งน Nitpick_ | _๐ต Trivial_ | _โก Quick win_\n\n**Add explicit return type for PHPStan compliance.**\n\nThe `customError()` method should declare its return type as `:string` to improve static analysis and code clarity, aligning with the PR's goal of PHPStan compliance.\n\n\... | diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 51e87b57398..c369f29ed19 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -17,9 +17,6 @@ parameters:
- tests/framework/*/mocks/*
# TODO: Analyze these directories
- tests/framework/db
- - tests/framework/... | 5 | 13 |
yiisoft/yii2#20873 | yiisoft/yii2 | 20,873 | f52efd863a5b91939844280d8e9385d20fe3271f | 3810dbf11837fa8405cac8eba30a6fcb1abf8ec3 | Analyze the `yiiunit\framework\log` namespace using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ๏ธ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\log` namespace using PHPStan",
"scope_files": [
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `framework/` needed for: Analyze the... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 20abc47d15b..51e87b57398 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -20,7 +20,6 @@ parameters:\n - tests/framework/grid\n ... | [
{
"subtask_id": "s2",
"comment": "_โ ๏ธ Potential issue_ | _๐ก Minor_ | _โก Quick win_\n\n**Add the missing list marker for the new changelog item.**\n\nLine 7 should use the same bullet-list format as other entries (`- ...`) to keep changelog formatting consistent.\n\n \n\n<details>\n<summary>Suggested fix</s... | diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 27b0954258b..2296dfc0938 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
2.0.56 under development
------------------------
-- no changes in this release.
+- Bug #20783: Fix PHPDoc annotatio... | 5 | 10 |
yiisoft/yii2#20786 | yiisoft/yii2 | 20,786 | cef4122784b39a2e4aae6b65a8e2b5c508f1afa2 | e7f28131f4cf0688070ccfda579a1d6046897a45 | Add unit tests for mutex classes
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Tests added? | โ๏ธ
| Breaks BC? | โ
| Fixed issues |
## What does this PR do?
Adds unit tests for `Mutex`, `DbMutex`, and `OracleMutex`.
### Coverage
| File | Tests | Lines | MSI |... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `tests/framework/mutex/` needed for: Add unit tests for mutex classes",
"scope_files": [
"tests/framework/mutex/DbMutexTest.php",
"tests/framework/mutex/MutexTest.php",
"tests/framework/mutex/OracleMutexTest.php"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"tests/framework/mutex/DbMutexTest.php",
"tests/framework/mutex/MutexTest.php",
"tests/framework/mutex/OracleMutexTest.php"
],
"solution_diff": "diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php\nnew fi... | [] |
diff --git a/tests/framework/mutex/DbMutexTest.php b/tests/framework/mutex/DbMutexTest.php
new file mode 100644
index 00000000000..3392c9ac549
--- /dev/null
+++ b/tests/framework/mutex/DbMutexTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software ... | 1 | 3 |
yiisoft/yii2#20795 | yiisoft/yii2 | 20,795 | a271aeee800a3e5dcda705180e72f3168973b7aa | 583dfe6e06550015f221383fa0f0f8f9d7f4d2be | Strengthen MSSQL `QueryBuilderTest` and `SchemaTest` coverage
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Tests added? | โ๏ธ
| Breaks BC? | โ
| Fixed issues |
## What does this PR do?
Adds tests for previously uncovered methods in MSSQL QueryBuilder, Schema and I... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `tests/framework/db/mssql/` needed for: Strengthen MSSQL `QueryBuilderTest` and `SchemaTest` coverage",
"scope_files": [
"tests/framework/db/mssql/QueryBuilderTest.php",
"tests/framework/db/mssql/SchemaTest.php"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"tests/framework/db/mssql/QueryBuilderTest.php",
"tests/framework/db/mssql/SchemaTest.php"
],
"solution_diff": "diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php\nindex 3d626dacd58..6624729524... | [] |
diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php
index 3d626dacd58..6624729524b 100644
--- a/tests/framework/db/mssql/QueryBuilderTest.php
+++ b/tests/framework/db/mssql/QueryBuilderTest.php
@@ -855,4 +855,159 @@ public static function buildFromDataProvider(): ... | 1 | 2 |
yiisoft/yii2#20872 | yiisoft/yii2 | 20,872 | 8d024ec5bed740af370f93782a75c1241d382f5b | 3e46c59446d107631c900122ef33ed6a2c6a3030 | Analyze more tests using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze more tests using PHPStan",
"scope_files": [
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `tests/framework/base/` needed for: Analyze more tests using PHPS... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4f6666327d7..20abc47d15b 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -13,25 +13,14 @@ parameters:\n excludePaths:\n analyse:\n ... | [
{
"subtask_id": "s7",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _โก Quick win_\n\n**Docblock types for `$pagination`/`$sort` are incorrect for actual data-provider inputs.**\n\nOn Line 75 and Line 76, both params are documented as `array`, but this test also passes `Pagination|false` and `Sort|false`. ... | diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 4f6666327d7..20abc47d15b 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -13,25 +13,14 @@ parameters:
excludePaths:
analyse:
- tests/data
- - tests/framework/base/stub
- - tests/framework/console/stubs
- ... | 8 | 15 |
yiisoft/yii2#20871 | yiisoft/yii2 | 20,871 | d0a0f0f93e8a382549775ae5970e193bda1bc5b8 | 9c520a46189032b5b5a9c5dd6c1e54fcdaa99c90 | Analyze the `yiiunit\framework\web` and `yiiunit\framework\widgets` namespaces using PHPStan
| Q | A
| ------------- | ---
| Is bugfix? | โ
| New feature? | โ
| Breaks BC? | โ
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any -->
| [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Analyze the `yiiunit\\framework\\web` and `yiiunit\\framework\\widgets` namespaces using PHPStan",
"scope_files": [
"phpstan.dist.neon"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `... | [
{
"subtask_id": "s1",
"scope_files": [
"phpstan.dist.neon"
],
"solution_diff": "diff --git a/phpstan.dist.neon b/phpstan.dist.neon\nindex 4728321b2fe..4f6666327d7 100644\n--- a/phpstan.dist.neon\n+++ b/phpstan.dist.neon\n@@ -14,8 +14,11 @@ parameters:\n analyse:\n - tests/d... | [
{
"subtask_id": "s1",
"comment": "_โ ๏ธ Potential issue_ | _๐ Major_ | _๐๏ธ Heavy lift_\n\n**New exclusions contradict the PRโs analysis scope.**\n\nAdding `tests/framework/web/mocks` and `tests/framework/web/stubs` to `excludePaths.analyse` narrows analysis for the exact `web` area this PR is meant to cover... | diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 4728321b2fe..4f6666327d7 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -14,8 +14,11 @@ parameters:
analyse:
- tests/data
- tests/framework/base/stub
+ - tests/framework/console/stubs
- tests/f... | 8 | 27 |
yt-dlp/yt-dlp#16948 | yt-dlp/yt-dlp | 16,948 | 9055188250348c3e6e29eee53e5fb3dc2c951977 | 6e6bbb28ac54af9c9ba05de637160d9824ebae42 | [youtube] yt-dlp occasionally only fetches the first 100 vids of a playlist
### Checklist
- [x] I'm reporting that yt-dlp is broken on a **supported** site
- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
- [x] I've check... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `yt_dlp/extractor/youtube/` needed for: [youtube] yt-dlp occasionally only fetches the first 100 vids of a playlist",
"scope_files": [
"yt_dlp/extractor/youtube/_base.py",
"yt_dlp/extractor/youtube/_tab.py"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"yt_dlp/extractor/youtube/_base.py",
"yt_dlp/extractor/youtube/_tab.py"
],
"solution_diff": "diff --git a/yt_dlp/extractor/youtube/_base.py b/yt_dlp/extractor/youtube/_base.py\nindex d3e4ab11767e..59a470ff6d81 100644\n--- a/yt_dlp/extractor/youtube/... | [
{
"subtask_id": "s1",
"comment": "fyi: creepy bible banger channel got taken down",
"revised_diff": "diff --git a/yt_dlp/extractor/youtube/_tab.py b/yt_dlp/extractor/youtube/_tab.py\nindex 78d5e5b6088a..197231daff91 100644\n--- a/yt_dlp/extractor/youtube/_tab.py\n+++ b/yt_dlp/extractor/youtube/_tab.py\n... | diff --git a/yt_dlp/extractor/youtube/_base.py b/yt_dlp/extractor/youtube/_base.py
index d3e4ab11767e..59a470ff6d81 100644
--- a/yt_dlp/extractor/youtube/_base.py
+++ b/yt_dlp/extractor/youtube/_base.py
@@ -1037,8 +1037,10 @@ def _extract_continuation(cls, renderer):
return next_continuation
ret... | 1 | 2 |
yt-dlp/yt-dlp#16931 | yt-dlp/yt-dlp | 16,931 | 707537a03946fbc5707e22be429545c670cd8ec2 | 7ce44d0916125e6c71d910288cf0c5223806661d | [utils] Deprecate `make_dir` in favor of `make_parent_dirs`
<!--
**IMPORTANT**: PRs without the template will be CLOSED
Due to the high volume of pull requests, it may be a while before your PR is reviewed.
Please try to keep your pull request focused on a single bugfix or new feature.
Pull r... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [utils] Deprecate `make_dir` in favor of `make_parent_dirs`",
"scope_files": [
"pyproject.toml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_dlp/` needed for: [utils] Deprecate `... | [
{
"subtask_id": "s1",
"scope_files": [
"pyproject.toml"
],
"solution_diff": "diff --git a/pyproject.toml b/pyproject.toml\nindex 8128fb31a85a..ccbfa74404e5 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -395,6 +395,7 @@ banned-from = [\n \"yt_dlp.utils.bytes_to_intlist\".msg = \"Use `l... | [
{
"subtask_id": "s4",
"comment": "can move this to `yt_dlp.utils._deprecated`, have it import `make_parent_dirs` locally, and add it to `tool.ruff.flake8-tidy-import.banned-api` in pyproject.toml",
"revised_diff": "diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py\nindex 43ee53729ebb..4cc7a76... | diff --git a/pyproject.toml b/pyproject.toml
index 8128fb31a85a..ccbfa74404e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -395,6 +395,7 @@ banned-from = [
"yt_dlp.utils.bytes_to_intlist".msg = "Use `list` instead."
"yt_dlp.utils.intlist_to_bytes".msg = "Use `bytes` instead."
"yt_dlp.utils.jwt_encode_hs256".m... | 4 | 5 |
yt-dlp/yt-dlp#3435 | yt-dlp/yt-dlp | 3,435 | afac4caa7db30804bebac33e53c3cb0237958224 | c8d5c5ee3bd7d1a86d73c1537f6ca090ab5a06e6 | add '--client-certificate some.pem' to authenticate a site user to the remote machine
### Checklist
- [X] I'm reporting a feature request
- [X] I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
- [X] I've verified that I'm running yt-dlp version **2022.03.08.1** ([update instructions](https://... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: add '--client-certificate some.pem' to authenticate a site user to the remote machine",
"scope_files": [
"README.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: ... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex 448b5c884f19..f8813cbb6dcd 100644\n--- a/README.md\n+++ b/README.md\n@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi\n ... | [
{
"subtask_id": "s1",
"comment": "imo, it should be `--client-certificate`, `--client-certificate-key`, `--client-certificate-password`.\r\n\r\nAlso, it would be great if password (if not given) can be obtained from netrc",
"revised_diff": "diff --git a/README.md b/README.md\nindex 448b5c884f19..f8813cb... | diff --git a/README.md b/README.md
index 448b5c884f19..f8813cbb6dcd 100644
--- a/README.md
+++ b/README.md
@@ -840,6 +840,15 @@ You can also fork the project on github and run your fork's [build workflow](.gi
interactively
--ap-list-mso List all supported mu... | 4 | 16 |
yt-dlp/yt-dlp#16930 | yt-dlp/yt-dlp | 16,930 | e47691215f75fe7e9684080d17fadf340c9a8450 | 519ccdf6a558cf8caf981ce1df1747a2fcccb09c | [utils] Fix `HTTPHeaderDict.__ior__`
<!--
**IMPORTANT**: PRs without the template will be CLOSED
Due to the high volume of pull requests, it may be a while before your PR is reviewed.
Please try to keep your pull request focused on a single bugfix or new feature.
Pull requests with a vast sco... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: [utils] Fix `HTTPHeaderDict.__ior__`",
"scope_files": [
"test/test_utils.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_dlp/utils/` needed for: [utils] Fix `HTTPHeaderDict.__ior_... | [
{
"subtask_id": "s1",
"scope_files": [
"test/test_utils.py"
],
"solution_diff": "diff --git a/test/test_utils.py b/test/test_utils.py\nindex cd0fb0f2e970..8f86d151b28c 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -2172,6 +2172,10 @@ def test_http_header_dict(self):\n ... | [] | diff --git a/yt_dlp/utils/networking.py b/yt_dlp/utils/networking.py
index 32c7acdb1483..33cca412dc38 100644
--- a/yt_dlp/utils/networking.py
+++ b/yt_dlp/utils/networking.py
@@ -64,7 +64,7 @@ def __ior__(self, other, /):
other = other.sensitive()
if isinstance(other, dict):
self.upda... | 2 | 2 |
yt-dlp/yt-dlp#16920 | yt-dlp/yt-dlp | 16,920 | 7f7bdc974dc61d941d1a0d51c4e21a0fdb7b2d06 | d3bd1b8cc344064ceb6b69b3ee11c308c01e57ed | compat-options allow-unsafe-ext errors yt-dlp
### Checklist
- [x] I'm reporting a bug unrelated to a specific site
- [x] I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
- [x] I've searched [known issues](https://github.com/yt-... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: compat-options allow-unsafe-ext errors yt-dlp",
"scope_files": [
"test/test_utils.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_dlp/` needed for: compat-options allow-unsafe-ext... | [
{
"subtask_id": "s1",
"scope_files": [
"test/test_utils.py"
],
"solution_diff": "diff --git a/test/test_utils.py b/test/test_utils.py\nindex 180ede624077..cd0fb0f2e970 100644\n--- a/test/test_utils.py\n+++ b/test/test_utils.py\n@@ -327,6 +327,12 @@ def test_prepend_extension(self):\n ... | [] | diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py
index 18cf4c8d2c3f..ec3d52755dc6 100644
--- a/yt_dlp/__init__.py
+++ b/yt_dlp/__init__.py
@@ -619,7 +619,7 @@ def report_conflict(arg1, opt1, arg2='--allow-unplayable-formats', opt2='allow_u
warnings.append(
'Using allow-unsafe-ext opens you up ... | 3 | 3 |
yt-dlp/yt-dlp#16697 | yt-dlp/yt-dlp | 16,697 | 25056f0d2d47adbd235a8d422fa62d68d0be2bc2 | 1aeef222c575ee7a036520f138c1f7089e44713d | [cleanup] Misc
<!--
**IMPORTANT**: PRs without the template will be CLOSED
Due to the high volume of pull requests, it may be a while before your PR is reviewed.
Please try to keep your pull request focused on a single bugfix or new feature.
Pull requests with a vast scope and/or very large d... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `devscripts/` needed for: [cleanup] Misc",
"scope_files": [
"devscripts/changelog_override.json",
"devscripts/update_requirements.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for:... | [
{
"subtask_id": "s1",
"scope_files": [
"devscripts/changelog_override.json",
"devscripts/update_requirements.py"
],
"solution_diff": "diff --git a/devscripts/changelog_override.json b/devscripts/changelog_override.json\nindex 937a8880bc8f..7ff3a6caa0fc 100644\n--- a/devscripts/changelog_... | [] | diff --git a/devscripts/changelog_override.json b/devscripts/changelog_override.json
index 937a8880bc8f..7ff3a6caa0fc 100644
--- a/devscripts/changelog_override.json
+++ b/devscripts/changelog_override.json
@@ -342,5 +342,30 @@
"action": "add",
"when": "1fbbe29b99dc61375bf6d786f824d9fcf6ea9c1a",
... | 4 | 7 |
yt-dlp/yt-dlp#16137 | yt-dlp/yt-dlp | 16,137 | e85da3b98532761573d8b48ccd4d8d28dee94b15 | e8dddb9176c3a15a7d692b0ab71462b22a01140c | hketv: unable to extract file ID
### Checklist
- [X] I'm reporting a broken site
- [X] I've verified that I'm running yt-dlp version **2022.02.03**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
- [X] I've checked that all provided URLs are alive and playable in a browser
- [X] I've checked th... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: hketv: unable to extract file ID",
"scope_files": [
"test/test_subtitles.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_dlp/extractor/` needed for: hketv: unable to extract file ... | [
{
"subtask_id": "s1",
"scope_files": [
"test/test_subtitles.py"
],
"solution_diff": "diff --git a/test/test_subtitles.py b/test/test_subtitles.py\nindex 53e0b4eaf8dc..32e80df952c0 100644\n--- a/test/test_subtitles.py\n+++ b/test/test_subtitles.py\n@@ -16,7 +16,6 @@\n CeskaTelevizeIE,\n ... | [
{
"subtask_id": "s2",
"comment": "it calls a non-existent `_extract_video_info` method now\r\n```suggestion\r\n _WORKING = False\r\n IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'\r\n```",
"revised_diff": "diff --git a/yt_dlp/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py\nindex 1eb25530f8... | diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py
index 1a29a93edaf8..f47a36099a12 100644
--- a/yt_dlp/extractor/_extractors.py
+++ b/yt_dlp/extractor/_extractors.py
@@ -54,7 +54,6 @@
WyborczaPodcastIE,
WyborczaVideoIE,
)
-from .airtv import AirTVIE
from .aitube import AitubeKZV... | 2 | 96 |
yt-dlp/yt-dlp#16827 | yt-dlp/yt-dlp | 16,827 | bc90c36b139c87cdc59399561dc1650198047a72 | 83c32f03861755dc7feb23d798f9317cc235157b | Extract supplemental codecs from DASH manifests
<!--
**IMPORTANT**: PRs without the template will be CLOSED
Due to the high volume of pull requests, it may be a while before your PR is reviewed.
Please try to keep your pull request focused on a single bugfix or new feature.
Pull requests with... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: Extract supplemental codecs from DASH manifests",
"scope_files": [
"test/test_InfoExtractor.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/testdata/mpd/` needed for: Extract su... | [
{
"subtask_id": "s1",
"scope_files": [
"test/test_InfoExtractor.py"
],
"solution_diff": "diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py\nindex f66fdbf8da6f..63aef689a14f 100644\n--- a/test/test_InfoExtractor.py\n+++ b/test/test_InfoExtractor.py\n@@ -1415,6 +1415,51 @@ def... | [] | diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py
index 31c0266d4a9d..048c542858e5 100644
--- a/yt_dlp/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@@ -2970,6 +2970,8 @@ def extract_Initialization(source):
content_type = representation_attrib.get('contentType', mime_type.... | 3 | 3 |
yt-dlp/yt-dlp#16782 | yt-dlp/yt-dlp | 16,782 | 10b54835cf3f0d63cdd964a2f411db8f7cac3ff1 | 32724e2ac3f0b7449e0be95536b88045345a11de | [ci] Update 3 actions in 9 workflows
<!-- BEGIN dlp-bot generated section -->
Updated with `--exclude-newer 2026-06-08T13:09:14.108419Z`
action | old | new | diff
-------|-----|-----|-----
[**`actions/checkout`**](<https://github.com/actions/checkout>) | [v6.0.***2***](<https://github.com/actions/checkout/releases/t... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [ci] Update 3 actions in 9 workflows",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/codeql.yml",
".github/workflows/core.yml"... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/codeql.yml",
".github/workflows/core.yml",
".github/workflows/quick-test.yml",
".github/workflows/release-nightly.yml",
".github/workflo... | [] | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a45a4b4e158f..37bbd65893bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -195,7 +195,7 @@ jobs:
UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214... | 1 | 9 |
yt-dlp/yt-dlp#16903 | yt-dlp/yt-dlp | 16,903 | 1e4668e9df78ff2409e139b51610442cbefe762e | 7fe27c4d1aba6b6d25fc715f96870dfbd8517e89 | [build] Update 12 dependencies
<!-- BEGIN dlp-bot generated section -->
package | old | new | diff | changelog
--------|-----|-----|------|----------
[**`certifi`**](<https://pypi.org/project/certifi/>) | [2026.***4.22***](<https://github.com/certifi/python-certifi/releases/tag/2026.04.22>) | [2026.***5.20***](<https... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [build] Update 12 dependencies",
"scope_files": [
"pyproject.toml",
"uv.lock"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `bundle/requirements/` needed for: [build] Update 12 ... | [
{
"subtask_id": "s1",
"scope_files": [
"pyproject.toml",
"uv.lock"
],
"solution_diff": "diff --git a/pyproject.toml b/pyproject.toml\nindex b2f8a007335b..8128fb31a85a 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -69,9 +69,9 @@ deno = [\n pin = [\n \"brotli==1.2.0 ; implemen... | [] | diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt
index 16068a0eb5f9..00850201a6c8 100644
--- a/bundle/requirements/build.txt
+++ b/bundle/requirements/build.txt
@@ -81,11 +81,11 @@ tomli==2.4.1 ; python_full_version < '3.11' \
# via
# build
# hatchling
-trove-classifiers==20... | 2 | 12 |
yt-dlp/yt-dlp#16589 | yt-dlp/yt-dlp | 16,589 | 98e42eb04486e00bf86479b24dbfe19321f652ee | 0415640523afcfb97dbf5e87e1cd4459b341f212 | [build] Update 14 dependencies
<!-- BEGIN dlp-bot generated section -->
package | old | new | diff | changelog
--------|-----|-----|------|----------
[**`build`**](<https://pypi.org/project/build/>) | [1.***4.4***](<https://github.com/pypa/build/releases/tag/1.4.4>) | [1.***5.0***](<https://github.com/pypa/build/rele... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [build] Update 14 dependencies",
"scope_files": [
"pyproject.toml",
"uv.lock"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `bundle/requirements/` needed for: [build] Update 14 ... | [
{
"subtask_id": "s1",
"scope_files": [
"pyproject.toml",
"uv.lock"
],
"solution_diff": "diff --git a/pyproject.toml b/pyproject.toml\nindex dcc67352b813..b2f8a007335b 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,11 +71,11 @@ pin = [\n \"brotlicffi==1.2.0.1 ; implementat... | [] | diff --git a/bundle/requirements/build.txt b/bundle/requirements/build.txt
index 3b3830cd7806..16068a0eb5f9 100644
--- a/bundle/requirements/build.txt
+++ b/bundle/requirements/build.txt
@@ -1,6 +1,6 @@
-build==1.4.4 \
- --hash=sha256:8c3f48a6090b39edec1a273d2d57949aaf13723b01e02f9d518396887519f64d \
- --hash=sha... | 2 | 16 |
yt-dlp/yt-dlp#16883 | yt-dlp/yt-dlp | 16,883 | 7aac95eae663be82cffeaf2a8c1193a5e349e401 | 4431ce9d64b78b4cbdf94fc3420201e81b28220d | [pp/exec] Restrict `--exec` template usage to safe conversions
Remove `--exec` footguns by restricting the conversions and default/placeholder values that are able to be used in the `exec` command template.
Previously, the user was able to pass something like this:
```
--exec 'echo "%(title)s"'
```
This could y... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [pp/exec] Restrict `--exec` template usage to safe conversions",
"scope_files": [
"README.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/` needed for: [pp/exec] Restrict `--e... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex 09e290b89dbc..e334bec8ed41 100644\n--- a/README.md\n+++ b/README.md\n@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu\n * `cer... | [
{
"subtask_id": "s3",
"comment": "do we want to allow `'S'` (filename-sanitized)?",
"revised_diff": "diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py\nindex 7db6303d4fda..8ce01d52335b 100644\n--- a/yt_dlp/YoutubeDL.py\n+++ b/yt_dlp/YoutubeDL.py\n@@ -112,6 +112,7 @@\n RejectedVideoReached,\n ... | diff --git a/README.md b/README.md
index 09e290b89dbc..e334bec8ed41 100644
--- a/README.md
+++ b/README.md
@@ -2332,8 +2332,8 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu
* `certifi` will be used for SSL root certificates, if installed. If you want to use system certificates (e.g... | 5 | 7 |
yt-dlp/yt-dlp#16896 | yt-dlp/yt-dlp | 16,896 | 7fdc46d01619afbb2371b0465d6830602013148f | c1e68c43dd875ff23897f45cf5c6d5250b9b5ba5 | [ci] Test with Python 3.15
<details open><summary>Template</summary> <!-- OPEN is intentional -->
### Before submitting a *pull request* make sure you have:
- [x] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [ci] Test with Python 3.15",
"scope_files": [
".github/workflows/challenge-tests.yml",
".github/workflows/core.yml"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/challenge-tests.yml",
".github/workflows/core.yml"
],
"solution_diff": "diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex f55cf68f47d0..7f0f7078f6d1 100644\n--- a/.github/workflows/c... | [] | diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml
index f55cf68f47d0..7f0f7078f6d1 100644
--- a/.github/workflows/challenge-tests.yml
+++ b/.github/workflows/challenge-tests.yml
@@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-l... | 1 | 2 |
yt-dlp/yt-dlp#2222 | yt-dlp/yt-dlp | 2,222 | fdeab99eaba64317f4c72ba6384da98f1c4f2687 | d3c074036e1e527e20d6b516a2c6da4134e1bff4 | [openrec] support movie URLs
### Checklist
- [X] I'm reporting a site feature request
- [X] I've verified that I'm running yt-dlp version **2021.12.27**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
- [X] I've checked that all provided URLs are alive and playable in a browser
- [X] I've searc... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `yt_dlp/extractor/` needed for: [openrec] support movie URLs",
"scope_files": [
"yt_dlp/extractor/extractors.py",
"yt_dlp/extractor/openrec.py"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
"yt_dlp/extractor/extractors.py",
"yt_dlp/extractor/openrec.py"
],
"solution_diff": "diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py\nindex 77d6ef511de4..02236bf6796b 100644\n--- a/yt_dlp/extractor/extractors.py\n+++ b/y... | [] | diff --git a/yt_dlp/extractor/extractors.py b/yt_dlp/extractor/extractors.py
index 77d6ef511de4..02236bf6796b 100644
--- a/yt_dlp/extractor/extractors.py
+++ b/yt_dlp/extractor/extractors.py
@@ -1058,6 +1058,7 @@
from .openrec import (
OpenRecIE,
OpenRecCaptureIE,
+ OpenRecMovieIE,
)
from .ora import Or... | 1 | 2 |
yt-dlp/yt-dlp#624 | yt-dlp/yt-dlp | 624 | 888299e6ca65009e8ae2809c384ba1ba6b5ae701 | 867c7a3c32093b1dd197beba21ca62a6ad08ba37 | [openrec] add support for openrec.tv
## Please follow the guide below
- You will be asked some questions, please read them **carefully** and answer honestly
- Put an `x` into all the boxes [ ] relevant to your *pull request* (like that [x])
- Use *Preview* tab to see how your *pull request* will actually look lik... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [openrec] add support for openrec.tv",
"scope_files": [
"README.md"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_dlp/extractor/` needed for: [openrec] add support for openrec.tv"... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex 7fb2c087404d..9ac50dbe00e2 100644\n--- a/README.md\n+++ b/README.md\n@@ -88,7 +88,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/\n \n * **Ari... | [
{
"subtask_id": "s2",
"comment": "Use try_get / traverse_obj",
"revised_diff": "diff --git a/yt_dlp/extractor/openrec.py b/yt_dlp/extractor/openrec.py\nnew file mode 100644\nindex 000000000000..d7073ab445bc\n--- /dev/null\n+++ b/yt_dlp/extractor/openrec.py\n@@ -0,0 +1,126 @@\n+# coding: utf-8\n+from __f... | diff --git a/README.md b/README.md
index 7fb2c087404d..9ac50dbe00e2 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/
* **Aria2c with HLS/DASH**: You can use `aria2c` as the external downloader for DASH(mpd) and HLS(m3u8) formats... | 2 | 3 |
yt-dlp/yt-dlp#16787 | yt-dlp/yt-dlp | 16,787 | e534a32619d1d944631a0483f28522bdd11f0745 | 5781682ef3b24e14264ed03a4e620adce332b6d1 | [Announcement] `ejs` is dropping support for Node v20 and v21
Node (aka Node.js) is an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime.
Node v20 reached its end-of-life (EOL) at the end of April 2026. Node v21, which is not a long-term support (LTS) version of Node, reached its end-of-life well b... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [Announcement] `ejs` is dropping support for Node v20 and v21",
"scope_files": [
".github/workflows/challenge-tests.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `yt_d... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/challenge-tests.yml"
],
"solution_diff": "diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex c76b9fa84c83..36f973f9b77d 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/wo... | [] | diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml
index c76b9fa84c83..36f973f9b77d 100644
--- a/.github/workflows/challenge-tests.yml
+++ b/.github/workflows/challenge-tests.yml
@@ -60,7 +60,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@48b55a011bda9f5d6ae... | 2 | 2 |
yt-dlp/yt-dlp#16788 | yt-dlp/yt-dlp | 16,788 | 125bb40468a8618e592d607c1c496095fda764f0 | 2942dc0334d22b03e50b156181d93b7a267c3c79 | [Announcement] Raising the minimum supported version of Deno to v2.3.0
Deno is an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime.
As of the next yt-dlp and/or ejs release, the minimum supported version of Deno will be raised from `v2.0.0` to `v2.3.0`.
This is being done for security reasons: De... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [Announcement] Raising the minimum supported version of Deno to v2.3.0",
"scope_files": [
".github/workflows/challenge-tests.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes un... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/challenge-tests.yml"
],
"solution_diff": "diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 287a115bd10d..c76b9fa84c83 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/wo... | [] | diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml
index 287a115bd10d..c76b9fa84c83 100644
--- a/.github/workflows/challenge-tests.yml
+++ b/.github/workflows/challenge-tests.yml
@@ -50,7 +50,7 @@ jobs:
- name: Install Deno
uses: denoland/setup-deno@667a34cdef165d8d2b... | 2 | 2 |
yt-dlp/yt-dlp#16786 | yt-dlp/yt-dlp | 16,786 | b536d72c869e47eb048fc54746e4d2f384706d2f | efc3fcab514e9f43931815ff22dbbbd70acb38b4 | [Announcement] Bun support is now limited and deprecated
Due to foreseeable compatibility and security issues, yt-dlp's support for Bun as an [`ejs`](https://github.com/yt-dlp/ejs)-compatible JavaScript runtime is being both limited and deprecated.
As of the next yt-dlp and/or ejs release, only Bun versions `1.2.11` ... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [Announcement] Bun support is now limited and deprecated",
"scope_files": [
".github/workflows/challenge-tests.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `test/test... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/challenge-tests.yml"
],
"solution_diff": "diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml\nindex 36f973f9b77d..f55cf68f47d0 100644\n--- a/.github/workflows/challenge-tests.yml\n+++ b/.github/wo... | [] | diff --git a/.github/workflows/challenge-tests.yml b/.github/workflows/challenge-tests.yml
index 36f973f9b77d..f55cf68f47d0 100644
--- a/.github/workflows/challenge-tests.yml
+++ b/.github/workflows/challenge-tests.yml
@@ -54,8 +54,7 @@ jobs:
- name: Install Bun
uses: oven-sh/setup-bun@0c5077e51419868618aea... | 5 | 6 |
yt-dlp/yt-dlp#14257 | yt-dlp/yt-dlp | 14,257 | 7c9b10ebc83907d37f9f65ea9d4bd6f5e3bd1371 | cc6bf1c384de37365160ca50eee03d6e652fd06b | Clarify third-party licenses and license Windows builds under GPL due to `mutagen`
<!--
######################################################################
WARNING!
IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
###################################################################... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: Clarify third-party licenses and license Windows builds under GPL due to `mutagen`",
"scope_files": [
"README.md",
"THIRD_PARTY_LICENSES.txt"
]
},
{
"subtask_id": "s2",
"goal": "Implement the cha... | [
{
"subtask_id": "s1",
"scope_files": [
"README.md",
"THIRD_PARTY_LICENSES.txt"
],
"solution_diff": "diff --git a/README.md b/README.md\nindex e582e1e53cbe..7be3266ea54c 100644\n--- a/README.md\n+++ b/README.md\n@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/publ... | [
{
"subtask_id": "s1",
"comment": "```suggestion\r\nWhile yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.\r\n\r\nMost notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work... | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 911bdaf6afee..ab02f59beec8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -269,12 +269,11 @@ jobs:
"[![Master](https://img.shields.io/badge/Master%20builds-lightblue.svg?style=for-the-badge... | 4 | 5 |
yt-dlp/yt-dlp#16269 | yt-dlp/yt-dlp | 16,269 | 18656b2f2af41a138793c7012a88f467c0d90274 | 86eb0f9030fcbd0ecabfef759cfd40f2e3730f7c | [youtube] [jsc] Error solving n challenge request using "deno" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')
### Checklist
- [x] I'm reporting that yt-dlp is broken on a **supported** site
- [x] I've verified that I have **updated yt-dlp to nightly or master** ([upd... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `(root)/` needed for: [youtube] [jsc] Error solving n challenge request using \"deno\" provider: Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'origin')",
"scope_files": [
"Makefile",
"README.md",
... | [
{
"subtask_id": "s1",
"scope_files": [
"Makefile",
"README.md",
"pyproject.toml"
],
"solution_diff": "diff --git a/Makefile b/Makefile\nindex b4daeb88a419..de3eabd13b3b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\n \n # The following EJS_-... | [
{
"subtask_id": "s1",
"comment": "1",
"revised_diff": "diff --git a/Makefile b/Makefile\nindex b4daeb88a419..de3eabd13b3b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md\n \n # The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py\n #... | diff --git a/Makefile b/Makefile
index b4daeb88a419..de3eabd13b3b 100644
--- a/Makefile
+++ b/Makefile
@@ -202,9 +202,9 @@ CONTRIBUTORS: Changelog.md
# The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py
# DO NOT EDIT!
-EJS_VERSION = 0.7.0
-EJS_WHEEL_NAME = yt_dlp_ejs-0.7.0-py3-none... | 4 | 7 |
yt-dlp/yt-dlp#16743 | yt-dlp/yt-dlp | 16,743 | 32f1671a906bf375e5b5d39433dd13f917a8dfa7 | e728d6290852c7c5fa1c911d1f684b79faaa7dc4 | [ci] Update 2 actions in 2 workflows
<!-- BEGIN dlp-bot generated section -->
Updated with `--exclude-newer 2026-05-19T01:54:28.178549+00:00`
action | old | new | diff
-------|-----|-----|-----
[**`github/codeql-action`**](<https://github.com/github/codeql-action>) | [v4.35.***2***](<https://github.com/github/codeql... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [ci] Update 2 actions in 2 workflows",
"scope_files": [
".github/workflows/codeql.yml",
".github/workflows/test-workflows.yml"
]
}
] | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/codeql.yml",
".github/workflows/test-workflows.yml"
],
"solution_diff": "diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\nindex 7a048015d8f5..4bc3a63be85e 100644\n--- a/.github/workflows/codeql.yml\n+++ b/... | [] | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7a048015d8f5..4bc3a63be85e 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -36,12 +36,12 @@ jobs:
persist-credentials: false
- name: Initialize CodeQL
- uses: github/codeql-action/init@95e... | 1 | 2 |
yt-dlp/yt-dlp#16740 | yt-dlp/yt-dlp | 16,740 | 410e0af5379c5fc5f2acb6abaa8965637f80ad76 | a282538776726d08d8b6c0d6b25b5b0dddac6ccc | [build] Rename requirements files to clean up dependency graph
We have GitHub's dependency graph and dependabot security scanning enabled for the repo, and dependabot seems to be very confused by the presence of both a `uv.lock` file and a `requirements-dev.txt` file.
The result is a buggy dependabot code path bein... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [build] Rename requirements files to clean up dependency graph",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/core.yml",
".gi... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/core.yml",
".github/workflows/quick-test.yml",
".github/workflows/release.yml",
".github/workflows/test-workflows.yml"
],
"solution_di... | [] | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ecb335433747..a45a4b4e158f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -325,7 +325,7 @@ jobs:
brew uninstall --ignore-dependencies python3
python3 -m venv ~/yt-dlp-build-venv
s... | 4 | 25 |
yt-dlp/yt-dlp#16738 | yt-dlp/yt-dlp | 16,738 | a85b38621286903b9124fdb05d177983d8273ec7 | 99a66bd7960e8eb7ad5570eec7d562e036649302 | [build] Upgrade all Linux binaries to Python 3.14
Per https://www.python.org/downloads/release/python-3145/ :
> Notably, the garbage collector (GC) has changed in Python 3.14.5.
>
> The incremental garbage collector shipped in Python 3.14.0-3.14.4 has been reverted back to the generational garbage collector from... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [build] Upgrade all Linux binaries to Python 3.14",
"scope_files": [
".github/workflows/build.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `bundle/docker/linux/` need... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/build.yml"
],
"solution_diff": "diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex 2f76e0494d4a..ecb335433747 100644\n--- a/.github/workflows/build.yml\n+++ b/.github/workflows/build.yml\n@@ -124,7 +124,7 @@ j... | [] | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f76e0494d4a..ecb335433747 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -124,7 +124,7 @@ jobs:
id: linux_matrix
env:
INPUTS: ${{ toJSON(inputs) }}
- PYTHON_VERSION: '3.13'
... | 2 | 2 |
yt-dlp/yt-dlp#16384 | yt-dlp/yt-dlp | 16,384 | c8695f52a91f0d2aabbba7b7200c1099bfa9a3e5 | ddc22504a056fd7f7729a9e532cee3c830ccb53d | [ci] Update 8 actions in 7 workflows
<!--
[ci] Update 8 actions in 7 workflows
* Bump actions/cache v5.0.3 => v5.0.5
* Bump actions/setup-node v6.3.0 => v6.4.0
* Bump actions/upload-artifact v7.0.0 => v7.0.1
* Bump denoland/setup-deno v2.0.3 => v2.0.4
* Bump github/codeql-action v4.33.0 => v4.35.2
* Bump py... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [ci] Update 8 actions in 7 workflows",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/codeql.yml",
".github/workflows/release-m... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/build.yml",
".github/workflows/challenge-tests.yml",
".github/workflows/codeql.yml",
".github/workflows/release-master.yml",
".github/workflows/release-nightly.yml",
".github/workflows/release.yml",
".github/... | [] | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b02c7280aa31..2f76e0494d4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -231,7 +231,7 @@ jobs:
[[ "${version}" != "${downgraded_version}" ]]
- name: Upload artifacts
- uses: actions/u... | 1 | 7 |
ytdl-org/youtube-dl#33227 | ytdl-org/youtube-dl | 33,227 | d0283f5385acd21dd51afa2102844c8cb2fe6b62 | fc469aace7097887c353d6a28fc3dc75ed7acba1 | no videos returned when trying to download youtube playlist
<!--
######################################################################
WARNING!
IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
######################################################################
-->
## Checklist
<!-... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `youtube_dl/` needed for: no videos returned when trying to download youtube playlist",
"scope_files": [
"youtube_dl/YoutubeDL.py"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `youtube_dl/extractor/` need... | [
{
"subtask_id": "s1",
"scope_files": [
"youtube_dl/YoutubeDL.py"
],
"solution_diff": "diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py\nindex ec1d35c3aca..4c762bf2ccd 100755\n--- a/youtube_dl/YoutubeDL.py\n+++ b/youtube_dl/YoutubeDL.py\n@@ -2404,60 +2404,52 @@ def format_resoluti... | [] | diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index ec1d35c3aca..4c762bf2ccd 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -2404,60 +2404,52 @@ def format_resolution(format, default='unknown'):
return res
def _format_note(self, fdict):
- res = ''
- ... | 2 | 2 |
ytdl-org/youtube-dl#33216 | ytdl-org/youtube-dl | 33,216 | 1e109aaee13a30e2a23f982410ffb3e4f73913df | 2486fbbae152f689f5d538fa55d964173101a110 | [YouTube] Unable to download API page: HTTP Error 400: Bad Request
<!--
######################################################################
WARNING!
IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
######################################################################
-->
## Checkli... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `test/` needed for: [YouTube] Unable to download API page: HTTP Error 400: Bad Request",
"scope_files": [
"test/helper.py",
"test/test_traversal.py",
"test/test_utils.py"
]
},
{
"subtask_id": "s2",
"goal": "Impl... | [
{
"subtask_id": "s1",
"scope_files": [
"test/helper.py",
"test/test_traversal.py",
"test/test_utils.py"
],
"solution_diff": "diff --git a/test/helper.py b/test/helper.py\nindex 6f2129efff3..fac069d25c9 100644\n--- a/test/helper.py\n+++ b/test/helper.py\n@@ -85,10 +85,10 @@ def expe... | [] | diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 8367b6e5345..ec1d35c3aca 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -357,7 +357,7 @@ class YoutubeDL(object):
_NUMERIC_FIELDS = set((
'width', 'height', 'tbr', 'abr', 'asr', 'vbr', 'fps', 'filesize', 'filesiz... | 3 | 10 |
ytdl-org/youtube-dl#33198 | ytdl-org/youtube-dl | 33,198 | 82552faba6f29ced4914cd670ccd80836364fd45 | 49a4d31e59ddbee3603c762e9d3c56a02cacdaf3 | Crash in dev mode when trying to download private YouTube-playlist
<!--
######################################################################
WARNING!
IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
######################################################################
-->
## Checkli... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: Crash in dev mode when trying to download private YouTube-playlist",
"scope_files": [
".github/workflows/ci.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `youtube_dl/e... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/ci.yml"
],
"solution_diff": "diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex c7a8fff8449..073c4458c1d 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -365,7 +365,7 @@ jobs:\n py... | [] | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7a8fff8449..073c4458c1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -365,7 +365,7 @@ jobs:
python -m ensurepip || python -m pip --version || { \
get_pip="${{ contains(needs.select.outputs.own-pip-vers... | 2 | 2 |
ytdl-org/youtube-dl#33189 | ytdl-org/youtube-dl | 33,189 | a084c80f7bac9ae343075a97cc0fb2c1c96ade89 | 59da256324073e03d0fd2e36947790376e283957 | [YouTube] unable to extract player URL, Sign in to confirm you're not a bot
<!--
######################################################################
WARNING!
IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN ISSUE CLOSED AS INCOMPLETE
######################################################################
-->
#... | [
{
"subtask_id": "s1",
"goal": "Implement the changes under `.github/workflows/` needed for: [YouTube] unable to extract player URL, Sign in to confirm you're not a bot",
"scope_files": [
".github/workflows/ci.yml"
]
},
{
"subtask_id": "s2",
"goal": "Implement the changes under `you... | [
{
"subtask_id": "s1",
"scope_files": [
".github/workflows/ci.yml"
],
"solution_diff": "diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex 8234e0ccb6d..c7a8fff8449 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -122,12 +122,12 @@ jobs:\n ... | [] | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8234e0ccb6d..c7a8fff8449 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -122,12 +122,12 @@ jobs:
ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}
run-tests-ext: [sh]
include:
- ... | 4 | 5 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.