gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18373 from MoonE/phpstan-object-shape

Browse Source 
phpstan supports object shape since 1.10.12
This commit is contained in:
Maurício Meneghini Fauth 2023-04-29 21:45:22 -03:00 committed by GitHub
commit 5b63d8485a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -100,7 +100,7 @@
"php-webdriver/webdriver": "^1.14",
"phpmyadmin/coding-standard": "^4.0",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan": "^1.10.12",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-strict-rules": "^1.5",
"phpstan/phpstan-webmozart-assert": "^1.2",

19
libraries/classes/FieldMetadata.php
View File

@ -179,14 +179,13 @@ final class FieldMetadata
* def: string,
* catalog: string,
* } $field
* @phpstan-param object $field Ignore unknown property access
*/
public function __construct(object $field)
{
$type = $field->type; // @phpstan-ignore-line
$type = $field->type;
$this->mappedType = $this->getMappedInternalType($type);
$flags = $field->flags; // @phpstan-ignore-line
$flags = $field->flags;
$this->isMultipleKey = (bool) ($flags & MYSQLI_MULTIPLE_KEY_FLAG);
$this->isPrimaryKey = (bool) ($flags & MYSQLI_PRI_KEY_FLAG);
$this->isUniqueKey = (bool) ($flags & MYSQLI_UNIQUE_KEY_FLAG);
@ -210,13 +209,13 @@ final class FieldMetadata
$this->isMappedTypeGeometry = $this->isType(self::TYPE_GEOMETRY);
$this->isMappedTypeTimestamp = $this->isType(self::TYPE_TIMESTAMP);
$this->name = $field->name; // @phpstan-ignore-line
$this->orgname = $field->orgname; // @phpstan-ignore-line
$this->table = $field->table; // @phpstan-ignore-line
$this->orgtable = $field->orgtable; // @phpstan-ignore-line
$this->charsetnr = $field->charsetnr; // @phpstan-ignore-line
$this->decimals = $field->decimals; // @phpstan-ignore-line
$this->length = $field->length; // @phpstan-ignore-line
$this->name = $field->name;
$this->orgname = $field->orgname;
$this->table = $field->table;
$this->orgtable = $field->orgtable;
$this->charsetnr = $field->charsetnr;
$this->decimals = $field->decimals;
$this->length = $field->length;
// 63 is the number for the MySQL charset "binary"
$this->isBinary = (