Skip to content

PHP-8x compatibility #225

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
ibrahim-kardi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

PHP-8x compatibility #225

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
624fed2
PHP-8x compatibility
ibrahim-kardi Dec 27, 2023
e9d0385
Update class-merlin.php
ibrahim-kardi Dec 27, 2023
1f973e9
Update class-merlin.php
ibrahim-kardi Dec 27, 2023
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
33 changes: 19 additions & 14 deletions class-merlin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ private function version() {
define( 'MERLIN_VERSION', '@@pkg.version' );
}
}
private $ready_big_button_url;
private $slug;
private $hook_suffix;

/**
* Class Constructor.
Expand Down Expand Up @@ -835,7 +838,7 @@ protected function welcome() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'welcome' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'welcome' ) ) ?? '', $this->svg_allowed_html() ); ?>

<h1><?php echo esc_html( sprintf( $header, $theme ) ); ?></h1>

Expand Down Expand Up @@ -895,7 +898,7 @@ protected function license() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'license' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'license' ) ) ?? '', $this->svg_allowed_html() ); ?>

<svg class="icon icon--checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="icon--checkmark__circle" cx="26" cy="26" r="25" fill="none"/><path class="icon--checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
Expand All @@ -914,7 +917,7 @@ protected function license() {
<?php if ( ! empty( $action_url ) ) : ?>
<a href="<?php echo esc_url( $action_url ); ?>" alt="<?php echo esc_attr( $action ); ?>" target="_blank">
<span class="hint--top" aria-label="<?php echo esc_attr( $action ); ?>">
<?php echo wp_kses( $this->svg( array( 'icon' => 'help' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'help' ) ) ?? '', $this->svg_allowed_html() ); ?>
</span>
</a>
<?php endif ?>
Expand All @@ -935,7 +938,7 @@ protected function license() {

<a href="<?php echo esc_url( $this->step_next_link() ); ?>" class="merlin__button merlin__button--next button-next js-merlin-license-activate-button" data-callback="activate_license">
<span class="merlin__button--loading__text"><?php echo esc_html( $install ); ?></span>
<?php echo wp_kses( $this->loading_spinner(), $this->loading_spinner_allowed_html() ); ?>
<?php echo wp_kses( $this->loading_spinner() ?? '', $this->loading_spinner_allowed_html() ); ?>
</a>

<?php else : ?>
Expand Down Expand Up @@ -983,7 +986,7 @@ protected function child() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'child' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'child' ) ) ?? '', $this->svg_allowed_html() ); ?>

<svg class="icon icon--checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="icon--checkmark__circle" cx="26" cy="26" r="25" fill="none"/><path class="icon--checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
Expand All @@ -1005,7 +1008,7 @@ protected function child() {

<a href="<?php echo esc_url( $this->step_next_link() ); ?>" class="merlin__button merlin__button--next button-next" data-callback="install_child">
<span class="merlin__button--loading__text"><?php echo esc_html( $install ); ?></span>
<?php echo wp_kses( $this->loading_spinner(), $this->loading_spinner_allowed_html() ); ?>
<?php echo wp_kses( $this->loading_spinner() ?? '', $this->loading_spinner_allowed_html() ); ?>
</a>

<?php else : ?>
Expand Down Expand Up @@ -1068,7 +1071,7 @@ protected function plugins() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'plugins' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'plugins' ) ) ?? '', $this->svg_allowed_html() ); ?>

<svg class="icon icon--checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="icon--checkmark__circle" cx="26" cy="26" r="25" fill="none"/><path class="icon--checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
Expand Down Expand Up @@ -1101,7 +1104,7 @@ protected function plugins() {
<span><?php echo esc_html( $plugin['name'] ); ?></span>

<span class="badge">
<span class="hint--top" aria-label="<?php esc_attr_e( 'Required', '@@textdomain' ); ?>">
<span class="hint--top" aria-label="<?php esc_html_e( 'Required', '@@textdomain' ); ?>">
<?php esc_html_e( 'req', '@@textdomain' ); ?>
</span>
</span>
Expand Down Expand Up @@ -1132,7 +1135,7 @@ protected function plugins() {
<a id="skip" href="<?php echo esc_url( $this->step_next_link() ); ?>" class="merlin__button merlin__button--skip merlin__button--proceed"><?php echo esc_html( $skip ); ?></a>
<a href="<?php echo esc_url( $this->step_next_link() ); ?>" class="merlin__button merlin__button--next button-next" data-callback="install_plugins">
<span class="merlin__button--loading__text"><?php echo esc_html( $install ); ?></span>
<?php echo wp_kses( $this->loading_spinner(), $this->loading_spinner_allowed_html() ); ?>
<?php echo wp_kses( $this->loading_spinner() ?? '', $this->loading_spinner_allowed_html() ); ?>
</a>
<?php else : ?>
<a href="<?php echo esc_url( $this->step_next_link() ); ?>" class="merlin__button merlin__button--next merlin__button--proceed merlin__button--colorchange"><?php echo esc_html( $next ); ?></a>
Expand Down Expand Up @@ -1167,7 +1170,7 @@ protected function content() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'content' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'content' ) ) ?? '', $this->svg_allowed_html() ); ?>

<svg class="icon icon--checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
<circle class="icon--checkmark__circle" cx="26" cy="26" r="25" fill="none"/><path class="icon--checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
Expand All @@ -1189,7 +1192,7 @@ protected function content() {

<div class="merlin__select-control-help">
<span class="hint--top" aria-label="<?php echo esc_attr__( 'Select Demo', '@@textdomain' ); ?>">
<?php echo wp_kses( $this->svg( array( 'icon' => 'downarrow' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'downarrow' ) ) ?? '', $this->svg_allowed_html() ); ?>
</span>
</div>
</div>
Expand Down Expand Up @@ -1254,6 +1257,7 @@ protected function ready() {
$skip = $strings['btn-skip'];
$next = $strings['btn-next'];
$big_btn = $strings['ready-big-button'];


// Links.
$links = array();
Expand All @@ -1279,11 +1283,11 @@ protected function ready() {

<div class="merlin__content--transition">

<?php echo wp_kses( $this->svg( array( 'icon' => 'done' ) ), $this->svg_allowed_html() ); ?>
<?php echo wp_kses( $this->svg( array( 'icon' => 'done' ) ) ?? '', $this->svg_allowed_html() ); ?>

<h1><?php echo esc_html( sprintf( $header, $theme ) ); ?></h1>

<p><?php wp_kses( printf( $paragraph, $author ), $allowed_html_array ); ?></p>
<p><?php wp_kses( printf( $paragraph, $author ) ?? '', $allowed_html_array ); ?></p>

</div>

Expand All @@ -1297,7 +1301,7 @@ protected function ready() {
<ul class="merlin__drawer merlin__drawer--extras">

<?php foreach ( $links as $link ) : ?>
<li><?php echo wp_kses( $link, $allowed_html_array ); ?></li>
<li><?php echo wp_kses( $link ?? '', $allowed_html_array ); ?></li>
<?php endforeach; ?>

</ul>
Expand Down Expand Up @@ -2123,6 +2127,7 @@ public function after_content_import_setup() {

$this->logger->debug( __( 'The blog page was set', '@@textdomain' ), array( 'blog_page_id' => $blogpage ) );
}

}

/**
Expand Down