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

Upgrade tcpdf

Browse Source 
A lot of phpdoc typehints where added upstream, since it is only documentation I decided to not fix the code on QA.

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-07-20 21:45:47 +02:00
parent 0bce47d4a9
commit 5e3aaac940
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 79 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -92,7 +92,7 @@
"symfony/console": "^4.4",
"symfony/finder": "^4.4",
"symfony/twig-bridge": "^4.4",
"tecnickcom/tcpdf": "^6.4.1",
"tecnickcom/tcpdf": "^6.4.2",
"vimeo/psalm": "^4.8.0"
},
"extra": {

48
phpstan-baseline.neon
View File

@ -1065,6 +1065,16 @@ parameters:
count: 1
path: libraries/classes/OutputBuffering.php
-
message: "#^Parameter \\#1 \\$font of method TCPDF\\:\\:setFooterFont\\(\\) expects array\\<int, string\\>, array\\<int, int\\|string\\> given\\.$#"
count: 1
path: libraries/classes/Pdf.php
-
message: "#^Parameter \\#7 \\$pdfa of method TCPDF\\:\\:__construct\\(\\) expects int, bool given\\.$#"
count: 1
path: libraries/classes/Pdf.php
-
message: "#^Method PhpMyAdmin\\\\Plugins\\:\\:getHtmlForProperty\\(\\) should return string but returns string\\|null\\.$#"
count: 1
@ -1155,6 +1165,16 @@ parameters:
count: 1
path: libraries/classes/Plugins/Export/ExportXml.php
-
message: "#^Binary operation \"\\+\" between array\\<float\\>\\|float and 6 results in an error\\.$#"
count: 2
path: libraries/classes/Plugins/Export/Helpers/Pdf.php
-
message: "#^Parameter \\#7 \\$fill of method TCPDF\\:\\:Cell\\(\\) expects bool, int given\\.$#"
count: 1
path: libraries/classes/Plugins/Export/Helpers/Pdf.php
-
message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
count: 1
@ -1406,7 +1426,7 @@ parameters:
path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
-
message: "#^Parameter \\#3 \\$fontSize of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\EpsRelationSchema\\:\\:addRelation\\(\\) expects int, current\\|int\\|string given\\.$#"
message: "#^Parameter \\#3 \\$fontSize of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\EpsRelationSchema\\:\\:addRelation\\(\\) expects int, float\\|int\\|string given\\.$#"
count: 2
path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
@ -1421,7 +1441,7 @@ parameters:
path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
-
message: "#^Parameter \\#5 \\$fontSize of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps constructor expects int, current\\|int\\|string given\\.$#"
message: "#^Parameter \\#5 \\$fontSize of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps constructor expects int, float\\|int\\|string given\\.$#"
count: 1
path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
@ -1445,6 +1465,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
-
message: "#^Parameter \\#7 \\$fill of method TCPDF\\:\\:Cell\\(\\) expects bool, int given\\.$#"
count: 1
path: libraries/classes/Plugins/Schema/Pdf/Pdf.php
-
message: "#^Cannot access property \\$customLinks on PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\Dia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\Eps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\Pdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\|null\\.$#"
count: 15
@ -1645,6 +1670,11 @@ parameters:
count: 6
path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
-
message: "#^Binary operation \"\\+\\=\" between int and array\\<float\\>\\|float results in an error\\.$#"
count: 1
path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
-
message: "#^Call to an undefined method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\Dia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\Eps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\Pdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:GetStringWidth\\(\\)\\.$#"
count: 3
@ -1690,6 +1720,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
-
message: "#^Property PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats\\:\\:\\$width \\(int\\) does not accept array\\<float\\>\\|float\\|int\\.$#"
count: 1
path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
-
message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\RelationStats\\:\\:getXy\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats, string given\\.$#"
count: 2
@ -1766,7 +1801,7 @@ parameters:
path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
-
message: "#^Parameter \\#3 \\$fontSize of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:addRelation\\(\\) expects int, current\\|int\\|string given\\.$#"
message: "#^Parameter \\#3 \\$fontSize of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:addRelation\\(\\) expects int, float\\|int\\|string given\\.$#"
count: 2
path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
@ -1781,7 +1816,7 @@ parameters:
path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
-
message: "#^Parameter \\#5 \\$fontSize of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg constructor expects int, current\\|int\\|string given\\.$#"
message: "#^Parameter \\#5 \\$fontSize of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg constructor expects int, float\\|int\\|string given\\.$#"
count: 1
path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
@ -2265,6 +2300,11 @@ parameters:
count: 1
path: test/classes/Navigation/Nodes/NodeColumnTest.php
-
message: "#^Parameter \\#1 \\$auto of method TCPDF\\:\\:SetAutoPageBreak\\(\\) expects bool, string given\\.$#"
count: 1
path: test/classes/PdfTest.php
-
message: "#^Parameter \\#1 \\$subgroupHeader of method PhpMyAdmin\\\\Properties\\\\Options\\\\Groups\\\\OptionsPropertySubgroup\\:\\:setSubgroupHeader\\(\\) expects PhpMyAdmin\\\\Properties\\\\PropertyItem, string given\\.$#"
count: 1

47
psalm-baseline.xml
View File

@ -1355,6 +1355,10 @@
</RedundantCastGivenDocblockType>
</file>
<file src="libraries/classes/Pdf.php">
<InvalidScalarArgument occurrences="2">
<code>$pdfa</code>
<code>[self::PMA_PDF_FONT, '', 14]</code>
</InvalidScalarArgument>
<ParamNameMismatch occurrences="1">
<code>$error_message</code>
</ParamNameMismatch>
@ -1563,9 +1567,20 @@
</PossiblyNullArgument>
</file>
<file src="libraries/classes/Plugins/Export/Helpers/Pdf.php">
<InvalidScalarArgument occurrences="1">
<code>1</code>
</InvalidScalarArgument>
<ParamNameMismatch occurrences="1">
<code>$topMargin</code>
</ParamNameMismatch>
<PossiblyInvalidOperand occurrences="6">
<code>$stringWidth</code>
<code>$totAlreadyFitted</code>
<code>$totalTitleWidth</code>
<code>$val</code>
<code>6</code>
<code>6</code>
</PossiblyInvalidOperand>
<PossiblyUndefinedVariable occurrences="6">
<code>$comments</code>
<code>$data</code>
@ -1787,17 +1802,12 @@
<TooFewArguments occurrences="1">
<code>tableDraw</code>
</TooFewArguments>
<UndefinedDocblockClass occurrences="3">
<code>$this-&gt;diagram-&gt;getFontSize()</code>
<code>$this-&gt;diagram-&gt;getFontSize()</code>
<code>$this-&gt;diagram-&gt;getFontSize()</code>
</UndefinedDocblockClass>
</file>
<file src="libraries/classes/Plugins/Schema/Eps/TableStatsEps.php">
<ArgumentTypeCoercion occurrences="1">
<code>$diagram</code>
</ArgumentTypeCoercion>
<InvalidScalarArgument occurrences="8">
<InvalidScalarArgument occurrences="10">
<code>$this-&gt;x</code>
<code>$this-&gt;x</code>
<code>$this-&gt;x + 5</code>
@ -1806,6 +1816,8 @@
<code>$this-&gt;y + 12 + $this-&gt;currentCell</code>
<code>$this-&gt;y + 14</code>
<code>$this-&gt;y + 14 + $this-&gt;currentCell</code>
<code>1</code>
<code>1</code>
</InvalidScalarArgument>
<PossiblyUndefinedMethod occurrences="4">
<code>rect</code>
@ -1819,18 +1831,31 @@
<code>(int) $fontSize</code>
</RedundantCastGivenDocblockType>
</file>
<file src="libraries/classes/Plugins/Schema/Pdf/Pdf.php">
<InvalidScalarArgument occurrences="1">
<code>$fill</code>
</InvalidScalarArgument>
</file>
<file src="libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php">
<InvalidArgument occurrences="2">
<code>$this-&gt;tables[$foreignTable]</code>
<code>$this-&gt;tables[$masterTable]</code>
</InvalidArgument>
<InvalidScalarArgument occurrences="6">
<InvalidScalarArgument occurrences="14">
<code>$this-&gt;offline</code>
<code>''</code>
<code>''</code>
<code>''</code>
<code>'B'</code>
<code>'B'</code>
<code>'auto'</code>
<code>'auto'</code>
<code>'auto'</code>
<code>0</code>
<code>0</code>
<code>0</code>
<code>0</code>
<code>0</code>
</InvalidScalarArgument>
<NullArgument occurrences="4">
<code>null</code>
@ -1841,10 +1866,11 @@
<PossiblyInvalidArgument occurrences="1">
<code>$this-&gt;diagram</code>
</PossiblyInvalidArgument>
<PossiblyNullArgument occurrences="21">
<PossiblyNullArgument occurrences="22">
<code>$this-&gt;diagram</code>
<code>$this-&gt;diagram</code>
<code>$this-&gt;diagram</code>
<code>$this-&gt;diagram-&gt;customLinks['RT']['-']</code>
<code>$this-&gt;offline</code>
<code>$this-&gt;orientation</code>
<code>$this-&gt;pageNumber</code>
@ -2225,11 +2251,6 @@
<TooFewArguments occurrences="1">
<code>tableDraw</code>
</TooFewArguments>
<UndefinedDocblockClass occurrences="3">
<code>$this-&gt;diagram-&gt;getFontSize()</code>
<code>$this-&gt;diagram-&gt;getFontSize()</code>
<code>$this-&gt;diagram-&gt;getFontSize()</code>
</UndefinedDocblockClass>
</file>
<file src="libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php">
<ArgumentTypeCoercion occurrences="1">