rebase on oct-10-2023

2023-10-10 17:23:21 -04:00
parent d37566ffb6
commit d096058d7d
4789 changed files with 254611 additions and 307223 deletions
--- a/wp/wp-content/plugins/wordpress-seo/lib/migrations/adapter.php
+++ b/wp/wp-content/plugins/wordpress-seo/lib/migrations/adapter.php
@@ -542,7 +542,7 @@ class Adapter {
 			}

 			return $result;
-		} catch ( \Exception $e ) {
+		} catch ( Exception $e ) {
 			return null;
 		}
 	}
--- a/wp/wp-content/plugins/wordpress-seo/lib/migrations/table.php
+++ b/wp/wp-content/plugins/wordpress-seo/lib/migrations/table.php
@@ -224,7 +224,6 @@ class Table {
 	 * @return string The SQL.
 	 */
 	private function columns_to_str() {
-		$str    = '';
 		$fields = [];
 		$len    = \count( $this->columns );
 		for ( $i = 0; $i < $len; $i++ ) {