Skip to content

Commit

Permalink
Merge pull request #1461 from szepeviktor/fix-typos
Browse files Browse the repository at this point in the history
  • Loading branch information
schlessera authored Oct 24, 2023
2 parents 7fcbb08 + 641ae66 commit 3273731
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions classes/class-alert.php
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -207,7 +207,7 @@ public function get_title() {
}

/**
* Retreive current alert type object
* Retrieve current alert type object
*
* @return Alert_Type
*/
Expand Down
2 changes: 1 addition & 1 deletion classes/class-live-update.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions classes/class-network.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-posts.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-taxonomies.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-users.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion connectors/class-connector-wordpress-seo.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
32 changes: 16 additions & 16 deletions includes/lib/Carbon.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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.
*
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
*
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
*
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion languages/stream-en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion local/docker/wordpress/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<arg value="sp" /><!-- Show sniff codes in all reports and progress. -->

<rule ref="PHPCompatibilityWP" />
<config name="testVersion" value="5.6-" /><!-- Test for PHP compatability for 5.6 and above. -->
<config name="testVersion" value="5.6-" /><!-- Test for PHP compatibility for 5.6 and above. -->

<rule ref="WordPress-Docs">
<type>warning</type><!-- FIXME Report but ignore for now. -->
Expand Down
6 changes: 3 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 =

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/connectors/test-class-connector-edd.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}

Expand Down
10 changes: 5 additions & 5 deletions tests/tests/connectors/test-class-connector-user-switching.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
);
Expand All @@ -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',
)
);
Expand Down Expand Up @@ -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',
)
);
Expand Down Expand Up @@ -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',
)
);
Expand Down

0 comments on commit 3273731

Please sign in to comment.