Skip to content

Commit 0efd86c

Browse files
committed
- Termporary? revert attribute namespace to \bitExpert\Disco\Annotations (for clearer diff)
- Updated docs - Implement v2 of psr/container
1 parent 1c12183 commit 0efd86c

Some content is hidden

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

47 files changed

+429
-640
lines changed

README.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ Next up you need to create a configuration class `MyConfiguration` and document
3232
```php
3333
<?php
3434

35-
use bitExpert\Disco\Attributes\Configuration;
35+
use bitExpert\Disco\Annotations\Configuration;
3636

37-
/**
38-
* @Configuration
39-
*/
37+
#[Configuration]
4038
class MyConfiguration
4139
{
4240
}
@@ -48,18 +46,14 @@ Doing this registers the instance with Disco and uses the type specified by the
4846
```php
4947
<?php
5048

51-
use bitExpert\Disco\Attributes\Bean;
52-
use bitExpert\Disco\Attributes\Configuration;
49+
use bitExpert\Disco\Annotations\Bean;
50+
use bitExpert\Disco\Annotations\Configuration;
5351
use bitExpert\Disco\Helper\SampleService;
5452

55-
/**
56-
* @Configuration
57-
*/
53+
#[Configuration]
5854
class MyConfiguration
5955
{
60-
/**
61-
* @Bean
62-
*/
56+
#[Bean]
6357
public function mySampleService() : SampleService
6458
{
6559
return new SampleService();

Upgrade.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ While this was valid configuration code before the 0.5.0 release:
7676
```php
7777
<?php
7878

79-
use bitExpert\Disco\Attributes\Bean;
80-
use bitExpert\Disco\Attributes\Configuration;
79+
use bitExpert\Disco\Annotations\Bean;
80+
use bitExpert\Disco\Annotations\Configuration;
8181
use bitExpert\Disco\Helper\SampleService;
8282

8383
/**
@@ -101,8 +101,8 @@ This is how you have to define bean instances for the 0.5.0 release:
101101
```php
102102
<?php
103103

104-
use bitExpert\Disco\Attributes\Bean;
105-
use bitExpert\Disco\Attributes\Configuration;
104+
use bitExpert\Disco\Annotations\Bean;
105+
use bitExpert\Disco\Annotations\Configuration;
106106
use bitExpert\Disco\Helper\SampleService;
107107

108108
/**

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"php": "^8.0.0",
1818
"bitexpert/slf4psrlog": "^0.1.3",
1919
"ocramius/proxy-manager": "^2.11.1",
20-
"psr/container": "^1.1.1",
20+
"psr/container": "^2.0.0",
2121
"webmozart/assert": "^1.10"
2222
},
2323
"require-dev": {
@@ -42,8 +42,7 @@
4242
}
4343
},
4444
"provide": {
45-
"container-interop/container-interop-implementation": "^1.2",
46-
"psr/container-implementation": "^1.0"
45+
"psr/container-implementation": "^2.0"
4746
},
4847
"scripts": {
4948
"check": [

0 commit comments

Comments
 (0)