Merge pull request #249 from indieweb/version-bump

pfefferle · web-flow · commit 8caf7b171fb6 · 2023-09-01T15:18:54.000+02:00
version bump
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -1,5 +1,5 @@
 name: Unit Testing
-on: 
+on:
     push:
     pull_request:
 jobs:
@@ -15,7 +15,7 @@ jobs:
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
     strategy:
       matrix:
-        php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.0', '7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,11 +18,12 @@ services:
     links:
       - db
     ports:
-      - "8099:80"
+      - "8077:80"
     volumes:
       - .:/var/www/html/wp-content/plugins/indieauth
     restart: always
     environment:
       WORDPRESS_DB_HOST: db:3306
+      WORDPRESS_DB_USER: wordpress
       WORDPRESS_DB_PASSWORD: wordpress
       WORDPRESS_DEBUG: 1
diff --git a/includes/class-external-token-page.php b/includes/class-external-token-page.php
@@ -60,8 +60,6 @@ public function options_form() {
 		</div>
 		<?php
 	}
-
-
 } // End Class
 
 new External_Token_Page();
diff --git a/includes/class-external-token-table.php b/includes/class-external-token-table.php
@@ -48,7 +48,6 @@ public function prepare_items() {
 		foreach ( $tokens as $value ) {
 			$this->items[] = $value;
 		}
-
 	}
 
 	public function column_default( $item, $column_name ) {
diff --git a/includes/class-indieauth-admin.php b/includes/class-indieauth-admin.php
@@ -269,4 +269,3 @@ public function add_help_tab() {
 		);
 	}
 }
-
diff --git a/includes/class-indieauth-authorization-endpoint.php b/includes/class-indieauth-authorization-endpoint.php
@@ -226,7 +226,6 @@ public function get( $request ) {
 		}
 
 		return new WP_OAuth_Response( 'unsupported_response_type', __( 'Unsupported Response Type', 'indieauth' ), 400 );
-
 	}
 
 	/*
@@ -474,4 +473,3 @@ public function confirmed() {
 		wp_redirect( $url ); // phpcs:ignore
 	}
 }
-
diff --git a/includes/class-indieauth-authorize.php b/includes/class-indieauth-authorize.php
@@ -27,7 +27,6 @@ public function load() {
 		add_filter( 'indieauth_response', array( $this, 'get_indieauth_response' ), 9 );
 		add_filter( 'wp_rest_server_class', array( $this, 'wp_rest_server_class' ) );
 		add_filter( 'rest_request_after_callbacks', array( $this, 'return_oauth_error' ), 10, 3 );
-
 	}
 
 
@@ -189,7 +188,6 @@ public function determine_current_user( $user_id ) {
 			)
 		);
 		return $user_id;
-
 	}
 
 	/**
diff --git a/includes/class-indieauth-client-discovery.php b/includes/class-indieauth-client-discovery.php
@@ -105,13 +105,10 @@ private function determine_icon() {
 		}
 		if ( is_array( $icons ) && ! wp_is_numeric_array( $icons ) && isset( $icons['url'] ) ) {
 			return $icons['url'];
+		} elseif ( isset( $icons[0]['url'] ) ) {
+			return $icons[0]['url'];
 		} else {
-			// Return the first icon
-			if ( isset( $icons[0]['url'] ) ) {
-				return $icons[0]['url'];
-			} else {
-				return '';
-			}
+			return '';
 		}
 	}
 
@@ -177,5 +174,4 @@ public static function extract_client_data_from_html( $contents, $url ) {
 
 		return $return;
 	}
-
 }
diff --git a/includes/class-indieauth-client-taxonomy.php b/includes/class-indieauth-client-taxonomy.php
@@ -17,7 +17,6 @@ public static function init() {
 		self::register();
 
 		add_filter( 'terms_clauses', array( __CLASS__, 'terms_clauses' ), 11, 3 );
-
 	}
 
 	public static function terms_clauses( $clauses, $taxonomies, $args ) {
@@ -105,7 +104,6 @@ public static function update_client_icon_from_discovery( $url ) {
 		}
 
 		return self::sideload_icon( $client->get_icon(), $url );
-
 	}
 
 
@@ -155,9 +153,9 @@ public static function add_client( $url, $name = null, $icon = null ) {
 		);
 	}
 
-	 /**
-	  * Get Client
-	  */
+	/**
+	 * Get Client
+	 */
 	public static function get_client( $url = null ) {
 		// If url is null retrieve all clients.
 		if ( is_null( $url ) ) {
@@ -209,9 +207,9 @@ public static function get_client( $url = null ) {
 		);
 	}
 
-	 /**
-	  * Delete a client
-	  */
+	/**
+	 * Delete a client
+	 */
 	public static function delete_client( $url ) {
 		$client = self::get_client( $url );
 		if ( ! $client ) {
@@ -318,9 +316,4 @@ public static function sideload_icon( $url, $client_id ) {
 
 		return self::upload_directory( $filehandle, true );
 	}
-
-
-
 } // End Class
-
-
diff --git a/includes/class-indieauth-debug.php b/includes/class-indieauth-debug.php
@@ -119,4 +119,3 @@ public function test( $request ) {
 		return indieauth_get_response();
 	}
 }
-
diff --git a/includes/class-indieauth-endpoint.php b/includes/class-indieauth-endpoint.php
@@ -106,6 +106,4 @@ public function delete_refresh_token( $id, $user_id = null ) {
 		$this->refresh_tokens->set_user( $user_id );
 		return $this->refresh_tokens->destroy( $id );
 	}
-
 }
-
diff --git a/includes/class-indieauth-introspection-endpoint.php b/includes/class-indieauth-introspection-endpoint.php
@@ -52,5 +52,4 @@ public function introspection( $request ) {
 
 		return rest_ensure_response( $token );
 	}
-
 }
diff --git a/includes/class-indieauth-local-authorize.php b/includes/class-indieauth-local-authorize.php
@@ -122,6 +122,4 @@ public static function verify_authorization_code( $code ) {
 		$tokens->destroy( $code );
 		return $return;
 	}
-
 }
-
diff --git a/includes/class-indieauth-metadata-endpoint.php b/includes/class-indieauth-metadata-endpoint.php
@@ -121,5 +121,4 @@ public function metadata( $request ) {
 			)
 		);
 	}
-
 }
diff --git a/includes/class-indieauth-remote-authorize.php b/includes/class-indieauth-remote-authorize.php
@@ -38,7 +38,6 @@ public function register_settings() {
 				'show_in_rest'      => true,
 			)
 		);
-
 	}
 
 	public static function admin_init() {
diff --git a/includes/class-indieauth-revocation-endpoint.php b/includes/class-indieauth-revocation-endpoint.php
@@ -48,6 +48,4 @@ public function revoke( $request ) {
 			200
 		);
 	}
-
-
 }
diff --git a/includes/class-indieauth-scope.php b/includes/class-indieauth-scope.php
@@ -57,4 +57,3 @@ public function has_cap( $cap ) {
 		return in_array( $cap, $capabilities, true );
 	}
 }
-
diff --git a/includes/class-indieauth-scopes.php b/includes/class-indieauth-scopes.php
@@ -270,4 +270,3 @@ public function has_cap( $cap, $scopes ) {
 		return false;
 	}
 }
-
diff --git a/includes/class-indieauth-ticket-endpoint.php b/includes/class-indieauth-ticket-endpoint.php
@@ -114,7 +114,6 @@ public function post( $request ) {
 
 		// If nothing works, return an error.
 		return new WP_OAuth_Response( 'invalid_request', __( 'Invalid Request', 'indieauth' ), 400 );
-
 	}
 
 	public function save_token( $token ) {
@@ -176,4 +175,3 @@ public function request_token( $url, $params ) {
 		);
 	}
 }
-
diff --git a/includes/class-indieauth-token-endpoint.php b/includes/class-indieauth-token-endpoint.php
@@ -164,7 +164,6 @@ public function refresh_token( $params ) {
 		$this->refresh_tokens->destroy( $params['refresh_token'] );
 
 		return $this->generate_token_response( $refresh );
-
 	}
 
 	// Authorization Code Grant Type.
@@ -189,7 +188,6 @@ public function authorization_code( $params ) {
 		}
 
 		return $this->generate_token_response( $response );
-
 	}
 
 	public function generate_token_response( $response ) {
@@ -273,6 +271,4 @@ public function generate_token_response( $response ) {
 		}
 		return new WP_OAuth_Response( 'server_error', __( 'There was an error in response.', 'indieauth' ), 500 );
 	}
-
 }
-
diff --git a/includes/class-indieauth-token-ui.php b/includes/class-indieauth-token-ui.php
@@ -153,7 +153,6 @@ public function scopes() {
 	public static function str_prefix( $source, $prefix ) {
 		return strncmp( $source, $prefix, strlen( $prefix ) ) === 0;
 	}
-
 } // End Class
 
 new IndieAuth_Token_UI();
diff --git a/includes/class-indieauth-userinfo-endpoint.php b/includes/class-indieauth-userinfo-endpoint.php
@@ -70,5 +70,4 @@ public function userinfo( $request ) {
 
 		return indieauth_get_user( $token['user'], in_array( 'email', $scopes, true ) );
 	}
-
 }
diff --git a/includes/class-oauth-response.php b/includes/class-oauth-response.php
@@ -1,5 +1,5 @@
 <?php
-
+//phpcs:ignore
 class WP_OAuth_Response extends WP_REST_Response {
 
 	public function __construct( $error, $error_description, $code = 200, $debug = null ) {
@@ -45,9 +45,9 @@ public function to_log() {
 		$status = $this->get_status();
 		return sprintf( 'IndieAuth Error: %1$s %2$s - %3$s %4$s', $status, $data['error'], $data['error_description'], wp_json_encode( $data ) );
 	}
-
 }
 
+//phpcs:ignore
 function get_oauth_error( $obj ) {
 	if ( is_array( $obj ) ) {
 		// When checking the result of wp_remote_post
@@ -70,11 +70,12 @@ function get_oauth_error( $obj ) {
 	return false;
 }
 
+//phpcs:ignore
 function is_oauth_error( $obj ) {
 	return ( $obj instanceof WP_OAuth_Response );
 }
 
-
+//phpcs:ignore
 function wp_error_to_oauth_response( $error ) {
 	if ( is_wp_error( $error ) ) {
 		$data   = $error->get_error_data();
diff --git a/includes/class-token-list-table.php b/includes/class-token-list-table.php
@@ -51,7 +51,6 @@ public function prepare_items() {
 			$value['token'] = $key;
 			$this->items[]  = $value;
 		}
-
 	}
 
 	public function column_default( $item, $column_name ) {
@@ -157,7 +156,6 @@ public function column_client_name( $item ) {
 			}
 		}
 		return sprintf( '%1$s  %2$s', $item['client_name'], $this->row_actions( $actions ) );
-
 	}
 
 	public function column_client_icon( $item ) {
diff --git a/includes/class-token-transient.php b/includes/class-token-transient.php
@@ -34,7 +34,6 @@ public function set( $info, $expiration = 120 ) {
 			return $key;
 		}
 		return false;
-
 	}
 
 	public function set_with_cookie( $info, $expiration = 120 ) {
diff --git a/includes/class-token-user.php b/includes/class-token-user.php
@@ -57,7 +57,6 @@ public function set( $info, $expiration = null ) {
 			return $key;
 		}
 		return false;
-
 	}
 
 	/**
@@ -192,7 +191,6 @@ public function get( $key, $hash = true ) {
 
 		$value['user'] = $user_id;
 		return $value;
-
 	}
 
 	/**
diff --git a/indieauth.php b/indieauth.php
@@ -170,7 +170,6 @@ public static function plugins_loaded() {
 			self::load( $ticket_load );
 			new IndieAuth_Ticket_Endpoint();
 		}
-
 	}
 
 	// Check that a file exists before loading it and if it does not print to the error log
@@ -194,7 +193,6 @@ public static function load( $files, $dir = 'includes/' ) {
 			}
 		}
 	}
-
 }
 
 add_action( 'plugins_loaded', array( 'IndieAuth_Plugin', 'plugins_loaded' ), 2 );
diff --git a/languages/indieauth.pot b/languages/indieauth.pot
diff --git a/package.json b/package.json
diff --git a/readme.md b/readme.md
diff --git a/readme.txt b/readme.txt
diff --git a/templates/authdiagtest.php b/templates/authdiagtest.php
diff --git a/templates/indieauth-settings.php b/templates/indieauth-settings.php

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function options_form() {`
`60`	`60`	`</div>`
`61`	`61`	`<?php`
`62`	`62`	`}`
`63`		`-`
`64`		`-`
`65`	`63`	`} // End Class`
`66`	`64`
`67`	`65`	`new External_Token_Page();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public function prepare_items() {`
`48`	`48`	`foreach ( $tokens as $value ) {`
`49`	`49`	`$this->items[] = $value;`
`50`	`50`	`}`
`51`		`-`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`public function column_default( $item, $column_name ) {`
Original file line number	Diff line number	Diff line change
`@@ -269,4 +269,3 @@ public function add_help_tab() {`
`269`	`269`	`);`
`270`	`270`	`}`
`271`	`271`	`}`
`272`		`-`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ public function get( $request ) {`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`return new WP_OAuth_Response( 'unsupported_response_type', __( 'Unsupported Response Type', 'indieauth' ), 400 );`
`229`		`-`
`230`	`229`	`}`
`231`	`230`
`232`	`231`	`/*`
`@@ -474,4 +473,3 @@ public function confirmed() {`
`474`	`473`	`wp_redirect( $url ); // phpcs:ignore`
`475`	`474`	`}`
`476`	`475`	`}`
`477`		`-`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public function load() {`
`27`	`27`	`add_filter( 'indieauth_response', array( $this, 'get_indieauth_response' ), 9 );`
`28`	`28`	`add_filter( 'wp_rest_server_class', array( $this, 'wp_rest_server_class' ) );`
`29`	`29`	`add_filter( 'rest_request_after_callbacks', array( $this, 'return_oauth_error' ), 10, 3 );`
`30`		`-`
`31`	`30`	`}`
`32`	`31`
`33`	`32`
`@@ -189,7 +188,6 @@ public function determine_current_user( $user_id ) {`
`189`	`188`	`)`
`190`	`189`	`);`
`191`	`190`	`return $user_id;`
`192`		`-`
`193`	`191`	`}`
`194`	`192`
`195`	`193`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -105,13 +105,10 @@ private function determine_icon() {`
`105`	`105`	`}`
`106`	`106`	`if ( is_array( $icons ) && ! wp_is_numeric_array( $icons ) && isset( $icons['url'] ) ) {`
`107`	`107`	`return $icons['url'];`
	`108`	`+ } elseif ( isset( $icons[0]['url'] ) ) {`
	`109`	`+ return $icons[0]['url'];`
`108`	`110`	`} else {`
`109`		`- // Return the first icon`
`110`		`- if ( isset( $icons[0]['url'] ) ) {`
`111`		`- return $icons[0]['url'];`
`112`		`- } else {`
`113`		`- return '';`
`114`		`- }`
	`111`	`+ return '';`
`115`	`112`	`}`
`116`	`113`	`}`
`117`	`114`
`@@ -177,5 +174,4 @@ public static function extract_client_data_from_html( $contents, $url ) {`
`177`	`174`
`178`	`175`	`return $return;`
`179`	`176`	`}`
`180`		`-`
`181`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,4 +119,3 @@ public function test( $request ) {`
`119`	`119`	`return indieauth_get_response();`
`120`	`120`	`}`
`121`	`121`	`}`
`122`		`-`