From 0235abdb4b187841766202509808263bbe0d7945 Mon Sep 17 00:00:00 2001 From: carmenmaymo Date: Fri, 20 Oct 2023 08:15:33 +0200 Subject: [PATCH 1/2] Remove housekeeping action --- .github/workflows/housekeeping.yml | 55 ------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 .github/workflows/housekeeping.yml diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml deleted file mode 100644 index 9d89454b..00000000 --- a/.github/workflows/housekeeping.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Housekeeping - -on: - workflow_dispatch: - push: - branches-ignore: - # We expect PRs to be merged when they are "clean". After merge, we don't need to re-trigger on develop - - 'develop' - -jobs: - housekeeping: - permissions: - # Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository. - contents: write - runs-on: ubuntu-latest - steps: - - uses: "actions/checkout@v2" - - name: Store branch and latest SHA - id: git - run: | - echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - uses: "shivammathur/setup-php@v2" - with: - php-version: "7.2" - - uses: "ramsey/composer-install@v2" - with: - composer-options: "--prefer-dist" - - name: "Run PHPCBF" - run: "composer fix-coding-standards || true" - - - name: "Install node modules" - run: "npm install" - - - name: "Install WP-CLI" - run: | - mkdir ~/wp-cli && cd ~/wp-cli - curl -L https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar --output wp - chmod +x wp - sudo ln -s ~/wp-cli/wp /usr/local/bin/wp - - name: "Create updated .pot file" - run: | - wp i18n make-pot . ./languages/en_GB.pot --skip-audit --allow-root - - # For now, any workflow run would result in a commit due to the updated timestamp even if there are no changes in translations - # We should figure out a way to only set the timestamp when there are new translations, but for now, - # let's just remove that timestamp entirely - - name: "Remove POT-Creation-Date" - run: sed -i '/POT-Creation-Date/d' ./languages/en_GB.pot - - - uses: "stefanzweifel/git-auto-commit-action@v4" - with: - push_options: --force - # This task should never update dependencies - file_pattern: :!*.lock From ab3e073e1c5292faa6d0a0b1e02b3a3532039c81 Mon Sep 17 00:00:00 2001 From: carmenmaymo Date: Fri, 20 Oct 2023 08:22:22 +0200 Subject: [PATCH 2/2] Fix CS --- .../ApplePayButton/ApplePayDataObjectHttp.php | 2 +- src/PaymentMethods/Kbc.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php b/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php index 38f91294..db7f6919 100644 --- a/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php +++ b/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php @@ -326,7 +326,7 @@ protected function addressHasRequiredFieldsValues( sprintf('ApplePay Data Error: Missing value for %s', $requiredField) ); $this->errors[] - = [ + = [ 'errorCode' => $errorCode, 'contactField' => $errorValue, ]; diff --git a/src/PaymentMethods/Kbc.php b/src/PaymentMethods/Kbc.php index 361116ed..5c220cac 100644 --- a/src/PaymentMethods/Kbc.php +++ b/src/PaymentMethods/Kbc.php @@ -6,10 +6,10 @@ class Kbc extends AbstractPaymentMethod implements PaymentMethodI { -protected const DEFAULT_ISSUERS_DROPDOWN = 'yes'; -protected function getConfig(): array -{ - return [ + protected const DEFAULT_ISSUERS_DROPDOWN = 'yes'; + protected function getConfig(): array + { + return [ 'id' => 'kbc', 'defaultTitle' => __('KBC/CBC Payment Button', 'mollie-payments-for-woocommerce'), 'settingsDescription' => '', @@ -23,10 +23,10 @@ protected function getConfig(): array 'filtersOnBuild' => false, 'confirmationDelayed' => true, 'SEPA' => true, - ]; -} + ]; + } -public function getFormFields($generalFormFields): array + public function getFormFields($generalFormFields): array { $paymentMethodFormFieds = [ 'issuers_dropdown_shown' => [