From d833d43a8bb753215a1cf7c20aa18050cb4e620f Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 2 Nov 2021 19:40:15 +0200
Subject: [PATCH] fixes

---
 application/Espo/Core/Api/ActionProcessor.php      | 4 ++--
 application/Espo/Core/Binding/BindingContainer.php | 4 ++--
 application/Espo/Core/InjectableFactory.php        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/Espo/Core/Api/ActionProcessor.php b/application/Espo/Core/Api/ActionProcessor.php
index 1ce3960c95..53858a6f6d 100644
--- a/application/Espo/Core/Api/ActionProcessor.php
+++ b/application/Espo/Core/Api/ActionProcessor.php
@@ -165,8 +165,8 @@ class ActionProcessor
 
         if (
             !$type ||
-            $type->isBuiltin() ||
-            !$type instanceof ReflectionNamedType
+            !$type instanceof ReflectionNamedType ||
+            $type->isBuiltin()
         ) {
             return false;
         }
diff --git a/application/Espo/Core/Binding/BindingContainer.php b/application/Espo/Core/Binding/BindingContainer.php
index 1b634709bc..9780abd2ea 100644
--- a/application/Espo/Core/Binding/BindingContainer.php
+++ b/application/Espo/Core/Binding/BindingContainer.php
@@ -83,8 +83,8 @@ class BindingContainer
 
         if (
             $type &&
-            !$type->isBuiltin() &&
-            $type instanceof ReflectionNamedType
+            $type instanceof ReflectionNamedType &&
+            !$type->isBuiltin()
         ) {
             $dependencyClassName = $type->getName();
         }
diff --git a/application/Espo/Core/InjectableFactory.php b/application/Espo/Core/InjectableFactory.php
index 2bc1f71b51..f5bd0d7ce4 100644
--- a/application/Espo/Core/InjectableFactory.php
+++ b/application/Espo/Core/InjectableFactory.php
@@ -158,8 +158,8 @@ class InjectableFactory
 
         if (
             $type &&
-            !$type->isBuiltin() &&
-            $type instanceof ReflectionNamedType
+            $type instanceof ReflectionNamedType &&
+            !$type->isBuiltin()
         ) {
             try {
                 $dependencyClass = new ReflectionClass($type->getName());
@@ -342,8 +342,8 @@ class InjectableFactory
 
         if (
             $type &&
-            !$type->isBuiltin() &&
-            $type instanceof ReflectionNamedType
+            $type instanceof ReflectionNamedType &&
+            !$type->isBuiltin()
         ) {
             $paramClass = new ReflectionClass($type->getName());
         }