Merge pull request #709 from Ocramius/feature/#702-bump-composer-runtime-api

Ocramius · web-flow · commit 21e2b4aa7d76 · 2021-06-09T12:16:06.000+02:00
Upgraded to `composer-runtime-api:^2.1.0`
diff --git a/composer.json b/composer.json
@@ -21,11 +21,10 @@
     "require": {
         "php":                       "~7.4.1 || ~8.0.0",
         "laminas/laminas-code":      "^4.3.0",
-        "composer-runtime-api":      "^2.0.0",
+        "composer-runtime-api":      "^2.1.0",
         "webimpress/safe-writer":    "^2.2.0"
     },
     "conflict": {
-        "composer/composer":         "<2.0.14",
         "zendframework/zend-stdlib": "<3.2.1",
         "laminas/laminas-stdlib":    "<3.2.1",
         "doctrine/annotations":      "<1.6.1",
diff --git a/composer.lock b/composer.lock
diff --git a/src/ProxyManager/Version.php b/src/ProxyManager/Version.php
@@ -34,7 +34,7 @@ private function __construct()
      */
     public static function getVersion(): string
     {
-        return InstalledVersions::getPrettyVersion('ocramius/proxy-manager')
-            . '@' . InstalledVersions::getReference('ocramius/proxy-manager');
+        return (string) InstalledVersions::getPrettyVersion('ocramius/proxy-manager')
+            . '@' . (string) InstalledVersions::getReference('ocramius/proxy-manager');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private function __construct()`
`34`	`34`	`*/`
`35`	`35`	`public static function getVersion(): string`
`36`	`36`	`{`
`37`		`- return InstalledVersions::getPrettyVersion('ocramius/proxy-manager')`
`38`		`- . '@' . InstalledVersions::getReference('ocramius/proxy-manager');`
	`37`	`+ return (string) InstalledVersions::getPrettyVersion('ocramius/proxy-manager')`
	`38`	`+ . '@' . (string) InstalledVersions::getReference('ocramius/proxy-manager');`
`39`	`39`	`}`
`40`	`40`	`}`