fix(Deps): Swapped ANM library

This commit is contained in:
Sibin Grasic 2024-11-01 12:58:29 +01:00
parent 9a8726f5e6
commit d772da1660
No known key found for this signature in database
GPG key ID: A29979125498C18E
4 changed files with 671 additions and 76 deletions

View file

@ -12,12 +12,13 @@
"require": {
"php": ">= 8.0",
"automattic/jetpack-constants": "^2",
"oblak/admin-notice-manager": "^2",
"woocommerce/action-scheduler": "^3.7"
"woocommerce/action-scheduler": "^3.7",
"x-wp/admin-notice-manager": "^1.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.42",
"oblak/wordpress-coding-standard": "^1"
"oblak/wordpress-coding-standard": "^1",
"wp-cli/wp-cli": "^2.11"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@ -31,6 +32,9 @@
]
},
"config": {
"platform": {
"php": "8.0"
},
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"dealerdirect/phpcodesniffer-composer-installer": true,

670
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7d2bb0da0dd22ced214347a658af3460",
"content-hash": "f2079bdb6f3e8be921a7d0471eab0501",
"packages": [
{
"name": "automattic/jetpack-constants",
@ -57,46 +57,6 @@
},
"time": "2023-11-20T20:02:28+00:00"
},
{
"name": "oblak/admin-notice-manager",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/oblakstudio/admin-notice-manager.git",
"reference": "53a32b62d9799fd486adf0bb09aeb5d80a7a214d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/oblakstudio/admin-notice-manager/zipball/53a32b62d9799fd486adf0bb09aeb5d80a7a214d",
"reference": "53a32b62d9799fd486adf0bb09aeb5d80a7a214d",
"shasum": ""
},
"require": {
"php": ">=7.3"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"phpcompatibility/phpcompatibility-wp": "*",
"squizlabs/php_codesniffer": "3.*",
"wp-coding-standards/wpcs": "*"
},
"type": "library",
"autoload": {
"psr-4": {
"Oblak\\WP\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-only"
],
"description": "Admin Notice manager for WordPress Admin",
"support": {
"issues": "https://github.com/oblakstudio/admin-notice-manager/issues",
"source": "https://github.com/oblakstudio/admin-notice-manager/tree/v2.0.0"
},
"time": "2022-10-23T15:30:02+00:00"
},
{
"name": "woocommerce/action-scheduler",
"version": "3.7.1",
@ -139,6 +99,187 @@
"source": "https://github.com/woocommerce/action-scheduler/tree/3.7.1"
},
"time": "2023-12-13T21:52:55+00:00"
},
{
"name": "x-wp/admin-notice-manager",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/x-wp/admin-notice-manager.git",
"reference": "378d04ee7cdf999199fe87690617420e9a367c24"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/x-wp/admin-notice-manager/zipball/378d04ee7cdf999199fe87690617420e9a367c24",
"reference": "378d04ee7cdf999199fe87690617420e9a367c24",
"shasum": ""
},
"require": {
"php": ">=8.0",
"x-wp/helper-functions": "^1.16",
"x-wp/helper-traits": "^1.16"
},
"replace": {
"oblak/admin-notice-manager": "*"
},
"require-dev": {
"oblak/wordpress-coding-standard": "^1",
"php-stubs/wordpress-stubs": "^6.5",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-deprecation-rules": "^1.1",
"swissspidy/phpstan-no-private": "^0.2.0",
"szepeviktor/phpstan-wordpress": "^1.3"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
},
"type": "library",
"autoload": {
"files": [
"src/Functions/xwp-anm-fns.php",
"src/Functions/xwp-anm-init.php"
],
"psr-4": {
"XWP\\ANM\\": "src/"
},
"classmap": [
"src/Core/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-only"
],
"authors": [
{
"name": "Sibin Grasic",
"email": "i.am@sib.ing"
}
],
"description": "Simplifies the process of working with admin notices in WordPress.",
"homepage": "https://extended.wp.rs/docs/packages/admin-notice-manager",
"keywords": [
"admin",
"admin notices",
"notices",
"wordpress"
],
"support": {
"issues": "https://github.com/x-wp/admin-notice-manager/issues",
"source": "https://github.com/x-wp/admin-notice-manager/tree/v1.0.0"
},
"time": "2024-11-01T11:46:27+00:00"
},
{
"name": "x-wp/helper-functions",
"version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/x-wp/helper-functions.git",
"reference": "1e3392e49d0fe95eb13e8980081b9ceb0268e0bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/x-wp/helper-functions/zipball/1e3392e49d0fe95eb13e8980081b9ceb0268e0bd",
"reference": "1e3392e49d0fe95eb13e8980081b9ceb0268e0bd",
"shasum": ""
},
"require": {
"php": ">=8.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
},
"type": "library",
"autoload": {
"files": [
"xwp-helper-fns-arr.php",
"xwp-helper-fns-num.php",
"xwp-helper-fns-req.php",
"xwp-helper-fns.php"
],
"psr-4": {
"XWP\\Helper\\Functions\\": "."
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-only"
],
"authors": [
{
"name": "Sibin Grasic",
"email": "sibin.grasic@oblak.studio"
}
],
"description": "Various traits related to xWP packages",
"keywords": [
"contracts",
"decoupling",
"extended-wp",
"interfaces",
"interoperability",
"standards",
"traits"
],
"support": {
"issues": "https://github.com/x-wp/helper-functions/issues",
"source": "https://github.com/x-wp/helper-functions/tree/v1.18.0"
},
"time": "2024-10-29T22:53:16+00:00"
},
{
"name": "x-wp/helper-traits",
"version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/x-wp/helper-traits.git",
"reference": "0367d136d6ba36e2ae0fe1854584ef760ea7cae9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/x-wp/helper-traits/zipball/0367d136d6ba36e2ae0fe1854584ef760ea7cae9",
"reference": "0367d136d6ba36e2ae0fe1854584ef760ea7cae9",
"shasum": ""
},
"require": {
"php": ">=8.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
},
"type": "library",
"autoload": {
"psr-4": {
"XWP\\Helper\\Traits\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-only"
],
"authors": [
{
"name": "Sibin Grasic",
"email": "sibin.grasic@oblak.studio"
}
],
"description": "Various traits related to xWP packages",
"keywords": [
"contracts",
"decoupling",
"extended-wp",
"interfaces",
"interoperability",
"standards",
"traits"
],
"support": {
"issues": "https://github.com/x-wp/helper-traits/issues",
"source": "https://github.com/x-wp/helper-traits/tree/v1.18.0"
},
"time": "2024-09-18T12:43:44+00:00"
}
],
"packages-dev": [
@ -759,6 +900,56 @@
],
"time": "2020-07-06T04:49:32+00:00"
},
{
"name": "mustache/mustache",
"version": "v2.14.2",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/mustache.php.git",
"reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e62b7c3849d22ec55f3ec425507bf7968193a6cb",
"reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb",
"shasum": ""
},
"require": {
"php": ">=5.2.4"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~1.11",
"phpunit/phpunit": "~3.7|~4.0|~5.0"
},
"type": "library",
"autoload": {
"psr-0": {
"Mustache": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Justin Hileman",
"email": "justin@justinhileman.info",
"homepage": "http://justinhileman.com"
}
],
"description": "A Mustache implementation in PHP.",
"homepage": "https://github.com/bobthecow/mustache.php",
"keywords": [
"mustache",
"templating"
],
"support": {
"issues": "https://github.com/bobthecow/mustache.php/issues",
"source": "https://github.com/bobthecow/mustache.php/tree/v2.14.2"
},
"time": "2022-08-23T13:07:01+00:00"
},
{
"name": "oblak/wordpress-coding-standard",
"version": "v1.1.1",
@ -1315,6 +1506,400 @@
],
"time": "2024-01-11T20:47:48+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "80d075412b557d41002320b96a096ca65aa2c98d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d",
"reference": "80d075412b557d41002320b96a096ca65aa2c98d",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.5-dev"
},
"thanks": {
"name": "symfony/contracts",
"url": "https://github.com/symfony/contracts"
}
},
"autoload": {
"files": [
"function.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2023-01-24T14:02:46+00:00"
},
{
"name": "symfony/finder",
"version": "v5.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "63741784cd7b9967975eec610b256eed3ede022b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b",
"reference": "63741784cd7b9967975eec610b256eed3ede022b",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Finder\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v5.4.45"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-09-28T13:32:08+00:00"
},
{
"name": "symfony/polyfill-php80",
"version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
"reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"type": "library",
"extra": {
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php80\\": ""
},
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ion Bazan",
"email": "ion.bazan@gmail.com"
},
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
},
{
"name": "wp-cli/mustangostang-spyc",
"version": "0.6.3",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/spyc.git",
"reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wp-cli/spyc/zipball/6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7",
"reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7",
"shasum": ""
},
"require": {
"php": ">=5.3.1"
},
"require-dev": {
"phpunit/phpunit": "4.3.*@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.5.x-dev"
}
},
"autoload": {
"files": [
"includes/functions.php"
],
"psr-4": {
"Mustangostang\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "mustangostang",
"email": "vlad.andersen@gmail.com"
}
],
"description": "A simple YAML loader/dumper class for PHP (WP-CLI fork)",
"homepage": "https://github.com/mustangostang/spyc/",
"support": {
"source": "https://github.com/wp-cli/spyc/tree/autoload"
},
"time": "2017-04-25T11:26:20+00:00"
},
{
"name": "wp-cli/php-cli-tools",
"version": "v0.11.22",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/php-cli-tools.git",
"reference": "a6bb94664ca36d0962f9c2ff25591c315a550c51"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/a6bb94664ca36d0962f9c2ff25591c315a550c51",
"reference": "a6bb94664ca36d0962f9c2ff25591c315a550c51",
"shasum": ""
},
"require": {
"php": ">= 5.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"wp-cli/wp-cli-tests": "^4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.11.x-dev"
}
},
"autoload": {
"files": [
"lib/cli/cli.php"
],
"psr-0": {
"cli": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Daniel Bachhuber",
"email": "daniel@handbuilt.co",
"role": "Maintainer"
},
{
"name": "James Logsdon",
"email": "jlogsdon@php.net",
"role": "Developer"
}
],
"description": "Console utilities for PHP",
"homepage": "http://github.com/wp-cli/php-cli-tools",
"keywords": [
"cli",
"console"
],
"support": {
"issues": "https://github.com/wp-cli/php-cli-tools/issues",
"source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.22"
},
"time": "2023-12-03T19:25:05+00:00"
},
{
"name": "wp-cli/wp-cli",
"version": "v2.11.0",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/wp-cli.git",
"reference": "53f0df112901fcf95099d0f501912a209429b6a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/53f0df112901fcf95099d0f501912a209429b6a9",
"reference": "53f0df112901fcf95099d0f501912a209429b6a9",
"shasum": ""
},
"require": {
"ext-curl": "*",
"mustache/mustache": "^2.14.1",
"php": "^5.6 || ^7.0 || ^8.0",
"symfony/finder": ">2.7",
"wp-cli/mustangostang-spyc": "^0.6.3",
"wp-cli/php-cli-tools": "~0.11.2"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"wp-cli/db-command": "^1.3 || ^2",
"wp-cli/entity-command": "^1.2 || ^2",
"wp-cli/extension-command": "^1.1 || ^2",
"wp-cli/package-command": "^1 || ^2",
"wp-cli/wp-cli-tests": "^4.0.1"
},
"suggest": {
"ext-readline": "Include for a better --prompt implementation",
"ext-zip": "Needed to support extraction of ZIP archives when doing downloads or updates"
},
"bin": [
"bin/wp",
"bin/wp.bat"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.11.x-dev"
}
},
"autoload": {
"psr-0": {
"WP_CLI\\": "php/"
},
"classmap": [
"php/class-wp-cli.php",
"php/class-wp-cli-command.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "WP-CLI framework",
"homepage": "https://wp-cli.org",
"keywords": [
"cli",
"wordpress"
],
"support": {
"docs": "https://make.wordpress.org/cli/handbook/",
"issues": "https://github.com/wp-cli/wp-cli/issues",
"source": "https://github.com/wp-cli/wp-cli"
},
"time": "2024-08-08T03:04:55+00:00"
},
{
"name": "wp-coding-standards/wpcs",
"version": "3.0.1",
@ -1391,5 +1976,8 @@
"php": ">= 8.0"
},
"platform-dev": [],
"platform-overrides": {
"php": "8.0"
},
"plugin-api-version": "2.6.0"
}

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ruleset name="WordPress Module">
<config name="minimum_supported_wp_version" value="6.4"/>
<config name="testVersion" value="7.4-"/>
<config name="minimum_wp_version" value="6.4"/>
<config name="testVersion" value="8.0-"/>

<rule ref="Oblak"/>
<rule ref="Oblak-Advanced"/>

View file

@ -275,22 +275,24 @@ abstract class Base_Plugin_Installer {
return;
}

Admin_Notice_Manager::get_instance()->add_notice(
"{$this->slug}_missing_tables",
array(
'caps' => 'manage_woocommerce',
'dismissible' => false,
'message' => \sprintf(
'<p><strong>%s</strong> - %s: %s</p>',
\esc_html( $this->slug ),
\esc_html__( 'The following tables are missing: ', 'oblak-plugin-installer' ),
\implode( ', ', $missing_tables ),
\xwp_get_notice( "{$this->slug}_missing_tables" )
->set_defaults()
->set_props(
array(
'caps' => 'manage_woocommerce',
'classes' => 'alt',
'dismissible' => false,
'message' => \sprintf(
'<p><strong>%s</strong> - %s: %s</p>',
\esc_html( $this->slug ),
\esc_html__( 'The following tables are missing: ', 'oblak-plugin-installer' ),
\implode( ', ', $missing_tables ),
),
'persistent' => true,
'type' => 'error',
),
'persistent' => true,
'type' => 'error',
),
true,
);
)
->save( true );
}

/**
@ -312,7 +314,7 @@ abstract class Base_Plugin_Installer {
if ( 0 < \count( $missing_tables ) ) {
$this->display_missing_tables_notice( $modify_notice );
} elseif ( $modify_notice && $this->show_admin_notices ) {
Admin_Notice_Manager::get_instance()->remove_notice( "{$this->slug}_missing_tables", true );
\xwp_delete_notice( "{$this->slug}_missing_tables", true );
} else {
\update_option( "{$this->slug}_schema_version", $this->db_version );
}
@ -416,18 +418,19 @@ abstract class Base_Plugin_Installer {
$file = $this->get_template_file( $name );
$args = $this->get_notice_args( $name );

Admin_Notice_Manager::get_instance()->add_notice(
"{$this->slug}_update_notice",
array(
'caps' => 'manage_options',
'dismissible' => 'update-complete' === $file,
'file_args' => $args,
'message' => $file,
'persistent' => false,
'type' => 'info',
),
true,
);
\xwp_get_notice( "{$this->slug}_update_notice" )
->set_defaults()
->set_props(
array(
'caps' => 'manage_options',
'dismissible' => 'update-complete' === $file,
'params' => $args,
'persistent' => false,
'template' => $file,
'type' => 'info',
),
)
->save( true );
}

/**
@ -637,7 +640,7 @@ abstract class Base_Plugin_Installer {

$progress->finish();

Admin_Notice_Manager::get_instance()->remove_notice( "{$this->slug}_update_notice", true );
\xwp_delete_notice( "{$this->slug}_update_notice", true );

WP_CLI::success(
\sprintf(
@ -740,7 +743,7 @@ abstract class Base_Plugin_Installer {
* @return string
*/
public function debug_verify_db_tables() {
Admin_Notice_Manager::get_instance()->remove_notice( "{$this->slug}_missing_tables", true );
\xwp_delete_notice( "{$this->slug}_missing_tables", true );

$missing_tables = $this->verify_base_tables( false, true );