Fix for 500 error when invalid url elementor#825

Author: ludobonnet

src/SitemapParser.php

@@ -123,9 +123,8 @@ public function parseRecursive( $url ) {
             $sitemaps = $this->sitemaps;
             $urls = $this->urls;
             try {
-                $this->parse( strval( $todo[0] ) );
+                $this->parse( $todo[0] );
             } catch ( WP2StaticException $e ) {
-                WsLog::w( $e->getMessage() );
                 // Keep crawling
                 continue;
             }
@@ -141,7 +140,7 @@ public function parseRecursive( $url ) {
      */
     public function addToQueue( array $url_array ) : void {
         foreach ( $url_array as $url ) {
-            $url = $this->urlEncode( strval( $url ) );
+            $url = $this->urlEncode( $url );
             if ( $this->urlValidate( $url ) ) {
                 $this->queue[] = $url;
             }
@@ -181,11 +180,6 @@ public function parse( $url, $url_content = null ) {
         }
         $this->history[] = $this->current_url;
         $response = is_string( $url_content ) ? $url_content : $this->getContent();
-
-        if ( ! $response ) {
-            return;
-        }
-
         if ( parse_url( $this->current_url, PHP_URL_PATH ) === self::ROBOTSTXT_PATH ) {
             $this->parseRobotstxt( $response );
             return;
@@ -223,7 +217,7 @@ protected function clean() {
     /**
      * Request the body content of an URL
      *
-     * @return ?string Raw body content
+     * @return string Raw body content
      * @throws WP2StaticException
      */
     protected function getContent() {
@@ -238,22 +232,9 @@ protected function getContent() {
             if ( ! isset( $this->config['guzzle']['headers']['User-Agent'] ) ) {
                 $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;
-            }
+            $client = new WP2StaticGuzzleHttp\Client();
             $res = $client->request( 'GET', $this->current_url, $this->config['guzzle'] );
-            if ( $res->getStatusCode() === 200 ) {
-                return $res->getBody()->getContents();
-            } else {
-                WsLog::w(
-                    'Got ' . $res->getStatusCode() .
-                    ' for sitemap url "' . $this->current_url . '", skipping.'
-                );
-                return null;
-            }
+            return $res->getBody()->getContents();
         } catch ( WP2StaticGuzzleHttp\Exception\TransferException $e ) {
             throw new WP2StaticException( 'Unable to fetch URL contents', 0, $e );
         } catch ( WP2StaticGuzzleHttp\Exception\GuzzleException $e ) {
@@ -271,7 +252,7 @@ protected function parseRobotstxt( $robotstxt ) {
         // Split lines into array
         $lines = array_filter(
             array_map(
-                fn ( $line ) => trim( (string) $line ),
+                'trim',
                 (array) preg_split( '/\r\n|\n|\r/', $robotstxt )
             )
         );
@@ -288,10 +269,7 @@ protected function parseRobotstxt( $robotstxt ) {
             $line = $line[0];
 
             // Split by directive and rule
-            $pair = array_map(
-                fn ( $line ) => trim( (string) $line ),
-                (array) preg_split( '/:/', $line, 2 )
-            );
+            $pair = array_map( 'trim', (array) preg_split( '/:/', $line, 2 ) );
             // Check if the line contains a sitemap
             if (
                 strtolower( $pair[0] ) !== self::XML_TAG_SITEMAP ||
@@ -324,7 +302,7 @@ protected function addArray( $type, array $array ) {
         if ( ! isset( $array['loc'] ) ) {
             return false;
         }
-        $array['loc'] = $this->urlEncode( trim( strval( $array['loc'] ) ) );
+        $array['loc'] = $this->urlEncode( trim( $array['loc'] ) );
         if ( $this->urlValidate( $array['loc'] ) ) {
             switch ( $type ) {
                 case self::XML_TAG_SITEMAP:
@@ -396,12 +374,7 @@ protected function parseString( $string ) {
             // Strings are not part of any documented sitemap standard
             return false;
         }
-        $array = array_filter(
-            array_map(
-                fn ( $line ) => trim( (string) $line ),
-                (array) preg_split( '/\r\n|\n|\r/', $string )
-            )
-        );
+        $array = array_filter( array_map( 'trim', (array) preg_split( '/\r\n|\n|\r/', $string ) ) );
         foreach ( $array as $line ) {
             if ( $this->isSitemapURL( $line ) ) {
                 $this->addArray( self::XML_TAG_SITEMAP, [ 'loc' => $line ] );