diff --git a/classes/class-alert.php b/classes/class-alert.php index 13f30bf36..f236ed133 100644 --- a/classes/class-alert.php +++ b/classes/class-alert.php @@ -186,7 +186,7 @@ public function update_meta( $meta_key, $meta_value, $prev_value = '' ) { /** * Determine the title of the alert. * - * @todo enhance human readibility + * @todo enhance human readability * @return string The title of the alert */ public function get_title() { @@ -207,7 +207,7 @@ public function get_title() { } /** - * Retreive current alert type object + * Retrieve current alert type object * * @return Alert_Type */ diff --git a/classes/class-live-update.php b/classes/class-live-update.php index f20d0baaf..9c2c33003 100644 --- a/classes/class-live-update.php +++ b/classes/class-live-update.php @@ -170,7 +170,7 @@ public function gather_updated_items( $last_time, $args = array() ) { /** * Handles live updates for Stream Post List * - * @action heartbeat_recieved + * @action heartbeat_received * * @param array $response Response to be sent to heartbeat tick. * @param array $data Data from heartbeat send. diff --git a/classes/class-network.php b/classes/class-network.php index 4e234e6c7..6111f82d9 100644 --- a/classes/class-network.php +++ b/classes/class-network.php @@ -351,13 +351,13 @@ public function get_settings_translations( $labels ) { * Wrapper for the settings API to work on the network settings page */ public function network_options_action() { - $allowed_referers = array( + $allowed_referrers = array( $this->network_settings_page_slug, $this->default_settings_page_slug, ); // @codingStandardsIgnoreLine - if ( ! isset( $_GET['action'] ) || ! in_array( $_GET['action'], $allowed_referers, true ) ) { + if ( ! isset( $_GET['action'] ) || ! in_array( $_GET['action'], $allowed_referrers, true ) ) { return; } diff --git a/connectors/class-connector-posts.php b/connectors/class-connector-posts.php index 6b0dc9694..fb0c0d22f 100644 --- a/connectors/class-connector-posts.php +++ b/connectors/class-connector-posts.php @@ -110,7 +110,7 @@ public function action_links( $links, $record ) { /* translators: %s: a post type singular name (e.g. "Post") */ $links[ sprintf( esc_html_x( 'Restore %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = $untrash; /* translators: %s: a post type singular name (e.g. "Post") */ - $links[ sprintf( esc_html_x( 'Delete %s Permenantly', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete; + $links[ sprintf( esc_html_x( 'Delete %s Permanently', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete; } else { /* translators: %s a post type singular name (e.g. "Post") */ $links[ sprintf( esc_html_x( 'Edit %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = get_edit_post_link( $post->ID ); diff --git a/connectors/class-connector-settings.php b/connectors/class-connector-settings.php index dede61ccb..679201b50 100644 --- a/connectors/class-connector-settings.php +++ b/connectors/class-connector-settings.php @@ -459,7 +459,7 @@ public function get_serialized_field_label( $option_name, $field_key ) { /** * Filter allows for insertion of serialized labels * - * @param array $lables Serialized labels + * @param array $labels Serialized labels * @return array Updated array of serialzed labels */ $labels = apply_filters( 'wp_stream_serialized_labels', $labels ); diff --git a/connectors/class-connector-taxonomies.php b/connectors/class-connector-taxonomies.php index 7966e9351..13e4bdb83 100644 --- a/connectors/class-connector-taxonomies.php +++ b/connectors/class-connector-taxonomies.php @@ -124,7 +124,7 @@ public function action_links( $links, $record ) { } /** - * Catch registration of taxonomies after inital loading, so we can cache its labels + * Catch registration of taxonomies after initial loading, so we can cache its labels * * @action registered_taxonomy * diff --git a/connectors/class-connector-users.php b/connectors/class-connector-users.php index cdce28441..91b6287e7 100644 --- a/connectors/class-connector-users.php +++ b/connectors/class-connector-users.php @@ -108,7 +108,7 @@ public function action_links( $links, $record ) { } /** - * Get an array of role lables assigned to a specific user. + * Get an array of role labels assigned to a specific user. * * @param object|int $user User object or user ID to get roles for. * diff --git a/connectors/class-connector-woocommerce.php b/connectors/class-connector-woocommerce.php index 1ab9aff0e..3361f4d4b 100644 --- a/connectors/class-connector-woocommerce.php +++ b/connectors/class-connector-woocommerce.php @@ -315,7 +315,7 @@ public function exclude_order_post_types( $post_types ) { * Prevent the Stream Comments connector from logging status * change comments on orders * - * @filter wp_stream_commnent_exclude_comment_types + * @filter wp_stream_comment_exclude_comment_types * * @param array $comment_types Ignored post types. * diff --git a/connectors/class-connector-wordpress-seo.php b/connectors/class-connector-wordpress-seo.php index 2170d836b..18614e965 100644 --- a/connectors/class-connector-wordpress-seo.php +++ b/connectors/class-connector-wordpress-seo.php @@ -170,7 +170,7 @@ public function action_links( $links, $record ) { /* translators: %s: a post type singular name (e.g. "Post") */ $links[ sprintf( esc_html_x( 'Restore %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = $untrash; /* translators: %s: a post type singular name (e.g. "Post") */ - $links[ sprintf( esc_html_x( 'Delete %s Permenantly', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete; + $links[ sprintf( esc_html_x( 'Delete %s Permanently', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete; } else { /* translators: %s: a post type singular name (e.g. "Post") */ $links[ sprintf( esc_html_x( 'Edit %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = get_edit_post_link( $post->ID ); diff --git a/includes/lib/Carbon.php b/includes/lib/Carbon.php index 93830c582..bf62c0316 100644 --- a/includes/lib/Carbon.php +++ b/includes/lib/Carbon.php @@ -1971,8 +1971,8 @@ public function endOfWeek() } /** - * Modify to the next occurance of a given day of the week. - * If no dayOfWeek is provided, modify to the next occurance + * Modify to the next occurrence of a given day of the week. + * If no dayOfWeek is provided, modify to the next occurrence * of the current day of the week. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. * @@ -1990,8 +1990,8 @@ public function next($dayOfWeek = null) } /** - * Modify to the previous occurance of a given day of the week. - * If no dayOfWeek is provided, modify to the previous occurance + * Modify to the previous occurrence of a given day of the week. + * If no dayOfWeek is provided, modify to the previous occurrence * of the current day of the week. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. * @@ -2009,7 +2009,7 @@ public function previous($dayOfWeek = null) } /** - * Modify to the first occurance of a given day of the week + * Modify to the first occurrence of a given day of the week * in the current month. If no dayOfWeek is provided, modify to the * first day of the current month. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2030,7 +2030,7 @@ public function firstOfMonth($dayOfWeek = null) } /** - * Modify to the last occurance of a given day of the week + * Modify to the last occurrence of a given day of the week * in the current month. If no dayOfWeek is provided, modify to the * last day of the current month. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2051,8 +2051,8 @@ public function lastOfMonth($dayOfWeek = null) } /** - * Modify to the given occurance of a given day of the week - * in the current month. If the calculated occurance is outside the scope + * Modify to the given occurrence of a given day of the week + * in the current month. If the calculated occurrence is outside the scope * of the current month, then return false and no modifications are made. * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY. * @@ -2071,7 +2071,7 @@ public function nthOfMonth($nth, $dayOfWeek) } /** - * Modify to the first occurance of a given day of the week + * Modify to the first occurrence of a given day of the week * in the current quarter. If no dayOfWeek is provided, modify to the * first day of the current quarter. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2086,7 +2086,7 @@ public function firstOfQuarter($dayOfWeek = null) } /** - * Modify to the last occurance of a given day of the week + * Modify to the last occurrence of a given day of the week * in the current quarter. If no dayOfWeek is provided, modify to the * last day of the current quarter. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2101,8 +2101,8 @@ public function lastOfQuarter($dayOfWeek = null) } /** - * Modify to the given occurance of a given day of the week - * in the current quarter. If the calculated occurance is outside the scope + * Modify to the given occurrence of a given day of the week + * in the current quarter. If the calculated occurrence is outside the scope * of the current quarter, then return false and no modifications are made. * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY. * @@ -2122,7 +2122,7 @@ public function nthOfQuarter($nth, $dayOfWeek) } /** - * Modify to the first occurance of a given day of the week + * Modify to the first occurrence of a given day of the week * in the current year. If no dayOfWeek is provided, modify to the * first day of the current year. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2137,7 +2137,7 @@ public function firstOfYear($dayOfWeek = null) } /** - * Modify to the last occurance of a given day of the week + * Modify to the last occurrence of a given day of the week * in the current year. If no dayOfWeek is provided, modify to the * last day of the current year. Use the supplied consts * to indicate the desired dayOfWeek, ex. static::MONDAY. @@ -2152,8 +2152,8 @@ public function lastOfYear($dayOfWeek = null) } /** - * Modify to the given occurance of a given day of the week - * in the current year. If the calculated occurance is outside the scope + * Modify to the given occurrence of a given day of the week + * in the current year. If the calculated occurrence is outside the scope * of the current year, then return false and no modifications are made. * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY. * diff --git a/languages/stream-en_US.po b/languages/stream-en_US.po index 4e10c8675..360dd4ebf 100644 --- a/languages/stream-en_US.po +++ b/languages/stream-en_US.po @@ -2582,7 +2582,7 @@ msgstr "" #: connectors/class-connector-wordpress-seo.php:160 #, php-format msgctxt "Post type singular name" -msgid "Delete %s Permenantly" +msgid "Delete %s Permanently" msgstr "" #: connectors/class-connector-posts.php:104 diff --git a/local/docker/wordpress/Dockerfile b/local/docker/wordpress/Dockerfile index a55dd18ac..ace59050e 100644 --- a/local/docker/wordpress/Dockerfile +++ b/local/docker/wordpress/Dockerfile @@ -6,7 +6,7 @@ FROM wordpress:php${PHP_VERSION}-apache # Default version which supports the default PHP 7.4. ARG XDEBUG_VERSION=2.9.6 -# Include our Composer vendor binrary path into global path. +# Include our Composer vendor binary path into global path. ENV PATH="/var/www/html/wp-content/plugins/stream-src/vendor/bin:${PATH}" RUN apt-get update; \ diff --git a/phpcs.xml.dist b/phpcs.xml.dist index cc28e8a19..16924cca3 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -7,7 +7,7 @@ - + warning diff --git a/readme.txt b/readme.txt index 8315816d9..ff44c5fec 100644 --- a/readme.txt +++ b/readme.txt @@ -171,7 +171,7 @@ Track changes to posts when using the block editor. - Fix: Track changes to posts when using the block editor by making the Posts connector to run on both frontend and backend requests since block editor changes happen over the REST API [#1264](https://github.com/xwp/stream/pull/1264), props [@coreymckrill](https://github.com/coreymckrill). - Fix: Don't store empty log event parameters [#1307](https://github.com/xwp/stream/pull/1307), props [@lkraav](https://github.com/lkraav). -- Development: Adjust the local development environment to use MariaDB containers for ARM processor compatabilty. +- Development: Adjust the local development environment to use MariaDB containers for ARM processor compatibility. = 3.8.2 - October 12, 2021 = @@ -376,7 +376,7 @@ Props [@lukecarbis](https://github.com/lukecarbis) * Tweak: Minor security improvements * Fix: New and improved Gravity Forms connector, works much better ([#780](https://github.com/xwp/stream/pull/780)) (thanks [Rob](https://github.com/rob)!) * Fix: Stream no longer explodes on < PHP 5.3, when trying to tell you that it explodes on < PHP 5.3 ([#781](https://github.com/xwp/stream/pull/781)) -* Fix: Fixed a smal typo ([62455c5](https://github.com/xwp/stream/commit/62455c518b95ddaf5e6c6c0733e7d03e5aa1311c)) +* Fix: Fixed a small typo ([62455c5](https://github.com/xwp/stream/commit/62455c518b95ddaf5e6c6c0733e7d03e5aa1311c)) * Fix: Multiple Multisite Mistakes Mended ([#788](https://github.com/xwp/stream/pull/788)) * Fix: Internet Explorer 8 fix!! IE8!? Come on, people, it's 2015. ([#789](https://github.com/xwp/stream/pull/789)) * Fix: EDD connector bug ([#790](https://github.com/xwp/stream/pull/790)) @@ -606,7 +606,7 @@ Props [@westonruter](https://github.com/westonruter), [@fjarrett](https://github * Fix: Non-Administrator users seeing errors in Settings records ([#406](https://github.com/x-team/wp-stream/issues/406)) * Fix: Uninstall confirmation message doesn't display ([#411](https://github.com/x-team/wp-stream/issues/411)) * Fix: TTL purge schedule is never setup ([#412](https://github.com/x-team/wp-stream/issues/412)) -* Fix: NextGen compability issue ([#416](https://github.com/x-team/wp-stream/issues/416)) +* Fix: NextGen compatibility issue ([#416](https://github.com/x-team/wp-stream/issues/416)) * Fix: Stream Feeds Key not being automatically generated ([#420](https://github.com/x-team/wp-stream/issues/420)) Props [@fjarrett](https://github.com/fjarrett), [@lukecarbis](https://github.com/lukecarbis), [@c3mdigital](https://github.com/c3mdigital), [@westonruter](https://github.com/westonruter), [@shadyvb](https://github.com/shadyvb), [@powelski](https://github.com/powelski), [@johnregan3](https://github.com/johnregan3), [@jonathanbardo](https://github.com/jonathanbardo), [@desaiuditd](https://github.com/desaiuditd) diff --git a/tests/tests/connectors/test-class-connector-edd.php b/tests/tests/connectors/test-class-connector-edd.php index 56e8638cf..6e6fb8ffd 100644 --- a/tests/tests/connectors/test-class-connector-edd.php +++ b/tests/tests/connectors/test-class-connector-edd.php @@ -185,7 +185,7 @@ function( $data ) use( &$asserted ) { $this->create_simple_download(); $this->create_simple_percent_discount(); - // Check assertion flage + // Check assertion flags $this->assertSame( $asserted, 2 ); } diff --git a/tests/tests/connectors/test-class-connector-user-switching.php b/tests/tests/connectors/test-class-connector-user-switching.php index 4fb79c18d..136d53e54 100644 --- a/tests/tests/connectors/test-class-connector-user-switching.php +++ b/tests/tests/connectors/test-class-connector-user-switching.php @@ -38,7 +38,7 @@ public function test_callback_switch_to_user() { $old_user_id = self::factory()->user->create( array( 'user_login' => 'oldtestuser', - 'user_role' => 'adminstrator', + 'user_role' => 'administrator', 'display_name' => 'oldtestuserdisplay', ) ); @@ -48,7 +48,7 @@ public function test_callback_switch_to_user() { $user_id = self::factory()->user->create( array( 'user_login' => 'testuser', - 'user_role' => 'adminstrator', + 'user_role' => 'administrator', 'display_name' => 'testuserdisplay', ) ); @@ -88,14 +88,14 @@ public function test_callback_switch_back_user() { $old_user_id = self::factory()->user->create( array( 'user_login' => 'oldtestuser', - 'user_role' => 'adminstrator', + 'user_role' => 'administrator', 'display_name' => 'oldtestuserdisplay', ) ); $user_id = self::factory()->user->create( array( 'user_login' => 'testuser', - 'user_role' => 'adminstrator', + 'user_role' => 'administrator', 'display_name' => 'testuserdisplay', ) ); @@ -138,7 +138,7 @@ public function test_callback_switch_off_user() { $user_id = self::factory()->user->create( array( 'user_login' => 'testuser', - 'user_role' => 'adminstrator', + 'user_role' => 'administrator', 'display_name' => 'testuserdisplay', ) );