Fix merge conflicts

This commit is contained in:
dinamiko 2021-09-30 12:52:15 +02:00
commit 57ff2cc649
106 changed files with 10786 additions and 7645 deletions

View file

@ -10,16 +10,14 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Subscription;
use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper;
use WooCommerce\PayPalCommerce\Subscription\Repository\PaymentTokenRepository;
use Psr\Container\ContainerInterface;
return array(
'subscription.helper' => static function ( ContainerInterface $container ): SubscriptionHelper {
'subscription.helper' => static function ( ContainerInterface $container ): SubscriptionHelper {
return new SubscriptionHelper();
},
'subscription.renewal-handler' => static function ( ContainerInterface $container ): RenewalHandler {
'subscription.renewal-handler' => static function ( ContainerInterface $container ): RenewalHandler {
$logger = $container->get( 'woocommerce.logger.woocommerce' );
$repository = $container->get( 'subscription.repository.payment-token' );
$repository = $container->get( 'vaulting.repository.payment-token' );
$endpoint = $container->get( 'api.endpoint.order' );
$purchase_unit_factory = $container->get( 'api.factory.purchase-unit' );
$payer_factory = $container->get( 'api.factory.payer' );