From 0dc504bcf30bc71a0a7caffc543226d55cc4c291 Mon Sep 17 00:00:00 2001 From: abaicus Date: Fri, 9 May 2025 12:42:39 +0300 Subject: [PATCH 1/6] fix: ensure sites that can't be imported in current context are marked properly [ref Codeinwp/neve-pro-addon#2994] --- includes/Sites_Listing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Sites_Listing.php b/includes/Sites_Listing.php index ebfad6e3..801b8842 100755 --- a/includes/Sites_Listing.php +++ b/includes/Sites_Listing.php @@ -230,6 +230,6 @@ private function get_upsell_status() { 8 => 2, 9 => 3, ); - return ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2; + return apply_filters( 'product_neve_license_status', false ) !== 'valid' || ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2; } } From a9443527f9554052345d8c490a8d7c9f472c798f Mon Sep 17 00:00:00 2001 From: abaicus Date: Fri, 9 May 2025 12:50:01 +0300 Subject: [PATCH 2/6] chore: upgrade CI actions --- .github/workflows/test-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index a802152d..9a91a35d 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -71,7 +71,7 @@ jobs: run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Setup Composer cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} From 12b96105f9a502721adc92a12439044c67c7bb28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 09:06:18 +0000 Subject: [PATCH 3/6] chore(deps): bump codeinwp/themeisle-sdk from 3.3.44 to 3.3.46 Bumps [codeinwp/themeisle-sdk](https://github.com/Codeinwp/themeisle-sdk) from 3.3.44 to 3.3.46. - [Release notes](https://github.com/Codeinwp/themeisle-sdk/releases) - [Changelog](https://github.com/Codeinwp/themeisle-sdk/blob/v3.3.46/CHANGELOG.md) - [Commits](https://github.com/Codeinwp/themeisle-sdk/compare/v3.3.44...v3.3.46) --- updated-dependencies: - dependency-name: codeinwp/themeisle-sdk dependency-version: 3.3.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 81dc0b5b..01b92804 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "126f1b3007145bf2c64b331928a6ac85", + "content-hash": "ae3cdd9534eb892645a05dfa56da1432", "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.44", + "version": "3.3.46", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "fed444b52ebf1f689ec2434df177926bf8f238c4" + "reference": "af2e7360bbe3af6a1bd2c3779fc33b7765104461" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/fed444b52ebf1f689ec2434df177926bf8f238c4", - "reference": "fed444b52ebf1f689ec2434df177926bf8f238c4", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/af2e7360bbe3af6a1bd2c3779fc33b7765104461", + "reference": "af2e7360bbe3af6a1bd2c3779fc33b7765104461", "shasum": "" }, "require-dev": { @@ -43,9 +43,9 @@ ], "support": { "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", - "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.44" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.46" }, - "time": "2025-02-18T21:31:30+00:00" + "time": "2025-05-16T15:38:02+00:00" } ], "packages-dev": [ From 460f562b2417483fd1f39de0bbb78afb580dd170 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 19 May 2025 18:49:42 +0530 Subject: [PATCH 4/6] fix: php deprecation warning --- includes/WP_Cli.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/WP_Cli.php b/includes/WP_Cli.php index 04437c59..eca3014a 100755 --- a/includes/WP_Cli.php +++ b/includes/WP_Cli.php @@ -147,7 +147,7 @@ public function import( $args, $assoc_args ) { $sites = $this->get_all_sites(); $site_slug = $args[0]; if ( ! array_key_exists( $site_slug, $sites ) ) { - \WP_CLI::warning( "No site to import with the slug ${site_slug}." ); + \WP_CLI::warning( "No site to import with the slug {$site_slug}." ); return; } @@ -257,7 +257,7 @@ function ( &$item ) { */ private function import_xml_file( $path, $json, $editor ) { if ( ! file_exists( $path ) || ! is_readable( $path ) ) { - \WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist (${path})" ); + \WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist ({$path})" ); } $this->content_importer->import_file( $path, $json, $editor ); $this->content_importer->maybe_bust_elementor_cache(); From 678c78629f7d5bbc5b6de65c4c3fdd319a54b37e Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 19 May 2025 19:07:07 +0530 Subject: [PATCH 5/6] update cache version for php test --- .github/workflows/test-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index a802152d..9a91a35d 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -71,7 +71,7 @@ jobs: run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Setup Composer cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} From 017eadc035755093158f77b7b3baa0b3fda2e22e Mon Sep 17 00:00:00 2001 From: vytisbulkevicius <36594177+vytisbulkevicius@users.noreply.github.com> Date: Tue, 20 May 2025 17:35:36 +0300 Subject: [PATCH 6/6] Update test-php.yml Updated to use actions/cache@v4 --- .github/workflows/test-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index a802152d..9a91a35d 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -71,7 +71,7 @@ jobs: run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Setup Composer cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}