Skip to content

Commit dd1362b

Browse files
committed
Fix the null/false mess
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
1 parent 04741d8 commit dd1362b

File tree

3 files changed

+14
-43
lines changed

3 files changed

+14
-43
lines changed

phpstan-baseline.neon

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Parameter \\#1 \\$shpFile of method PhpMyAdmin\\\\ShapeFile\\\\ShapeRecord\\:\\:saveToFile\\(\\) expects resource, resource\\|false given\\.$#"
5-
count: 1
6-
path: src/ShapeFile.php
7-
8-
-
9-
message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
10-
count: 1
11-
path: src/ShapeFile.php
12-
133
-
144
message: "#^Parameter \\#1 \\$stream of function feof expects resource, resource\\|false given\\.$#"
15-
count: 2
16-
path: src/ShapeFile.php
17-
18-
-
19-
message: "#^Parameter \\#1 \\$stream of function fread expects resource, resource\\|false given\\.$#"
205
count: 1
216
path: src/ShapeFile.php
227

23-
-
24-
message: "#^Parameter \\#1 \\$stream of function fwrite expects resource, resource\\|false given\\.$#"
25-
count: 2
26-
path: src/ShapeFile.php
27-
288
-
299
message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
3010
count: 6
@@ -60,26 +40,6 @@ parameters:
6040
count: 1
6141
path: src/ShapeFile.php
6242

63-
-
64-
message: "#^Parameter \\#1 \\$dbase_identifier of function dbase_add_record expects resource, resource\\|false given\\.$#"
65-
count: 1
66-
path: src/ShapeRecord.php
67-
68-
-
69-
message: "#^Parameter \\#1 \\$dbase_identifier of function dbase_get_record_with_names expects resource, resource\\|false given\\.$#"
70-
count: 1
71-
path: src/ShapeRecord.php
72-
73-
-
74-
message: "#^Parameter \\#1 \\$dbase_identifier of function dbase_numrecords expects resource, resource\\|false given\\.$#"
75-
count: 1
76-
path: src/ShapeRecord.php
77-
78-
-
79-
message: "#^Parameter \\#1 \\$dbase_identifier of function dbase_replace_record expects resource, resource\\|false given\\.$#"
80-
count: 1
81-
path: src/ShapeRecord.php
82-
8343
-
8444
message: "#^Parameter \\#2 \\$record_number of function dbase_get_record_with_names expects int, int\\|null given\\.$#"
8545
count: 1

src/ShapeFile.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ public function getIndexFromDBFData(string $field, string $value): int
304304
private function loadDBFHeader(): array
305305
{
306306
$DBFFile = fopen($this->getFilename('.dbf'), 'r');
307+
if ($DBFFile === false) {
308+
return [];
309+
}
307310

308311
$result = [];
309312
$i = 1;
@@ -449,6 +452,10 @@ private function saveHeaders(): void
449452
*/
450453
private function loadRecords(): bool
451454
{
455+
if ($this->shpFile === false) {
456+
return false;
457+
}
458+
452459
/* Need to start at offset 100 */
453460
while (! $this->eofSHP()) {
454461
$record = new ShapeRecord(-1);
@@ -475,7 +482,7 @@ private function loadRecords(): bool
475482
private function saveRecords(): void
476483
{
477484
$offset = 50;
478-
if ($this->records === []) {
485+
if ($this->records === [] || $this->shxFile === false || $this->shpFile === false) {
479486
return;
480487
}
481488

src/ShapeRecord.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
class ShapeRecord
4141
{
4242
/** @var resource */
43-
private $shpFile = null;
43+
private $shpFile;
4444

4545
/** @var resource|false */
4646
private $dbfFile = false;
@@ -780,13 +780,17 @@ public function getContentLength(): ?int
780780

781781
private function loadDBFData(): void
782782
{
783+
if ($this->dbfFile === false) {
784+
return;
785+
}
786+
783787
$this->dbfData = @dbase_get_record_with_names($this->dbfFile, $this->recordNumber);
784788
unset($this->dbfData['deleted']);
785789
}
786790

787791
private function saveDBFData(): void
788792
{
789-
if ($this->dbfData === []) {
793+
if ($this->dbfData === [] || $this->dbfFile === false) {
790794
return;
791795
}
792796

0 commit comments

Comments
 (0)