Lint PHP by removing unnecessary local vars (#1316)

src/admin/admin.php

@@ -85,7 +85,6 @@ function qtranxf_decode_json_name_value( $value ): ?array {
  * @see qtranxf_collect_translations
  */
 function qtranxf_collect_translations_posted() {
-    $edit_lang = null;
     if ( isset( $_REQUEST['qtranslate-fields'] ) ) {
         $edit_lang = qtranxf_get_edit_language();
         foreach ( $_REQUEST['qtranslate-fields'] as $name => &$qfields ) {
@@ -454,7 +453,7 @@ function qtranxf_admin_footer() {
         <?php
         echo 'var qTranslateConfig=' . json_encode( $config ) . ';' . PHP_EOL;
         // each script entry may define javascript code to be injected
-        foreach ( $page_config['js'] as $key => $js ) {
+        foreach ( $page_config['js'] as $js ) {
             if ( isset( $js['javascript'] ) && ! empty( $js['javascript'] ) ) {
                 echo $js['javascript'];
             }
@@ -787,9 +786,7 @@ function qtranxf_admin_home_url( $url, $path, $orig_scheme, $blog_id ) {
     } else {
         $lang = $q_config['default_language'];
     }
-    $url = qtranxf_get_url_for_language( $url, $lang, ! $q_config['hide_default_language'] || $lang != $q_config['default_language'] );
-
-    return $url;
+    return qtranxf_get_url_for_language( $url, $lang, ! $q_config['hide_default_language'] || $lang != $q_config['default_language'] );
 }
 
 function qtranxf_admin_footer_text( $text ) {

src/admin/admin_options_update.php

@@ -341,7 +341,7 @@ function qtranxf_reset_config(): void {
     foreach ( $qtranslate_options['default_value'] as $nm => $def ) {
         delete_option( 'qtranslate_' . $nm );
     }
-    foreach ( $qtranslate_options['languages'] as $nm => $opn ) {
+    foreach ( $qtranslate_options['languages'] as $opn ) {
         delete_option( $opn );
     }
 

src/admin/admin_settings.php

@@ -309,7 +309,7 @@ private function add_general_section(): void {
                         <table id="qtranxs-enabled-languages">
                             <?php
                             $flag_location = qtranxf_flag_location();
-                            foreach ( qtranxf_getSortedLanguages() as $key => $language ) {
+                            foreach ( qtranxf_getSortedLanguages() as $language ) {
                                 echo '<tr>';
                                 echo '<td><label title="' . $q_config['language_name'][ $language ] . '"><input type="radio" name="default_language" value="' . $language . '"';
                                 checked( $language, $q_config['default_language'] );

src/admin/admin_taxonomy.php

@@ -357,9 +357,7 @@ function qtranxf_admin_list_cats( string $text ): string {
                 return $text;
             }
             $texts = qtranxf_split_blocks( $blocks );
-            $text  = qtranxf_join_b( $texts ); // with closing tag
-
-            return $text;
+            return qtranxf_join_b( $texts );  // with closing tag
         default:
             return qtranxf_useCurrentLanguageIfNotFoundUseDefaultLanguage( $text );
     }

src/admin/admin_utils_db.php

@@ -364,7 +364,7 @@ function qtranxf_split_database_file( string $ifp, array $languages_to_keep ): s
                     $lfh = fopen( $lfp, 'a+' );
                     if ( ! $lfh || ! $dfh ) {
                         fclose( $ifh );
-                        foreach ( $files as $lang_file => &$file ) {
+                        foreach ( $files as &$file ) {
                             if ( ! isset( $file['fh'] ) ) {
                                 continue;
                             }
@@ -398,7 +398,7 @@ function qtranxf_split_database_file( string $ifp, array $languages_to_keep ): s
                 fputs( $files[ $lang ]['fh'], $ln . PHP_EOL );
             }
         } else {
-            foreach ( $files as $lang => &$file ) {
+            foreach ( $files as &$file ) {
                 fputs( $file['fh'], $s );
             }
             if ( $mfh ) {
@@ -407,7 +407,7 @@ function qtranxf_split_database_file( string $ifp, array $languages_to_keep ): s
         }
     }
     fclose( $ifh );
-    foreach ( $files as $lang => &$file ) {
+    foreach ( $files as &$file ) {
         fclose( $file['fh'] );
     }
     if ( $mfh ) {

src/admin/block_editor.php

@@ -77,9 +77,7 @@ public function rest_prepare( WP_REST_Response $response, WP_Post $post, WP_REST
         // TODO allow user to select editor lang with buttons
         $editor_lang = $q_config['url_info']['language'];
 
-        $response = $this->select_raw_response_language( $response, $editor_lang );
-
-        return $response;
+        return $this->select_raw_response_language( $response, $editor_lang );
     }
 
     /**
@@ -159,9 +157,7 @@ public function rest_request_after_callbacks( $response, array $handler, WP_REST
             return $response;
         }
 
-        $response = $this->select_raw_response_language( $response, $editor_lang );
-
-        return $response;
+        return $this->select_raw_response_language( $response, $editor_lang );
     }
 
     /**

src/date_time.php

@@ -193,9 +193,7 @@ function qxtranxf_intl_strftime( string $format, $timestamp = null, ?string $loc
         }
     }, $format );
 
-    $out = str_replace( '%%', '%', $out );
-
-    return $out;
+    return str_replace( '%%', '%', $out );
 }
 
 /**

src/frontend.php

@@ -370,9 +370,7 @@ function qtranxf_translate_deep( $value, $lang ) {
 
             return serialize( $value );
         }
-        $lang_value = qtranxf_use_language( $lang, $value );
-
-        return $lang_value;
+        return qtranxf_use_language( $lang, $value );
     } else if ( is_array( $value ) ) {
         foreach ( $value as $k => $v ) {
             $value[ $k ] = qtranxf_translate_deep( $v, $lang );
@@ -639,9 +637,7 @@ function qtranxf_get_attachment_image_attributes( $attr, $attachment = null, $si
 function qtranxf_home_url( $url, $path, $orig_scheme, $blog_id ): string {
     global $q_config;
     $lang = $q_config['language'];
-    $url  = qtranxf_get_url_for_language( $url, $lang, ! $q_config['hide_default_language'] || $lang != $q_config['default_language'] );
-
-    return $url;
+    return qtranxf_get_url_for_language( $url, $lang, ! $q_config['hide_default_language'] || $lang != $q_config['default_language'] );
 }
 
 function qtranxf_esc_html( $text ) {
@@ -836,9 +832,7 @@ function qtranxf_checkCanonical( string $redirect_url, string $requested_url ):
     global $q_config;
     $lang = $q_config['language'];
     // fix canonical conflicts with language urls
-    $redirect_url_lang = qtranxf_convertURL( $redirect_url, $lang );
-
-    return $redirect_url_lang;
+    return qtranxf_convertURL( $redirect_url, $lang );
 }
 
 /**

src/language_blocks.php

@@ -180,7 +180,7 @@ function qtranxf_getAvailableLanguages( $text ) {
 function qtranxf_allthesame( array $texts ): ?string {
     $text = null;
     // take first not empty
-    foreach ( $texts as $lang => $lang_text ) {
+    foreach ( $texts as $lang_text ) {
         if ( ! $lang_text || $lang_text == '' ) {
             continue;
         }
@@ -190,7 +190,7 @@ function qtranxf_allthesame( array $texts ): ?string {
     if ( empty( $text ) ) {
         return '';
     }
-    foreach ( $texts as $lang => $lang_text ) {
+    foreach ( $texts as $lang_text ) {
         if ( $lang_text != $text ) {
             return null;
         }

src/modules/gravity-forms/loader.php

@@ -102,27 +102,21 @@ public function gform_form_tag( string $tag ): string {
         if ( ! $this->isEnabled() ) {
             return $tag;
         }
-        $tag = preg_replace_callback( "|action='([^']+)'|", array( &$this, 'gform_form_action_attribute' ), $tag );
-
-        return $tag;
+        return preg_replace_callback( "|action='([^']+)'|", array( &$this, 'gform_form_action_attribute' ), $tag );
     }
 
     public function gform_savecontinue_link( string $save_button, array $form ) {
         if ( ! $this->isEnabled() ) {
             return $save_button;
         }
-        $save_button = $this->translate( $save_button );
-
-        return $save_button;
+        return $this->translate( $save_button );
     }
 
     public function gform_confirmation( $confirmation, $form, $lead, bool $ajax ) {
         if ( ! $this->isEnabled() ) {
             return $confirmation;
         }
-        $confirmation = $this->translate( $confirmation );
-
-        return $confirmation;
+        return $this->translate( $confirmation );
     }
 
     public function gform_pre_send_email( array $email ): array {

src/url.php

@@ -32,9 +32,7 @@ function qtranxf_convertURL( string $url = '', string $lang = '', bool $forceadm
 
     $url = apply_filters( 'qtranslate_convert_url', $url, $lang );
 
-    $complete = qtranxf_get_url_for_language( $url, $lang, $showLanguage );
-
-    return $complete;
+    return qtranxf_get_url_for_language( $url, $lang, $showLanguage );
 }
 
 function qtranxf_convertURLs( $url, string $lang = '', bool $forceadmin = false, bool $showDefaultLanguage = false ) {