Perform code optimization from cachegrind

This commit is contained in:
Dennis Eichhorn 2017-09-14 17:47:33 +02:00
parent 49133a58f6
commit d451301a33
2 changed files with 4 additions and 4 deletions

View File

@ -1454,7 +1454,7 @@ class DataMapperAbstract implements DataMapperInterface
$class = static::class; $class = static::class;
$class = str_replace('Mapper', '', $class); $class = str_replace('Mapper', '', $class);
if (count($result) === 0) { if (empty($result)) {
$parts = explode('\\', $class); $parts = explode('\\', $class);
$name = $parts[$c = (count($parts) - 1)]; $name = $parts[$c = (count($parts) - 1)];
$parts[$c] = 'Null' . $name; $parts[$c] = 'Null' . $name;
@ -1760,7 +1760,7 @@ class DataMapperAbstract implements DataMapperInterface
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass(get_class($obj));
foreach ($result as $column => $value) { foreach ($result as $column => $value) {
if (isset(static::$columns[$column]['internal']) && $reflectionClass->hasProperty(static::$columns[$column]['internal'])) { if (isset(static::$columns[$column]['internal']) /* && $reflectionClass->hasProperty(static::$columns[$column]['internal']) */) {
$reflectionProperty = $reflectionClass->getProperty(static::$columns[$column]['internal']); $reflectionProperty = $reflectionClass->getProperty(static::$columns[$column]['internal']);
if (!($accessible = $reflectionProperty->isPublic())) { if (!($accessible = $reflectionProperty->isPublic())) {
@ -1768,7 +1768,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) { if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) {
if($reflectionProperty->getValue($obj) !== null || $value !== null) { if($value !== null || $reflectionProperty->getValue($obj) !== null) {
settype($value, static::$columns[$column]['type']); settype($value, static::$columns[$column]['type']);
} }

View File

@ -240,7 +240,7 @@ abstract class GrammarAbstract
$identifier = $this->systemIdentifier; $identifier = $this->systemIdentifier;
foreach($this->specialKeywords as $keyword) { foreach($this->specialKeywords as $keyword) {
if(StringUtils::startsWith($system, $keyword)) { if($keyword === '' || strrpos($system, $keyword, -strlen($system)) !== false) {
$prefix = ''; $prefix = '';
$identifier = ''; $identifier = '';
} }