adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed 'Automatic conversion of false to array is deprecated'.

Browse source
This commit is contained in:
Kamil Wylegala 2022-01-04 16:45:09 +01:00
parent 58e843e981
commit d83997f849
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Model/Datasource/Database/Mysql.php
View file

@ -333,7 +333,7 @@ class Mysql extends DboSource {
* Returns an array of the fields in given table name. * Returns an array of the fields in given table name.
* *
* @param Model|string $model Name of database table to inspect or model instance * @param Model|string $model Name of database table to inspect or model instance
* @return array Fields in table. Keys are name and type * @return array|bool Fields in table. Keys are name and type. Returns false if result is empty.
* @throws CakeException * @throws CakeException
*/ */
public function describe($model) { public function describe($model) {
@ -344,7 +344,7 @@ class Mysql extends DboSource {
} }
$table = $this->fullTableName($model); $table = $this->fullTableName($model);
$fields = false; $fields = array();
$cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $table); $cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $table);
if (!$cols) { if (!$cols) {
throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table)); throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));
@ -382,6 +382,12 @@ class Mysql extends DboSource {
} }
$this->_cacheDescription($key, $fields); $this->_cacheDescription($key, $fields);
$cols->closeCursor(); $cols->closeCursor();
//Fields must be an array for compatibility with PHP8.1 (deprecation notice) but also let's keep backwards compatibility for method.
if (count($fields) === 0) {
return false;
}
return $fields; return $fields;
} }