Skip to content

Commit f825d8f

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #33 from MauricioFauth/php82
Bump minimum PHP version to 8.2.0
2 parents 4b64f4e + a48ff45 commit f825d8f

7 files changed

Lines changed: 46 additions & 41 deletions

File tree

‎.github/workflows/lint-and-analyse-php.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
- name: Checkout code
1212
uses: actions/checkout@v4
1313

14-
- name: Set up PHP 8.1
14+
- name: Set up PHP 8.2
1515
uses: shivammathur/setup-php@v2
1616
with:
17-
php-version: 8.1
17+
php-version: 8.2
1818

1919
- name: Validate composer.json and composer.lock
2020
run: composer validate --strict
@@ -33,10 +33,10 @@ jobs:
3333
- name: Checkout code
3434
uses: actions/checkout@v4
3535

36-
- name: Set up PHP 8.1
36+
- name: Set up PHP 8.2
3737
uses: shivammathur/setup-php@v2
3838
with:
39-
php-version: 8.1
39+
php-version: 8.2
4040
extensions: dbase
4141

4242
- name: Install Composer dependencies

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
continue-on-error: ${{ matrix.experimental }}
1212
strategy:
1313
matrix:
14-
php-version: ['8.1', '8.2', '8.3']
14+
php-version: ['8.2', '8.3']
1515
php-extensions: ['dbase', ':dbase']
1616
os: [ubuntu-latest]
1717
experimental: [false]

‎.scrutinizer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build:
1818
analysis:
1919
environment:
2020
php:
21-
version: 8.1
21+
version: 8.2
2222
pecl_extensions:
2323
- dbase
2424
dependencies:

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

66
## [Unreleased]
77
### Removed
8-
- Drop support for PHP 7.1, PHP 7.2, PHP 7.3, PHP 7.4 and PHP 8.0
8+
- Drop support for PHP 7.1, PHP 7.2, PHP 7.3, PHP 7.4, PHP 8.0 and PHP 8.1
99

1010
## [3.0.2] - 2023-09-11
1111
### Added

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
]
3333
},
3434
"require": {
35-
"php": "^8.1"
35+
"php": "^8.2"
3636
},
3737
"suggest": {
3838
"ext-dbase": "For dbf files parsing"

‎phpstan-baseline.neon‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ parameters:
4545
count: 1
4646
path: src/ShapeFile.php
4747

48+
-
49+
message: "#^Parameter \\#2 \\$length of function fread expects int\\<1, max\\>, int\\<0, max\\> given\\.$#"
50+
count: 1
51+
path: src/ShapeFile.php
52+
4853
-
4954
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
5055
count: 4
@@ -57,12 +62,12 @@ parameters:
5762

5863
-
5964
message: "#^Cannot access offset 'points' on mixed\\.$#"
60-
count: 17
65+
count: 15
6166
path: src/ShapeRecord.php
6267

6368
-
6469
message: "#^Cannot access offset int on mixed\\.$#"
65-
count: 14
70+
count: 12
6671
path: src/ShapeRecord.php
6772

6873
-
@@ -72,7 +77,7 @@ parameters:
7277

7378
-
7479
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
75-
count: 14
80+
count: 12
7681
path: src/ShapeRecord.php
7782

7883
-

‎psalm-baseline.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
2+
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
33
<file src="src/ShapeFile.php">
44
<InvalidPropertyAssignmentValue>
55
<code><![CDATA[$this->shpFile]]></code>
@@ -10,7 +10,7 @@
1010
<code><![CDATA[$this->boundingBox[$type] ?? 0]]></code>
1111
</MixedArgument>
1212
<MixedAssignment>
13-
<code>$shapeType</code>
13+
<code><![CDATA[$shapeType]]></code>
1414
</MixedAssignment>
1515
<PossiblyFalseArgument>
1616
<code><![CDATA[$this->shpFile]]></code>
@@ -21,13 +21,13 @@
2121
<code><![CDATA[$this->records[$index]->getContentLength()]]></code>
2222
</PossiblyNullOperand>
2323
<PossiblyUnusedReturnValue>
24-
<code>bool</code>
25-
<code>bool</code>
26-
<code>int</code>
24+
<code><![CDATA[bool]]></code>
25+
<code><![CDATA[bool]]></code>
26+
<code><![CDATA[int]]></code>
2727
</PossiblyUnusedReturnValue>
2828
<UnusedFunctionCall>
29-
<code>dbase_close</code>
30-
<code>dbase_pack</code>
29+
<code><![CDATA[dbase_close]]></code>
30+
<code><![CDATA[dbase_pack]]></code>
3131
</UnusedFunctionCall>
3232
</file>
3333
<file src="src/ShapeRecord.php">
@@ -41,8 +41,8 @@
4141
<code><![CDATA[$data['y']]]></code>
4242
<code><![CDATA[$data['y']]]></code>
4343
<code><![CDATA[$data['z']]]></code>
44-
<code>$pointData</code>
45-
<code>$pointData[$type]</code>
44+
<code><![CDATA[$pointData]]></code>
45+
<code><![CDATA[$pointData[$type]]]></code>
4646
<code><![CDATA[$this->shpData['parts']]]></code>
4747
<code><![CDATA[$this->shpData['parts']]]></code>
4848
<code><![CDATA[$this->shpData['parts']]]></code>
@@ -65,7 +65,7 @@
6565
<MixedArrayAccess>
6666
<code><![CDATA[$partData['points']]]></code>
6767
<code><![CDATA[$partData['points']]]></code>
68-
<code>$pointData[$type]</code>
68+
<code><![CDATA[$pointData[$type]]]></code>
6969
<code><![CDATA[$this->shpData['parts'][$i]]]></code>
7070
<code><![CDATA[$this->shpData['parts'][$i]]]></code>
7171
<code><![CDATA[$this->shpData['parts'][$i]]]></code>
@@ -82,7 +82,7 @@
8282
<code><![CDATA[$this->shpData['points'][$i]]]></code>
8383
<code><![CDATA[$this->shpData['points'][$i][$type]]]></code>
8484
<code><![CDATA[$this->shpData['points'][count($this->shpData['points']) - 1]]]></code>
85-
<code>$value</code>
85+
<code><![CDATA[$value]]></code>
8686
</MixedArrayAccess>
8787
<MixedArrayAssignment>
8888
<code><![CDATA[$this->shpData['parts'][$partIndex]]]></code>
@@ -101,46 +101,46 @@
101101
</MixedArrayAssignment>
102102
<MixedArrayOffset>
103103
<code><![CDATA[$this->dbfData[$value]]]></code>
104-
<code>$tmp[$value]</code>
104+
<code><![CDATA[$tmp[$value]]]></code>
105105
</MixedArrayOffset>
106106
<MixedAssignment>
107107
<code><![CDATA[$data['m']]]></code>
108108
<code><![CDATA[$data['m']]]></code>
109109
<code><![CDATA[$data['z']]]></code>
110-
<code>$numparts</code>
111-
<code>$numparts</code>
112-
<code>$numpoints</code>
113-
<code>$numpoints</code>
114-
<code>$partData</code>
115-
<code>$partData</code>
116-
<code>$point</code>
117-
<code>$pointData</code>
118-
<code>$pointData</code>
110+
<code><![CDATA[$numparts]]></code>
111+
<code><![CDATA[$numparts]]></code>
112+
<code><![CDATA[$numpoints]]></code>
113+
<code><![CDATA[$numpoints]]></code>
114+
<code><![CDATA[$partData]]></code>
115+
<code><![CDATA[$partData]]></code>
116+
<code><![CDATA[$point]]></code>
117+
<code><![CDATA[$pointData]]></code>
118+
<code><![CDATA[$pointData]]></code>
119119
<code><![CDATA[$point['m']]]></code>
120120
<code><![CDATA[$point['z']]]></code>
121-
<code>$recordNumber</code>
122-
<code>$shapeType</code>
123-
<code>$size</code>
121+
<code><![CDATA[$recordNumber]]></code>
122+
<code><![CDATA[$shapeType]]></code>
123+
<code><![CDATA[$size]]></code>
124124
<code><![CDATA[$this->size]]></code>
125-
<code>[$value]</code>
125+
<code><![CDATA[[$value]]]></code>
126126
</MixedAssignment>
127127
<MixedOperand>
128-
<code>$size</code>
128+
<code><![CDATA[$size]]></code>
129129
<code><![CDATA[$this->shpData['numpoints']]]></code>
130130
<code><![CDATA[$this->shpData['numpoints']]]></code>
131131
<code><![CDATA[$this->shpData['numpoints'] ?? 0]]></code>
132132
<code><![CDATA[$this->shpData['numpoints'] ?? 0]]></code>
133133
</MixedOperand>
134134
<PossiblyNullReference>
135-
<code>hasMeasure</code>
136-
<code>hasMeasure</code>
137-
<code>readSHP</code>
135+
<code><![CDATA[hasMeasure]]></code>
136+
<code><![CDATA[hasMeasure]]></code>
137+
<code><![CDATA[readSHP]]></code>
138138
</PossiblyNullReference>
139139
<PossiblyUndefinedArrayOffset>
140140
<code><![CDATA[$this->shpData['parts']]]></code>
141141
</PossiblyUndefinedArrayOffset>
142142
<PropertyNotSetInConstructor>
143-
<code>$shpFile</code>
143+
<code><![CDATA[$shpFile]]></code>
144144
</PropertyNotSetInConstructor>
145145
</file>
146146
<file src="tests/ShapeFileTest.php">

0 commit comments

Comments
 (0)