Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/db/mssql.class.php
View File

@@ -1157,7 +1157,8 @@ class DoliDBMssql extends DoliDB
* @return string field's name escaped
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function EscapeFieldName($fieldname) {
function EscapeFieldName($fieldname)
{
return "[".$fieldname."]";
}
@@ -1170,7 +1171,8 @@ class DoliDBMssql extends DoliDB
* @return false|object
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function GetFieldInformation($table,$fields) {
function GetFieldInformation($table,$fields)
{
$sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
if (is_array($fields))
{

9
htdocs/core/db/sqlite3.class.php
View File

@@ -1321,7 +1321,8 @@ class DoliDBSqlite3 extends DoliDB
* @return int Formatted date
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
private static function calc_daynr($year, $month, $day) {
private static function calc_daynr($year, $month, $day)
{
$y = $year;
if ($y == 0 && $month == 0) return 0;
$num = (365* $y + 31 * ($month - 1) + $day);
@@ -1342,7 +1343,8 @@ class DoliDBSqlite3 extends DoliDB
* @return int
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
private static function calc_weekday($daynr, $sunday_first_day_of_week) {
private static function calc_weekday($daynr, $sunday_first_day_of_week)
{
$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
return $ret;
}
@@ -1370,7 +1372,8 @@ class DoliDBSqlite3 extends DoliDB
* @return string ???
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
{
$daynr=self::calc_daynr($year,$month,$day);
$first_daynr=self::calc_daynr($year,1,1);
$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;