Merge pull request #48 from mwarzybok-sumoheavy/feature/SP-664

SP-664 WooCommerce Plugin Error on v5.0.1

Author: bobbrodie

.github/workflows/build.yml

@@ -14,4 +14,4 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run WordPress code standard
         run: |
-          ./vendor/bin/phpcs -v --ignore=vendor,wpcs --standard=./phpcs.xml ./
+          ./vendorPrefixed/vendor/bin/phpcs -v --ignore=vendor,vendorPrefixed,wpcs,scoper.inc.php --standard=./phpcs.xml ./

.gitignore

@@ -2,3 +2,4 @@
 BitPayLib/.DS_Store
 logs/*.*
 /.idea/
+/vendor

BitPayLib/class-bitpaylogger.php

@@ -16,7 +16,8 @@ class BitPayLogger {
 
 	public function execute( $msg, string $type, bool $is_array = false, $error = false ): void {
 		$bitpay_checkout_options = get_option( 'woocommerce_bitpay_checkout_gateway_settings' );
-		$log_directory           = plugin_dir_path( __FILE__ ) . '..' . DIRECTORY_SEPARATOR . 'logs/';
+		$log_directory           = plugin_dir_path( __FILE__ ) . '..' . DIRECTORY_SEPARATOR . '..'
+			. DIRECTORY_SEPARATOR . 'logs/';
 		if ( ! file_exists( $log_directory ) && ! mkdir( $log_directory ) && ! is_dir( $log_directory ) ) {
 			throw new \RuntimeException( sprintf( 'Directory "%s" was not created', $log_directory ) );
 		}

BitPayLib/class-bitpaypluginsetup.php

@@ -116,7 +116,7 @@ public function check_requirements(): void {
 	}
 
 	public function validate_wc_payment_gateway(): void {
-		if ( class_exists( 'WC_Payment_Gateway' ) ) {
+		if ( class_exists( '\WC_Payment_Gateway' ) ) {
 			return;
 		}
 

README.md

@@ -58,6 +58,8 @@ If you *are* a developer wanting contribute an enhancement, bugfix or other patc
 
 This open source project is released under the [MIT license](http://opensource.org/licenses/MIT) which means if you would like to use this project's code in your own project you are free to do so. Speaking of, if you have used our code in a cool new project we would like to hear about it!  Please send us an [email](mailto:[email protected]).
 
+Vendor is generated by php-scoper to avoid dependency conflicts between plugins. Remember to run 'composer install' and add 'vendorPrefixed' to the repository after making any changes
+
 ## License
 
 Please refer to the [LICENSE](https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE) file that came with this project.

composer.json

@@ -9,17 +9,31 @@
   ],
   "require": {
     "php": "^8",
-    "bitpay/sdk": "^8.0.0"
+    "bitpay/sdk": "^8.0.0",
+    "humbug/php-scoper": "^0.18.3"
   },
   "require-dev": {
     "wp-coding-standards/wpcs": "dev-develop"
   },
   "autoload": {
     "classmap": ["BitPayLib"]
   },
+  "scripts": {
+    "add-prefix": [
+      "php ./vendor/bin/php-scoper add-prefix --force --quiet",
+      "composer dump-autoload --working-dir vendorPrefixed"
+    ],
+    "dump-prefixed-vendor": "composer dump-autoload --working-dir vendorPrefixed --classmap-authoritative",
+    "post-install-cmd": [
+      "composer add-prefix"
+    ],
+    "post-update-cmd": [
+      "composer add-prefix"
+    ]
+  },
   "config": {
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
   }
-}
+}