Skip to content
Permalink
Browse files

Remove last yoda conditions as per coding standards guidelines.

  • Loading branch information...
dereuromark committed Sep 6, 2013
1 parent 0f528c2 commit 959988cfa18f436daf051fb6e4ccb846572cd34b
@@ -952,14 +952,14 @@ public function fullTableName($model, $quote = true, $schema = true) {
if ($quote) {
if ($schema && !empty($schemaName)) {
if (false == strstr($table, '.')) {
if (strstr($table, '.') === false) {
return $this->name($schemaName) . '.' . $this->name($table);
}
}
return $this->name($table);
}
if ($schema && !empty($schemaName)) {
if (false == strstr($table, '.')) {
if (strstr($table, '.') === false) {
return $schemaName . '.' . $table;
}
}
@@ -1065,7 +1065,7 @@ public function read(Model $model, $queryData = array(), $recursive = null) {
if ($bypass) {
$assocData['fields'] = false;
}
if (true === $this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null)) {
if ($this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
$linkedModels[$type . '/' . $assoc] = true;
}
}
@@ -610,7 +610,7 @@ public function testItemEnclosureLength() {
$this->assertTrue($File->write('123'), 'Could not write to ' . $tmpFile);
if (50300 <= PHP_VERSION_ID) {
if (PHP_VERSION_ID >= 50300) {
clearstatcache(true, $tmpFile);
} else {
clearstatcache();
@@ -97,7 +97,7 @@ public function testCaseList() {
$urlExtra = '&plugin=' . $plugin;
}
if (1 > count($testCases)) {
if (count($testCases) < 1) {
$buffer .= "<strong>EMPTY</strong>";
}
@@ -161,7 +161,7 @@ public function testCaseList() {
$urlExtra = '&plugin=' . $plugin;
}
if (1 > count($testCases)) {
if (count($testCases) < 1) {
$buffer .= 'EMPTY';
echo $buffer;
}
@@ -591,7 +591,7 @@ public static function classicExtract($data, $path = null) {
}
}
return $tmp;
} elseif (false !== strpos($key, '{') && false !== strpos($key, '}')) {
} elseif (strpos($key, '{') !== false && strpos($key, '}') !== false) {
$pattern = substr($key, 1, -1);
foreach ($data as $j => $val) {

0 comments on commit 959988c

Please sign in to comment.
You can’t perform that action at this time.