Criterion9 php8 dynamic attributes and other similar php version chan…

…ge issues (#903) * Update error.php attribute typo logger attribute was typo as loggger * Update module.php * Update module.php moving the declaration to the parent class where it belongs * Update owa_module.php missed attribute declaration * Update owa_metric.php missed attribute declarations added type, entity, and all_columns attributes * Update owa_auth.php missed attribute declaration added eq * Update owa_coreAPI.php optional parameter wrong order removed "optional" parameter that had a required parameter after it * Update state.php optional parameter order removed "optional" parameter that had a required parameter afterwards * Update owa_template.php missed attribute declaration added time_now * Update owa_template.php check for null parameter added a check for null parameter and set to a string before using in strtolower() * Update report.php missed attribute declaration added report_params * Update owa_view.php method mismatch fixes the Fatal error: Declaration of owa_optionsGeneralView::render($data) must be compatible with message
Open-Web-Analytics · Jan 7, 2024 · 898236b · 898236b
1 parent ed125da
commit 898236b
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 16 deletions.
diff --git a/modules/base/classes/error.php b/modules/base/classes/error.php
@@ -48,7 +48,7 @@ class owa_error {
      *
      * @var array
      */
-    var $loggger;
+    var $logger;
 
     /**
      * Buffered Msgs
@@ -426,4 +426,4 @@ function mailErrorMsg( $msg, $subject ) {
     }
 }
 
-?>
+?>
diff --git a/modules/base/classes/state.php b/modules/base/classes/state.php
@@ -93,7 +93,7 @@ public function get($store, $name = '') {
         }
     }
 
-    function setState($store, $name = '', $value, $store_type = '', $is_perminent = false) {
+    function setState($store, $name, $value, $store_type = '', $is_perminent = false) {
 
         owa_coreAPI::debug(sprintf('populating state for store: %s, name: %s, value: %s, store type: %s, is_perm: %s', $store, $name, print_r($value, true), $store_type, $is_perminent));
 
@@ -141,7 +141,7 @@ function isCdhRequired($store_name) {
         }
     }
 
-    function set($store, $name = '', $value, $store_type = '', $is_perminent = false) {
+    function set($store, $name, $value, $store_type = '', $is_perminent = false) {
 
         if ( ! isset($this->stores[$store] ) ) {
             $this->loadState($store);
@@ -318,4 +318,4 @@ function getCookieDomainHash($domain = '') {
     }
 }
 
-?>
+?>
diff --git a/modules/base/module.php b/modules/base/module.php
@@ -2415,4 +2415,4 @@ function checkEventForType( $event ) {
 }
 
 
-?>
+?>
diff --git a/modules/base/report.php b/modules/base/report.php
@@ -32,6 +32,7 @@
  */
 
 class owa_reportView extends owa_view {
+    var $report_params;
 
     function render($data) {
 
@@ -258,4 +259,4 @@ function render() {
     }
 }
 
-?>
+?>
diff --git a/owa_auth.php b/owa_auth.php
@@ -73,6 +73,8 @@ class owa_auth extends owa_base {
 
     var $auth_method;
 
+    var $eq;
+
     /**
      * Auth class Singleton
      *
@@ -578,4 +580,4 @@ public function getAuthMethod() {
     }
 }
 
-?>
+?>
diff --git a/owa_coreAPI.php b/owa_coreAPI.php
@@ -1230,7 +1230,7 @@ public static function registerStateStore($name, $expiration, $length = '', $for
         return $service->request->state->registerStore( $name, $expiration, $length, $format, $type, $cdh_required );
     }
 
-    public static function setState($store, $name = '', $value, $store_type = '', $is_perminent = '') {
+    public static function setState($store, $name, $value, $store_type = '', $is_perminent = '') {
 
         $service = owa_coreAPI::serviceSingleton();
         return $service->request->state->set($store, $name, $value, $store_type, $is_perminent);
@@ -1936,4 +1936,4 @@ public static function signRequestUrl( $url, $apiKey ) {
 
 }
 
-?>
+?>
diff --git a/owa_metric.php b/owa_metric.php
@@ -101,6 +101,8 @@ class owa_metric extends owa_base {
     var $name;
 
     var $supported_data_types = array('percentage', 'decimal', 'integer', 'url', 'yyyymmdd', 'timestamp', 'string', 'currency');
+
+    var $type, $entity, $all_columns;
 
     function __construct($params = array()) {
 
@@ -360,4 +362,4 @@ function setMetricType( $type ) {
     }
 }
 
-?>
+?>
diff --git a/owa_module.php b/owa_module.php
@@ -215,7 +215,8 @@ abstract class owa_module {
 	 * Filesystem path of the module's directory
 	 */
     var $path;
-
+
+	var $config_required;
 
     /**
      * Constructor
@@ -1197,4 +1198,4 @@ protected function registerEventQueue( $name, $map ) {
 
 }
 
-?>
+?>
diff --git a/owa_template.php b/owa_template.php
@@ -59,6 +59,8 @@ class owa_template extends Template {
 
     var $period;
 
+    var $time_now;
+
     /**
      * Params passed by calling caller
      *
@@ -199,6 +201,9 @@ function get_month_label($month) {
      * @return unknown
      */
     function choose_browser_icon($browser_type) {
+	    if(is_null($browser_type)){
+		    $browser_type = 'null';
+	    }
 
 		$bicons = [
 
@@ -1060,4 +1065,4 @@ public function isValueSet( $string ) {
 }
 
 
-?>
+?>
diff --git a/owa_view.php b/owa_view.php
@@ -917,7 +917,7 @@ function render() {
 
 class owa_adminPageView extends owa_view {
 
-    function render() {
+    function render($data) {
 
         // Set Page title
         $this->t->set('page_title', $this->get('title'));
@@ -970,4 +970,4 @@ function setResponseData( $data ) {
     }
 }
 
-?>
+?>