Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-05-25 10:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix db bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-28 17:16:05 +01:00
parent 7300b52d25
commit e83574a452
6 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataStorage/Database/DataMapperAbstract.php
View File

@ -1885,7 +1885,9 @@ class DataMapperAbstract implements DataMapperInterface
if ($depth < 1) { if ($depth < 1) {
if (\array_key_exists(static::$ownsOne[$member]['self'] . '_' . ($depth + 1), $result)) { if (\array_key_exists(static::$ownsOne[$member]['self'] . '_' . ($depth + 1), $result)) {
return $mapper::createNullModel($result[static::$ownsOne[$member]['self'] . '_' . ($depth + 1)]); return isset(static::$ownsOne[$member]['column'])
? $result[static::$ownsOne[$member]['self'] . '_' . ($depth + 1)]
: $mapper::createNullModel($result[static::$ownsOne[$member]['self'] . '_' . ($depth + 1)]);
} else { } else {
return $default; return $default;
} }
@ -1963,7 +1965,9 @@ class DataMapperAbstract implements DataMapperInterface
if ($depth < 1) { if ($depth < 1) {
if (\array_key_exists(static::$belongsTo[$member]['self'] . '_' . ($depth + 1), $result)) { if (\array_key_exists(static::$belongsTo[$member]['self'] . '_' . ($depth + 1), $result)) {
return $mapper::createNullModel($result[static::$belongsTo[$member]['self'] . '_' . ($depth + 1)]); return isset(static::$belongsTo[$member]['column'])
? $result[static::$belongsTo[$member]['self'] . '_' . ($depth + 1)]
: $mapper::createNullModel($result[static::$belongsTo[$member]['self'] . '_' . ($depth + 1)]);
} else { } else {
return $default; return $default;
} }

14
Localization/Defaults/City.php
View File

@ -30,7 +30,7 @@ class City
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $id = 0; protected int $id = 0;
/** /**
* Country code. * Country code.
@ -38,7 +38,7 @@ class City
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $countryCode = ''; protected string $countryCode = '';
/** /**
* State code. * State code.
@ -46,7 +46,7 @@ class City
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $state = ''; protected string $state = '';
/** /**
* City name. * City name.
@ -54,7 +54,7 @@ class City
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $name = ''; protected string $name = '';
/** /**
* Postal code. * Postal code.
@ -62,7 +62,7 @@ class City
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $postal = 0; protected int $postal = 0;
/** /**
* Latitude. * Latitude.
@ -70,7 +70,7 @@ class City
* @var float * @var float
* @since 1.0.0 * @since 1.0.0
*/ */
private float $lat = 0.0; protected float $lat = 0.0;
/** /**
* Longitude. * Longitude.
@ -78,7 +78,7 @@ class City
* @var float * @var float
* @since 1.0.0 * @since 1.0.0
*/ */
private float $long = 0.0; protected float $long = 0.0;
/** /**
* Get city name * Get city name

12
Localization/Defaults/Country.php
View File

@ -30,7 +30,7 @@ class Country
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private $id = 0; protected int $id = 0;
/** /**
* Country name. * Country name.
@ -38,7 +38,7 @@ class Country
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $name = ''; protected string $name = '';
/** /**
* Country code. * Country code.
@ -46,7 +46,7 @@ class Country
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $code2 = ''; protected string $code2 = '';
/** /**
* Country code. * Country code.
@ -54,7 +54,7 @@ class Country
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $code3 = ''; protected string $code3 = '';
/** /**
* Country code. * Country code.
@ -62,7 +62,7 @@ class Country
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private $numeric = 0; protected int $numeric = 0;
/** /**
* Country subdevision. * Country subdevision.
@ -70,7 +70,7 @@ class Country
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $subdevision = ''; protected string $subdevision = '';
/** /**
* Get id * Get id

16
Localization/Defaults/Currency.php
View File

@ -30,7 +30,7 @@ class Currency
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $id = 0; protected int $id = 0;
/** /**
* Currency name. * Currency name.
@ -38,7 +38,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $name = ''; protected string $name = '';
/** /**
* Currency code. * Currency code.
@ -46,7 +46,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $code = ''; protected string $code = '';
/** /**
* Currency symbol. * Currency symbol.
@ -54,7 +54,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $symbol = ''; protected string $symbol = '';
/** /**
* Currency number. * Currency number.
@ -62,7 +62,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $number = ''; protected string $number = '';
/** /**
* Currency subunits. * Currency subunits.
@ -70,7 +70,7 @@ class Currency
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $subunits = 0; protected int $subunits = 0;
/** /**
* Currency decimals. * Currency decimals.
@ -78,7 +78,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $decimals = ''; protected string $decimals = '';
/** /**
* Currency countries. * Currency countries.
@ -86,7 +86,7 @@ class Currency
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $countries = ''; protected string $countries = '';
/** /**
* Get currency name * Get currency name

10
Localization/Defaults/Iban.php
View File

@ -30,7 +30,7 @@ class Iban
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private $id = 0; protected int $id = 0;
/** /**
* Iban country. * Iban country.
@ -38,7 +38,7 @@ class Iban
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $country = ''; protected string $country = '';
/** /**
* Iban chars. * Iban chars.
@ -46,7 +46,7 @@ class Iban
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private $chars = 2; protected int $chars = 2;
/** /**
* Iban bban. * Iban bban.
@ -54,7 +54,7 @@ class Iban
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $bban = ''; protected string $bban = '';
/** /**
* Iban fields. * Iban fields.
@ -62,7 +62,7 @@ class Iban
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private $fields = ''; protected string $fields = '';
/** /**
* Get iban country * Get iban country

12
Localization/Defaults/Language.php
View File

@ -30,7 +30,7 @@ class Language
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $id = 0; protected int $id = 0;
/** /**
* Language name. * Language name.
@ -38,7 +38,7 @@ class Language
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $name = ''; protected string $name = '';
/** /**
* Language native. * Language native.
@ -46,7 +46,7 @@ class Language
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $native = ''; protected string $native = '';
/** /**
* Language code. * Language code.
@ -54,7 +54,7 @@ class Language
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $code2 = ''; protected string $code2 = '';
/** /**
* Language code. * Language code.
@ -62,7 +62,7 @@ class Language
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $code3 = ''; protected string $code3 = '';
/** /**
* Language code. * Language code.
@ -70,7 +70,7 @@ class Language
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $code3Native = ''; protected string $code3Native = '';
/** /**
* Get id * Get id