Skip to content

Fix PHP 8 fatal/warning on first opt-in without paid plans #888

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
Tobias-Conrad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix PHP 8 fatal/warning on first opt-in without paid plans #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions includes/class-freemius.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19869,8 +19869,15 @@ private function _store_plans( $store = true ) {

// Copy plans.
$encrypted_plans = array();
for ( $i = 0, $len = count( $this->_plans ); $i < $len; $i ++ ) {
$encrypted_plans[] = self::_encrypt_entity( $this->_plans[ $i ] );

// `_plans` defaults to `false` and is only assigned once the account carries a plan
// list (`_set_account()` skips the assignment when `$plans === false`). On a fresh
// first opt-in of a product without paid plans it can therefore still be `false` here,
// and `count( false )` is a fatal TypeError on PHP 8. Treat a missing list as empty.
$plans_to_encrypt = is_array( $this->_plans ) ? $this->_plans : array();

for ( $i = 0, $len = count( $plans_to_encrypt ); $i < $len; $i ++ ) {
$encrypted_plans[] = self::_encrypt_entity( $plans_to_encrypt[ $i ] );
}

$plans[ $this->_slug ] = $encrypted_plans;
Expand Down
5 changes: 4 additions & 1 deletion includes/entities/class-fs-site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ function __construct( $site = false ) {
parent::__construct( $site );

if ( is_object( $site ) ) {
$this->plan_id = $site->plan_id;
// The install payload can arrive without `plan_id` (e.g. a fresh/new-user
// connection of a product without paid plans), which raised an
// "Undefined property: stdClass::$plan_id" warning on PHP 8.
$this->plan_id = isset( $site->plan_id ) ? $site->plan_id : null;
}

if ( ! is_bool( $this->is_disconnected ) ) {
Expand Down