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

Ensure the class has a constructor

Browse source 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.

Conflicts:

	lib/Cake/Utility/ClassRegistry.php
This commit is contained in:
AD7six 2012-01-09 23:38:32 +01:00
parent 0be71a08d6
commit b8598c5ca0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Utility/ClassRegistry.php
View file

@ -158,7 +158,11 @@ class ClassRegistry {
}
}
}
$instance = $reflection->newInstance($settings);
if ($reflection->getConstructor()) {
$instance = $reflection->newInstance($settings);
} else {
$instance = $reflection->newInstance();
}
if ($strict) {
$instance = ($instance instanceof Model) ? $instance : null;
}