Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
os: >-
['ubuntu-latest', 'windows-latest']
php: >-
['8.1', '8.2', '8.3']
['8.1', '8.2', '8.3', '8.4']
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Change Log
## 0.1.3 Under development

- Enh #87: Refactor `SemverUtil::class` stability normalization logic (@terabytesoftw)
- Bug #104: Add support for PHP 8.4 (@terabytesoftw)

## 0.1.2 June 10, 2024

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"php-forge/support": "^0.1",
"phpunit/phpunit": "^10.5",
"symplify/easy-coding-standard": "^12.1",
"vimeo/psalm": "^5.20"
"vimeo/psalm": "^5.26.1|^6.4.1"
},
"config": {
"preferred-install": {
Expand Down
2 changes: 1 addition & 1 deletion src/Asset/AssetManagerFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function addManager(AssetManagerInterface $manager): void
* @throws RuntimeException When the asset manager does not exist
* @throws RuntimeException When the asset manager is not found
*/
public function findManager(string $manager = null): AssetManagerInterface
public function findManager(string|null $manager = null): AssetManagerInterface
{
if (null !== $manager) {
if (isset($this->managers[$manager])) {
Expand Down
6 changes: 3 additions & 3 deletions src/Config/ConfigBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ abstract class ConfigBuilder
* @param array $defaults The default values.
* @param IOInterface|null $io The composer input/output.
*/
public static function build(Composer $composer, array $defaults = [], IOInterface $io = null): Config
public static function build(Composer $composer, array $defaults = [], IOInterface|null $io = null): Config
{
$config = self::getConfigBase($composer, $io);

Expand All @@ -44,7 +44,7 @@ public static function build(Composer $composer, array $defaults = [], IOInterfa
* @param Composer $composer The composer.
* @param IOInterface|null $io The composer input/output.
*/
private static function getConfigBase(Composer $composer, IOInterface $io = null): array
private static function getConfigBase(Composer $composer, IOInterface|null $io = null): array
{
$globalPackageConfig = self::getGlobalConfig($composer, 'composer', $io);
$globalConfig = self::getGlobalConfig($composer, 'config', $io);
Expand All @@ -63,7 +63,7 @@ private static function getConfigBase(Composer $composer, IOInterface $io = null
* @param string $filename The filename.
* @param IOInterface|null $io The composer input/output.
*/
private static function getGlobalConfig(Composer $composer, string $filename, IOInterface $io = null): array
private static function getGlobalConfig(Composer $composer, string $filename, IOInterface|null $io = null): array
{
$home = self::getComposerHome($composer);
$file = new JsonFile($home . '/' . $filename . '.json');
Expand Down
2 changes: 1 addition & 1 deletion src/Converter/SemverConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
final class SemverConverter implements VersionConverterInterface
{
public function convertVersion(string $version = null): string
public function convertVersion(string|null $version = null): string
{
if (\in_array($version, [null, '', 'latest'], true)) {
return ('latest' === $version ? 'default || ' : '') . '*';
Expand Down
2 changes: 1 addition & 1 deletion src/Converter/VersionConverterInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ interface VersionConverterInterface
*
* @return string The composer version
*/
public function convertVersion(string $version = null): string;
public function convertVersion(string|null $version = null): string;
}
2 changes: 1 addition & 1 deletion src/Fallback/AssetFallback.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct(
protected IOInterface $io,
protected Config $config,
protected string $path,
Filesystem $fs = null
Filesystem|null $fs = null
) {
$this->fs = $fs ?: new Filesystem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Fallback/ComposerFallback.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function __construct(
protected IOInterface $io,
protected Config $config,
protected InputInterface $input,
Filesystem $fs = null,
Filesystem|null $fs = null,
protected Installer|null $installer = null
) {
$this->fs = $fs ?: new Filesystem();
Expand Down