Changeset 3320114
- Timestamp:
- 06/30/2025 02:22:55 PM (9 months ago)
- Location:
- g-smtp
- Files:
-
- 8 edited
- 1 copied
-
tags/1.1.5 (copied) (copied from g-smtp/trunk)
-
tags/1.1.5/g-smtp.php (modified) (3 diffs)
-
tags/1.1.5/readme.txt (modified) (3 diffs)
-
tags/1.1.5/vendor/autoload.php (modified) (1 diff)
-
tags/1.1.5/vendor/composer/InstalledVersions.php (modified) (5 diffs)
-
trunk/g-smtp.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/vendor/autoload.php (modified) (1 diff)
-
trunk/vendor/composer/InstalledVersions.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
g-smtp/tags/1.1.5/g-smtp.php
r3064581 r3320114 10 10 * Plugin URI: https://thegeneration.se/ 11 11 * Description: Next Generation SMTP-plugin. 12 * Version: 1.1. 412 * Version: 1.1.5 13 13 * Author: The Generation AB 14 14 * Author URI: https://thegeneration.se … … 40 40 * Version of plugin 41 41 */ 42 const VERSION = '1.1.4'; 43 44 /** 45 * @var string 46 */ 47 private $plugin_description; 48 49 /** 50 * @var string 51 */ 52 private $plugin_label; 42 const VERSION = '1.1.5'; 53 43 54 44 /** … … 106 96 $this->load_dependencies(); 107 97 $this->init_modules(); 98 } 108 99 109 $this->plugin_description = esc_html__( 'Next Generation SMTP-plugin.', 'g-smtp' ); 110 $this->plugin_label = esc_html__( 'G-SMTP', 'g-smtp' ); 100 /** 101 * Translate plugin description 102 * 103 * @return void 104 */ 105 public function translate_plugin_description() { 106 esc_html__( 'Next Generation SMTP-plugin.', 'g-smtp' ); 107 esc_html__( 'G-SMTP', 'g-smtp' ); 111 108 } 112 109 -
g-smtp/tags/1.1.5/readme.txt
r3064581 r3320114 7 7 License: Apache 2.0 8 8 License URI: https://www.apache.org/licenses/LICENSE-2.0 9 Stable tag: 1.1. 49 Stable tag: 1.1.5 10 10 11 11 Next Generation SMTP-plugin … … 89 89 == Upgrade Notice == 90 90 91 = 1.1.5 = 92 1.1.5 is a patch release. 93 91 94 = 1.1.4 = 92 95 1.1.4 is a patch release. … … 109 112 == Changelog == 110 113 114 = 1.1.5 = 115 * Added compatibility with WordPress 6.8. 116 117 = 1.1.4 = 118 * Feature: Tested with WordPress 6.5. 119 120 = 1.1.3 = 121 * Feature: Tested with WordPress 6.4. 122 111 123 = 1.1.2 = 112 124 * Tested with WordPress 6.0. -
g-smtp/tags/1.1.5/vendor/autoload.php
r3005021 r3320114 15 15 } 16 16 } 17 trigger_error( 18 $err, 19 E_USER_ERROR 20 ); 17 throw new RuntimeException($err); 21 18 } 22 19 -
g-smtp/tags/1.1.5/vendor/composer/InstalledVersions.php
r3005021 r3320114 28 28 { 29 29 /** 30 * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to 31 * @internal 32 */ 33 private static $selfDir = null; 34 35 /** 30 36 * @var mixed[]|null 31 37 * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null 32 38 */ 33 39 private static $installed; 40 41 /** 42 * @var bool 43 */ 44 private static $installedIsLocalDir; 34 45 35 46 /** … … 310 321 self::$installed = $data; 311 322 self::$installedByVendor = array(); 323 324 // when using reload, we disable the duplicate protection to ensure that self::$installed data is 325 // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, 326 // so we have to assume it does not, and that may result in duplicate data being returned when listing 327 // all installed packages for example 328 self::$installedIsLocalDir = false; 329 } 330 331 /** 332 * @return string 333 */ 334 private static function getSelfDir() 335 { 336 if (self::$selfDir === null) { 337 self::$selfDir = strtr(__DIR__, '\\', '/'); 338 } 339 340 return self::$selfDir; 312 341 } 313 342 … … 323 352 324 353 $installed = array(); 354 $copiedLocalDir = false; 325 355 326 356 if (self::$canGetVendors) { 357 $selfDir = self::getSelfDir(); 327 358 foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { 359 $vendorDir = strtr($vendorDir, '\\', '/'); 328 360 if (isset(self::$installedByVendor[$vendorDir])) { 329 361 $installed[] = self::$installedByVendor[$vendorDir]; … … 331 363 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ 332 364 $required = require $vendorDir.'/composer/installed.php'; 333 $installed[] = self::$installedByVendor[$vendorDir] = $required; 334 if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { 335 self::$installed = $installed[count($installed) - 1]; 365 self::$installedByVendor[$vendorDir] = $required; 366 $installed[] = $required; 367 if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { 368 self::$installed = $required; 369 self::$installedIsLocalDir = true; 336 370 } 371 } 372 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { 373 $copiedLocalDir = true; 337 374 } 338 375 } … … 351 388 } 352 389 353 if (self::$installed !== array() ) {390 if (self::$installed !== array() && !$copiedLocalDir) { 354 391 $installed[] = self::$installed; 355 392 } -
g-smtp/trunk/g-smtp.php
r3064581 r3320114 10 10 * Plugin URI: https://thegeneration.se/ 11 11 * Description: Next Generation SMTP-plugin. 12 * Version: 1.1. 412 * Version: 1.1.5 13 13 * Author: The Generation AB 14 14 * Author URI: https://thegeneration.se … … 40 40 * Version of plugin 41 41 */ 42 const VERSION = '1.1.4'; 43 44 /** 45 * @var string 46 */ 47 private $plugin_description; 48 49 /** 50 * @var string 51 */ 52 private $plugin_label; 42 const VERSION = '1.1.5'; 53 43 54 44 /** … … 106 96 $this->load_dependencies(); 107 97 $this->init_modules(); 98 } 108 99 109 $this->plugin_description = esc_html__( 'Next Generation SMTP-plugin.', 'g-smtp' ); 110 $this->plugin_label = esc_html__( 'G-SMTP', 'g-smtp' ); 100 /** 101 * Translate plugin description 102 * 103 * @return void 104 */ 105 public function translate_plugin_description() { 106 esc_html__( 'Next Generation SMTP-plugin.', 'g-smtp' ); 107 esc_html__( 'G-SMTP', 'g-smtp' ); 111 108 } 112 109 -
g-smtp/trunk/readme.txt
r3064581 r3320114 7 7 License: Apache 2.0 8 8 License URI: https://www.apache.org/licenses/LICENSE-2.0 9 Stable tag: 1.1. 49 Stable tag: 1.1.5 10 10 11 11 Next Generation SMTP-plugin … … 89 89 == Upgrade Notice == 90 90 91 = 1.1.5 = 92 1.1.5 is a patch release. 93 91 94 = 1.1.4 = 92 95 1.1.4 is a patch release. … … 109 112 == Changelog == 110 113 114 = 1.1.5 = 115 * Added compatibility with WordPress 6.8. 116 117 = 1.1.4 = 118 * Feature: Tested with WordPress 6.5. 119 120 = 1.1.3 = 121 * Feature: Tested with WordPress 6.4. 122 111 123 = 1.1.2 = 112 124 * Tested with WordPress 6.0. -
g-smtp/trunk/vendor/autoload.php
r3005021 r3320114 15 15 } 16 16 } 17 trigger_error( 18 $err, 19 E_USER_ERROR 20 ); 17 throw new RuntimeException($err); 21 18 } 22 19 -
g-smtp/trunk/vendor/composer/InstalledVersions.php
r3005021 r3320114 28 28 { 29 29 /** 30 * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to 31 * @internal 32 */ 33 private static $selfDir = null; 34 35 /** 30 36 * @var mixed[]|null 31 37 * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null 32 38 */ 33 39 private static $installed; 40 41 /** 42 * @var bool 43 */ 44 private static $installedIsLocalDir; 34 45 35 46 /** … … 310 321 self::$installed = $data; 311 322 self::$installedByVendor = array(); 323 324 // when using reload, we disable the duplicate protection to ensure that self::$installed data is 325 // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, 326 // so we have to assume it does not, and that may result in duplicate data being returned when listing 327 // all installed packages for example 328 self::$installedIsLocalDir = false; 329 } 330 331 /** 332 * @return string 333 */ 334 private static function getSelfDir() 335 { 336 if (self::$selfDir === null) { 337 self::$selfDir = strtr(__DIR__, '\\', '/'); 338 } 339 340 return self::$selfDir; 312 341 } 313 342 … … 323 352 324 353 $installed = array(); 354 $copiedLocalDir = false; 325 355 326 356 if (self::$canGetVendors) { 357 $selfDir = self::getSelfDir(); 327 358 foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { 359 $vendorDir = strtr($vendorDir, '\\', '/'); 328 360 if (isset(self::$installedByVendor[$vendorDir])) { 329 361 $installed[] = self::$installedByVendor[$vendorDir]; … … 331 363 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ 332 364 $required = require $vendorDir.'/composer/installed.php'; 333 $installed[] = self::$installedByVendor[$vendorDir] = $required; 334 if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { 335 self::$installed = $installed[count($installed) - 1]; 365 self::$installedByVendor[$vendorDir] = $required; 366 $installed[] = $required; 367 if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { 368 self::$installed = $required; 369 self::$installedIsLocalDir = true; 336 370 } 371 } 372 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { 373 $copiedLocalDir = true; 337 374 } 338 375 } … … 351 388 } 352 389 353 if (self::$installed !== array() ) {390 if (self::$installed !== array() && !$copiedLocalDir) { 354 391 $installed[] = self::$installed; 355 392 }
Note: See TracChangeset
for help on using the changeset viewer.