Skip to content

Commit 131b07b

Browse files
aedartaedart
committed
Merge tag '9.2.0' into 9.x
2 parents 6105c75 + 05e6e74 commit 131b07b

File tree

29 files changed

+132
-104
lines changed

29 files changed

+132
-104
lines changed

‎CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [9.2.0] - 2025-03-17
11+
12+
### Changed
13+
14+
* Updated dependencies (_service update_).
15+
16+
### Fixed
17+
18+
* Unable to unset properties `$stream`, `$meta`, `$isReadable` and `$isWritable`, in `\Aedart\Streams\Stream::detach()`, due to possible hooks in a subclass (_phpstan error for PHP `v8.4`_). [#226](https://github.com/aedart/athenaeum/issues/226).
19+
* Unable to unset property `$originalStream`, in `\Aedart\Streams\Transactions\Drivers\BaseTransactionDriver::close()`, due to possible hooks in a subclass (_phpstan error for PHP `v8.4`_). [#226](https://github.com/aedart/athenaeum/issues/226).
20+
* Unable to unset property `$name`, in `\Aedart\Tests\Helpers\Dummies\Properties\Accessibility\Person::unsetName()`, due to possible hooks in a subclass (_phpstan error for PHP `v8.4`_). [#226](https://github.com/aedart/athenaeum/issues/226).
21+
* Unable to unset property `$name`, in `\Aedart\Tests\Unit\Properties\OverloadTest::canUnsetProperty()`, due to possible hooks in a subclass (_phpstan error for PHP `v8.4`_). [#226](https://github.com/aedart/athenaeum/issues/226).
22+
1023
## [9.1.0] - 2025-03-06
1124

1225
### Changed
@@ -1694,7 +1707,8 @@ It will high-jack the `app` binding, which will cause your application to behave
16941707

16951708
* Please review commits on [GitHub](https://github.com/aedart/athenaeum/commits/master)
16961709

1697-
[Unreleased]: https://github.com/aedart/athenaeum/compare/9.1.0...HEAD
1710+
[Unreleased]: https://github.com/aedart/athenaeum/compare/9.2.0...HEAD
1711+
[9.2.0]: https://github.com/aedart/athenaeum/compare/9.1.0...9.2.0
16981712
[9.1.0]: https://github.com/aedart/athenaeum/compare/9.0.0...9.1.0
16991713
[9.0.0]: https://github.com/aedart/athenaeum/compare/8.22.0...9.0.0
17001714
[8.22.0]: https://github.com/aedart/athenaeum/compare/8.21.0...8.22.0

‎composer.json

+51-51
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
"dragonmantank/cron-expression": "^3.4.0",
1818
"fakerphp/faker": "^v1.24.1",
1919
"guzzlehttp/guzzle": "^7.9.2",
20-
"illuminate/auth": "^v12.1.1",
21-
"illuminate/cache": "^v12.1.1",
22-
"illuminate/collections": "^v12.1.1",
23-
"illuminate/config": "^v12.1.1",
24-
"illuminate/console": "^v12.1.1",
25-
"illuminate/container": "^v12.1.1",
26-
"illuminate/contracts": "^v12.1.1",
27-
"illuminate/database": "^v12.1.1",
28-
"illuminate/events": "^v12.1.1",
29-
"illuminate/filesystem": "^v12.1.1",
30-
"illuminate/http": "^v12.1.1",
31-
"illuminate/pipeline": "^v12.1.1",
32-
"illuminate/support": "^v12.1.1",
33-
"illuminate/translation": "^v12.1.1",
34-
"illuminate/validation": "^v12.1.1",
20+
"illuminate/auth": "^v12.2.0",
21+
"illuminate/cache": "^v12.2.0",
22+
"illuminate/collections": "^v12.2.0",
23+
"illuminate/config": "^v12.2.0",
24+
"illuminate/console": "^v12.2.0",
25+
"illuminate/container": "^v12.2.0",
26+
"illuminate/contracts": "^v12.2.0",
27+
"illuminate/database": "^v12.2.0",
28+
"illuminate/events": "^v12.2.0",
29+
"illuminate/filesystem": "^v12.2.0",
30+
"illuminate/http": "^v12.2.0",
31+
"illuminate/pipeline": "^v12.2.0",
32+
"illuminate/support": "^v12.2.0",
33+
"illuminate/translation": "^v12.2.0",
34+
"illuminate/validation": "^v12.2.0",
3535
"league/flysystem": "^3.29.1",
3636
"mockery/mockery": "1.6.*",
3737
"psr/http-client": "^1.0.3",
@@ -51,13 +51,13 @@
5151
"codeception/codeception": "^5.2.1",
5252
"codeception/module-asserts": "^3.0.0",
5353
"devium/toml": "^1.0.5",
54-
"illuminate/testing": "^v12.1.1",
54+
"illuminate/testing": "^v12.2.0",
5555
"laravel/fortify": "^1.25.4",
5656
"league/flysystem-adapter-test-utilities": "^3.29.0",
5757
"nette/neon": "^3.4.4",
5858
"orchestra/testbench": "^v10.1.0",
5959
"orchestra/testbench-dusk": "^v10.1.0",
60-
"phpstan/phpstan": "^2.1.7",
60+
"phpstan/phpstan": "^2.1.8",
6161
"predis/predis": "^2.3.0",
6262
"roave/security-advisories": "dev-master",
6363
"symfony/var-dumper": "^v7.2.3",
@@ -113,7 +113,7 @@
113113
},
114114
"extra": {
115115
"branch-alias": {
116-
"dev-master": "9.2.x-dev"
116+
"dev-master": "9.3.x-dev"
117117
},
118118
"extra": {
119119
"bamarni-bin": {
@@ -157,39 +157,39 @@
157157
}
158158
},
159159
"replace": {
160-
"aedart/athenaeum-acl": "9.1.0",
161-
"aedart/athenaeum-antivirus": "9.1.0",
162-
"aedart/athenaeum-audit": "9.1.0",
163-
"aedart/athenaeum-auth": "9.1.0",
164-
"aedart/athenaeum-circuits": "9.1.0",
165-
"aedart/athenaeum-collections": "9.1.0",
166-
"aedart/athenaeum-config": "9.1.0",
167-
"aedart/athenaeum-console": "9.1.0",
168-
"aedart/athenaeum-container": "9.1.0",
169-
"aedart/athenaeum-contracts": "9.1.0",
170-
"aedart/athenaeum-core": "9.1.0",
171-
"aedart/athenaeum-database": "9.1.0",
172-
"aedart/athenaeum-dto": "9.1.0",
173-
"aedart/athenaeum-etags": "9.1.0",
174-
"aedart/athenaeum-events": "9.1.0",
175-
"aedart/athenaeum-filters": "9.1.0",
176-
"aedart/athenaeum-flysystem-db": "9.1.0",
177-
"aedart/athenaeum-http-api": "9.1.0",
178-
"aedart/athenaeum-http-clients": "9.1.0",
179-
"aedart/athenaeum-http-cookies": "9.1.0",
180-
"aedart/athenaeum-http-messages": "9.1.0",
181-
"aedart/athenaeum-maintenance-modes": "9.1.0",
182-
"aedart/athenaeum-mime-types": "9.1.0",
183-
"aedart/athenaeum-pagination": "9.1.0",
184-
"aedart/athenaeum-properties": "9.1.0",
185-
"aedart/athenaeum-redmine": "9.1.0",
186-
"aedart/athenaeum-service": "9.1.0",
187-
"aedart/athenaeum-streams": "9.1.0",
188-
"aedart/athenaeum-support": "9.1.0",
189-
"aedart/athenaeum-testing": "9.1.0",
190-
"aedart/athenaeum-translation": "9.1.0",
191-
"aedart/athenaeum-utils": "9.1.0",
192-
"aedart/athenaeum-validation": "9.1.0"
160+
"aedart/athenaeum-acl": "9.2.0",
161+
"aedart/athenaeum-antivirus": "9.2.0",
162+
"aedart/athenaeum-audit": "9.2.0",
163+
"aedart/athenaeum-auth": "9.2.0",
164+
"aedart/athenaeum-circuits": "9.2.0",
165+
"aedart/athenaeum-collections": "9.2.0",
166+
"aedart/athenaeum-config": "9.2.0",
167+
"aedart/athenaeum-console": "9.2.0",
168+
"aedart/athenaeum-container": "9.2.0",
169+
"aedart/athenaeum-contracts": "9.2.0",
170+
"aedart/athenaeum-core": "9.2.0",
171+
"aedart/athenaeum-database": "9.2.0",
172+
"aedart/athenaeum-dto": "9.2.0",
173+
"aedart/athenaeum-etags": "9.2.0",
174+
"aedart/athenaeum-events": "9.2.0",
175+
"aedart/athenaeum-filters": "9.2.0",
176+
"aedart/athenaeum-flysystem-db": "9.2.0",
177+
"aedart/athenaeum-http-api": "9.2.0",
178+
"aedart/athenaeum-http-clients": "9.2.0",
179+
"aedart/athenaeum-http-cookies": "9.2.0",
180+
"aedart/athenaeum-http-messages": "9.2.0",
181+
"aedart/athenaeum-maintenance-modes": "9.2.0",
182+
"aedart/athenaeum-mime-types": "9.2.0",
183+
"aedart/athenaeum-pagination": "9.2.0",
184+
"aedart/athenaeum-properties": "9.2.0",
185+
"aedart/athenaeum-redmine": "9.2.0",
186+
"aedart/athenaeum-service": "9.2.0",
187+
"aedart/athenaeum-streams": "9.2.0",
188+
"aedart/athenaeum-support": "9.2.0",
189+
"aedart/athenaeum-testing": "9.2.0",
190+
"aedart/athenaeum-translation": "9.2.0",
191+
"aedart/athenaeum-utils": "9.2.0",
192+
"aedart/athenaeum-validation": "9.2.0"
193193
},
194194
"minimum-stability": "dev",
195195
"prefer-stable": true

‎monorepo-builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"codeception/module-asserts" => "^3.0.0",
5252
'orchestra/testbench' => '^v10.1.0',
5353
'orchestra/testbench-dusk' => '^v10.1.0',
54-
'illuminate/testing' => '^v12.1.1'
54+
'illuminate/testing' => '^v12.2.0'
5555
],
5656

5757
ComposerJsonSection::AUTOLOAD => [

‎packages/Acl/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"aedart/athenaeum-support": "^9.2",
2626
"aedart/athenaeum-utils": "^9.2",
2727
"aedart/athenaeum-validation": "^9.2",
28-
"illuminate/auth": "^v12.0.1"
28+
"illuminate/auth": "^v12.2.0"
2929
},
3030
"autoload": {
3131
"psr-4": {

‎packages/Antivirus/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"aedart/athenaeum-streams": "^9.2",
2323
"aedart/athenaeum-support": "^9.2",
2424
"aedart/athenaeum-validation": "^9.2",
25-
"illuminate/events": "^v12.0.1",
25+
"illuminate/events": "^v12.2.0",
2626
"xenolope/quahog": "^3.0"
2727
},
2828
"autoload": {

‎packages/Auth/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"php": "^8.3",
1919
"aedart/athenaeum-contracts": "^9.2",
2020
"aedart/athenaeum-support": "^9.2",
21+
"illuminate/validation": "^v12.2.0",
2122
"laravel/fortify": "^1.25.4",
22-
"illuminate/validation": "^v12.0.1",
2323
"shrikeh/teapot": "^3.0.0"
2424
},
2525
"require-dev": {

‎packages/Circuits/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"aedart/athenaeum-contracts": "^9.2",
2020
"aedart/athenaeum-support": "^9.2",
2121
"aedart/athenaeum-utils": "^9.2",
22-
"illuminate/cache": "^v12.0.1",
23-
"illuminate/events": "^v12.0.1"
22+
"illuminate/cache": "^v12.2.0",
23+
"illuminate/events": "^v12.2.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

‎packages/Collections/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"aedart/athenaeum-contracts": "^9.2",
2222
"aedart/athenaeum-support": "^9.2",
2323
"aedart/athenaeum-utils": "^9.2",
24-
"illuminate/collections": "^v12.0.1"
24+
"illuminate/collections": "^v12.2.0"
2525
},
2626
"autoload": {
2727
"psr-4": {

‎packages/Config/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"aedart/athenaeum-contracts": "^9.2",
2727
"aedart/athenaeum-support": "^9.2",
2828
"aedart/athenaeum-utils": "^9.2",
29-
"illuminate/config": "^v12.0.1",
30-
"illuminate/filesystem": "^v12.0.1"
29+
"illuminate/config": "^v12.2.0",
30+
"illuminate/filesystem": "^v12.2.0"
3131
},
3232
"require-dev": {
3333
"devium/toml": "^1.0.5",

‎packages/Console/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"aedart/athenaeum-contracts": "^9.2",
2222
"aedart/athenaeum-support": "^9.2",
2323
"dragonmantank/cron-expression": "^3.4.0",
24-
"illuminate/cache": "^v12.0.1",
25-
"illuminate/console": "^v12.0.1"
24+
"illuminate/cache": "^v12.2.0",
25+
"illuminate/console": "^v12.2.0"
2626
},
2727
"autoload": {
2828
"psr-4": {

‎packages/Container/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": "^8.3",
2121
"aedart/athenaeum-contracts": "^9.2",
2222
"aedart/athenaeum-support": "^9.2",
23-
"illuminate/container": "^v12.0.1"
23+
"illuminate/container": "^v12.2.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

‎packages/Contracts/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"type": "library",
1818
"require": {
1919
"php": "^8.3",
20-
"illuminate/contracts": "^v12.0.1"
20+
"illuminate/contracts": "^v12.2.0"
2121
},
2222
"autoload": {
2323
"psr-4": {

‎packages/Core/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"aedart/athenaeum-service": "^9.2",
2828
"aedart/athenaeum-support": "^9.2",
2929
"aedart/athenaeum-utils": "^9.2",
30-
"illuminate/cache": "^v12.0.1",
31-
"illuminate/filesystem": "^v12.0.1",
30+
"illuminate/cache": "^v12.2.0",
31+
"illuminate/filesystem": "^v12.2.0",
3232
"psr/log": "^3.0.2",
3333
"symfony/console": "^v7.2.1",
3434
"vlucas/phpdotenv": "^5.6.1"

‎packages/Database/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"aedart/athenaeum-contracts": "^9.2",
2121
"aedart/athenaeum-support": "^9.2",
2222
"aedart/athenaeum-utils": "^9.2",
23-
"illuminate/database": "^v12.0.1"
23+
"illuminate/database": "^v12.2.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

‎packages/ETags/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"aedart/athenaeum-streams": "^9.2",
2424
"aedart/athenaeum-support": "^9.2",
2525
"aedart/athenaeum-utils": "^9.2",
26-
"illuminate/http": "^v12.0.1",
26+
"illuminate/http": "^v12.2.0",
2727
"ramsey/http-range": "^2.0.0"
2828
},
2929
"autoload": {

‎packages/Events/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"require": {
2020
"php": "^8.3",
2121
"aedart/athenaeum-support": "^9.2",
22-
"illuminate/events": "^v12.0.1"
22+
"illuminate/events": "^v12.2.0"
2323
},
2424
"autoload": {
2525
"psr-4": {

‎packages/Filters/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"aedart/athenaeum-support": "^9.2",
2525
"aedart/athenaeum-utils": "^9.2",
2626
"aedart/athenaeum-validation": "^9.2",
27-
"illuminate/http": "^v12.0.1",
28-
"illuminate/pipeline": "^v12.0.1"
27+
"illuminate/http": "^v12.2.0",
28+
"illuminate/pipeline": "^v12.2.0"
2929
},
3030
"autoload": {
3131
"psr-4": {

‎packages/Flysystem/Db/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"aedart/athenaeum-container": "^9.2",
2323
"aedart/athenaeum-database": "^9.2",
2424
"aedart/athenaeum-streams": "^9.2",
25-
"illuminate/console": "^v12.0.1",
25+
"illuminate/console": "^v12.2.0",
2626
"league/flysystem": "^3.29.1"
2727
},
2828
"require-dev": {

‎packages/Http/Api/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"aedart/athenaeum-etags": "^9.2",
2323
"aedart/athenaeum-support": "^9.2",
2424
"aedart/athenaeum-validation": "^9.2",
25-
"illuminate/http": "^v12.0.1",
25+
"illuminate/http": "^v12.2.0",
2626
"shrikeh/teapot": "^3.0.0"
2727
},
2828
"autoload": {

‎packages/Http/Clients/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"aedart/athenaeum-http-messages": "^9.2",
2626
"aedart/athenaeum-support": "^9.2",
2727
"guzzlehttp/guzzle": "^7.9.2",
28-
"illuminate/pipeline": "^v12.0.1",
28+
"illuminate/pipeline": "^v12.2.0",
2929
"psr/http-client": "^1.0.3",
3030
"psr/http-factory": "^1.1.0",
3131
"psr/http-message": "^2.0",

‎packages/Streams/src/Stream.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Stream implements StreamInterface
4949
/**
5050
* The actual resource stream
5151
*
52-
* @var resource
52+
* @var resource|null
5353
*/
5454
protected $stream;
5555

@@ -169,12 +169,12 @@ public function detach()
169169
}
170170

171171
$resource = $this->stream;
172-
unset(
173-
$this->stream,
174-
$this->meta,
175-
$this->isReadable,
176-
$this->isWritable
177-
);
172+
173+
// Reset properties.
174+
$this->stream = null;
175+
$this->setMetaRepository();
176+
$this->isReadable = null;
177+
$this->isWritable = null;
178178

179179
return $resource;
180180
}

0 commit comments

Comments
 (0)