From 9c7fe5195de30c3460d093f2f10b279d251e86dc Mon Sep 17 00:00:00 2001 From: Christian Sonntag Date: Mon, 12 Feb 2024 22:09:33 +0100 Subject: [PATCH 1/2] [TASK] Fix some more PHP 8.2 deprecation notices Address additional PHP 8.2 deprecatn warnings related to dynamic properties. --- lib/php-openid/Auth/OpenID/AX.php | 5 +++++ lib/php-openid/Auth/OpenID/MDB2Store.php | 4 ++++ lib/php-openid/Auth/OpenID/Parse.php | 3 +++ lib/php-openid/Auth/OpenID/Server.php | 4 ++++ lib/php-openid/Auth/Yadis/ParseHTML.php | 3 +++ lib/php-openid/Auth/Yadis/XML.php | 4 ++++ lib/php-openid/Auth/Yadis/XRIRes.php | 2 ++ 7 files changed, 25 insertions(+) diff --git a/lib/php-openid/Auth/OpenID/AX.php b/lib/php-openid/Auth/OpenID/AX.php index 82b354d..32d19f0 100644 --- a/lib/php-openid/Auth/OpenID/AX.php +++ b/lib/php-openid/Auth/OpenID/AX.php @@ -72,6 +72,7 @@ function Auth_OpenID_AX_checkAlias($alias) * @package OpenID */ class Auth_OpenID_AX_Error { + public $message; function __construct($message=null) { $this->message = $message; @@ -142,6 +143,10 @@ function _newArgs() * @package OpenID */ class Auth_OpenID_AX_AttrInfo { + public $required; + public $count; + public $type_uri; + public $alias; /** * Construct an attribute information object. Do not call this * directly; call make(...) instead. diff --git a/lib/php-openid/Auth/OpenID/MDB2Store.php b/lib/php-openid/Auth/OpenID/MDB2Store.php index e6cb4c4..1fb7fc5 100644 --- a/lib/php-openid/Auth/OpenID/MDB2Store.php +++ b/lib/php-openid/Auth/OpenID/MDB2Store.php @@ -44,6 +44,10 @@ * @package OpenID */ class Auth_OpenID_MDB2Store extends Auth_OpenID_OpenIDStore { + public $associations_table_name; + public $nonces_table_name; + public $connection; + public $max_nonce_age; /** * This creates a new MDB2Store instance. It requires an * established database connection be given to it, and it allows diff --git a/lib/php-openid/Auth/OpenID/Parse.php b/lib/php-openid/Auth/OpenID/Parse.php index fe4b8d2..4e8d31d 100644 --- a/lib/php-openid/Auth/OpenID/Parse.php +++ b/lib/php-openid/Auth/OpenID/Parse.php @@ -107,6 +107,9 @@ class Auth_OpenID_Parse { public $_open_tag_expr = "<%s\b"; public $_close_tag_expr = "<((\/%s\b)|(%s[^>\/]*\/))>"; + public $_link_find; + public $_entity_replacements; + public $_ent_replace; function __construct() { diff --git a/lib/php-openid/Auth/OpenID/Server.php b/lib/php-openid/Auth/OpenID/Server.php index 6af8c7c..eeef1d5 100644 --- a/lib/php-openid/Auth/OpenID/Server.php +++ b/lib/php-openid/Auth/OpenID/Server.php @@ -1308,6 +1308,8 @@ class Auth_OpenID_ServerResponse { /** @var Auth_OpenID_Request */ public $request; + public $fields; + /** * Auth_OpenID_ServerResponse constructor. * @@ -1402,6 +1404,7 @@ function encodeToKVForm() class Auth_OpenID_WebResponse { public $code = AUTH_OPENID_HTTP_OK; public $body = ""; + public $headers; function __construct($code = null, $headers = null, $body = null) @@ -1791,6 +1794,7 @@ function defaultDecoder($message) * @package OpenID */ class Auth_OpenID_EncodingError { + public $response; function __construct($response = null) { if ($response !== null) { diff --git a/lib/php-openid/Auth/Yadis/ParseHTML.php b/lib/php-openid/Auth/Yadis/ParseHTML.php index 2085cd2..e83c9ab 100644 --- a/lib/php-openid/Auth/Yadis/ParseHTML.php +++ b/lib/php-openid/Auth/Yadis/ParseHTML.php @@ -42,6 +42,9 @@ class Auth_Yadis_ParseHTML { */ public $_attr_find = '\b([-\w]+)=(".*?"|\'.*?\'|.+?)[\/\s>]'; + public $_entity_replacements; + public $_ent_replace; + function __construct() { $this->_attr_find = sprintf("/%s/%s", diff --git a/lib/php-openid/Auth/Yadis/XML.php b/lib/php-openid/Auth/Yadis/XML.php index 6820658..fee7551 100644 --- a/lib/php-openid/Auth/Yadis/XML.php +++ b/lib/php-openid/Auth/Yadis/XML.php @@ -139,6 +139,10 @@ function attributes($node) * @package OpenID */ class Auth_Yadis_domxml extends Auth_Yadis_XMLParser { + public $xml; + public $doc; + public $xpath; + public $errors; function __construct() { $this->xml = null; diff --git a/lib/php-openid/Auth/Yadis/XRIRes.php b/lib/php-openid/Auth/Yadis/XRIRes.php index 388f433..4b5d869 100644 --- a/lib/php-openid/Auth/Yadis/XRIRes.php +++ b/lib/php-openid/Auth/Yadis/XRIRes.php @@ -12,6 +12,8 @@ class Auth_Yadis_ProxyResolver { /** @var Auth_Yadis_HTTPFetcher */ protected $fetcher; + public $proxy_url; + function __construct($fetcher, $proxy_url = null) { $this->fetcher = $fetcher; From d8f82fd76121422b2f8090f1ed6a5819c6daf21a Mon Sep 17 00:00:00 2001 From: Christian Sonntag Date: Tue, 13 Feb 2024 09:12:32 +0100 Subject: [PATCH 2/2] [TASK] Exchange Font Awesome icon with a SVG The SVG was downloaded directly from https://fontawesome.com/icons/openid --- Resources/Private/Templates/OpenidLogin.html | 2 +- Resources/Public/Icons/fa-openid.svg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Resources/Public/Icons/fa-openid.svg diff --git a/Resources/Private/Templates/OpenidLogin.html b/Resources/Private/Templates/OpenidLogin.html index e155297..5c22715 100644 --- a/Resources/Private/Templates/OpenidLogin.html +++ b/Resources/Private/Templates/OpenidLogin.html @@ -7,7 +7,7 @@
- + fa-openid
diff --git a/Resources/Public/Icons/fa-openid.svg b/Resources/Public/Icons/fa-openid.svg new file mode 100644 index 0000000..abe147e --- /dev/null +++ b/Resources/Public/Icons/fa-openid.svg @@ -0,0 +1 @@ + \ No newline at end of file