Reorder detection so that files come first

We have multiple ways to discover paths, and
some come with a filename while others don't.
Only the first version of a detected URL is
crawled. Reorder detection so that in the event
of a duplicate, we will get the filename detected
before we get a version without the filename.

Author: john-shaffer

src/URLDetector.php

@@ -42,7 +42,6 @@ public static function detectURLsIter( bool $quiet = false ) : \Iterator {
 
         $arrays_to_merge = [];
 
-        // TODO: detect robots.txt, etc before adding
         $arrays_to_merge[] = [
             '/',
             '/robots.txt',
@@ -52,45 +51,6 @@ public static function detectURLsIter( bool $quiet = false ) : \Iterator {
 
         $iterators_to_merge = [];
 
-        /*
-            TODO: reimplement detection for URLs:
-                'detectCommentPagination',
-                'detectComments',
-                'detectFeedURLs',
-
-        // other options:
-
-         - robots
-         - favicon
-         - sitemaps
-
-        */
-
-        if ( CoreOptions::getValue( 'detectPosts' ) ) {
-            $arrays_to_merge[] = DetectPostURLs::detect();
-        }
-
-        if ( CoreOptions::getValue( 'detectPages' ) ) {
-            $arrays_to_merge[] = DetectPageURLs::detect();
-        }
-
-        if ( CoreOptions::getValue( 'detectCustomPostTypes' ) ) {
-            $arrays_to_merge[] = DetectCustomPostTypeURLs::detect();
-        }
-
-        if ( CoreOptions::getValue( 'detectUploads' ) ) {
-            $iterators_to_merge[] =
-                $filtering->getListOfLocalFilesByDir(
-                    SiteInfo::getPath( 'uploads' ),
-                );
-        }
-
-        $detect_sitemaps = apply_filters( 'wp2static_detect_sitemaps', 1 );
-
-        if ( $detect_sitemaps ) {
-            $arrays_to_merge[] = DetectSitemapsURLs::detect( SiteInfo::getURL( 'site' ) );
-        }
-
         $detect_parent_theme = apply_filters( 'wp2static_detect_parent_theme', 1 );
 
         if ( $detect_parent_theme ) {
@@ -115,12 +75,37 @@ public static function detectURLsIter( bool $quiet = false ) : \Iterator {
             $iterators_to_merge[] = DetectWPIncludesAssets::detect( $filtering );
         }
 
+        if ( CoreOptions::getValue( 'detectUploads' ) ) {
+            $iterators_to_merge[] =
+                $filtering->getListOfLocalFilesByDir(
+                    SiteInfo::getPath( 'uploads' ),
+                );
+        }
+
         $detect_vendor_cache = apply_filters( 'wp2static_detect_vendor_cache', 1 );
 
         if ( $detect_vendor_cache ) {
             $iterators_to_merge[] = DetectVendorFiles::detect( $filtering, SiteInfo::getURL( 'site' ) );
         }
 
+        $detect_sitemaps = apply_filters( 'wp2static_detect_sitemaps', 1 );
+
+        if ( $detect_sitemaps ) {
+            $arrays_to_merge[] = DetectSitemapsURLs::detect( SiteInfo::getURL( 'site' ) );
+        }
+
+        if ( CoreOptions::getValue( 'detectPosts' ) ) {
+            $arrays_to_merge[] = DetectPostURLs::detect();
+        }
+
+        if ( CoreOptions::getValue( 'detectPages' ) ) {
+            $arrays_to_merge[] = DetectPageURLs::detect();
+        }
+
+        if ( CoreOptions::getValue( 'detectCustomPostTypes' ) ) {
+            $arrays_to_merge[] = DetectCustomPostTypeURLs::detect();
+        }
+
         $detect_posts_pagination = apply_filters( 'wp2static_detect_posts_pagination', 1 );
 
         if ( $detect_posts_pagination ) {