fix(composer): clean composer autoload now works

WPBP · Jul 14, 2020 · ed2fed4 · ed2fed4
1 parent 0654a07
commit ed2fed4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/generator/composer.php b/generator/composer.php
@@ -200,11 +200,11 @@ function remove_folder_for_autoload( $composer ) {
     if ( isset( $composer[ 'autoload' ] ) ) {
         foreach ( $composer[ 'autoload' ][ 'psr-4' ] as $key => $path ) {
             $there_is_only_index_file = count_files_in_a_folder( getcwd() . DIRECTORY_SEPARATOR . WPBP_PLUGIN_SLUG . '/' . $path );
-            if ( $there_is_only_index_file === 1 ) {
+            if ( $there_is_only_index_file === 1 || $there_is_only_index_file === 0 ) {
                 unset( $composer[ 'autoload' ][ 'psr-4' ][ $key ] );
+                print_v( 'Removed ' . $key . ' from composer' );
             }
         }
-        $composer[ 'autoload' ][ 'psr-4' ] = $composer[ 'autoload' ][ 'psr-4' ]; 
     }
 
     return $composer;

diff --git a/generator/init.php b/generator/init.php
@@ -57,6 +57,7 @@
 remove_empty_folders();
 // Another round to remove the folder that wasn't cleaned at first round
 remove_empty_folders();
+execute_composer();
 $clio->styleLine( 'Done, I am superfast!', $info );
 $clio->styleLine( '', $info );
 $clio->styleLine( '👉 Don\'t forget to look on https://wpbp.github.io/wiki.html', $info );

diff --git a/generator/wpbp.php b/generator/wpbp.php
@@ -154,7 +154,6 @@ function execute_generator( $config ) {
     git_init();
     grunt();
     grumphp();
-    execute_composer();
 }
 
 function parse_conditional_template( $file, $config, $file_content ) {