Browse Source

Fix phpcs warning

Laurent Destailleur 8 years ago
parent
commit
f5e29d6c86

+ 4 - 2
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);

+ 4 - 2
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 2
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) {

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 4 - 2
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);

+ 2 - 1
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);