Context Navigation

← Previous Changeset
Next Changeset →

Changeset 14681

Timestamp:

03/09/2026 06:37:33 AM (4 months ago)

Author:

dd32

Message:

PHP 8.4 compatibility: Various fixes to avoid PHP Deprecated warnings.

Includes an update of adhocore-php/jwt.

Merges https://github.com/WordPress/wordpress.org/pull/557

Location:

sites/trunk

Files:

: 13 edited

api.wordpress.org/public_html/dotorg/trac/pr/adhocore-php-jwt/JWT.php (modified) (2 diffs)
common/includes/slack/trac/bot.php (modified) (1 diff)
common/includes/slack/trac/comment-handler.php (modified) (1 diff)
common/includes/slack/trac/resource.php (modified) (1 diff)
wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-notifications.php (modified) (1 diff)
wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-route-translation-helpers.php (modified) (3 diffs)
wordpress.org/public_html/wp-content/plugins/photo-directory/inc/photo.php (modified) (3 diffs)
wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/adhocore-php-jwt/JWT.php (modified) (5 diffs)
wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/adhocore-php-jwt/ValidatesJWT.php (modified) (2 diffs)
wordpress.org/public_html/wp-content/plugins/theme-directory/lib/adhocore-php-jwt/JWT.php (modified) (5 diffs)
wordpress.org/public_html/wp-content/plugins/theme-directory/lib/adhocore-php-jwt/ValidatesJWT.php (modified) (2 diffs)
wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-stats.php (modified) (2 diffs)
wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/profiles.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/adhocore-php-jwt/JWT.php

-              r14331
+              r14681
         int $maxAge = 3600,
         int $leeway = 0,
         string $pass = null
+        ?string $pass = null
     ) {
         $this->validateConfig($key, $algo, $maxAge, $leeway);
 …
      * @param int|null $timestamp
      */
     public function setTestTimestamp(int $timestamp = null): self
+    public function setTestTimestamp(?int $timestamp = null): self
+    {
         $this->timestamp = $timestamp;

sites/trunk/common/includes/slack/trac/bot.php

r14678	r14681
22	22
23	23	protected $parsed = array();
	24	protected $post_data;
24	25
25	26	// We want to post to Trac no more than once per two hours, and to Slack no more than once every 10 minutes.

sites/trunk/common/includes/slack/trac/comment-handler.php

-              r7111
+              r14681
 class Comment_Handler {
+        protected $send;
+        protected $lines;
+        protected $trac;
+        protected $title;
+        protected $author;
+        protected $comment;
+        protected $changes;
+        protected $ticket_id;
+        protected $ticket_url;
+        protected $comment_id;
+        protected $comment_url;
         function __construct( \Dotorg\Slack\Send $send, array $email_message ) {

sites/trunk/common/includes/slack/trac/resource.php

r14341	r14681
7	7
8	8	protected $data;
	9	protected $trac;
	10	protected $id;
9	11
10	12	static protected $instances = array();

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-notifications.php

r12205	r14681
208	208	* @return array The emails to be notified from the thread comments.
209	209	*/
210		public static function get_commenters_email_addresses( array $comments, string $email_address_to_ignore = null ): array {
	210	public static function get_commenters_email_addresses( array $comments, ?string $email_address_to_ignore = null ): array {
211	211	$email_addresses = array();
212	212	foreach ( $comments as $comment ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-route-translation-helpers.php

-              r12926
+              r14681
          * @return string                   JSON with the content of each section.
          */
         public function ajax_translation_helpers_locale( string $project_path, string $locale_slug, string $set_slug, int $original_id, int $translation_id = null ) {
+        public function ajax_translation_helpers_locale( string $project_path, string $locale_slug, string $set_slug, int $original_id, ?int $translation_id = null ) {
                 return $this->ajax_translation_helpers( $project_path, $original_id, $translation_id, $locale_slug, $set_slug );
+        }
 …
          * @return void                         Prints the JSON with the content of each section.
          */
         public function ajax_translation_helpers( string $project_path, int $original_id, int $translation_id = null, string $locale_slug = null, string $set_slug = null ): void {
+        public function ajax_translation_helpers( string $project_path, int $original_id, ?int $translation_id = null, ?string $locale_slug = null, ?string $set_slug = null ): void {
                 $project = GP::$project->by_path( $project_path );
                 if ( ! $project ) {
 …
          * @return string                   The full permalink.
          */
         public static function get_permalink( string $project_path, ?int $original_id, string $set_slug = null, string $locale_slug = null ): string {
+        public static function get_permalink( string $project_path, ?int $original_id, ?string $set_slug = null, ?string $locale_slug = null ): string {
                 $permalink = $project_path . '/' . $original_id;
                 if ( $set_slug && $locale_slug ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/photo.php

r14650	r14681
386	386	foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
387	387	if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
388		$meta[ $key ] = ~~utf8_encode( $meta[ $key ]~~ );
	388	$meta[ $key ] = mb_convert_encoding( $meta[ $key ], 'UTF-8', 'ISO-8859-1' );
389	389	}
390	390	}
…	…
392	392	foreach ( $meta['keywords'] as $key => $keyword ) {
393	393	if ( ! seems_utf8( $keyword ) ) {
394		$meta['keywords'][ $key ] = ~~utf8_encode( $keyword~~ );
	394	$meta['keywords'][ $key ] = mb_convert_encoding( $keyword, 'UTF-8', 'ISO-8859-1' );
395	395	}
396	396	}
…	…
991	991
992	992	if ( $text && ! seems_utf8( $text ) ) {
993		$text = ~~utf8_encode( $text~~ );
	993	$text = mb_convert_encoding( $text, 'UTF-8', 'ISO-8859-1' );
994	994	}
995	995

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/adhocore-php-jwt/JWT.php

-              r9564
+              r14681
         int $maxAge = 3600,
         int $leeway = 0,
         string $pass = null
+        ?string $pass = null
     ) {
         $this->validateConfig($key, $algo, $maxAge, $leeway);
 …
+     *
      * @param string $token
+     * @param bool   $verify
+     *
      * @throws JWTException
 …
      * @return array
      */
     public function decode(string $token): array
+    public function decode(string $token, bool $verify = true): array
+    {
         if (\substr_count($token, '.') < 2) {
 …
         $token = \explode('.', $token, 3);
+        if (!$verify) {
+            return (array) $this->urlSafeDecode($token[1]);
+        }
         $this->validateHeader((array) $this->urlSafeDecode($token[0]));
 …
      * @param int|null $timestamp
      */
     public function setTestTimestamp(int $timestamp = null): self
+    public function setTestTimestamp(?int $timestamp = null): self
+    {
         $this->timestamp = $timestamp;

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/adhocore-php-jwt/ValidatesJWT.php

-              r9564
+              r14681
             ['exp', $this->leeway /*          */ , static::ERROR_TOKEN_EXPIRED, 'Expired'],
             ['iat', $this->maxAge - $this->leeway, static::ERROR_TOKEN_EXPIRED, 'Expired'],
             ['nbf', $this->maxAge - $this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
+            ['nbf', -$this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
         ];
 …
+        }
+        if (!\is_resource($this->key)) {
+        if (\PHP_VERSION_ID < 80000 && !\is_resource($this->key)) {
+            throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
+        }
+        if (\PHP_VERSION_ID > 80000 && !(
+            $this->key instanceof \OpenSSLAsymmetricKey
+            || $this->key instanceof \OpenSSLCertificate
+            || $this->key instanceof \OpenSSLCertificateSigningRequest
+        )) {
             throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
+        }

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/adhocore-php-jwt/JWT.php

-              r9564
+              r14681
         int $maxAge = 3600,
         int $leeway = 0,
         string $pass = null
+        ?string $pass = null
     ) {
         $this->validateConfig($key, $algo, $maxAge, $leeway);
 …
+     *
      * @param string $token
+     * @param bool   $verify
+     *
      * @throws JWTException
 …
      * @return array
      */
     public function decode(string $token): array
+    public function decode(string $token, bool $verify = true): array
+    {
         if (\substr_count($token, '.') < 2) {
 …
         $token = \explode('.', $token, 3);
+        if (!$verify) {
+            return (array) $this->urlSafeDecode($token[1]);
+        }
         $this->validateHeader((array) $this->urlSafeDecode($token[0]));
 …
      * @param int|null $timestamp
      */
     public function setTestTimestamp(int $timestamp = null): self
+    public function setTestTimestamp(?int $timestamp = null): self
+    {
         $this->timestamp = $timestamp;

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/adhocore-php-jwt/ValidatesJWT.php

-              r9564
+              r14681
             ['exp', $this->leeway /*          */ , static::ERROR_TOKEN_EXPIRED, 'Expired'],
             ['iat', $this->maxAge - $this->leeway, static::ERROR_TOKEN_EXPIRED, 'Expired'],
             ['nbf', $this->maxAge - $this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
+            ['nbf', -$this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
         ];
 …
+        }
+        if (!\is_resource($this->key)) {
+        if (\PHP_VERSION_ID < 80000 && !\is_resource($this->key)) {
+            throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
+        }
+        if (\PHP_VERSION_ID > 80000 && !(
+            $this->key instanceof \OpenSSLAsymmetricKey
+            || $this->key instanceof \OpenSSLCertificate
+            || $this->key instanceof \OpenSSLCertificateSigningRequest
+        )) {
             throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
+        }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-stats.php

-              r14029
+              r14681
          * @return void
          */
         public function __invoke( bool $echo_the_values = false, string $old_date = null ): void {
+        public function __invoke( bool $echo_the_values = false, ?string $old_date = null ): void {
                 global $wpdb;
 …
          * @return array
          */
         private function get_forums_stats( string $type, int $year = null ): array {
+        private function get_forums_stats( string $type, ?int $year = null ): array {
                 global $wpdb;

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/profiles.php

r11974	r14681
39	39	* Add a activity when strings are suggested and approved.
40	40	*/
41		function add_single_translation_activity( GP_Translation $new_translation, GP_Translation $previous_translation = null ) : void {
	41	function add_single_translation_activity( GP_Translation $new_translation, ?GP_Translation $previous_translation = null ) : void {
42	42	if ( ! should_notify( $new_translation->user_id ) ) {
43	43	return;

Note: See TracChangeset for help on using the changeset viewer.

Making WordPress.org