Merge branch 'master' into simplesamlphp-3.0

tvdijen · tvdijen · commit 97a2aac7d77b · 2026-06-02T10:49:28.000+02:00
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
@@ -379,7 +379,7 @@ public static function getInstance(string $instancename = 'simplesaml'): Configu
      */
     public function getVersion(): string
     {
-        $version = \Composer\InstalledVersions::getRootPackage()['pretty_version'];
+        $version = \Composer\InstalledVersions::getPrettyVersion('simplesamlphp/simplesamlphp');
         // If the returned version is in format `vX.Y.Z`, remove leading
         // `v` to keep the compatibility with the previously used
         // format `X.Y.Z`.

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ public static function getInstance(string $instancename = 'simplesaml'): Configu`
`379`	`379`	`*/`
`380`	`380`	`public function getVersion(): string`
`381`	`381`	`{`
`382`		`- $version = \Composer\InstalledVersions::getRootPackage()['pretty_version'];`
	`382`	`+ $version = \Composer\InstalledVersions::getPrettyVersion('simplesamlphp/simplesamlphp');`
`383`	`383`	// If the returned version is in format `vX.Y.Z`, remove leading
`384`	`384`	// `v` to keep the compatibility with the previously used
`385`	`385`	// format `X.Y.Z`.