adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-06-05 14:23:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.4

Browse source 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
This commit is contained in:
ADmad 2013-07-14 10:58:55 +05:30
commit d161b21ae1
146 changed files with 207 additions and 920 deletions
lib/Cake/Model
Datasource
DataSource.php
Model.php

2
lib/Cake/Model/Datasource/DataSource.php
View file

@ -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;

1
lib/Cake/Model/Model.php
View file

@ -95,7 +95,6 @@ class Model extends Object implements CakeEventListener {
* Holds physical schema/database name for this model. Automatically set during Model creation.
*
* @var string
* @access public
*/
public $schemaName = null;