@@ -142,11 +142,8 @@ private static function getModuleName(string $filePath): string
142142 private static function isViewLayerClass (string $ filePath , string $ moduleName ): bool
143143 {
144144 $ className = self ::getClassNameWithNamespace ($ filePath );
145- if (
146- $ className &&
147- !str_contains (strtolower ($ className ), 'adminhtml ' ) &&
148- self ::isFrontendUIComponent ($ moduleName , $ className )
149- ) {
145+ $ adminChange = str_contains (strtolower ($ className ), 'adminhtml ' );
146+ if ($ className && !$ adminChange && self ::isFrontendUIComponent ($ moduleName , $ className )) {
150147 return true ;
151148 }
152149 return false ;
@@ -184,13 +181,12 @@ private static function isFrontendUIComponent(string $moduleName, string $classN
184181
185182 if (is_array ($ files )) {
186183 $ uIComponentClasses = [];
187- foreach ($ files as $ filename ) {
184+ foreach ($ files as $ filename ) {
188185 $ xml = simplexml_load_file ($ filename );
189- $ dataProviders = $ xml ->xpath ('//@class ' );
190- $ uIComponentClasses = array_merge ($ dataProviders , $ uIComponentClasses );
186+ $ uIComponentClasses [] = $ xml ->xpath ('//@class ' );
191187 }
192- $ frontendUIComponent = self :: filterUiComponents ( array_unique ($ uIComponentClasses ), $ moduleName );
193- self ::$ frontendUIComponent [$ moduleName ] = $ frontendUIComponent ;
188+ $ frontendUIComponent = array_unique (array_merge ([], ... $ uIComponentClasses ) );
189+ self ::$ frontendUIComponent [$ moduleName ] = self :: filterUiComponents ( $ frontendUIComponent, $ moduleName ) ;
194190 }
195191 }
196192
0 commit comments