| @@ -84,6 +84,10 @@ | ||
| 84 | 84 | } | 
| 85 | 85 | } | 
| 86 | 86 | |
| 87 | + /** | |
| 88 | + * @param string $buffer | |
| 89 | + * @param FixedTextDefinition[] $fieldDefinition | |
| 90 | + */ | |
| 87 | 91 | protected function processBuffer($buffer, $fieldDefinition) | 
| 88 | 92 |      { | 
| 89 | 93 | $cntDef = count($fieldDefinition); | 
| @@ -92,9 +92,9 @@ | ||
| 92 | 92 | $fieldDef = $fieldDefinition[$i]; | 
| 93 | 93 | |
| 94 | 94 | $fields[$fieldDef->fieldName] = substr($buffer, $fieldDef->startPos, $fieldDef->length); | 
| 95 | -            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[" . $fieldDef->requiredValue . "]$/", | |
| 95 | +            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[".$fieldDef->requiredValue."]$/", | |
| 96 | 96 |                      $fields[$fieldDef->fieldName]))) { | 
| 97 | -                throw new IteratorException("Expected the value '" . $fieldDef->requiredValue . "' and I got '" . $fields[$fieldDef->fieldName] . "'"); | |
| 97 | +                throw new IteratorException("Expected the value '".$fieldDef->requiredValue."' and I got '".$fields[$fieldDef->fieldName]."'"); | |
| 98 | 98 |              } elseif (is_array($fieldDef->subTypes)) { | 
| 99 | 99 | $fields[$fieldDef->fieldName] = $this->processBuffer($fields[$fieldDef->fieldName], $fieldDef->subTypes); | 
| 100 | 100 | } | 
| @@ -92,7 +92,9 @@ | ||
| 92 | 92 |              foreach ($array as $key => $value) { | 
| 93 | 93 |                  $stmt->bindValue(":" . SQLBind::keyAdj($key), $value); | 
| 94 | 94 | } | 
| 95 | - } else $stmt = $this->_db->prepare($sql); | |
| 95 | +        } else { | |
| 96 | + $stmt = $this->_db->prepare($sql); | |
| 97 | + } | |
| 96 | 98 | |
| 97 | 99 | return $stmt; | 
| 98 | 100 | } | 
| @@ -27,15 +27,15 @@ discard block | ||
| 27 | 27 | |
| 28 | 28 |          if (is_null($strcnn)) { | 
| 29 | 29 |              if ($this->_connectionManagement->getFilePath() != "") { | 
| 30 | - $strcnn = $this->_connectionManagement->getDriver() . ":" . $this->_connectionManagement->getFilePath(); | |
| 30 | + $strcnn = $this->_connectionManagement->getDriver().":".$this->_connectionManagement->getFilePath(); | |
| 31 | 31 |              } else { | 
| 32 | - $strcnn = $this->_connectionManagement->getDriver() . ":dbname=" . $this->_connectionManagement->getDatabase(); | |
| 32 | + $strcnn = $this->_connectionManagement->getDriver().":dbname=".$this->_connectionManagement->getDatabase(); | |
| 33 | 33 |                  if ($this->_connectionManagement->getExtraParam("unixsocket") != "") { | 
| 34 | -                    $strcnn .= ";unix_socket=" . $this->_connectionManagement->getExtraParam("unixsocket"); | |
| 34 | +                    $strcnn .= ";unix_socket=".$this->_connectionManagement->getExtraParam("unixsocket"); | |
| 35 | 35 |                  } else { | 
| 36 | - $strcnn .= ";host=" . $this->_connectionManagement->getServer(); | |
| 36 | + $strcnn .= ";host=".$this->_connectionManagement->getServer(); | |
| 37 | 37 |                      if ($this->_connectionManagement->getPort() != "") { | 
| 38 | - $strcnn .= ";port=" . $this->_connectionManagement->getPort(); | |
| 38 | + $strcnn .= ";port=".$this->_connectionManagement->getPort(); | |
| 39 | 39 | } | 
| 40 | 40 | } | 
| 41 | 41 | } | 
| @@ -43,14 +43,14 @@ discard block | ||
| 43 | 43 | |
| 44 | 44 | // Create Connection | 
| 45 | 45 | $this->_db = new PDO($strcnn, $this->_connectionManagement->getUsername(), | 
| 46 | - $this->_connectionManagement->getPassword(), (array) $preOptions); | |
| 46 | + $this->_connectionManagement->getPassword(), (array)$preOptions); | |
| 47 | 47 | $this->_connectionManagement->setDriver($this->_db->getAttribute(PDO::ATTR_DRIVER_NAME)); | 
| 48 | 48 | |
| 49 | 49 | // Set Specific Attributes | 
| 50 | 50 | $this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); | 
| 51 | 51 | $this->_db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); | 
| 52 | 52 | |
| 53 | -        foreach ((array) $postOptions as $key => $value) { | |
| 53 | +        foreach ((array)$postOptions as $key => $value) { | |
| 54 | 54 | $this->_db->setAttribute($key, $value); | 
| 55 | 55 | } | 
| 56 | 56 | } | 
| @@ -61,11 +61,11 @@ discard block | ||
| 61 | 61 |              throw new NotAvailableException("Extension 'PDO' is not loaded"); | 
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | -        if (!extension_loaded('pdo_' . strtolower($connMngt->getDriver()))) { | |
| 65 | -            throw new NotAvailableException("Extension 'pdo_" . strtolower($connMngt->getDriver()) . "' is not loaded"); | |
| 64 | +        if (!extension_loaded('pdo_'.strtolower($connMngt->getDriver()))) { | |
| 65 | +            throw new NotAvailableException("Extension 'pdo_".strtolower($connMngt->getDriver())."' is not loaded"); | |
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | - $class = '\ByJG\AnyDataset\Database\Pdo' . ucfirst($connMngt->getDriver()); | |
| 68 | + $class = '\ByJG\AnyDataset\Database\Pdo'.ucfirst($connMngt->getDriver()); | |
| 69 | 69 | |
| 70 | 70 |          if (!class_exists($class, true)) { | 
| 71 | 71 | return new DBPDODriver($connMngt, null, null, null); | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | list($sql, $array) = SQLBind::parseSQL($this->_connectionManagement, $sql, $array); | 
| 92 | 92 | $stmt = $this->_db->prepare($sql); | 
| 93 | 93 |              foreach ($array as $key => $value) { | 
| 94 | -                $stmt->bindValue(":" . SQLBind::keyAdj($key), $value); | |
| 94 | +                $stmt->bindValue(":".SQLBind::keyAdj($key), $value); | |
| 95 | 95 | } | 
| 96 | 96 | } else $stmt = $this->_db->prepare($sql); | 
| 97 | 97 | |
| @@ -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); | 
| @@ -76,50 +76,50 @@ | ||
| 76 | 76 | if ($s) $s .= '+'; | 
| 77 | 77 | $ch = $fmt[$i]; | 
| 78 | 78 |              switch ($ch) { | 
| 79 | - case 'Y': | |
| 80 | - case 'y': | |
| 81 | - $s .= "datename(yyyy,$col)"; | |
| 82 | - break; | |
| 83 | - case 'M': | |
| 84 | - $s .= "convert(char(3),$col,0)"; | |
| 85 | - break; | |
| 86 | - case 'm': | |
| 87 | - $s .= "replace(str(month($col),2),' ','0')"; | |
| 88 | - break; | |
| 89 | - case 'Q': | |
| 90 | - case 'q': | |
| 91 | - $s .= "datename(quarter,$col)"; | |
| 92 | - break; | |
| 93 | - case 'D': | |
| 94 | - case 'd': | |
| 95 | - $s .= "replace(str(day($col),2),' ','0')"; | |
| 96 | - break; | |
| 97 | - case 'h': | |
| 98 | - $s .= "substring(convert(char(14),$col,0),13,2)"; | |
| 99 | - break; | |
| 100 | - | |
| 101 | - case 'H': | |
| 102 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; | |
| 103 | - break; | |
| 104 | - | |
| 105 | - case 'i': | |
| 106 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; | |
| 107 | - break; | |
| 108 | - case 's': | |
| 109 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; | |
| 110 | - break; | |
| 111 | - case 'a': | |
| 112 | - case 'A': | |
| 113 | - $s .= "substring(convert(char(19),$col,0),18,2)"; | |
| 114 | - break; | |
| 115 | - | |
| 116 | - default: | |
| 117 | -                    if ($ch == '\\') { | |
| 118 | - $i++; | |
| 119 | - $ch = substr($fmt, $i, 1); | |
| 120 | - } | |
| 121 | - $s .= $this->qstr($ch); | |
| 122 | - break; | |
| 79 | + case 'Y': | |
| 80 | + case 'y': | |
| 81 | + $s .= "datename(yyyy,$col)"; | |
| 82 | + break; | |
| 83 | + case 'M': | |
| 84 | + $s .= "convert(char(3),$col,0)"; | |
| 85 | + break; | |
| 86 | + case 'm': | |
| 87 | + $s .= "replace(str(month($col),2),' ','0')"; | |
| 88 | + break; | |
| 89 | + case 'Q': | |
| 90 | + case 'q': | |
| 91 | + $s .= "datename(quarter,$col)"; | |
| 92 | + break; | |
| 93 | + case 'D': | |
| 94 | + case 'd': | |
| 95 | + $s .= "replace(str(day($col),2),' ','0')"; | |
| 96 | + break; | |
| 97 | + case 'h': | |
| 98 | + $s .= "substring(convert(char(14),$col,0),13,2)"; | |
| 99 | + break; | |
| 100 | + | |
| 101 | + case 'H': | |
| 102 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; | |
| 103 | + break; | |
| 104 | + | |
| 105 | + case 'i': | |
| 106 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; | |
| 107 | + break; | |
| 108 | + case 's': | |
| 109 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; | |
| 110 | + break; | |
| 111 | + case 'a': | |
| 112 | + case 'A': | |
| 113 | + $s .= "substring(convert(char(19),$col,0),18,2)"; | |
| 114 | + break; | |
| 115 | + | |
| 116 | + default: | |
| 117 | +                if ($ch == '\\') { | |
| 118 | + $i++; | |
| 119 | + $ch = substr($fmt, $i, 1); | |
| 120 | + } | |
| 121 | + $s .= $this->qstr($ch); | |
| 122 | + break; | |
| 123 | 123 | } | 
| 124 | 124 | } | 
| 125 | 125 | return $s; | 
| @@ -68,12 +68,16 @@ | ||
| 68 | 68 | */ | 
| 69 | 69 | function sqlDate($fmt, $col = false) | 
| 70 | 70 |      { | 
| 71 | - if (!$col) $col = "getdate()"; | |
| 71 | +        if (!$col) { | |
| 72 | + $col = "getdate()"; | |
| 73 | + } | |
| 72 | 74 | $s = ''; | 
| 73 | 75 | |
| 74 | 76 | $len = strlen($fmt); | 
| 75 | 77 |          for ($i = 0; $i < $len; $i++) { | 
| 76 | - if ($s) $s .= '+'; | |
| 78 | +            if ($s) { | |
| 79 | + $s .= '+'; | |
| 80 | + } | |
| 77 | 81 | $ch = $fmt[$i]; | 
| 78 | 82 |              switch ($ch) { | 
| 79 | 83 | case 'Y': | 
| @@ -12,7 +12,7 @@ | ||
| 12 | 12 |      { | 
| 13 | 13 |          for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { | 
| 14 | 14 | $var = func_get_arg($i); | 
| 15 | - $sql .= ($i == 0 ? "" : "+") . $var; | |
| 15 | + $sql .= ($i == 0 ? "" : "+").$var; | |
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | 18 | return $sql; | 
| @@ -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 . "')"; | 
| @@ -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); | 
| @@ -10,7 +10,7 @@ discard block | ||
| 10 | 10 | $sql = ""; | 
| 11 | 11 |          for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { | 
| 12 | 12 | $var = func_get_arg($i); | 
| 13 | - $sql .= ($i == 0 ? "" : " || ") . $var; | |
| 13 | + $sql .= ($i == 0 ? "" : " || ").$var; | |
| 14 | 14 | } | 
| 15 | 15 | |
| 16 | 16 | return $sql; | 
| @@ -26,7 +26,7 @@ discard block | ||
| 26 | 26 | function limit($sql, $start, $qty) | 
| 27 | 27 |      { | 
| 28 | 28 |          if (strpos($sql, ' LIMIT ') === false) { | 
| 29 | - return $sql . " LIMIT $qty OFFSET $start "; | |
| 29 | + return $sql." LIMIT $qty OFFSET $start "; | |
| 30 | 30 |          } else { | 
| 31 | 31 | return $sql; | 
| 32 | 32 | } | 
| @@ -71,7 +71,7 @@ discard block | ||
| 71 | 71 | function sqlDate($fmt, $col = false) | 
| 72 | 72 |      { | 
| 73 | 73 | if (!$col) $col = $this->sysTimeStamp; | 
| 74 | -        $s = 'TO_CHAR(' . $col . ",'"; | |
| 74 | +        $s = 'TO_CHAR('.$col.",'"; | |
| 75 | 75 | |
| 76 | 76 | $len = strlen($fmt); | 
| 77 | 77 |          for ($i = 0; $i < $len; $i++) { | 
| @@ -99,7 +99,7 @@ discard block | ||
| 99 | 99 | break; | 
| 100 | 100 | |
| 101 | 101 | case 'H': | 
| 102 | - $s.= 'HH24'; | |
| 102 | + $s .= 'HH24'; | |
| 103 | 103 | break; | 
| 104 | 104 | |
| 105 | 105 | case 'h': | 
| @@ -128,11 +128,11 @@ discard block | ||
| 128 | 128 |                      if (strpos('-/.:;, ', $ch) !== false) { | 
| 129 | 129 | $s .= $ch; | 
| 130 | 130 |                      } else { | 
| 131 | - $s .= '"' . $ch . '"'; | |
| 131 | + $s .= '"'.$ch.'"'; | |
| 132 | 132 | } | 
| 133 | 133 | } | 
| 134 | 134 | } | 
| 135 | - return $s . "')"; | |
| 135 | + return $s."')"; | |
| 136 | 136 | } | 
| 137 | 137 | |
| 138 | 138 | /** | 
| @@ -82,59 +82,59 @@ | ||
| 82 | 82 |          for ($i = 0; $i < $len; $i++) { | 
| 83 | 83 | $ch = $fmt[$i]; | 
| 84 | 84 |              switch ($ch) { | 
| 85 | - case 'Y': | |
| 86 | - case 'y': | |
| 87 | - $s .= '%Y'; | |
| 88 | - break; | |
| 89 | - case 'Q': | |
| 90 | - case 'q': | |
| 91 | - $s .= "'),Quarter($col)"; | |
| 92 | - | |
| 93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; | |
| 94 | -                    else $s .= ",('"; | |
| 95 | - $concat = true; | |
| 96 | - break; | |
| 97 | - case 'M': | |
| 98 | - $s .= '%b'; | |
| 99 | - break; | |
| 100 | - | |
| 101 | - case 'm': | |
| 102 | - $s .= '%m'; | |
| 103 | - break; | |
| 104 | - case 'D': | |
| 105 | - case 'd': | |
| 106 | - $s .= '%d'; | |
| 107 | - break; | |
| 108 | - | |
| 109 | - case 'H': | |
| 110 | - $s .= '%H'; | |
| 111 | - break; | |
| 112 | - | |
| 113 | - case 'h': | |
| 114 | - $s .= '%I'; | |
| 115 | - break; | |
| 116 | - | |
| 117 | - case 'i': | |
| 118 | - $s .= '%i'; | |
| 119 | - break; | |
| 120 | - | |
| 121 | - case 's': | |
| 122 | - $s .= '%s'; | |
| 123 | - break; | |
| 124 | - | |
| 125 | - case 'a': | |
| 126 | - case 'A': | |
| 127 | - $s .= '%p'; | |
| 128 | - break; | |
| 129 | - | |
| 130 | - default: | |
| 131 | - | |
| 132 | -                    if ($ch == '\\') { | |
| 133 | - $i++; | |
| 134 | - $ch = substr($fmt, $i, 1); | |
| 135 | - } | |
| 136 | - $s .= $ch; | |
| 137 | - break; | |
| 85 | + case 'Y': | |
| 86 | + case 'y': | |
| 87 | + $s .= '%Y'; | |
| 88 | + break; | |
| 89 | + case 'Q': | |
| 90 | + case 'q': | |
| 91 | + $s .= "'),Quarter($col)"; | |
| 92 | + | |
| 93 | + if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; | |
| 94 | +                else $s .= ",('"; | |
| 95 | + $concat = true; | |
| 96 | + break; | |
| 97 | + case 'M': | |
| 98 | + $s .= '%b'; | |
| 99 | + break; | |
| 100 | + | |
| 101 | + case 'm': | |
| 102 | + $s .= '%m'; | |
| 103 | + break; | |
| 104 | + case 'D': | |
| 105 | + case 'd': | |
| 106 | + $s .= '%d'; | |
| 107 | + break; | |
| 108 | + | |
| 109 | + case 'H': | |
| 110 | + $s .= '%H'; | |
| 111 | + break; | |
| 112 | + | |
| 113 | + case 'h': | |
| 114 | + $s .= '%I'; | |
| 115 | + break; | |
| 116 | + | |
| 117 | + case 'i': | |
| 118 | + $s .= '%i'; | |
| 119 | + break; | |
| 120 | + | |
| 121 | + case 's': | |
| 122 | + $s .= '%s'; | |
| 123 | + break; | |
| 124 | + | |
| 125 | + case 'a': | |
| 126 | + case 'A': | |
| 127 | + $s .= '%p'; | |
| 128 | + break; | |
| 129 | + | |
| 130 | + default: | |
| 131 | + | |
| 132 | +                if ($ch == '\\') { | |
| 133 | + $i++; | |
| 134 | + $ch = substr($fmt, $i, 1); | |
| 135 | + } | |
| 136 | + $s .= $ch; | |
| 137 | + break; | |
| 138 | 138 | } | 
| 139 | 139 | } | 
| 140 | 140 | $s.="')"; | 
| @@ -75,7 +75,9 @@ discard block | ||
| 75 | 75 | */ | 
| 76 | 76 | function sqlDate($fmt, $col = false) | 
| 77 | 77 |      { | 
| 78 | - if (!$col) $col = $this->sysTimeStamp; | |
| 78 | +        if (!$col) { | |
| 79 | + $col = $this->sysTimeStamp; | |
| 80 | + } | |
| 79 | 81 |          $s = 'DATE_FORMAT(' . $col . ",'"; | 
| 80 | 82 | $concat = false; | 
| 81 | 83 | $len = strlen($fmt); | 
| @@ -90,8 +92,11 @@ discard block | ||
| 90 | 92 | case 'q': | 
| 91 | 93 | $s .= "'),Quarter($col)"; | 
| 92 | 94 | |
| 93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; | |
| 94 | -                    else $s .= ",('"; | |
| 95 | +                    if ($len > $i + 1) { | |
| 96 | + $s .= ",DATE_FORMAT($col,'"; | |
| 97 | +                    } else { | |
| 98 | +                        $s .= ",('"; | |
| 99 | + } | |
| 95 | 100 | $concat = true; | 
| 96 | 101 | break; | 
| 97 | 102 | case 'M': | 
| @@ -138,7 +143,9 @@ discard block | ||
| 138 | 143 | } | 
| 139 | 144 | } | 
| 140 | 145 | $s.="')"; | 
| 141 | - if ($concat) $s = "CONCAT($s)"; | |
| 146 | +        if ($concat) { | |
| 147 | + $s = "CONCAT($s)"; | |
| 148 | + } | |
| 142 | 149 | return $s; | 
| 143 | 150 | } | 
| 144 | 151 | |
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 |          $sql = "concat("; | 
| 15 | 15 |          for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { | 
| 16 | 16 | $var = func_get_arg($i); | 
| 17 | - $sql .= ($i == 0 ? "" : ",") . $var; | |
| 17 | + $sql .= ($i == 0 ? "" : ",").$var; | |
| 18 | 18 | } | 
| 19 | 19 | $sql .= ")"; | 
| 20 | 20 | |
| @@ -31,7 +31,7 @@ discard block | ||
| 31 | 31 | function limit($sql, $start, $qty) | 
| 32 | 32 |      { | 
| 33 | 33 |          if (strpos($sql, ' LIMIT ') === false) { | 
| 34 | - return $sql . " LIMIT $start, $qty "; | |
| 34 | + return $sql." LIMIT $start, $qty "; | |
| 35 | 35 |          } else { | 
| 36 | 36 | return $sql; | 
| 37 | 37 | } | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | function sqlDate($fmt, $col = false) | 
| 77 | 77 |      { | 
| 78 | 78 | if (!$col) $col = $this->sysTimeStamp; | 
| 79 | -        $s = 'DATE_FORMAT(' . $col . ",'"; | |
| 79 | +        $s = 'DATE_FORMAT('.$col.",'"; | |
| 80 | 80 | $concat = false; | 
| 81 | 81 | $len = strlen($fmt); | 
| 82 | 82 |          for ($i = 0; $i < $len; $i++) { | 
| @@ -137,7 +137,7 @@ discard block | ||
| 137 | 137 | break; | 
| 138 | 138 | } | 
| 139 | 139 | } | 
| 140 | - $s.="')"; | |
| 140 | + $s .= "')"; | |
| 141 | 141 | if ($concat) $s = "CONCAT($s)"; | 
| 142 | 142 | return $s; | 
| 143 | 143 | } | 
| @@ -27,7 +27,9 @@ discard block | ||
| 27 | 27 | } | 
| 28 | 28 | |
| 29 | 29 |          if ($path != "") { | 
| 30 | - if ($path[0] == "/") $path = substr($path, 1); | |
| 30 | +            if ($path[0] == "/") { | |
| 31 | + $path = substr($path, 1); | |
| 32 | + } | |
| 31 | 33 | |
| 32 | 34 |              $pathAr = explode("/", $path); | 
| 33 | 35 | |
| @@ -44,7 +46,9 @@ discard block | ||
| 44 | 46 | } | 
| 45 | 47 | } | 
| 46 | 48 | $this->_jsonObject = $newjsonObject; | 
| 47 | - } else $this->_jsonObject = $jsonObject; | |
| 49 | +        } else { | |
| 50 | + $this->_jsonObject = $jsonObject; | |
| 51 | + } | |
| 48 | 52 | |
| 49 | 53 | $this->_current = 0; | 
| 50 | 54 | } | 
| @@ -23,27 +23,27 @@ | ||
| 23 | 23 | $lastError = json_last_error(); | 
| 24 | 24 | $lastErrorDesc = ""; | 
| 25 | 25 |          switch ($lastError) { | 
| 26 | - case JSON_ERROR_NONE: | |
| 27 | - $lastErrorDesc = 'No errors'; | |
| 28 | - break; | |
| 29 | - case JSON_ERROR_DEPTH: | |
| 30 | - $lastErrorDesc = 'Maximum stack depth exceeded'; | |
| 31 | - break; | |
| 32 | - case JSON_ERROR_STATE_MISMATCH: | |
| 33 | - $lastErrorDesc = 'Underflow or the modes mismatch'; | |
| 34 | - break; | |
| 35 | - case JSON_ERROR_CTRL_CHAR: | |
| 36 | - $lastErrorDesc = 'Unexpected control character found'; | |
| 37 | - break; | |
| 38 | - case JSON_ERROR_SYNTAX: | |
| 39 | - $lastErrorDesc = 'Syntax error, malformed JSON'; | |
| 40 | - break; | |
| 41 | - case JSON_ERROR_UTF8: | |
| 42 | - $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; | |
| 43 | - break; | |
| 44 | - default: | |
| 45 | - $lastErrorDesc = 'Unknown error'; | |
| 46 | - break; | |
| 26 | + case JSON_ERROR_NONE: | |
| 27 | + $lastErrorDesc = 'No errors'; | |
| 28 | + break; | |
| 29 | + case JSON_ERROR_DEPTH: | |
| 30 | + $lastErrorDesc = 'Maximum stack depth exceeded'; | |
| 31 | + break; | |
| 32 | + case JSON_ERROR_STATE_MISMATCH: | |
| 33 | + $lastErrorDesc = 'Underflow or the modes mismatch'; | |
| 34 | + break; | |
| 35 | + case JSON_ERROR_CTRL_CHAR: | |
| 36 | + $lastErrorDesc = 'Unexpected control character found'; | |
| 37 | + break; | |
| 38 | + case JSON_ERROR_SYNTAX: | |
| 39 | + $lastErrorDesc = 'Syntax error, malformed JSON'; | |
| 40 | + break; | |
| 41 | + case JSON_ERROR_UTF8: | |
| 42 | + $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; | |
| 43 | + break; | |
| 44 | + default: | |
| 45 | + $lastErrorDesc = 'Unknown error'; | |
| 46 | + break; | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 |          if ($lastError != JSON_ERROR_NONE) { | 
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 |          if ($lastError != JSON_ERROR_NONE) { | 
| 50 | -            throw new DatasetException("Invalid JSON string: " . $lastErrorDesc); | |
| 50 | +            throw new DatasetException("Invalid JSON string: ".$lastErrorDesc); | |
| 51 | 51 | } | 
| 52 | 52 | } | 
| 53 | 53 | |
| @@ -26,7 +26,9 @@ | ||
| 26 | 26 | |
| 27 | 27 | $this->_array = array(); | 
| 28 | 28 | |
| 29 | - if (!$array) return; | |
| 29 | +        if (!$array) { | |
| 30 | + return; | |
| 31 | + } | |
| 30 | 32 | |
| 31 | 33 |          if (is_array($array)) { | 
| 32 | 34 |              foreach ($array as $key => $value) { |