Skip to content

Instantly share code, notes, and snippets.

@retlehs

retlehs/woocommerce-shipping-ups-remove-psr-log.patch

Created July 18, 2025 18:41
Show Gist options
  • Save retlehs/4e76aee9a30cc0d3228cf6146eec64e0 to your computer and use it in GitHub Desktop.
Save retlehs/4e76aee9a30cc0d3228cf6146eec64e0 to your computer and use it in GitHub Desktop.
Download ZIP
WooCommerce patches to avoid `psr/log` conflicts with Acorn
Raw
woocommerce-shipping-ups-remove-psr-log.patch
diff --git a/vendor/composer/jetpack_autoload_classmap.php b/vendor/composer/jetpack_autoload_classmap.php
index 1855b18..d52edf3 100644
--- a/vendor/composer/jetpack_autoload_classmap.php
+++ b/vendor/composer/jetpack_autoload_classmap.php
@@ -194,50 +194,50 @@ return array(
'version' => '3.1.3',
'path' => $vendorDir . '/automattic/jetpack-autoloader/src/class-plugins-handler.php'
),
- 'Psr\\Log\\AbstractLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php'
- ),
- 'Psr\\Log\\InvalidArgumentException' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php'
- ),
- 'Psr\\Log\\LogLevel' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php'
- ),
- 'Psr\\Log\\LoggerAwareInterface' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php'
- ),
- 'Psr\\Log\\LoggerAwareTrait' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php'
- ),
- 'Psr\\Log\\LoggerInterface' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php'
- ),
- 'Psr\\Log\\LoggerTrait' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php'
- ),
- 'Psr\\Log\\NullLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php'
- ),
- 'Psr\\Log\\Test\\DummyTest' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php'
- ),
- 'Psr\\Log\\Test\\LoggerInterfaceTest' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php'
- ),
- 'Psr\\Log\\Test\\TestLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php'
- ),
+ // 'Psr\\Log\\AbstractLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php'
+ // ),
+ // 'Psr\\Log\\InvalidArgumentException' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php'
+ // ),
+ // 'Psr\\Log\\LogLevel' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php'
+ // ),
+ // 'Psr\\Log\\LoggerAwareInterface' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php'
+ // ),
+ // 'Psr\\Log\\LoggerAwareTrait' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php'
+ // ),
+ // 'Psr\\Log\\LoggerInterface' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php'
+ // ),
+ // 'Psr\\Log\\LoggerTrait' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php'
+ // ),
+ // 'Psr\\Log\\NullLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php'
+ // ),
+ // 'Psr\\Log\\Test\\DummyTest' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php'
+ // ),
+ // 'Psr\\Log\\Test\\LoggerInterfaceTest' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php'
+ // ),
+ // 'Psr\\Log\\Test\\TestLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php'
+ // ),
'Shutdown_Handler' => array(
'version' => '3.1.3',
'path' => $vendorDir . '/automattic/jetpack-autoloader/src/class-shutdown-handler.php'
Raw
woocommerce-shipping-usps-remove-psr-log.patch
diff --git a/vendor/composer/jetpack_autoload_classmap.php b/vendor/composer/jetpack_autoload_classmap.php
index 1fab082..a55f832 100644
--- a/vendor/composer/jetpack_autoload_classmap.php
+++ b/vendor/composer/jetpack_autoload_classmap.php
@@ -194,50 +194,50 @@ return array(
'version' => '3.1.3',
'path' => $vendorDir . '/automattic/jetpack-autoloader/src/class-plugins-handler.php'
),
- 'Psr\\Log\\AbstractLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php'
- ),
- 'Psr\\Log\\InvalidArgumentException' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php'
- ),
- 'Psr\\Log\\LogLevel' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php'
- ),
- 'Psr\\Log\\LoggerAwareInterface' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php'
- ),
- 'Psr\\Log\\LoggerAwareTrait' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php'
- ),
- 'Psr\\Log\\LoggerInterface' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php'
- ),
- 'Psr\\Log\\LoggerTrait' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php'
- ),
- 'Psr\\Log\\NullLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php'
- ),
- 'Psr\\Log\\Test\\DummyTest' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php'
- ),
- 'Psr\\Log\\Test\\LoggerInterfaceTest' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php'
- ),
- 'Psr\\Log\\Test\\TestLogger' => array(
- 'version' => '1.1.4.0',
- 'path' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php'
- ),
+ // 'Psr\\Log\\AbstractLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php'
+ // ),
+ // 'Psr\\Log\\InvalidArgumentException' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php'
+ // ),
+ // 'Psr\\Log\\LogLevel' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php'
+ // ),
+ // 'Psr\\Log\\LoggerAwareInterface' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php'
+ // ),
+ // 'Psr\\Log\\LoggerAwareTrait' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php'
+ // ),
+ // 'Psr\\Log\\LoggerInterface' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php'
+ // ),
+ // 'Psr\\Log\\LoggerTrait' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php'
+ // ),
+ // 'Psr\\Log\\NullLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php'
+ // ),
+ // 'Psr\\Log\\Test\\DummyTest' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php'
+ // ),
+ // 'Psr\\Log\\Test\\LoggerInterfaceTest' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php'
+ // ),
+ // 'Psr\\Log\\Test\\TestLogger' => array(
+ // 'version' => '1.1.4.0',
+ // 'path' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php'
+ // ),
'Shutdown_Handler' => array(
'version' => '3.1.3',
'path' => $vendorDir . '/automattic/jetpack-autoloader/src/class-shutdown-handler.php'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment