@@ -113,7 +113,7 @@ private function readPropertyType(ReflectionProperty $property, bool $allowPrimi
113113 $ type = $ resolvedType ;
114114 }
115115
116- if (! $ this ->classExists ( $ type ) && ! $ this ->ignorePhpDocErrors ) {
116+ if (! $ this ->ignorePhpDocErrors && ! $ this ->classExists ( $ type ) ) {
117117 throw new AnnotationException (sprintf (
118118 'The @var annotation on %s::%s contains a non existent class "%s" ' ,
119119 $ class ->name ,
@@ -154,10 +154,8 @@ private function readParameterClass(ReflectionParameter $parameter, bool $allowP
154154 {
155155 // Use reflection
156156 $ parameterType = $ parameter ->getType ();
157- if ($ parameterType ) {
158- if (! $ parameterType ->isBuiltin () && $ parameterType instanceof \ReflectionNamedType) {
159- return $ parameterType ->getName ();
160- }
157+ if ($ parameterType && $ parameterType instanceof \ReflectionNamedType && ! $ parameterType ->isBuiltin ()) {
158+ return $ parameterType ->getName ();
161159 }
162160
163161 $ parameterName = $ parameter ->name ;
@@ -242,12 +240,18 @@ private function tryResolveFqn(string $type, ReflectionClass $class, Reflector $
242240 return $ uses [$ loweredAlias ] . substr ($ type , $ pos );
243241 }
244242 return $ uses [$ loweredAlias ];
245- } elseif ($ this ->classExists ($ class ->getNamespaceName () . '\\' . $ type )) {
243+ }
244+
245+ if ($ this ->classExists ($ class ->getNamespaceName () . '\\' . $ type )) {
246246 return $ class ->getNamespaceName () . '\\' . $ type ;
247- } elseif (isset ($ uses ['__NAMESPACE__ ' ]) && $ this ->classExists ($ uses ['__NAMESPACE__ ' ] . '\\' . $ type )) {
247+ }
248+
249+ if (isset ($ uses ['__NAMESPACE__ ' ]) && $ this ->classExists ($ uses ['__NAMESPACE__ ' ] . '\\' . $ type )) {
248250 // Class namespace
249251 return $ uses ['__NAMESPACE__ ' ] . '\\' . $ type ;
250- } elseif ($ this ->classExists ($ type )) {
252+ }
253+
254+ if ($ this ->classExists ($ type )) {
251255 // No namespace
252256 return $ type ;
253257 }
0 commit comments