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 @@ -31,4 +31,4 @@ jobs:
os: >-
['ubuntu-latest', 'windows-latest']
php: >-
['8.0', '8.1', '8.2', '8.3']
['8.0', '8.1', '8.2', '8.3', '8.4']
2 changes: 1 addition & 1 deletion .github/workflows/composer-require-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.0', '8.1', '8.2', '8.3']
['8.0', '8.1', '8.2', '8.3', '8.4']
2 changes: 1 addition & 1 deletion .github/workflows/rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.3']
['8.4']
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.0', '8.1', '8.2', '8.3']
['8.0', '8.1', '8.2', '8.3', '8.4']
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 1.3.1 under development

- no changes in this release.
- Chg #217: Change PHP constraint in `composer.json` to `8.0 - 8.4` (@vjik)

## 1.3.0 December 09, 2024

Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
}
],
"require": {
"php": "^8.0",
"psr/container": "^1.0|^2.0",
"yiisoft/definitions": "^1.0|^2.0|^3.0.1"
"php": "8.0 - 8.4",
"psr/container": "^1.0 || ^2.0",
"yiisoft/definitions": "^1.0 || ^2.0 || ^3.0.1"
},
"require-dev": {
"maglnet/composer-require-checker": "^4.2",
"phpunit/phpunit": "^9.5",
"rector/rector": "^2.0.3",
"roave/infection-static-analysis-plugin": "^1.16",
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^4.30|^5.4",
"yiisoft/test-support": "^3.0"
"maglnet/composer-require-checker": "^4.4",
"phpunit/phpunit": "^9.6.22",
"rector/rector": "^2.0.10",
"roave/infection-static-analysis-plugin": "^1.25",
"spatie/phpunit-watcher": "^1.23.6",
"vimeo/psalm": "^4.30 || ^5.26.1 || ^6.9.4",
"yiisoft/test-support": "^3.0.2"
},
"autoload": {
"psr-4": {
Expand Down
12 changes: 4 additions & 8 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
errorLevel="1"
findUnusedBaselineEntry="true"
findUnusedCode="false"
ensureOverrideAttribute="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src"/>
<directory name="src" />
<ignoreFiles>
<directory name="vendor"/>
<directory name="vendor" />
</ignoreFiles>
</projectFiles>
<issueHandlers>
<MixedAssignment errorLevel="suppress"/>
<InvalidCatch>
<errorLevel type="suppress">
<referencedClass name="Psr\Container\NotFoundExceptionInterface"/>
</errorLevel>
</InvalidCatch>
<MixedAssignment errorLevel="suppress" />
</issueHandlers>
</psalm>
18 changes: 0 additions & 18 deletions tests/FactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
use Yiisoft\Factory\Tests\Support\NullableOptionalInterfaceDependency;
use Yiisoft\Factory\Tests\Support\NullableOptionalConcreteDependency;
use Yiisoft\Factory\Tests\Support\NullableScalarConstructorArgument;
use Yiisoft\Factory\Tests\Support\OptionalInterfaceDependency;
use Yiisoft\Factory\Tests\Support\OptionalConcreteDependency;
use Yiisoft\Factory\Tests\Support\Phone;
use Yiisoft\Factory\Tests\Support\PinkCircle;
use Yiisoft\Factory\Tests\Support\PropertyTest;
Expand Down Expand Up @@ -762,22 +760,6 @@ public function testDefinitionEqualId(): void
$this->assertSame(42, $engine->getNumber());
}

public function testOptionalInterfaceDependency(): void
{
$factory = new Factory(new SimpleContainer());

$object = $factory->create(OptionalInterfaceDependency::class);
$this->assertInstanceOf(OptionalInterfaceDependency::class, $object);
}

public function testOptionalConcreteDependency(): void
{
$factory = new Factory(new SimpleContainer());

$object = $factory->create(OptionalConcreteDependency::class);
$this->assertInstanceOf(OptionalConcreteDependency::class, $object);
}

public function testNullableOptionalInterfaceDependency(): void
{
$factory = new Factory(new SimpleContainer());
Expand Down
12 changes: 0 additions & 12 deletions tests/Support/OptionalConcreteDependency.php

This file was deleted.

12 changes: 0 additions & 12 deletions tests/Support/OptionalInterfaceDependency.php

This file was deleted.

Loading