Skip to content

Commit

Permalink
TMS-968: phpcs fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
eebbi committed Mar 18, 2024
1 parent 020dbed commit eebfb3b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
8 changes: 6 additions & 2 deletions src/Models/page-combined-events-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ protected function get_events() : array {

if ( empty( $response ) ) {
$response = $this->do_get_events( $params );
$response['events'] = array_merge( $response['events'], $this->get_manual_events(), $this->get_recurring_manual_events() );
$response['events'] = array_merge(
$response['events'],
$this->get_manual_events(),
$this->get_recurring_manual_events()
);

// Sort events by start datetime objects.
usort( $response['events'], function( $a, $b ) {
Expand Down Expand Up @@ -206,7 +210,7 @@ protected function get_recurring_manual_events() : array {
$event->id = $id;
$event->title = \get_the_title( $id );
$event->url = \get_permalink( $id );
$event->image = \has_post_thumbnail( $id ) ? \get_the_post_thumbnail_url( $id, 'medium_large' ) : null;
$event->image = \has_post_thumbnail( $id ) ? \get_the_post_thumbnail_url( $id, 'medium_large' ) : null; // phpcs:ignore
$event->start_datetime = $date['start'];
$event->end_datetime = $date['end'];

Expand Down
17 changes: 12 additions & 5 deletions src/Models/page-combined-events-search.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected function get_events() : array {
$end_date = \get_query_var( self::EVENT_SEARCH_END_DATE );
$end_date = ! empty( $end_date ) ? $end_date : date( 'Y-m-d', strtotime( '+1 year' ) );

if ( ! $event_search_text && ! \get_query_var( self::EVENT_SEARCH_START_DATE ) && ! \get_query_var( self::EVENT_SEARCH_END_DATE ) ) {
if ( ! $event_search_text && ! \get_query_var( self::EVENT_SEARCH_START_DATE ) && ! \get_query_var( self::EVENT_SEARCH_END_DATE ) ) { // phpcs:ignore
return [];
}

Expand Down Expand Up @@ -151,7 +151,11 @@ protected function get_events() : array {

if ( empty( $response ) ) {
$response = $this->do_get_events( $params );
$response['events'] = array_merge( $response['events'] ?? [], $this->get_manual_events( $params ), $this->get_recurring_manual_events( $params ) );
$response['events'] = array_merge(
$response['events'] ?? [],
$this->get_manual_events( $params ),
$this->get_recurring_manual_events( $params )
);

// Sort events by start datetime objects.
usort( $response['events'], function( $a, $b ) {
Expand Down Expand Up @@ -284,15 +288,18 @@ protected function get_recurring_manual_events( $params ) : array {
$event_end = new DateTime( $date['end'], $timezone );

// Check if url-parameters exist
if ( ! \get_query_var( self::EVENT_SEARCH_START_DATE ) && ! \get_query_var( self::EVENT_SEARCH_END_DATE ) ) {
if ( ! \get_query_var( self::EVENT_SEARCH_START_DATE ) && ! \get_query_var( self::EVENT_SEARCH_END_DATE ) ) { // phpcs:ignore
// Return only ongoing or next upcoming event
if ( $time_now > $event_start && $time_now < $event_end ) {
$event->start_datetime = $date['start'];
$event->end_datetime = $date['end'];
}
}
else if ( \get_query_var( self::EVENT_SEARCH_START_DATE ) ) {
$param_start = new DateTime( \get_query_var( self::EVENT_SEARCH_START_DATE ), new \DateTimeZone( 'Europe/Helsinki' ) );
elseif ( \get_query_var( self::EVENT_SEARCH_START_DATE ) ) {
$param_start = new DateTime(
\get_query_var( self::EVENT_SEARCH_START_DATE ),
new \DateTimeZone( 'Europe/Helsinki' )
);

// Get next starting event
if ( $param_start <= $event_start ) {
Expand Down
2 changes: 1 addition & 1 deletion src/Models/single-manual-event-cpt.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function event() {

// Set latest dates if no upcoming date found
if ( empty( $event->start_datetime ) && empty( $event->end_datetime ) ) {
$last_dates = end( $event->dates );
$last_dates = end( $event->dates );
$event->start_datetime = $last_dates['start'];
$event->end_datetime = $last_dates['end'];
}
Expand Down
2 changes: 1 addition & 1 deletion src/PostType/ManualEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ protected function get_event_tab( string $key ) : ?Field\Tab {
->add_rule( $price_is_free->get_key(), '!=', '1' );
$rule_group_is_virtual_event = ( new ConditionalLogicGroup() )
->add_rule( $is_virtual_event->get_key(), '==', '1' );
$rule_group_is_not_recurring = ( new ConditionalLogicGroup() )
$rule_group_is_not_recurring = ( new ConditionalLogicGroup() )
->add_rule( $recurring_event->get_key(), '==', '0' );
$rule_group_is_recurring = ( new ConditionalLogicGroup() )
->add_rule( $recurring_event->get_key(), '==', '1' );
Expand Down

0 comments on commit eebfb3b

Please sign in to comment.