Skip to content

Commit 041c821

Browse files
authored
Merge pull request FoolCode#204 from red-led/php8.1
2 parents 61986ac + 544cc78 commit 041c821

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ php:
66
- 7.3
77
- 7.4
88
- 8.0
9+
- 8.1.0
910

1011
env:
1112
- DRIVER=mysqli SEARCH_BUILD=SPHINX2 EXCLUDE_GROUP="--exclude-group=Manticore"

src/Drivers/MultiResultSet.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public function getStored()
5959
* @inheritdoc
6060
* @throws DatabaseException
6161
*/
62+
#[\ReturnTypeWillChange]
6263
public function offsetExists($offset)
6364
{
6465
$this->store();
@@ -70,6 +71,7 @@ public function offsetExists($offset)
7071
* @inheritdoc
7172
* @throws DatabaseException
7273
*/
74+
#[\ReturnTypeWillChange]
7375
public function offsetGet($offset)
7476
{
7577
$this->store();
@@ -81,6 +83,7 @@ public function offsetGet($offset)
8183
* @inheritdoc
8284
* @codeCoverageIgnore
8385
*/
86+
#[\ReturnTypeWillChange]
8487
public function offsetSet($offset, $value)
8588
{
8689
throw new \BadMethodCallException('Not implemented');
@@ -90,6 +93,7 @@ public function offsetSet($offset, $value)
9093
* @inheritdoc
9194
* @codeCoverageIgnore
9295
*/
96+
#[\ReturnTypeWillChange]
9397
public function offsetUnset($offset)
9498
{
9599
throw new \BadMethodCallException('Not implemented');
@@ -98,6 +102,7 @@ public function offsetUnset($offset)
98102
/**
99103
* @inheritdoc
100104
*/
105+
#[\ReturnTypeWillChange]
101106
public function next()
102107
{
103108
$this->rowSet = $this->getNext();
@@ -106,6 +111,7 @@ public function next()
106111
/**
107112
* @inheritdoc
108113
*/
114+
#[\ReturnTypeWillChange]
109115
public function key()
110116
{
111117
return (int)$this->cursor;
@@ -114,6 +120,7 @@ public function key()
114120
/**
115121
* @inheritdoc
116122
*/
123+
#[\ReturnTypeWillChange]
117124
public function rewind()
118125
{
119126
// we actually can't roll this back unless it was stored first
@@ -126,6 +133,7 @@ public function rewind()
126133
* @inheritdoc
127134
* @throws DatabaseException
128135
*/
136+
#[\ReturnTypeWillChange]
129137
public function count()
130138
{
131139
$this->store();
@@ -136,6 +144,7 @@ public function count()
136144
/**
137145
* @inheritdoc
138146
*/
147+
#[\ReturnTypeWillChange]
139148
public function valid()
140149
{
141150
if ($this->stored !== null) {
@@ -148,6 +157,7 @@ public function valid()
148157
/**
149158
* @inheritdoc
150159
*/
160+
#[\ReturnTypeWillChange]
151161
public function current()
152162
{
153163
$rowSet = $this->rowSet;

src/Drivers/ResultSet.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public function getAffectedRows()
8787
/**
8888
* @inheritdoc
8989
*/
90+
#[\ReturnTypeWillChange]
9091
public function offsetExists($offset)
9192
{
9293
return $this->hasRow($offset);
@@ -96,6 +97,7 @@ public function offsetExists($offset)
9697
* @inheritdoc
9798
* @throws ResultSetException
9899
*/
100+
#[\ReturnTypeWillChange]
99101
public function offsetGet($offset)
100102
{
101103
return $this->toRow($offset)->fetchAssoc();
@@ -105,6 +107,7 @@ public function offsetGet($offset)
105107
* @inheritdoc
106108
* @codeCoverageIgnore
107109
*/
110+
#[\ReturnTypeWillChange]
108111
public function offsetSet($offset, $value)
109112
{
110113
throw new \BadMethodCallException('Not implemented');
@@ -114,6 +117,7 @@ public function offsetSet($offset, $value)
114117
* @inheritdoc
115118
* @codeCoverageIgnore
116119
*/
120+
#[\ReturnTypeWillChange]
117121
public function offsetUnset($offset)
118122
{
119123
throw new \BadMethodCallException('Not implemented');
@@ -122,6 +126,7 @@ public function offsetUnset($offset)
122126
/**
123127
* @inheritdoc
124128
*/
129+
#[\ReturnTypeWillChange]
125130
public function current()
126131
{
127132
$row = $this->fetched;
@@ -133,6 +138,7 @@ public function current()
133138
/**
134139
* @inheritdoc
135140
*/
141+
#[\ReturnTypeWillChange]
136142
public function next()
137143
{
138144
$this->fetched = $this->fetch(true);
@@ -141,6 +147,7 @@ public function next()
141147
/**
142148
* @inheritdoc
143149
*/
150+
#[\ReturnTypeWillChange]
144151
public function key()
145152
{
146153
return (int)$this->cursor;
@@ -149,6 +156,7 @@ public function key()
149156
/**
150157
* @inheritdoc
151158
*/
159+
#[\ReturnTypeWillChange]
152160
public function valid()
153161
{
154162
if ($this->stored !== null) {
@@ -161,6 +169,7 @@ public function valid()
161169
/**
162170
* @inheritdoc
163171
*/
172+
#[\ReturnTypeWillChange]
164173
public function rewind()
165174
{
166175
if ($this->stored === null) {
@@ -176,6 +185,7 @@ public function rewind()
176185
* Returns the number of rows in the result set
177186
* @inheritdoc
178187
*/
188+
#[\ReturnTypeWillChange]
179189
public function count()
180190
{
181191
return $this->num_rows;

0 commit comments

Comments
 (0)