Skip to content

Commit b52d643

Browse files
DouglasCorreiaMeliDouglasCorreiaMeli
authored
Merge branch 'main' into release/6.9.3
2 parents 6ebe145 + d672eaf commit b52d643

File tree

886 files changed

+82972
-63843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

886 files changed

+82972
-63843
lines changed

‎.editorconfig

+3-10
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,11 @@ charset = utf-8
1111
end_of_line = lf
1212
insert_final_newline = true
1313
trim_trailing_whitespace = true
14-
indent_style = tab
15-
16-
[{*.yml,*.neon,*.js}]
17-
indent_style = space
18-
indent_size = 2
19-
20-
[{composer.json,composer.lock,package.json}]
2114
indent_style = space
2215
indent_size = 4
2316

17+
[{*.yml,*.neon,*.js,*.css}]
18+
indent_size = 2
19+
2420
[*.md]
2521
trim_trailing_whitespace = false
26-
27-
[readme.txt]
28-
indent_style = space

‎includes/admin/hooks/mercadopago-settings/.gitkeep ‎.github/.gitkeep

File renamed without changes.

‎.github/workflows/phpcs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup PHP
1313
uses: shivammathur/setup-php@v2
1414
with:
15-
php-version: '7.4'
15+
php-version: '8.3'
1616
coverage: none
1717
tools: composer, cs2pr
1818

@@ -33,4 +33,4 @@ jobs:
3333
run: composer install --prefer-dist --no-suggest --no-progress
3434

3535
- name: Detect coding standard violations
36-
run: vendor/bin/phpcs -q --report=checkstyle --standard=phpcs.xml includes templates woocommerce-mercadopago.php | cs2pr --graceful-warnings
36+
run: vendor/bin/phpcs -q --report=checkstyle --standard=phpcs.xml src assets templates woocommerce-mercadopago.php | cs2pr --graceful-warnings

‎.github/workflows/phpunit.yml

-51
This file was deleted.

‎.github/workflows/publish-release.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: publish-release
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
publish-release:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: get-npm-version
13+
id: package-version
14+
uses: martinbeentjes/npm-get-version-action@main
15+
- name: Setup release
16+
env:
17+
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
18+
SSH_SDK_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY_PHP_SDK }}
19+
DESTINATION_REPOSITORY_USERNAME: 'mercadopago'
20+
DESTINATION_REPOSITORY_NAME: 'cart-woocommerce'
21+
GIT_USER_NAME: 'Mercado Pago'
22+
GIT_USER_EMAIL: '[email protected]'
23+
PACKAGE_VERSION: ${{ steps.package-version.outputs.current-version }}
24+
run: bin/setup-release.sh

‎.github/workflows/qit-checks.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: WooCommerce QIT Checks
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- develop
8+
9+
permissions:
10+
pull-requests: write
11+
12+
jobs:
13+
run-qit-checks:
14+
runs-on: ubuntu-20.04
15+
env:
16+
NO_COLOR: 1
17+
QIT_DISABLE_ONBOARDING: yes
18+
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v3
22+
23+
- name: Install Composer dependencies
24+
run: composer install
25+
26+
- name: Make Build
27+
run: make build
28+
29+
- name: Install QIT via Composer
30+
run: composer require woocommerce/qit-cli
31+
32+
- name: Add Partner
33+
run: ./vendor/bin/qit partner:add --user='${{ secrets.PARTNER_USER }}' --application_password='${{ secrets.PARTNER_SECRET }}'
34+
35+
- name: Run QIT E2E tests
36+
run: ./vendor/bin/qit run:woo-e2e woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait
37+
38+
- name: Run PHPStan QIT checks
39+
run: ./vendor/bin/qit run:phpstan woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait
40+
41+
- name: Run PHP Compatibility checks
42+
run: ./vendor/bin/qit run:phpcompatibility woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait
43+
44+
- name: Run Security checks
45+
run: ./vendor/bin/qit run:security woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait
46+
47+
- name: Run Woo API tests
48+
run: ./vendor/bin/qit run:woo-api woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait
49+
50+
- uses: marocchino/sticky-pull-request-comment@v2
51+
if: failure()
52+
with:
53+
header: QIT Test Results
54+
recreate: true
55+
path: result.txt

‎.gitignore

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
node_modules
21
.DS_Store
3-
.vscode
4-
.idea
5-
.idea/
2+
*.cache
3+
4+
clover.xml
5+
coverage
6+
7+
/.idea/
8+
/.vscode/
69
/vendor/
10+
/node_modules/
11+
/code_analysis
12+
713
woocommerce-mercadopago.zip
14+
15+
qit-env.yml

‎.husky/_/husky.sh

-31
This file was deleted.

‎.husky/pre-commit

-22
This file was deleted.

‎.jshintignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
node_modules
21
vendor
3-
**/*.min.js
2+
node_modules
3+
**/*.min.js

‎.jshintrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"boss": true,
2+
"boss": true,
33
"curly": true,
44
"eqeqeq": true,
55
"eqnull": true,
@@ -11,7 +11,7 @@
1111
"trailing": true,
1212
"undef": true,
1313
"unused": true,
14-
"esversion": 6,
14+
"esversion": 11,
1515
"browser": true,
1616
"globals": {
1717
"_": false,
@@ -22,4 +22,4 @@
2222
"console": false,
2323
"module": false
2424
}
25-
}
25+
}

‎.php-cs-fixer.php

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
return (new PhpCsFixer\Config())
4+
->setRules(array_fill_keys([
5+
'nullable_type_declaration_for_default_null_value',
6+
], true))
7+
->setFinder(PhpCsFixer\Finder::create()->in(__DIR__));

‎.pre-commit-config.yaml

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
repos:
22
# Websec hook is MANDATORY, DO NOT comment it.
3-
- repo: https://github.com/melisource/fury_websec-git-hooks
4-
rev: v1.0.5
3+
- repo: git@github.com-emu:melisource/fury_websec-git-hooks
4+
rev: v2.0.0
55
hooks:
66
- id: pre_commit_hook
77
stages: [commit]
88
- id: post_commit_hook
9-
stages: [post-commit]
9+
stages: [post-commit]
10+
11+
- repo: [email protected]:melisource/fury_datasec-git-hooks.git
12+
rev: 1.2.0
13+
hooks:
14+
- id: pre_commit_hook
15+
stages: [commit]
16+
verbose: true
17+
- id: post_commit_hook
18+
stages: [post-commit]
19+
20+
- repo: local
21+
hooks:
22+
- id: add-index
23+
name: Add index.php
24+
stages: [pre-commit]
25+
language: script
26+
entry: ./bin/add-index.sh

‎.prettierrc

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"arrowParens": "always",
3+
"bracketSpacing": true,
4+
"endOfLine": "lf",
5+
"htmlWhitespaceSensitivity": "ignore",
6+
"insertPragma": false,
7+
"jsxSingleQuote": false,
8+
"printWidth": 120,
9+
"proseWrap": "always",
10+
"quoteProps": "as-needed",
11+
"requirePragma": false,
12+
"semi": true,
13+
"singleQuote": true,
14+
"tabWidth": 2,
15+
"trailingComma": "all",
16+
"useTabs": false,
17+
"vueIndentScriptAndStyle": false,
18+
"embeddedLanguageFormatting": "off"
19+
}

0 commit comments

Comments
 (0)