Fixed suspicious binary operations errors

Author: apphp

CHANGELOG

@@ -1,6 +1,7 @@
 Version 1.5.x -
 ----------------------------
 - Bug: fixed error on setup module with db transaction
+- Bug: fixed error in usage of simplexml_load_file
 
 
 Version 1.4.1 - 30 Jan, 2021

framework/helpers/CHtml.php

@@ -568,7 +568,7 @@ public static function checkBoxList($name, $select, $data, $htmlOptions = [])
 		$checkAll = true;
 
 		foreach ($data as $value => $label) {
-			$checked = !is_array($select) && !strcmp($value, $select) || is_array($select) && in_array($value, $select);
+			$checked = (!is_array($select) && !strcmp($value, $select)) || (is_array($select) && in_array($value, $select));
 			$checkAll = $checkAll && $checked;
 			$htmlOptions['value'] = $value;
 			$htmlOptions['id'] = $baseID . '_' . $id++;
@@ -775,7 +775,7 @@ public static function listOptions($selection, $listData, &$htmlOptions)
 					// For single-level arrays where additional options available
                     $attributes = ['value' => (string)$key, 'encode' => ! $raw];
                     if (!empty($value['optionDisabled'])) $attributes['disabled'] = true;
-					if (!is_array($selection) && !strcmp($key, $selection) || is_array($selection) && in_array($key, $selection)) {
+					if ((!is_array($selection) && !strcmp($key, $selection)) || (is_array($selection) && in_array($key, $selection))) {
 						$attributes['selected'] = 'selected';
 					}
 					if (isset($options[$key])) $attributes = array_merge($attributes, $options[$key]);
@@ -790,7 +790,7 @@ public static function listOptions($selection, $listData, &$htmlOptions)
 				}
 			} else {
                 $attributes = ['value' => (string)$key, 'encode' => ! $raw];
-                if (!is_array($selection) && !strcmp($key, $selection) || is_array($selection) && in_array($key, $selection)) {
+                if ((!is_array($selection) && !strcmp($key, $selection)) || (is_array($selection) && in_array($key, $selection))) {
 					$attributes['selected'] = 'selected';
 				}
 				if (isset($options[$key])) $attributes = array_merge($attributes, $options[$key]);

framework/helpers/widgets/CFormValidation.php

@@ -266,10 +266,10 @@ private static function _handleField($field, $fieldInfo, $isMultiArray = false,
 					}
 				}
 			}
-		} elseif ($required && (!is_array($fieldValue) && trim($fieldValue) === '' || is_array($fieldValue) && empty($fieldValue))) {
+		} elseif ($required && ((!is_array($fieldValue) && trim($fieldValue) === '') || (is_array($fieldValue) && empty($fieldValue)))) {
 			$valid = false;
 			$errorMessage = A::t($msgSource, 'The field {title} cannot be empty! Please re-enter.', array('{title}' => $title));
-		} elseif ($type == 'confirm') {
+		} elseif ($type === 'confirm') {
 			$confirmField = self::keyAt('validation.confirmField', $fieldInfo, '');
 			$confirmFieldValue = $cRequest->getPost($confirmField);
 			$confirmFieldName = self::keyAt($confirmField . '.title', $fields, '');

utils/tests/inc/validator/test.php

@@ -32,7 +32,7 @@
 					 $content .= '</td>
 					 <td class="align-center">'.($expectedValue ? '<span class="true">true</span>' : '<span class="false">false</span>').'</td>
 					 <td class="align-center">'.($result ? '<span class="true">true</span>' : '<span class="false">false</span>').'</td>
-					 <td>'.($result && $expectedValue || !$result && !$expectedValue ? '&nbsp;<span class="ok">OK</span>' : '&nbsp;<span class="failed">Failed</span>').'</td>';
+					 <td>'.(($result && $expectedValue) || (!$result && !$expectedValue) ? '&nbsp;<span class="ok">OK</span>' : '&nbsp;<span class="failed">Failed</span>').'</td>';
 	}
 	$content .= '</tr>';
 	$content .= '</table>';