Skip to content

Commit 017c6cd

Browse files
committed
Merge pull request #26 from BackEndTea/patch-1
1 parent d3f4b7e commit 017c6cd

46 files changed

Lines changed: 205 additions & 199 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ composer require boson-php/os-info
2626

2727
## Documentation
2828

29-
- You can learn more [about what a Boson is](https://bosonphp.com/doc/0.17/introduction).
30-
- Information [about the configs](https://bosonphp.com/doc/0.17/configuration) is
31-
available on the [corresponding pages](https://bosonphp.com/doc/0.17/application-configuration).
32-
- A more detailed description of working with the [application](https://bosonphp.com/doc/0.17/application),
33-
[windows](https://bosonphp.com/doc/0.17/window) and [webview](https://bosonphp.com/doc/0.17/webview)
29+
- You can learn more [about what a Boson is](https://bosonphp.com/doc/0.19/introduction).
30+
- Information [about the configs](https://bosonphp.com/doc/0.19/configuration) is
31+
available on the [corresponding pages](https://bosonphp.com/doc/0.19/application-configuration).
32+
- A more detailed description of working with the [application](https://bosonphp.com/doc/0.19/application),
33+
[windows](https://bosonphp.com/doc/0.19/window) and [webview](https://bosonphp.com/doc/0.19/webview)
3434
is also available.
3535
- Also, do not miss the detailed guide on additional apps for working with
36-
[function bindings](https://bosonphp.com/doc/0.17/bindings-api),
37-
[scripts](https://bosonphp.com/doc/0.17/scripts-api),
38-
[request interception](https://bosonphp.com/doc/0.17/schemes-api), and more.
36+
[function bindings](https://bosonphp.com/doc/0.19/bindings-api),
37+
[scripts](https://bosonphp.com/doc/0.19/scripts-api),
38+
[request interception](https://bosonphp.com/doc/0.19/schemes-api), and more.
3939
- If you want to build an application based on
40-
[Symfony](https://bosonphp.com/doc/0.17/symfony-adapter),
41-
[Laravel](https://bosonphp.com/doc/0.17/laravel-adapter) and
42-
[others](https://bosonphp.com/doc/0.17/psr7-adapter),
40+
[Symfony](https://bosonphp.com/doc/0.19/symfony-adapter),
41+
[Laravel](https://bosonphp.com/doc/0.19/laravel-adapter) and
42+
[others](https://bosonphp.com/doc/0.19/psr7-adapter),
4343
then similar functionality is also available.
4444

4545
## Community
@@ -50,5 +50,5 @@ composer require boson-php/os-info
5050
## Contributing
5151

5252
Boson is an Open Source, [community-driven project](https://github.com/boson-php/boson/graphs/contributors).
53-
Join them [contributing code](https://bosonphp.com/doc/0.17/contribution).
53+
Join them [contributing code](https://bosonphp.com/doc/0.19/contribution).
5454

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"php": "^8.4",
1919
"ext-pcre": "*",
2020
"ext-ffi": "*",
21-
"boson-php/os-info-contracts": "^0.18",
22-
"ffi/env": "^1.0"
21+
"ffi/env": "^1.0",
22+
"boson-php/value-object-contracts": "^0.19"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -36,8 +36,8 @@
3636
},
3737
"extra": {
3838
"branch-alias": {
39-
"dev-master": "0.18.x-dev",
40-
"dev-main": "0.18.x-dev"
39+
"dev-master": "0.19.x-dev",
40+
"dev-main": "0.19.x-dev"
4141
}
4242
},
4343
"config": {

src/Factory/DefaultOperatingSystemFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Boson\Component\OsInfo\Factory\Driver\WindowsRegistryDriver;
1515
use Boson\Component\OsInfo\Family\Factory\DefaultFamilyFactory;
1616
use Boson\Component\OsInfo\Family\Factory\FamilyFactoryInterface;
17-
use Boson\Contracts\OsInfo\OperatingSystemInterface;
17+
use Boson\Component\OsInfo\OperatingSystem;
1818

1919
final readonly class DefaultOperatingSystemFactory implements OperatingSystemFactoryInterface
2020
{
@@ -26,7 +26,7 @@ public function __construct(
2626
$this->factory = new OperatingSystemFactory(
2727
familyFactory: $familyFactory,
2828
drivers: [
29-
new EnvDriver(),
29+
EnvDriver::createForOverrideEnvVariables(),
3030
new WindowsRegistryDriver(),
3131
new WindowsGenericDriver(),
3232
new MacLicenseAwareDriver(),
@@ -38,8 +38,8 @@ public function __construct(
3838
);
3939
}
4040

41-
public function createOperatingSystemFromGlobals(): OperatingSystemInterface
41+
public function createOperatingSystem(): OperatingSystem
4242
{
43-
return $this->factory->createOperatingSystemFromGlobals();
43+
return $this->factory->createOperatingSystem();
4444
}
4545
}

src/Factory/Driver/CodenameDriverInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Boson\Component\OsInfo\Factory\Driver;
66

7-
use Boson\Contracts\OsInfo\FamilyInterface;
7+
use Boson\Component\OsInfo\FamilyInterface;
88

99
interface CodenameDriverInterface
1010
{

src/Factory/Driver/EditionDriverInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Boson\Component\OsInfo\Factory\Driver;
66

7-
use Boson\Contracts\OsInfo\FamilyInterface;
7+
use Boson\Component\OsInfo\FamilyInterface;
88

99
interface EditionDriverInterface
1010
{

src/Factory/Driver/EnvDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace Boson\Component\OsInfo\Factory\Driver;
66

7+
use Boson\Component\OsInfo\FamilyInterface;
78
use Boson\Component\OsInfo\Standard;
8-
use Boson\Contracts\OsInfo\FamilyInterface;
9-
use Boson\Contracts\OsInfo\StandardInterface;
9+
use Boson\Component\OsInfo\StandardInterface;
1010

1111
final readonly class EnvDriver implements
1212
NameDriverInterface,

src/Factory/Driver/GenericDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
namespace Boson\Component\OsInfo\Factory\Driver;
66

77
use Boson\Component\OsInfo\Family;
8+
use Boson\Component\OsInfo\FamilyInterface;
89
use Boson\Component\OsInfo\Standard;
9-
use Boson\Contracts\OsInfo\FamilyInterface;
10-
use Boson\Contracts\OsInfo\StandardInterface;
10+
use Boson\Component\OsInfo\StandardInterface;
1111

1212
final readonly class GenericDriver implements
1313
NameDriverInterface,

src/Factory/Driver/LinuxOsReleaseDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Boson\Component\OsInfo\Factory\Driver;
66

77
use Boson\Component\OsInfo\Family;
8-
use Boson\Contracts\OsInfo\FamilyInterface;
8+
use Boson\Component\OsInfo\FamilyInterface;
99

1010
final class LinuxOsReleaseDriver implements
1111
NameDriverInterface,

src/Factory/Driver/MacLicenseAwareDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Boson\Component\OsInfo\Factory\Driver;
66

77
use Boson\Component\OsInfo\Family;
8-
use Boson\Contracts\OsInfo\FamilyInterface;
8+
use Boson\Component\OsInfo\FamilyInterface;
99

1010
final readonly class MacLicenseAwareDriver implements
1111
CodenameDriverInterface

src/Factory/Driver/MacSysVersionDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Boson\Component\OsInfo\Factory\Driver;
66

77
use Boson\Component\OsInfo\Family;
8-
use Boson\Contracts\OsInfo\FamilyInterface;
8+
use Boson\Component\OsInfo\FamilyInterface;
99

1010
final class MacSysVersionDriver implements
1111
NameDriverInterface,

0 commit comments

Comments
 (0)