Skip to content

Commit 4150d84

Browse files
committed
[skip ci] fix models cache generation pb (php 8 attributes)
1 parent ca170d4 commit 4150d84

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/Ubiquity/orm/parser/ReflexionFieldsTrait.php

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Ubiquity\orm\parser;
44

5-
65
trait ReflexionFieldsTrait {
76

87
abstract public static function getAnnotationMember($class, $member, $annotation);
8+
99
abstract public static function getAnnotsEngine();
1010

1111
/**
@@ -15,12 +15,15 @@ abstract public static function getAnnotsEngine();
1515
* @return object|boolean
1616
*/
1717
protected static function getAnnotationColumnMember($class, $member) {
18-
return self::getAnnotationMember ( $class, $member, 'column' );
18+
if ($r = self::getAnnotationMember ( $class, $member, 'column' ) === false) {
19+
$r = self::getAnnotationMember ( $class, $member, 'joinColumn' );
20+
}
21+
return $r;
1922
}
2023

2124
public static function getDbType($class, $member) {
2225
$ret = self::getAnnotationColumnMember ( $class, $member );
23-
if (\is_object($ret) && \property_exists($ret, 'dbType')){
26+
if (\is_object ( $ret ) && \property_exists ( $ret, 'dbType' )) {
2427
return $ret->dbType;
2528
}
2629
return false;
@@ -35,7 +38,7 @@ public static function isSerializable($class, $member) {
3538

3639
public static function getFieldName($class, $member) {
3740
$ret = self::getAnnotationColumnMember ( $class, $member );
38-
if ($ret === false || ! isset ( $ret->name )){
41+
if ($ret === false || ! isset ( $ret->name )) {
3942
$ret = $member;
4043
} else {
4144
$ret = $ret->name;
@@ -45,7 +48,7 @@ public static function getFieldName($class, $member) {
4548

4649
public static function isNullable($class, $member) {
4750
$ret = self::getAnnotationColumnMember ( $class, $member );
48-
if (\is_object($ret) && \property_exists($ret, 'nullable')){
51+
if (\is_object ( $ret ) && \property_exists ( $ret, 'nullable' )) {
4952
return $ret->nullable;
5053
}
5154
return false;
@@ -66,15 +69,15 @@ public static function getProperty($instance, $member) {
6669
}
6770

6871
public static function getPropertyType($class, $property) {
69-
if(($r=self::getMetadata ( $class, $property, 'var', 'type' ))===false){
70-
$reflect=new \ReflectionProperty($class, $property);
71-
return $reflect->getType();
72+
if (($r = self::getMetadata ( $class, $property, 'var', 'type' )) === false) {
73+
$reflect = new \ReflectionProperty ( $class, $property );
74+
return $reflect->getType ();
7275
}
7376
return $r;
7477
}
7578

7679
public static function getMetadata($class, $property, $type, $name) {
77-
$a = self::getAnnotsEngine()->getAnnotsOfProperty ( $class, $property, $type );
80+
$a = self::getAnnotsEngine ()->getAnnotsOfProperty ( $class, $property, $type );
7881
if (! \count ( $a )) {
7982
return false;
8083
}

0 commit comments

Comments
 (0)