Skip to content

Commit

Permalink
Merge pull request #47 from bobbrodie/master
Browse files Browse the repository at this point in the history
SP-638 Regenerate composer.lock to support PHP 8.0 and bump version
  • Loading branch information
bobbrodie committed Jul 24, 2023
2 parents d7b24e3 + 698c129 commit 9df997f
Show file tree
Hide file tree
Showing 59 changed files with 2,951 additions and 1,017 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
name: Build

on:
pull_request:
types:
- opened
- reopened
push:
branches-ignore:
- 'master'
on: [push, pull_request]

jobs:
phpcs:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

strategy:
matrix:
Expand All @@ -21,4 +14,4 @@ jobs:
- uses: actions/checkout@v3
- name: Run WordPress code standard
run: |
./vendor/bin/phpcs -v --ignore=vendor,wpcs --standard=./phpcs.xml ./
./vendor/bin/phpcs -v --ignore=vendor,wpcs --standard=./phpcs.xml ./
6 changes: 3 additions & 3 deletions BitPayLib/class-bitpayclientfactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public function __construct( BitPayPaymentSettings $bitpay_payment_settings ) {

public function create(): Client {
$token = $this->bitpay_payment_settings->get_bitpay_token();
if (!$token) {
wc_add_notice( '<strong>' . esc_html( __('Missing BitPay Token' ) ), 'error' );
throw new \RuntimeException('Missing BitPay Token');
if ( ! $token ) {
wc_add_notice( '<strong>' . esc_html( __( 'Missing BitPay Token' ) ), 'error' );
throw new \RuntimeException( 'Missing BitPay Token' );
}

return new PosClient(
Expand Down
2 changes: 1 addition & 1 deletion BitPayLib/class-bitpayinvoicecreate.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(
BitPayPaymentSettings $bitpay_payment_settings,
BitPayLogger $bitpay_logger
) {
$this->client_factory = $client_factory;
$this->client_factory = $client_factory;
$this->bitpay_checkout_transactions = $bitpay_checkout_transactions;
$this->bitpay_payment_settings = $bitpay_payment_settings;
$this->bitpay_logger = $bitpay_logger;
Expand Down
2 changes: 1 addition & 1 deletion BitPayLib/class-bitpayipnprocess.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(
) {
$this->bitpay_checkout_transactions = $bitpay_checkout_transactions;
$this->logger = $logger;
$this->factory = $factory;
$this->factory = $factory;
}

public function execute( WP_REST_Request $request ): void {
Expand Down
2 changes: 1 addition & 1 deletion BitPayLib/class-bitpaypluginsetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct() {
$this->bitpay_ipn_process = new BitPayIpnProcess( $this->bitpay_checkout_transactions, $factory, $logger );
$this->bitpay_cancel_order = new BitPayCancelOrder( $cart, $this->bitpay_checkout_transactions, $logger );
$this->bitpay_invoice_create = new BitPayInvoiceCreate(
$factory,
$factory,
$this->bitpay_checkout_transactions,
$this->bitpay_payment_settings,
$logger
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

# 5.0.1
* Fix support for PHP 8.0
# 5.0.0
* Improve code quality
* Use BitPay SDK
Expand Down
57 changes: 30 additions & 27 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: BitPay Checkout for WooCommerce
* Plugin URI: https://www.bitpay.com
* Description: BitPay Checkout Plugin
* Version: 5.0.0
* Version: 5.0.1
* Author: BitPay
* Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
*/
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Requires at least: 6.0
Tested up to: 6.2.2
Requires PHP: 8.0
Recommended PHP: 8.0
Stable tag: 5.0.0
Stable tag: 5.0.1
License: MIT License (MIT)
License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE

Expand Down Expand Up @@ -111,6 +111,9 @@ You can contact our support team via the following form https://bitpay.com/reque

== Changelog ==

= 5.0.1 =
* Fix support for PHP 8.0

= 5.0.0 =
* Improve code quality
* Use BitPay SDK
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitbf29e92a4eb299ce8b74cb0d23ab0c24::getLoader();
return ComposerAutoloaderInit056b4614544da4979dc4893803506afc::getLoader();
2 changes: 1 addition & 1 deletion vendor/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
return array(
'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'),
'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
'PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\' => array($vendorDir . '/dealerdirect/phpcodesniffer-composer-installer/src'),
'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInitbf29e92a4eb299ce8b74cb0d23ab0c24
class ComposerAutoloaderInit056b4614544da4979dc4893803506afc
{
private static $loader;

Expand All @@ -24,16 +24,16 @@ public static function getLoader()

require __DIR__ . '/platform_check.php';

spl_autoload_register(array('ComposerAutoloaderInitbf29e92a4eb299ce8b74cb0d23ab0c24', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit056b4614544da4979dc4893803506afc', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitbf29e92a4eb299ce8b74cb0d23ab0c24', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit056b4614544da4979dc4893803506afc', 'loadClassLoader'));

require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit056b4614544da4979dc4893803506afc::getInitializer($loader));

$loader->register(true);

$filesToLoad = \Composer\Autoload\ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit056b4614544da4979dc4893803506afc::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
16 changes: 8 additions & 8 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24
class ComposerStaticInit056b4614544da4979dc4893803506afc
{
public static $files = array (
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
Expand Down Expand Up @@ -48,8 +48,8 @@ class ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24
),
'Psr\\Http\\Message\\' =>
array (
0 => __DIR__ . '/..' . '/psr/http-factory/src',
1 => __DIR__ . '/..' . '/psr/http-message/src',
0 => __DIR__ . '/..' . '/psr/http-message/src',
1 => __DIR__ . '/..' . '/psr/http-factory/src',
),
'Psr\\Http\\Client\\' =>
array (
Expand Down Expand Up @@ -147,11 +147,11 @@ class ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$prefixDirsPsr4;
$loader->fallbackDirsPsr4 = ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$fallbackDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$prefixesPsr0;
$loader->classMap = ComposerStaticInitbf29e92a4eb299ce8b74cb0d23ab0c24::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit056b4614544da4979dc4893803506afc::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit056b4614544da4979dc4893803506afc::$prefixDirsPsr4;
$loader->fallbackDirsPsr4 = ComposerStaticInit056b4614544da4979dc4893803506afc::$fallbackDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit056b4614544da4979dc4893803506afc::$prefixesPsr0;
$loader->classMap = ComposerStaticInit056b4614544da4979dc4893803506afc::$classMap;

}, null, ClassLoader::class);
}
Expand Down

0 comments on commit 9df997f

Please sign in to comment.