@@ -185,7 +185,7 @@ |
||
| 185 | 185 | |
| 186 | 186 | /** |
| 187 | 187 | * |
| 188 | - * @return handle |
|
| 188 | + * @return resource|null |
|
| 189 | 189 | */ |
| 190 | 190 | public function getDbConnection() |
| 191 | 191 | { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Return if the database provider have a top or similar function |
| 47 | - * @return unknown_type |
|
| 47 | + * @return boolean |
|
| 48 | 48 | */ |
| 49 | 49 | function hasTop() |
| 50 | 50 | { |
@@ -76,59 +76,59 @@ |
||
| 76 | 76 | for ($i = 0; $i < $len; $i++) { |
| 77 | 77 | $ch = $fmt[$i]; |
| 78 | 78 | switch ($ch) { |
| 79 | - case 'Y': |
|
| 80 | - case 'y': |
|
| 81 | - $s .= 'YYYY'; |
|
| 82 | - break; |
|
| 83 | - case 'Q': |
|
| 84 | - case 'q': |
|
| 85 | - $s .= 'Q'; |
|
| 86 | - break; |
|
| 87 | - |
|
| 88 | - case 'M': |
|
| 89 | - $s .= 'Mon'; |
|
| 90 | - break; |
|
| 91 | - |
|
| 92 | - case 'm': |
|
| 93 | - $s .= 'MM'; |
|
| 94 | - break; |
|
| 95 | - case 'D': |
|
| 96 | - case 'd': |
|
| 97 | - $s .= 'DD'; |
|
| 98 | - break; |
|
| 99 | - |
|
| 100 | - case 'H': |
|
| 101 | - $s.= 'HH24'; |
|
| 102 | - break; |
|
| 103 | - |
|
| 104 | - case 'h': |
|
| 105 | - $s .= 'HH'; |
|
| 106 | - break; |
|
| 107 | - |
|
| 108 | - case 'i': |
|
| 109 | - $s .= 'MI'; |
|
| 110 | - break; |
|
| 111 | - |
|
| 112 | - case 's': |
|
| 113 | - $s .= 'SS'; |
|
| 114 | - break; |
|
| 115 | - |
|
| 116 | - case 'a': |
|
| 117 | - case 'A': |
|
| 118 | - $s .= 'AM'; |
|
| 119 | - break; |
|
| 120 | - |
|
| 121 | - default: |
|
| 122 | - // handle escape characters... |
|
| 123 | - if ($ch == '\\') { |
|
| 124 | - $i++; |
|
| 125 | - $ch = substr($fmt, $i, 1); |
|
| 126 | - } |
|
| 127 | - if (strpos('-/.:;, ', $ch) !== false) { |
|
| 128 | - $s .= $ch; |
|
| 129 | - } else { |
|
| 130 | - $s .= '"' . $ch . '"'; |
|
| 131 | - } |
|
| 79 | + case 'Y': |
|
| 80 | + case 'y': |
|
| 81 | + $s .= 'YYYY'; |
|
| 82 | + break; |
|
| 83 | + case 'Q': |
|
| 84 | + case 'q': |
|
| 85 | + $s .= 'Q'; |
|
| 86 | + break; |
|
| 87 | + |
|
| 88 | + case 'M': |
|
| 89 | + $s .= 'Mon'; |
|
| 90 | + break; |
|
| 91 | + |
|
| 92 | + case 'm': |
|
| 93 | + $s .= 'MM'; |
|
| 94 | + break; |
|
| 95 | + case 'D': |
|
| 96 | + case 'd': |
|
| 97 | + $s .= 'DD'; |
|
| 98 | + break; |
|
| 99 | + |
|
| 100 | + case 'H': |
|
| 101 | + $s.= 'HH24'; |
|
| 102 | + break; |
|
| 103 | + |
|
| 104 | + case 'h': |
|
| 105 | + $s .= 'HH'; |
|
| 106 | + break; |
|
| 107 | + |
|
| 108 | + case 'i': |
|
| 109 | + $s .= 'MI'; |
|
| 110 | + break; |
|
| 111 | + |
|
| 112 | + case 's': |
|
| 113 | + $s .= 'SS'; |
|
| 114 | + break; |
|
| 115 | + |
|
| 116 | + case 'a': |
|
| 117 | + case 'A': |
|
| 118 | + $s .= 'AM'; |
|
| 119 | + break; |
|
| 120 | + |
|
| 121 | + default: |
|
| 122 | + // handle escape characters... |
|
| 123 | + if ($ch == '\\') { |
|
| 124 | + $i++; |
|
| 125 | + $ch = substr($fmt, $i, 1); |
|
| 126 | + } |
|
| 127 | + if (strpos('-/.:;, ', $ch) !== false) { |
|
| 128 | + $s .= $ch; |
|
| 129 | + } else { |
|
| 130 | + $s .= '"' . $ch . '"'; |
|
| 131 | + } |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | return $s . "')"; |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | break; |
| 99 | 99 | |
| 100 | 100 | case 'H': |
| 101 | - $s.= 'HH24'; |
|
| 101 | + $s .= 'HH24'; |
|
| 102 | 102 | break; |
| 103 | 103 | |
| 104 | 104 | case 'h': |
@@ -69,7 +69,9 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | function sqlDate($fmt, $col = false) |
| 71 | 71 | { |
| 72 | - if (!$col) $col = $this->sysTimeStamp; |
|
| 72 | + if (!$col) { |
|
| 73 | + $col = $this->sysTimeStamp; |
|
| 74 | + } |
|
| 73 | 75 | $s = 'TO_CHAR(' . $col . ",'"; |
| 74 | 76 | |
| 75 | 77 | $len = strlen($fmt); |
@@ -25,6 +25,9 @@ |
||
| 25 | 25 | protected $_conn; |
| 26 | 26 | protected $_transaction = false; |
| 27 | 27 | |
| 28 | + /** |
|
| 29 | + * @param ConnectionManagement $connMngt |
|
| 30 | + */ |
|
| 28 | 31 | public function __construct($connMngt) |
| 29 | 32 | { |
| 30 | 33 | $this->_connectionManagement = $connMngt; |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | sqlrcur_prepareQuery($cur, $sql); |
| 57 | 57 | $bindCount = 1; |
| 58 | 58 | foreach ($array as $key => $value) { |
| 59 | - $field = strval($bindCount ++); |
|
| 59 | + $field = strval($bindCount++); |
|
| 60 | 60 | sqlrcur_inputBind($cur, $field, $value); |
| 61 | 61 | } |
| 62 | 62 | $success = sqlrcur_executeQuery($cur); |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | * |
| 34 | 34 | * @param ConnectionManagement $connData |
| 35 | 35 | * @param string $sql |
| 36 | - * @param array $param |
|
| 36 | + * @param array $params |
|
| 37 | 37 | * @return array An array with the adjusted SQL and PARAMs |
| 38 | 38 | */ |
| 39 | 39 | public static function parseSQL(ConnectionManagement $connData, $sql, $params = null) |
@@ -32,7 +32,6 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * Generate and Execute UPDATE and INSERTS |
| 34 | 34 | * |
| 35 | - * @param DBDataset $db |
|
| 36 | 35 | * @param string $table |
| 37 | 36 | * @param array $fields |
| 38 | 37 | * @param SQLType $type |
@@ -148,6 +147,9 @@ discard block |
||
| 148 | 147 | $this->_fieldDeliRight = $right; |
| 149 | 148 | } |
| 150 | 149 | |
| 150 | + /** |
|
| 151 | + * @param string $sql |
|
| 152 | + */ |
|
| 151 | 153 | public static function createSafeSQL($sql, $list) |
| 152 | 154 | { |
| 153 | 155 | foreach ($list as $key => $value) { |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | } elseif ($valores[0] == SQLFieldType::DATE) { |
| 110 | 110 | $date = ($valores[1] instanceof DateTime ? $valores[1]->format(DBBaseFunctions::YMDH) : $valores[1]); |
| 111 | 111 | $param[$name] = $date; |
| 112 | - if (($this->_db->getDbType() == 'oci8') || ( ($this->_db->getDbType() == 'dsn') && (strpos($this->_db->getDbConnectionString(), |
|
| 112 | + if (($this->_db->getDbType() == 'oci8') || (($this->_db->getDbType() == 'dsn') && (strpos($this->_db->getDbConnectionString(), |
|
| 113 | 113 | "oci8")))) { |
| 114 | 114 | return "TO_DATE($paramName, 'YYYY-MM-DD')"; |
| 115 | 115 | } else { |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * @param string $fieldName |
| 20 | 20 | * @param int $startPos |
| 21 | 21 | * @param int $length |
| 22 | - * @param bool $requiredValue |
|
| 22 | + * @param string|boolean $requiredValue |
|
| 23 | 23 | * @param array_of_FixedTextDefinition $subTypes |
| 24 | 24 | */ |
| 25 | 25 | public function __construct($fieldName, $startPos, $length, $requiredValue = "", $subTypes = null) |
@@ -185,7 +185,6 @@ discard block |
||
| 185 | 185 | * @param type $classMeta |
| 186 | 186 | * @param type $prop |
| 187 | 187 | * @param type $keyProp |
| 188 | - * @param type $this->_config |
|
| 189 | 188 | * @return null |
| 190 | 189 | */ |
| 191 | 190 | protected function getPropInfo($classMeta, $prop, $keyProp) |
@@ -287,6 +286,9 @@ discard block |
||
| 287 | 286 | return $node; |
| 288 | 287 | } |
| 289 | 288 | |
| 289 | + /** |
|
| 290 | + * @param DOMNode $node |
|
| 291 | + */ |
|
| 290 | 292 | protected function createPropertyNodes($node, $properties, $classMeta) |
| 291 | 293 | { |
| 292 | 294 | if (!is_null($properties)) { |
@@ -321,6 +323,10 @@ discard block |
||
| 321 | 323 | // Check if the array is associative or dont. |
| 322 | 324 | $isAssoc = (bool) count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string')); |
| 323 | 325 | $hasScalar = (bool) count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]), |
| 326 | + |
|
| 327 | + /** |
|
| 328 | + * @param DOMNode $val |
|
| 329 | + */ |
|
| 324 | 330 | function($val) { |
| 325 | 331 | return !(is_object($val) || is_array($val)); |
| 326 | 332 | })); |
@@ -519,7 +525,7 @@ discard block |
||
| 519 | 525 | * |
| 520 | 526 | * @param DOMNode $domnode |
| 521 | 527 | * @param type $jsonFunction |
| 522 | - * @return type |
|
| 528 | + * @return string |
|
| 523 | 529 | */ |
| 524 | 530 | public static function xml2json($domnode, $jsonFunction = "") |
| 525 | 531 | { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | // Check the proper treatment |
| 71 | 71 | if (is_array($model)) { |
| 72 | - $this->_model = (object) $model; |
|
| 72 | + $this->_model = (object)$model; |
|
| 73 | 73 | $this->_currentArray = true; |
| 74 | 74 | |
| 75 | 75 | // Fix First Level non-associative arrays |
@@ -319,8 +319,8 @@ discard block |
||
| 319 | 319 | # Value is an ARRAY? |
| 320 | 320 | elseif (is_array($propMeta[ObjectHandler::PROP_VALUE])) { |
| 321 | 321 | // Check if the array is associative or dont. |
| 322 | - $isAssoc = (bool) count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string')); |
|
| 323 | - $hasScalar = (bool) count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]), |
|
| 322 | + $isAssoc = (bool)count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string')); |
|
| 323 | + $hasScalar = (bool)count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]), |
|
| 324 | 324 | function($val) { |
| 325 | 325 | return !(is_object($val) || is_array($val)); |
| 326 | 326 | })); |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | if ($propMeta[ObjectHandler::PROP_DONT_CREATE_NODE] || (!$isAssoc && $hasScalar)) { |
| 331 | 331 | $nodeUsed = $node; |
| 332 | 332 | } else if ((!$isAssoc && !$hasScalar)) { |
| 333 | - $lazyCreate = true; // Have to create the node every iteration |
|
| 333 | + $lazyCreate = true; // Have to create the node every iteration |
|
| 334 | 334 | } else { |
| 335 | 335 | $nodeUsed = $used = XmlUtil::CreateChild($node, $propMeta[ObjectHandler::PROP_NAME]); |
| 336 | 336 | } |
@@ -472,9 +472,9 @@ discard block |
||
| 472 | 472 | } else { |
| 473 | 473 | $arText = array(); |
| 474 | 474 | } |
| 475 | - $x[$k][] = (array) $v + $arText; |
|
| 475 | + $x[$k][] = (array)$v + $arText; |
|
| 476 | 476 | } |
| 477 | - $value = (array) $value->attributes() + $x; |
|
| 477 | + $value = (array)$value->attributes() + $x; |
|
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | // Fix empty arrays or with one element only. |
@@ -536,9 +536,9 @@ discard block |
||
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | if ($xml->getName() == "xmlnuke") { |
| 539 | - $array = (array) $xml->children(); |
|
| 539 | + $array = (array)$xml->children(); |
|
| 540 | 540 | } else { |
| 541 | - $array = (array) $xml; |
|
| 541 | + $array = (array)$xml; |
|
| 542 | 542 | } |
| 543 | 543 | |
| 544 | 544 | array_walk($array, "ByJG\AnyDataset\Model\ObjectHandler::mapArray"); |
@@ -170,8 +170,9 @@ |
||
| 170 | 170 | : ""; |
| 171 | 171 | $classMeta[ObjectHandler::CLASS_DONT_CREATE_NODE_CLASS] = array_key_exists("$this->_config:dontcreatenode", |
| 172 | 172 | $classAttributes); |
| 173 | - if (!is_array($classMeta[ObjectHandler::CLASS_NAMESPACE]) && !empty($classMeta[ObjectHandler::CLASS_NAMESPACE])) |
|
| 174 | - $classMeta[ObjectHandler::CLASS_NAMESPACE] = array($classMeta[ObjectHandler::CLASS_NAMESPACE]); |
|
| 173 | + if (!is_array($classMeta[ObjectHandler::CLASS_NAMESPACE]) && !empty($classMeta[ObjectHandler::CLASS_NAMESPACE])) { |
|
| 174 | + $classMeta[ObjectHandler::CLASS_NAMESPACE] = array($classMeta[ObjectHandler::CLASS_NAMESPACE]); |
|
| 175 | + } |
|
| 175 | 176 | |
| 176 | 177 | #---------- |
| 177 | 178 | # Node References |
@@ -308,6 +308,10 @@ |
||
| 308 | 308 | return; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | + /** |
|
| 312 | + * @param SingleRow[] $seq |
|
| 313 | + * @param string $field |
|
| 314 | + */ |
|
| 311 | 315 | protected function quickSortExec($seq, $field) |
| 312 | 316 | { |
| 313 | 317 | if (!count($seq)) return $seq; |
@@ -316,7 +316,7 @@ |
||
| 316 | 316 | $x = $y = array(); |
| 317 | 317 | |
| 318 | 318 | $cntSeq = count($seq); |
| 319 | - for ($i = 1; $i < $cntSeq; $i ++) { |
|
| 319 | + for ($i = 1; $i < $cntSeq; $i++) { |
|
| 320 | 320 | if ($seq[$i]->getField($field) <= $k->getField($field)) { |
| 321 | 321 | $x [] = $seq [$i]; |
| 322 | 322 | } else { |
@@ -310,7 +310,9 @@ |
||
| 310 | 310 | |
| 311 | 311 | protected function quickSortExec($seq, $field) |
| 312 | 312 | { |
| 313 | - if (!count($seq)) return $seq; |
|
| 313 | + if (!count($seq)) { |
|
| 314 | + return $seq; |
|
| 315 | + } |
|
| 314 | 316 | |
| 315 | 317 | $k = $seq [0]; |
| 316 | 318 | $x = $y = array(); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | private $_rs; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * @param PDOStatement $recordset |
|
| 23 | + * @param \PDOStatement $recordset |
|
| 24 | 24 | * @return void |
| 25 | 25 | */ |
| 26 | 26 | public function __construct($recordset) |