2
2
3
3
namespace Ubiquity \orm \parser ;
4
4
5
-
6
5
trait ReflexionFieldsTrait {
7
6
8
7
abstract public static function getAnnotationMember ($ class , $ member , $ annotation );
8
+
9
9
abstract public static function getAnnotsEngine ();
10
10
11
11
/**
@@ -15,12 +15,15 @@ abstract public static function getAnnotsEngine();
15
15
* @return object|boolean
16
16
*/
17
17
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 ;
19
22
}
20
23
21
24
public static function getDbType ($ class , $ member ) {
22
25
$ ret = self ::getAnnotationColumnMember ( $ class , $ member );
23
- if (\is_object ( $ ret ) && \property_exists ( $ ret , 'dbType ' )) {
26
+ if (\is_object ( $ ret ) && \property_exists ( $ ret , 'dbType ' )) {
24
27
return $ ret ->dbType ;
25
28
}
26
29
return false ;
@@ -35,7 +38,7 @@ public static function isSerializable($class, $member) {
35
38
36
39
public static function getFieldName ($ class , $ member ) {
37
40
$ ret = self ::getAnnotationColumnMember ( $ class , $ member );
38
- if ($ ret === false || ! isset ( $ ret ->name )){
41
+ if ($ ret === false || ! isset ( $ ret ->name )) {
39
42
$ ret = $ member ;
40
43
} else {
41
44
$ ret = $ ret ->name ;
@@ -45,7 +48,7 @@ public static function getFieldName($class, $member) {
45
48
46
49
public static function isNullable ($ class , $ member ) {
47
50
$ ret = self ::getAnnotationColumnMember ( $ class , $ member );
48
- if (\is_object ( $ ret ) && \property_exists ( $ ret , 'nullable ' )) {
51
+ if (\is_object ( $ ret ) && \property_exists ( $ ret , 'nullable ' )) {
49
52
return $ ret ->nullable ;
50
53
}
51
54
return false ;
@@ -66,15 +69,15 @@ public static function getProperty($instance, $member) {
66
69
}
67
70
68
71
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 ();
72
75
}
73
76
return $ r ;
74
77
}
75
78
76
79
public static function getMetadata ($ class , $ property , $ type , $ name ) {
77
- $ a = self ::getAnnotsEngine ()->getAnnotsOfProperty ( $ class , $ property , $ type );
80
+ $ a = self ::getAnnotsEngine ()->getAnnotsOfProperty ( $ class , $ property , $ type );
78
81
if (! \count ( $ a )) {
79
82
return false ;
80
83
}
0 commit comments