chore: improved PHP 8 compatibility

winternet-studio · Apr 3, 2024 · 23890b8 · 23890b8
1 parent ad5e61e
commit 23890b8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/UserException.php b/src/UserException.php
@@ -230,13 +230,19 @@ function __construct($msg, $arrayInternalInfo = [], $options = []) {
 				}
 			}
 
-			$requestInfo = [
-				'IP' => $ipAddress . (@$_SERVER['REDIRECT_GEOIP_COUNTRY_NAME'] ? '   '. $_SERVER['REDIRECT_GEOIP_COUNTRY_NAME'] : ''),
-				'Host' => $host,
-				$_SERVER['REQUEST_METHOD'] => (!empty($_POST) ? $_POST : file_get_contents('php://input')),
-				'Referer' => @$_SERVER['HTTP_REFERER'],
-				'User Agent' => @$_SERVER['HTTP_USER_AGENT'],
-			];
+			if (Yii::$app->request->isConsoleRequest) {
+				$requestInfo = [
+					'Mode' => 'CLI',
+				];
+			} else {
+				$requestInfo = [
+					'IP' => $ipAddress . (@$_SERVER['REDIRECT_GEOIP_COUNTRY_NAME'] ? '   '. $_SERVER['REDIRECT_GEOIP_COUNTRY_NAME'] : ''),
+					'Host' => $host,
+					$_SERVER['REQUEST_METHOD'] => (!empty($_POST) ? $_POST : file_get_contents('php://input')),
+					'Referer' => @$_SERVER['HTTP_REFERER'],
+					'User Agent' => @$_SERVER['HTTP_USER_AGENT'],
+				];
+			}
 			if (!$terminate) {
 				$requestInfo['Execution terminated'] = $terminate;
 				$requestInfo['Silent'] = $silent;

diff --git a/src/generators/crud2/default/views/_search.php b/src/generators/crud2/default/views/_search.php
@@ -24,8 +24,8 @@ function toggleSearchMethod() {
 		// Clear fields we are hiding and reset operator
 		$('.crud-search-area :input').not(':visible').not('.operator-input').val('');
 		$('.crud-search-area select.operator-input').find('option').prop('selected', function () {
-	        return $(this).prop('defaultSelected');
-	    }).parent().trigger('change');
+			return $(this).prop('defaultSelected');
+		}).parent().trigger('change');
 	}});
 }
 $(function() {