fix typing & syntax

Author: leonstafford

phpstan.neon

@@ -44,4 +44,7 @@ parameters:
         - message: "#^Cannot access property \\$\\S+ on mixed\\.$#"
           path: views/addons-page.php
           count: 7
+        - message: "#^Cannot access offset \\S+ on mixed\\.$#"
+          path: src/SitemapParser.php
+          count: 3
         - '/^Parameter #2 \$callable of static method WP_CLI::add_command\(\) expects callable\(\): mixed, \S+ given\.$/'

src/SitemapParser.php

@@ -123,7 +123,7 @@ public function parseRecursive( $url ) {
             $sitemaps = $this->sitemaps;
             $urls = $this->urls;
             try {
-                $this->parse( $todo[0] );
+                $this->parse( strval( $todo[0] ) );
             } catch ( WP2StaticException $e ) {
                 WsLog::w( $e->getMessage() );
                 // Keep crawling
@@ -141,7 +141,7 @@ public function parseRecursive( $url ) {
      */
     public function addToQueue( array $url_array ) : void {
         foreach ( $url_array as $url ) {
-            $url = $this->urlEncode( $url );
+            $url = $this->urlEncode( strval( $url ) );
             if ( $this->urlValidate( $url ) ) {
                 $this->queue[] = $url;
             }
@@ -239,6 +239,11 @@ protected function getContent() {
                 $this->config['guzzle']['headers']['User-Agent'] = $this->user_agent;
             }
             $client = new WP2StaticGuzzleHttp\Client( [ 'verify' => false ] );
+
+            if ( ! is_array( $this->config['guzzle'] ) ) {
+                WsLog::w( 'Guzzle config is not in expected array format' );
+                return null;
+            }
             $res = $client->request( 'GET', $this->current_url, $this->config['guzzle'] );
             if ( $res->getStatusCode() === 200 ) {
                 return $res->getBody()->getContents();
@@ -319,7 +324,7 @@ protected function addArray( $type, array $array ) {
         if ( ! isset( $array['loc'] ) ) {
             return false;
         }
-        $array['loc'] = $this->urlEncode( trim( $array['loc'] ) );
+        $array['loc'] = $this->urlEncode( trim( strval( $array['loc'] ) ) );
         if ( $this->urlValidate( $array['loc'] ) ) {
             switch ( $type ) {
                 case self::XML_TAG_SITEMAP:

src/StaticSite.php

@@ -76,6 +76,9 @@ public static function getPaths() : array {
         );
 
         foreach ( $iterator as $filename => $file_object ) {
+            /**
+             * @var string $filename
+             */
             $base_name = basename( $filename );
             if ( $base_name != '.' && $base_name != '..' ) {
                 $real_filepath = realpath( $filename );

src/URLDetector.php

@@ -167,6 +167,9 @@ public static function detectURLs( bool $quiet = false ) : array {
             $arrays_to_merge[] = DetectAuthorPaginationURLs::detect( SiteInfo::getUrl( 'site' ) );
         }
 
+        /**
+         * @var string[] $url_queue
+         */
         $url_queue = call_user_func_array( 'array_merge', $arrays_to_merge );
 
         $url_queue = FilesHelper::cleanDetectedURLs( $url_queue );