Bug fixes

Author: mirekmarek

_installer/Classes/IntlMock.php

@@ -30,8 +30,8 @@ public static function getDisplayLanguage() : string
 }
 
 class IntlDateFormatter {
-	const SHORT = '';
-	const MEDIUM = '';
+	const SHORT = 0;
+	const MEDIUM = 0;
 	const LONG = '';
 	const FULL = '';
 	const GREGORIAN = '';

_installer/dictionaries/en_US/ConfigureDb.php

@@ -27,4 +27,5 @@
 	'UNIX socket:' => '',
 	'Charset:' => '',
 	'Path:' => '',
+	'Error connecting to database:' => '',
 ];

_tools/studio/application/Classes/DataModel/Definition/Model/Main.php

@@ -45,7 +45,7 @@ class DataModel_Definition_Model_Main extends Jet_DataModel_Definition_Model_Mai
 	public static function getCreateForm(): Form
 	{
 		if( !static::$create_form ) {
-			static::$create_form = DataModel_Definition_Model_Trait::getCreateForm_Main();
+			static::$create_form = static::getCreateForm_Main();
 		}
 
 		return static::$create_form;
@@ -164,12 +164,12 @@ public static function catchCreateForm(): bool|DataModel_Definition_Model_Main
 			return false;
 		}
 
-		$class = DataModel_Definition_Model_Trait::catchCreateForm_createClass( $form );
+		$class = static::catchCreateForm_createClass( $form );
 
 		$model = new DataModel_Definition_Model_Main();
 		$model->setClass( $class );
-
-		DataModel_Definition_Model_Trait::catchCreateForm_modelMainSetup( $form, $model );
+		
+		static::catchCreateForm_modelMainSetup( $form, $model );
 
 		return $model;
 	}

_tools/studio/application/Classes/DataModel/Definition/Model/Related/1to1.php

@@ -36,7 +36,7 @@ class DataModel_Definition_Model_Related_1to1 extends Jet_DataModel_Definition_M
 	public static function getCreateForm(): Form
 	{
 		if( !static::$create_form ) {
-			static::$create_form = DataModel_Definition_Model_Trait::getCreateForm_Related( DataModel::MODEL_TYPE_RELATED_1TO1 );
+			static::$create_form = static::getCreateForm_Related( DataModel::MODEL_TYPE_RELATED_1TO1 );
 		}
 
 		return static::$create_form;
@@ -56,13 +56,13 @@ public static function catchCreateForm(): bool|DataModel_Definition_Model_Relate
 			return false;
 		}
 
-		$class = DataModel_Definition_Model_Trait::catchCreateForm_createClass( $form );
+		$class = static::catchCreateForm_createClass( $form );
 
 		$model = new DataModel_Definition_Model_Related_1to1();
 		$model->setClass( $class );
 
-		DataModel_Definition_Model_Trait::catchCreateForm_modelMainSetup( $form, $model );
-		DataModel_Definition_Model_Trait::catchCreateForm_relatedModelSetup( $form, $model );
+		static::catchCreateForm_modelMainSetup( $form, $model );
+		static::catchCreateForm_relatedModelSetup( $form, $model );
 
 		return $model;
 	}

_tools/studio/application/Classes/DataModel/Definition/Model/Related/1toN.php

@@ -37,7 +37,7 @@ class DataModel_Definition_Model_Related_1toN extends Jet_DataModel_Definition_M
 	public static function getCreateForm(): Form
 	{
 		if( !static::$create_form ) {
-			static::$create_form = DataModel_Definition_Model_Trait::getCreateForm_Related( DataModel::MODEL_TYPE_RELATED_1TON );
+			static::$create_form = static::getCreateForm_Related( DataModel::MODEL_TYPE_RELATED_1TON );
 		}
 
 		return static::$create_form;
@@ -57,13 +57,13 @@ public static function catchCreateForm(): bool|DataModel_Definition_Model_Relate
 			return false;
 		}
 
-		$class = DataModel_Definition_Model_Trait::catchCreateForm_createClass( $form );
+		$class = static::catchCreateForm_createClass( $form );
 
 		$model = new DataModel_Definition_Model_Related_1toN();
 		$model->setClass( $class );
-
-		DataModel_Definition_Model_Trait::catchCreateForm_modelMainSetup( $form, $model );
-		DataModel_Definition_Model_Trait::catchCreateForm_relatedModelSetup( $form, $model );
+		
+		static::catchCreateForm_modelMainSetup( $form, $model );
+		static::catchCreateForm_relatedModelSetup( $form, $model );
 
 
 		return $model;

library/Jet/Locale.php

@@ -1,4 +1,5 @@
-<?php
+<?php /** @noinspection PhpMultipleClassDeclarationsInspection */
+
 /**
  *
  * @copyright Copyright (c) Miroslav Marek <mirek.marek@web-jet.cz>