mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-05-25 17:03:29 +00:00
Merge branch 'master' into 2.4
Conflicts: lib/Cake/Controller/Component/AuthComponent.php
This commit is contained in:
commit
d161b21ae1
146 changed files with 207 additions and 920 deletions
lib/Cake/Model/Datasource
|
@ -415,7 +415,6 @@ class DataSource extends Object {
|
|||
* Returns the schema name. Override this in subclasses.
|
||||
*
|
||||
* @return string schema name
|
||||
* @access public
|
||||
*/
|
||||
public function getSchemaName() {
|
||||
return null;
|
||||
|
@ -425,7 +424,6 @@ class DataSource extends Object {
|
|||
* Closes a connection. Override in subclasses
|
||||
*
|
||||
* @return boolean
|
||||
* @access public
|
||||
*/
|
||||
public function close() {
|
||||
return $this->connected = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue