Skip to content
This repository has been archived by the owner on Jul 24, 2023. It is now read-only.

More cleanup #139

Merged
merged 3 commits into from
Apr 7, 2020
Merged

More cleanup #139

merged 3 commits into from
Apr 7, 2020

Conversation

liayn
Copy link
Contributor

@liayn liayn commented May 27, 2017

No description provided.

@liayn
Copy link
Contributor Author

liayn commented Aug 9, 2018

@marcoceppi Would you mind merging my long standing PR?

Copy link
Member

@marcoceppi marcoceppi left a comment

Choose a reason for hiding this comment

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

Anywhere you've made the change from array() to shorthand, make sure, if it's a multi-line array that the last element has a trailing ,

@@ -22,16 +22,18 @@
* Data.
*/

$store_types = array("Filesystem" => "Auth_OpenID_FileStore",
$store_types = [
"Filesystem" => "Auth_OpenID_FileStore",
Copy link
Member

Choose a reason for hiding this comment

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

indent doesn't match

"MySQL" => "Auth_OpenID_MySQLStore",
"PostgreSQL" => "Auth_OpenID_PostgreSQLStore",
"SQLite" => "Auth_OpenID_SQLiteStore");
"SQLite" => "Auth_OpenID_SQLiteStore"
Copy link
Member

Choose a reason for hiding this comment

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

If we're going to do this, lets also use the dangling ,

$headers = array(
'X-XRDS-Location: '.$xrdsurl);
$headers = [
'X-XRDS-Location: '.$xrdsurl
Copy link
Member

Choose a reason for hiding this comment

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

Lets use a dangling ,

@@ -63,7 +63,8 @@ function doAuth($info, $trusted=null, $fail_cancels=false,
'postcode' => '12345',
'country' => 'ES',
'language' => 'eu',
'timezone' => 'America/New_York');
'timezone' => 'America/New_York'
Copy link
Member

Choose a reason for hiding this comment

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

Dangling , here

@@ -201,7 +201,8 @@ function detect_math($r, &$out)
'security of the network links involved. If you are only ' .
'using consumer support, you should still be able to operate ' .
'securely when the users are communicating with a ' .
'well-implemented server.'));
'well-implemented server.'
Copy link
Member

Choose a reason for hiding this comment

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

Dangling ,

@@ -37,11 +37,11 @@ function doIncludes() {
doIncludes();

global $pape_policy_uris;
$pape_policy_uris = array(
$pape_policy_uris = [
PAPE_AUTH_MULTI_FACTOR_PHYSICAL,
PAPE_AUTH_MULTI_FACTOR,
PAPE_AUTH_PHISHING_RESISTANT
Copy link
Member

Choose a reason for hiding this comment

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

trailing ,

'buggy-gmp',
'no-curl',
'math-lib=',
'insecure-rand',
'thorough',
'extra-tests=');
'extra-tests='
Copy link
Member

Choose a reason for hiding this comment

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

,

@liayn
Copy link
Contributor Author

liayn commented Aug 9, 2018

Wow... That was really fast. Will update the PR to match latest code (changes were done by PHPStorm back then)

@liayn liayn requested a review from marcoceppi April 6, 2020 15:45
@marcoceppi marcoceppi merged commit 8a68f6d into openid:master Apr 7, 2020
@liayn liayn deleted the more-cleanup branch April 7, 2020 20:47
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.

2 participants