From aab279998132f07f49f319538c60452ec6d29b62 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Mon, 27 Nov 2017 13:48:36 +0000
Subject: [PATCH] Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
htdocs/admin/loan.php | 2 +-
htdocs/admin/taxes.php | 2 +-
htdocs/core/lib/admin.lib.php | 2 +-
htdocs/core/lib/barcode.lib.php | 6 +++---
htdocs/core/lib/json.lib.php | 28 +++++++++++++-------------
htdocs/don/admin/donation.php | 2 +-
htdocs/product/card.php | 2 +-
htdocs/product/class/product.class.php | 18 ++++++++---------
8 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 65363f468e8..1a9ef385bf7 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -77,7 +77,7 @@ if ($action == 'update')
llxHeader();
$form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 59796919a8b..a8f98f02c3b 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -113,7 +113,7 @@ if ($action == 'update') {
llxHeader();
$form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 75653783c7c..422e7be984d 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -133,7 +133,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
$error=0;
$i=0;
$buffer = '';
- $arraysql = Array();
+ $arraysql = array();
// Get version of database
$versionarray=$db->getVersionArray();
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index b0849bb913e..13956f688aa 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -27,9 +27,9 @@
/* ******************************************************************** */
/* COLORS */
/* ******************************************************************** */
-$bar_color=Array(0,0,0);
-$bg_color=Array(255,255,255);
-$text_color=Array(0,0,0);
+$bar_color=array(0,0,0);
+$bg_color=array(255,255,255);
+$text_color=array(0,0,0);
/* ******************************************************************** */
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index a35520998bf..4d31308b4b3 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -356,20 +356,20 @@ function utf82utf16($utf8)
}
switch(strlen($utf8)) {
- case 1:
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return $utf8;
-
- case 2:
- // return a UTF-16 character from a 2-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
-
- case 3:
- // return a UTF-16 character from a 3-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
+ case 1:
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return $utf8;
+
+ case 2:
+ // return a UTF-16 character from a 2-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
+
+ case 3:
+ // return a UTF-16 character from a 3-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
}
// ignoring UTF-32 for now, sorry
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 69e48248d57..fc659565c56 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -201,7 +201,7 @@ else if ($action == 'setart885') {
$dir = "../../core/modules/dons/";
$form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a6b431c4273..9f91765b92d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -848,7 +848,7 @@ llxHeader('', $title, $helpurl);
$form = new Form($db);
$formfile = new FormFile($db);
$formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
// Load object modBarCodeProduct
$res=0;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4c67a25962e..18f53a304b2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3585,15 +3585,15 @@ class Product extends CommonObject
{
switch ($type)
{
- case 0:
- return $this->LibStatut($this->status,$mode,$type);
- case 1:
- return $this->LibStatut($this->status_buy,$mode,$type);
- case 2:
- return $this->LibStatut($this->status_batch,$mode,$type);
- default:
- //Simulate previous behavior but should return an error string
- return $this->LibStatut($this->status_buy,$mode,$type);
+ case 0:
+ return $this->LibStatut($this->status,$mode,$type);
+ case 1:
+ return $this->LibStatut($this->status_buy,$mode,$type);
+ case 2:
+ return $this->LibStatut($this->status_batch,$mode,$type);
+ default:
+ //Simulate previous behavior but should return an error string
+ return $this->LibStatut($this->status_buy,$mode,$type);
}
}
--
GitLab