Start using composer to get SSP version (#2617)

cicnavi · web-flow · commit 69a168c9552c · 2026-03-20T10:07:30.000+01:00
* Use composer to get SSP version

* Apply phpcbf fixes
diff --git a/modules/saml/src/Auth/Process/FilterScopes.php b/modules/saml/src/Auth/Process/FilterScopes.php
@@ -34,6 +34,7 @@ class FilterScopes extends ProcessingFilter
      */
     private bool $allowNonScoped = true;
 
+
     /**
      * Constructor for the processing filter.
      *
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
@@ -38,11 +38,6 @@
  */
 class Configuration implements Utils\ClearableState
 {
-    /**
-     * The release version of this package
-     */
-    public const string VERSION = 'dev-master';
-
     /**
      * A default value which means that the given option is required.
      */
@@ -384,7 +379,14 @@ public static function getInstance(string $instancename = 'simplesaml'): Configu
      */
     public function getVersion(): string
     {
-        return self::VERSION;
+        $version = \Composer\InstalledVersions::getRootPackage()['pretty_version'];
+        // 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`.
+        if (preg_match('/^v\d+\.\d+\.\d+/', $version)) {
+            return substr($version, 1);
+        }
+        return $version;
     }
 
 
diff --git a/tests/modules/saml/src/Auth/Process/FilterScopesTest.php b/tests/modules/saml/src/Auth/Process/FilterScopesTest.php
@@ -223,10 +223,11 @@ public function testAttributeValueMultipleAt(): void
         $this->assertEquals($request['Attributes'], $result['Attributes']);
     }
 
+
     /**
      * Test that non-scoped values pass or not depending on default or filter config setting.
      */
-   public function testNonScopedValuesRemovedWhenDisallowed(): void
+    public function testNonScopedValuesRemovedWhenDisallowed(): void
     {
         $config = [
             // Explicitly disallow non-scoped values
diff --git a/tests/src/SimpleSAML/ConfigurationTest.php b/tests/src/SimpleSAML/ConfigurationTest.php
@@ -24,7 +24,11 @@ class ConfigurationTest extends ClearStateTestCase
     public function testGetVersion(): void
     {
         $c = Configuration::getOptionalConfig();
-        $this->assertEquals($c->getVersion(), Configuration::VERSION);
+        $version = \Composer\InstalledVersions::getRootPackage()['pretty_version'];
+        if (preg_match('/^v\d+\.\d+\.\d+/', $version)) {
+            $version = substr($version, 1);
+        }
+        $this->assertEquals($c->getVersion(), $version);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ class FilterScopes extends ProcessingFilter`
`34`	`34`	`*/`
`35`	`35`	`private bool $allowNonScoped = true;`
`36`	`36`
	`37`	`+`
`37`	`38`	`/**`
`38`	`39`	`* Constructor for the processing filter.`
`39`	`40`	`*`
Original file line number	Diff line number	Diff line change
`@@ -223,10 +223,11 @@ public function testAttributeValueMultipleAt(): void`
`223`	`223`	`$this->assertEquals($request['Attributes'], $result['Attributes']);`
`224`	`224`	`}`
`225`	`225`
	`226`	`+`
`226`	`227`	`/**`
`227`	`228`	`* Test that non-scoped values pass or not depending on default or filter config setting.`
`228`	`229`	`*/`
`229`		`- public function testNonScopedValuesRemovedWhenDisallowed(): void`
	`230`	`+ public function testNonScopedValuesRemovedWhenDisallowed(): void`
`230`	`231`	`{`
`231`	`232`	`$config = [`
`232`	`233`	`// Explicitly disallow non-scoped values`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,11 @@ class ConfigurationTest extends ClearStateTestCase`
`24`	`24`	`public function testGetVersion(): void`
`25`	`25`	`{`
`26`	`26`	`$c = Configuration::getOptionalConfig();`
`27`		`- $this->assertEquals($c->getVersion(), Configuration::VERSION);`
	`27`	`+ $version = \Composer\InstalledVersions::getRootPackage()['pretty_version'];`
	`28`	`+ if (preg_match('/^v\d+\.\d+\.\d+/', $version)) {`
	`29`	`+ $version = substr($version, 1);`
	`30`	`+ }`
	`31`	`+ $this->assertEquals($c->getVersion(), $version);`
`28`	`32`	`}`
`29`	`33`
`30`	`34`