Skip to content
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

Fixes issues with abs() requiring int|float since PHP8 #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes issues with abs() requiring int|float since PHP8 #61

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
24 changes: 12 additions & 12 deletions image-widget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public function widget( $args, $instance ) {
* @param array $args The array of widget arguments.
* @param array $instance The array of widget options.
*/
$instance['width'] = apply_filters( 'image_widget_image_width', abs( $instance['width'] ), $args, $instance );
$instance['width'] = apply_filters( 'image_widget_image_width', abs( (int) $instance['width'] ), $args, $instance );

/**
* Filters the height of the image in the widget.
Expand All @@ -191,7 +191,7 @@ public function widget( $args, $instance ) {
* @param array $args The array of widget arguments.
* @param array $instance The array of widget options.
*/
$instance['height'] = apply_filters( 'image_widget_image_height', abs( $instance['height'] ), $args, $instance );
$instance['height'] = apply_filters( 'image_widget_image_height', abs( (int) $instance['height'] ), $args, $instance );

/**
* Filters the max width of the image in the widget.
Expand Down Expand Up @@ -267,7 +267,7 @@ public function widget( $args, $instance ) {
* @param array $args The array of widget arguments.
* @param array $instance The array of widget options.
*/
$instance['attachment_id'] = apply_filters( 'image_widget_image_attachment_id', abs( $instance['attachment_id'] ), $args, $instance );
$instance['attachment_id'] = apply_filters( 'image_widget_image_attachment_id', abs( (int) $instance['attachment_id'] ), $args, $instance );

/**
* Filters the size of the image in the widget.
Expand Down Expand Up @@ -334,8 +334,8 @@ public function update( $new_instance, $old_instance ) {
$instance['linktitle'] = $new_instance['linktitle'];
$instance['linkid'] = $new_instance['linkid'];
$instance['linktarget'] = $new_instance['linktarget'];
$instance['width'] = abs( $new_instance['width'] );
$instance['height'] = abs( $new_instance['height'] );
$instance['width'] = abs( (int) $new_instance['width'] );
$instance['height'] = abs( (int) $new_instance['height'] );

if ( ! defined( 'IMAGE_WIDGET_COMPATIBILITY_TEST' ) ) {
$instance['size'] = $new_instance['size'];
Expand All @@ -347,9 +347,9 @@ public function update( $new_instance, $old_instance ) {

// Reverse compatibility with $image, now called $attachement_id
if ( ! defined( 'IMAGE_WIDGET_COMPATIBILITY_TEST' ) && $new_instance['attachment_id'] > 0 ) {
$instance['attachment_id'] = abs( $new_instance['attachment_id'] );
$instance['attachment_id'] = abs( (int) $new_instance['attachment_id'] );
} elseif ( $new_instance['image'] > 0 ) {
$instance['attachment_id'] = $instance['image'] = abs( $new_instance['image'] );
$instance['attachment_id'] = $instance['image'] = abs( (int) $new_instance['image'] );
if ( class_exists( 'ImageWidgetDeprecated' ) ) {
$instance['imageurl'] = ImageWidgetDeprecated::get_image_url( $instance['image'], $instance['width'], $instance['height'] ); // image resizing not working right now
}
Expand Down Expand Up @@ -483,8 +483,8 @@ private function get_image_html( $instance, $include_link = true ) {
}
}

$instance['width'] = abs( $instance['width'] );
$instance['height'] = abs( $instance['height'] );
$instance['width'] = abs( (int) $instance['width'] );
$instance['height'] = abs( (int) $instance['height'] );

$attr = array();

Expand Down Expand Up @@ -544,7 +544,7 @@ private function get_image_html( $instance, $include_link = true ) {

$output .= ' />';

} elseif ( abs( $instance['attachment_id'] ) > 0 ) {
} elseif ( abs( (int) $instance['attachment_id'] ) > 0 ) {
$output .= wp_get_attachment_image( $instance['attachment_id'], $size, false, $attr );
}

Expand Down Expand Up @@ -591,7 +591,7 @@ private function get_image_size( $instance ) {
if ( ! empty( $instance['size'] ) && $instance['size'] != self::CUSTOM_IMAGE_SIZE_SLUG ) {
$size = $instance['size'];
} elseif ( isset( $instance['width'] ) && is_numeric( $instance['width'] ) && isset( $instance['height'] ) && is_numeric( $instance['height'] ) ) {
//$size = array(abs($instance['width']),abs($instance['height']));
//$size = array(abs((int) $instance['width']),abs((int) $instance['height']));
$size = array( $instance['width'], $instance['height'] );
} else {
$size = 'full';
Expand All @@ -608,7 +608,7 @@ private function get_image_size( $instance ) {
*/
private function get_image_aspect_ratio( $instance ) {
if ( ! empty( $instance['aspect_ratio'] ) ) {
return abs( $instance['aspect_ratio'] );
return abs( (float) $instance['aspect_ratio'] );
} else {
$attachment_id = ( ! empty( $instance['attachment_id'] ) ) ? $instance['attachment_id'] : $instance['image'];
if ( ! empty( $attachment_id ) ) {
Expand Down
2 changes: 1 addition & 1 deletion views/widget-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="tribe_preview" id="<?php echo $this->get_field_id( 'preview' ); ?>">
<?php echo $this->get_image_html( $instance, false ); ?>
</div>
<input type="hidden" id="<?php echo $this->get_field_id( 'attachment_id' ); ?>" name="<?php echo $this->get_field_name( 'attachment_id' ); ?>" value="<?php echo abs( $instance['attachment_id'] ); ?>" />
<input type="hidden" id="<?php echo $this->get_field_id( 'attachment_id' ); ?>" name="<?php echo $this->get_field_name( 'attachment_id' ); ?>" value="<?php echo abs( (int) $instance['attachment_id'] ); ?>" />
<input type="hidden" id="<?php echo $this->get_field_id( 'imageurl' ); ?>" name="<?php echo $this->get_field_name( 'imageurl' ); ?>" value="<?php echo esc_attr( esc_url( $instance['imageurl'] ) ); ?>" />
</div>
<br clear="all" />
Expand Down