Skip to content

Moved from php_version to programming_language_version for consistency. #2

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.

Sign up for GitHub

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

Open
vovafeldman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moved from php_version to programming_language_version for consistency. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b5d494
Pull php version from both 'php_version' or 'programming_language_ver…
vovafeldman Feb 15, 2017
dad1edb
Don't require 'php_version', instead require one of the two 'php_vers…
vovafeldman Feb 15, 2017
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
10 changes: 8 additions & 2 deletions includes/migration/class-fs-migration-endpoint-abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,9 +637,15 @@ protected function validate_all_params() {
'language',
'charset',
'platform_version',
'php_version',
) );

if ( ! isset( $this->_request_data[ 'php_version' ] ) &&
! isset( $this->_request_data[ 'programming_language_version' ] )
) {
$this->require_params( array( 'programming_language_version' ) );
}


$this->require_non_empty_params( array(
// License key.
'license_key',
Expand Down Expand Up @@ -970,4 +976,4 @@ abstract protected function local_to_remote_module( $local_module );
* @throws FS_Endpoint_Exception
*/
abstract protected function migrate_install_license();
}
}
4 changes: 3 additions & 1 deletion includes/migration/wc/class-fs-wc-migration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,9 @@ protected function get_install_for_api( $license_id ) {
$install['language'] = $this->_edd_install_data['language'];
$install['charset'] = $this->_edd_install_data['charset'];
$install['platform_version'] = $this->_edd_install_data['platform_version'];
$install['programming_language_version'] = $this->_edd_install_data['php_version'];
$install['programming_language_version'] = !empty($this->_edd_install_data['php_version']) ?
$this->_edd_install_data['php_version'] :
$this->_edd_install_data['programming_language_version'];
$install['license_id'] = $license_id;

$install_at = $this->ep->order->_purchase_time;
Expand Down