Skip to content

Commit

Permalink
Merge branch 'main' into release/6.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
DouglasCorreiaMeli authored Oct 10, 2024
2 parents 6ebe145 + d672eaf commit b52d643
Show file tree
Hide file tree
Showing 886 changed files with 82,972 additions and 63,843 deletions.
13 changes: 3 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,11 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = tab

[{*.yml,*.neon,*.js}]
indent_style = space
indent_size = 2

[{composer.json,composer.lock,package.json}]
indent_style = space
indent_size = 4

[{*.yml,*.neon,*.js,*.css}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false

[readme.txt]
indent_style = space
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.3'
coverage: none
tools: composer, cs2pr

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

- name: Detect coding standard violations
run: vendor/bin/phpcs -q --report=checkstyle --standard=phpcs.xml includes templates woocommerce-mercadopago.php | cs2pr --graceful-warnings
run: vendor/bin/phpcs -q --report=checkstyle --standard=phpcs.xml src assets templates woocommerce-mercadopago.php | cs2pr --graceful-warnings
51 changes: 0 additions & 51 deletions .github/workflows/phpunit.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: publish-release

on:
push:
branches: [ master ]

jobs:
publish-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: get-npm-version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Setup release
env:
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
SSH_SDK_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY_PHP_SDK }}
DESTINATION_REPOSITORY_USERNAME: 'mercadopago'
DESTINATION_REPOSITORY_NAME: 'cart-woocommerce'
GIT_USER_NAME: 'Mercado Pago'
GIT_USER_EMAIL: '[email protected]'
PACKAGE_VERSION: ${{ steps.package-version.outputs.current-version }}
run: bin/setup-release.sh
55 changes: 55 additions & 0 deletions .github/workflows/qit-checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: WooCommerce QIT Checks

on:
pull_request:
branches:
- main
- develop

permissions:
pull-requests: write

jobs:
run-qit-checks:
runs-on: ubuntu-20.04
env:
NO_COLOR: 1
QIT_DISABLE_ONBOARDING: yes

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Install Composer dependencies
run: composer install

- name: Make Build
run: make build

- name: Install QIT via Composer
run: composer require woocommerce/qit-cli

- name: Add Partner
run: ./vendor/bin/qit partner:add --user='${{ secrets.PARTNER_USER }}' --application_password='${{ secrets.PARTNER_SECRET }}'

- name: Run QIT E2E tests
run: ./vendor/bin/qit run:woo-e2e woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait

- name: Run PHPStan QIT checks
run: ./vendor/bin/qit run:phpstan woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait

- name: Run PHP Compatibility checks
run: ./vendor/bin/qit run:phpcompatibility woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait

- name: Run Security checks
run: ./vendor/bin/qit run:security woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait

- name: Run Woo API tests
run: ./vendor/bin/qit run:woo-api woocommerce-mercadopago --zip=woocommerce-mercadopago.zip --wait

- uses: marocchino/sticky-pull-request-comment@v2
if: failure()
with:
header: QIT Test Results
recreate: true
path: result.txt
16 changes: 12 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
node_modules
.DS_Store
.vscode
.idea
.idea/
*.cache

clover.xml
coverage

/.idea/
/.vscode/
/vendor/
/node_modules/
/code_analysis

woocommerce-mercadopago.zip

qit-env.yml
31 changes: 0 additions & 31 deletions .husky/_/husky.sh

This file was deleted.

22 changes: 0 additions & 22 deletions .husky/pre-commit

This file was deleted.

4 changes: 2 additions & 2 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node_modules
vendor
**/*.min.js
node_modules
**/*.min.js
6 changes: 3 additions & 3 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"boss": true,
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
Expand All @@ -11,7 +11,7 @@
"trailing": true,
"undef": true,
"unused": true,
"esversion": 6,
"esversion": 11,
"browser": true,
"globals": {
"_": false,
Expand All @@ -22,4 +22,4 @@
"console": false,
"module": false
}
}
}
7 changes: 7 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

return (new PhpCsFixer\Config())
->setRules(array_fill_keys([
'nullable_type_declaration_for_default_null_value',
], true))
->setFinder(PhpCsFixer\Finder::create()->in(__DIR__));
23 changes: 20 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
repos:
# Websec hook is MANDATORY, DO NOT comment it.
- repo: https://github.com/melisource/fury_websec-git-hooks
rev: v1.0.5
- repo: git@github.com-emu:melisource/fury_websec-git-hooks
rev: v2.0.0
hooks:
- id: pre_commit_hook
stages: [commit]
- id: post_commit_hook
stages: [post-commit]
stages: [post-commit]

- repo: [email protected]:melisource/fury_datasec-git-hooks.git
rev: 1.2.0
hooks:
- id: pre_commit_hook
stages: [commit]
verbose: true
- id: post_commit_hook
stages: [post-commit]

- repo: local
hooks:
- id: add-index
name: Add index.php
stages: [pre-commit]
language: script
entry: ./bin/add-index.sh
19 changes: 19 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"arrowParens": "always",
"bracketSpacing": true,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "ignore",
"insertPragma": false,
"jsxSingleQuote": false,
"printWidth": 120,
"proseWrap": "always",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": false,
"vueIndentScriptAndStyle": false,
"embeddedLanguageFormatting": "off"
}
Loading

0 comments on commit b52d643

Please sign in to comment.