Merge pull request #67 from pronamic/66-revise-icon-functionality

66 revise icon functionality
pronamic · Mar 26, 2024 · 9c858da · 9c858da
2 parents 184e206 + 0baddf4
commit 9c858da
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 366 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@
 
 # WordPress content
 /wp-content/
+
+# Packages
+/packages/
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,7 +1,7 @@
 {
 	"core": null,
 	"plugins": [
-		"./tests/wp-env-helper.php",
+		"pronamic/wp-env-quick-login",
 		"pronamic/wp-pronamic-pay-test-helper",
 		"https://downloads.wordpress.org/plugin/woocommerce.zip",
 		"https://downloads.wordpress.org/plugin/pronamic-client.zip",
@@ -10,9 +10,8 @@
 		"https://downloads.wordpress.org/plugin/wp-plugin-dependencies.zip"
 	],
 	"mappings": {
-		"wp-content/plugins/pronamic-ideal": "../../../",
 		"wp-content/plugins/pronamic-pay-woocommerce": ".",
-		"wp-content/plugins/woocommerce-subscriptions": "https://github.com/pronamic/woocommerce-subscriptions/releases/download/v5.4.0/woocommerce-subscriptions-5.4.0.zip"
+		"wp-content/plugins/woocommerce-subscriptions": "https://github.com/pronamic/woocommerce-subscriptions/releases/download/v6.0.0/woocommerce-subscriptions-6.0.0.zip"
 	},
 	"config": {
 		"PRONAMIC_PAY_DEBUG": true

diff --git a/composer.json b/composer.json
@@ -37,26 +37,17 @@
 		{
 			"type": "package",
 			"package": {
-				"name": "wp-premium/woocommerce-subscriptions",
-				"version": "3.0.9",
+				"name": "pronamic/woocommerce-subscriptions",
+				"version": "6.0.0",
 				"type": "wordpress-plugin",
 				"dist": {
-					"url": "https://github.com/wp-premium/woocommerce-subscriptions/archive/3.0.9.zip",
+					"url": "https://github.com/pronamic/woocommerce-subscriptions/releases/download/v6.0.0/woocommerce-subscriptions-6.0.0.zip",
 					"type": "zip"
 				},
 				"source": {
-					"url": "https://github.com/wp-premium/woocommerce-subscriptions",
+					"url": "https://github.com/pronamic/woocommerce-subscriptions",
 					"type": "github",
-					"reference": "tags/3.0.9"
-				},
-				"autoload": {
-					"classmap": [
-						"includes/"
-					],
-					"exclude-from-classmap": [
-						"includes/api/legacy/",
-						"includes/libraries/"
-					]
+					"reference": "tags/v6.0.0"
 				}
 			}
 		}
@@ -71,10 +62,23 @@
 			"automattic/jetpack-autoloader": true
 		}
 	},
+	"extra": {
+		"installer-paths": {
+			"packages/{$vendor}/{$name}": [
+				"vendor:pronamic",
+				"vendor:wp-pay",
+				"vendor:wp-pay-extensions",
+				"vendor:wp-pay-gateways",
+				"woocommerce/action-scheduler"
+			]
+		}
+	},
 	"require": {
-		"php": ">=7.4",
+		"php": ">=8.0",
+		"automattic/jetpack-autoloader": "^3.0",
 		"pronamic/wp-html": "^2.2",
-		"wp-pay/core": "^4.9"
+		"woocommerce/action-scheduler": "^3.7",
+		"wp-pay/core": "dev-main as 4.16"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
@@ -84,11 +88,11 @@
 		"php-stubs/wp-cli-stubs": "^2.6",
 		"phpmd/phpmd": "^2.9",
 		"pronamic/pronamic-cli": "^1.1",
+		"pronamic/woocommerce-subscriptions": "^6.0",
 		"pronamic/wp-coding-standards": "^2.0",
 		"roots/wordpress": "^6.0",
 		"wp-cli/wp-cli": "^2.6",
 		"wp-phpunit/wp-phpunit": "^6.1",
-		"wp-premium/woocommerce-subscriptions": "^3.0",
 		"wpackagist-plugin/woocommerce": "^7.5",
 		"yoast/phpunit-polyfills": "^1.0",
 		"yoast/wordpress-seo": "^19.6"

diff --git a/package.json b/package.json
@@ -35,10 +35,10 @@
     "@woocommerce/block-library": "^2.3.0",
     "@woocommerce/dependency-extraction-webpack-plugin": "^2.3.0",
     "@woocommerce/settings": "^1.0.0",
-    "@wordpress/components": "^27.1.0",
-    "@wordpress/env": "^9.5.0",
-    "@wordpress/html-entities": "^3.53.0",
-    "@wordpress/scripts": "^27.4.0",
+    "@wordpress/components": "^27.2.0",
+    "@wordpress/env": "^9.6.0",
+    "@wordpress/html-entities": "^3.54.0",
+    "@wordpress/scripts": "^27.5.0",
     "eslint-plugin-json": "^3.1.0"
   },
   "scripts": {

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -6,6 +6,11 @@
 	<exclude-pattern>js/dist/*</exclude-pattern>
 	<exclude-pattern>tests/wp-config.php</exclude-pattern>
 
+	<exclude-pattern type="relative">^build/*</exclude-pattern>
+	<exclude-pattern type="relative">^node_modules/*</exclude-pattern>
+	<exclude-pattern type="relative">^packages/*</exclude-pattern>
+	<exclude-pattern type="relative">^vendor/*</exclude-pattern>
+
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCatch">
 		<exclude-pattern>src/Extension.php</exclude-pattern>
 		<exclude-pattern>src/Gateway.php</exclude-pattern>

diff --git a/pronamic-pay-woocommerce.php b/pronamic-pay-woocommerce.php
@@ -16,9 +16,6 @@
  *
  * License: GPL-3.0-or-later
  *
- * Requires Plugins: pronamic-ideal, woocommerce
- * Depends: wp-pay/core
- *
  * GitHub URI: https://github.com/pronamic/wp-pronamic-pay-woocommerce
  *
  * @author    Pronamic <info@pronamic.eu>
@@ -30,7 +27,29 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
-
+
+/**
+ * Autoload.
+ */
+require_once __DIR__ . '/vendor/autoload_packages.php';
+
+/**
+ * Bootstrap.
+ */
+add_action(
+	'plugins_loaded',
+	function () {
+		load_plugin_textdomain( 'pronamic-pay-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+	}
+);
+
+\Pronamic\WordPress\Pay\Plugin::instance(
+	[
+		'file'             => __FILE__,
+		'action_scheduler' => __DIR__ . '/packages/woocommerce/action-scheduler/action-scheduler.php',
+	]
+);
+
 add_filter(
 	'pronamic_pay_plugin_integrations',
 	function ( $integrations ) {