11<?php
22/**
3- * Copyright © Magento, Inc. All rights reserved.
4- * See COPYING.txt for license details .
3+ * Copyright 2015 Adobe
4+ * All Rights Reserved .
55 */
66declare (strict_types=1 );
77
@@ -581,10 +581,12 @@ private function createExpectedFilter($field, $value, $atIndex)
581581 ->method ('setField ' )
582582 ->with ($ field )
583583 ->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+ }
588590 $ this ->filterBuilder ->expects (new MethodInvokedAtIndex ($ atIndex ))
589591 ->method ('create ' )
590592 ->willReturn ($ filterObject );
@@ -623,11 +625,11 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
623625 );
624626
625627 $ 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 );
627630
628- $ this ->filterBuilder ->expects (static :: once ( ))
631+ $ this ->filterBuilder ->expects (self :: exactly ( 2 ))
629632 ->method ('setConditionType ' )
630- ->with ('gt ' )
631633 ->willReturnSelf ();
632634
633635 $ this ->searchCriteriaBuilder ->expects (self ::exactly (6 ))
@@ -639,7 +641,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
639641 [$ expiresAtFilter , $ this ->searchCriteriaBuilder ],
640642 [$ isActiveFilter , $ this ->searchCriteriaBuilder ],
641643 [$ isVisibleFilter , $ this ->searchCriteriaBuilder ],
642- [$ websiteFilter , $ this ->searchCriteriaBuilder ],
644+ [[ $ websiteFilter1 , $ websiteFilter2 ] , $ this ->searchCriteriaBuilder ],
643645 ]
644646 );
645647
0 commit comments