Skip to content

Commit 57f18b7

Browse files
authored
release: fixes
- Updated dependencies - Ensure sites that can't be imported in current context are marked properly - Fixed php deprecation warning with PHP 8.2 and above
2 parents 83344bf + 219a1cc commit 57f18b7

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/test-php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: |
7272
echo "::set-output name=dir::$(composer config cache-files-dir)"
7373
- name: Setup Composer cache
74-
uses: actions/cache@v1
74+
uses: actions/cache@v4
7575
with:
7676
path: ${{ steps.composer-cache.outputs.dir }}
7777
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

includes/Sites_Listing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,6 @@ private function get_upsell_status() {
230230
8 => 2,
231231
9 => 3,
232232
);
233-
return ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2;
233+
return apply_filters( 'product_neve_license_status', false ) !== 'valid' || ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2;
234234
}
235235
}

includes/WP_Cli.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function import( $args, $assoc_args ) {
147147
$sites = $this->get_all_sites();
148148
$site_slug = $args[0];
149149
if ( ! array_key_exists( $site_slug, $sites ) ) {
150-
\WP_CLI::warning( "No site to import with the slug ${site_slug}." );
150+
\WP_CLI::warning( "No site to import with the slug {$site_slug}." );
151151

152152
return;
153153
}
@@ -257,7 +257,7 @@ function ( &$item ) {
257257
*/
258258
private function import_xml_file( $path, $json, $editor ) {
259259
if ( ! file_exists( $path ) || ! is_readable( $path ) ) {
260-
\WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist (${path})" );
260+
\WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist ({$path})" );
261261
}
262262
$this->content_importer->import_file( $path, $json, $editor );
263263
$this->content_importer->maybe_bust_elementor_cache();

0 commit comments

Comments
 (0)