Skip to content

Commit a7d7c38

Browse files
authored
Merge pull request #3 from magento-gl/php84_deprication_fix
Php84 deprication fix
2 parents 475addb + 1536266 commit a7d7c38

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

library/Zend/Db/Adapter/Db2/Exception.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception
3838
protected $code = '00000';
3939
protected $message = 'unknown exception';
4040

41-
function __construct($message = 'unknown exception', $code = '00000', Exception $e = null)
41+
function __construct($message = 'unknown exception', $code = '00000', ?Exception $e = null)
4242
{
4343
parent::__construct($message, $code, $e);
4444
}

library/Zend/Db/Adapter/Exception.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Zend_Db_Adapter_Exception extends Zend_Db_Exception
3636
{
3737
protected $_chainedException = null;
3838

39-
public function __construct($message = '', $code = 0, Exception $e = null)
39+
public function __construct($message = '', $code = 0, ?Exception $e = null)
4040
{
4141
if ($e && (0 === $code)) {
4242
$code = $e->getCode();

library/Zend/Db/Statement.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function bindValue($parameter, $value, $type = null)
304304
* @param array $params OPTIONAL Values to bind to parameter placeholders.
305305
* @return bool
306306
*/
307-
public function execute(array $params = null)
307+
public function execute(?array $params = null)
308308
{
309309
/*
310310
* Simple case - no query profiler to manage.

library/Zend/Db/Statement/Db2.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public function errorInfo()
191191
* @return bool
192192
* @throws Zend_Db_Statement_Db2_Exception
193193
*/
194-
public function _execute(array $params = null)
194+
public function _execute(?array $params = null)
195195
{
196196
if (!$this->_stmt) {
197197
return false;

library/Zend/Db/Statement/Mysqli.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function errorInfo()
180180
* @return bool
181181
* @throws Zend_Db_Statement_Mysqli_Exception
182182
*/
183-
public function _execute(array $params = null)
183+
public function _execute(?array $params = null)
184184
{
185185
if (!$this->_stmt) {
186186
return false;

library/Zend/Db/Statement/Oracle.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function errorInfo()
226226
* @return bool
227227
* @throws Zend_Db_Statement_Exception
228228
*/
229-
public function _execute(array $params = null)
229+
public function _execute(?array $params = null)
230230
{
231231
$connection = $this->_adapter->getConnection();
232232

library/Zend/Db/Statement/Pdo.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function errorInfo()
221221
* @return bool
222222
* @throws Zend_Db_Statement_Exception
223223
*/
224-
public function _execute(array $params = null)
224+
public function _execute(?array $params = null)
225225
{
226226
try {
227227
if ($params !== null) {

library/Zend/Db/Statement/Sqlsrv.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function errorInfo()
174174
* @return bool
175175
* @throws Zend_Db_Statement_Exception
176176
*/
177-
public function _execute(array $params = null)
177+
public function _execute(?array $params = null)
178178
{
179179
$connection = $this->_adapter->getConnection();
180180
if (!$this->_stmt) {

library/Zend/Db/Table/Abstract.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ protected function _fetch(Zend_Db_Table_Select $select)
16031603
* @throws Zend_Db_Table_Row_Exception
16041604
* @return Zend_Db_Table_Abstract
16051605
*/
1606-
public static function getTableFromString($tableName, Zend_Db_Table_Abstract $referenceTable = null)
1606+
public static function getTableFromString($tableName, ?Zend_Db_Table_Abstract $referenceTable = null)
16071607
{
16081608
if ($referenceTable instanceof Zend_Db_Table_Abstract) {
16091609
$tableDefinition = $referenceTable->getDefinition();

library/Zend/Db/Table/Row/Abstract.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public function getTable()
332332
* @return boolean
333333
* @throws Zend_Db_Table_Row_Exception
334334
*/
335-
public function setTable(Zend_Db_Table_Abstract $table = null)
335+
public function setTable(?Zend_Db_Table_Abstract $table = null)
336336
{
337337
if ($table == null) {
338338
$this->_table = null;
@@ -875,7 +875,7 @@ protected function _prepareReference(Zend_Db_Table_Abstract $dependentTable, Zen
875875
* @return Zend_Db_Table_Rowset_Abstract Query result from $dependentTable
876876
* @throws Zend_Db_Table_Row_Exception If $dependentTable is not a table or is not loadable.
877877
*/
878-
public function findDependentRowset($dependentTable, $ruleKey = null, Zend_Db_Table_Select $select = null)
878+
public function findDependentRowset($dependentTable, $ruleKey = null, ?Zend_Db_Table_Select $select = null)
879879
{
880880
$db = $this->_getTable()->getAdapter();
881881

@@ -931,7 +931,7 @@ public function findDependentRowset($dependentTable, $ruleKey = null, Zend_Db_Ta
931931
* @return Zend_Db_Table_Row_Abstract Query result from $parentTable
932932
* @throws Zend_Db_Table_Row_Exception If $parentTable is not a table or is not loadable.
933933
*/
934-
public function findParentRow($parentTable, $ruleKey = null, Zend_Db_Table_Select $select = null)
934+
public function findParentRow($parentTable, $ruleKey = null, ?Zend_Db_Table_Select $select = null)
935935
{
936936
$db = $this->_getTable()->getAdapter();
937937

@@ -999,7 +999,7 @@ public function findParentRow($parentTable, $ruleKey = null, Zend_Db_Table_Selec
999999
* @throws Zend_Db_Table_Row_Exception If $matchTable or $intersectionTable is not a table class or is not loadable.
10001000
*/
10011001
public function findManyToManyRowset($matchTable, $intersectionTable, $callerRefRule = null,
1002-
$matchRefRule = null, Zend_Db_Table_Select $select = null)
1002+
$matchRefRule = null, ?Zend_Db_Table_Select $select = null)
10031003
{
10041004
$db = $this->_getTable()->getAdapter();
10051005

0 commit comments

Comments
 (0)