Quellcode durchsuchen

fix unit tests and lint

Olivier Massot vor 6 Monaten
Ursprung
Commit
6dd336ccea

+ 2 - 2
src/Service/Dolibarr/DolibarrApiService.php

@@ -90,7 +90,7 @@ class DolibarrApiService extends ApiRequestService
                     'sortfield' => 'datef',
                     'sortorder' => 'DESC',
                     'limit' => 5,
-                    'sqlfilters' => "(fk_soc:=:$socId) and (fk_statut:!=:0)"
+                    'sqlfilters' => "(fk_soc:=:$socId) and (fk_statut:!=:0)",
                 ]);
         } catch (HttpException $e) {
             if ($e->getStatusCode() === 404) {
@@ -117,7 +117,7 @@ class DolibarrApiService extends ApiRequestService
                     'sortfield' => 't.date_valid',
                     'sortorder' => 'DESC',
                     'limit' => 1,
-                    'sqlfilters' => 'fk_soc:=:'.$socId
+                    'sqlfilters' => 'fk_soc:=:'.$socId,
                 ]
             );
         } catch (HttpException $e) {

+ 3 - 3
tests/Unit/Service/Dolibarr/DolibarrApiServiceTest.php

@@ -172,7 +172,7 @@ class DolibarrApiServiceTest extends TestCase
         $dolibarrApiService
             ->expects(self::once())
             ->method('getJsonContent')
-            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => 'fk_soc:=:'.$socId])
+            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => "(fk_soc:=:$socId) and (fk_statut:!=:0)"])
             ->willReturn([['id' => 10], ['id' => 20]]);
 
         $this->assertEquals([['id' => 10], ['id' => 20]], $dolibarrApiService->getBills($socId));
@@ -193,7 +193,7 @@ class DolibarrApiServiceTest extends TestCase
         $dolibarrApiService
             ->expects(self::once())
             ->method('getJsonContent')
-            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => 'fk_soc:=:'.$socId])
+            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => "(fk_soc:=:$socId) and (fk_statut:!=:0)"])
             ->willThrowException(new HttpException(404));
 
         $this->assertEquals([], $dolibarrApiService->getBills($socId));
@@ -214,7 +214,7 @@ class DolibarrApiServiceTest extends TestCase
         $dolibarrApiService
             ->expects(self::once())
             ->method('getJsonContent')
-            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => 'fk_soc:=:'.$socId])
+            ->with('invoices', ['sortfield' => 'datef', 'sortorder' => 'DESC', 'limit' => 5, 'sqlfilters' => "(fk_soc:=:$socId) and (fk_statut:!=:0)"])
             ->willThrowException(new HttpException(500));
 
         $this->expectException(HttpException::class);