Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Reviews and Version Notices libraries #1339

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions composer.lock

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

25 changes: 12 additions & 13 deletions lib/composer.lock

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

29 changes: 14 additions & 15 deletions lib/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,17 @@
},
{
"name": "publishpress/wordpress-reviews",
"version": "v1.1.19",
"version_normalized": "1.1.19.0",
"version": "v1.1.20",
"version_normalized": "1.1.20.0",
"source": {
"type": "git",
"url": "https://github.com/publishpress/library-wordpress-reviews.git",
"reference": "028e573eb7c5da2455a7a823cabbbe5e3f89ca9c"
"reference": "6d0b687a66439721b0432ef1320fd818cd56309f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/publishpress/library-wordpress-reviews/zipball/028e573eb7c5da2455a7a823cabbbe5e3f89ca9c",
"reference": "028e573eb7c5da2455a7a823cabbbe5e3f89ca9c",
"url": "https://api.github.com/repos/publishpress/library-wordpress-reviews/zipball/6d0b687a66439721b0432ef1320fd818cd56309f",
"reference": "6d0b687a66439721b0432ef1320fd818cd56309f",
"shasum": ""
},
"require": {
Expand All @@ -320,12 +320,11 @@
"overtrue/phplint": "^2.1",
"phpmd/phpmd": "^2.8",
"publishpress/publishpress-plugin-builder": "^1.2",
"sebastian/phpcpd": "^5.0",
"squizlabs/php_codesniffer": "^3.5",
"wp-cli/i18n-command": "^2.2",
"wp-cli/wp-cli": "^2.5"
},
"time": "2022-06-03T13:38:53+00:00",
"time": "2023-10-06T17:22:31+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -356,23 +355,23 @@
],
"support": {
"issues": "https://github.com/publishpress/library-wordpress-reviews/issues",
"source": "https://github.com/publishpress/library-wordpress-reviews/tree/v1.1.19"
"source": "https://github.com/publishpress/library-wordpress-reviews/tree/v1.1.20"
},
"install-path": "../publishpress/wordpress-reviews"
},
{
"name": "publishpress/wordpress-version-notices",
"version": "2.1.2",
"version_normalized": "2.1.2.0",
"version": "2.1.3",
"version_normalized": "2.1.3.0",
"source": {
"type": "git",
"url": "https://github.com/publishpress/library-wordpress-version-notices.git",
"reference": "b0efcf04ab9d37304e38673bee471116e44cdb0e"
"reference": "8e54558d2427a0f93174ccbc1d02c1ba7e2abc8d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/publishpress/library-wordpress-version-notices/zipball/b0efcf04ab9d37304e38673bee471116e44cdb0e",
"reference": "b0efcf04ab9d37304e38673bee471116e44cdb0e",
"url": "https://api.github.com/repos/publishpress/library-wordpress-version-notices/zipball/8e54558d2427a0f93174ccbc1d02c1ba7e2abc8d",
"reference": "8e54558d2427a0f93174ccbc1d02c1ba7e2abc8d",
"shasum": ""
},
"require": {
Expand All @@ -394,7 +393,7 @@
"overtrue/phplint": "^2.1",
"publishpress/version-loader-generator": "^1.0"
},
"time": "2023-05-30T19:00:42+00:00",
"time": "2023-10-11T15:04:44+00:00",
"type": "library",
"extra": {
"generator": {
Expand Down Expand Up @@ -425,7 +424,7 @@
"description": "Library for displaying version notices for Pro plugins in WordPress.",
"support": {
"issues": "https://github.com/publishpress/library-wordpress-version-notices/issues",
"source": "https://github.com/publishpress/library-wordpress-version-notices/tree/2.1.2"
"source": "https://github.com/publishpress/library-wordpress-version-notices/tree/2.1.3"
},
"install-path": "../publishpress/wordpress-version-notices"
}
Expand Down
24 changes: 12 additions & 12 deletions lib/vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php return array(
'root' => array(
'name' => '__root__',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '405163c580736698a6a7bc2e9ccb06d744df325b',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'd50962e02792c29b3cfed9af0ba392e0745a8fc1',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => true,
),
'versions' => array(
'__root__' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '405163c580736698a6a7bc2e9ccb06d744df325b',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'd50962e02792c29b3cfed9af0ba392e0745a8fc1',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -56,18 +56,18 @@
'dev_requirement' => false,
),
'publishpress/wordpress-reviews' => array(
'pretty_version' => 'v1.1.19',
'version' => '1.1.19.0',
'reference' => '028e573eb7c5da2455a7a823cabbbe5e3f89ca9c',
'pretty_version' => 'v1.1.20',
'version' => '1.1.20.0',
'reference' => '6d0b687a66439721b0432ef1320fd818cd56309f',
'type' => 'library',
'install_path' => __DIR__ . '/../publishpress/wordpress-reviews',
'aliases' => array(),
'dev_requirement' => false,
),
'publishpress/wordpress-version-notices' => array(
'pretty_version' => '2.1.2',
'version' => '2.1.2.0',
'reference' => 'b0efcf04ab9d37304e38673bee471116e44cdb0e',
'pretty_version' => '2.1.3',
'version' => '2.1.3.0',
'reference' => '8e54558d2427a0f93174ccbc1d02c1ba7e2abc8d',
'type' => 'library',
'install_path' => __DIR__ . '/../publishpress/wordpress-version-notices',
'aliases' => array(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@

use Exception;

if (class_exists('PublishPress\\WordPressReviews\\ReviewsController')) {
return;
}

/**
* Class ReviewsController
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function __construct(TemplateLoaderInterface $templateLoader)
public function init()
{
add_action('admin_head', [$this, 'adminHeadAddStyle']);
add_action('init', [$this, 'collectTheSettings'], 5);
add_action('init', [$this, 'collectTheSettings'], 50);
add_action('admin_menu', [$this, 'addMenuLink'], 20);
add_action('admin_print_scripts', [$this, 'setUpgradeMenuLink'], 9999);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function init()
{
add_action(self::DISPLAY_ACTION, [$this, 'display'], 10, 2);
add_action('in_admin_header', [$this, 'displayTopNotice']);
add_action('admin_init', [$this, 'collectTheSettings'], 5);
add_action('admin_init', [$this, 'collectTheSettings'], 50);
add_action('admin_head', [$this, 'adminHeadAddStyle']);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

add_action('plugins_loaded', function () {
if (! defined('PP_VERSION_NOTICES_LOADED')) {
define('PP_VERSION_NOTICES_VERSION', '2.1.1');
define('PP_VERSION_NOTICES_VERSION', '2.1.3');
define('PP_VERSION_NOTICES_BASE_PATH', __DIR__ . '/../');
define('PP_VERSION_NOTICES_SRC_PATH', __DIR__);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
return;
}

if (! function_exists(__NAMESPACE__ . '\register2Dot1Dot2')) {
if (! function_exists(__NAMESPACE__ . '\register2Dot1Dot3')) {
if (! defined('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_INCLUDED')) {
define('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_INCLUDED', __DIR__);
}
Expand All @@ -27,24 +27,24 @@
add_action('plugins_loaded', [Versions::class, 'initializeLatestVersion'], -150, 0);
}

add_action('plugins_loaded', __NAMESPACE__ . '\register2Dot1Dot2', -190, 0);
add_action('plugins_loaded', __NAMESPACE__ . '\register2Dot1Dot3', -190, 0);

function register2Dot1Dot2()
function register2Dot1Dot3()
{
if (! class_exists('PublishPress\WordpressVersionNotices\ServicesProvider')) {
$versions = Versions::getInstance();
$versions->register('2.1.2', __NAMESPACE__ . '\initialize2Dot1Dot2');
$versions->register('2.1.3', __NAMESPACE__ . '\initialize2Dot1Dot3');
}
}

function initialize2Dot1Dot2()
function initialize2Dot1Dot3()
{
require_once __DIR__ . '/autoload.php';

if (! defined('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION')) {
define('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION', '2.1.2');
define('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION', '2.1.3');
}

do_action('publishpress_wordpress_version_notices_2Dot1Dot2_initialized');
do_action('publishpress_wordpress_version_notices_2Dot1Dot3_initialized');
}
}