Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update phpcs script and dependent libs #572

Merged
merged 3 commits into from
Oct 24, 2018

Conversation

joshcanhelp
Copy link
Contributor

Changes

This PR does not change plugin functionality.

  • Rename phpcs-ruleset.xmlphpcs.xml.dist (automatically picked up by PHPCS)
  • Add local PHPCS config files to .gitignore
  • Update coding standard Composer packages
  • Adjust Composer scripts

Note: I had to run the auto-formatter command to pass CI. I marked all the modified files with a comment if the changes were whitespace only. Non-whitespace changes in this commit.

References

@joshcanhelp joshcanhelp added this to the 3.8.0 milestone Oct 24, 2018
@@ -114,7 +114,8 @@ public static function get_token( $domain, $client_id, $client_secret, $grantTyp
$headers['content-type'] = 'application/x-www-form-urlencoded';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -116,7 +116,10 @@ public function create_wordpress_connection( $app_token, $migration_enabled, $pa
$enabled_clients = array_diff( $db_connection->enabled_clients, array( $client_id ) );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -171,7 +171,8 @@ public function install_db( $version_to_install = null, $app_token = '' ) {
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -158,7 +158,10 @@ public function override_email_update() {
$requires_verified_email = $this->a0_options->get( 'requires_verified_email' );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -221,7 +221,11 @@ public function redirect_login() {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -30,7 +30,9 @@ public function admin_enqueue() {
wp_register_script( 'wpa0_bootstrap', WPA0_PLUGIN_BS_URL . 'js/bootstrap.min.js', array( 'jquery' ), '3.3.6' );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -720,7 +720,8 @@ public function migration_ws_validation( $old_options, $input ) {
array(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -144,7 +144,8 @@ public function cant_create_client_grant_message() {
<?php
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -73,7 +73,11 @@ public function exchange_code() {
$client_id = get_bloginfo( 'url' );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -27,7 +27,8 @@ public function render( $step ) {
array(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -320,7 +320,8 @@ private function buildAuthorizationHeader( array $oauth ) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -67,9 +67,12 @@ public function testConstantPrefixFilter() {
$this->assertEquals( self::DEFAULT_CONSTANT_PREFIX . 'DOMAIN', $opts->get_constant_name( $opt_name ) );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -76,9 +76,11 @@ public function testHooks() {
*/
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -24,10 +24,13 @@ public function testUserinfoScope() {
$this->assertEquals( 'openid email profile', $scope );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -140,9 +140,11 @@ public function testShouldCreateUserFilterRejected() {
update_option( 'users_can_register', 1 );
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -68,7 +68,9 @@ public function testThatFiltersOverrideValues() {
// phpcs:ignore
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@@ -24,13 +24,15 @@ public function get_hook( $hook = '' ) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace-only

@auth0 auth0 deleted a comment from codecov-io Oct 24, 2018
@joshcanhelp joshcanhelp merged commit 56fd534 into master Oct 24, 2018
@joshcanhelp joshcanhelp deleted the fix-and-update-phpcs-scripts branch October 24, 2018 18:58
@@ -30,15 +30,13 @@
},
"minimum-stability": "stable",
"scripts": {
"compat": "./vendor/bin/phpcs --standard=phpcs-compat-ruleset.xml .",
"phpcs": "./vendor/bin/phpcs --standard=phpcs-ruleset.xml -s .",
"compat": "vendor/bin/phpcs --standard=phpcs-compat-ruleset.xml .",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vendor/bin/phpcs => \"vendor/bin/phpcs\" (for consistency and cross-platform compat)

Also there are a few more of these in this same block lower down.

@joshcanhelp
Copy link
Contributor Author

@jrfnl - Thank you so much! I probably should have waited to see if you commented 😄 I'll get another PR through for this.

@jrfnl
Copy link

jrfnl commented Oct 26, 2018

@joshcanhelp No worries, were only two minor nitpicks anyway.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants