1
1
<?php
2
2
/**
3
- * Copyright © Magento, Inc. All rights reserved.
4
- * See COPYING.txt for license details .
3
+ * Copyright 2015 Adobe
4
+ * All Rights Reserved .
5
5
*/
6
6
declare (strict_types=1 );
7
7
@@ -581,10 +581,12 @@ private function createExpectedFilter($field, $value, $atIndex)
581
581
->method ('setField ' )
582
582
->with ($ field )
583
583
->willReturnSelf ();
584
- $ this ->filterBuilder ->expects (new MethodInvokedAtIndex ($ atIndex ))
585
- ->method ('setValue ' )
586
- ->with ($ value )
587
- ->willReturnSelf ();
584
+ if ($ value !== null ) {
585
+ $ this ->filterBuilder ->expects (new MethodInvokedAtIndex ($ atIndex ))
586
+ ->method ('setValue ' )
587
+ ->with ($ value )
588
+ ->willReturnSelf ();
589
+ }
588
590
$ this ->filterBuilder ->expects (new MethodInvokedAtIndex ($ atIndex ))
589
591
->method ('create ' )
590
592
->willReturn ($ filterObject );
@@ -623,11 +625,11 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
623
625
);
624
626
625
627
$ isVisibleFilter = $ this ->createExpectedFilter (PaymentTokenInterface::IS_VISIBLE , 1 , 4 );
626
- $ websiteFilter = $ this ->createExpectedFilter (PaymentTokenInterface::WEBSITE_ID , 1 , 5 );
628
+ $ websiteFilter1 = $ this ->createExpectedFilter (PaymentTokenInterface::WEBSITE_ID , 1 , 5 );
629
+ $ websiteFilter2 = $ this ->createExpectedFilter (PaymentTokenInterface::WEBSITE_ID , null , 6 );
627
630
628
- $ this ->filterBuilder ->expects (static :: once ( ))
631
+ $ this ->filterBuilder ->expects (self :: exactly ( 2 ))
629
632
->method ('setConditionType ' )
630
- ->with ('gt ' )
631
633
->willReturnSelf ();
632
634
633
635
$ this ->searchCriteriaBuilder ->expects (self ::exactly (6 ))
@@ -639,7 +641,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
639
641
[$ expiresAtFilter , $ this ->searchCriteriaBuilder ],
640
642
[$ isActiveFilter , $ this ->searchCriteriaBuilder ],
641
643
[$ isVisibleFilter , $ this ->searchCriteriaBuilder ],
642
- [$ websiteFilter , $ this ->searchCriteriaBuilder ],
644
+ [[ $ websiteFilter1 , $ websiteFilter2 ] , $ this ->searchCriteriaBuilder ],
643
645
]
644
646
);
645
647
0 commit comments