Code cleanup.

psalm.xml

@@ -17,7 +17,6 @@
     </projectFiles>
 
     <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
         <RedundantConditionGivenDocblockType errorLevel="info" />
         <TypeCoercion errorLevel="info" />
         <DocblockTypeContradiction errorLevel="info" />

src/Core/App.php

@@ -65,10 +65,8 @@ class App
         if (static::_classExistsInBase($fullname, $base)) {
             return $base . $fullname;
         }
-        if ($plugin) {
-            return null;
-        }
-        if (!static::_classExistsInBase($fullname, 'Cake')) {
+
+        if ($plugin || !static::_classExistsInBase($fullname, 'Cake')) {
             return null;
         }
 

src/ORM/BehaviorRegistry.php

@@ -88,12 +88,8 @@ class BehaviorRegistry extends ObjectRegistry implements EventDispatcherInterfac
      */
     public static function className(string $class): ?string
     {
-        $result = App::className($class, 'Model/Behavior', 'Behavior');
-        if (!$result) {
-            $result = App::className($class, 'ORM/Behavior', 'Behavior');
-        }
-
-        return $result;
+        return App::className($class, 'Model/Behavior', 'Behavior')
+            ?: App::className($class, 'ORM/Behavior', 'Behavior');
     }
 
     /**

src/View/ViewBuilder.php

@@ -527,8 +527,7 @@ class ViewBuilder implements JsonSerializable, Serializable
         $className = $this->_className;
         if ($className === null) {
             $className = App::className('App', 'View', 'View') ?: View::class;
-        }
-        if ($className === 'View') {
+        } elseif ($className === 'View') {
             $className = App::className($className, 'View');
         } else {
             $className = App::className($className, 'View', 'View');