Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31227 from woocommerce/fix/count_param 

Update count param consistently.
This commit is contained in:
Barry Hughes 2021-11-22 11:34:47 -08:00 committed by GitHub
parent ab1a35719c 2013a66313
commit 5773089e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce/includes/class-wc-download-handler.php
View File

@ -270,7 +270,7 @@ class WC_Download_Handler {
); );
$count = 0; $count = 0;
$file_path = str_replace( array_keys( $replacements ), array_values( $replacements ), $file_path ); $file_path = str_replace( array_keys( $replacements ), array_values( $replacements ), $file_path, $count );
$parsed_file_path = wp_parse_url( $file_path ); $parsed_file_path = wp_parse_url( $file_path );
$remote_file = null === $count || 0 === $count; // Remote file only if there were no replacements. $remote_file = null === $count || 0 === $count; // Remote file only if there were no replacements.

52
plugins/woocommerce/tests/php/includes/class-wc-download-handler-tests.php Normal file
View File

@ -0,0 +1,52 @@
<?php
/**
* Class WC_Download_Handler_Tests.
*/
class WC_Download_Handler_Tests extends \WC_Unit_Test_Case {
/**
* Test for local file path.
*/
public function test_parse_file_path_for_local_file() {
$local_file_path = trailingslashit( wp_upload_dir()['basedir'] ) . 'dummy_file.jpg';
$parsed_file_path = WC_Download_Handler::parse_file_path( $local_file_path );
$this->assertFalse( $parsed_file_path['remote_file'] );
}
/**
* Test for local URL without protocol.
*/
public function test_parse_file_path_for_local_url() {
$local_file_path = trailingslashit( wp_upload_dir()['baseurl'] ) . 'dummy_file.jpg';
$parsed_file_path = WC_Download_Handler::parse_file_path( $local_file_path );
$this->assertFalse( $parsed_file_path['remote_file'] );
}
/**
* Test for local file with `file` protocol.
*/
public function test_parse_file_path_for_local_file_protocol() {
$local_file_path = 'file:/' . trailingslashit( wp_upload_dir()['basedir'] ) . 'dummy_file.jpg';
$parsed_file_path = WC_Download_Handler::parse_file_path( $local_file_path );
$this->assertFalse( $parsed_file_path['remote_file'] );
}
/**
* Test for local file with https protocom.
*/
public function test_parse_file_path_for_local_file_https_protocol() {
$local_file_path = site_url( '/', 'https' ) . 'dummy_file.jpg';
$parsed_file_path = WC_Download_Handler::parse_file_path( $local_file_path );
$this->assertFalse( $parsed_file_path['remote_file'] );
}
/**
* Test for remote file.
*/
public function test_parse_file_path_for_remote_file() {
$remote_file_path = 'https://dummy.woocommerce.com/dummy_file.jpg';
$parsed_file_path = WC_Download_Handler::parse_file_path( $remote_file_path );
$this->assertTrue( $parsed_file_path['remote_file'] );
}
}