Skip to content

Commit c36b9fa

Browse files
committed
Fix compatibility by removing type constraints
1 parent e8296f0 commit c36b9fa

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

src/main/php/rdbms/Criteria.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ public function addGroupBy($column) {
124124
* If the first parameter is omitted or NULL given the projection will be cleared
125125
* projection is then assumed
126126
*
127-
* @param rdbms.SQLRenderable projection optional
127+
* @param ?rdbms.SQLRenderable projection optional
128128
* @param string optional alias
129-
* @return rdbms.Criteria this object
129+
* @return self this object
130130
*/
131-
public function setProjection(SQLRenderable $projection= null, $alias= '') {
131+
public function setProjection($projection= null, $alias= '') {
132132
$this->projection= (is_null($projection) || ($projection instanceof ProjectionList))
133133
? $projection
134134
: $projection= Projections::projectionList()->add($projection, $alias)
@@ -141,7 +141,7 @@ public function setProjection(SQLRenderable $projection= null, $alias= '') {
141141
*
142142
* @param rdbms.SQLRenderable projection
143143
* @param string optional alias
144-
* @return rdbms.Criteria this object
144+
* @return self this object
145145
*/
146146
public function withProjection(SQLRenderable $projection, $alias= '') {
147147
$crit= clone($this);

src/main/php/rdbms/ResultSet.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ abstract class ResultSet implements Closeable, IteratorAggregate {
2525
/**
2626
* Constructor
2727
*
28-
* @param var $handle
29-
* @param var $fields
30-
* @param util.TimeZone $tz
28+
* @param var $handle
29+
* @param var $fields
30+
* @param ?util.TimeZone $tz
3131
*/
32-
public function __construct($handle, $fields, TimeZone $tz= null) {
32+
public function __construct($handle, $fields, $tz= null) {
3333
$this->handle= $handle;
3434
$this->fields= $fields;
3535
$this->tz= $tz;

src/main/php/rdbms/mysqlx/MySqlxBufferedResultSet.class.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ class MySqlxBufferedResultSet extends AbstractMysqlxResultSet {
1313
/**
1414
* Constructor
1515
*
16-
* @param resource handle
16+
* @param var $result
17+
* @param [:var] $fields
18+
* @param ?util.TimeZone $tz
1719
*/
18-
public function __construct($result, $fields, \util\TimeZone $tz= null) {
20+
public function __construct($result, $fields, $tz= null) {
1921
parent::__construct($result, $fields, $tz);
2022
while (null !== ($record= $this->handle->fetch($this->fields))) {
2123
$this->records[]= $record;

src/main/php/rdbms/tds/TdsBufferedResultSet.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ class TdsBufferedResultSet extends AbstractTdsResultSet {
1717
/**
1818
* Constructor
1919
*
20-
* @param var result
21-
* @param [:var] fields
22-
* @param util.TimeZone tz
20+
* @param var $result
21+
* @param [:var] $fields
22+
* @param ?util.TimeZone $tz
2323
*/
24-
public function __construct($result, $fields, TimeZone $tz= null) {
24+
public function __construct($result, $fields, $tz= null) {
2525
parent::__construct($result, $fields, $tz);
2626
do {
2727
try {

0 commit comments

Comments
 (0)