From 45db097bd8bde8baa861e75c0635e5bbbf76020c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Wed, 17 Feb 2021 11:18:59 +0100 Subject: [PATCH 01/42] Now depending on newer module standard Refactoring of modules themselves was not necessary, because they were already following the new standard. --- .idea/woocommerce-paypal-payments.iml | 92 +++++++++++++------------- composer.json | 7 +- wordpress_org_assets/icon-128x128.png | Bin 15835 -> 15834 bytes wordpress_org_assets/icon-256x256.png | Bin 35452 -> 35451 bytes wordpress_org_assets/screenshot-1.png | Bin 102284 -> 102282 bytes wordpress_org_assets/screenshot-2.png | Bin 54280 -> 54279 bytes wordpress_org_assets/screenshot-4.png | Bin 80445 -> 80443 bytes 7 files changed, 50 insertions(+), 49 deletions(-) diff --git a/.idea/woocommerce-paypal-payments.iml b/.idea/woocommerce-paypal-payments.iml index c02195bf7..2dcaa137d 100644 --- a/.idea/woocommerce-paypal-payments.iml +++ b/.idea/woocommerce-paypal-payments.iml @@ -5,58 +5,58 @@ - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/composer.json b/composer.json index f72cfc0a5..27b6300dd 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,12 @@ "description": "PayPal Commerce Platform for WooCommerce", "license": "GPL-2.0", "require": { + "php": "^7.1 | ^8.0", "dhii/module-interface": "^0.2 || ^0.3", - "psr/container": "1.0.0", + "psr/container": "^1.0", "container-interop/service-provider": "^0.4.0", - "dhii/containers": "v0.1.0-alpha1", - "dhii/wp-containers": "v0.1.0-alpha1", + "dhii/containers": "^0.1.0-alpha1", + "dhii/wp-containers": "^0.1.0-alpha1", "psr/log": "^1.1", "ext-json": "*", "ralouphie/getallheaders": "^3.0" diff --git a/wordpress_org_assets/icon-128x128.png b/wordpress_org_assets/icon-128x128.png index 215c72eff1a93c198b3884179208c28a4f4a33c3..c9b216209ff63efd533ea66f06a6558be7036d6c 100644 GIT binary patch delta 13 UcmcazeXE+KGr-S%BkMI=04=Kp=Kufz delta 14 VcmcareY={qGr-TCcO%O+TL3Z-1@r&_ diff --git a/wordpress_org_assets/icon-256x256.png b/wordpress_org_assets/icon-256x256.png index 05e79e17deb690758d3926113e6e804414902bbc..7eabe654eaa8d55fe6bdf41c83e0f66eda21fbe2 100644 GIT binary patch delta 15 Wcmew}h3WScCYH_sKlhES8+408eEIGynhq delta 23 fcmeC0&(<@ajkPnt&z*N8i_S(y-pvLZqwWC!UhW7@ diff --git a/wordpress_org_assets/screenshot-2.png b/wordpress_org_assets/screenshot-2.png index a77634b98be9bce742624ca2c724cd2d666c705e..39e5ccfc316d3de95aae7a99dc30e5519224d8f9 100644 GIT binary patch delta 15 WcmeBJ!Q8%rnWZzp&wV2+^A!Lrhy`T; delta 16 XcmZo)!Q8QenYA;(&z*N83-c8KFr@`@ diff --git a/wordpress_org_assets/screenshot-4.png b/wordpress_org_assets/screenshot-4.png index 28bff48f0c3bae8f4abd1232a3bede63a14b0bf4..f6f9c6c1c0f162bedef56d8cc5494e1c8072344a 100644 GIT binary patch delta 24 gcmdn{g=O~_7M9KcKlhES2i2O7t8G87##kl{0E$2g761SM delta 27 jcmdn}g=Oy-7S_%HKX=}ZEC Date: Wed, 17 Feb 2021 12:31:40 +0100 Subject: [PATCH 02/42] Use Composer modules and convert modules to PSR-4 PSR-4 is much more robust and predictable. But to do this, a source root dir must be specified for every module. This could be done in the root file, but this is not very modular. Instead, now every module declares its own source root by using the amazing Composer Merge Plugin. This approach allows each module to also declare its own dependencies. Together, these changes allow modules to be easily extractable to separate pacakges when the need arises, and in general improves modularity significantly. --- .idea/woocommerce-paypal-payments.iml | 2 ++ composer.json | 15 ++++++++++----- modules/ppcp-admin-notices/composer.json | 17 +++++++++++++++++ ...{class-adminnotices.php => AdminNotices.php} | 0 .../Entity/{class-message.php => Message.php} | 0 .../{class-renderer.php => Renderer.php} | 0 ...dererinterface.php => RendererInterface.php} | 0 .../{class-repository.php => Repository.php} | 0 ...oryinterface.php => RepositoryInterface.php} | 0 modules/ppcp-api-client/composer.json | 17 +++++++++++++++++ .../src/{class-apimodule.php => ApiModule.php} | 0 .../{class-bearer.php => Bearer.php} | 0 ...lass-connectbearer.php => ConnectBearer.php} | 0 ...{class-paypalbearer.php => PayPalBearer.php} | 0 ...lass-identitytoken.php => IdentityToken.php} | 0 .../{class-loginseller.php => LoginSeller.php} | 0 ...lass-orderendpoint.php => OrderEndpoint.php} | 0 ...artnerreferrals.php => PartnerReferrals.php} | 0 ...artnersendpoint.php => PartnersEndpoint.php} | 0 ...kenendpoint.php => PaymentTokenEndpoint.php} | 0 ...aymentsendpoint.php => PaymentsEndpoint.php} | 0 ...{class-requesttrait.php => RequestTrait.php} | 0 ...-webhookendpoint.php => WebhookEndpoint.php} | 0 .../Entity/{class-address.php => Address.php} | 0 .../src/Entity/{class-amount.php => Amount.php} | 0 ...-amountbreakdown.php => AmountBreakdown.php} | 0 ...cationcontext.php => ApplicationContext.php} | 0 ...lass-authorization.php => Authorization.php} | 0 ...zationstatus.php => AuthorizationStatus.php} | 0 .../Entity/{class-capture.php => Capture.php} | 0 ...nresult.php => CardAuthenticationResult.php} | 0 .../src/Entity/{class-item.php => Item.php} | 0 .../src/Entity/{class-money.php => Money.php} | 0 .../src/Entity/{class-order.php => Order.php} | 0 .../{class-orderstatus.php => OrderStatus.php} | 0 .../src/Entity/{class-patch.php => Patch.php} | 0 ...-patchcollection.php => PatchCollection.php} | 0 .../src/Entity/{class-payee.php => Payee.php} | 0 .../src/Entity/{class-payer.php => Payer.php} | 0 .../{class-payername.php => PayerName.php} | 0 ...{class-payertaxinfo.php => PayerTaxInfo.php} | 0 ...lass-paymentmethod.php => PaymentMethod.php} | 0 ...lass-paymentsource.php => PaymentSource.php} | 0 ...mentsourcecard.php => PaymentSourceCard.php} | 0 ...sourcewallet.php => PaymentSourceWallet.php} | 0 ...{class-paymenttoken.php => PaymentToken.php} | 0 .../Entity/{class-payments.php => Payments.php} | 0 .../src/Entity/{class-phone.php => Phone.php} | 0 ...lass-phonewithtype.php => PhoneWithType.php} | 0 ...{class-purchaseunit.php => PurchaseUnit.php} | 0 .../src/Entity/{class-refund.php => Refund.php} | 0 ...{class-sellerstatus.php => SellerStatus.php} | 0 ...tatusproduct.php => SellerStatusProduct.php} | 0 .../Entity/{class-shipping.php => Shipping.php} | 0 .../src/Entity/{class-token.php => Token.php} | 0 .../Entity/{class-webhook.php => Webhook.php} | 0 ...foundexception.php => NotFoundException.php} | 0 ...lapiexception.php => PayPalApiException.php} | 0 ...untimeexception.php => RuntimeException.php} | 0 ...ss-addressfactory.php => AddressFactory.php} | 0 ...lass-amountfactory.php => AmountFactory.php} | 0 ...actory.php => ApplicationContextFactory.php} | 0 ...tionfactory.php => AuthorizationFactory.php} | 0 ...ss-capturefactory.php => CaptureFactory.php} | 0 .../{class-itemfactory.php => ItemFactory.php} | 0 ...{class-orderfactory.php => OrderFactory.php} | 0 ...onfactory.php => PatchCollectionFactory.php} | 0 ...{class-payeefactory.php => PayeeFactory.php} | 0 ...{class-payerfactory.php => PayerFactory.php} | 0 ...urcefactory.php => PaymentSourceFactory.php} | 0 ...tokenfactory.php => PaymentTokenFactory.php} | 0 ...-paymentsfactory.php => PaymentsFactory.php} | 0 ...eunitfactory.php => PurchaseUnitFactory.php} | 0 ...tatusfactory.php => SellerStatusFactory.php} | 0 ...-shippingfactory.php => ShippingFactory.php} | 0 ...ss-webhookfactory.php => WebhookFactory.php} | 0 .../src/Helper/{class-cache.php => Cache.php} | 0 .../{class-dccapplies.php => DccApplies.php} | 0 ...lass-errorresponse.php => ErrorResponse.php} | 0 ...ory.php => ApplicationContextRepository.php} | 0 ...ss-cartrepository.php => CartRepository.php} | 0 ...ferralsdata.php => PartnerReferralsData.php} | 0 ...sitory.php => PayPalRequestIdRepository.php} | 0 ...-payeerepository.php => PayeeRepository.php} | 0 ....php => PurchaseUnitRepositoryInterface.php} | 0 modules/ppcp-button/composer.json | 17 +++++++++++++++++ ...dsmartbutton.php => DisabledSmartButton.php} | 0 .../{class-smartbutton.php => SmartButton.php} | 0 ...oninterface.php => SmartButtonInterface.php} | 0 ...{class-buttonmodule.php => ButtonModule.php} | 0 ...derendpoint.php => ApproveOrderEndpoint.php} | 0 ...ecartendpoint.php => ChangeCartEndpoint.php} | 0 ...rderendpoint.php => CreateOrderEndpoint.php} | 0 ...tidendpoint.php => DataClientIdEndpoint.php} | 0 ...pointinterface.php => EndpointInterface.php} | 0 .../{class-requestdata.php => RequestData.php} | 0 ...untimeexception.php => RuntimeException.php} | 0 ...lyorderhandler.php => EarlyOrderHandler.php} | 0 ...lass-messagesapply.php => MessagesApply.php} | 0 ...{class-threedsecure.php => ThreeDSecure.php} | 0 modules/ppcp-onboarding/composer.json | 17 +++++++++++++++++ ...nboardingassets.php => OnboardingAssets.php} | 0 ...llerendpoint.php => LoginSellerEndpoint.php} | 0 .../{class-environment.php => Environment.php} | 0 ...nboardingmodule.php => OnboardingModule.php} | 0 ...rdingrenderer.php => OnboardingRenderer.php} | 0 .../src/{class-state.php => State.php} | 0 modules/ppcp-session/composer.json | 17 +++++++++++++++++ ...ancelcontroller.php => CancelController.php} | 0 .../{class-cancelview.php => CancelView.php} | 0 ...ss-sessionhandler.php => SessionHandler.php} | 0 ...lass-sessionmodule.php => SessionModule.php} | 0 modules/ppcp-subscription/composer.json | 17 +++++++++++++++++ ...riptionhelper.php => SubscriptionHelper.php} | 0 ...ss-renewalhandler.php => RenewalHandler.php} | 0 ...epository.php => PaymentTokenRepository.php} | 0 ...riptionmodule.php => SubscriptionModule.php} | 0 modules/ppcp-wc-gateway/composer.json | 17 +++++++++++++++++ modules/ppcp-wc-gateway/services.php | 4 ++-- ...mn.php => OrderTablePaymentStatusColumn.php} | 0 ...rdetail.php => PaymentStatusOrderDetail.php} | 0 ...rizeaction.php => RenderAuthorizeAction.php} | 0 ...eset.php => CheckoutPayPalAddressPreset.php} | 0 ...-disablegateways.php => DisableGateways.php} | 0 ...urnurlendpoint.php => ReturnUrlEndpoint.php} | 0 ...foundexception.php => NotFoundException.php} | 0 ...ditcardgateway.php => CreditCardGateway.php} | 0 ...lass-paypalgateway.php => PayPalGateway.php} | 0 ...paymenttrait.php => ProcessPaymentTrait.php} | 0 .../src/Gateway/WcGatewayInterface.php | 0 ...ccproductstatus.php => DccProductStatus.php} | 2 +- ...otice.php => AuthorizeOrderActionNotice.php} | 0 ...ctadminnotice.php => ConnectAdminNotice.php} | 0 ...ssor.php => AuthorizedPaymentsProcessor.php} | 0 ...ss-orderprocessor.php => OrderProcessor.php} | 0 ...-refundprocessor.php => RefundProcessor.php} | 0 ...ectionsrenderer.php => SectionsRenderer.php} | 0 .../{class-settings.php => Settings.php} | 0 ...ettingslistener.php => SettingsListener.php} | 0 ...ettingsrenderer.php => SettingsRenderer.php} | 0 ...-wcgatewaymodule.php => WcGatewayModule.php} | 0 modules/ppcp-webhooks/composer.json | 17 +++++++++++++++++ ...erapproved.php => CheckoutOrderApproved.php} | 0 ...completed.php => CheckoutOrderCompleted.php} | 0 ...ompleted.php => PaymentCaptureCompleted.php} | 0 ...erefunded.php => PaymentCaptureRefunded.php} | 0 ...ereversed.php => PaymentCaptureReversed.php} | 0 .../{class-prefixtrait.php => PrefixTrait.php} | 0 ...ss-requesthandler.php => RequestHandler.php} | 0 ...endpoint.php => IncomingWebhookEndpoint.php} | 0 ...lass-webhookmodule.php => WebhookModule.php} | 0 ...ebhookregistrar.php => WebhookRegistrar.php} | 0 modules/woocommerce-logging/composer.json | 17 +++++++++++++++++ .../{class-nulllogger.php => NullLogger.php} | 0 ...commercelogger.php => WooCommerceLogger.php} | 0 ...gmodule.php => WooCommerceLoggingModule.php} | 0 ...{class-pluginmodule.php => PluginModule.php} | 0 157 files changed, 168 insertions(+), 8 deletions(-) create mode 100644 modules/ppcp-admin-notices/composer.json rename modules/ppcp-admin-notices/src/{class-adminnotices.php => AdminNotices.php} (100%) rename modules/ppcp-admin-notices/src/Entity/{class-message.php => Message.php} (100%) rename modules/ppcp-admin-notices/src/Renderer/{class-renderer.php => Renderer.php} (100%) rename modules/ppcp-admin-notices/src/Renderer/{class-rendererinterface.php => RendererInterface.php} (100%) rename modules/ppcp-admin-notices/src/Repository/{class-repository.php => Repository.php} (100%) rename modules/ppcp-admin-notices/src/Repository/{class-repositoryinterface.php => RepositoryInterface.php} (100%) create mode 100644 modules/ppcp-api-client/composer.json rename modules/ppcp-api-client/src/{class-apimodule.php => ApiModule.php} (100%) rename modules/ppcp-api-client/src/Authentication/{class-bearer.php => Bearer.php} (100%) rename modules/ppcp-api-client/src/Authentication/{class-connectbearer.php => ConnectBearer.php} (100%) rename modules/ppcp-api-client/src/Authentication/{class-paypalbearer.php => PayPalBearer.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-identitytoken.php => IdentityToken.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-loginseller.php => LoginSeller.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-orderendpoint.php => OrderEndpoint.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-partnerreferrals.php => PartnerReferrals.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-partnersendpoint.php => PartnersEndpoint.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-paymenttokenendpoint.php => PaymentTokenEndpoint.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-paymentsendpoint.php => PaymentsEndpoint.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-requesttrait.php => RequestTrait.php} (100%) rename modules/ppcp-api-client/src/Endpoint/{class-webhookendpoint.php => WebhookEndpoint.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-address.php => Address.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-amount.php => Amount.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-amountbreakdown.php => AmountBreakdown.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-applicationcontext.php => ApplicationContext.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-authorization.php => Authorization.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-authorizationstatus.php => AuthorizationStatus.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-capture.php => Capture.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-cardauthenticationresult.php => CardAuthenticationResult.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-item.php => Item.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-money.php => Money.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-order.php => Order.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-orderstatus.php => OrderStatus.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-patch.php => Patch.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-patchcollection.php => PatchCollection.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-payee.php => Payee.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-payer.php => Payer.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-payername.php => PayerName.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-payertaxinfo.php => PayerTaxInfo.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-paymentmethod.php => PaymentMethod.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-paymentsource.php => PaymentSource.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-paymentsourcecard.php => PaymentSourceCard.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-paymentsourcewallet.php => PaymentSourceWallet.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-paymenttoken.php => PaymentToken.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-payments.php => Payments.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-phone.php => Phone.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-phonewithtype.php => PhoneWithType.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-purchaseunit.php => PurchaseUnit.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-refund.php => Refund.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-sellerstatus.php => SellerStatus.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-sellerstatusproduct.php => SellerStatusProduct.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-shipping.php => Shipping.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-token.php => Token.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-webhook.php => Webhook.php} (100%) rename modules/ppcp-api-client/src/Exception/{class-notfoundexception.php => NotFoundException.php} (100%) rename modules/ppcp-api-client/src/Exception/{class-paypalapiexception.php => PayPalApiException.php} (100%) rename modules/ppcp-api-client/src/Exception/{class-runtimeexception.php => RuntimeException.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-addressfactory.php => AddressFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-amountfactory.php => AmountFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-applicationcontextfactory.php => ApplicationContextFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-authorizationfactory.php => AuthorizationFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-capturefactory.php => CaptureFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-itemfactory.php => ItemFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-orderfactory.php => OrderFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-patchcollectionfactory.php => PatchCollectionFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-payeefactory.php => PayeeFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-payerfactory.php => PayerFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-paymentsourcefactory.php => PaymentSourceFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-paymenttokenfactory.php => PaymentTokenFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-paymentsfactory.php => PaymentsFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-purchaseunitfactory.php => PurchaseUnitFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-sellerstatusfactory.php => SellerStatusFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-shippingfactory.php => ShippingFactory.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-webhookfactory.php => WebhookFactory.php} (100%) rename modules/ppcp-api-client/src/Helper/{class-cache.php => Cache.php} (100%) rename modules/ppcp-api-client/src/Helper/{class-dccapplies.php => DccApplies.php} (100%) rename modules/ppcp-api-client/src/Helper/{class-errorresponse.php => ErrorResponse.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-applicationcontextrepository.php => ApplicationContextRepository.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-cartrepository.php => CartRepository.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-partnerreferralsdata.php => PartnerReferralsData.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-paypalrequestidrepository.php => PayPalRequestIdRepository.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-payeerepository.php => PayeeRepository.php} (100%) rename modules/ppcp-api-client/src/Repository/{class-purchaseunitrepositoryinterface.php => PurchaseUnitRepositoryInterface.php} (100%) create mode 100644 modules/ppcp-button/composer.json rename modules/ppcp-button/src/Assets/{class-disabledsmartbutton.php => DisabledSmartButton.php} (100%) rename modules/ppcp-button/src/Assets/{class-smartbutton.php => SmartButton.php} (100%) rename modules/ppcp-button/src/Assets/{class-smartbuttoninterface.php => SmartButtonInterface.php} (100%) rename modules/ppcp-button/src/{class-buttonmodule.php => ButtonModule.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-approveorderendpoint.php => ApproveOrderEndpoint.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-changecartendpoint.php => ChangeCartEndpoint.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-createorderendpoint.php => CreateOrderEndpoint.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-dataclientidendpoint.php => DataClientIdEndpoint.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-endpointinterface.php => EndpointInterface.php} (100%) rename modules/ppcp-button/src/Endpoint/{class-requestdata.php => RequestData.php} (100%) rename modules/ppcp-button/src/Exception/{class-runtimeexception.php => RuntimeException.php} (100%) rename modules/ppcp-button/src/Helper/{class-earlyorderhandler.php => EarlyOrderHandler.php} (100%) rename modules/ppcp-button/src/Helper/{class-messagesapply.php => MessagesApply.php} (100%) rename modules/ppcp-button/src/Helper/{class-threedsecure.php => ThreeDSecure.php} (100%) create mode 100644 modules/ppcp-onboarding/composer.json rename modules/ppcp-onboarding/src/Assets/{class-onboardingassets.php => OnboardingAssets.php} (100%) rename modules/ppcp-onboarding/src/Endpoint/{class-loginsellerendpoint.php => LoginSellerEndpoint.php} (100%) rename modules/ppcp-onboarding/src/{class-environment.php => Environment.php} (100%) rename modules/ppcp-onboarding/src/{class-onboardingmodule.php => OnboardingModule.php} (100%) rename modules/ppcp-onboarding/src/Render/{class-onboardingrenderer.php => OnboardingRenderer.php} (100%) rename modules/ppcp-onboarding/src/{class-state.php => State.php} (100%) create mode 100644 modules/ppcp-session/composer.json rename modules/ppcp-session/src/Cancellation/{class-cancelcontroller.php => CancelController.php} (100%) rename modules/ppcp-session/src/Cancellation/{class-cancelview.php => CancelView.php} (100%) rename modules/ppcp-session/src/{class-sessionhandler.php => SessionHandler.php} (100%) rename modules/ppcp-session/src/{class-sessionmodule.php => SessionModule.php} (100%) create mode 100644 modules/ppcp-subscription/composer.json rename modules/ppcp-subscription/src/Helper/{class-subscriptionhelper.php => SubscriptionHelper.php} (100%) rename modules/ppcp-subscription/src/{class-renewalhandler.php => RenewalHandler.php} (100%) rename modules/ppcp-subscription/src/Repository/{class-paymenttokenrepository.php => PaymentTokenRepository.php} (100%) rename modules/ppcp-subscription/src/{class-subscriptionmodule.php => SubscriptionModule.php} (100%) create mode 100644 modules/ppcp-wc-gateway/composer.json rename modules/ppcp-wc-gateway/src/Admin/{class-ordertablepaymentstatuscolumn.php => OrderTablePaymentStatusColumn.php} (100%) rename modules/ppcp-wc-gateway/src/Admin/{class-paymentstatusorderdetail.php => PaymentStatusOrderDetail.php} (100%) rename modules/ppcp-wc-gateway/src/Admin/{class-renderauthorizeaction.php => RenderAuthorizeAction.php} (100%) rename modules/ppcp-wc-gateway/src/Checkout/{class-checkoutpaypaladdresspreset.php => CheckoutPayPalAddressPreset.php} (100%) rename modules/ppcp-wc-gateway/src/Checkout/{class-disablegateways.php => DisableGateways.php} (100%) rename modules/ppcp-wc-gateway/src/Endpoint/{class-returnurlendpoint.php => ReturnUrlEndpoint.php} (100%) rename modules/ppcp-wc-gateway/src/Exception/{class-notfoundexception.php => NotFoundException.php} (100%) rename modules/ppcp-wc-gateway/src/Gateway/{class-creditcardgateway.php => CreditCardGateway.php} (100%) rename modules/ppcp-wc-gateway/src/Gateway/{class-paypalgateway.php => PayPalGateway.php} (100%) rename modules/ppcp-wc-gateway/src/Gateway/{class-processpaymenttrait.php => ProcessPaymentTrait.php} (100%) create mode 100644 modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php rename modules/ppcp-wc-gateway/src/Helper/{class-dccproductstatus.php => DccProductStatus.php} (97%) rename modules/ppcp-wc-gateway/src/Notice/{class-authorizeorderactionnotice.php => AuthorizeOrderActionNotice.php} (100%) rename modules/ppcp-wc-gateway/src/Notice/{class-connectadminnotice.php => ConnectAdminNotice.php} (100%) rename modules/ppcp-wc-gateway/src/Processor/{class-authorizedpaymentsprocessor.php => AuthorizedPaymentsProcessor.php} (100%) rename modules/ppcp-wc-gateway/src/Processor/{class-orderprocessor.php => OrderProcessor.php} (100%) rename modules/ppcp-wc-gateway/src/Processor/{class-refundprocessor.php => RefundProcessor.php} (100%) rename modules/ppcp-wc-gateway/src/Settings/{class-sectionsrenderer.php => SectionsRenderer.php} (100%) rename modules/ppcp-wc-gateway/src/Settings/{class-settings.php => Settings.php} (100%) rename modules/ppcp-wc-gateway/src/Settings/{class-settingslistener.php => SettingsListener.php} (100%) rename modules/ppcp-wc-gateway/src/Settings/{class-settingsrenderer.php => SettingsRenderer.php} (100%) rename modules/ppcp-wc-gateway/src/{class-wcgatewaymodule.php => WcGatewayModule.php} (100%) create mode 100644 modules/ppcp-webhooks/composer.json rename modules/ppcp-webhooks/src/Handler/{class-checkoutorderapproved.php => CheckoutOrderApproved.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-checkoutordercompleted.php => CheckoutOrderCompleted.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-paymentcapturecompleted.php => PaymentCaptureCompleted.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-paymentcapturerefunded.php => PaymentCaptureRefunded.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-paymentcapturereversed.php => PaymentCaptureReversed.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-prefixtrait.php => PrefixTrait.php} (100%) rename modules/ppcp-webhooks/src/Handler/{class-requesthandler.php => RequestHandler.php} (100%) rename modules/ppcp-webhooks/src/{class-incomingwebhookendpoint.php => IncomingWebhookEndpoint.php} (100%) rename modules/ppcp-webhooks/src/{class-webhookmodule.php => WebhookModule.php} (100%) rename modules/ppcp-webhooks/src/{class-webhookregistrar.php => WebhookRegistrar.php} (100%) create mode 100644 modules/woocommerce-logging/composer.json rename modules/woocommerce-logging/src/Logger/{class-nulllogger.php => NullLogger.php} (100%) rename modules/woocommerce-logging/src/Logger/{class-woocommercelogger.php => WooCommerceLogger.php} (100%) rename modules/woocommerce-logging/src/{class-woocommerceloggingmodule.php => WooCommerceLoggingModule.php} (100%) rename src/{class-pluginmodule.php => PluginModule.php} (100%) diff --git a/.idea/woocommerce-paypal-payments.iml b/.idea/woocommerce-paypal-payments.iml index 2dcaa137d..b649496c9 100644 --- a/.idea/woocommerce-paypal-payments.iml +++ b/.idea/woocommerce-paypal-payments.iml @@ -5,6 +5,7 @@ + @@ -57,6 +58,7 @@ + diff --git a/composer.json b/composer.json index 27b6300dd..5c663096d 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "dhii/wp-containers": "^0.1.0-alpha1", "psr/log": "^1.1", "ext-json": "*", - "ralouphie/getallheaders": "^3.0" + "ralouphie/getallheaders": "^3.0", + "wikimedia/composer-merge-plugin": "^1.4" }, "require-dev": { "woocommerce/woocommerce-sniffs": "^0.1.0", @@ -20,10 +21,9 @@ "brain/monkey": "^2.4" }, "autoload": { - "classmap": [ - "modules/", - "src/" - ] + "psr-4": { + "WooCommerce\\PayPalCommerce\\": "src" + } }, "autoload-dev": { "psr-4": { @@ -47,6 +47,11 @@ "type:inpsyde-module" ] }, + "merge-plugin": { + "include": [ + "modules/*/composer.json" + ] + }, "hooks": { "pre-commit": [ "vendor/bin/phpcbf" diff --git a/modules/ppcp-admin-notices/composer.json b/modules/ppcp-admin-notices/composer.json new file mode 100644 index 000000000..88e9fbc19 --- /dev/null +++ b/modules/ppcp-admin-notices/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-admin-notices", + "type": "dhii-mod", + "description": "Admin notices module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\AdminNotices\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-admin-notices/src/class-adminnotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php similarity index 100% rename from modules/ppcp-admin-notices/src/class-adminnotices.php rename to modules/ppcp-admin-notices/src/AdminNotices.php diff --git a/modules/ppcp-admin-notices/src/Entity/class-message.php b/modules/ppcp-admin-notices/src/Entity/Message.php similarity index 100% rename from modules/ppcp-admin-notices/src/Entity/class-message.php rename to modules/ppcp-admin-notices/src/Entity/Message.php diff --git a/modules/ppcp-admin-notices/src/Renderer/class-renderer.php b/modules/ppcp-admin-notices/src/Renderer/Renderer.php similarity index 100% rename from modules/ppcp-admin-notices/src/Renderer/class-renderer.php rename to modules/ppcp-admin-notices/src/Renderer/Renderer.php diff --git a/modules/ppcp-admin-notices/src/Renderer/class-rendererinterface.php b/modules/ppcp-admin-notices/src/Renderer/RendererInterface.php similarity index 100% rename from modules/ppcp-admin-notices/src/Renderer/class-rendererinterface.php rename to modules/ppcp-admin-notices/src/Renderer/RendererInterface.php diff --git a/modules/ppcp-admin-notices/src/Repository/class-repository.php b/modules/ppcp-admin-notices/src/Repository/Repository.php similarity index 100% rename from modules/ppcp-admin-notices/src/Repository/class-repository.php rename to modules/ppcp-admin-notices/src/Repository/Repository.php diff --git a/modules/ppcp-admin-notices/src/Repository/class-repositoryinterface.php b/modules/ppcp-admin-notices/src/Repository/RepositoryInterface.php similarity index 100% rename from modules/ppcp-admin-notices/src/Repository/class-repositoryinterface.php rename to modules/ppcp-admin-notices/src/Repository/RepositoryInterface.php diff --git a/modules/ppcp-api-client/composer.json b/modules/ppcp-api-client/composer.json new file mode 100644 index 000000000..97392f7fb --- /dev/null +++ b/modules/ppcp-api-client/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-api-client", + "type": "dhii-mod", + "description": "API client module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\ApiClient\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-api-client/src/class-apimodule.php b/modules/ppcp-api-client/src/ApiModule.php similarity index 100% rename from modules/ppcp-api-client/src/class-apimodule.php rename to modules/ppcp-api-client/src/ApiModule.php diff --git a/modules/ppcp-api-client/src/Authentication/class-bearer.php b/modules/ppcp-api-client/src/Authentication/Bearer.php similarity index 100% rename from modules/ppcp-api-client/src/Authentication/class-bearer.php rename to modules/ppcp-api-client/src/Authentication/Bearer.php diff --git a/modules/ppcp-api-client/src/Authentication/class-connectbearer.php b/modules/ppcp-api-client/src/Authentication/ConnectBearer.php similarity index 100% rename from modules/ppcp-api-client/src/Authentication/class-connectbearer.php rename to modules/ppcp-api-client/src/Authentication/ConnectBearer.php diff --git a/modules/ppcp-api-client/src/Authentication/class-paypalbearer.php b/modules/ppcp-api-client/src/Authentication/PayPalBearer.php similarity index 100% rename from modules/ppcp-api-client/src/Authentication/class-paypalbearer.php rename to modules/ppcp-api-client/src/Authentication/PayPalBearer.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-identitytoken.php b/modules/ppcp-api-client/src/Endpoint/IdentityToken.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-identitytoken.php rename to modules/ppcp-api-client/src/Endpoint/IdentityToken.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-loginseller.php b/modules/ppcp-api-client/src/Endpoint/LoginSeller.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-loginseller.php rename to modules/ppcp-api-client/src/Endpoint/LoginSeller.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php b/modules/ppcp-api-client/src/Endpoint/OrderEndpoint.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php rename to modules/ppcp-api-client/src/Endpoint/OrderEndpoint.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php b/modules/ppcp-api-client/src/Endpoint/PartnerReferrals.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php rename to modules/ppcp-api-client/src/Endpoint/PartnerReferrals.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php b/modules/ppcp-api-client/src/Endpoint/PartnersEndpoint.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php rename to modules/ppcp-api-client/src/Endpoint/PartnersEndpoint.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentTokenEndpoint.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php rename to modules/ppcp-api-client/src/Endpoint/PaymentTokenEndpoint.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php rename to modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-requesttrait.php b/modules/ppcp-api-client/src/Endpoint/RequestTrait.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-requesttrait.php rename to modules/ppcp-api-client/src/Endpoint/RequestTrait.php diff --git a/modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php b/modules/ppcp-api-client/src/Endpoint/WebhookEndpoint.php similarity index 100% rename from modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php rename to modules/ppcp-api-client/src/Endpoint/WebhookEndpoint.php diff --git a/modules/ppcp-api-client/src/Entity/class-address.php b/modules/ppcp-api-client/src/Entity/Address.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-address.php rename to modules/ppcp-api-client/src/Entity/Address.php diff --git a/modules/ppcp-api-client/src/Entity/class-amount.php b/modules/ppcp-api-client/src/Entity/Amount.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-amount.php rename to modules/ppcp-api-client/src/Entity/Amount.php diff --git a/modules/ppcp-api-client/src/Entity/class-amountbreakdown.php b/modules/ppcp-api-client/src/Entity/AmountBreakdown.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-amountbreakdown.php rename to modules/ppcp-api-client/src/Entity/AmountBreakdown.php diff --git a/modules/ppcp-api-client/src/Entity/class-applicationcontext.php b/modules/ppcp-api-client/src/Entity/ApplicationContext.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-applicationcontext.php rename to modules/ppcp-api-client/src/Entity/ApplicationContext.php diff --git a/modules/ppcp-api-client/src/Entity/class-authorization.php b/modules/ppcp-api-client/src/Entity/Authorization.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-authorization.php rename to modules/ppcp-api-client/src/Entity/Authorization.php diff --git a/modules/ppcp-api-client/src/Entity/class-authorizationstatus.php b/modules/ppcp-api-client/src/Entity/AuthorizationStatus.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-authorizationstatus.php rename to modules/ppcp-api-client/src/Entity/AuthorizationStatus.php diff --git a/modules/ppcp-api-client/src/Entity/class-capture.php b/modules/ppcp-api-client/src/Entity/Capture.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-capture.php rename to modules/ppcp-api-client/src/Entity/Capture.php diff --git a/modules/ppcp-api-client/src/Entity/class-cardauthenticationresult.php b/modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-cardauthenticationresult.php rename to modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php diff --git a/modules/ppcp-api-client/src/Entity/class-item.php b/modules/ppcp-api-client/src/Entity/Item.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-item.php rename to modules/ppcp-api-client/src/Entity/Item.php diff --git a/modules/ppcp-api-client/src/Entity/class-money.php b/modules/ppcp-api-client/src/Entity/Money.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-money.php rename to modules/ppcp-api-client/src/Entity/Money.php diff --git a/modules/ppcp-api-client/src/Entity/class-order.php b/modules/ppcp-api-client/src/Entity/Order.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-order.php rename to modules/ppcp-api-client/src/Entity/Order.php diff --git a/modules/ppcp-api-client/src/Entity/class-orderstatus.php b/modules/ppcp-api-client/src/Entity/OrderStatus.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-orderstatus.php rename to modules/ppcp-api-client/src/Entity/OrderStatus.php diff --git a/modules/ppcp-api-client/src/Entity/class-patch.php b/modules/ppcp-api-client/src/Entity/Patch.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-patch.php rename to modules/ppcp-api-client/src/Entity/Patch.php diff --git a/modules/ppcp-api-client/src/Entity/class-patchcollection.php b/modules/ppcp-api-client/src/Entity/PatchCollection.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-patchcollection.php rename to modules/ppcp-api-client/src/Entity/PatchCollection.php diff --git a/modules/ppcp-api-client/src/Entity/class-payee.php b/modules/ppcp-api-client/src/Entity/Payee.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-payee.php rename to modules/ppcp-api-client/src/Entity/Payee.php diff --git a/modules/ppcp-api-client/src/Entity/class-payer.php b/modules/ppcp-api-client/src/Entity/Payer.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-payer.php rename to modules/ppcp-api-client/src/Entity/Payer.php diff --git a/modules/ppcp-api-client/src/Entity/class-payername.php b/modules/ppcp-api-client/src/Entity/PayerName.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-payername.php rename to modules/ppcp-api-client/src/Entity/PayerName.php diff --git a/modules/ppcp-api-client/src/Entity/class-payertaxinfo.php b/modules/ppcp-api-client/src/Entity/PayerTaxInfo.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-payertaxinfo.php rename to modules/ppcp-api-client/src/Entity/PayerTaxInfo.php diff --git a/modules/ppcp-api-client/src/Entity/class-paymentmethod.php b/modules/ppcp-api-client/src/Entity/PaymentMethod.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-paymentmethod.php rename to modules/ppcp-api-client/src/Entity/PaymentMethod.php diff --git a/modules/ppcp-api-client/src/Entity/class-paymentsource.php b/modules/ppcp-api-client/src/Entity/PaymentSource.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-paymentsource.php rename to modules/ppcp-api-client/src/Entity/PaymentSource.php diff --git a/modules/ppcp-api-client/src/Entity/class-paymentsourcecard.php b/modules/ppcp-api-client/src/Entity/PaymentSourceCard.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-paymentsourcecard.php rename to modules/ppcp-api-client/src/Entity/PaymentSourceCard.php diff --git a/modules/ppcp-api-client/src/Entity/class-paymentsourcewallet.php b/modules/ppcp-api-client/src/Entity/PaymentSourceWallet.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-paymentsourcewallet.php rename to modules/ppcp-api-client/src/Entity/PaymentSourceWallet.php diff --git a/modules/ppcp-api-client/src/Entity/class-paymenttoken.php b/modules/ppcp-api-client/src/Entity/PaymentToken.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-paymenttoken.php rename to modules/ppcp-api-client/src/Entity/PaymentToken.php diff --git a/modules/ppcp-api-client/src/Entity/class-payments.php b/modules/ppcp-api-client/src/Entity/Payments.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-payments.php rename to modules/ppcp-api-client/src/Entity/Payments.php diff --git a/modules/ppcp-api-client/src/Entity/class-phone.php b/modules/ppcp-api-client/src/Entity/Phone.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-phone.php rename to modules/ppcp-api-client/src/Entity/Phone.php diff --git a/modules/ppcp-api-client/src/Entity/class-phonewithtype.php b/modules/ppcp-api-client/src/Entity/PhoneWithType.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-phonewithtype.php rename to modules/ppcp-api-client/src/Entity/PhoneWithType.php diff --git a/modules/ppcp-api-client/src/Entity/class-purchaseunit.php b/modules/ppcp-api-client/src/Entity/PurchaseUnit.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-purchaseunit.php rename to modules/ppcp-api-client/src/Entity/PurchaseUnit.php diff --git a/modules/ppcp-api-client/src/Entity/class-refund.php b/modules/ppcp-api-client/src/Entity/Refund.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-refund.php rename to modules/ppcp-api-client/src/Entity/Refund.php diff --git a/modules/ppcp-api-client/src/Entity/class-sellerstatus.php b/modules/ppcp-api-client/src/Entity/SellerStatus.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-sellerstatus.php rename to modules/ppcp-api-client/src/Entity/SellerStatus.php diff --git a/modules/ppcp-api-client/src/Entity/class-sellerstatusproduct.php b/modules/ppcp-api-client/src/Entity/SellerStatusProduct.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-sellerstatusproduct.php rename to modules/ppcp-api-client/src/Entity/SellerStatusProduct.php diff --git a/modules/ppcp-api-client/src/Entity/class-shipping.php b/modules/ppcp-api-client/src/Entity/Shipping.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-shipping.php rename to modules/ppcp-api-client/src/Entity/Shipping.php diff --git a/modules/ppcp-api-client/src/Entity/class-token.php b/modules/ppcp-api-client/src/Entity/Token.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-token.php rename to modules/ppcp-api-client/src/Entity/Token.php diff --git a/modules/ppcp-api-client/src/Entity/class-webhook.php b/modules/ppcp-api-client/src/Entity/Webhook.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-webhook.php rename to modules/ppcp-api-client/src/Entity/Webhook.php diff --git a/modules/ppcp-api-client/src/Exception/class-notfoundexception.php b/modules/ppcp-api-client/src/Exception/NotFoundException.php similarity index 100% rename from modules/ppcp-api-client/src/Exception/class-notfoundexception.php rename to modules/ppcp-api-client/src/Exception/NotFoundException.php diff --git a/modules/ppcp-api-client/src/Exception/class-paypalapiexception.php b/modules/ppcp-api-client/src/Exception/PayPalApiException.php similarity index 100% rename from modules/ppcp-api-client/src/Exception/class-paypalapiexception.php rename to modules/ppcp-api-client/src/Exception/PayPalApiException.php diff --git a/modules/ppcp-api-client/src/Exception/class-runtimeexception.php b/modules/ppcp-api-client/src/Exception/RuntimeException.php similarity index 100% rename from modules/ppcp-api-client/src/Exception/class-runtimeexception.php rename to modules/ppcp-api-client/src/Exception/RuntimeException.php diff --git a/modules/ppcp-api-client/src/Factory/class-addressfactory.php b/modules/ppcp-api-client/src/Factory/AddressFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-addressfactory.php rename to modules/ppcp-api-client/src/Factory/AddressFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-amountfactory.php b/modules/ppcp-api-client/src/Factory/AmountFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-amountfactory.php rename to modules/ppcp-api-client/src/Factory/AmountFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-applicationcontextfactory.php b/modules/ppcp-api-client/src/Factory/ApplicationContextFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-applicationcontextfactory.php rename to modules/ppcp-api-client/src/Factory/ApplicationContextFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-authorizationfactory.php b/modules/ppcp-api-client/src/Factory/AuthorizationFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-authorizationfactory.php rename to modules/ppcp-api-client/src/Factory/AuthorizationFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-capturefactory.php b/modules/ppcp-api-client/src/Factory/CaptureFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-capturefactory.php rename to modules/ppcp-api-client/src/Factory/CaptureFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-itemfactory.php b/modules/ppcp-api-client/src/Factory/ItemFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-itemfactory.php rename to modules/ppcp-api-client/src/Factory/ItemFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-orderfactory.php b/modules/ppcp-api-client/src/Factory/OrderFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-orderfactory.php rename to modules/ppcp-api-client/src/Factory/OrderFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-patchcollectionfactory.php b/modules/ppcp-api-client/src/Factory/PatchCollectionFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-patchcollectionfactory.php rename to modules/ppcp-api-client/src/Factory/PatchCollectionFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-payeefactory.php b/modules/ppcp-api-client/src/Factory/PayeeFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-payeefactory.php rename to modules/ppcp-api-client/src/Factory/PayeeFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-payerfactory.php b/modules/ppcp-api-client/src/Factory/PayerFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-payerfactory.php rename to modules/ppcp-api-client/src/Factory/PayerFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-paymentsourcefactory.php b/modules/ppcp-api-client/src/Factory/PaymentSourceFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-paymentsourcefactory.php rename to modules/ppcp-api-client/src/Factory/PaymentSourceFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php b/modules/ppcp-api-client/src/Factory/PaymentTokenFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php rename to modules/ppcp-api-client/src/Factory/PaymentTokenFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-paymentsfactory.php b/modules/ppcp-api-client/src/Factory/PaymentsFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-paymentsfactory.php rename to modules/ppcp-api-client/src/Factory/PaymentsFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php b/modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php rename to modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-sellerstatusfactory.php b/modules/ppcp-api-client/src/Factory/SellerStatusFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-sellerstatusfactory.php rename to modules/ppcp-api-client/src/Factory/SellerStatusFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-shippingfactory.php b/modules/ppcp-api-client/src/Factory/ShippingFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-shippingfactory.php rename to modules/ppcp-api-client/src/Factory/ShippingFactory.php diff --git a/modules/ppcp-api-client/src/Factory/class-webhookfactory.php b/modules/ppcp-api-client/src/Factory/WebhookFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-webhookfactory.php rename to modules/ppcp-api-client/src/Factory/WebhookFactory.php diff --git a/modules/ppcp-api-client/src/Helper/class-cache.php b/modules/ppcp-api-client/src/Helper/Cache.php similarity index 100% rename from modules/ppcp-api-client/src/Helper/class-cache.php rename to modules/ppcp-api-client/src/Helper/Cache.php diff --git a/modules/ppcp-api-client/src/Helper/class-dccapplies.php b/modules/ppcp-api-client/src/Helper/DccApplies.php similarity index 100% rename from modules/ppcp-api-client/src/Helper/class-dccapplies.php rename to modules/ppcp-api-client/src/Helper/DccApplies.php diff --git a/modules/ppcp-api-client/src/Helper/class-errorresponse.php b/modules/ppcp-api-client/src/Helper/ErrorResponse.php similarity index 100% rename from modules/ppcp-api-client/src/Helper/class-errorresponse.php rename to modules/ppcp-api-client/src/Helper/ErrorResponse.php diff --git a/modules/ppcp-api-client/src/Repository/class-applicationcontextrepository.php b/modules/ppcp-api-client/src/Repository/ApplicationContextRepository.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-applicationcontextrepository.php rename to modules/ppcp-api-client/src/Repository/ApplicationContextRepository.php diff --git a/modules/ppcp-api-client/src/Repository/class-cartrepository.php b/modules/ppcp-api-client/src/Repository/CartRepository.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-cartrepository.php rename to modules/ppcp-api-client/src/Repository/CartRepository.php diff --git a/modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php b/modules/ppcp-api-client/src/Repository/PartnerReferralsData.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php rename to modules/ppcp-api-client/src/Repository/PartnerReferralsData.php diff --git a/modules/ppcp-api-client/src/Repository/class-paypalrequestidrepository.php b/modules/ppcp-api-client/src/Repository/PayPalRequestIdRepository.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-paypalrequestidrepository.php rename to modules/ppcp-api-client/src/Repository/PayPalRequestIdRepository.php diff --git a/modules/ppcp-api-client/src/Repository/class-payeerepository.php b/modules/ppcp-api-client/src/Repository/PayeeRepository.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-payeerepository.php rename to modules/ppcp-api-client/src/Repository/PayeeRepository.php diff --git a/modules/ppcp-api-client/src/Repository/class-purchaseunitrepositoryinterface.php b/modules/ppcp-api-client/src/Repository/PurchaseUnitRepositoryInterface.php similarity index 100% rename from modules/ppcp-api-client/src/Repository/class-purchaseunitrepositoryinterface.php rename to modules/ppcp-api-client/src/Repository/PurchaseUnitRepositoryInterface.php diff --git a/modules/ppcp-button/composer.json b/modules/ppcp-button/composer.json new file mode 100644 index 000000000..e8eaa90ca --- /dev/null +++ b/modules/ppcp-button/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-button", + "type": "dhii-mod", + "description": "Button module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Button\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-button/src/Assets/class-disabledsmartbutton.php b/modules/ppcp-button/src/Assets/DisabledSmartButton.php similarity index 100% rename from modules/ppcp-button/src/Assets/class-disabledsmartbutton.php rename to modules/ppcp-button/src/Assets/DisabledSmartButton.php diff --git a/modules/ppcp-button/src/Assets/class-smartbutton.php b/modules/ppcp-button/src/Assets/SmartButton.php similarity index 100% rename from modules/ppcp-button/src/Assets/class-smartbutton.php rename to modules/ppcp-button/src/Assets/SmartButton.php diff --git a/modules/ppcp-button/src/Assets/class-smartbuttoninterface.php b/modules/ppcp-button/src/Assets/SmartButtonInterface.php similarity index 100% rename from modules/ppcp-button/src/Assets/class-smartbuttoninterface.php rename to modules/ppcp-button/src/Assets/SmartButtonInterface.php diff --git a/modules/ppcp-button/src/class-buttonmodule.php b/modules/ppcp-button/src/ButtonModule.php similarity index 100% rename from modules/ppcp-button/src/class-buttonmodule.php rename to modules/ppcp-button/src/ButtonModule.php diff --git a/modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php b/modules/ppcp-button/src/Endpoint/ApproveOrderEndpoint.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php rename to modules/ppcp-button/src/Endpoint/ApproveOrderEndpoint.php diff --git a/modules/ppcp-button/src/Endpoint/class-changecartendpoint.php b/modules/ppcp-button/src/Endpoint/ChangeCartEndpoint.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-changecartendpoint.php rename to modules/ppcp-button/src/Endpoint/ChangeCartEndpoint.php diff --git a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-createorderendpoint.php rename to modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php diff --git a/modules/ppcp-button/src/Endpoint/class-dataclientidendpoint.php b/modules/ppcp-button/src/Endpoint/DataClientIdEndpoint.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-dataclientidendpoint.php rename to modules/ppcp-button/src/Endpoint/DataClientIdEndpoint.php diff --git a/modules/ppcp-button/src/Endpoint/class-endpointinterface.php b/modules/ppcp-button/src/Endpoint/EndpointInterface.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-endpointinterface.php rename to modules/ppcp-button/src/Endpoint/EndpointInterface.php diff --git a/modules/ppcp-button/src/Endpoint/class-requestdata.php b/modules/ppcp-button/src/Endpoint/RequestData.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-requestdata.php rename to modules/ppcp-button/src/Endpoint/RequestData.php diff --git a/modules/ppcp-button/src/Exception/class-runtimeexception.php b/modules/ppcp-button/src/Exception/RuntimeException.php similarity index 100% rename from modules/ppcp-button/src/Exception/class-runtimeexception.php rename to modules/ppcp-button/src/Exception/RuntimeException.php diff --git a/modules/ppcp-button/src/Helper/class-earlyorderhandler.php b/modules/ppcp-button/src/Helper/EarlyOrderHandler.php similarity index 100% rename from modules/ppcp-button/src/Helper/class-earlyorderhandler.php rename to modules/ppcp-button/src/Helper/EarlyOrderHandler.php diff --git a/modules/ppcp-button/src/Helper/class-messagesapply.php b/modules/ppcp-button/src/Helper/MessagesApply.php similarity index 100% rename from modules/ppcp-button/src/Helper/class-messagesapply.php rename to modules/ppcp-button/src/Helper/MessagesApply.php diff --git a/modules/ppcp-button/src/Helper/class-threedsecure.php b/modules/ppcp-button/src/Helper/ThreeDSecure.php similarity index 100% rename from modules/ppcp-button/src/Helper/class-threedsecure.php rename to modules/ppcp-button/src/Helper/ThreeDSecure.php diff --git a/modules/ppcp-onboarding/composer.json b/modules/ppcp-onboarding/composer.json new file mode 100644 index 000000000..b2a10b9d8 --- /dev/null +++ b/modules/ppcp-onboarding/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-onboarding", + "type": "dhii-mod", + "description": "Onboarding module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Onboarding\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-onboarding/src/Assets/class-onboardingassets.php b/modules/ppcp-onboarding/src/Assets/OnboardingAssets.php similarity index 100% rename from modules/ppcp-onboarding/src/Assets/class-onboardingassets.php rename to modules/ppcp-onboarding/src/Assets/OnboardingAssets.php diff --git a/modules/ppcp-onboarding/src/Endpoint/class-loginsellerendpoint.php b/modules/ppcp-onboarding/src/Endpoint/LoginSellerEndpoint.php similarity index 100% rename from modules/ppcp-onboarding/src/Endpoint/class-loginsellerendpoint.php rename to modules/ppcp-onboarding/src/Endpoint/LoginSellerEndpoint.php diff --git a/modules/ppcp-onboarding/src/class-environment.php b/modules/ppcp-onboarding/src/Environment.php similarity index 100% rename from modules/ppcp-onboarding/src/class-environment.php rename to modules/ppcp-onboarding/src/Environment.php diff --git a/modules/ppcp-onboarding/src/class-onboardingmodule.php b/modules/ppcp-onboarding/src/OnboardingModule.php similarity index 100% rename from modules/ppcp-onboarding/src/class-onboardingmodule.php rename to modules/ppcp-onboarding/src/OnboardingModule.php diff --git a/modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php b/modules/ppcp-onboarding/src/Render/OnboardingRenderer.php similarity index 100% rename from modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php rename to modules/ppcp-onboarding/src/Render/OnboardingRenderer.php diff --git a/modules/ppcp-onboarding/src/class-state.php b/modules/ppcp-onboarding/src/State.php similarity index 100% rename from modules/ppcp-onboarding/src/class-state.php rename to modules/ppcp-onboarding/src/State.php diff --git a/modules/ppcp-session/composer.json b/modules/ppcp-session/composer.json new file mode 100644 index 000000000..32313fe03 --- /dev/null +++ b/modules/ppcp-session/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-session", + "type": "dhii-mod", + "description": "Session module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Session\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-session/src/Cancellation/class-cancelcontroller.php b/modules/ppcp-session/src/Cancellation/CancelController.php similarity index 100% rename from modules/ppcp-session/src/Cancellation/class-cancelcontroller.php rename to modules/ppcp-session/src/Cancellation/CancelController.php diff --git a/modules/ppcp-session/src/Cancellation/class-cancelview.php b/modules/ppcp-session/src/Cancellation/CancelView.php similarity index 100% rename from modules/ppcp-session/src/Cancellation/class-cancelview.php rename to modules/ppcp-session/src/Cancellation/CancelView.php diff --git a/modules/ppcp-session/src/class-sessionhandler.php b/modules/ppcp-session/src/SessionHandler.php similarity index 100% rename from modules/ppcp-session/src/class-sessionhandler.php rename to modules/ppcp-session/src/SessionHandler.php diff --git a/modules/ppcp-session/src/class-sessionmodule.php b/modules/ppcp-session/src/SessionModule.php similarity index 100% rename from modules/ppcp-session/src/class-sessionmodule.php rename to modules/ppcp-session/src/SessionModule.php diff --git a/modules/ppcp-subscription/composer.json b/modules/ppcp-subscription/composer.json new file mode 100644 index 000000000..a27ad686a --- /dev/null +++ b/modules/ppcp-subscription/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-subscription", + "type": "dhii-mod", + "description": "Subscription module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Subscription\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-subscription/src/Helper/class-subscriptionhelper.php b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php similarity index 100% rename from modules/ppcp-subscription/src/Helper/class-subscriptionhelper.php rename to modules/ppcp-subscription/src/Helper/SubscriptionHelper.php diff --git a/modules/ppcp-subscription/src/class-renewalhandler.php b/modules/ppcp-subscription/src/RenewalHandler.php similarity index 100% rename from modules/ppcp-subscription/src/class-renewalhandler.php rename to modules/ppcp-subscription/src/RenewalHandler.php diff --git a/modules/ppcp-subscription/src/Repository/class-paymenttokenrepository.php b/modules/ppcp-subscription/src/Repository/PaymentTokenRepository.php similarity index 100% rename from modules/ppcp-subscription/src/Repository/class-paymenttokenrepository.php rename to modules/ppcp-subscription/src/Repository/PaymentTokenRepository.php diff --git a/modules/ppcp-subscription/src/class-subscriptionmodule.php b/modules/ppcp-subscription/src/SubscriptionModule.php similarity index 100% rename from modules/ppcp-subscription/src/class-subscriptionmodule.php rename to modules/ppcp-subscription/src/SubscriptionModule.php diff --git a/modules/ppcp-wc-gateway/composer.json b/modules/ppcp-wc-gateway/composer.json new file mode 100644 index 000000000..06bf37d24 --- /dev/null +++ b/modules/ppcp-wc-gateway/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-wc-gateway", + "type": "dhii-mod", + "description": "WC gateway module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\WcGateway\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index f072e347c..2e0e167b8 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -24,7 +24,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Endpoint\ReturnUrlEndpoint; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\TransactionUrlProvider; -use Woocommerce\PayPalCommerce\WcGateway\Helper\DccProductStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\DccProductStatus; use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; use WooCommerce\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice; use WooCommerce\PayPalCommerce\WcGateway\Notice\ConnectAdminNotice; @@ -646,7 +646,7 @@ return array( 'label' => sprintf( // translators: %1$s and %2$s are the opening and closing of HTML tag. __( 'Enable saved cards and subscription features on your store. To use vaulting features, you must %1$senable vaulting on your account%2$s.', 'woocommerce-paypal-payments' ), - '', diff --git a/modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php b/modules/ppcp-wc-gateway/src/Admin/OrderTablePaymentStatusColumn.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php rename to modules/ppcp-wc-gateway/src/Admin/OrderTablePaymentStatusColumn.php diff --git a/modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php b/modules/ppcp-wc-gateway/src/Admin/PaymentStatusOrderDetail.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php rename to modules/ppcp-wc-gateway/src/Admin/PaymentStatusOrderDetail.php diff --git a/modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php b/modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php rename to modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php diff --git a/modules/ppcp-wc-gateway/src/Checkout/class-checkoutpaypaladdresspreset.php b/modules/ppcp-wc-gateway/src/Checkout/CheckoutPayPalAddressPreset.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Checkout/class-checkoutpaypaladdresspreset.php rename to modules/ppcp-wc-gateway/src/Checkout/CheckoutPayPalAddressPreset.php diff --git a/modules/ppcp-wc-gateway/src/Checkout/class-disablegateways.php b/modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Checkout/class-disablegateways.php rename to modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php diff --git a/modules/ppcp-wc-gateway/src/Endpoint/class-returnurlendpoint.php b/modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Endpoint/class-returnurlendpoint.php rename to modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php diff --git a/modules/ppcp-wc-gateway/src/Exception/class-notfoundexception.php b/modules/ppcp-wc-gateway/src/Exception/NotFoundException.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Exception/class-notfoundexception.php rename to modules/ppcp-wc-gateway/src/Exception/NotFoundException.php diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php rename to modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php rename to modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php rename to modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php diff --git a/modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php b/modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php new file mode 100644 index 000000000..e69de29bb diff --git a/modules/ppcp-wc-gateway/src/Helper/class-dccproductstatus.php b/modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php similarity index 97% rename from modules/ppcp-wc-gateway/src/Helper/class-dccproductstatus.php rename to modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php index 2ec284d1d..344a7f9da 100644 --- a/modules/ppcp-wc-gateway/src/Helper/class-dccproductstatus.php +++ b/modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php @@ -7,7 +7,7 @@ declare( strict_types=1 ); -namespace Woocommerce\PayPalCommerce\WcGateway\Helper; +namespace WooCommerce\PayPalCommerce\WcGateway\Helper; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Entity\SellerStatusProduct; diff --git a/modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php b/modules/ppcp-wc-gateway/src/Notice/AuthorizeOrderActionNotice.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php rename to modules/ppcp-wc-gateway/src/Notice/AuthorizeOrderActionNotice.php diff --git a/modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php b/modules/ppcp-wc-gateway/src/Notice/ConnectAdminNotice.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php rename to modules/ppcp-wc-gateway/src/Notice/ConnectAdminNotice.php diff --git a/modules/ppcp-wc-gateway/src/Processor/class-authorizedpaymentsprocessor.php b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Processor/class-authorizedpaymentsprocessor.php rename to modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php diff --git a/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php b/modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php rename to modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php diff --git a/modules/ppcp-wc-gateway/src/Processor/class-refundprocessor.php b/modules/ppcp-wc-gateway/src/Processor/RefundProcessor.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Processor/class-refundprocessor.php rename to modules/ppcp-wc-gateway/src/Processor/RefundProcessor.php diff --git a/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php rename to modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settings.php b/modules/ppcp-wc-gateway/src/Settings/Settings.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Settings/class-settings.php rename to modules/ppcp-wc-gateway/src/Settings/Settings.php diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settingslistener.php b/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Settings/class-settingslistener.php rename to modules/ppcp-wc-gateway/src/Settings/SettingsListener.php diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php rename to modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php diff --git a/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php b/modules/ppcp-wc-gateway/src/WcGatewayModule.php similarity index 100% rename from modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php rename to modules/ppcp-wc-gateway/src/WcGatewayModule.php diff --git a/modules/ppcp-webhooks/composer.json b/modules/ppcp-webhooks/composer.json new file mode 100644 index 000000000..69049e0c0 --- /dev/null +++ b/modules/ppcp-webhooks/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-webhooks", + "type": "dhii-mod", + "description": "Webhooks module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Webhooks\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php b/modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php rename to modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php diff --git a/modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php b/modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php rename to modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php b/modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php rename to modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php b/modules/ppcp-webhooks/src/Handler/PaymentCaptureRefunded.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php rename to modules/ppcp-webhooks/src/Handler/PaymentCaptureRefunded.php diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php b/modules/ppcp-webhooks/src/Handler/PaymentCaptureReversed.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php rename to modules/ppcp-webhooks/src/Handler/PaymentCaptureReversed.php diff --git a/modules/ppcp-webhooks/src/Handler/class-prefixtrait.php b/modules/ppcp-webhooks/src/Handler/PrefixTrait.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-prefixtrait.php rename to modules/ppcp-webhooks/src/Handler/PrefixTrait.php diff --git a/modules/ppcp-webhooks/src/Handler/class-requesthandler.php b/modules/ppcp-webhooks/src/Handler/RequestHandler.php similarity index 100% rename from modules/ppcp-webhooks/src/Handler/class-requesthandler.php rename to modules/ppcp-webhooks/src/Handler/RequestHandler.php diff --git a/modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php b/modules/ppcp-webhooks/src/IncomingWebhookEndpoint.php similarity index 100% rename from modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php rename to modules/ppcp-webhooks/src/IncomingWebhookEndpoint.php diff --git a/modules/ppcp-webhooks/src/class-webhookmodule.php b/modules/ppcp-webhooks/src/WebhookModule.php similarity index 100% rename from modules/ppcp-webhooks/src/class-webhookmodule.php rename to modules/ppcp-webhooks/src/WebhookModule.php diff --git a/modules/ppcp-webhooks/src/class-webhookregistrar.php b/modules/ppcp-webhooks/src/WebhookRegistrar.php similarity index 100% rename from modules/ppcp-webhooks/src/class-webhookregistrar.php rename to modules/ppcp-webhooks/src/WebhookRegistrar.php diff --git a/modules/woocommerce-logging/composer.json b/modules/woocommerce-logging/composer.json new file mode 100644 index 000000000..6e25a57e6 --- /dev/null +++ b/modules/woocommerce-logging/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/woocommerce-logging", + "type": "dhii-mod", + "description": "WC logging module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.2.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\WooCommerce\\Logging\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/woocommerce-logging/src/Logger/class-nulllogger.php b/modules/woocommerce-logging/src/Logger/NullLogger.php similarity index 100% rename from modules/woocommerce-logging/src/Logger/class-nulllogger.php rename to modules/woocommerce-logging/src/Logger/NullLogger.php diff --git a/modules/woocommerce-logging/src/Logger/class-woocommercelogger.php b/modules/woocommerce-logging/src/Logger/WooCommerceLogger.php similarity index 100% rename from modules/woocommerce-logging/src/Logger/class-woocommercelogger.php rename to modules/woocommerce-logging/src/Logger/WooCommerceLogger.php diff --git a/modules/woocommerce-logging/src/class-woocommerceloggingmodule.php b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php similarity index 100% rename from modules/woocommerce-logging/src/class-woocommerceloggingmodule.php rename to modules/woocommerce-logging/src/WooCommerceLoggingModule.php diff --git a/src/class-pluginmodule.php b/src/PluginModule.php similarity index 100% rename from src/class-pluginmodule.php rename to src/PluginModule.php From b8cc98e9cd9ffb79971a68f94bb08a885aa0266c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Wed, 17 Feb 2021 12:50:21 +0100 Subject: [PATCH 03/42] Remove unused dependency The WP containers don't seem to be used anywhere. There were imports, but they are not actually used it seems. --- .idea/woocommerce-paypal-payments.iml | 5 ----- composer.json | 1 - modules/ppcp-admin-notices/services.php | 1 - modules/ppcp-session/services.php | 1 - 4 files changed, 8 deletions(-) diff --git a/.idea/woocommerce-paypal-payments.iml b/.idea/woocommerce-paypal-payments.iml index b649496c9..41338f20b 100644 --- a/.idea/woocommerce-paypal-payments.iml +++ b/.idea/woocommerce-paypal-payments.iml @@ -26,14 +26,9 @@ - - - - - diff --git a/composer.json b/composer.json index 5c663096d..c2aacc0c5 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ "psr/container": "^1.0", "container-interop/service-provider": "^0.4.0", "dhii/containers": "^0.1.0-alpha1", - "dhii/wp-containers": "^0.1.0-alpha1", "psr/log": "^1.1", "ext-json": "*", "ralouphie/getallheaders": "^3.0", diff --git a/modules/ppcp-admin-notices/services.php b/modules/ppcp-admin-notices/services.php index 6dd3931fc..38f93a325 100644 --- a/modules/ppcp-admin-notices/services.php +++ b/modules/ppcp-admin-notices/services.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\AdminNotices; -use Dhii\Data\Container\ContainerInterface; use WooCommerce\PayPalCommerce\AdminNotices\Renderer\Renderer; use WooCommerce\PayPalCommerce\AdminNotices\Renderer\RendererInterface; use WooCommerce\PayPalCommerce\AdminNotices\Repository\Repository; diff --git a/modules/ppcp-session/services.php b/modules/ppcp-session/services.php index a57e673a9..6081b802c 100644 --- a/modules/ppcp-session/services.php +++ b/modules/ppcp-session/services.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Session; -use Dhii\Data\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Session\Cancellation\CancelController; use WooCommerce\PayPalCommerce\Session\Cancellation\CancelView; From eca267a8741ec96075eaff7585a9575a156bb9af Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Wed, 17 Feb 2021 14:10:49 +0100 Subject: [PATCH 04/42] No longer requiring WPCS for file names --- phpcs.xml.dist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 6a1702bf3..55ec61e99 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -19,6 +19,11 @@ tests/ + + + + + ./src ./modules From 3d39f3b2a9c50ae0eb1a276808d4ef6afcf40410 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Wed, 17 Feb 2021 14:25:42 +0100 Subject: [PATCH 05/42] Configure PHPCS Now will use config instead of CLI values for most things. Will also show sniff codes. --- .github/workflows/php.yml | 25 ++++++++++++------------- phpcs.xml.dist | 6 +++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index dd62791ec..ae058ece2 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,27 +1,25 @@ -name: PHP Composer +name: CI -on: - push: - branches: [ trunk ] - pull_request: - branches: [ trunk ] +on: [push] jobs: build: - runs-on: ubuntu-latest - strategy: matrix: php-versions: ['7.1', '7.2', '7.3', '7.4'] + name: PHP ${{ matrix.php-versions }} steps: - uses: actions/checkout@v2 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ matrix.php-versions }} + + - name: Packagist.com Auth + run: composer config --global --auth http-basic.repo.packagist.com token ${{ secrets.PACKAGIST_TOKEN }} - name: Validate composer.json and composer.lock run: composer validate @@ -31,7 +29,8 @@ jobs: with: composer-options: "--prefer-dist" - - name: Run test suite - run: ./vendor/bin/phpunit - - name: Run Woocommerce coding standards - run: ./vendor/bin/phpcs + - name: Run PHPUnit + run: vendor/bin/phpunit + + - name: Run PHPCS + run: ./vendor/bin/phpcs--runtime-set ignore_warnings_on_exit 1 src modules woocommerce-paypal-payments.php --extensions=php diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 55ec61e99..1b0bf7352 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -25,9 +25,9 @@ - ./src - ./modules - ./woocommerce-paypal-payments.php + src + modules + woocommerce-paypal-payments.php */node_modules/* */vendor/* From cabcb7d9e4e41d8b63fd6214a9b0945c7b821611 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Wed, 17 Feb 2021 14:35:37 +0100 Subject: [PATCH 06/42] Add Container typehint to all service definitions --- modules/ppcp-admin-notices/services.php | 5 +- modules/ppcp-api-client/services.php | 69 +++++++++++++------------ modules/ppcp-button/services.php | 23 +++++---- modules/ppcp-onboarding/services.php | 39 +++++++------- modules/ppcp-session/services.php | 7 +-- modules/ppcp-subscription/services.php | 6 +-- modules/ppcp-wc-gateway/services.php | 40 +++++++------- modules/ppcp-webhooks/services.php | 6 +-- 8 files changed, 101 insertions(+), 94 deletions(-) diff --git a/modules/ppcp-admin-notices/services.php b/modules/ppcp-admin-notices/services.php index 38f93a325..32dfe5357 100644 --- a/modules/ppcp-admin-notices/services.php +++ b/modules/ppcp-admin-notices/services.php @@ -9,18 +9,19 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\AdminNotices; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\AdminNotices\Renderer\Renderer; use WooCommerce\PayPalCommerce\AdminNotices\Renderer\RendererInterface; use WooCommerce\PayPalCommerce\AdminNotices\Repository\Repository; use WooCommerce\PayPalCommerce\AdminNotices\Repository\RepositoryInterface; return array( - 'admin-notices.renderer' => static function ( $container ): RendererInterface { + 'admin-notices.renderer' => static function ( ContainerInterface $container ): RendererInterface { $repository = $container->get( 'admin-notices.repository' ); return new Renderer( $repository ); }, - 'admin-notices.repository' => static function ( $container ): RepositoryInterface { + 'admin-notices.repository' => static function ( ContainerInterface $container ): RepositoryInterface { return new Repository(); }, diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php index 588a89228..c15d38d91 100644 --- a/modules/ppcp-api-client/services.php +++ b/modules/ppcp-api-client/services.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\ApiClient; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer; use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\IdentityToken; @@ -46,10 +47,10 @@ use WooCommerce\PayPalCommerce\ApiClient\Repository\PayPalRequestIdRepository; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; return array( - 'api.host' => function( $container ) : string { + 'api.host' => function( ContainerInterface $container ) : string { return PAYPAL_API_URL; }, - 'api.paypal-host' => function( $container ) : string { + 'api.paypal-host' => function( ContainerInterface $container ) : string { return PAYPAL_API_URL; }, 'api.partner_merchant_id' => static function () : string { @@ -70,7 +71,7 @@ return array( 'api.prefix' => static function (): string { return 'WC-'; }, - 'api.bearer' => static function ( $container ): Bearer { + 'api.bearer' => static function ( ContainerInterface $container ): Bearer { $cache = new Cache( 'ppcp-paypal-bearer' ); $key = $container->get( 'api.key' ); @@ -86,7 +87,7 @@ return array( $logger ); }, - 'api.endpoint.partners' => static function ( $container ) : PartnersEndpoint { + 'api.endpoint.partners' => static function ( ContainerInterface $container ) : PartnersEndpoint { return new PartnersEndpoint( $container->get( 'api.host' ), $container->get( 'api.bearer' ), @@ -96,10 +97,10 @@ return array( $container->get( 'api.merchant_id' ) ); }, - 'api.factory.sellerstatus' => static function ( $container ) : SellerStatusFactory { + 'api.factory.sellerstatus' => static function ( ContainerInterface $container ) : SellerStatusFactory { return new SellerStatusFactory(); }, - 'api.endpoint.payment-token' => static function ( $container ) : PaymentTokenEndpoint { + 'api.endpoint.payment-token' => static function ( ContainerInterface $container ) : PaymentTokenEndpoint { return new PaymentTokenEndpoint( $container->get( 'api.host' ), $container->get( 'api.bearer' ), @@ -108,7 +109,7 @@ return array( $container->get( 'api.prefix' ) ); }, - 'api.endpoint.webhook' => static function ( $container ) : WebhookEndpoint { + 'api.endpoint.webhook' => static function ( ContainerInterface $container ) : WebhookEndpoint { return new WebhookEndpoint( $container->get( 'api.host' ), @@ -117,7 +118,7 @@ return array( $container->get( 'woocommerce.logger.woocommerce' ) ); }, - 'api.endpoint.partner-referrals' => static function ( $container ) : PartnerReferrals { + 'api.endpoint.partner-referrals' => static function ( ContainerInterface $container ) : PartnerReferrals { return new PartnerReferrals( $container->get( 'api.host' ), @@ -126,7 +127,7 @@ return array( $container->get( 'woocommerce.logger.woocommerce' ) ); }, - 'api.endpoint.identity-token' => static function ( $container ) : IdentityToken { + 'api.endpoint.identity-token' => static function ( ContainerInterface $container ) : IdentityToken { $logger = $container->get( 'woocommerce.logger.woocommerce' ); $prefix = $container->get( 'api.prefix' ); @@ -137,7 +138,7 @@ return array( $prefix ); }, - 'api.endpoint.payments' => static function ( $container ): PaymentsEndpoint { + 'api.endpoint.payments' => static function ( ContainerInterface $container ): PaymentsEndpoint { $authorizations_factory = $container->get( 'api.factory.authorization' ); $logger = $container->get( 'woocommerce.logger.woocommerce' ); @@ -148,7 +149,7 @@ return array( $logger ); }, - 'api.endpoint.login-seller' => static function ( $container ) : LoginSeller { + 'api.endpoint.login-seller' => static function ( ContainerInterface $container ) : LoginSeller { $logger = $container->get( 'woocommerce.logger.woocommerce' ); return new LoginSeller( @@ -157,7 +158,7 @@ return array( $logger ); }, - 'api.endpoint.order' => static function ( $container ): OrderEndpoint { + 'api.endpoint.order' => static function ( ContainerInterface $container ): OrderEndpoint { $order_factory = $container->get( 'api.factory.order' ); $patch_collection_factory = $container->get( 'api.factory.patch-collection-factory' ); $logger = $container->get( 'woocommerce.logger.woocommerce' ); @@ -182,44 +183,44 @@ return array( $paypal_request_id ); }, - 'api.repository.paypal-request-id' => static function( $container ) : PayPalRequestIdRepository { + 'api.repository.paypal-request-id' => static function( ContainerInterface $container ) : PayPalRequestIdRepository { return new PayPalRequestIdRepository(); }, - 'api.repository.application-context' => static function( $container ) : ApplicationContextRepository { + 'api.repository.application-context' => static function( ContainerInterface $container ) : ApplicationContextRepository { $settings = $container->get( 'wcgateway.settings' ); return new ApplicationContextRepository( $settings ); }, - 'api.repository.partner-referrals-data' => static function ( $container ) : PartnerReferralsData { + 'api.repository.partner-referrals-data' => static function ( ContainerInterface $container ) : PartnerReferralsData { $merchant_email = $container->get( 'api.merchant_email' ); $dcc_applies = $container->get( 'api.helpers.dccapplies' ); return new PartnerReferralsData( $merchant_email, $dcc_applies ); }, - 'api.repository.cart' => static function ( $container ): CartRepository { + 'api.repository.cart' => static function ( ContainerInterface $container ): CartRepository { $factory = $container->get( 'api.factory.purchase-unit' ); return new CartRepository( $factory ); }, - 'api.repository.payee' => static function ( $container ): PayeeRepository { + 'api.repository.payee' => static function ( ContainerInterface $container ): PayeeRepository { $merchant_email = $container->get( 'api.merchant_email' ); $merchant_id = $container->get( 'api.merchant_id' ); return new PayeeRepository( $merchant_email, $merchant_id ); }, - 'api.factory.application-context' => static function ( $container ) : ApplicationContextFactory { + 'api.factory.application-context' => static function ( ContainerInterface $container ) : ApplicationContextFactory { return new ApplicationContextFactory(); }, - 'api.factory.payment-token' => static function ( $container ) : PaymentTokenFactory { + 'api.factory.payment-token' => static function ( ContainerInterface $container ) : PaymentTokenFactory { return new PaymentTokenFactory(); }, - 'api.factory.webhook' => static function ( $container ): WebhookFactory { + 'api.factory.webhook' => static function ( ContainerInterface $container ): WebhookFactory { return new WebhookFactory(); }, - 'api.factory.capture' => static function ( $container ): CaptureFactory { + 'api.factory.capture' => static function ( ContainerInterface $container ): CaptureFactory { $amount_factory = $container->get( 'api.factory.amount' ); return new CaptureFactory( $amount_factory ); }, - 'api.factory.purchase-unit' => static function ( $container ): PurchaseUnitFactory { + 'api.factory.purchase-unit' => static function ( ContainerInterface $container ): PurchaseUnitFactory { $amount_factory = $container->get( 'api.factory.amount' ); $payee_repository = $container->get( 'api.repository.payee' ); @@ -239,34 +240,34 @@ return array( $prefix ); }, - 'api.factory.patch-collection-factory' => static function ( $container ): PatchCollectionFactory { + 'api.factory.patch-collection-factory' => static function ( ContainerInterface $container ): PatchCollectionFactory { return new PatchCollectionFactory(); }, - 'api.factory.payee' => static function ( $container ): PayeeFactory { + 'api.factory.payee' => static function ( ContainerInterface $container ): PayeeFactory { return new PayeeFactory(); }, - 'api.factory.item' => static function ( $container ): ItemFactory { + 'api.factory.item' => static function ( ContainerInterface $container ): ItemFactory { return new ItemFactory(); }, - 'api.factory.shipping' => static function ( $container ): ShippingFactory { + 'api.factory.shipping' => static function ( ContainerInterface $container ): ShippingFactory { $address_factory = $container->get( 'api.factory.address' ); return new ShippingFactory( $address_factory ); }, - 'api.factory.amount' => static function ( $container ): AmountFactory { + 'api.factory.amount' => static function ( ContainerInterface $container ): AmountFactory { $item_factory = $container->get( 'api.factory.item' ); return new AmountFactory( $item_factory ); }, - 'api.factory.payer' => static function ( $container ): PayerFactory { + 'api.factory.payer' => static function ( ContainerInterface $container ): PayerFactory { $address_factory = $container->get( 'api.factory.address' ); return new PayerFactory( $address_factory ); }, - 'api.factory.address' => static function ( $container ): AddressFactory { + 'api.factory.address' => static function ( ContainerInterface $container ): AddressFactory { return new AddressFactory(); }, - 'api.factory.payment-source' => static function ( $container ): PaymentSourceFactory { + 'api.factory.payment-source' => static function ( ContainerInterface $container ): PaymentSourceFactory { return new PaymentSourceFactory(); }, - 'api.factory.order' => static function ( $container ): OrderFactory { + 'api.factory.order' => static function ( ContainerInterface $container ): OrderFactory { $purchase_unit_factory = $container->get( 'api.factory.purchase-unit' ); $payer_factory = $container->get( 'api.factory.payer' ); $application_context_repository = $container->get( 'api.repository.application-context' ); @@ -280,15 +281,15 @@ return array( $payment_source_factory ); }, - 'api.factory.payments' => static function ( $container ): PaymentsFactory { + 'api.factory.payments' => static function ( ContainerInterface $container ): PaymentsFactory { $authorizations_factory = $container->get( 'api.factory.authorization' ); $capture_factory = $container->get( 'api.factory.capture' ); return new PaymentsFactory( $authorizations_factory, $capture_factory ); }, - 'api.factory.authorization' => static function ( $container ): AuthorizationFactory { + 'api.factory.authorization' => static function ( ContainerInterface $container ): AuthorizationFactory { return new AuthorizationFactory(); }, - 'api.helpers.dccapplies' => static function ( $container ) : DccApplies { + 'api.helpers.dccapplies' => static function ( ContainerInterface $container ) : DccApplies { return new DccApplies(); }, ); diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php index 9ff036bbf..c2574927a 100644 --- a/modules/ppcp-button/services.php +++ b/modules/ppcp-button/services.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Button; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Button\Assets\DisabledSmartButton; use WooCommerce\PayPalCommerce\Button\Assets\SmartButton; use WooCommerce\PayPalCommerce\Button\Assets\SmartButtonInterface; @@ -25,7 +26,7 @@ use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\State; return array( - 'button.client_id' => static function ( $container ): string { + 'button.client_id' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); $client_id = $settings->has( 'client_id' ) ? $settings->get( 'client_id' ) : ''; @@ -43,7 +44,7 @@ return array( return $env->current_environment_is( Environment::SANDBOX ) ? CONNECT_WOO_SANDBOX_CLIENT_ID : CONNECT_WOO_CLIENT_ID; }, - 'button.smart-button' => static function ( $container ): SmartButtonInterface { + 'button.smart-button' => static function ( ContainerInterface $container ): SmartButtonInterface { $state = $container->get( 'onboarding.state' ); /** @@ -84,16 +85,16 @@ return array( $settings_status ); }, - 'button.url' => static function ( $container ): string { + 'button.url' => static function ( ContainerInterface $container ): string { return plugins_url( '/modules/ppcp-button/', dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' ); }, - 'button.request-data' => static function ( $container ): RequestData { + 'button.request-data' => static function ( ContainerInterface $container ): RequestData { return new RequestData(); }, - 'button.endpoint.change-cart' => static function ( $container ): ChangeCartEndpoint { + 'button.endpoint.change-cart' => static function ( ContainerInterface $container ): ChangeCartEndpoint { if ( ! \WC()->cart ) { throw new RuntimeException( 'cant initialize endpoint at this moment' ); } @@ -104,7 +105,7 @@ return array( $data_store = \WC_Data_Store::load( 'product' ); return new ChangeCartEndpoint( $cart, $shipping, $request_data, $repository, $data_store ); }, - 'button.endpoint.create-order' => static function ( $container ): CreateOrderEndpoint { + 'button.endpoint.create-order' => static function ( ContainerInterface $container ): CreateOrderEndpoint { $request_data = $container->get( 'button.request-data' ); $cart_repository = $container->get( 'api.repository.cart' ); $purchase_unit_factory = $container->get( 'api.factory.purchase-unit' ); @@ -124,7 +125,7 @@ return array( $early_order_handler ); }, - 'button.helper.early-order-handler' => static function ( $container ) : EarlyOrderHandler { + 'button.helper.early-order-handler' => static function ( ContainerInterface $container ) : EarlyOrderHandler { $state = $container->get( 'onboarding.state' ); $order_processor = $container->get( 'wcgateway.order-processor' ); @@ -132,7 +133,7 @@ return array( $prefix = $container->get( 'api.prefix' ); return new EarlyOrderHandler( $state, $order_processor, $session_handler, $prefix ); }, - 'button.endpoint.approve-order' => static function ( $container ): ApproveOrderEndpoint { + 'button.endpoint.approve-order' => static function ( ContainerInterface $container ): ApproveOrderEndpoint { $request_data = $container->get( 'button.request-data' ); $order_endpoint = $container->get( 'api.endpoint.order' ); $session_handler = $container->get( 'session.handler' ); @@ -150,7 +151,7 @@ return array( $logger ); }, - 'button.endpoint.data-client-id' => static function( $container ) : DataClientIdEndpoint { + 'button.endpoint.data-client-id' => static function( ContainerInterface $container ) : DataClientIdEndpoint { $request_data = $container->get( 'button.request-data' ); $identity_token = $container->get( 'api.endpoint.identity-token' ); return new DataClientIdEndpoint( @@ -158,10 +159,10 @@ return array( $identity_token ); }, - 'button.helper.three-d-secure' => static function ( $container ): ThreeDSecure { + 'button.helper.three-d-secure' => static function ( ContainerInterface $container ): ThreeDSecure { return new ThreeDSecure(); }, - 'button.helper.messages-apply' => static function ( $container ): MessagesApply { + 'button.helper.messages-apply' => static function ( ContainerInterface $container ): MessagesApply { return new MessagesApply(); }, ); diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php index 2e07665b8..f2836d8af 100644 --- a/modules/ppcp-onboarding/services.php +++ b/modules/ppcp-onboarding/services.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Onboarding; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer; use WooCommerce\PayPalCommerce\ApiClient\Authentication\ConnectBearer; use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer; @@ -21,7 +22,7 @@ use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingRenderer; use WooCommerce\PayPalCommerce\Onboarding\Onboarding_REST_Controller; return array( - 'api.sandbox-host' => static function ( $container ): string { + 'api.sandbox-host' => static function ( ContainerInterface $container ): string { $state = $container->get( 'onboarding.state' ); @@ -35,7 +36,7 @@ return array( } return CONNECT_WOO_SANDBOX_URL; }, - 'api.production-host' => static function ( $container ): string { + 'api.production-host' => static function ( ContainerInterface $container ): string { $state = $container->get( 'onboarding.state' ); @@ -50,7 +51,7 @@ return array( } return CONNECT_WOO_URL; }, - 'api.host' => static function ( $container ): string { + 'api.host' => static function ( ContainerInterface $container ): string { $environment = $container->get( 'onboarding.environment' ); /** @@ -62,19 +63,19 @@ return array( ? (string) $container->get( 'api.sandbox-host' ) : (string) $container->get( 'api.production-host' ); }, - 'api.paypal-host-production' => static function( $container ) : string { + 'api.paypal-host-production' => static function( ContainerInterface $container ) : string { return PAYPAL_API_URL; }, - 'api.paypal-host-sandbox' => static function( $container ) : string { + 'api.paypal-host-sandbox' => static function( ContainerInterface $container ) : string { return PAYPAL_SANDBOX_API_URL; }, - 'api.partner_merchant_id-production' => static function( $container ) : string { + 'api.partner_merchant_id-production' => static function( ContainerInterface $container ) : string { return CONNECT_WOO_MERCHANT_ID; }, - 'api.partner_merchant_id-sandbox' => static function( $container ) : string { + 'api.partner_merchant_id-sandbox' => static function( ContainerInterface $container ) : string { return CONNECT_WOO_SANDBOX_MERCHANT_ID; }, - 'api.paypal-host' => function( $container ) : string { + 'api.paypal-host' => function( ContainerInterface $container ) : string { $environment = $container->get( 'onboarding.environment' ); /** * The current environment. @@ -88,7 +89,7 @@ return array( }, - 'api.bearer' => static function ( $container ): Bearer { + 'api.bearer' => static function ( ContainerInterface $container ): Bearer { $state = $container->get( 'onboarding.state' ); @@ -115,17 +116,17 @@ return array( $settings ); }, - 'onboarding.state' => function( $container ) : State { + 'onboarding.state' => function( ContainerInterface $container ) : State { $environment = $container->get( 'onboarding.environment' ); $settings = $container->get( 'wcgateway.settings' ); return new State( $environment, $settings ); }, - 'onboarding.environment' => function( $container ) : Environment { + 'onboarding.environment' => function( ContainerInterface $container ) : Environment { $settings = $container->get( 'wcgateway.settings' ); return new Environment( $settings ); }, - 'onboarding.assets' => function( $container ) : OnboardingAssets { + 'onboarding.assets' => function( ContainerInterface $container ) : OnboardingAssets { $state = $container->get( 'onboarding.state' ); $login_seller_endpoint = $container->get( 'onboarding.endpoint.login-seller' ); return new OnboardingAssets( @@ -135,14 +136,14 @@ return array( ); }, - 'onboarding.url' => static function ( $container ): string { + 'onboarding.url' => static function ( ContainerInterface $container ): string { return plugins_url( '/modules/ppcp-onboarding/', dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' ); }, - 'api.endpoint.login-seller-production' => static function ( $container ) : LoginSeller { + 'api.endpoint.login-seller-production' => static function ( ContainerInterface $container ) : LoginSeller { $logger = $container->get( 'woocommerce.logger.woocommerce' ); return new LoginSeller( @@ -152,7 +153,7 @@ return array( ); }, - 'api.endpoint.login-seller-sandbox' => static function ( $container ) : LoginSeller { + 'api.endpoint.login-seller-sandbox' => static function ( ContainerInterface $container ) : LoginSeller { $logger = $container->get( 'woocommerce.logger.woocommerce' ); return new LoginSeller( @@ -162,7 +163,7 @@ return array( ); }, - 'onboarding.endpoint.login-seller' => static function ( $container ) : LoginSellerEndpoint { + 'onboarding.endpoint.login-seller' => static function ( ContainerInterface $container ) : LoginSellerEndpoint { $request_data = $container->get( 'button.request-data' ); $login_seller_production = $container->get( 'api.endpoint.login-seller-production' ); @@ -180,7 +181,7 @@ return array( $cache ); }, - 'api.endpoint.partner-referrals-sandbox' => static function ( $container ) : PartnerReferrals { + 'api.endpoint.partner-referrals-sandbox' => static function ( ContainerInterface $container ) : PartnerReferrals { return new PartnerReferrals( CONNECT_WOO_SANDBOX_URL, @@ -189,7 +190,7 @@ return array( $container->get( 'woocommerce.logger.woocommerce' ) ); }, - 'api.endpoint.partner-referrals-production' => static function ( $container ) : PartnerReferrals { + 'api.endpoint.partner-referrals-production' => static function ( ContainerInterface $container ) : PartnerReferrals { return new PartnerReferrals( CONNECT_WOO_URL, @@ -198,7 +199,7 @@ return array( $container->get( 'woocommerce.logger.woocommerce' ) ); }, - 'onboarding.render' => static function ( $container ) : OnboardingRenderer { + 'onboarding.render' => static function ( ContainerInterface $container ) : OnboardingRenderer { $partner_referrals = $container->get( 'api.endpoint.partner-referrals-production' ); $partner_referrals_sandbox = $container->get( 'api.endpoint.partner-referrals-sandbox' ); diff --git a/modules/ppcp-session/services.php b/modules/ppcp-session/services.php index 6081b802c..b83a1a6a5 100644 --- a/modules/ppcp-session/services.php +++ b/modules/ppcp-session/services.php @@ -9,11 +9,12 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Session; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Session\Cancellation\CancelController; use WooCommerce\PayPalCommerce\Session\Cancellation\CancelView; return array( - 'session.handler' => function ( $container ) : SessionHandler { + 'session.handler' => function ( ContainerInterface $container ) : SessionHandler { if ( is_null( WC()->session ) ) { return new SessionHandler(); @@ -26,10 +27,10 @@ return array( WC()->session->set( SessionHandler::ID, $session_handler ); return $session_handler; }, - 'session.cancellation.view' => function ( $container ) : CancelView { + 'session.cancellation.view' => function ( ContainerInterface $container ) : CancelView { return new CancelView(); }, - 'session.cancellation.controller' => function ( $container ) : CancelController { + 'session.cancellation.controller' => function ( ContainerInterface $container ) : CancelController { return new CancelController( $container->get( 'session.handler' ), $container->get( 'session.cancellation.view' ) diff --git a/modules/ppcp-subscription/services.php b/modules/ppcp-subscription/services.php index 253e22b36..1c24dab22 100644 --- a/modules/ppcp-subscription/services.php +++ b/modules/ppcp-subscription/services.php @@ -14,10 +14,10 @@ use WooCommerce\PayPalCommerce\Subscription\Repository\PaymentTokenRepository; use Psr\Container\ContainerInterface; return array( - 'subscription.helper' => static function ( $container ): SubscriptionHelper { + 'subscription.helper' => static function ( ContainerInterface $container ): SubscriptionHelper { return new SubscriptionHelper(); }, - 'subscription.renewal-handler' => static function ( $container ): RenewalHandler { + 'subscription.renewal-handler' => static function ( ContainerInterface $container ): RenewalHandler { $logger = $container->get( 'woocommerce.logger.woocommerce' ); $repository = $container->get( 'subscription.repository.payment-token' ); $endpoint = $container->get( 'api.endpoint.order' ); @@ -31,7 +31,7 @@ return array( $payer_factory ); }, - 'subscription.repository.payment-token' => static function ( $container ): PaymentTokenRepository { + 'subscription.repository.payment-token' => static function ( ContainerInterface $container ): PaymentTokenRepository { $factory = $container->get( 'api.factory.payment-token' ); $endpoint = $container->get( 'api.endpoint.payment-token' ); return new PaymentTokenRepository( $factory, $endpoint ); diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 2e0e167b8..bd7109a30 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\WcGateway; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\ApiClient\Entity\ApplicationContext; use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache; use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies; @@ -35,9 +36,10 @@ use WooCommerce\PayPalCommerce\WcGateway\Settings\SectionsRenderer; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsListener; use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer; +use WpOop\TransientCache\CachePoolFactory; return array( - 'wcgateway.paypal-gateway' => static function ( $container ): PayPalGateway { + 'wcgateway.paypal-gateway' => static function ( ContainerInterface $container ): PayPalGateway { $order_processor = $container->get( 'wcgateway.order-processor' ); $settings_renderer = $container->get( 'wcgateway.settings.render' ); $authorized_payments = $container->get( 'wcgateway.processor.authorized-payments' ); @@ -61,7 +63,7 @@ return array( $subscription_helper ); }, - 'wcgateway.credit-card-gateway' => static function ( $container ): CreditCardGateway { + 'wcgateway.credit-card-gateway' => static function ( ContainerInterface $container ): CreditCardGateway { $order_processor = $container->get( 'wcgateway.order-processor' ); $settings_renderer = $container->get( 'wcgateway.settings.render' ); $authorized_payments = $container->get( 'wcgateway.processor.authorized-payments' ); @@ -95,15 +97,15 @@ return array( $subscription_helper ); }, - 'wcgateway.disabler' => static function ( $container ): DisableGateways { + 'wcgateway.disabler' => static function ( ContainerInterface $container ): DisableGateways { $session_handler = $container->get( 'session.handler' ); $settings = $container->get( 'wcgateway.settings' ); return new DisableGateways( $session_handler, $settings ); }, - 'wcgateway.settings' => static function ( $container ): Settings { + 'wcgateway.settings' => static function ( ContainerInterface $container ): Settings { return new Settings(); }, - 'wcgateway.notice.connect' => static function ( $container ): ConnectAdminNotice { + 'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice { $state = $container->get( 'onboarding.state' ); $settings = $container->get( 'wcgateway.settings' ); return new ConnectAdminNotice( $state, $settings ); @@ -112,14 +114,14 @@ return array( static function ( $container ): AuthorizeOrderActionNotice { return new AuthorizeOrderActionNotice(); }, - 'wcgateway.settings.sections-renderer' => static function ( $container ): SectionsRenderer { + 'wcgateway.settings.sections-renderer' => static function ( ContainerInterface $container ): SectionsRenderer { return new SectionsRenderer(); }, 'wcgateway.settings.status' => static function ( $container ): SettingsStatus { $settings = $container->get( 'wcgateway.settings' ); return new SettingsStatus( $settings ); }, - 'wcgateway.settings.render' => static function ( $container ): SettingsRenderer { + 'wcgateway.settings.render' => static function ( ContainerInterface $container ): SettingsRenderer { $settings = $container->get( 'wcgateway.settings' ); $state = $container->get( 'onboarding.state' ); $fields = $container->get( 'wcgateway.settings.fields' ); @@ -137,7 +139,7 @@ return array( $settings_status ); }, - 'wcgateway.settings.listener' => static function ( $container ): SettingsListener { + 'wcgateway.settings.listener' => static function ( ContainerInterface $container ): SettingsListener { $settings = $container->get( 'wcgateway.settings' ); $fields = $container->get( 'wcgateway.settings.fields' ); $webhook_registrar = $container->get( 'webhook.registrar' ); @@ -146,7 +148,7 @@ return array( $bearer = $container->get( 'api.bearer' ); return new SettingsListener( $settings, $fields, $webhook_registrar, $cache, $state, $bearer ); }, - 'wcgateway.order-processor' => static function ( $container ): OrderProcessor { + 'wcgateway.order-processor' => static function ( ContainerInterface $container ): OrderProcessor { $session_handler = $container->get( 'session.handler' ); $order_endpoint = $container->get( 'api.endpoint.order' ); @@ -167,29 +169,29 @@ return array( $environment->current_environment_is( Environment::SANDBOX ) ); }, - 'wcgateway.processor.refunds' => static function ( $container ): RefundProcessor { + 'wcgateway.processor.refunds' => static function ( ContainerInterface $container ): RefundProcessor { $order_endpoint = $container->get( 'api.endpoint.order' ); $payments_endpoint = $container->get( 'api.endpoint.payments' ); return new RefundProcessor( $order_endpoint, $payments_endpoint ); }, - 'wcgateway.processor.authorized-payments' => static function ( $container ): AuthorizedPaymentsProcessor { + 'wcgateway.processor.authorized-payments' => static function ( ContainerInterface $container ): AuthorizedPaymentsProcessor { $order_endpoint = $container->get( 'api.endpoint.order' ); $payments_endpoint = $container->get( 'api.endpoint.payments' ); return new AuthorizedPaymentsProcessor( $order_endpoint, $payments_endpoint ); }, - 'wcgateway.admin.render-authorize-action' => static function ( $container ): RenderAuthorizeAction { + 'wcgateway.admin.render-authorize-action' => static function ( ContainerInterface $container ): RenderAuthorizeAction { return new RenderAuthorizeAction(); }, - 'wcgateway.admin.order-payment-status' => static function ( $container ): PaymentStatusOrderDetail { + 'wcgateway.admin.order-payment-status' => static function ( ContainerInterface $container ): PaymentStatusOrderDetail { return new PaymentStatusOrderDetail(); }, - 'wcgateway.admin.orders-payment-status-column' => static function ( $container ): OrderTablePaymentStatusColumn { + 'wcgateway.admin.orders-payment-status-column' => static function ( ContainerInterface $container ): OrderTablePaymentStatusColumn { $settings = $container->get( 'wcgateway.settings' ); return new OrderTablePaymentStatusColumn( $settings ); }, - 'wcgateway.settings.fields' => static function ( $container ): array { + 'wcgateway.settings.fields' => static function ( ContainerInterface $container ): array { $state = $container->get( 'onboarding.state' ); $messages_disclaimers = $container->get( 'button.helper.messages-disclaimers' ); @@ -1862,13 +1864,13 @@ return array( return $fields; }, - 'wcgateway.checkout.address-preset' => static function( $container ): CheckoutPayPalAddressPreset { + 'wcgateway.checkout.address-preset' => static function( ContainerInterface $container ): CheckoutPayPalAddressPreset { return new CheckoutPayPalAddressPreset( $container->get( 'session.handler' ) ); }, - 'wcgateway.url' => static function ( $container ): string { + 'wcgateway.url' => static function ( ContainerInterface $container ): string { return plugins_url( $container->get( 'wcgateway.relative-path' ), dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' @@ -1883,7 +1885,7 @@ return array( ) . $container->get( 'wcgateway.relative-path' ); }, - 'wcgateway.endpoint.return-url' => static function ( $container ) : ReturnUrlEndpoint { + 'wcgateway.endpoint.return-url' => static function ( ContainerInterface $container ) : ReturnUrlEndpoint { $gateway = $container->get( 'wcgateway.paypal-gateway' ); $endpoint = $container->get( 'api.endpoint.order' ); $prefix = $container->get( 'api.prefix' ); @@ -1909,7 +1911,7 @@ return array( return new TransactionUrlProvider( $sandbox_url_base, $live_url_base ); }, - 'wcgateway.helper.dcc-product-status' => static function ( $container ) : DccProductStatus { + 'wcgateway.helper.dcc-product-status' => static function ( ContainerInterface $container ) : DccProductStatus { $settings = $container->get( 'wcgateway.settings' ); $partner_endpoint = $container->get( 'api.endpoint.partners' ); diff --git a/modules/ppcp-webhooks/services.php b/modules/ppcp-webhooks/services.php index 3b19bf7a1..b2dd4a7ff 100644 --- a/modules/ppcp-webhooks/services.php +++ b/modules/ppcp-webhooks/services.php @@ -18,7 +18,7 @@ use Psr\Container\ContainerInterface; return array( - 'webhook.registrar' => function( $container ) : WebhookRegistrar { + 'webhook.registrar' => function( ContainerInterface $container ) : WebhookRegistrar { $factory = $container->get( 'api.factory.webhook' ); $endpoint = $container->get( 'api.endpoint.webhook' ); $rest_endpoint = $container->get( 'webhook.endpoint.controller' ); @@ -28,7 +28,7 @@ return array( $rest_endpoint ); }, - 'webhook.endpoint.controller' => function( $container ) : IncomingWebhookEndpoint { + 'webhook.endpoint.controller' => function( ContainerInterface $container ) : IncomingWebhookEndpoint { $webhook_endpoint = $container->get( 'api.endpoint.webhook' ); $webhook_factory = $container->get( 'api.factory.webhook' ); $handler = $container->get( 'webhook.endpoint.handler' ); @@ -43,7 +43,7 @@ return array( ... $handler ); }, - 'webhook.endpoint.handler' => function( $container ) : array { + 'webhook.endpoint.handler' => function( ContainerInterface $container ) : array { $logger = $container->get( 'woocommerce.logger.woocommerce' ); $prefix = $container->get( 'api.prefix' ); $order_endpoint = $container->get( 'api.endpoint.order' ); From 69d9631a73fb58fca52b4a2a1910d06da65ab004 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 18 Feb 2021 09:46:26 +0100 Subject: [PATCH 07/42] Now using modularity standard v0.3 This is the newest release, and is the first one that is compatible with PHP 8. Other changes are BC-breaking, but very very minor. --- modules/ppcp-admin-notices/composer.json | 2 +- modules/ppcp-admin-notices/src/AdminNotices.php | 8 ++------ modules/ppcp-api-client/composer.json | 2 +- modules/ppcp-api-client/src/ApiModule.php | 8 ++------ modules/ppcp-button/composer.json | 2 +- modules/ppcp-button/src/ButtonModule.php | 8 ++------ modules/ppcp-onboarding/composer.json | 2 +- modules/ppcp-onboarding/src/OnboardingModule.php | 8 ++------ modules/ppcp-session/composer.json | 2 +- modules/ppcp-session/src/SessionModule.php | 8 ++------ modules/ppcp-subscription/composer.json | 2 +- modules/ppcp-subscription/src/SubscriptionModule.php | 8 ++------ modules/ppcp-wc-gateway/composer.json | 2 +- modules/ppcp-wc-gateway/src/WcGatewayModule.php | 8 ++------ modules/ppcp-webhooks/composer.json | 2 +- modules/ppcp-webhooks/src/WebhookModule.php | 8 ++------ modules/woocommerce-logging/composer.json | 2 +- .../woocommerce-logging/src/WooCommerceLoggingModule.php | 8 ++------ src/PluginModule.php | 6 ++---- 19 files changed, 29 insertions(+), 67 deletions(-) diff --git a/modules/ppcp-admin-notices/composer.json b/modules/ppcp-admin-notices/composer.json index 88e9fbc19..697ef0137 100644 --- a/modules/ppcp-admin-notices/composer.json +++ b/modules/ppcp-admin-notices/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-admin-notices/src/AdminNotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php index 686ae4db6..5ff22d51c 100644 --- a/modules/ppcp-admin-notices/src/AdminNotices.php +++ b/modules/ppcp-admin-notices/src/AdminNotices.php @@ -20,9 +20,7 @@ use Psr\Container\ContainerInterface; class AdminNotices implements ModuleInterface { /** - * Sets up the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -32,9 +30,7 @@ class AdminNotices implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-api-client/composer.json b/modules/ppcp-api-client/composer.json index 97392f7fb..faa4f3d9c 100644 --- a/modules/ppcp-api-client/composer.json +++ b/modules/ppcp-api-client/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-api-client/src/ApiModule.php b/modules/ppcp-api-client/src/ApiModule.php index bdc98924b..f2d35f742 100644 --- a/modules/ppcp-api-client/src/ApiModule.php +++ b/modules/ppcp-api-client/src/ApiModule.php @@ -20,9 +20,7 @@ use Psr\Container\ContainerInterface; class ApiModule implements ModuleInterface { /** - * Sets up the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -32,9 +30,7 @@ class ApiModule implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-button/composer.json b/modules/ppcp-button/composer.json index e8eaa90ca..0d818629d 100644 --- a/modules/ppcp-button/composer.json +++ b/modules/ppcp-button/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-button/src/ButtonModule.php b/modules/ppcp-button/src/ButtonModule.php index 659183db8..5de8d712a 100644 --- a/modules/ppcp-button/src/ButtonModule.php +++ b/modules/ppcp-button/src/ButtonModule.php @@ -27,9 +27,7 @@ class ButtonModule implements ModuleInterface { /** - * Sets up the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -39,9 +37,7 @@ class ButtonModule implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface|null $container The Container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { diff --git a/modules/ppcp-onboarding/composer.json b/modules/ppcp-onboarding/composer.json index b2a10b9d8..a063dc01d 100644 --- a/modules/ppcp-onboarding/composer.json +++ b/modules/ppcp-onboarding/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-onboarding/src/OnboardingModule.php b/modules/ppcp-onboarding/src/OnboardingModule.php index 7fdaf5d55..90126c93c 100644 --- a/modules/ppcp-onboarding/src/OnboardingModule.php +++ b/modules/ppcp-onboarding/src/OnboardingModule.php @@ -24,9 +24,7 @@ use Psr\Container\ContainerInterface; class OnboardingModule implements ModuleInterface { /** - * Sets up the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -36,9 +34,7 @@ class OnboardingModule implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface|null $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { diff --git a/modules/ppcp-session/composer.json b/modules/ppcp-session/composer.json index 32313fe03..0a8325e93 100644 --- a/modules/ppcp-session/composer.json +++ b/modules/ppcp-session/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-session/src/SessionModule.php b/modules/ppcp-session/src/SessionModule.php index b2c5a5aef..1cd7e198d 100644 --- a/modules/ppcp-session/src/SessionModule.php +++ b/modules/ppcp-session/src/SessionModule.php @@ -21,9 +21,7 @@ use Psr\Container\ContainerInterface; class SessionModule implements ModuleInterface { /** - * Sets up the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -33,9 +31,7 @@ class SessionModule implements ModuleInterface { } /** - * Run the module. - * - * @param ContainerInterface|null $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-subscription/composer.json b/modules/ppcp-subscription/composer.json index a27ad686a..b54dfb9a0 100644 --- a/modules/ppcp-subscription/composer.json +++ b/modules/ppcp-subscription/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-subscription/src/SubscriptionModule.php b/modules/ppcp-subscription/src/SubscriptionModule.php index 5984ab988..0456971b3 100644 --- a/modules/ppcp-subscription/src/SubscriptionModule.php +++ b/modules/ppcp-subscription/src/SubscriptionModule.php @@ -28,9 +28,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException; class SubscriptionModule implements ModuleInterface { /** - * Setup the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -40,9 +38,7 @@ class SubscriptionModule implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface|null $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-wc-gateway/composer.json b/modules/ppcp-wc-gateway/composer.json index 06bf37d24..c8a15a7d6 100644 --- a/modules/ppcp-wc-gateway/composer.json +++ b/modules/ppcp-wc-gateway/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-wc-gateway/src/WcGatewayModule.php b/modules/ppcp-wc-gateway/src/WcGatewayModule.php index 981491351..8ae82940d 100644 --- a/modules/ppcp-wc-gateway/src/WcGatewayModule.php +++ b/modules/ppcp-wc-gateway/src/WcGatewayModule.php @@ -37,9 +37,7 @@ use Psr\Container\ContainerInterface; class WcGatewayModule implements ModuleInterface { /** - * Setup the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -49,9 +47,7 @@ class WcGatewayModule implements ModuleInterface { } /** - * Runs the module. - * - * @param ContainerInterface|null $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { $this->register_payment_gateways( $container ); diff --git a/modules/ppcp-webhooks/composer.json b/modules/ppcp-webhooks/composer.json index 69049e0c0..83dd73952 100644 --- a/modules/ppcp-webhooks/composer.json +++ b/modules/ppcp-webhooks/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/ppcp-webhooks/src/WebhookModule.php b/modules/ppcp-webhooks/src/WebhookModule.php index 24a765a08..6ba7ede7e 100644 --- a/modules/ppcp-webhooks/src/WebhookModule.php +++ b/modules/ppcp-webhooks/src/WebhookModule.php @@ -20,9 +20,7 @@ use Psr\Container\ContainerInterface; class WebhookModule implements ModuleInterface { /** - * Setup the Webhook module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -32,9 +30,7 @@ class WebhookModule implements ModuleInterface { } /** - * Run the Webhook module. - * - * @param ContainerInterface|null $container The Container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/woocommerce-logging/composer.json b/modules/woocommerce-logging/composer.json index 6e25a57e6..ebe40607a 100644 --- a/modules/woocommerce-logging/composer.json +++ b/modules/woocommerce-logging/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", - "dhii/module-interface": "^0.2.0-alpha1" + "dhii/module-interface": "^0.3.0-alpha1" }, "autoload": { "psr-4": { diff --git a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php index 1d4da4899..0e677c7fa 100644 --- a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php +++ b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php @@ -20,9 +20,7 @@ use Psr\Container\ContainerInterface; class WooCommerceLoggingModule implements ModuleInterface { /** - * Setup the module. - * - * @return ServiceProviderInterface + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -32,9 +30,7 @@ class WooCommerceLoggingModule implements ModuleInterface { } /** - * Run the module. - * - * @param ContainerInterface $container The container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { } diff --git a/src/PluginModule.php b/src/PluginModule.php index ef622a978..51b560ae3 100644 --- a/src/PluginModule.php +++ b/src/PluginModule.php @@ -20,16 +20,14 @@ use Psr\Container\ContainerInterface; class PluginModule implements ModuleInterface { /** - * Sets the module up. + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( array(), array() ); } /** - * Runs the module. - * - * @param ContainerInterface|null $container The Container. + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { } From 6eda7448d42282e55a96479db2073b3e7d5ccba0 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Fri, 5 Mar 2021 10:17:38 +0100 Subject: [PATCH 08/42] Merge pull request #2 from strangerkir/task/refactoring --- modules/ppcp-api-client/src/Entity/PurchaseUnit.php | 4 ++-- tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ppcp-api-client/src/Entity/PurchaseUnit.php b/modules/ppcp-api-client/src/Entity/PurchaseUnit.php index 0ef21455b..770ca0d38 100644 --- a/modules/ppcp-api-client/src/Entity/PurchaseUnit.php +++ b/modules/ppcp-api-client/src/Entity/PurchaseUnit.php @@ -317,8 +317,8 @@ class PurchaseUnit { } } - $fee_items_total = round( $fee_items_total, 2 ); - $fee_tax_total = round( $fee_tax_total, 2 ); + $fee_items_total = round( (float) $fee_items_total, 2 ); + $fee_tax_total = round( (float) $fee_tax_total, 2 ); if ( 0.0 !== $fee_items_total || 0.0 !== $fee_tax_total ) { return true; diff --git a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php index 2f4efbe8e..23d600d65 100644 --- a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php +++ b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php @@ -32,7 +32,7 @@ class CreateOrderEndpointTest extends TestCase { list($payer_factory, $testee) = $this->mockTestee(); - $method = $this->testPrivateMethod(CreateOrderEndpoint::class, 'payer'); + $method = $this->getProtectedMethodAccessibleReflection(CreateOrderEndpoint::class, 'payer'); $dataString = wp_json_encode($expectedResult['payer']); $dataObj = json_decode(wp_json_encode($expectedResult['payer'])); @@ -173,11 +173,11 @@ class CreateOrderEndpointTest extends TestCase * @return \ReflectionMethod * @throws \ReflectionException */ - protected function testPrivateMethod($class, $method) + protected function getProtectedMethodAccessibleReflection($class, $method) { $reflector = new ReflectionClass($class); $method = $reflector->getMethod($method); $method->setAccessible(true); return $method; } -} \ No newline at end of file +} From 25e419ab7207e70fbe87b73d47ce1dc26464e56a Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sat, 3 Jul 2021 14:21:20 +0200 Subject: [PATCH 09/42] Switch GPG keyserver https://stackoverflow.com/a/68132500/565229 --- .idea/php.xml | 18 ++++++++++++++++++ docker/Dockerfile_wp | 9 +++++++++ 2 files changed, 27 insertions(+) diff --git a/.idea/php.xml b/.idea/php.xml index 46483f7ae..9eda782e5 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -60,6 +60,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 27bde5660..361ba590e 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -77,6 +77,15 @@ RUN docker-php-ext-install intl json && \ RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - RUN apt-get install -y nodejs +# Install Phive +RUN wget -O phive.phar "https://phar.io/releases/phive.phar" +RUN wget -O phive.phar.asc "https://phar.io/releases/phive.phar.asc" +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 0x9D8A98B29B2D5D79 +RUN gpg --verify phive.phar.asc phive.phar +RUN rm phive.phar.asc && \ + chmod +x phive.phar && \ + mv phive.phar /usr/local/bin/phive + WORKDIR ${BUILD_ROOT_PATH} COPY . ./ From 4f13f1182c77dd05a7b696884572e2aa8e39bf2d Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 14:45:55 +0200 Subject: [PATCH 10/42] Upgrade Composer --- docker/Dockerfile_wp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 361ba590e..5f0fb17e9 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -64,7 +64,7 @@ RUN apt-get install -y \ wget RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ - php composer-setup.php --install-dir=/usr/bin --filename=composer --version=1.10.19 && \ + php composer-setup.php --install-dir=/usr/bin --filename=composer --version=1.10.22 && \ php -r "unlink('composer-setup.php');" RUN mkdir -p ~/.ssh From 46856f756fa3bbf2e2e8cf9b90d90a84fba8c649 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 14:46:09 +0200 Subject: [PATCH 11/42] Upgrade Node --- docker/Dockerfile_wp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 5f0fb17e9..abbebc311 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -74,7 +74,7 @@ RUN docker-php-ext-install intl json && \ docker-php-ext-enable intl json # Install Node -RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - RUN apt-get install -y nodejs # Install Phive From f2a5143066844fe0bfacfd5325e237dcb14a8312 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 16:56:49 +0200 Subject: [PATCH 12/42] Use Composer v1 --- docker/Dockerfile_wp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index abbebc311..6fb845a45 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -12,7 +12,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" RUN echo 'memory_limit = 128M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini; RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ - php composer-setup.php --install-dir=/usr/bin --filename=composer && \ + php composer-setup.php --install-dir=/usr/bin --filename=composer --version=1.10.22 && \ php -r "unlink('composer-setup.php');" RUN apt-get update From 272302501bb655712f3ebea34b535c524fae590d Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 16:57:01 +0200 Subject: [PATCH 13/42] Update deps --- composer.json | 2 +- composer.lock | 527 ++++++-------------------------------------------- 2 files changed, 62 insertions(+), 467 deletions(-) diff --git a/composer.json b/composer.json index c2aacc0c5..67b00d086 100644 --- a/composer.json +++ b/composer.json @@ -5,12 +5,12 @@ "license": "GPL-2.0", "require": { "php": "^7.1 | ^8.0", + "ext-json": "*", "dhii/module-interface": "^0.2 || ^0.3", "psr/container": "^1.0", "container-interop/service-provider": "^0.4.0", "dhii/containers": "^0.1.0-alpha1", "psr/log": "^1.1", - "ext-json": "*", "ralouphie/getallheaders": "^3.0", "wikimedia/composer-merge-plugin": "^1.4" }, diff --git a/composer.lock b/composer.lock index 6370a86ba..96c547218 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f1528613bfae64666db050d9fead669", + "content-hash": "0b4f7dd4cc7706bd902a10f64dbd095e", "packages": [ { "name": "container-interop/service-provider", @@ -35,10 +35,6 @@ ], "description": "Promoting container interoperability through standard service providers", "homepage": "https://github.com/container-interop/service-provider", - "support": { - "issues": "https://github.com/container-interop/service-provider/issues", - "source": "https://github.com/container-interop/service-provider/tree/master" - }, "time": "2017-09-20T14:13:36+00:00" }, { @@ -90,36 +86,34 @@ } ], "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", - "support": { - "issues": "https://github.com/Dhii/collections-interface/issues", - "source": "https://github.com/Dhii/collections-interface/tree/v0.3.0-alpha4" - }, "time": "2021-03-09T17:36:34+00:00" }, { "name": "dhii/containers", - "version": "v0.1.0-alpha1", + "version": "v0.1.2", "source": { "type": "git", "url": "https://github.com/Dhii/containers.git", - "reference": "73eed5422e106006c81ca1fa8b7213c6be33efbc" + "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/containers/zipball/73eed5422e106006c81ca1fa8b7213c6be33efbc", - "reference": "73eed5422e106006c81ca1fa8b7213c6be33efbc", + "url": "https://api.github.com/repos/Dhii/containers/zipball/b753f1d8eee7bf58ebbeb815b55a634785bcdb64", + "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64", "shasum": "" }, "require": { "container-interop/service-provider": "^0.4", - "dhii/collections-interface": "^0.3.0-alpha1", + "dhii/collections-interface": "^0.3.0-alpha2", "php": "^7.1 | ^8.0" }, "require-dev": { "gmazzap/andrew": "^1.1", "phpunit/phpunit": "^7.0", "psr/container": "^1.0", - "slevomat/coding-standard": "~4.0" + "psr/simple-cache": "^1.0", + "slevomat/coding-standard": "~4.0", + "wildwolf/psr-memory-cache": "^1.0" }, "type": "library", "extra": { @@ -147,177 +141,7 @@ "PSR-11", "container" ], - "support": { - "issues": "https://github.com/Dhii/containers/issues", - "source": "https://github.com/Dhii/containers/tree/v0.1.0-alpha1" - }, - "time": "2020-09-14T18:27:47+00:00" - }, - { - "name": "dhii/data-container-interface", - "version": "v0.2.1-alpha1", - "source": { - "type": "git", - "url": "https://github.com/Dhii/data-container-interface.git", - "reference": "6be46e427184b95785d9dd563d6acf2e0700cc31" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/data-container-interface/zipball/6be46e427184b95785d9dd563d6acf2e0700cc31", - "reference": "6be46e427184b95785d9dd563d6acf2e0700cc31", - "shasum": "" - }, - "require": { - "dhii/exception-interface": "^0.1 | ^0.2", - "dhii/factory-interface": "^0.1-alpha1", - "php": "^5.3 | ^7.0", - "psr/container": "^1.0" - }, - "require-dev": { - "codeclimate/php-test-reporter": "<=0.3.2", - "dhii/php-cs-fixer-config": "dev-php-5.3", - "dhii/stringable-interface": "^0.1", - "phpunit/phpunit": "^4.8", - "ptrofimov/xpmock": "^1.1" - }, - "suggest": { - "dhii/stringable-interface": "To be able to pass Stringables as keys" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Data\\Container\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "Interfaces for working with data containers", - "support": { - "issues": "https://github.com/Dhii/data-container-interface/issues", - "source": "https://github.com/Dhii/data-container-interface/tree/v0.2.1-alpha1" - }, - "abandoned": "dhii/collections-interface", - "time": "2019-05-10T14:17:29+00:00" - }, - { - "name": "dhii/exception-interface", - "version": "v0.2", - "source": { - "type": "git", - "url": "https://github.com/Dhii/exception-interface.git", - "reference": "b69feebf7cb2879cd43977a03342e2393b73f7fb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/exception-interface/zipball/b69feebf7cb2879cd43977a03342e2393b73f7fb", - "reference": "b69feebf7cb2879cd43977a03342e2393b73f7fb", - "shasum": "" - }, - "require": { - "dhii/stringable-interface": "^0.1", - "php": "^5.3 | ^7.0" - }, - "require-dev": { - "codeclimate/php-test-reporter": "<=0.3.2", - "dhii/php-cs-fixer-config": "dev-php-5.3", - "phpunit/phpunit": "^4.8", - "ptrofimov/xpmock": "^1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Exception\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "Interfaces for most common exceptions", - "support": { - "issues": "https://github.com/Dhii/exception-interface/issues", - "source": "https://github.com/Dhii/exception-interface/tree/develop" - }, - "time": "2018-08-29T10:42:04+00:00" - }, - { - "name": "dhii/factory-interface", - "version": "v0.1", - "source": { - "type": "git", - "url": "https://github.com/Dhii/factory-interface.git", - "reference": "b8d217aec8838e64ccaa770cb03dc164bf6f0515" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/factory-interface/zipball/b8d217aec8838e64ccaa770cb03dc164bf6f0515", - "reference": "b8d217aec8838e64ccaa770cb03dc164bf6f0515", - "shasum": "" - }, - "require": { - "dhii/exception-interface": "^0.1|^0.2", - "php": "^5.3 | ^7.0" - }, - "require-dev": { - "codeclimate/php-test-reporter": "<=0.3.2", - "dhii/php-cs-fixer-config": "dev-php-5.3", - "dhii/stringable-interface": "^0.1", - "phpunit/phpunit": "^4.8", - "psr/container": "^1.0", - "ptrofimov/xpmock": "^1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Factory\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "Interfaces for working with factories.", - "support": { - "issues": "https://github.com/Dhii/factory-interface/issues", - "source": "https://github.com/Dhii/factory-interface/tree/master" - }, - "abandoned": true, - "time": "2018-08-29T11:15:09+00:00" + "time": "2020-10-22T10:20:26+00:00" }, { "name": "dhii/module-interface", @@ -365,119 +189,8 @@ } ], "description": "Interfaces for modules", - "support": { - "issues": "https://github.com/Dhii/module-interface/issues", - "source": "https://github.com/Dhii/module-interface/tree/v0.3.0-alpha2" - }, "time": "2021-08-23T08:23:01+00:00" }, - { - "name": "dhii/stringable-interface", - "version": "v0.1", - "source": { - "type": "git", - "url": "https://github.com/Dhii/stringable-interface.git", - "reference": "b6653905eef2ebf377749feb80a6d18abbe913ef" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/stringable-interface/zipball/b6653905eef2ebf377749feb80a6d18abbe913ef", - "reference": "b6653905eef2ebf377749feb80a6d18abbe913ef", - "shasum": "" - }, - "require": { - "php": "^5.3 | ^7.0" - }, - "require-dev": { - "codeclimate/php-test-reporter": "<=0.3.2", - "dhii/php-cs-fixer-config": "dev-php-5.3", - "phpunit/phpunit": "^4.8", - "ptrofimov/xpmock": "^1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Dhii\\Util\\String\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "Interoperability interface for objects that can be cast to string", - "support": { - "issues": "https://github.com/Dhii/stringable-interface/issues", - "source": "https://github.com/Dhii/stringable-interface/tree/master" - }, - "abandoned": "symfony/polyfill-php80", - "time": "2017-01-23T15:08:20+00:00" - }, - { - "name": "dhii/wp-containers", - "version": "v0.1.0-alpha1", - "source": { - "type": "git", - "url": "https://github.com/Dhii/wp-containers.git", - "reference": "e91a6f741622770ed724a2b594145fa917811f0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/wp-containers/zipball/e91a6f741622770ed724a2b594145fa917811f0c", - "reference": "e91a6f741622770ed724a2b594145fa917811f0c", - "shasum": "" - }, - "require": { - "dhii/data-container-interface": "^0.2.1-alpha1", - "php": "^7.0 | ^8.0", - "psr/container": "^1.0" - }, - "require-dev": { - "brain/monkey": "^2", - "gmazzap/andrew": "^1.1", - "phpunit/phpunit": "^6", - "slevomat/coding-standard": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Wp\\Containers\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "PSR-11 container implementations that wrap some WP features, for convenience and interoperability.", - "keywords": [ - "container", - "dependency injection", - "di", - "wordpress" - ], - "support": { - "issues": "https://github.com/Dhii/wp-containers/issues", - "source": "https://github.com/Dhii/wp-containers/tree/v0.1.0-alpha1" - }, - "abandoned": "wp-oop/containers", - "time": "2019-05-10T15:04:22+00:00" - }, { "name": "psr/container", "version": "1.0.0", @@ -525,10 +238,6 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" - }, "time": "2017-02-14T16:28:37+00:00" }, { @@ -576,9 +285,6 @@ "psr", "psr-3" ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, "time": "2021-05-03T11:20:27+00:00" }, { @@ -619,11 +325,56 @@ } ], "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "wikimedia/composer-merge-plugin", + "version": "v1.4.1", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/composer-merge-plugin.git", + "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100", + "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": ">=5.3.2" + }, + "require-dev": { + "composer/composer": "~1.0.0", + "jakub-onderka/php-parallel-lint": "~0.8", + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "~2.1.0" + }, + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + }, + "class": "Wikimedia\\Composer\\MergePlugin" + }, + "autoload": { + "psr-4": { + "Wikimedia\\Composer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bryan Davis", + "email": "bd808@wikimedia.org" + } + ], + "description": "Composer plugin to merge multiple composer.json files", + "time": "2017-04-25T02:31:25+00:00" } ], "packages-dev": [ @@ -669,10 +420,6 @@ "runkit", "testing" ], - "support": { - "issues": "https://github.com/antecedent/patchwork/issues", - "source": "https://github.com/antecedent/patchwork/tree/2.1.15" - }, "time": "2021-08-22T08:00:13+00:00" }, { @@ -739,10 +486,6 @@ "test", "testing" ], - "support": { - "issues": "https://github.com/Brain-WP/BrainMonkey/issues", - "source": "https://github.com/Brain-WP/BrainMonkey" - }, "time": "2020-10-13T17:56:14+00:00" }, { @@ -809,10 +552,6 @@ "stylecheck", "tests" ], - "support": { - "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", - "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" - }, "time": "2020-12-07T18:04:37+00:00" }, { @@ -864,10 +603,6 @@ "constructor", "instantiate" ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" - }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -929,10 +664,6 @@ "keywords": [ "test" ], - "support": { - "issues": "https://github.com/hamcrest/hamcrest-php/issues", - "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" - }, "time": "2020-07-09T08:09:16+00:00" }, { @@ -998,10 +729,6 @@ "test double", "testing" ], - "support": { - "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.3.4" - }, "time": "2021-02-24T09:51:00+00:00" }, { @@ -1050,10 +777,6 @@ "object", "object graph" ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" - }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", @@ -1115,10 +838,6 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" - }, "time": "2018-07-08T19:23:20+00:00" }, { @@ -1166,10 +885,6 @@ } ], "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/master" - }, "time": "2018-07-08T19:19:57+00:00" }, { @@ -1228,10 +943,6 @@ "phpcs", "standards" ], - "support": { - "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues", - "source": "https://github.com/PHPCompatibility/PHPCompatibility" - }, "time": "2019-12-27T09:44:58+00:00" }, { @@ -1284,10 +995,6 @@ "polyfill", "standards" ], - "support": { - "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", - "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" - }, "time": "2021-02-15T10:24:51+00:00" }, { @@ -1338,10 +1045,6 @@ "standards", "wordpress" ], - "support": { - "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", - "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" - }, "time": "2021-07-21T11:09:57+00:00" }, { @@ -1391,10 +1094,6 @@ "reflection", "static analysis" ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master" - }, "time": "2020-04-27T09:25:28+00:00" }, { @@ -1447,10 +1146,6 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x" - }, "time": "2019-12-28T18:55:12+00:00" }, { @@ -1498,10 +1193,6 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/0.7.2" - }, "time": "2019-08-22T18:11:29+00:00" }, { @@ -1565,10 +1256,6 @@ "spy", "stub" ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.10.3" - }, "time": "2020-03-05T15:02:03+00:00" }, { @@ -1632,10 +1319,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master" - }, "time": "2018-10-31T16:06:48+00:00" }, { @@ -1686,10 +1369,6 @@ "filesystem", "iterator" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1737,10 +1416,6 @@ "keywords": [ "template" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" - }, "time": "2015-06-21T13:50:34+00:00" }, { @@ -1790,10 +1465,6 @@ "keywords": [ "timer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1849,10 +1520,6 @@ "keywords": [ "tokenizer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1944,10 +1611,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20" - }, "time": "2020-01-08T08:45:45+00:00" }, { @@ -1993,10 +1656,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2067,10 +1726,6 @@ "compare", "equality" ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2133,10 +1788,6 @@ "unidiff", "unified diff" ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2196,10 +1847,6 @@ "environment", "hhvm" ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2273,10 +1920,6 @@ "export", "exporter" ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2334,10 +1977,6 @@ "keywords": [ "global state" ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0" - }, "time": "2017-04-27T15:39:26+00:00" }, { @@ -2385,10 +2024,6 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2440,10 +2075,6 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2503,10 +2134,6 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2555,10 +2182,6 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2608,10 +2231,6 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" - }, "time": "2016-10-03T07:35:21+00:00" }, { @@ -2663,11 +2282,6 @@ "phpcs", "standards" ], - "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" - }, "time": "2021-04-09T00:54:41+00:00" }, { @@ -2730,9 +2344,6 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2787,10 +2398,6 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/master" - }, "time": "2019-06-13T22:48:21+00:00" }, { @@ -2840,10 +2447,6 @@ "check", "validate" ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" - }, "time": "2020-07-08T17:02:28+00:00" }, { @@ -2884,10 +2487,6 @@ "woocommerce", "wordpress" ], - "support": { - "issues": "https://github.com/woocommerce/woocommerce-sniffs/issues", - "source": "https://github.com/woocommerce/woocommerce-sniffs/tree/0.1.1" - }, "time": "2021-07-29T17:25:16+00:00" }, { @@ -2934,11 +2533,6 @@ "standards", "wordpress" ], - "support": { - "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues", - "source": "https://github.com/WordPress/WordPress-Coding-Standards", - "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki" - }, "time": "2020-05-13T23:57:56+00:00" } ], @@ -2948,8 +2542,9 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { + "php": "^7.1 | ^8.0", "ext-json": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "1.1.0" } From b56484e46ca9e934c6479c96c41db7548885afbc Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 17:17:28 +0200 Subject: [PATCH 14/42] Bring remaining classes to comply with PSR-4 --- ...disclaimers.php => MessagesDisclaimers.php} | 0 ...class-compatmodule.php => CompatModule.php} | 2 +- ...s-deactivatenote.php => DeactivateNote.php} | 6 +++--- .../{class-mockgateway.php => MockGateway.php} | 2 +- .../{class-ppechelper.php => PpecHelper.php} | 2 +- ...ttingsimporter.php => SettingsImporter.php} | 4 ++-- ...onshandler.php => SubscriptionsHandler.php} | 18 +++++++++--------- modules/ppcp-onboarding/services.php | 6 +++--- ...roller.php => OnboardingRestController.php} | 2 +- .../src/{class-renderer.php => Renderer.php} | 0 ...reportmodule.php => StatusReportModule.php} | 0 ...gspageassets.php => SettingsPageAssets.php} | 0 ...provider.php => TransactionUrlProvider.php} | 0 ...s-settingsstatus.php => SettingsStatus.php} | 0 14 files changed, 21 insertions(+), 21 deletions(-) rename modules/ppcp-button/src/Helper/{class-messagesdisclaimers.php => MessagesDisclaimers.php} (100%) rename modules/ppcp-compat/src/{class-compatmodule.php => CompatModule.php} (97%) rename modules/ppcp-compat/src/PPEC/{class-deactivatenote.php => DeactivateNote.php} (93%) rename modules/ppcp-compat/src/PPEC/{class-mockgateway.php => MockGateway.php} (95%) rename modules/ppcp-compat/src/PPEC/{class-ppechelper.php => PpecHelper.php} (99%) rename modules/ppcp-compat/src/PPEC/{class-settingsimporter.php => SettingsImporter.php} (98%) rename modules/ppcp-compat/src/PPEC/{class-subscriptionshandler.php => SubscriptionsHandler.php} (90%) rename modules/ppcp-onboarding/src/{class-onboarding-rest-controller.php => OnboardingRestController.php} (99%) rename modules/ppcp-status-report/src/{class-renderer.php => Renderer.php} (100%) rename modules/ppcp-status-report/src/{class-statusreportmodule.php => StatusReportModule.php} (100%) rename modules/ppcp-wc-gateway/src/Assets/{class-settingspageassets.php => SettingsPageAssets.php} (100%) rename modules/ppcp-wc-gateway/src/Gateway/{class-transactionurlprovider.php => TransactionUrlProvider.php} (100%) rename modules/ppcp-wc-gateway/src/Helper/{class-settingsstatus.php => SettingsStatus.php} (100%) diff --git a/modules/ppcp-button/src/Helper/class-messagesdisclaimers.php b/modules/ppcp-button/src/Helper/MessagesDisclaimers.php similarity index 100% rename from modules/ppcp-button/src/Helper/class-messagesdisclaimers.php rename to modules/ppcp-button/src/Helper/MessagesDisclaimers.php diff --git a/modules/ppcp-compat/src/class-compatmodule.php b/modules/ppcp-compat/src/CompatModule.php similarity index 97% rename from modules/ppcp-compat/src/class-compatmodule.php rename to modules/ppcp-compat/src/CompatModule.php index 17102b297..bac88c3d2 100644 --- a/modules/ppcp-compat/src/class-compatmodule.php +++ b/modules/ppcp-compat/src/CompatModule.php @@ -13,7 +13,7 @@ use Dhii\Container\ServiceProvider; use Dhii\Modular\Module\ModuleInterface; use Interop\Container\ServiceProviderInterface; use Psr\Container\ContainerInterface; -use WooCommerce\PayPalCommerce\Compat\PPEC\PPECHelper; +use WooCommerce\PayPalCommerce\Compat\PPEC\PpecHelper; /** * Class CompatModule diff --git a/modules/ppcp-compat/src/PPEC/class-deactivatenote.php b/modules/ppcp-compat/src/PPEC/DeactivateNote.php similarity index 93% rename from modules/ppcp-compat/src/PPEC/class-deactivatenote.php rename to modules/ppcp-compat/src/PPEC/DeactivateNote.php index 07e0dbe1b..e832c5dc8 100644 --- a/modules/ppcp-compat/src/PPEC/class-deactivatenote.php +++ b/modules/ppcp-compat/src/PPEC/DeactivateNote.php @@ -29,7 +29,7 @@ class DeactivateNote { * Note initialization. */ public static function init() { - if ( ! PPECHelper::is_plugin_active() ) { + if ( ! PpecHelper::is_plugin_active() ) { self::maybe_mark_note_as_actioned(); return; } @@ -47,7 +47,7 @@ class DeactivateNote { * @return Automatic\WooCommerce\Admin\Notes\Note */ public static function get_note() { - if ( PPECHelper::site_has_ppec_subscriptions() ) { + if ( PpecHelper::site_has_ppec_subscriptions() ) { $msg = __( 'As of 1 Sept 2021, PayPal Checkout will be officially retired from WooCommerce.com, and support for this product will end as of 1 March 2022. PayPal Payments can now handle all your subscription renewals even if they were first created using PayPal Checkout. To fully switch over, all you need to do is deactivate and/or remove the PayPal Checkout plugin from your store.', 'woocommerce-paypal-payments' @@ -70,7 +70,7 @@ class DeactivateNote { $note->add_action( 'deactivate-paypal-checkout-plugin', __( 'Deactivate PayPal Checkout', 'woocommerce-paypal-payments' ), - admin_url( 'plugins.php?action=deactivate&plugin=' . rawurlencode( PPECHelper::PPEC_PLUGIN_FILE ) . '&plugin_status=all&paged=1&_wpnonce=' . wp_create_nonce( 'deactivate-plugin_' . PPECHelper::PPEC_PLUGIN_FILE ) ), + admin_url( 'plugins.php?action=deactivate&plugin=' . rawurlencode( PpecHelper::PPEC_PLUGIN_FILE ) . '&plugin_status=all&paged=1&_wpnonce=' . wp_create_nonce( 'deactivate-plugin_' . PpecHelper::PPEC_PLUGIN_FILE ) ), Note::E_WC_ADMIN_NOTE_UNACTIONED, true ); diff --git a/modules/ppcp-compat/src/PPEC/class-mockgateway.php b/modules/ppcp-compat/src/PPEC/MockGateway.php similarity index 95% rename from modules/ppcp-compat/src/PPEC/class-mockgateway.php rename to modules/ppcp-compat/src/PPEC/MockGateway.php index cc070c048..43d2e65b2 100644 --- a/modules/ppcp-compat/src/PPEC/class-mockgateway.php +++ b/modules/ppcp-compat/src/PPEC/MockGateway.php @@ -18,7 +18,7 @@ class MockGateway extends \WC_Payment_Gateway { * @param string $title Gateway title. */ public function __construct( $title ) { - $this->id = PPECHelper::PPEC_GATEWAY_ID; + $this->id = PpecHelper::PPEC_GATEWAY_ID; $this->title = $title; $this->method_title = $this->title; $this->description = ''; diff --git a/modules/ppcp-compat/src/PPEC/class-ppechelper.php b/modules/ppcp-compat/src/PPEC/PpecHelper.php similarity index 99% rename from modules/ppcp-compat/src/PPEC/class-ppechelper.php rename to modules/ppcp-compat/src/PPEC/PpecHelper.php index 0f13aafe5..2adc9f118 100644 --- a/modules/ppcp-compat/src/PPEC/class-ppechelper.php +++ b/modules/ppcp-compat/src/PPEC/PpecHelper.php @@ -11,7 +11,7 @@ namespace WooCommerce\PayPalCommerce\Compat\PPEC; * Helper class with various constants associated to the PayPal Express Checkout plugin, as well as methods for figuring * out the status of the gateway. */ -class PPECHelper { +class PpecHelper { /** * The PayPal Express Checkout gateway ID. diff --git a/modules/ppcp-compat/src/PPEC/class-settingsimporter.php b/modules/ppcp-compat/src/PPEC/SettingsImporter.php similarity index 98% rename from modules/ppcp-compat/src/PPEC/class-settingsimporter.php rename to modules/ppcp-compat/src/PPEC/SettingsImporter.php index f2c539a28..25f1721a9 100644 --- a/modules/ppcp-compat/src/PPEC/class-settingsimporter.php +++ b/modules/ppcp-compat/src/PPEC/SettingsImporter.php @@ -38,7 +38,7 @@ class SettingsImporter { */ public function __construct( Settings $settings ) { $this->ppcp_settings = $settings; - $this->ppec_settings = (array) get_option( PPECHelper::PPEC_SETTINGS_OPTION_NAME, array() ); + $this->ppec_settings = (array) get_option( PpecHelper::PPEC_SETTINGS_OPTION_NAME, array() ); } /** @@ -48,7 +48,7 @@ class SettingsImporter { */ public function maybe_hook() { // Import settings the first time the PPCP option is created. - if ( PPECHelper::is_gateway_available() && false === get_option( $this->ppcp_settings::KEY ) ) { + if ( PpecHelper::is_gateway_available() && false === get_option( $this->ppcp_settings::KEY ) ) { add_action( 'add_option_' . $this->ppcp_settings::KEY, array( $this, 'import_settings' ), 10, 2 ); } } diff --git a/modules/ppcp-compat/src/PPEC/class-subscriptionshandler.php b/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php similarity index 90% rename from modules/ppcp-compat/src/PPEC/class-subscriptionshandler.php rename to modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php index 0881c40a5..43889c2bc 100644 --- a/modules/ppcp-compat/src/PPEC/class-subscriptionshandler.php +++ b/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php @@ -51,7 +51,7 @@ class SubscriptionsHandler { * @return void */ public function maybe_hook() { - if ( ! PPECHelper::use_ppec_compat_layer_for_subscriptions() ) { + if ( ! PpecHelper::use_ppec_compat_layer_for_subscriptions() ) { return; } @@ -62,7 +62,7 @@ class SubscriptionsHandler { add_filter( 'woocommerce_paypal_payments_valid_payment_token_types', array( $this, 'add_billing_agreement_as_token_type' ) ); // Process PPEC renewals through PayPal Payments. - add_action( 'woocommerce_scheduled_subscription_payment_' . PPECHelper::PPEC_GATEWAY_ID, array( $this, 'process_renewal' ), 10, 2 ); + add_action( 'woocommerce_scheduled_subscription_payment_' . PpecHelper::PPEC_GATEWAY_ID, array( $this, 'process_renewal' ), 10, 2 ); } /** @@ -74,8 +74,8 @@ class SubscriptionsHandler { * @return array */ public function add_mock_ppec_gateway( $gateways ) { - if ( ! isset( $gateways[ PPECHelper::PPEC_GATEWAY_ID ] ) && $this->should_mock_ppec_gateway() ) { - $gateways[ PPECHelper::PPEC_GATEWAY_ID ] = $this->mock_gateway; + if ( ! isset( $gateways[ PpecHelper::PPEC_GATEWAY_ID ] ) && $this->should_mock_ppec_gateway() ) { + $gateways[ PpecHelper::PPEC_GATEWAY_ID ] = $this->mock_gateway; } return $gateways; @@ -121,7 +121,7 @@ class SubscriptionsHandler { * @return null|PaymentToken */ public function use_billing_agreement_as_token( $token, $customer, $order ) { - if ( PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() && wcs_order_contains_renewal( $order ) ) { + if ( PpecHelper::PPEC_GATEWAY_ID === $order->get_payment_method() && wcs_order_contains_renewal( $order ) ) { $billing_agreement_id = $order->get_meta( '_ppec_billing_agreement_id', true ); if ( $billing_agreement_id ) { @@ -154,21 +154,21 @@ class SubscriptionsHandler { if ( wcs_is_view_subscription_page() ) { $subscription = wcs_get_subscription( absint( get_query_var( 'view-subscription' ) ) ); - return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } // Changing payment method? if ( is_wc_endpoint_url( 'order-pay' ) && isset( $_GET['change_payment_method'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended $subscription = wcs_get_subscription( absint( get_query_var( 'order-pay' ) ) ); - return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } // Early renew (via modal). if ( isset( $_GET['process_early_renewal'], $_GET['subscription_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended $subscription = wcs_get_subscription( absint( $_GET['subscription_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended - return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } } @@ -192,7 +192,7 @@ class SubscriptionsHandler { if ( in_array( get_current_screen()->id, array( 'shop_subscription', 'shop_order' ), true ) ) { $order = wc_get_order( $GLOBALS['post']->ID ); - return ( $order && PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() ); + return ( $order && PpecHelper::PPEC_GATEWAY_ID === $order->get_payment_method() ); } } diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php index f2836d8af..333268302 100644 --- a/modules/ppcp-onboarding/services.php +++ b/modules/ppcp-onboarding/services.php @@ -19,7 +19,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache; use WooCommerce\PayPalCommerce\Onboarding\Assets\OnboardingAssets; use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint; use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingRenderer; -use WooCommerce\PayPalCommerce\Onboarding\Onboarding_REST_Controller; +use WooCommerce\PayPalCommerce\Onboarding\OnboardingRestController; return array( 'api.sandbox-host' => static function ( ContainerInterface $container ): string { @@ -210,7 +210,7 @@ return array( $partner_referrals_sandbox ); }, - 'onboarding.rest' => static function( $container ) : Onboarding_REST_Controller { - return new Onboarding_REST_Controller( $container ); + 'onboarding.rest' => static function( $container ) : OnboardingRestController { + return new OnboardingRestController( $container ); }, ); diff --git a/modules/ppcp-onboarding/src/class-onboarding-rest-controller.php b/modules/ppcp-onboarding/src/OnboardingRestController.php similarity index 99% rename from modules/ppcp-onboarding/src/class-onboarding-rest-controller.php rename to modules/ppcp-onboarding/src/OnboardingRestController.php index 1cbc77794..fe65f29cf 100644 --- a/modules/ppcp-onboarding/src/class-onboarding-rest-controller.php +++ b/modules/ppcp-onboarding/src/OnboardingRestController.php @@ -16,7 +16,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; /** * Exposes and handles REST routes related to onboarding. */ -class Onboarding_REST_Controller { +class OnboardingRestController { /** * REST namespace. diff --git a/modules/ppcp-status-report/src/class-renderer.php b/modules/ppcp-status-report/src/Renderer.php similarity index 100% rename from modules/ppcp-status-report/src/class-renderer.php rename to modules/ppcp-status-report/src/Renderer.php diff --git a/modules/ppcp-status-report/src/class-statusreportmodule.php b/modules/ppcp-status-report/src/StatusReportModule.php similarity index 100% rename from modules/ppcp-status-report/src/class-statusreportmodule.php rename to modules/ppcp-status-report/src/StatusReportModule.php diff --git a/modules/ppcp-wc-gateway/src/Assets/class-settingspageassets.php b/modules/ppcp-wc-gateway/src/Assets/SettingsPageAssets.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Assets/class-settingspageassets.php rename to modules/ppcp-wc-gateway/src/Assets/SettingsPageAssets.php diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-transactionurlprovider.php b/modules/ppcp-wc-gateway/src/Gateway/TransactionUrlProvider.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Gateway/class-transactionurlprovider.php rename to modules/ppcp-wc-gateway/src/Gateway/TransactionUrlProvider.php diff --git a/modules/ppcp-wc-gateway/src/Helper/class-settingsstatus.php b/modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Helper/class-settingsstatus.php rename to modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php From 6652ff317f0262c4907570e40e2a3e19e2107c3c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 26 Aug 2021 17:17:39 +0200 Subject: [PATCH 15/42] Add package definition to module --- .idea/php.xml | 17 ----------------- modules/ppcp-status-report/composer.json | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 modules/ppcp-status-report/composer.json diff --git a/.idea/php.xml b/.idea/php.xml index 9eda782e5..590085524 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -61,23 +61,6 @@ - - - - - - - - - - - - - - - - - diff --git a/modules/ppcp-status-report/composer.json b/modules/ppcp-status-report/composer.json new file mode 100644 index 000000000..c1738cf6e --- /dev/null +++ b/modules/ppcp-status-report/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-status-report", + "type": "dhii-mod", + "description": "Status report module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.3.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\StatusReport\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} From 28005c9bb0d891dee726f8ee406e86bea4ed9105 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 07:46:24 +0200 Subject: [PATCH 16/42] Add missing module Composer config --- modules/ppcp-compat/composer.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 modules/ppcp-compat/composer.json diff --git a/modules/ppcp-compat/composer.json b/modules/ppcp-compat/composer.json new file mode 100644 index 000000000..50084eaf9 --- /dev/null +++ b/modules/ppcp-compat/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-compat", + "type": "dhii-mod", + "description": "Compatibility module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.3.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Compat\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} From 2fa6d6e2f3a23ee88e1b0217b6a13bc852f78749 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 07:55:48 +0200 Subject: [PATCH 17/42] Use Composer v1 on CI --- .github/workflows/php.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index ae058ece2..c15e1fa86 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -17,6 +17,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} + tools: composer:v1 - name: Packagist.com Auth run: composer config --global --auth http-basic.repo.packagist.com token ${{ secrets.PACKAGIST_TOKEN }} From 3cfe111b4b410132d13eeb13b282d03d8a04bcf9 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 07:57:01 +0200 Subject: [PATCH 18/42] Fix typo in command --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c15e1fa86..f6c76df8e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,4 +34,4 @@ jobs: run: vendor/bin/phpunit - name: Run PHPCS - run: ./vendor/bin/phpcs--runtime-set ignore_warnings_on_exit 1 src modules woocommerce-paypal-payments.php --extensions=php + run: ./vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 src modules woocommerce-paypal-payments.php --extensions=php From 3a72a73ae37eec51e34faa124c0f611ee666a006 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 08:08:41 +0200 Subject: [PATCH 19/42] Auto-fix PHPCS --- modules/ppcp-admin-notices/src/AdminNotices.php | 4 ++-- modules/ppcp-api-client/src/ApiModule.php | 4 ++-- modules/ppcp-button/src/ButtonModule.php | 4 ++-- modules/ppcp-onboarding/src/OnboardingModule.php | 4 ++-- modules/ppcp-session/src/SessionModule.php | 4 ++-- modules/ppcp-subscription/src/SubscriptionModule.php | 4 ++-- modules/ppcp-wc-gateway/src/WcGatewayModule.php | 4 ++-- modules/ppcp-webhooks/src/WebhookModule.php | 4 ++-- modules/woocommerce-logging/src/WooCommerceLoggingModule.php | 4 ++-- src/PluginModule.php | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/ppcp-admin-notices/src/AdminNotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php index 5ff22d51c..e437ca5e3 100644 --- a/modules/ppcp-admin-notices/src/AdminNotices.php +++ b/modules/ppcp-admin-notices/src/AdminNotices.php @@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface; class AdminNotices implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -30,7 +30,7 @@ class AdminNotices implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-api-client/src/ApiModule.php b/modules/ppcp-api-client/src/ApiModule.php index f2d35f742..615e6f16b 100644 --- a/modules/ppcp-api-client/src/ApiModule.php +++ b/modules/ppcp-api-client/src/ApiModule.php @@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface; class ApiModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -30,7 +30,7 @@ class ApiModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-button/src/ButtonModule.php b/modules/ppcp-button/src/ButtonModule.php index 5de8d712a..2ad1f09e2 100644 --- a/modules/ppcp-button/src/ButtonModule.php +++ b/modules/ppcp-button/src/ButtonModule.php @@ -27,7 +27,7 @@ class ButtonModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -37,7 +37,7 @@ class ButtonModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { diff --git a/modules/ppcp-onboarding/src/OnboardingModule.php b/modules/ppcp-onboarding/src/OnboardingModule.php index 90126c93c..daa613cdf 100644 --- a/modules/ppcp-onboarding/src/OnboardingModule.php +++ b/modules/ppcp-onboarding/src/OnboardingModule.php @@ -24,7 +24,7 @@ use Psr\Container\ContainerInterface; class OnboardingModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -34,7 +34,7 @@ class OnboardingModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { diff --git a/modules/ppcp-session/src/SessionModule.php b/modules/ppcp-session/src/SessionModule.php index 1cd7e198d..479efc2ec 100644 --- a/modules/ppcp-session/src/SessionModule.php +++ b/modules/ppcp-session/src/SessionModule.php @@ -21,7 +21,7 @@ use Psr\Container\ContainerInterface; class SessionModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -31,7 +31,7 @@ class SessionModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-subscription/src/SubscriptionModule.php b/modules/ppcp-subscription/src/SubscriptionModule.php index 0456971b3..1d7eb8eb0 100644 --- a/modules/ppcp-subscription/src/SubscriptionModule.php +++ b/modules/ppcp-subscription/src/SubscriptionModule.php @@ -28,7 +28,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException; class SubscriptionModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -38,7 +38,7 @@ class SubscriptionModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/ppcp-wc-gateway/src/WcGatewayModule.php b/modules/ppcp-wc-gateway/src/WcGatewayModule.php index 8ae82940d..22a9d6acd 100644 --- a/modules/ppcp-wc-gateway/src/WcGatewayModule.php +++ b/modules/ppcp-wc-gateway/src/WcGatewayModule.php @@ -37,7 +37,7 @@ use Psr\Container\ContainerInterface; class WcGatewayModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -47,7 +47,7 @@ class WcGatewayModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { $this->register_payment_gateways( $container ); diff --git a/modules/ppcp-webhooks/src/WebhookModule.php b/modules/ppcp-webhooks/src/WebhookModule.php index 6ba7ede7e..6b849c489 100644 --- a/modules/ppcp-webhooks/src/WebhookModule.php +++ b/modules/ppcp-webhooks/src/WebhookModule.php @@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface; class WebhookModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -30,7 +30,7 @@ class WebhookModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { add_action( diff --git a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php index 0e677c7fa..73cfc8c16 100644 --- a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php +++ b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php @@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface; class WooCommerceLoggingModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( @@ -30,7 +30,7 @@ class WooCommerceLoggingModule implements ModuleInterface { } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { } diff --git a/src/PluginModule.php b/src/PluginModule.php index 51b560ae3..d9fa6ff43 100644 --- a/src/PluginModule.php +++ b/src/PluginModule.php @@ -20,14 +20,14 @@ use Psr\Container\ContainerInterface; class PluginModule implements ModuleInterface { /** - * {@inheritDoc} + * {@inheritDoc} */ public function setup(): ServiceProviderInterface { return new ServiceProvider( array(), array() ); } /** - * {@inheritDoc} + * {@inheritDoc} */ public function run( ContainerInterface $container ): void { } From df185157bdfc77dcc8d4f449a7268a25e19d9ab0 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 08:10:43 +0200 Subject: [PATCH 20/42] Update parameter name Fixes PHPCS --- .../ppcp-admin-notices/src/AdminNotices.php | 6 +-- modules/ppcp-api-client/src/ApiModule.php | 2 +- modules/ppcp-button/src/ButtonModule.php | 16 ++++---- modules/ppcp-compat/src/CompatModule.php | 6 +-- .../ppcp-onboarding/src/OnboardingModule.php | 14 +++---- modules/ppcp-session/src/SessionModule.php | 6 +-- .../src/StatusReportModule.php | 16 ++++---- .../src/SubscriptionModule.php | 32 ++++++++-------- .../ppcp-wc-gateway/src/WcGatewayModule.php | 38 +++++++++---------- modules/ppcp-webhooks/src/WebhookModule.php | 14 +++---- .../src/WooCommerceLoggingModule.php | 2 +- src/PluginModule.php | 2 +- 12 files changed, 77 insertions(+), 77 deletions(-) diff --git a/modules/ppcp-admin-notices/src/AdminNotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php index e437ca5e3..390d5742d 100644 --- a/modules/ppcp-admin-notices/src/AdminNotices.php +++ b/modules/ppcp-admin-notices/src/AdminNotices.php @@ -32,11 +32,11 @@ class AdminNotices implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'admin_notices', - function() use ( $container ) { - $renderer = $container->get( 'admin-notices.renderer' ); + function() use ( $c ) { + $renderer = $c->get( 'admin-notices.renderer' ); $renderer->render(); } ); diff --git a/modules/ppcp-api-client/src/ApiModule.php b/modules/ppcp-api-client/src/ApiModule.php index 615e6f16b..68ec588db 100644 --- a/modules/ppcp-api-client/src/ApiModule.php +++ b/modules/ppcp-api-client/src/ApiModule.php @@ -32,7 +32,7 @@ class ApiModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'woocommerce_after_calculate_totals', function ( \WC_Cart $cart ) { diff --git a/modules/ppcp-button/src/ButtonModule.php b/modules/ppcp-button/src/ButtonModule.php index 2ad1f09e2..8ecc2d871 100644 --- a/modules/ppcp-button/src/ButtonModule.php +++ b/modules/ppcp-button/src/ButtonModule.php @@ -39,15 +39,15 @@ class ButtonModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'wp', - static function () use ( $container ) { + static function () use ( $c ) { if ( is_admin() ) { return; } - $smart_button = $container->get( 'button.smart-button' ); + $smart_button = $c->get( 'button.smart-button' ); /** * The Smart Button. * @@ -58,9 +58,9 @@ class ButtonModule implements ModuleInterface { ); add_action( 'wp_enqueue_scripts', - static function () use ( $container ) { + static function () use ( $c ) { - $smart_button = $container->get( 'button.smart-button' ); + $smart_button = $c->get( 'button.smart-button' ); /** * The Smart Button. * @@ -72,8 +72,8 @@ class ButtonModule implements ModuleInterface { add_filter( 'woocommerce_create_order', - static function ( $value ) use ( $container ) { - $early_order_handler = $container->get( 'button.helper.early-order-handler' ); + static function ( $value ) use ( $c ) { + $early_order_handler = $c->get( 'button.helper.early-order-handler' ); if ( ! is_null( $value ) ) { $value = (int) $value; } @@ -86,7 +86,7 @@ class ButtonModule implements ModuleInterface { } ); - $this->register_ajax_endpoints( $container ); + $this->register_ajax_endpoints( $c ); } /** diff --git a/modules/ppcp-compat/src/CompatModule.php b/modules/ppcp-compat/src/CompatModule.php index bac88c3d2..3b155cff7 100644 --- a/modules/ppcp-compat/src/CompatModule.php +++ b/modules/ppcp-compat/src/CompatModule.php @@ -35,10 +35,10 @@ class CompatModule implements ModuleInterface { /** * Run the compatibility module. * - * @param ContainerInterface|null $container The Container. + * @param ContainerInterface|null $c The Container. */ - public function run( ContainerInterface $container ): void { - $this->initialize_ppec_compat_layer( $container ); + public function run( ContainerInterface $c ): void { + $this->initialize_ppec_compat_layer( $c ); } /** diff --git a/modules/ppcp-onboarding/src/OnboardingModule.php b/modules/ppcp-onboarding/src/OnboardingModule.php index daa613cdf..d05b9509f 100644 --- a/modules/ppcp-onboarding/src/OnboardingModule.php +++ b/modules/ppcp-onboarding/src/OnboardingModule.php @@ -36,9 +36,9 @@ class OnboardingModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { - $asset_loader = $container->get( 'onboarding.assets' ); + $asset_loader = $c->get( 'onboarding.assets' ); /** * The OnboardingAssets. * @@ -61,11 +61,11 @@ class OnboardingModule implements ModuleInterface { add_filter( 'woocommerce_form_field', - static function ( $field, $key, $config ) use ( $container ) { + static function ( $field, $key, $config ) use ( $c ) { if ( 'ppcp_onboarding' !== $config['type'] ) { return $field; } - $renderer = $container->get( 'onboarding.render' ); + $renderer = $c->get( 'onboarding.render' ); $is_production = 'production' === $config['env']; /** @@ -85,8 +85,8 @@ class OnboardingModule implements ModuleInterface { add_action( 'wc_ajax_' . LoginSellerEndpoint::ENDPOINT, - static function () use ( $container ) { - $endpoint = $container->get( 'onboarding.endpoint.login-seller' ); + static function () use ( $c ) { + $endpoint = $c->get( 'onboarding.endpoint.login-seller' ); /** * The ChangeCartEndpoint. @@ -98,7 +98,7 @@ class OnboardingModule implements ModuleInterface { ); // Initialize REST routes at the appropriate time. - $rest_controller = $container->get( 'onboarding.rest' ); + $rest_controller = $c->get( 'onboarding.rest' ); add_action( 'rest_api_init', array( $rest_controller, 'register_routes' ) ); } diff --git a/modules/ppcp-session/src/SessionModule.php b/modules/ppcp-session/src/SessionModule.php index 479efc2ec..854c93bfb 100644 --- a/modules/ppcp-session/src/SessionModule.php +++ b/modules/ppcp-session/src/SessionModule.php @@ -33,11 +33,11 @@ class SessionModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'woocommerce_init', - function () use ( $container ) { - $controller = $container->get( 'session.cancellation.controller' ); + function () use ( $c ) { + $controller = $c->get( 'session.cancellation.controller' ); /** * The Cancel controller. * diff --git a/modules/ppcp-status-report/src/StatusReportModule.php b/modules/ppcp-status-report/src/StatusReportModule.php index 69707dcd3..99440538c 100644 --- a/modules/ppcp-status-report/src/StatusReportModule.php +++ b/modules/ppcp-status-report/src/StatusReportModule.php @@ -38,27 +38,27 @@ class StatusReportModule implements ModuleInterface { /** * {@inheritDoc} * - * @param ContainerInterface $container A services container instance. + * @param ContainerInterface $c A services container instance. */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'woocommerce_system_status_report', - function () use ( $container ) { + function () use ( $c ) { /* @var State $state The state. */ - $state = $container->get( 'onboarding.state' ); + $state = $c->get( 'onboarding.state' ); /* @var Bearer $bearer The bearer. */ - $bearer = $container->get( 'api.bearer' ); + $bearer = $c->get( 'api.bearer' ); /* @var DccApplies $dcc_applies The ddc applies. */ - $dcc_applies = $container->get( 'api.helpers.dccapplies' ); + $dcc_applies = $c->get( 'api.helpers.dccapplies' ); /* @var MessagesApply $messages_apply The messages apply. */ - $messages_apply = $container->get( 'button.helper.messages-apply' ); + $messages_apply = $c->get( 'button.helper.messages-apply' ); /* @var Renderer $renderer The renderer. */ - $renderer = $container->get( 'status-report.renderer' ); + $renderer = $c->get( 'status-report.renderer' ); $items = array( array( diff --git a/modules/ppcp-subscription/src/SubscriptionModule.php b/modules/ppcp-subscription/src/SubscriptionModule.php index 1d7eb8eb0..72febcb20 100644 --- a/modules/ppcp-subscription/src/SubscriptionModule.php +++ b/modules/ppcp-subscription/src/SubscriptionModule.php @@ -40,11 +40,11 @@ class SubscriptionModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'woocommerce_scheduled_subscription_payment_' . PayPalGateway::ID, - function ( $amount, $order ) use ( $container ) { - $this->renew( $order, $container ); + function ( $amount, $order ) use ( $c ) { + $this->renew( $order, $c ); }, 10, 2 @@ -52,8 +52,8 @@ class SubscriptionModule implements ModuleInterface { add_action( 'woocommerce_scheduled_subscription_payment_' . CreditCardGateway::ID, - function ( $amount, $order ) use ( $container ) { - $this->renew( $order, $container ); + function ( $amount, $order ) use ( $c ) { + $this->renew( $order, $c ); }, 10, 2 @@ -61,9 +61,9 @@ class SubscriptionModule implements ModuleInterface { add_action( 'woocommerce_subscription_payment_complete', - function ( $subscription ) use ( $container ) { - $payment_token_repository = $container->get( 'subscription.repository.payment-token' ); - $logger = $container->get( 'woocommerce.logger.woocommerce' ); + function ( $subscription ) use ( $c ) { + $payment_token_repository = $c->get( 'subscription.repository.payment-token' ); + $logger = $c->get( 'woocommerce.logger.woocommerce' ); $this->add_payment_token_id( $subscription, $payment_token_repository, $logger ); } @@ -71,10 +71,10 @@ class SubscriptionModule implements ModuleInterface { add_filter( 'woocommerce_gateway_description', - function ( $description, $id ) use ( $container ) { - $payment_token_repository = $container->get( 'subscription.repository.payment-token' ); - $settings = $container->get( 'wcgateway.settings' ); - $subscription_helper = $container->get( 'subscription.helper' ); + function ( $description, $id ) use ( $c ) { + $payment_token_repository = $c->get( 'subscription.repository.payment-token' ); + $settings = $c->get( 'wcgateway.settings' ); + $subscription_helper = $c->get( 'subscription.helper' ); return $this->display_saved_paypal_payments( $settings, (string) $id, $payment_token_repository, (string) $description, $subscription_helper ); }, @@ -84,10 +84,10 @@ class SubscriptionModule implements ModuleInterface { add_filter( 'woocommerce_credit_card_form_fields', - function ( $default_fields, $id ) use ( $container ) { - $payment_token_repository = $container->get( 'subscription.repository.payment-token' ); - $settings = $container->get( 'wcgateway.settings' ); - $subscription_helper = $container->get( 'subscription.helper' ); + function ( $default_fields, $id ) use ( $c ) { + $payment_token_repository = $c->get( 'subscription.repository.payment-token' ); + $settings = $c->get( 'wcgateway.settings' ); + $subscription_helper = $c->get( 'subscription.helper' ); return $this->display_saved_credit_cards( $settings, $id, $payment_token_repository, $default_fields, $subscription_helper ); }, diff --git a/modules/ppcp-wc-gateway/src/WcGatewayModule.php b/modules/ppcp-wc-gateway/src/WcGatewayModule.php index 22a9d6acd..466a57f76 100644 --- a/modules/ppcp-wc-gateway/src/WcGatewayModule.php +++ b/modules/ppcp-wc-gateway/src/WcGatewayModule.php @@ -49,17 +49,17 @@ class WcGatewayModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { - $this->register_payment_gateways( $container ); - $this->register_order_functionality( $container ); - $this->register_columns( $container ); - $this->register_checkout_paypal_address_preset( $container ); - $this->ajax_gateway_enabler( $container ); + public function run( ContainerInterface $c ): void { + $this->register_payment_gateways( $c ); + $this->register_order_functionality( $c ); + $this->register_columns( $c ); + $this->register_checkout_paypal_address_preset( $c ); + $this->ajax_gateway_enabler( $c ); add_action( 'woocommerce_sections_checkout', - function() use ( $container ) { - $section_renderer = $container->get( 'wcgateway.settings.sections-renderer' ); + function() use ( $c ) { + $section_renderer = $c->get( 'wcgateway.settings.sections-renderer' ); /** * The Section Renderer. * @@ -69,19 +69,19 @@ class WcGatewayModule implements ModuleInterface { } ); - if ( $container->has( 'wcgateway.url' ) ) { + if ( $c->has( 'wcgateway.url' ) ) { $assets = new SettingsPageAssets( - $container->get( 'wcgateway.url' ), - $container->get( 'wcgateway.absolute-path' ), - $container->get( 'api.bearer' ) + $c->get( 'wcgateway.url' ), + $c->get( 'wcgateway.absolute-path' ), + $c->get( 'api.bearer' ) ); $assets->register_assets(); } add_filter( Repository::NOTICES_FILTER, - static function ( $notices ) use ( $container ): array { - $notice = $container->get( 'wcgateway.notice.connect' ); + static function ( $notices ) use ( $c ): array { + $notice = $c->get( 'wcgateway.notice.connect' ); /** * The Connect Admin Notice object. * @@ -91,13 +91,13 @@ class WcGatewayModule implements ModuleInterface { if ( $connect_message ) { $notices[] = $connect_message; } - $authorize_order_action = $container->get( 'wcgateway.notice.authorize-order-action' ); + $authorize_order_action = $c->get( 'wcgateway.notice.authorize-order-action' ); $authorized_message = $authorize_order_action->message(); if ( $authorized_message ) { $notices[] = $authorized_message; } - $settings_renderer = $container->get( 'wcgateway.settings.render' ); + $settings_renderer = $c->get( 'wcgateway.settings.render' ); /** * The settings renderer. * @@ -111,7 +111,7 @@ class WcGatewayModule implements ModuleInterface { ); add_action( 'woocommerce_paypal_commerce_gateway_deactivate', - static function () use ( $container ) { + static function () use ( $c ) { delete_option( Settings::KEY ); delete_option( PayPalRequestIdRepository::KEY ); delete_option( 'woocommerce_' . PayPalGateway::ID . '_settings' ); @@ -121,8 +121,8 @@ class WcGatewayModule implements ModuleInterface { add_action( 'wc_ajax_' . ReturnUrlEndpoint::ENDPOINT, - static function () use ( $container ) { - $endpoint = $container->get( 'wcgateway.endpoint.return-url' ); + static function () use ( $c ) { + $endpoint = $c->get( 'wcgateway.endpoint.return-url' ); /** * The Endpoint. * diff --git a/modules/ppcp-webhooks/src/WebhookModule.php b/modules/ppcp-webhooks/src/WebhookModule.php index 6b849c489..276d8e366 100644 --- a/modules/ppcp-webhooks/src/WebhookModule.php +++ b/modules/ppcp-webhooks/src/WebhookModule.php @@ -32,11 +32,11 @@ class WebhookModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { add_action( 'rest_api_init', - static function () use ( $container ) { - $endpoint = $container->get( 'webhook.endpoint.controller' ); + static function () use ( $c ) { + $endpoint = $c->get( 'webhook.endpoint.controller' ); /** * The Incoming Webhook Endpoint. * @@ -48,8 +48,8 @@ class WebhookModule implements ModuleInterface { add_action( WebhookRegistrar::EVENT_HOOK, - static function () use ( $container ) { - $registrar = $container->get( 'webhook.registrar' ); + static function () use ( $c ) { + $registrar = $c->get( 'webhook.registrar' ); /** * The Webhook Registrar. * @@ -61,8 +61,8 @@ class WebhookModule implements ModuleInterface { add_action( 'woocommerce_paypal_payments_gateway_deactivate', - static function () use ( $container ) { - $registrar = $container->get( 'webhook.registrar' ); + static function () use ( $c ) { + $registrar = $c->get( 'webhook.registrar' ); /** * The Webhook Registrar. * diff --git a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php index 73cfc8c16..29cdad07f 100644 --- a/modules/woocommerce-logging/src/WooCommerceLoggingModule.php +++ b/modules/woocommerce-logging/src/WooCommerceLoggingModule.php @@ -32,7 +32,7 @@ class WooCommerceLoggingModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { } diff --git a/src/PluginModule.php b/src/PluginModule.php index d9fa6ff43..7f405db42 100644 --- a/src/PluginModule.php +++ b/src/PluginModule.php @@ -29,7 +29,7 @@ class PluginModule implements ModuleInterface { /** * {@inheritDoc} */ - public function run( ContainerInterface $container ): void { + public function run( ContainerInterface $c ): void { } /** From 67f327d6c9ea7b9eb745e2a2fd33ee04a92936a0 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 08:10:55 +0200 Subject: [PATCH 21/42] Update PHPStorm configs --- .idea/php.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.idea/php.xml b/.idea/php.xml index 590085524..9eda782e5 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -61,6 +61,23 @@ + + + + + + + + + + + + + + + + + From f6822fa660de0a6061f053c796884b2413d430a1 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 30 Aug 2021 08:18:10 +0200 Subject: [PATCH 22/42] PHPCS now allows omitting inherited param doc --- phpcs.xml.dist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 1b0bf7352..fff53ac50 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -24,6 +24,12 @@ + + + + + + src modules From 1866efc291bfd51827c2f2ce6b5b1fe426717f0f Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Sat, 3 Jul 2021 14:21:20 +0200 Subject: [PATCH 23/42] Revert "Switch GPG keyserver" This reverts commit 25e419ab --- docker/Dockerfile_wp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 6fb845a45..357ff2f1e 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -77,15 +77,6 @@ RUN docker-php-ext-install intl json && \ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - RUN apt-get install -y nodejs -# Install Phive -RUN wget -O phive.phar "https://phar.io/releases/phive.phar" -RUN wget -O phive.phar.asc "https://phar.io/releases/phive.phar.asc" -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 0x9D8A98B29B2D5D79 -RUN gpg --verify phive.phar.asc phive.phar -RUN rm phive.phar.asc && \ - chmod +x phive.phar && \ - mv phive.phar /usr/local/bin/phive - WORKDIR ${BUILD_ROOT_PATH} COPY . ./ From 40b578309ba095b7060bf135e454d93a916b8df7 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 13 Sep 2021 16:24:27 +0200 Subject: [PATCH 24/42] Change case of `PPECHelper` class name --- modules/ppcp-compat/src/CompatModule.php | 2 +- .../ppcp-compat/src/PPEC/DeactivateNote.php | 6 +++--- modules/ppcp-compat/src/PPEC/MockGateway.php | 2 +- .../PPEC/{PpecHelper.php => PPECHelper.php} | 2 +- .../ppcp-compat/src/PPEC/SettingsImporter.php | 4 ++-- .../src/PPEC/SubscriptionsHandler.php | 18 +++++++++--------- 6 files changed, 17 insertions(+), 17 deletions(-) rename modules/ppcp-compat/src/PPEC/{PpecHelper.php => PPECHelper.php} (99%) diff --git a/modules/ppcp-compat/src/CompatModule.php b/modules/ppcp-compat/src/CompatModule.php index 3b155cff7..34429215c 100644 --- a/modules/ppcp-compat/src/CompatModule.php +++ b/modules/ppcp-compat/src/CompatModule.php @@ -13,7 +13,7 @@ use Dhii\Container\ServiceProvider; use Dhii\Modular\Module\ModuleInterface; use Interop\Container\ServiceProviderInterface; use Psr\Container\ContainerInterface; -use WooCommerce\PayPalCommerce\Compat\PPEC\PpecHelper; +use WooCommerce\PayPalCommerce\Compat\PPEC\PPECHelper; /** * Class CompatModule diff --git a/modules/ppcp-compat/src/PPEC/DeactivateNote.php b/modules/ppcp-compat/src/PPEC/DeactivateNote.php index e832c5dc8..07e0dbe1b 100644 --- a/modules/ppcp-compat/src/PPEC/DeactivateNote.php +++ b/modules/ppcp-compat/src/PPEC/DeactivateNote.php @@ -29,7 +29,7 @@ class DeactivateNote { * Note initialization. */ public static function init() { - if ( ! PpecHelper::is_plugin_active() ) { + if ( ! PPECHelper::is_plugin_active() ) { self::maybe_mark_note_as_actioned(); return; } @@ -47,7 +47,7 @@ class DeactivateNote { * @return Automatic\WooCommerce\Admin\Notes\Note */ public static function get_note() { - if ( PpecHelper::site_has_ppec_subscriptions() ) { + if ( PPECHelper::site_has_ppec_subscriptions() ) { $msg = __( 'As of 1 Sept 2021, PayPal Checkout will be officially retired from WooCommerce.com, and support for this product will end as of 1 March 2022. PayPal Payments can now handle all your subscription renewals even if they were first created using PayPal Checkout. To fully switch over, all you need to do is deactivate and/or remove the PayPal Checkout plugin from your store.', 'woocommerce-paypal-payments' @@ -70,7 +70,7 @@ class DeactivateNote { $note->add_action( 'deactivate-paypal-checkout-plugin', __( 'Deactivate PayPal Checkout', 'woocommerce-paypal-payments' ), - admin_url( 'plugins.php?action=deactivate&plugin=' . rawurlencode( PpecHelper::PPEC_PLUGIN_FILE ) . '&plugin_status=all&paged=1&_wpnonce=' . wp_create_nonce( 'deactivate-plugin_' . PpecHelper::PPEC_PLUGIN_FILE ) ), + admin_url( 'plugins.php?action=deactivate&plugin=' . rawurlencode( PPECHelper::PPEC_PLUGIN_FILE ) . '&plugin_status=all&paged=1&_wpnonce=' . wp_create_nonce( 'deactivate-plugin_' . PPECHelper::PPEC_PLUGIN_FILE ) ), Note::E_WC_ADMIN_NOTE_UNACTIONED, true ); diff --git a/modules/ppcp-compat/src/PPEC/MockGateway.php b/modules/ppcp-compat/src/PPEC/MockGateway.php index 43d2e65b2..cc070c048 100644 --- a/modules/ppcp-compat/src/PPEC/MockGateway.php +++ b/modules/ppcp-compat/src/PPEC/MockGateway.php @@ -18,7 +18,7 @@ class MockGateway extends \WC_Payment_Gateway { * @param string $title Gateway title. */ public function __construct( $title ) { - $this->id = PpecHelper::PPEC_GATEWAY_ID; + $this->id = PPECHelper::PPEC_GATEWAY_ID; $this->title = $title; $this->method_title = $this->title; $this->description = ''; diff --git a/modules/ppcp-compat/src/PPEC/PpecHelper.php b/modules/ppcp-compat/src/PPEC/PPECHelper.php similarity index 99% rename from modules/ppcp-compat/src/PPEC/PpecHelper.php rename to modules/ppcp-compat/src/PPEC/PPECHelper.php index 2adc9f118..0f13aafe5 100644 --- a/modules/ppcp-compat/src/PPEC/PpecHelper.php +++ b/modules/ppcp-compat/src/PPEC/PPECHelper.php @@ -11,7 +11,7 @@ namespace WooCommerce\PayPalCommerce\Compat\PPEC; * Helper class with various constants associated to the PayPal Express Checkout plugin, as well as methods for figuring * out the status of the gateway. */ -class PpecHelper { +class PPECHelper { /** * The PayPal Express Checkout gateway ID. diff --git a/modules/ppcp-compat/src/PPEC/SettingsImporter.php b/modules/ppcp-compat/src/PPEC/SettingsImporter.php index 25f1721a9..f2c539a28 100644 --- a/modules/ppcp-compat/src/PPEC/SettingsImporter.php +++ b/modules/ppcp-compat/src/PPEC/SettingsImporter.php @@ -38,7 +38,7 @@ class SettingsImporter { */ public function __construct( Settings $settings ) { $this->ppcp_settings = $settings; - $this->ppec_settings = (array) get_option( PpecHelper::PPEC_SETTINGS_OPTION_NAME, array() ); + $this->ppec_settings = (array) get_option( PPECHelper::PPEC_SETTINGS_OPTION_NAME, array() ); } /** @@ -48,7 +48,7 @@ class SettingsImporter { */ public function maybe_hook() { // Import settings the first time the PPCP option is created. - if ( PpecHelper::is_gateway_available() && false === get_option( $this->ppcp_settings::KEY ) ) { + if ( PPECHelper::is_gateway_available() && false === get_option( $this->ppcp_settings::KEY ) ) { add_action( 'add_option_' . $this->ppcp_settings::KEY, array( $this, 'import_settings' ), 10, 2 ); } } diff --git a/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php b/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php index 43889c2bc..0881c40a5 100644 --- a/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php +++ b/modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php @@ -51,7 +51,7 @@ class SubscriptionsHandler { * @return void */ public function maybe_hook() { - if ( ! PpecHelper::use_ppec_compat_layer_for_subscriptions() ) { + if ( ! PPECHelper::use_ppec_compat_layer_for_subscriptions() ) { return; } @@ -62,7 +62,7 @@ class SubscriptionsHandler { add_filter( 'woocommerce_paypal_payments_valid_payment_token_types', array( $this, 'add_billing_agreement_as_token_type' ) ); // Process PPEC renewals through PayPal Payments. - add_action( 'woocommerce_scheduled_subscription_payment_' . PpecHelper::PPEC_GATEWAY_ID, array( $this, 'process_renewal' ), 10, 2 ); + add_action( 'woocommerce_scheduled_subscription_payment_' . PPECHelper::PPEC_GATEWAY_ID, array( $this, 'process_renewal' ), 10, 2 ); } /** @@ -74,8 +74,8 @@ class SubscriptionsHandler { * @return array */ public function add_mock_ppec_gateway( $gateways ) { - if ( ! isset( $gateways[ PpecHelper::PPEC_GATEWAY_ID ] ) && $this->should_mock_ppec_gateway() ) { - $gateways[ PpecHelper::PPEC_GATEWAY_ID ] = $this->mock_gateway; + if ( ! isset( $gateways[ PPECHelper::PPEC_GATEWAY_ID ] ) && $this->should_mock_ppec_gateway() ) { + $gateways[ PPECHelper::PPEC_GATEWAY_ID ] = $this->mock_gateway; } return $gateways; @@ -121,7 +121,7 @@ class SubscriptionsHandler { * @return null|PaymentToken */ public function use_billing_agreement_as_token( $token, $customer, $order ) { - if ( PpecHelper::PPEC_GATEWAY_ID === $order->get_payment_method() && wcs_order_contains_renewal( $order ) ) { + if ( PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() && wcs_order_contains_renewal( $order ) ) { $billing_agreement_id = $order->get_meta( '_ppec_billing_agreement_id', true ); if ( $billing_agreement_id ) { @@ -154,21 +154,21 @@ class SubscriptionsHandler { if ( wcs_is_view_subscription_page() ) { $subscription = wcs_get_subscription( absint( get_query_var( 'view-subscription' ) ) ); - return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } // Changing payment method? if ( is_wc_endpoint_url( 'order-pay' ) && isset( $_GET['change_payment_method'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended $subscription = wcs_get_subscription( absint( get_query_var( 'order-pay' ) ) ); - return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } // Early renew (via modal). if ( isset( $_GET['process_early_renewal'], $_GET['subscription_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended $subscription = wcs_get_subscription( absint( $_GET['subscription_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended - return ( $subscription && PpecHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); + return ( $subscription && PPECHelper::PPEC_GATEWAY_ID === $subscription->get_payment_method() ); } } @@ -192,7 +192,7 @@ class SubscriptionsHandler { if ( in_array( get_current_screen()->id, array( 'shop_subscription', 'shop_order' ), true ) ) { $order = wc_get_order( $GLOBALS['post']->ID ); - return ( $order && PpecHelper::PPEC_GATEWAY_ID === $order->get_payment_method() ); + return ( $order && PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() ); } } From 9f2496ada0c2e3ca1e4d44d45cd958718911d1d5 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 13 Sep 2021 16:28:47 +0200 Subject: [PATCH 25/42] Change case of `OnboardingRestController` class name --- modules/ppcp-onboarding/services.php | 6 +++--- ...rdingRestController.php => OnboardingRESTController.php} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename modules/ppcp-onboarding/src/{OnboardingRestController.php => OnboardingRESTController.php} (99%) diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php index 333268302..3dad56fdf 100644 --- a/modules/ppcp-onboarding/services.php +++ b/modules/ppcp-onboarding/services.php @@ -19,7 +19,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache; use WooCommerce\PayPalCommerce\Onboarding\Assets\OnboardingAssets; use WooCommerce\PayPalCommerce\Onboarding\Endpoint\LoginSellerEndpoint; use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingRenderer; -use WooCommerce\PayPalCommerce\Onboarding\OnboardingRestController; +use WooCommerce\PayPalCommerce\Onboarding\OnboardingRESTController; return array( 'api.sandbox-host' => static function ( ContainerInterface $container ): string { @@ -210,7 +210,7 @@ return array( $partner_referrals_sandbox ); }, - 'onboarding.rest' => static function( $container ) : OnboardingRestController { - return new OnboardingRestController( $container ); + 'onboarding.rest' => static function( $container ) : OnboardingRESTController { + return new OnboardingRESTController( $container ); }, ); diff --git a/modules/ppcp-onboarding/src/OnboardingRestController.php b/modules/ppcp-onboarding/src/OnboardingRESTController.php similarity index 99% rename from modules/ppcp-onboarding/src/OnboardingRestController.php rename to modules/ppcp-onboarding/src/OnboardingRESTController.php index fe65f29cf..9a5fae43a 100644 --- a/modules/ppcp-onboarding/src/OnboardingRestController.php +++ b/modules/ppcp-onboarding/src/OnboardingRESTController.php @@ -16,7 +16,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; /** * Exposes and handles REST routes related to onboarding. */ -class OnboardingRestController { +class OnboardingRESTController { /** * REST namespace. From 6078de235f3105d5037c346c1a51c7c4b7aa101c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 13 Sep 2021 16:31:09 +0200 Subject: [PATCH 26/42] Change case of `DCCProductStatus` class name --- modules/ppcp-wc-gateway/services.php | 6 +++--- ...ProductStatus.php => DCCProductStatus.php} | 2 +- .../src/Settings/SettingsRenderer.php | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) rename modules/ppcp-wc-gateway/src/Helper/{DccProductStatus.php => DCCProductStatus.php} (98%) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index bd7109a30..8ff38c187 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -25,7 +25,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Endpoint\ReturnUrlEndpoint; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\TransactionUrlProvider; -use WooCommerce\PayPalCommerce\WcGateway\Helper\DccProductStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus; use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; use WooCommerce\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice; use WooCommerce\PayPalCommerce\WcGateway\Notice\ConnectAdminNotice; @@ -1911,11 +1911,11 @@ return array( return new TransactionUrlProvider( $sandbox_url_base, $live_url_base ); }, - 'wcgateway.helper.dcc-product-status' => static function ( ContainerInterface $container ) : DccProductStatus { + 'wcgateway.helper.dcc-product-status' => static function ( ContainerInterface $container ) : DCCProductStatus { $settings = $container->get( 'wcgateway.settings' ); $partner_endpoint = $container->get( 'api.endpoint.partners' ); - return new DccProductStatus( $settings, $partner_endpoint ); + return new DCCProductStatus( $settings, $partner_endpoint ); }, 'button.helper.messages-disclaimers' => static function ( $container ): MessagesDisclaimers { diff --git a/modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php similarity index 98% rename from modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php rename to modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php index 344a7f9da..4430469b1 100644 --- a/modules/ppcp-wc-gateway/src/Helper/DccProductStatus.php +++ b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php @@ -17,7 +17,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; /** * Class DccProductStatus */ -class DccProductStatus { +class DCCProductStatus { /** * Caches the status for the current load. diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php index b08533e05..9ecaded28 100644 --- a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php +++ b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php @@ -15,7 +15,7 @@ use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply; use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; use Psr\Container\ContainerInterface; -use Woocommerce\PayPalCommerce\WcGateway\Helper\DccProductStatus; +use Woocommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus; use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; /** @@ -68,7 +68,7 @@ class SettingsRenderer { /** * The DCC Product Status. * - * @var DccProductStatus + * @var DCCProductStatus */ private $dcc_product_status; @@ -80,17 +80,17 @@ class SettingsRenderer { * @param array $fields The setting fields. * @param DccApplies $dcc_applies Whether DCC gateway can be shown. * @param MessagesApply $messages_apply Whether messages can be shown. - * @param DccProductStatus $dcc_product_status The product status. + * @param DCCProductStatus $dcc_product_status The product status. * @param SettingsStatus $settings_status The Settings status helper. */ public function __construct( - ContainerInterface $settings, - State $state, - array $fields, - DccApplies $dcc_applies, - MessagesApply $messages_apply, - DccProductStatus $dcc_product_status, - SettingsStatus $settings_status + ContainerInterface $settings, + State $state, + array $fields, + DccApplies $dcc_applies, + MessagesApply $messages_apply, + DCCProductStatus $dcc_product_status, + SettingsStatus $settings_status ) { $this->settings = $settings; From 72216ba44a52064783e8f7bfbe6a6afa7ed159e6 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Mon, 13 Sep 2021 16:33:41 +0200 Subject: [PATCH 27/42] Change case of `WCGatewayModule` class name See https://github.com/woocommerce/woocommerce-paypal-payments/pull/235#issuecomment-910082924. --- modules/ppcp-wc-gateway/module.php | 2 +- .../src/{WcGatewayModule.php => WCGatewayModule.php} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/ppcp-wc-gateway/src/{WcGatewayModule.php => WCGatewayModule.php} (99%) diff --git a/modules/ppcp-wc-gateway/module.php b/modules/ppcp-wc-gateway/module.php index 27674e63c..881c93daa 100644 --- a/modules/ppcp-wc-gateway/module.php +++ b/modules/ppcp-wc-gateway/module.php @@ -12,5 +12,5 @@ namespace WooCommerce\PayPalCommerce\WcGateway; use Dhii\Modular\Module\ModuleInterface; return static function (): ModuleInterface { - return new WcGatewayModule(); + return new WCGatewayModule(); }; diff --git a/modules/ppcp-wc-gateway/src/WcGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php similarity index 99% rename from modules/ppcp-wc-gateway/src/WcGatewayModule.php rename to modules/ppcp-wc-gateway/src/WCGatewayModule.php index 466a57f76..8aa13ab5b 100644 --- a/modules/ppcp-wc-gateway/src/WcGatewayModule.php +++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php @@ -34,7 +34,7 @@ use Psr\Container\ContainerInterface; /** * Class WcGatewayModule */ -class WcGatewayModule implements ModuleInterface { +class WCGatewayModule implements ModuleInterface { /** * {@inheritDoc} From 390db65e5ae3859453ac3b9a01b7f8b5b4653b2d Mon Sep 17 00:00:00 2001 From: dinamiko Date: Thu, 30 Sep 2021 12:56:01 +0200 Subject: [PATCH 28/42] add local changes --- wordpress_org_assets/icon-128x128.png | Bin 15835 -> 15834 bytes wordpress_org_assets/icon-256x256.png | Bin 35452 -> 35451 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/wordpress_org_assets/icon-128x128.png b/wordpress_org_assets/icon-128x128.png index 215c72eff1a93c198b3884179208c28a4f4a33c3..c9b216209ff63efd533ea66f06a6558be7036d6c 100644 GIT binary patch delta 13 UcmcazeXE+KGr-S%BkMI=04=Kp=Kufz delta 14 VcmcareY={qGr-TCcO%O+TL3Z-1@r&_ diff --git a/wordpress_org_assets/icon-256x256.png b/wordpress_org_assets/icon-256x256.png index 05e79e17deb690758d3926113e6e804414902bbc..7eabe654eaa8d55fe6bdf41c83e0f66eda21fbe2 100644 GIT binary patch delta 15 Wcmew}h3WScCYH_sKlhES Date: Thu, 30 Sep 2021 16:30:52 +0200 Subject: [PATCH 29/42] Renaming class names --- composer.lock | 1058 ++++++++++------- ...lass-webhookevent.php => WebhookEvent.php} | 0 ...entfactory.php => WebhookEventFactory.php} | 0 modules/ppcp-subscription/services.php | 1 + modules/ppcp-vaulting/composer.json | 17 + ...assets.php => MyAccountPaymentsAssets.php} | 0 ...int.php => DeletePaymentTokenEndpoint.php} | 0 .../src/PaymentTokenRepository.php | 155 +++ ...renderer.php => PaymentTokensRenderer.php} | 0 ...-vaultingmodule.php => VaultingModule.php} | 0 modules/ppcp-wc-gateway/services.php | 1 - ...ce.php => DccWithoutPayPalAdminNotice.php} | 0 ...ematchertrait.php => PageMatcherTrait.php} | 0 ...beendpoint.php => ResubscribeEndpoint.php} | 0 ...ulateendpoint.php => SimulateEndpoint.php} | 0 ...dpoint.php => SimulationStateEndpoint.php} | 0 .../Assets/class-webhooksstatuspageassets.php | 110 -- ...oksimulation.php => WebhookSimulation.php} | 0 ...sstatuspage.php => WebhooksStatusPage.php} | 0 19 files changed, 805 insertions(+), 537 deletions(-) rename modules/ppcp-api-client/src/Entity/{class-webhookevent.php => WebhookEvent.php} (100%) rename modules/ppcp-api-client/src/Factory/{class-webhookeventfactory.php => WebhookEventFactory.php} (100%) create mode 100644 modules/ppcp-vaulting/composer.json rename modules/ppcp-vaulting/src/Assets/{class-myaccountpaymentsassets.php => MyAccountPaymentsAssets.php} (100%) rename modules/ppcp-vaulting/src/Endpoint/{class-deletepaymenttokenendpoint.php => DeletePaymentTokenEndpoint.php} (100%) create mode 100644 modules/ppcp-vaulting/src/PaymentTokenRepository.php rename modules/ppcp-vaulting/src/{class-paymenttokensrenderer.php => PaymentTokensRenderer.php} (100%) rename modules/ppcp-vaulting/src/{class-vaultingmodule.php => VaultingModule.php} (100%) rename modules/ppcp-wc-gateway/src/Notice/{class-dccwithoutpaypaladminnotice.php => DccWithoutPayPalAdminNotice.php} (100%) rename modules/ppcp-wc-gateway/src/Settings/{class-pagematchertrait.php => PageMatcherTrait.php} (100%) rename modules/ppcp-webhooks/src/Endpoint/{class-resubscribeendpoint.php => ResubscribeEndpoint.php} (100%) rename modules/ppcp-webhooks/src/Endpoint/{class-simulateendpoint.php => SimulateEndpoint.php} (100%) rename modules/ppcp-webhooks/src/Endpoint/{class-simulationstateendpoint.php => SimulationStateEndpoint.php} (100%) delete mode 100644 modules/ppcp-webhooks/src/Status/Assets/class-webhooksstatuspageassets.php rename modules/ppcp-webhooks/src/Status/{class-webhooksimulation.php => WebhookSimulation.php} (100%) rename modules/ppcp-webhooks/src/Status/{class-webhooksstatuspage.php => WebhooksStatusPage.php} (100%) diff --git a/composer.lock b/composer.lock index 96c547218..bd8390aa2 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "content-hash": "0b4f7dd4cc7706bd902a10f64dbd095e", @@ -193,27 +193,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -226,7 +221,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -238,7 +233,7 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/log", @@ -603,20 +598,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -668,30 +649,33 @@ }, { "name": "mockery/mockery", - "version": "1.3.4", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "31467aeb3ca3188158613322d66df81cedd86626" + "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/31467aeb3ca3188158613322d66df81cedd86626", - "reference": "31467aeb3ca3188158613322d66df81cedd86626", + "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346", + "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": ">=5.6.0" + "php": "^7.3 || ^8.0" + }, + "conflict": { + "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" + "phpunit/phpunit": "^8.5 || ^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -729,7 +713,7 @@ "test double", "testing" ], - "time": "2021-02-24T09:51:00+00:00" + "time": "2021-09-13T15:28:59+00:00" }, { "name": "myclabs/deep-copy", @@ -777,38 +761,85 @@ "object", "object graph" ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], "time": "2020-11-13T09:40:50+00:00" }, { - "name": "phar-io/manifest", - "version": "1.0.3", + "name": "nikic/php-parser", + "version": "v4.13.0", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "50953a2691a922aa1769461637869a0a2faa3f53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53", + "reference": "50953a2691a922aa1769461637869a0a2faa3f53", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2021-09-20T12:20:58+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -838,24 +869,24 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2018-07-08T19:23:20+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { "name": "phar-io/version", - "version": "2.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + "reference": "bae7c545bef187884426f042434e561ab1ddb182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", + "reference": "bae7c545bef187884426f042434e561ab1ddb182", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -885,7 +916,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2018-07-08T19:19:57+00:00" + "time": "2021-02-23T14:00:09+00:00" }, { "name": "phpcompatibility/php-compatibility", @@ -1049,25 +1080,25 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": ">=7.1" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -1094,45 +1125,41 @@ "reflection", "static analysis" ], - "time": "2020-04-27T09:25:28+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.4", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", - "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", - "webmozart/assert": "^1.0" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" }, "require-dev": { - "doctrine/instantiator": "^1.0.5", - "mockery/mockery": "^1.0", - "phpdocumentor/type-resolver": "0.4.*", - "phpunit/phpunit": "^6.4" + "mockery/mockery": "~1.3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1143,38 +1170,41 @@ { "name": "Mike van Riel", "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-12-28T18:55:12+00:00" + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.0.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", + "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "^7.1", - "mockery/mockery": "~1", - "phpunit/phpunit": "^7.0" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { @@ -1193,37 +1223,37 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2019-08-22T18:11:29+00:00" + "time": "2021-09-17T15:28:14+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.10.3", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "451c3cd1418cf640de218914901e51b064abb093" + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", - "reference": "451c3cd1418cf640de218914901e51b064abb093", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" + "doctrine/instantiator": "^1.2", + "php": "^7.2 || ~8.0, <8.2", + "phpdocumentor/reflection-docblock": "^5.2", + "sebastian/comparator": "^3.0 || ^4.0", + "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5 || ^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" + "phpspec/phpspec": "^6.0 || ^7.0", + "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -1256,44 +1286,48 @@ "spy", "stub" ], - "time": "2020-03-05T15:02:03+00:00" + "time": "2021-09-10T09:02:12+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "9.2.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218", + "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "nikic/php-parser": "^4.12.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-pcov": "*", + "ext-xdebug": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -1319,32 +1353,32 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "time": "2021-09-17T05:39:03+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05" + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05", - "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1369,32 +1403,87 @@ "filesystem", "iterator" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-07-19T06:46:01+00:00" + "time": "2020-09-28T05:57:25+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1416,32 +1505,32 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2020-10-26T05:33:50+00:00" }, { "name": "phpunit/php-timer", - "version": "2.1.3", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1465,119 +1554,59 @@ "keywords": [ "timer" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:20:02+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "3.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2021-07-26T12:15:06+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "9.5.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a", + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.3.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpspec/prophecy": "^1.12.1", + "phpunit/php-code-coverage": "^9.2.7", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.5", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.3", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^2.3.4", + "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*" + "ext-pdo": "*", + "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "ext-xdebug": "*" }, "bin": [ "phpunit" @@ -1585,12 +1614,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "9.5-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1611,32 +1643,124 @@ "testing", "xunit" ], - "time": "2020-01-08T08:45:45+00:00" + "time": "2021-09-25T07:38:51+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "sebastian/cli-parser", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -1656,40 +1780,34 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1726,39 +1844,80 @@ "compare", "equality" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2020-10-26T15:49:45+00:00" }, { - "name": "sebastian/diff", - "version": "3.0.3", + "name": "sebastian/complexity", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", "shasum": "" }, "require": { - "php": ">=7.1" + "nikic/php-parser": "^4.7", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "time": "2020-10-26T15:52:27+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" } }, "autoload": { @@ -1788,33 +1947,27 @@ "unidiff", "unified diff" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "5.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "388b6ced16caa751030f6a69e588299fa09200ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", + "reference": "388b6ced16caa751030f6a69e588299fa09200ac", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -1822,7 +1975,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -1847,40 +2000,34 @@ "environment", "hhvm" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2020-09-28T05:52:38+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.3", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1920,33 +2067,30 @@ "export", "exporter" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:47:53+00:00" + "time": "2020-09-28T05:24:23+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -1954,7 +2098,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1977,34 +2121,81 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2021-06-11T13:31:12+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "3.0.4", + "name": "sebastian/lines-of-code", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "nikic/php-parser": "^4.6", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "time": "2020-11-28T06:42:11+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" } }, "autoload": { @@ -2024,38 +2215,32 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2075,38 +2260,32 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2134,35 +2313,32 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2020-10-26T13:17:30+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2182,35 +2358,75 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2020-09-28T06:45:17+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "sebastian/type", + "version": "2.3.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "time": "2021-06-15T12:49:02+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" } }, "autoload": { @@ -2231,7 +2447,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2020-09-28T06:39:44+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2344,41 +2560,27 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-02-19T12:13:01+00:00" }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -2398,34 +2600,39 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-06-13T22:48:21+00:00" + "time": "2021-07-28T10:34:58+00:00" }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -2447,7 +2654,7 @@ "check", "validate" ], - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-03-09T10:59:23+00:00" }, { "name": "woocommerce/woocommerce-sniffs", @@ -2545,6 +2752,5 @@ "php": "^7.1 | ^8.0", "ext-json": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } diff --git a/modules/ppcp-api-client/src/Entity/class-webhookevent.php b/modules/ppcp-api-client/src/Entity/WebhookEvent.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-webhookevent.php rename to modules/ppcp-api-client/src/Entity/WebhookEvent.php diff --git a/modules/ppcp-api-client/src/Factory/class-webhookeventfactory.php b/modules/ppcp-api-client/src/Factory/WebhookEventFactory.php similarity index 100% rename from modules/ppcp-api-client/src/Factory/class-webhookeventfactory.php rename to modules/ppcp-api-client/src/Factory/WebhookEventFactory.php diff --git a/modules/ppcp-subscription/services.php b/modules/ppcp-subscription/services.php index b7c7286c7..21a135dc9 100644 --- a/modules/ppcp-subscription/services.php +++ b/modules/ppcp-subscription/services.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Subscription; use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper; +use Psr\Container\ContainerInterface; return array( 'subscription.helper' => static function ( ContainerInterface $container ): SubscriptionHelper { diff --git a/modules/ppcp-vaulting/composer.json b/modules/ppcp-vaulting/composer.json new file mode 100644 index 000000000..d57c09b96 --- /dev/null +++ b/modules/ppcp-vaulting/composer.json @@ -0,0 +1,17 @@ +{ + "name": "woocommerce/ppcp-vaulting", + "type": "dhii-mod", + "description": "Vaulting module for PPCP", + "license": "GPL-2.0", + "require": { + "php": "^7.1 | ^8.0", + "dhii/module-interface": "^0.3.0-alpha1" + }, + "autoload": { + "psr-4": { + "WooCommerce\\PayPalCommerce\\Vaulting\\": "src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/modules/ppcp-vaulting/src/Assets/class-myaccountpaymentsassets.php b/modules/ppcp-vaulting/src/Assets/MyAccountPaymentsAssets.php similarity index 100% rename from modules/ppcp-vaulting/src/Assets/class-myaccountpaymentsassets.php rename to modules/ppcp-vaulting/src/Assets/MyAccountPaymentsAssets.php diff --git a/modules/ppcp-vaulting/src/Endpoint/class-deletepaymenttokenendpoint.php b/modules/ppcp-vaulting/src/Endpoint/DeletePaymentTokenEndpoint.php similarity index 100% rename from modules/ppcp-vaulting/src/Endpoint/class-deletepaymenttokenendpoint.php rename to modules/ppcp-vaulting/src/Endpoint/DeletePaymentTokenEndpoint.php diff --git a/modules/ppcp-vaulting/src/PaymentTokenRepository.php b/modules/ppcp-vaulting/src/PaymentTokenRepository.php new file mode 100644 index 000000000..d159aae41 --- /dev/null +++ b/modules/ppcp-vaulting/src/PaymentTokenRepository.php @@ -0,0 +1,155 @@ +factory = $factory; + $this->endpoint = $endpoint; + } + + /** + * Return a token for a user. + * + * @param int $id The user id. + * + * @return PaymentToken|null + */ + public function for_user_id( int $id ) { + try { + $token = (array) get_user_meta( $id, self::USER_META, true ); + if ( ! $token || ! isset( $token['id'] ) ) { + return $this->fetch_for_user_id( $id ); + } + + $token = $this->factory->from_array( $token ); + return $token; + } catch ( RuntimeException $error ) { + return null; + } + } + + /** + * Return all tokens for a user. + * + * @param int $id The user id. + * @return PaymentToken[] + */ + public function all_for_user_id( int $id ) { + try { + $tokens = $this->endpoint->for_user( $id ); + update_user_meta( $id, self::USER_META, $tokens ); + return $tokens; + } catch ( RuntimeException $exception ) { + return array(); + } + } + + /** + * Delete a token for a user. + * + * @param int $user_id The user id. + * @param PaymentToken $token The token. + * + * @return bool + */ + public function delete_token( int $user_id, PaymentToken $token ): bool { + delete_user_meta( $user_id, self::USER_META ); + return $this->endpoint->delete_token( $token ); + } + + /** + * Check if tokens has card source. + * + * @param PaymentToken[] $tokens The tokens. + * @return bool Whether tokens contains card or not. + */ + public function tokens_contains_card( array $tokens ): bool { + return $this->token_contains_source( $tokens, 'card' ); + } + + /** + * Check if tokens has PayPal source. + * + * @param PaymentToken[] $tokens The tokens. + * @return bool Whether tokens contains card or not. + */ + public function tokens_contains_paypal( array $tokens ): bool { + return $this->token_contains_source( $tokens, 'paypal' ); + } + + /** + * Fetch PaymentToken from PayPal for a user. + * + * @param int $id The user id. + * @return PaymentToken + */ + private function fetch_for_user_id( int $id ): PaymentToken { + + $tokens = $this->endpoint->for_user( $id ); + $token = current( $tokens ); + $token_array = $token->to_array(); + update_user_meta( $id, self::USER_META, $token_array ); + return $token; + } + + /** + * Checks if tokens has the given source. + * + * @param array $tokens Payment tokens. + * @param string $source_type Payment token source type. + * @return bool Whether tokens contains source or not. + */ + private function token_contains_source( array $tokens, string $source_type ): bool { + foreach ( $tokens as $token ) { + if ( isset( $token->source()->card ) && 'card' === $source_type || isset( $token->source()->paypal ) && 'paypal' === $source_type ) { + return true; + } + } + + return false; + } +} diff --git a/modules/ppcp-vaulting/src/class-paymenttokensrenderer.php b/modules/ppcp-vaulting/src/PaymentTokensRenderer.php similarity index 100% rename from modules/ppcp-vaulting/src/class-paymenttokensrenderer.php rename to modules/ppcp-vaulting/src/PaymentTokensRenderer.php diff --git a/modules/ppcp-vaulting/src/class-vaultingmodule.php b/modules/ppcp-vaulting/src/VaultingModule.php similarity index 100% rename from modules/ppcp-vaulting/src/class-vaultingmodule.php rename to modules/ppcp-vaulting/src/VaultingModule.php diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 0054aa086..c48a15569 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -39,7 +39,6 @@ use WooCommerce\PayPalCommerce\WcGateway\Settings\SectionsRenderer; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsListener; use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer; -use WpOop\TransientCache\CachePoolFactory; use WooCommerce\PayPalCommerce\Webhooks\Status\WebhooksStatusPage; return array( diff --git a/modules/ppcp-wc-gateway/src/Notice/class-dccwithoutpaypaladminnotice.php b/modules/ppcp-wc-gateway/src/Notice/DccWithoutPayPalAdminNotice.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Notice/class-dccwithoutpaypaladminnotice.php rename to modules/ppcp-wc-gateway/src/Notice/DccWithoutPayPalAdminNotice.php diff --git a/modules/ppcp-wc-gateway/src/Settings/class-pagematchertrait.php b/modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Settings/class-pagematchertrait.php rename to modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php diff --git a/modules/ppcp-webhooks/src/Endpoint/class-resubscribeendpoint.php b/modules/ppcp-webhooks/src/Endpoint/ResubscribeEndpoint.php similarity index 100% rename from modules/ppcp-webhooks/src/Endpoint/class-resubscribeendpoint.php rename to modules/ppcp-webhooks/src/Endpoint/ResubscribeEndpoint.php diff --git a/modules/ppcp-webhooks/src/Endpoint/class-simulateendpoint.php b/modules/ppcp-webhooks/src/Endpoint/SimulateEndpoint.php similarity index 100% rename from modules/ppcp-webhooks/src/Endpoint/class-simulateendpoint.php rename to modules/ppcp-webhooks/src/Endpoint/SimulateEndpoint.php diff --git a/modules/ppcp-webhooks/src/Endpoint/class-simulationstateendpoint.php b/modules/ppcp-webhooks/src/Endpoint/SimulationStateEndpoint.php similarity index 100% rename from modules/ppcp-webhooks/src/Endpoint/class-simulationstateendpoint.php rename to modules/ppcp-webhooks/src/Endpoint/SimulationStateEndpoint.php diff --git a/modules/ppcp-webhooks/src/Status/Assets/class-webhooksstatuspageassets.php b/modules/ppcp-webhooks/src/Status/Assets/class-webhooksstatuspageassets.php deleted file mode 100644 index 50c6956a4..000000000 --- a/modules/ppcp-webhooks/src/Status/Assets/class-webhooksstatuspageassets.php +++ /dev/null @@ -1,110 +0,0 @@ -module_url = untrailingslashit( $module_url ); - } - - /** - * Registers the scripts and styles. - * - * @return void - */ - public function register(): void { - wp_register_style( - 'ppcp-webhooks-status-page-style', - $this->module_url . '/assets/css/status-page.css', - array(), - 1 - ); - - wp_register_script( - 'ppcp-webhooks-status-page', - $this->module_url . '/assets/js/status-page.js', - array(), - 1, - true - ); - - wp_localize_script( - 'ppcp-webhooks-status-page', - 'PayPalCommerceGatewayWebhooksStatus', - $this->get_script_data() - ); - } - - /** - * Returns the data for the script. - * - * @return array - */ - public function get_script_data() { - return array( - 'resubscribe' => array( - 'endpoint' => home_url( \WC_AJAX::get_endpoint( ResubscribeEndpoint::ENDPOINT ) ), - 'nonce' => wp_create_nonce( ResubscribeEndpoint::nonce() ), - 'button' => '.ppcp-webhooks-resubscribe', - 'failureMessage' => __( 'Operation failed. Check WooCommerce logs for more details.', 'woocommerce-paypal-payments' ), - ), - 'simulation' => array( - 'start' => array( - 'endpoint' => home_url( \WC_AJAX::get_endpoint( SimulateEndpoint::ENDPOINT ) ), - 'nonce' => wp_create_nonce( SimulateEndpoint::nonce() ), - 'button' => '.ppcp-webhooks-simulate', - 'failureMessage' => __( 'Operation failed. Check WooCommerce logs for more details.', 'woocommerce-paypal-payments' ), - ), - 'state' => array( - 'endpoint' => home_url( \WC_AJAX::get_endpoint( SimulationStateEndpoint::ENDPOINT ) ), - 'successState' => WebhookSimulation::STATE_RECEIVED, - 'waitingMessage' => __( 'Waiting for the webhook to arrive...', 'woocommerce-paypal-payments' ), - 'successMessage' => __( 'The webhook was received successfully.', 'woocommerce-paypal-payments' ), - 'tooLongDelayMessage' => __( 'Looks like the webhook cannot be received. Check that your website is accessible from the internet.', 'woocommerce-paypal-payments' ), - ), - ), - ); - } - - /** - * Enqueues the necessary scripts. - * - * @return void - */ - public function enqueue(): void { - wp_enqueue_style( 'ppcp-webhooks-status-page-style' ); - wp_enqueue_script( 'ppcp-webhooks-status-page' ); - } -} diff --git a/modules/ppcp-webhooks/src/Status/class-webhooksimulation.php b/modules/ppcp-webhooks/src/Status/WebhookSimulation.php similarity index 100% rename from modules/ppcp-webhooks/src/Status/class-webhooksimulation.php rename to modules/ppcp-webhooks/src/Status/WebhookSimulation.php diff --git a/modules/ppcp-webhooks/src/Status/class-webhooksstatuspage.php b/modules/ppcp-webhooks/src/Status/WebhooksStatusPage.php similarity index 100% rename from modules/ppcp-webhooks/src/Status/class-webhooksstatuspage.php rename to modules/ppcp-webhooks/src/Status/WebhooksStatusPage.php From d7395f90afca86b8cc085214d5d1ecfda845094d Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 10:33:48 +0200 Subject: [PATCH 30/42] Add classmap to gateway module to prevent `SettingsStatus` not found --- modules/ppcp-wc-gateway/composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/ppcp-wc-gateway/composer.json b/modules/ppcp-wc-gateway/composer.json index c8a15a7d6..af57a6f8e 100644 --- a/modules/ppcp-wc-gateway/composer.json +++ b/modules/ppcp-wc-gateway/composer.json @@ -10,7 +10,10 @@ "autoload": { "psr-4": { "WooCommerce\\PayPalCommerce\\WcGateway\\": "src" - } + }, + "classmap": [ + "src" + ] }, "minimum-stability": "dev", "prefer-stable": true From 05d8012c99ba42ee912dafca0646c308e504755d Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 10:41:08 +0200 Subject: [PATCH 31/42] Remove `composer.lock` to check if CI pass or not --- composer.lock | 2756 ------------------------------------------------- 1 file changed, 2756 deletions(-) delete mode 100644 composer.lock diff --git a/composer.lock b/composer.lock deleted file mode 100644 index bd8390aa2..000000000 --- a/composer.lock +++ /dev/null @@ -1,2756 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "content-hash": "0b4f7dd4cc7706bd902a10f64dbd095e", - "packages": [ - { - "name": "container-interop/service-provider", - "version": "v0.4.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/service-provider.git", - "reference": "4969b9e49460690b7430b3f1a87cab07be61418a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/service-provider/zipball/4969b9e49460690b7430b3f1a87cab07be61418a", - "reference": "4969b9e49460690b7430b3f1a87cab07be61418a", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting container interoperability through standard service providers", - "homepage": "https://github.com/container-interop/service-provider", - "time": "2017-09-20T14:13:36+00:00" - }, - { - "name": "dhii/collections-interface", - "version": "v0.3.0-alpha4", - "source": { - "type": "git", - "url": "https://github.com/Dhii/collections-interface.git", - "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/da334f75f6477ef7eecaf28df1d5253fe05684ee", - "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee", - "shasum": "" - }, - "require": { - "php": "^7.1 | ^8.0", - "psr/container": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", - "slevomat/coding-standard": "^6.0", - "vimeo/psalm": "^3.11.7 | ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Collection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - }, - { - "name": "Anton Ukhanev", - "email": "xedin.unknown@gmail.com" - } - ], - "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", - "time": "2021-03-09T17:36:34+00:00" - }, - { - "name": "dhii/containers", - "version": "v0.1.2", - "source": { - "type": "git", - "url": "https://github.com/Dhii/containers.git", - "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/containers/zipball/b753f1d8eee7bf58ebbeb815b55a634785bcdb64", - "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64", - "shasum": "" - }, - "require": { - "container-interop/service-provider": "^0.4", - "dhii/collections-interface": "^0.3.0-alpha2", - "php": "^7.1 | ^8.0" - }, - "require-dev": { - "gmazzap/andrew": "^1.1", - "phpunit/phpunit": "^7.0", - "psr/container": "^1.0", - "psr/simple-cache": "^1.0", - "slevomat/coding-standard": "~4.0", - "wildwolf/psr-memory-cache": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "A selection of PSR-11 containers for utility, simplicity, and ease.", - "keywords": [ - "PSR-11", - "container" - ], - "time": "2020-10-22T10:20:26+00:00" - }, - { - "name": "dhii/module-interface", - "version": "v0.3.0-alpha2", - "source": { - "type": "git", - "url": "https://github.com/Dhii/module-interface.git", - "reference": "0e39f167d7ed8990c82f5d2e6084159d1a502a5b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dhii/module-interface/zipball/0e39f167d7ed8990c82f5d2e6084159d1a502a5b", - "reference": "0e39f167d7ed8990c82f5d2e6084159d1a502a5b", - "shasum": "" - }, - "require": { - "container-interop/service-provider": "^0.4", - "php": "^7.1 | ^8.0", - "psr/container": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", - "slevomat/coding-standard": "^6.0", - "vimeo/psalm": "^3.11.7 | ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dhii\\Modular\\Module\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dhii Team", - "email": "development@dhii.co" - } - ], - "description": "Interfaces for modules", - "time": "2021-08-23T08:23:01+00:00" - }, - { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2021-03-05T17:36:06+00:00" - }, - { - "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2021-05-03T11:20:27+00:00" - }, - { - "name": "ralouphie/getallheaders", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" - }, - "type": "library", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders.", - "time": "2019-03-08T08:55:37+00:00" - }, - { - "name": "wikimedia/composer-merge-plugin", - "version": "v1.4.1", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/composer-merge-plugin.git", - "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100", - "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3.2" - }, - "require-dev": { - "composer/composer": "~1.0.0", - "jakub-onderka/php-parallel-lint": "~0.8", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "~2.1.0" - }, - "type": "composer-plugin", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - }, - "class": "Wikimedia\\Composer\\MergePlugin" - }, - "autoload": { - "psr-4": { - "Wikimedia\\Composer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bryan Davis", - "email": "bd808@wikimedia.org" - } - ], - "description": "Composer plugin to merge multiple composer.json files", - "time": "2017-04-25T02:31:25+00:00" - } - ], - "packages-dev": [ - { - "name": "antecedent/patchwork", - "version": "2.1.15", - "source": { - "type": "git", - "url": "https://github.com/antecedent/patchwork.git", - "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/antecedent/patchwork/zipball/0430ceaac7f447f1778c199ec19d7e4362a6f961", - "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": ">=4" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ignas Rudaitis", - "email": "ignas.rudaitis@gmail.com" - } - ], - "description": "Method redefinition (monkey-patching) functionality for PHP.", - "homepage": "http://patchwork2.org/", - "keywords": [ - "aop", - "aspect", - "interception", - "monkeypatching", - "redefinition", - "runkit", - "testing" - ], - "time": "2021-08-22T08:00:13+00:00" - }, - { - "name": "brain/monkey", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "7042140000b4b18034c0c0010d86274a00f25442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/7042140000b4b18034c0c0010d86274a00f25442", - "reference": "7042140000b4b18034c0c0010d86274a00f25442", - "shasum": "" - }, - "require": { - "antecedent/patchwork": "^2.0", - "mockery/mockery": ">=0.9 <2", - "php": ">=5.6.0" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || ^0.7", - "phpcompatibility/php-compatibility": "^9.3.0", - "phpunit/phpunit": "^5.7.9 || ^6.0 || ^7.0 || ^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Brain\\Monkey\\": "src/" - }, - "files": [ - "inc/api.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Giuseppe Mazzapica", - "email": "giuseppe.mazzapica@gmail.com", - "homepage": "https://gmazzap.me", - "role": "Developer" - } - ], - "description": "Mocking utility for PHP functions and WordPress plugin API", - "keywords": [ - "Monkey Patching", - "interception", - "mock", - "mock functions", - "mockery", - "patchwork", - "redefinition", - "runkit", - "test", - "testing" - ], - "time": "2020-10-13T17:56:14+00:00" - }, - { - "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.7.1", - "source": { - "type": "git", - "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "fe390591e0241955f22eb9ba327d137e501c771c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c", - "reference": "fe390591e0241955f22eb9ba327d137e501c771c", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0" - }, - "require-dev": { - "composer/composer": "*", - "phpcompatibility/php-compatibility": "^9.0", - "sensiolabs/security-checker": "^4.1.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" - }, - "autoload": { - "psr-4": { - "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Franck Nijhof", - "email": "franck.nijhof@dealerdirect.com", - "homepage": "http://www.frenck.nl", - "role": "Developer / IT Manager" - } - ], - "description": "PHP_CodeSniffer Standards Composer Installer Plugin", - "homepage": "http://www.dealerdirect.com", - "keywords": [ - "PHPCodeSniffer", - "PHP_CodeSniffer", - "code quality", - "codesniffer", - "composer", - "installer", - "phpcs", - "plugin", - "qa", - "quality", - "standard", - "standards", - "style guide", - "stylecheck", - "tests" - ], - "time": "2020-12-07T18:04:37+00:00" - }, - { - "name": "doctrine/instantiator", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^8.0", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2020-11-10T18:47:58+00:00" - }, - { - "name": "hamcrest/hamcrest-php", - "version": "v2.0.1", - "source": { - "type": "git", - "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", - "shasum": "" - }, - "require": { - "php": "^5.3|^7.0|^8.0" - }, - "replace": { - "cordoval/hamcrest-php": "*", - "davedevelopment/hamcrest-php": "*", - "kodova/hamcrest-php": "*" - }, - "require-dev": { - "phpunit/php-file-iterator": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "autoload": { - "classmap": [ - "hamcrest" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "This is the PHP port of Hamcrest Matchers", - "keywords": [ - "test" - ], - "time": "2020-07-09T08:09:16+00:00" - }, - { - "name": "mockery/mockery", - "version": "1.4.4", - "source": { - "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346", - "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346", - "shasum": "" - }, - "require": { - "hamcrest/hamcrest-php": "^2.0.1", - "lib-pcre": ">=7.0", - "php": "^7.3 || ^8.0" - }, - "conflict": { - "phpunit/phpunit": "<8.0" - }, - "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "Mockery": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Pádraic Brady", - "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" - }, - { - "name": "Dave Marshall", - "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" - } - ], - "description": "Mockery is a simple yet flexible PHP mock object framework", - "homepage": "https://github.com/mockery/mockery", - "keywords": [ - "BDD", - "TDD", - "library", - "mock", - "mock objects", - "mockery", - "stub", - "test", - "test double", - "testing" - ], - "time": "2021-09-13T15:28:59+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.10.2", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "replace": { - "myclabs/deep-copy": "self.version" - }, - "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, - "files": [ - "src/DeepCopy/deep_copy.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "time": "2020-11-13T09:40:50+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v4.13.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2021-09-20T12:20:58+00:00" - }, - { - "name": "phar-io/manifest", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2021-07-20T11:28:43+00:00" - }, - { - "name": "phar-io/version", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "time": "2021-02-23T14:00:09+00:00" - }, - { - "name": "phpcompatibility/php-compatibility", - "version": "9.3.5", - "source": { - "type": "git", - "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", - "reference": "9fb324479acf6f39452e0655d2429cc0d3914243" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243", - "reference": "9fb324479acf6f39452e0655d2429cc0d3914243", - "shasum": "" - }, - "require": { - "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.3 || ^3.0.2" - }, - "conflict": { - "squizlabs/php_codesniffer": "2.6.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0" - }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", - "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Wim Godden", - "homepage": "https://github.com/wimg", - "role": "lead" - }, - { - "name": "Juliette Reinders Folmer", - "homepage": "https://github.com/jrfnl", - "role": "lead" - }, - { - "name": "Contributors", - "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors" - } - ], - "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.", - "homepage": "http://techblog.wimgodden.be/tag/codesniffer/", - "keywords": [ - "compatibility", - "phpcs", - "standards" - ], - "time": "2019-12-27T09:44:58+00:00" - }, - { - "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.1", - "source": { - "type": "git", - "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "ddabec839cc003651f2ce695c938686d1086cf43" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/ddabec839cc003651f2ce695c938686d1086cf43", - "reference": "ddabec839cc003651f2ce695c938686d1086cf43", - "shasum": "" - }, - "require": { - "phpcompatibility/php-compatibility": "^9.0" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", - "paragonie/random_compat": "dev-master", - "paragonie/sodium_compat": "dev-master" - }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", - "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Wim Godden", - "role": "lead" - }, - { - "name": "Juliette Reinders Folmer", - "role": "lead" - } - ], - "description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.", - "homepage": "http://phpcompatibility.com/", - "keywords": [ - "compatibility", - "paragonie", - "phpcs", - "polyfill", - "standards" - ], - "time": "2021-02-15T10:24:51+00:00" - }, - { - "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.2", - "source": { - "type": "git", - "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "a792ab623069f0ce971b2417edef8d9632e32f75" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/a792ab623069f0ce971b2417edef8d9632e32f75", - "reference": "a792ab623069f0ce971b2417edef8d9632e32f75", - "shasum": "" - }, - "require": { - "phpcompatibility/php-compatibility": "^9.0", - "phpcompatibility/phpcompatibility-paragonie": "^1.0" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7" - }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", - "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Wim Godden", - "role": "lead" - }, - { - "name": "Juliette Reinders Folmer", - "role": "lead" - } - ], - "description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.", - "homepage": "http://phpcompatibility.com/", - "keywords": [ - "compatibility", - "phpcs", - "standards", - "wordpress" - ], - "time": "2021-07-21T11:09:57+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-09-03T19:13:55+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2021-09-17T15:28:14+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "1.14.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2021-09-10T09:02:12+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "9.2.7", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-libxml": "*", - "ext-xmlwriter": "*", - "nikic/php-parser": "^4.12.0", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "time": "2021-09-17T05:39:03+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "3.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "time": "2020-09-28T05:57:25+00:00" - }, - { - "name": "phpunit/php-invoker", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-pcntl": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Invoke callables with a timeout", - "homepage": "https://github.com/sebastianbergmann/php-invoker/", - "keywords": [ - "process" - ], - "time": "2020-09-28T05:58:55+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "time": "2020-10-26T05:33:50+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "5.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2020-10-26T13:16:10+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "9.5.10", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a", - "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.3.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.7", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3.4", - "sebastian/version": "^3.0.2" - }, - "require-dev": { - "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, - "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.5-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ], - "files": [ - "src/Framework/Assert/Functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2021-09-25T07:38:51+00:00" - }, - { - "name": "sebastian/cli-parser", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for parsing CLI options", - "homepage": "https://github.com/sebastianbergmann/cli-parser", - "time": "2020-09-28T06:08:49+00:00" - }, - { - "name": "sebastian/code-unit", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", - "time": "2020-10-26T13:08:54+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2020-09-28T05:30:19+00:00" - }, - { - "name": "sebastian/comparator", - "version": "4.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "time": "2020-10-26T15:49:45+00:00" - }, - { - "name": "sebastian/complexity", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.7", - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for calculating the complexity of PHP code units", - "homepage": "https://github.com/sebastianbergmann/complexity", - "time": "2020-10-26T15:52:27+00:00" - }, - { - "name": "sebastian/diff", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "time": "2020-10-26T13:10:38+00:00" - }, - { - "name": "sebastian/environment", - "version": "5.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-posix": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "time": "2020-09-28T05:52:38+00:00" - }, - { - "name": "sebastian/exporter", - "version": "4.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "time": "2020-09-28T05:24:23+00:00" - }, - { - "name": "sebastian/global-state", - "version": "5.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "time": "2021-06-11T13:31:12+00:00" - }, - { - "name": "sebastian/lines-of-code", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.6", - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for counting the lines of code in PHP source code", - "homepage": "https://github.com/sebastianbergmann/lines-of-code", - "time": "2020-11-28T06:42:11+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2020-10-26T13:12:34+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2020-10-26T13:14:26+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2020-10-26T13:17:30+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2020-09-28T06:45:17+00:00" - }, - { - "name": "sebastian/type", - "version": "2.3.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", - "time": "2021-06-15T12:49:02+00:00" - }, - { - "name": "sebastian/version", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c6c1022351a901512170118436c764e473f6de8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", - "reference": "c6c1022351a901512170118436c764e473f6de8c", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2020-09-28T06:39:44+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.6.0", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2021-04-09T00:54:41+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.23.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "time": "2021-02-19T12:13:01+00:00" - }, - { - "name": "theseer/tokenizer", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - } - ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2021-07-28T10:34:58+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2021-03-09T10:59:23+00:00" - }, - { - "name": "woocommerce/woocommerce-sniffs", - "version": "0.1.1", - "source": { - "type": "git", - "url": "https://github.com/woocommerce/woocommerce-sniffs.git", - "reference": "eb604d751b61c42f31ff1aa24113c7c0de438553" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/eb604d751b61c42f31ff1aa24113c7c0de438553", - "reference": "eb604d751b61c42f31ff1aa24113c7c0de438553", - "shasum": "" - }, - "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "php": ">=7.0", - "phpcompatibility/phpcompatibility-wp": "^2.1.0", - "wp-coding-standards/wpcs": "^2.3.0" - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Claudio Sanches", - "email": "claudio@automattic.com" - } - ], - "description": "WooCommerce sniffs", - "keywords": [ - "phpcs", - "standards", - "woocommerce", - "wordpress" - ], - "time": "2021-07-29T17:25:16+00:00" - }, - { - "name": "wp-coding-standards/wpcs", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "7da1894633f168fe244afc6de00d141f27517b62" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62", - "reference": "7da1894633f168fe244afc6de00d141f27517b62", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.3.1" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6", - "phpcompatibility/php-compatibility": "^9.0", - "phpcsstandards/phpcsdevtools": "^1.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Contributors", - "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors" - } - ], - "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", - "keywords": [ - "phpcs", - "standards", - "wordpress" - ], - "time": "2020-05-13T23:57:56+00:00" - } - ], - "aliases": [], - "minimum-stability": "dev", - "stability-flags": [], - "prefer-stable": true, - "prefer-lowest": false, - "platform": { - "php": "^7.1 | ^8.0", - "ext-json": "*" - }, - "platform-dev": [] -} From e74283e7f20cfba611b463f474c3f842c165afc3 Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 10:50:24 +0200 Subject: [PATCH 32/42] Fix phpcs errors --- modules/ppcp-subscription/services.php | 4 ++-- modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php | 0 modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php diff --git a/modules/ppcp-subscription/services.php b/modules/ppcp-subscription/services.php index 21a135dc9..16bcd67c0 100644 --- a/modules/ppcp-subscription/services.php +++ b/modules/ppcp-subscription/services.php @@ -13,10 +13,10 @@ use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper; 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( 'vaulting.repository.payment-token' ); $endpoint = $container->get( 'api.endpoint.order' ); diff --git a/modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php b/modules/ppcp-wc-gateway/src/Gateway/WcGatewayInterface.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php index 595168360..61e555d9d 100644 --- a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php +++ b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php @@ -100,7 +100,7 @@ class SettingsRenderer { array $fields, DccApplies $dcc_applies, MessagesApply $messages_apply, - DccProductStatus $dcc_product_status, + DCCProductStatus $dcc_product_status, SettingsStatus $settings_status, string $page_id ) { From 6a4719d92ecbb91a007faeb1ae2328d0898e35c4 Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 11:23:55 +0200 Subject: [PATCH 33/42] Require `PaymentTokenRepository` into service --- modules/ppcp-subscription/services.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ppcp-subscription/services.php b/modules/ppcp-subscription/services.php index 16bcd67c0..dbd78239a 100644 --- a/modules/ppcp-subscription/services.php +++ b/modules/ppcp-subscription/services.php @@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Subscription; use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper; use Psr\Container\ContainerInterface; +use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository; return array( 'subscription.helper' => static function ( ContainerInterface $container ): SubscriptionHelper { From e7f31ed80adb2e9eff7722ae81c4a2dd671ba98a Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 11:50:43 +0200 Subject: [PATCH 34/42] Composer install on PHP 7.1 --- composer.lock | 2446 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2446 insertions(+) create mode 100644 composer.lock diff --git a/composer.lock b/composer.lock new file mode 100644 index 000000000..a97ff8b2f --- /dev/null +++ b/composer.lock @@ -0,0 +1,2446 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "3ea38ef24e7868bd70b088311959df2d", + "packages": [ + { + "name": "container-interop/service-provider", + "version": "v0.4.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/service-provider.git", + "reference": "4969b9e49460690b7430b3f1a87cab07be61418a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/service-provider/zipball/4969b9e49460690b7430b3f1a87cab07be61418a", + "reference": "4969b9e49460690b7430b3f1a87cab07be61418a", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting container interoperability through standard service providers", + "homepage": "https://github.com/container-interop/service-provider", + "time": "2017-09-20T14:13:36+00:00" + }, + { + "name": "dhii/collections-interface", + "version": "v0.3.0-alpha4", + "source": { + "type": "git", + "url": "https://github.com/Dhii/collections-interface.git", + "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/da334f75f6477ef7eecaf28df1d5253fe05684ee", + "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee", + "shasum": "" + }, + "require": { + "php": "^7.1 | ^8.0", + "psr/container": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", + "slevomat/coding-standard": "^6.0", + "vimeo/psalm": "^3.11.7 | ^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dhii\\Collection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dhii Team", + "email": "development@dhii.co" + }, + { + "name": "Anton Ukhanev", + "email": "xedin.unknown@gmail.com" + } + ], + "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", + "time": "2021-03-09T17:36:34+00:00" + }, + { + "name": "dhii/containers", + "version": "v0.1.2", + "source": { + "type": "git", + "url": "https://github.com/Dhii/containers.git", + "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dhii/containers/zipball/b753f1d8eee7bf58ebbeb815b55a634785bcdb64", + "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64", + "shasum": "" + }, + "require": { + "container-interop/service-provider": "^0.4", + "dhii/collections-interface": "^0.3.0-alpha2", + "php": "^7.1 | ^8.0" + }, + "require-dev": { + "gmazzap/andrew": "^1.1", + "phpunit/phpunit": "^7.0", + "psr/container": "^1.0", + "psr/simple-cache": "^1.0", + "slevomat/coding-standard": "~4.0", + "wildwolf/psr-memory-cache": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dhii\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dhii Team", + "email": "development@dhii.co" + } + ], + "description": "A selection of PSR-11 containers for utility, simplicity, and ease.", + "keywords": [ + "PSR-11", + "container" + ], + "time": "2020-10-22T10:20:26+00:00" + }, + { + "name": "dhii/module-interface", + "version": "v0.3.0-alpha2", + "source": { + "type": "git", + "url": "https://github.com/Dhii/module-interface.git", + "reference": "0e39f167d7ed8990c82f5d2e6084159d1a502a5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dhii/module-interface/zipball/0e39f167d7ed8990c82f5d2e6084159d1a502a5b", + "reference": "0e39f167d7ed8990c82f5d2e6084159d1a502a5b", + "shasum": "" + }, + "require": { + "container-interop/service-provider": "^0.4", + "php": "^7.1 | ^8.0", + "psr/container": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", + "slevomat/coding-standard": "^6.0", + "vimeo/psalm": "^3.11.7 | ^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dhii\\Modular\\Module\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dhii Team", + "email": "development@dhii.co" + } + ], + "description": "Interfaces for modules", + "time": "2021-08-23T08:23:01+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "wikimedia/composer-merge-plugin", + "version": "v1.4.1", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/composer-merge-plugin.git", + "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100", + "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": ">=5.3.2" + }, + "require-dev": { + "composer/composer": "~1.0.0", + "jakub-onderka/php-parallel-lint": "~0.8", + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "~2.1.0" + }, + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + }, + "class": "Wikimedia\\Composer\\MergePlugin" + }, + "autoload": { + "psr-4": { + "Wikimedia\\Composer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bryan Davis", + "email": "bd808@wikimedia.org" + } + ], + "description": "Composer plugin to merge multiple composer.json files", + "time": "2017-04-25T02:31:25+00:00" + } + ], + "packages-dev": [ + { + "name": "antecedent/patchwork", + "version": "2.1.15", + "source": { + "type": "git", + "url": "https://github.com/antecedent/patchwork.git", + "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/antecedent/patchwork/zipball/0430ceaac7f447f1778c199ec19d7e4362a6f961", + "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": ">=4" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignas Rudaitis", + "email": "ignas.rudaitis@gmail.com" + } + ], + "description": "Method redefinition (monkey-patching) functionality for PHP.", + "homepage": "http://patchwork2.org/", + "keywords": [ + "aop", + "aspect", + "interception", + "monkeypatching", + "redefinition", + "runkit", + "testing" + ], + "time": "2021-08-22T08:00:13+00:00" + }, + { + "name": "brain/monkey", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/Brain-WP/BrainMonkey.git", + "reference": "7042140000b4b18034c0c0010d86274a00f25442" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/7042140000b4b18034c0c0010d86274a00f25442", + "reference": "7042140000b4b18034c0c0010d86274a00f25442", + "shasum": "" + }, + "require": { + "antecedent/patchwork": "^2.0", + "mockery/mockery": ">=0.9 <2", + "php": ">=5.6.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || ^0.7", + "phpcompatibility/php-compatibility": "^9.3.0", + "phpunit/phpunit": "^5.7.9 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-version/1": "1.x-dev", + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Brain\\Monkey\\": "src/" + }, + "files": [ + "inc/api.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Giuseppe Mazzapica", + "email": "giuseppe.mazzapica@gmail.com", + "homepage": "https://gmazzap.me", + "role": "Developer" + } + ], + "description": "Mocking utility for PHP functions and WordPress plugin API", + "keywords": [ + "Monkey Patching", + "interception", + "mock", + "mock functions", + "mockery", + "patchwork", + "redefinition", + "runkit", + "test", + "testing" + ], + "time": "2020-10-13T17:56:14+00:00" + }, + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v0.7.1", + "source": { + "type": "git", + "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", + "reference": "fe390591e0241955f22eb9ba327d137e501c771c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c", + "reference": "fe390591e0241955f22eb9ba327d137e501c771c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "*", + "phpcompatibility/php-compatibility": "^9.0", + "sensiolabs/security-checker": "^4.1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "franck.nijhof@dealerdirect.com", + "homepage": "http://www.frenck.nl", + "role": "Developer / IT Manager" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "homepage": "http://www.dealerdirect.com", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "time": "2020-12-07T18:04:37+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^8.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2020-11-10T18:47:58+00:00" + }, + { + "name": "hamcrest/hamcrest-php", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "shasum": "" + }, + "require": { + "php": "^5.3|^7.0|^8.0" + }, + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" + }, + "require-dev": { + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "hamcrest" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "This is the PHP port of Hamcrest Matchers", + "keywords": [ + "test" + ], + "time": "2020-07-09T08:09:16+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.3.5", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d", + "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "^2.0.1", + "lib-pcre": ">=7.0", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Mockery": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ], + "time": "2021-09-13T15:33:03+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.10.2", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2020-11-13T09:40:50+00:00" + }, + { + "name": "phar-io/manifest", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^2.0", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2018-07-08T19:23:20+00:00" + }, + { + "name": "phar-io/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2018-07-08T19:19:57+00:00" + }, + { + "name": "phpcompatibility/php-compatibility", + "version": "9.3.5", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.3 || ^3.0.2" + }, + "conflict": { + "squizlabs/php_codesniffer": "2.6.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "homepage": "https://github.com/wimg", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors" + } + ], + "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.", + "homepage": "http://techblog.wimgodden.be/tag/codesniffer/", + "keywords": [ + "compatibility", + "phpcs", + "standards" + ], + "time": "2019-12-27T09:44:58+00:00" + }, + { + "name": "phpcompatibility/phpcompatibility-paragonie", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", + "reference": "ddabec839cc003651f2ce695c938686d1086cf43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/ddabec839cc003651f2ce695c938686d1086cf43", + "reference": "ddabec839cc003651f2ce695c938686d1086cf43", + "shasum": "" + }, + "require": { + "phpcompatibility/php-compatibility": "^9.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "paragonie/random_compat": "dev-master", + "paragonie/sodium_compat": "dev-master" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "lead" + } + ], + "description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.", + "homepage": "http://phpcompatibility.com/", + "keywords": [ + "compatibility", + "paragonie", + "phpcs", + "polyfill", + "standards" + ], + "time": "2021-02-15T10:24:51+00:00" + }, + { + "name": "phpcompatibility/phpcompatibility-wp", + "version": "2.1.2", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", + "reference": "a792ab623069f0ce971b2417edef8d9632e32f75" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/a792ab623069f0ce971b2417edef8d9632e32f75", + "reference": "a792ab623069f0ce971b2417edef8d9632e32f75", + "shasum": "" + }, + "require": { + "phpcompatibility/php-compatibility": "^9.0", + "phpcompatibility/phpcompatibility-paragonie": "^1.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "lead" + } + ], + "description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.", + "homepage": "http://phpcompatibility.com/", + "keywords": [ + "compatibility", + "phpcs", + "standards", + "wordpress" + ], + "time": "2021-07-21T11:09:57+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2020-04-27T09:25:28+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "4.3.4", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", + "shasum": "" + }, + "require": { + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "doctrine/instantiator": "^1.0.5", + "mockery/mockery": "^1.0", + "phpdocumentor/type-resolver": "0.4.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2019-12-28T18:55:12+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "shasum": "" + }, + "require": { + "php": "^7.1", + "phpdocumentor/reflection-common": "^2.0" + }, + "require-dev": { + "ext-tokenizer": "^7.1", + "mockery/mockery": "~1", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "time": "2019-08-22T18:11:29+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.10.3", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "451c3cd1418cf640de218914901e51b064abb093" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5 || ^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Prophecy\\": "src/Prophecy" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2020-03-05T15:02:03+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "6.1.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.1 || ^4.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "suggest": { + "ext-xdebug": "^2.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2018-10-31T16:06:48+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05", + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2021-07-19T06:46:01+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "2.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2020-11-30T08:20:02+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "3.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "abandoned": true, + "time": "2021-07-26T12:15:06+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "7.5.20", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.1", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "^1.7", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", + "php": "^7.1", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0.1", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.1", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0", + "sebastian/environment": "^4.0", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0", + "sebastian/version": "^2.0.1" + }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-soap": "*", + "ext-xdebug": "*", + "phpunit/php-invoker": "^2.0" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "7.5-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2020-01-08T08:45:45+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2020-11-30T08:15:22+00:00" + }, + { + "name": "sebastian/comparator", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2020-11-30T08:04:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "time": "2020-11-30T07:59:04+00:00" + }, + { + "name": "sebastian/environment", + "version": "4.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2020-11-30T07:53:42+00:00" + }, + { + "name": "sebastian/exporter", + "version": "3.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", + "shasum": "" + }, + "require": { + "php": ">=7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2020-11-30T07:47:53+00:00" + }, + { + "name": "sebastian/global-state", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2017-04-27T15:39:26+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "3.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "shasum": "" + }, + "require": { + "php": ">=7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2020-11-30T07:40:27+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2020-11-30T07:37:18+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2020-11-30T07:34:24+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2020-11-30T07:30:19+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.6.0", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2021-04-09T00:54:41+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.23.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2021-02-19T12:13:01+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2019-06-13T22:48:21+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0 || ^8.0", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36 || ^7.5.13" + }, + "type": "library", + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2020-07-08T17:02:28+00:00" + }, + { + "name": "woocommerce/woocommerce-sniffs", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/woocommerce/woocommerce-sniffs.git", + "reference": "eb604d751b61c42f31ff1aa24113c7c0de438553" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/eb604d751b61c42f31ff1aa24113c7c0de438553", + "reference": "eb604d751b61c42f31ff1aa24113c7c0de438553", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "php": ">=7.0", + "phpcompatibility/phpcompatibility-wp": "^2.1.0", + "wp-coding-standards/wpcs": "^2.3.0" + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Claudio Sanches", + "email": "claudio@automattic.com" + } + ], + "description": "WooCommerce sniffs", + "keywords": [ + "phpcs", + "standards", + "woocommerce", + "wordpress" + ], + "time": "2021-07-29T17:25:16+00:00" + }, + { + "name": "wp-coding-standards/wpcs", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", + "reference": "7da1894633f168fe244afc6de00d141f27517b62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62", + "reference": "7da1894633f168fe244afc6de00d141f27517b62", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.3.1" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6", + "phpcompatibility/php-compatibility": "^9.0", + "phpcsstandards/phpcsdevtools": "^1.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Contributors", + "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", + "keywords": [ + "phpcs", + "standards", + "wordpress" + ], + "time": "2020-05-13T23:57:56+00:00" + } + ], + "aliases": [], + "minimum-stability": "dev", + "stability-flags": [], + "prefer-stable": true, + "prefer-lowest": false, + "platform": { + "php": "^7.1 | ^8.0", + "ext-json": "*" + }, + "platform-dev": [], + "platform-overrides": { + "php": "7.1" + } +} From 7ecbd4f590dbebad62a9e6c9a6a7106705a25901 Mon Sep 17 00:00:00 2001 From: dinamiko Date: Fri, 1 Oct 2021 12:35:29 +0200 Subject: [PATCH 35/42] Composer install on PHP 7.1 --- composer.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index a97ff8b2f..f71c236a2 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3ea38ef24e7868bd70b088311959df2d", + "content-hash": "0b4f7dd4cc7706bd902a10f64dbd095e", "packages": [ { "name": "container-interop/service-provider", @@ -2440,7 +2440,5 @@ "ext-json": "*" }, "platform-dev": [], - "platform-overrides": { - "php": "7.1" - } + "plugin-api-version": "1.1.0" } From 8f43e3a46dd6649c7227601c2da48f114d3287cd Mon Sep 17 00:00:00 2001 From: Ratnakar Dubey Date: Tue, 5 Oct 2021 13:46:00 +0530 Subject: [PATCH 36/42] Fix: Broken multi-level (nested) associative array values getting submitted from checkout page --- .../Endpoint/class-createorderendpoint.php | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php b/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php index 60f11ca77..223623ad7 100644 --- a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php +++ b/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php @@ -362,17 +362,8 @@ class CreateOrderEndpoint implements EndpointInterface { * @throws Exception On Error. */ private function process_checkout_form( string $form_values ) { - $form_values = explode( '&', $form_values ); + parse_str( $form_values, $parsed_values ); - $parsed_values = array(); - foreach ( $form_values as $field ) { - $field = explode( '=', $field ); - - if ( count( $field ) !== 2 ) { - continue; - } - $parsed_values[ $field[0] ] = $field[1]; - } $_POST = $parsed_values; $_REQUEST = $parsed_values; @@ -412,16 +403,8 @@ class CreateOrderEndpoint implements EndpointInterface { * @throws Exception On Error. */ private function process_checkout_form_when_creating_account( string $form_values, \WC_Order $wc_order = null ) { - $form_values = explode( '&', $form_values ); - $parsed_values = array(); - foreach ( $form_values as $field ) { - $field = explode( '=', $field ); + parse_str( $form_values, $parsed_values ); - if ( count( $field ) !== 2 ) { - continue; - } - $parsed_values[ $field[0] ] = $field[1]; - } $_POST = $parsed_values; $_REQUEST = $parsed_values; From e02926a033922fe1469a6ae18abe7124f3676268 Mon Sep 17 00:00:00 2001 From: Alex P Date: Thu, 7 Oct 2021 18:09:06 +0300 Subject: [PATCH 37/42] Rename new classes --- ...horizationstatusdetails.php => AuthorizationStatusDetails.php} | 0 .../src/Entity/{class-capturestatus.php => CaptureStatus.php} | 0 .../{class-capturestatusdetails.php => CaptureStatusDetails.php} | 0 .../Processor/{class-ordermetatrait.php => OrderMetaTrait.php} | 0 ...entstatushandlingtrait.php => PaymentsStatusHandlingTrait.php} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename modules/ppcp-api-client/src/Entity/{class-authorizationstatusdetails.php => AuthorizationStatusDetails.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-capturestatus.php => CaptureStatus.php} (100%) rename modules/ppcp-api-client/src/Entity/{class-capturestatusdetails.php => CaptureStatusDetails.php} (100%) rename modules/ppcp-wc-gateway/src/Processor/{class-ordermetatrait.php => OrderMetaTrait.php} (100%) rename modules/ppcp-wc-gateway/src/Processor/{class-paymentstatushandlingtrait.php => PaymentsStatusHandlingTrait.php} (100%) diff --git a/modules/ppcp-api-client/src/Entity/class-authorizationstatusdetails.php b/modules/ppcp-api-client/src/Entity/AuthorizationStatusDetails.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-authorizationstatusdetails.php rename to modules/ppcp-api-client/src/Entity/AuthorizationStatusDetails.php diff --git a/modules/ppcp-api-client/src/Entity/class-capturestatus.php b/modules/ppcp-api-client/src/Entity/CaptureStatus.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-capturestatus.php rename to modules/ppcp-api-client/src/Entity/CaptureStatus.php diff --git a/modules/ppcp-api-client/src/Entity/class-capturestatusdetails.php b/modules/ppcp-api-client/src/Entity/CaptureStatusDetails.php similarity index 100% rename from modules/ppcp-api-client/src/Entity/class-capturestatusdetails.php rename to modules/ppcp-api-client/src/Entity/CaptureStatusDetails.php diff --git a/modules/ppcp-wc-gateway/src/Processor/class-ordermetatrait.php b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Processor/class-ordermetatrait.php rename to modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php diff --git a/modules/ppcp-wc-gateway/src/Processor/class-paymentstatushandlingtrait.php b/modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php similarity index 100% rename from modules/ppcp-wc-gateway/src/Processor/class-paymentstatushandlingtrait.php rename to modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php From f4b2c5d7dfb2dad9d40666ca95a888c95bfd5e88 Mon Sep 17 00:00:00 2001 From: Alex P Date: Fri, 8 Oct 2021 10:19:28 +0300 Subject: [PATCH 38/42] Use composer update --lock because of composer-merge-plugin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 825b535f1..dcedab93e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "docker:shell": "docker-compose run --rm wp_dev bash", "docker:install": "docker-compose run --rm composer composer install && yarn run docker:build-js", "docker:build-js": "docker-compose run --rm build yarn run build:dev", - "docker:composer-update": "docker-compose run --rm composer composer update", + "docker:composer-update": "docker-compose run --rm composer composer update && docker-compose run --rm composer composer update --lock", "docker:test": "docker-compose run --rm test vendor/bin/phpunit", "docker:lint": "docker-compose run --rm test vendor/bin/phpcs --parallel=8 -s", "docker:fix-lint": "docker-compose run --rm test vendor/bin/phpcbf", From 196f143e658729409244a757b9bafda4a4b6134f Mon Sep 17 00:00:00 2001 From: Alex P Date: Fri, 8 Oct 2021 10:21:33 +0300 Subject: [PATCH 39/42] Fix docker build --- docker/Dockerfile_wp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 357ff2f1e..a698095d7 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -56,6 +56,7 @@ RUN apt-get install -y \ curl \ git \ yarn \ + ca-certificates \ # These are for extensions zlib1g-dev \ libicu-dev \ @@ -63,6 +64,9 @@ RUN apt-get install -y \ # For installing things from URL wget +# https://github.com/nodesource/distributions/issues/1266 +RUN update-ca-certificates + RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ php composer-setup.php --install-dir=/usr/bin --filename=composer --version=1.10.22 && \ php -r "unlink('composer-setup.php');" From f4d82e0de85afc3cfc60dae1036d60d12978cb57 Mon Sep 17 00:00:00 2001 From: Alex P Date: Fri, 8 Oct 2021 10:23:19 +0300 Subject: [PATCH 40/42] Fix namespace name, remove classmap --- composer.lock | 29 ++++++++++--------- .../src/Endpoint/PaymentsEndpoint.php | 2 +- .../ppcp-api-client/src/Entity/Capture.php | 4 +-- .../src/Factory/CaptureFactory.php | 2 +- .../src/Factory/PaymentsFactory.php | 2 +- .../ppcp-button/src/Assets/SmartButton.php | 2 +- modules/ppcp-wc-gateway/composer.json | 5 +--- modules/ppcp-wc-gateway/services.php | 2 +- .../src/Helper/DCCProductStatus.php | 2 +- .../src/Helper/SettingsStatus.php | 4 +-- .../Processor/AuthorizedPaymentsProcessor.php | 2 +- .../Processor/PaymentsStatusHandlingTrait.php | 2 +- .../src/Settings/PageMatcherTrait.php | 7 ----- .../src/Settings/SettingsRenderer.php | 4 +-- .../ApiClient/Endpoint/OrderEndpointTest.php | 2 +- .../Endpoint/PaymentsEndpointTest.php | 4 +-- .../ApiClient/Factory/PaymentsFactoryTest.php | 2 +- .../WcGateway/Gateway/WcGatewayTest.php | 2 +- .../AuthorizedPaymentsProcessorTest.php | 2 +- .../Processor/OrderProcessorTest.php | 2 +- 20 files changed, 36 insertions(+), 47 deletions(-) diff --git a/composer.lock b/composer.lock index f71c236a2..85469abd8 100644 --- a/composer.lock +++ b/composer.lock @@ -39,16 +39,16 @@ }, { "name": "dhii/collections-interface", - "version": "v0.3.0-alpha4", + "version": "v0.3.0", "source": { "type": "git", "url": "https://github.com/Dhii/collections-interface.git", - "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee" + "reference": "74464a969b340d16889eacd9eadc9817f7e7f47a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/da334f75f6477ef7eecaf28df1d5253fe05684ee", - "reference": "da334f75f6477ef7eecaf28df1d5253fe05684ee", + "url": "https://api.github.com/repos/Dhii/collections-interface/zipball/74464a969b340d16889eacd9eadc9817f7e7f47a", + "reference": "74464a969b340d16889eacd9eadc9817f7e7f47a", "shasum": "" }, "require": { @@ -58,7 +58,7 @@ "require-dev": { "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", "slevomat/coding-standard": "^6.0", - "vimeo/psalm": "^3.11.7 | ^4.0" + "vimeo/psalm": "^4.0" }, "type": "library", "extra": { @@ -86,33 +86,34 @@ } ], "description": "A highly ISP-compliant collection of interfaces that represent maps and lists.", - "time": "2021-03-09T17:36:34+00:00" + "time": "2021-10-06T10:56:09+00:00" }, { "name": "dhii/containers", - "version": "v0.1.2", + "version": "v0.1.4", "source": { "type": "git", "url": "https://github.com/Dhii/containers.git", - "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64" + "reference": "42ab24683183fa0dc155f26c6a470ef697bbdc9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/containers/zipball/b753f1d8eee7bf58ebbeb815b55a634785bcdb64", - "reference": "b753f1d8eee7bf58ebbeb815b55a634785bcdb64", + "url": "https://api.github.com/repos/Dhii/containers/zipball/42ab24683183fa0dc155f26c6a470ef697bbdc9a", + "reference": "42ab24683183fa0dc155f26c6a470ef697bbdc9a", "shasum": "" }, "require": { "container-interop/service-provider": "^0.4", - "dhii/collections-interface": "^0.3.0-alpha2", + "dhii/collections-interface": "^0.3.0-alpha4", "php": "^7.1 | ^8.0" }, "require-dev": { "gmazzap/andrew": "^1.1", - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", "psr/container": "^1.0", "psr/simple-cache": "^1.0", - "slevomat/coding-standard": "~4.0", + "slevomat/coding-standard": "^6.0", + "vimeo/psalm": "^4.0", "wildwolf/psr-memory-cache": "^1.0" }, "type": "library", @@ -141,7 +142,7 @@ "PSR-11", "container" ], - "time": "2020-10-22T10:20:26+00:00" + "time": "2021-10-06T11:13:51+00:00" }, { "name": "dhii/module-interface", diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php index dc5f21743..d750cecf8 100644 --- a/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php +++ b/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php @@ -11,7 +11,7 @@ namespace WooCommerce\PayPalCommerce\ApiClient\Endpoint; use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\Refund; use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException; use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException; diff --git a/modules/ppcp-api-client/src/Entity/Capture.php b/modules/ppcp-api-client/src/Entity/Capture.php index 4b4853add..c45f8351a 100644 --- a/modules/ppcp-api-client/src/Entity/Capture.php +++ b/modules/ppcp-api-client/src/Entity/Capture.php @@ -4,12 +4,12 @@ * * @link https://developer.paypal.com/docs/api/orders/v2/#definition-capture * - * @package Woocommerce\PayPalCommerce\ApiClient\Entity + * @package WooCommerce\PayPalCommerce\ApiClient\Entity */ declare( strict_types=1 ); -namespace Woocommerce\PayPalCommerce\ApiClient\Entity; +namespace WooCommerce\PayPalCommerce\ApiClient\Entity; /** * Class Capture diff --git a/modules/ppcp-api-client/src/Factory/CaptureFactory.php b/modules/ppcp-api-client/src/Factory/CaptureFactory.php index ec0309014..beee6753a 100644 --- a/modules/ppcp-api-client/src/Factory/CaptureFactory.php +++ b/modules/ppcp-api-client/src/Factory/CaptureFactory.php @@ -9,7 +9,7 @@ declare( strict_types=1 ); namespace WooCommerce\PayPalCommerce\ApiClient\Factory; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatusDetails; diff --git a/modules/ppcp-api-client/src/Factory/PaymentsFactory.php b/modules/ppcp-api-client/src/Factory/PaymentsFactory.php index 353c71f44..81f99e53f 100644 --- a/modules/ppcp-api-client/src/Factory/PaymentsFactory.php +++ b/modules/ppcp-api-client/src/Factory/PaymentsFactory.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\ApiClient\Factory; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\Payments; /** diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php index c9ebc52fc..b9a4d25d7 100644 --- a/modules/ppcp-button/src/Assets/SmartButton.php +++ b/modules/ppcp-button/src/Assets/SmartButton.php @@ -22,7 +22,7 @@ use WooCommerce\PayPalCommerce\Session\SessionHandler; use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper; use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; -use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; /** diff --git a/modules/ppcp-wc-gateway/composer.json b/modules/ppcp-wc-gateway/composer.json index af57a6f8e..c8a15a7d6 100644 --- a/modules/ppcp-wc-gateway/composer.json +++ b/modules/ppcp-wc-gateway/composer.json @@ -10,10 +10,7 @@ "autoload": { "psr-4": { "WooCommerce\\PayPalCommerce\\WcGateway\\": "src" - }, - "classmap": [ - "src" - ] + } }, "minimum-stability": "dev", "prefer-stable": true diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 3c23d2357..7ae429d8d 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -28,7 +28,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; use WooCommerce\PayPalCommerce\WcGateway\Gateway\TransactionUrlProvider; use WooCommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus; -use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; use WooCommerce\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice; use WooCommerce\PayPalCommerce\WcGateway\Notice\ConnectAdminNotice; use WooCommerce\PayPalCommerce\WcGateway\Notice\DccWithoutPayPalAdminNotice; diff --git a/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php index 4430469b1..ba48b4b54 100644 --- a/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php +++ b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php @@ -2,7 +2,7 @@ /** * Manage the Seller status. * - * @package Woocommerce\PayPalCommerce\WcGateway\Helper + * @package WooCommerce\PayPalCommerce\WcGateway\Helper */ declare( strict_types=1 ); diff --git a/modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php b/modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php index f74355a1a..d707dc8f1 100644 --- a/modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php +++ b/modules/ppcp-wc-gateway/src/Helper/SettingsStatus.php @@ -2,12 +2,12 @@ /** * Helper to get settings status. * - * @package Woocommerce\PayPalCommerce\WcGateway\Helper + * @package WooCommerce\PayPalCommerce\WcGateway\Helper */ declare(strict_types=1); -namespace Woocommerce\PayPalCommerce\WcGateway\Helper; +namespace WooCommerce\PayPalCommerce\WcGateway\Helper; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; diff --git a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php index 7e19cd85f..cc232ad04 100644 --- a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php +++ b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php @@ -15,7 +15,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; use WooCommerce\PayPalCommerce\ApiClient\Entity\AuthorizationStatus; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; diff --git a/modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php b/modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php index 20d56be72..06eb74d5e 100644 --- a/modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php +++ b/modules/ppcp-wc-gateway/src/Processor/PaymentsStatusHandlingTrait.php @@ -12,7 +12,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Processor; use WC_Order; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; use WooCommerce\PayPalCommerce\ApiClient\Entity\AuthorizationStatus; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException; diff --git a/modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php b/modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php index f47388c85..f3b41fdfb 100644 --- a/modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php +++ b/modules/ppcp-wc-gateway/src/Settings/PageMatcherTrait.php @@ -9,15 +9,8 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\WcGateway\Settings; -use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message; -use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies; -use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply; -use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; -use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; -use Woocommerce\PayPalCommerce\WcGateway\Helper\DccProductStatus; -use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; use WooCommerce\PayPalCommerce\Webhooks\Status\WebhooksStatusPage; /** diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php index 61e555d9d..3ffcaf3e0 100644 --- a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php +++ b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php @@ -15,9 +15,9 @@ use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply; use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway; use Psr\Container\ContainerInterface; -use Woocommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus; use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway; -use Woocommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; +use WooCommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus; /** * Class SettingsRenderer diff --git a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php index 16bd945f7..b64e3c34c 100644 --- a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php +++ b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php @@ -7,7 +7,7 @@ use Hamcrest\Matchers; use Requests_Utility_CaseInsensitiveDictionary; use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer; use WooCommerce\PayPalCommerce\ApiClient\Entity\ApplicationContext; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus; diff --git a/tests/PHPUnit/ApiClient/Endpoint/PaymentsEndpointTest.php b/tests/PHPUnit/ApiClient/Endpoint/PaymentsEndpointTest.php index 337d58ebf..f47282e76 100644 --- a/tests/PHPUnit/ApiClient/Endpoint/PaymentsEndpointTest.php +++ b/tests/PHPUnit/ApiClient/Endpoint/PaymentsEndpointTest.php @@ -8,13 +8,11 @@ use Psr\Log\NullLogger; use Requests_Utility_CaseInsensitiveDictionary; use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; -use WooCommerce\PayPalCommerce\ApiClient\Entity\ErrorResponseCollection; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\Token; use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException; use WooCommerce\PayPalCommerce\ApiClient\Factory\AuthorizationFactory; use WooCommerce\PayPalCommerce\ApiClient\Factory\CaptureFactory; -use WooCommerce\PayPalCommerce\ApiClient\Factory\ErrorResponseCollectionFactory; use WooCommerce\PayPalCommerce\ApiClient\TestCase; use Mockery; diff --git a/tests/PHPUnit/ApiClient/Factory/PaymentsFactoryTest.php b/tests/PHPUnit/ApiClient/Factory/PaymentsFactoryTest.php index 639d940a4..3540c3905 100644 --- a/tests/PHPUnit/ApiClient/Factory/PaymentsFactoryTest.php +++ b/tests/PHPUnit/ApiClient/Factory/PaymentsFactoryTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\ApiClient\Factory; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\Payments; use WooCommerce\PayPalCommerce\ApiClient\TestCase; use Mockery; diff --git a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php index 8d3ad40e5..7a1add591 100644 --- a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php +++ b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php @@ -5,7 +5,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Gateway; use Psr\Container\ContainerInterface; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\State; diff --git a/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php index 1f7bed337..80ab8cf29 100644 --- a/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php +++ b/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php @@ -10,7 +10,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; use WooCommerce\PayPalCommerce\ApiClient\Entity\AuthorizationStatus; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\ApiClient\Entity\Payments; diff --git a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php index 13019b4c1..9872019a3 100644 --- a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php +++ b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php @@ -9,7 +9,7 @@ use Psr\Log\LoggerInterface; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization; use WooCommerce\PayPalCommerce\ApiClient\Entity\AuthorizationStatus; -use Woocommerce\PayPalCommerce\ApiClient\Entity\Capture; +use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture; use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus; From c0a727e4a85ecf1e51b60a26f371a7cb94f7e6e0 Mon Sep 17 00:00:00 2001 From: "Jorge A. Torres" Date: Tue, 12 Oct 2021 10:28:52 -0300 Subject: [PATCH 41/42] Update release date for 1.6.1 --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 87329bfa6..1f4e6c82a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ *** Changelog *** -= 1.6.1 - TBD = += 1.6.1 - 2021-10-12 = * Fix - Handle authorization capture failures #312 * Fix - Handle denied payment authorization #302 * Fix - Handle failed authorizations when capturing order #303 From 34a18b359faa404df2a908ad8ff3e95db854a991 Mon Sep 17 00:00:00 2001 From: Ratnakar Dubey Date: Wed, 13 Oct 2021 15:46:33 +0530 Subject: [PATCH 42/42] Rename file from class-createorderendpoint.php to CreateOrderEndpoint.php to follow PSR-4 --- .../{class-createorderendpoint.php => CreateOrderEndpoint.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/ppcp-button/src/Endpoint/{class-createorderendpoint.php => CreateOrderEndpoint.php} (100%) diff --git a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php similarity index 100% rename from modules/ppcp-button/src/Endpoint/class-createorderendpoint.php rename to modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php