diff --git a/src/Service/Holiday.php b/src/Service/Holiday.php
index 3358979e0..eb381ed30 100644
--- a/src/Service/Holiday.php
+++ b/src/Service/Holiday.php
@@ -111,7 +111,7 @@ public static function getYearsOption( ): string {
 			$year_options .= '<option value="'. $year .'" ';
 			if($i === 0){
 				$year_options .= ' selected ';
-			};
+			}
 
 			$year_options .='>'. $year++ .'</option>';
 		}
diff --git a/templates/dashboard-index.php b/templates/dashboard-index.php
index 2fe2b0604..f49b386fb 100644
--- a/templates/dashboard-index.php
+++ b/templates/dashboard-index.php
@@ -1,5 +1,5 @@
 <h1>Dashboard</h1>
-<!-- based on Wordpress Dashboard --> 
+<!-- based on Wordpress Dashboard -->
 <div class="wrap">
 	<div id="cb_welcome-panel" class="cb_welcome-panel">
 		<div class="cb_welcome-panel-content">
@@ -16,7 +16,7 @@
 				<div class="cb_welcome-panel-column cb_welcome-panel-last">
 					<h3><?php echo esc_html__('Support', 'commonsbooking') ;?></h3>
 					<ul>
-						<li><a href="https://commonsbooking.org/dokumentation" target="_blank"><?php echo esc_html__('Documentation & Tutorials', 'commonsbooking') ;?></a></li>		
+						<li><a href="https://commonsbooking.org/dokumentation" target="_blank"><?php echo esc_html__('Documentation & Tutorials', 'commonsbooking') ;?></a></li>
 						<li><a href="mailto:mail@commonsbooking.org?body=%0D%0A%0D%0A-----------%0D%0A%0D%0AInstallations-URL: <?php echo home_url(); ?>%0D%0A%0D%0ACB-Version: <?php echo commonsbooking_sanitizeHTML( COMMONSBOOKING_VERSION ); ?>" target="_blank"><?php echo esc_html__('Support E-Mail', 'commonsbooking') ;?></a></li>
 						<li><a href="https://commonsbooking.org/kontakt/" target="_blank"><?php echo __('Contact & Newsletter', 'commonsbooking') ;?></a></li>
 					</ul>
@@ -37,7 +37,7 @@
 						<li><a href="edit.php?post_type=cb_timeframe"><span class="dashicons dashicons-calendar-alt"></span> <?php echo esc_html__('Timeframes', 'commonsbooking') ;?></a>
 						</li>
 					</ul>
-	
+
 				</div><!-- .cb_welcome-panel-column -->
 				<div class="cb_welcome-panel-column">
 					<h3 style="padding-bottom:20px"><?php echo esc_html__('See Bookings & manage restrictions', 'commonsbooking') ;?></h3>
@@ -67,28 +67,28 @@
 			<div class="cb_welcome-panel-column-container">
 				<div class="cb_welcome-panel-column" style="width: 50%;">
 					<h3><?php echo esc_html__("Today's pickups", 'commonsbooking') ;?></h3>
-					<?php 
+					<?php
 					// Display list of bookings with pickup date = today
 					$BeginningBookings = CommonsBooking\View\Dashboard::renderBeginningBookings();
 					if ($BeginningBookings) {
 						echo commonsbooking_sanitizeHTML($BeginningBookings);
 					} else {
-						echo esc_html__('No pickups today', 'commonsbooking');					
-					};
-					
+						echo esc_html__('No pickups today', 'commonsbooking');
+					}
+
 					?>
 				</div>
 				<div class="cb_welcome-panel-column" style="width: 50%">
 					<h3><?php echo esc_html__("Today's returns", 'commonsbooking') ;?></h3>
-					<?php 
+					<?php
 					// Display list of bookings with return date = today
 					$BeginningBookings = CommonsBooking\View\Dashboard::renderEndingBookings();
 					if ($BeginningBookings) {
 						echo commonsbooking_sanitizeHTML($BeginningBookings);
 					} else {
-						echo esc_html__('No returns today', 'commonsbooking');					
-					};
-					
+						echo esc_html__('No returns today', 'commonsbooking');
+					}
+
 					?>
 				</div>
 			</div>
diff --git a/templates/map-admin-page-template.php b/templates/map-admin-page-template.php
index 5c9fc7be6..0b42c4c51 100644
--- a/templates/map-admin-page-template.php
+++ b/templates/map-admin-page-template.php
@@ -197,7 +197,7 @@
                               title="<?php echo commonsbooking_sanitizeHTML( __('activate to show the marker tooltips permanently' ,'commonsbooking')); ?>"></span>
                     </th>
                     <td><input type="checkbox"
-                               name="cb_map_options[marker_tooltip_permanent]" <?php echo  MapAdmin::get_option($cb_map_id, 'marker_tooltip_permanent' ,'commonsbooking') ? 'checked="checked"' : '' ?> value="on"></td>
+                               name="cb_map_options[marker_tooltip_permanent]" <?php echo  MapAdmin::get_option($cb_map_id, 'marker_tooltip_permanent') ? 'checked="checked"' : '' ?> value="on"></td>
                 </tr>
             </table>
         </details>
@@ -206,10 +206,10 @@
         <details>
             <summary><?php echo commonsbooking_sanitizeHTML( __( 'Marker Popup' ,'commonsbooking')); ?></summary>
             <table class="text-left">
-			<!-- 
+			<!--
 				deactivated popup information because we dont want to show contact infos before booking and do not want to display long pickup instructions here
 				needs to be optmized in future version
-				
+
                 <tr>
                     <th>
                         <?php echo commonsbooking_sanitizeHTML( __('show location opening hours' ,'commonsbooking')); ?>:
diff --git a/templates/shortcode-items.php b/templates/shortcode-items.php
index baa0f6220..67e62349a 100644
--- a/templates/shortcode-items.php
+++ b/templates/shortcode-items.php
@@ -35,7 +35,7 @@
 <?php
 if ($hasTimeFrames) {
 	/**
-	 * if this item has bookable timeframes we load the template timeframe-withlocation.php and 
+	 * if this item has bookable timeframes we load the template timeframe-withlocation.php and
 	 * set the variables used in this template
 	 */
     foreach ($templateData['data'] as $locationId => $data ) {
@@ -45,4 +45,4 @@
         set_query_var( 'data', $data );
         commonsbooking_get_template_part( 'timeframe', 'withlocation' );
     }
- }; // end if ($timeframes) ?>
\ No newline at end of file
+ } // end if ($timeframes) ?>
\ No newline at end of file
diff --git a/tests/php/Repository/TimeframeTest.php b/tests/php/Repository/TimeframeTest.php
index b0f5d2004..c7e40e0ae 100644
--- a/tests/php/Repository/TimeframeTest.php
+++ b/tests/php/Repository/TimeframeTest.php
@@ -31,14 +31,14 @@ class TimeframeTest extends CustomPostTypeTest {
 	protected array $allTimeframes;
 
 	/**
-	 * Create a completely seperate item, location and timeframe.
+	 * Create a completely separate item, location and timeframe.
 	 * @return void
 	 */
 	private function createOtherTimeframe( $start = null, $end = null ) {
-		if ( $start = null ) {
+		if ( $start === null ) {
 			$start = $this->repetition_start;
 		}
-		if ( $end = null ) {
+		if ( $end === null ) {
 			$end = $this->repetition_end;
 		}
 		$this->otherItemId      = $this->createItem( "Other Item" );