Skip to content

Commit

Permalink
- Termporary? revert attribute namespace to \bitExpert\Disco\Annotati…
Browse files Browse the repository at this point in the history
…ons (for clearer diff)

- Updated docs
- Implement v2 of psr/container
  • Loading branch information
zluiten committed Aug 17, 2021
1 parent 1c12183 commit 0efd86c
Show file tree
Hide file tree
Showing 47 changed files with 429 additions and 640 deletions.
18 changes: 6 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ Next up you need to create a configuration class `MyConfiguration` and document
```php
<?php

use bitExpert\Disco\Attributes\Configuration;
use bitExpert\Disco\Annotations\Configuration;

/**
* @Configuration
*/
#[Configuration]
class MyConfiguration
{
}
Expand All @@ -48,18 +46,14 @@ Doing this registers the instance with Disco and uses the type specified by the
```php
<?php

use bitExpert\Disco\Attributes\Bean;
use bitExpert\Disco\Attributes\Configuration;
use bitExpert\Disco\Annotations\Bean;
use bitExpert\Disco\Annotations\Configuration;
use bitExpert\Disco\Helper\SampleService;

/**
* @Configuration
*/
#[Configuration]
class MyConfiguration
{
/**
* @Bean
*/
#[Bean]
public function mySampleService() : SampleService
{
return new SampleService();
Expand Down
8 changes: 4 additions & 4 deletions Upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ While this was valid configuration code before the 0.5.0 release:
```php
<?php

use bitExpert\Disco\Attributes\Bean;
use bitExpert\Disco\Attributes\Configuration;
use bitExpert\Disco\Annotations\Bean;
use bitExpert\Disco\Annotations\Configuration;
use bitExpert\Disco\Helper\SampleService;

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

use bitExpert\Disco\Attributes\Bean;
use bitExpert\Disco\Attributes\Configuration;
use bitExpert\Disco\Annotations\Bean;
use bitExpert\Disco\Annotations\Configuration;
use bitExpert\Disco\Helper\SampleService;

/**
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"php": "^8.0.0",
"bitexpert/slf4psrlog": "^0.1.3",
"ocramius/proxy-manager": "^2.11.1",
"psr/container": "^1.1.1",
"psr/container": "^2.0.0",
"webmozart/assert": "^1.10"
},
"require-dev": {
Expand All @@ -42,8 +42,7 @@
}
},
"provide": {
"container-interop/container-interop-implementation": "^1.2",
"psr/container-implementation": "^1.0"
"psr/container-implementation": "^2.0"
},
"scripts": {
"check": [
Expand Down
Loading

0 comments on commit 0efd86c

Please sign in to comment.