From f5e29d6c86ad885301fa96528baa4c853269e3d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:45:02 +0200
Subject: [PATCH] Fix phpcs warning
---
htdocs/categories/class/api_categories.class.php | 6 ++++--
htdocs/categories/class/api_deprecated_category.class.php | 6 ++++--
htdocs/comm/action/class/api_agendaevents.class.php | 3 ++-
htdocs/comm/propal/class/api_proposals.class.php | 3 ++-
htdocs/commande/class/api_deprecated_commande.class.php | 3 ++-
htdocs/commande/class/api_orders.class.php | 3 ++-
htdocs/compta/bank/class/api_bankaccounts.class.php | 4 ++--
.../compta/facture/class/api_deprecated_invoice.class.php | 3 ++-
htdocs/compta/facture/class/api_invoices.class.php | 3 ++-
htdocs/expensereport/class/api_expensereports.class.php | 3 ++-
htdocs/fourn/class/api_supplier_invoices.class.php | 3 ++-
htdocs/product/class/api_deprecated_product.class.php | 6 ++++--
htdocs/product/class/api_products.class.php | 3 ++-
htdocs/product/stock/class/api_stockmovements.class.php | 3 ++-
htdocs/product/stock/class/api_warehouses.class.php | 3 ++-
htdocs/projet/class/api_projects.class.php | 3 ++-
htdocs/projet/class/api_tasks.class.php | 3 ++-
htdocs/societe/class/api_contacts.class.php | 3 ++-
htdocs/societe/class/api_deprecated_contact.class.php | 3 ++-
htdocs/societe/class/api_deprecated_thirdparty.class.php | 3 ++-
htdocs/societe/class/api_thirdparties.class.php | 3 ++-
htdocs/user/class/api_users.class.php | 3 ++-
22 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index a08abdfc545..fc7aca368f4 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -146,7 +146,8 @@ class Categories extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$category_static = new Categorie($db);
@@ -232,7 +233,8 @@ class Categories extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$category_static = new Categorie($db);
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
index 271f2900502..efbcac82124 100644
--- a/htdocs/categories/class/api_deprecated_category.class.php
+++ b/htdocs/categories/class/api_deprecated_category.class.php
@@ -147,7 +147,8 @@ class CategoryApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$category_static = new Categorie($db);
@@ -228,7 +229,8 @@ class CategoryApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$category_static = new Categorie($db);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..376df238a95 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -147,7 +147,8 @@ class AgendaEvents extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$actioncomm_static = new ActionComm($db);
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index fd508b03256..190f6cdca87 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -148,7 +148,8 @@ class Proposals extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$propal_static = new Propal($db);
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index aa1584c4fed..c0b3a634825 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -163,7 +163,8 @@ class CommandeApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$commande_static = new Commande($db);
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 81a2ad79d69..1bd4e44a877 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -152,7 +152,8 @@ class Orders extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$commande_static = new Commande($db);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 10994d7d525..98ee2672d3b 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -98,8 +98,8 @@ class BankAccounts extends DolibarrApi
if ($result) {
$num = $this->db->num_rows($result);
- $minnum = min($num, ($limit <= 0 ? $num : $limit));
- for ($i = 0; $i < $minnum; $i++) {
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ for ($i = 0; $i < $min; $i++) {
$obj = $this->db->fetch_object($result);
$account = new Account($this->db);
if ($account->fetch($obj->rowid) > 0) {
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index b638a46b920..36aa232de9e 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -161,7 +161,8 @@ class InvoiceApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$invoice_static = new Facture($db);
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 4efc997cc42..e2842df0530 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -155,7 +155,8 @@ class Invoices extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$invoice_static = new Facture($db);
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 03ecb51de79..763b550d34e 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -134,7 +134,8 @@ class ExpenseReports extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$expensereport_static = new ExpenseReport($db);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 3bf5c3f5934..1eb1872126c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -155,7 +155,8 @@ class SupplierInvoices extends DolibarrApi
{
$i = 0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$invoice_static = new FactureFournisseur($db);
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index e2ee97e0100..e33c7dd3e32 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -149,7 +149,8 @@ class ProductApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$product_static = new Product($db);
@@ -235,7 +236,8 @@ class ProductApi extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$product_static = new Product($db);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 14885532952..a733a554fd5 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -146,7 +146,8 @@ class Products extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$product_static = new Product($db);
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 677d34d9fcb..79e17749991 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -133,7 +133,8 @@ class StockMovements extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$stockmovement_static = new MouvementStock($db);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index d09c7bc527f..d50f590c30c 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -131,7 +131,8 @@ class Warehouses extends DolibarrApi
{
$i=0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$warehouse_static = new Entrepot($db);
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 5bb7e8dfc7e..0f4f85c05af 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -153,7 +153,8 @@ class Projects extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$project_static = new Project($db);
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index ad72a36fa45..d2d7b81d865 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -160,7 +160,8 @@ class Tasks extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$task_static = new Task($db);
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index de50799e430..02c1410fcbf 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -153,7 +153,8 @@ class Contacts extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
index 196a1386b5d..8cb61fa3eb0 100644
--- a/htdocs/societe/class/api_deprecated_contact.class.php
+++ b/htdocs/societe/class/api_deprecated_contact.class.php
@@ -167,7 +167,8 @@ class ContactApi extends DolibarrApi
{
$i = 0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index 96a2ebac321..a8146f4cca6 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -214,7 +214,8 @@ class ThirdpartyApi extends DolibarrApi
{
$i = 0;
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$soc_static = new Societe($db);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f8e96d82e47..df7965d6d8c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -156,7 +156,8 @@ class Thirdparties extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$soc_static = new Societe($db);
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 80065f8d8d2..aa2569fb3ca 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -106,7 +106,8 @@ class Users extends DolibarrApi
if ($result)
{
$num = $db->num_rows($result);
- while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ while ($i < $min)
{
$obj = $db->fetch_object($result);
$user_static = new User($db);
--
GitLab