Skip to content

Commit

Permalink
Merge pull request #709 from Ocramius/feature/#702-bump-composer-runt…
Browse files Browse the repository at this point in the history
…ime-api

Upgraded to `composer-runtime-api:^2.1.0`
  • Loading branch information
Ocramius authored Jun 9, 2021
2 parents 6046a57 + b598df5 commit 21e2b4a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/ProxyManager/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}

0 comments on commit 21e2b4a

Please sign in to comment.