woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-30 05:00:51 +08:00
Code Issues Projects Packages Wiki Activity Actions 18

Merge branch 'trunk'

Browse source 
# Conflicts:
#	composer.lock
This commit is contained in:
Philipp Stracker 2024-09-04 15:40:55 +02:00
commit 68095ed7b6
No known key found for this signature in database
10 changed files with 158 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
.distignore Normal file
View file

@ -0,0 +1,33 @@
.distignore
.editorconfig
.gitattributes
.gitignore
.eslintrc
.ddev
.git*
.phpstorm*
.idea
*.env*
.psalm*
tests
*.xml*
.phpunit.result.cache
babel.config.json
node_modules
resources
*.lock
webpack.config.js
wp-cli.yml
ngrok.yml
composer.json
package.json
package-lock.json
.composer_compiled_assets
assets-compiler.json
patchwork.json
.babelrc
README.md
wordpress_org_assets
.DS_Store
auth.json
*.log

36
.github/workflows/package-new.yml vendored Normal file
View file

@ -0,0 +1,36 @@
name: Build package (New)
on:
workflow_dispatch:
inputs:
packageVersion:
description: 'Package version'
required: false
type: string
jobs:
check_version:
runs-on: ubuntu-latest
env:
PACKAGE_VERSION: ${{ github.event.inputs.packageVersion }}
outputs:
version: ${{ env.PACKAGE_VERSION }}
name: Check version
steps:
- uses: actions/checkout@v4
- name: Fix plugin version input # Add the version number if only suffix entered
run: echo "PACKAGE_VERSION=$(sed -nE '/Version:/s/.* ([0-9.]+).*/\1/p' woocommerce-paypal-payments.php)-$PACKAGE_VERSION" >> $GITHUB_ENV
if: env.PACKAGE_VERSION && !contains(env.PACKAGE_VERSION, '.')
- name: Fill plugin version # If the version number was not set, retrieve it from the file
run: echo "PACKAGE_VERSION=$(sed -nE '/Version:/s/.* ([0-9.]+).*/\1/p' woocommerce-paypal-payments.php)" >> $GITHUB_ENV
if: "!env.PACKAGE_VERSION"
create_archive:
needs: check_version
uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@feature/prefixed-archives
with:
PHP_VERSION: 7.2
PLUGIN_MAIN_FILE: ./woocommerce-paypal-payments.php
PLUGIN_VERSION: ${{ needs.check_version.outputs.version }}
ARCHIVE_NAME: woocommerce-paypal-payments-${{ needs.check_version.outputs.version }}
COMPILE_ASSETS_ARGS: '-vv --env=root'

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ modules/*/assets/*
auth.json
.DS_Store
tests/.DS_Store
.composer_compiled_assets

4
assets-compiler.json Normal file
View file

@ -0,0 +1,4 @@
{
"dependencies": "install",
"commands": "yarn"
}

2
changelog.txt
View file

@ -1,6 +1,6 @@
*** Changelog ***
= 2.9.0 - xxxx-xx-xx =
= 2.9.0 - 2024-09-02 =
* Fix - Fatal error in Block Editor when using WooCommerce blocks #2534
* Fix - Can't pay from block pages when the shipping callback is enabled and no shipping methods defined #2429
* Fix - Various Google Pay button fixes #2496

11
composer.json
View file

@ -14,6 +14,7 @@
"symfony/polyfill-php80": "^1.19"
},
"require-dev": {
"inpsyde/composer-assets-compiler": "^2.5",
"psr/container": "^1.0",
"dhii/module-interface": "^0.2 || ^0.3",
"container-interop/service-provider": "^0.4.0",
@ -70,6 +71,15 @@
"vendor/bin/phpcbf"
]
},
"composer-asset-compiler": {
"auto-run": false,
"packages": {
"inpsyde/*": {
"dependencies": "install",
"script": "build"
}
}
},
"mozart": {
"dep_namespace": "WooCommerce\\PayPalCommerce\\Vendor\\",
"dep_directory": "/lib/packages/",
@ -89,6 +99,7 @@
"php": "7.2"
},
"allow-plugins": {
"inpsyde/composer-assets-compiler": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"wikimedia/composer-merge-plugin": true
}

67
composer.lock generated
View file

@ -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": "dc32884a51201e6beee788e0c860d088",
"content-hash": "4ada1f9416971ef72b0587ca34b32cc1",
"packages": [
{
"name": "container-interop/service-provider",
@ -1706,6 +1706,71 @@
},
"time": "2020-07-09T08:09:16+00:00"
},
{
"name": "inpsyde/composer-assets-compiler",
"version": "2.5.3",
"source": {
"type": "git",
"url": "https://github.com/inpsyde/composer-asset-compiler.git",
"reference": "3db3bea66088421377b725d110bd16ee23716c05"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/inpsyde/composer-asset-compiler/zipball/3db3bea66088421377b725d110bd16ee23716c05",
"reference": "3db3bea66088421377b725d110bd16ee23716c05",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1 || ^2",
"ext-json": "*",
"php": ">= 7.2"
},
"require-dev": {
"composer/composer": "^2.1.9",
"inpsyde/php-coding-standards": "^1@dev",
"mikey179/vfsstream": "^1.6.10",
"mockery/mockery": "^1.3.5",
"phpunit/phpunit": "^8.5.21",
"vimeo/psalm": "^4.16.1"
},
"type": "composer-plugin",
"extra": {
"class": "Inpsyde\\AssetsCompiler\\Composer\\Plugin",
"branch-alias": {
"dev-master": "2.x-dev",
"dev-v1.x": "1.x-dev",
"dev-v2.x": "2.x-dev",
"dev-v3.x": "3.x-dev"
}
},
"autoload": {
"psr-4": {
"Inpsyde\\AssetsCompiler\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Inpsyde GmbH",
"email": "hello@inpsyde.com",
"homepage": "https://inpsyde.com/",
"role": "Company"
},
{
"name": "Giuseppe Mazzapica",
"email": "g.mazzapica@inpsyde.com"
}
],
"description": "Composer plugin that installs and compile frontend dependencies for installed Composer packages based on configuration.",
"support": {
"issues": "https://github.com/inpsyde/composer-asset-compiler/issues",
"source": "https://github.com/inpsyde/composer-asset-compiler/tree/2.5.3"
},
"time": "2024-03-07T12:11:10+00:00"
},
{
"name": "inpsyde/modularity",
"version": "1.8.0",

2
package.json
View file

@ -96,7 +96,7 @@
"prearchive": "rm -rf $npm_package_name.zip",
"archive": "zip -r $npm_package_name.zip . -x **.git/\\* **node_modules/\\*",
"postarchive": "yarn run archive:cleanup && rm -rf $npm_package_name && unzip $npm_package_name.zip -d $npm_package_name && rm $npm_package_name.zip && zip -r $npm_package_name.zip $npm_package_name && rm -rf $npm_package_name",
"archive:cleanup": "zip -d $npm_package_name.zip .env* .ddev/\\* \\*.idea/\\* .editorconfig .eslintrc babel.config.json tests/\\* \\*test/\\* .github/\\* .psalm/\\* wordpress_org_assets/\\* \\*.DS_Store \\*README.md \\*.gitattributes \\*.gitignore \\*composer.json \\*composer.lock patchwork.json phpunit.xml.dist .phpunit.result.cache phpcs.xml* psalm*.xml* playwright.config.js wp-cli.yml \\*.babelrc \\*package.json \\*webpack.config.js \\*yarn.lock \\*.travis.yml\\"
"archive:cleanup": "zip -d $npm_package_name.zip .env* .ddev/\\* \\*.idea/\\* .editorconfig tests/\\* .github/\\* .psalm/\\* wordpress_org_assets/\\* \\*.DS_Store \\*README.md \\*.gitattributes \\*.gitignore \\*composer.json \\*composer.lock patchwork.json phpunit.xml.dist .phpunit.result.cache phpcs.xml* psalm*.xml* playwright.config.js wp-cli.yml \\*.babelrc \\*package.json \\*webpack.config.js \\*yarn.lock \\*.travis.yml\\"
},
"config": {
"wp_org_slug": "woocommerce-paypal-payments"

4
readme.txt
View file

@ -1,6 +1,6 @@
=== WooCommerce PayPal Payments ===
Contributors: woocommerce, automattic, syde
Tags: woocommerce, paypal, payments, ecommerce, checkout, cart, pay later, apple pay, subscriptions, debit card, credit card, google pay
Tags: woocommerce, paypal, payments, ecommerce, credit card
Requires at least: 5.3
Tested up to: 6.6
Requires PHP: 7.2
@ -179,7 +179,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
== Changelog ==
= 2.9.0 - xxxx-xx-xx =
= 2.9.0 - 2024-09-02 =
* Fix - Fatal error in Block Editor when using WooCommerce blocks #2534
* Fix - Can't pay from block pages when the shipping callback is enabled and no shipping methods defined #2429
* Fix - Various Google Pay button fixes #2496

6
yarn.lock
View file

@ -3031,9 +3031,9 @@ axe-core@=4.7.0:
integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==
axios@^1.6.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
version "1.7.7"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
dependencies:
follow-redirects "^1.15.6"
form-data "^4.0.0"