PHP-DI · mnapoli · Jan 12, 2023 · Aug 1, 2020 · Aug 1, 2020 · Aug 1, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,10 +16,10 @@ jobs:
         timeout-minutes: 15
         strategy:
             matrix:
-                php: [ '7.4', '8.0', '8.1' ]
+                php: [ '8.0', '8.1' ]
                 dependency-version: [ '' ]
                 include:
-                    -   php: '7.4'
+                    -   php: '8.0'
                         dependency-version: '--prefer-lowest'
         steps:
             -   name: Checkout
@@ -30,6 +30,9 @@ jobs:
                     php-version: ${{ matrix.php }}
                     tools: composer:v2
                     coverage: none
+                    # Enable apcu
+                    extensions: apcu
+                    ini-values: apc.enable_cli=1
             -   name: Cache Composer dependencies
                 uses: actions/cache@v2
                 with:
@@ -41,10 +44,7 @@ jobs:
                 run: composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
             -   name: 'Install PHP dependencies on PHP 8.1 (TODO: remove that)'
                 if: matrix.php == '8.1'
-                run: |
-                    # Install Composer 2
-                    composer self-update --snapshot
-                    composer update --ignore-platform-reqs ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
+                run: composer update --ignore-platform-reqs ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
             -   name: PHPUnit
                 run: vendor/bin/phpunit
 
@@ -57,8 +57,8 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
-                    tools: composer, cs2pr
+                    php-version: 8.0
+                    tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
                 uses: actions/cache@v2
@@ -71,17 +71,16 @@ jobs:
             -   name: PHP CS Fixer
                 run: vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
 
-    phpstan:
-        name: PHPStan
+    psalm:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
                 uses: actions/checkout@v2
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
-                    tools: composer, cs2pr
+                    php-version: 8.0
+                    tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
                 uses: actions/cache@v2
@@ -91,5 +90,5 @@ jobs:
                     restore-keys: php-composer-locked-
             -   name: Install PHP dependencies
                 run: composer install --no-interaction --no-progress --no-suggest
-            -   name: PHPStan
-                run: vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr
+            -   name: Psalm
+                run: vendor/bin/psalm --output-format=checkstyle | cs2pr
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -3,50 +3,55 @@
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/src')
     ->notPath('Compiler/Template.php');
+$config = new PhpCsFixer\Config;
 
-return (new PhpCsFixer\Config)
-    ->setRules([
-        '@PSR2' => true,
-        '@PHP70Migration' => true,
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'braces' => [
-            'allow_single_line_closure' => true,
-        ],
-        'concat_space' => [
-            'spacing' => 'one',
-        ],
-        //'declare_strict_types' => true,
-        'heredoc_to_nowdoc' => true,
-        'linebreak_after_opening_tag' => true,
-        'new_with_braces' => false,
-        'multiline_whitespace_before_semicolons' => false,
-        'no_php4_constructor' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => true,
-        'php_unit_strict' => true,
-        'phpdoc_add_missing_param_annotation' => false,
-        'phpdoc_align' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'phpdoc_separation' => false,
-        'phpdoc_to_comment' => false,
-        'phpdoc_var_without_name' => true,
-        'pow_to_exponentiation' => true,
-        'unary_operator_spaces' => false,
-        'return_type_declaration' => [
-            'space_before' => 'one',
-        ],
-        'semicolon_after_instruction' => true,
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'yoda_style' => false,
-        'native_function_invocation' => false,
-        'single_line_throw' => false,
-        'blank_line_between_import_groups' => false,
+return $config->setRules([
+    '@PSR2' => true,
+    '@PHP70Migration' => true,
+    '@PHP71Migration' => true,
+    '@PHP73Migration' => true,
+    '@PHP74Migration' => true,
+    '@PHP80Migration' => true,
+    '@Symfony' => true,
+    '@Symfony:risky' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'braces' => [
+        'allow_single_line_closure' => true,
+    ],
+    'concat_space' => [
+        'spacing' => 'one',
+    ],
+    'declare_strict_types' => true,
+    'heredoc_to_nowdoc' => true,
+    'linebreak_after_opening_tag' => true,
+    'new_with_braces' => false,
+    'multiline_whitespace_before_semicolons' => false,
+    'no_php4_constructor' => true,
+    'no_unreachable_default_argument_value' => true,
+    'no_useless_else' => true,
+    'no_useless_return' => true,
+    'ordered_imports' => true,
+    'php_unit_strict' => false,
+    'phpdoc_add_missing_param_annotation' => false,
+    'phpdoc_align' => false,
+    'phpdoc_annotation_without_dot' => false,
+    'phpdoc_separation' => false,
+    'phpdoc_to_comment' => false,
+    'phpdoc_var_without_name' => true,
+    'pow_to_exponentiation' => true,
+    'unary_operator_spaces' => false,
+    'return_type_declaration' => [
+        'space_before' => 'one',
+    ],
+    'semicolon_after_instruction' => true,
+    'strict_comparison' => true,
+    'strict_param' => true,
+    'yoda_style' => false,
+    'native_function_invocation' => false,
+    'single_line_throw' => false,
+    'php_unit_method_casing' => false,
+    'blank_line_between_import_groups' => false,
         'global_namespace_import' => false,
-    ])
+])
     ->setRiskyAllowed(true)
     ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -21,29 +21,25 @@
     },
     "scripts": {
         "test": "phpunit",
-        "format-code": "php-cs-fixer fix --allow-risky=yes",
-        "phpstan": "phpstan analyse -l 5 -c phpstan.neon src"
+        "format-code": "php-cs-fixer fix --allow-risky=yes"
     },
     "require": {
-        "php": ">=7.4.0",
-        "psr/container": "^1.0",
+        "php": ">=8.0",
+        "psr/container": "^1.1 || ^2.0",
         "php-di/invoker": "^2.0",
-        "php-di/phpdoc-reader": "^2.0.1",
         "laravel/serializable-closure": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "mnapoli/phpunit-easymock": "^1.2",
-        "doctrine/annotations": "~1.10",
+        "mnapoli/phpunit-easymock": "^1.3",
         "ocramius/proxy-manager": "^2.11.2",
         "friendsofphp/php-cs-fixer": "^3",
-        "phpstan/phpstan": "^1.9"
+        "vimeo/psalm": "^4.6"
     },
     "provide": {
         "psr/container-implementation": "^1.0"
     },
     "suggest": {
-        "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
-        "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)"
+        "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ^2.3)"
     }
 }
diff --git a/couscous.yml b/couscous.yml
@@ -46,6 +46,9 @@ menu:
                 php-definitions:
                     text: PHP definitions
                     url: doc/php-definitions.html
+                attributes:
+                    text: PHP attributes
+                    url: doc/attributes.html
                 annotations:
                     text: Annotations
                     url: doc/annotations.html

diff --git a/doc/README.md b/doc/README.md
@@ -19,7 +19,7 @@ title: Documentation index
 * [Introduction](definition.md)
 * [Autowiring](autowiring.md)
 * [PHP definitions](php-definitions.md)
-* [Annotations](annotations.md)
+* [Attributes](attributes.md)
 * [Definition extensions and overriding](definition-overriding.md)
 
 ### Frameworks integration
@@ -45,6 +45,7 @@ title: Documentation index
 * [Migration from PHP-DI 3.x to 4.0](migration/4.0.md)
 * [Migration from PHP-DI 4.x to 5.0](migration/5.0.md)
 * [Migration from PHP-DI 5.x to 6.0](migration/6.0.md)
+* [Migration from PHP-DI 6.x to 7.0](migration/7.0.md)
 
 ### Internals
 

diff --git a/doc/annotations.md b/doc/annotations.md
@@ -5,142 +5,4 @@ current_menu: annotations
 
 # Annotations
 
-On top of [autowiring](autowiring.md) and [PHP configuration files](php-definitions.md), you can define injections using annotations.
-
-Using annotations do not affect performances when [compiling the container](performances.md).
-
-## Installation
-
-Annotations **are disabled by default**. To be able to use them, you first need to install the [Doctrine Annotations](http://doctrine-common.readthedocs.org/en/latest/reference/annotations.html) library using Composer:
-
-```
-composer require doctrine/annotations
-```
-
-Then you need to [configure the `ContainerBuilder`](container-configuration.md) to use them:
-
-```php
-$containerBuilder->useAnnotations(true);
-```
-
-Annotations are written in PHP docblock comments. They are used by a lot of modern libraries and frameworks, like [Doctrine](http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/index.html), [Symfony](http://symfony.com/), [PHPUnit](http://www.phpunit.de/)…
-
-## @Inject
-
-`@Inject` lets you define where PHP-DI should inject something, and what it should inject. You can optionally combine it with `@var` and `@param` phpdoc tags to define what should be injected.
-
-It can be used on:
-
-- the constructor (constructor injection)
-- methods (setter/method injection)
-- properties (property injection)
-
-*Note: property injections occur after the constructor is executed, so any injectable property will be null inside `__construct`.*
-
-Here is an example of all possible uses of the `@Inject` annotation:
-
-```php
-class Example
-{
-    /**
-     * Annotation combined with phpdoc:
-     *
-     * @Inject
-     * @var Foo
-     */
-    private $property1;
-
-    /**
-     * Explicit definition of the entry to inject:
-     *
-     * @Inject("db.host")
-     */
-    private $property2;
-
-    /**
-     * Annotation combined with phpdoc:
-     *
-     * @Inject
-     * @param Foo $param1
-     * @param Bar $param2
-     */
-    public function __construct($param1, $param2)
-    {
-    }
-
-    /**
-     * Annotation combined with the type-hint:
-     *
-     * @Inject
-     */
-    public function method1(Foo $param)
-    {
-    }
-
-    /**
-     * Explicit definition of the entries to inject:
-     *
-     * @Inject({"db.host", "db.name"})
-     */
-    public function method2($param1, $param2)
-    {
-    }
-
-    /**
-     * Explicit definition of parameters by their name:
-     *
-     * @Inject({"param2" = "db.host"})
-     */
-    public function method3(Foo $param1, $param2)
-    {
-    }
-}
-```
-
-*Note: importing annotations with `use DI\Annotation\Inject;` is optional.*
-
-### Troubleshooting @Inject
-
-- you must use double quotes (`"`) instead of single quotes(`'`), for example: `@Inject("foo")`
-- what's inside `@Inject()` must be in quotes, even if it's a class name: `@Inject("Acme\Blog\ArticleRepository")`
-- when using `@Inject` in combination with `@var` or `@param`, make sure the class name is correctly imported if using namespaces (a good IDE will show warnings if not)
-- `@Inject` is not meant to be used on the method to call with [`Container::call()`](container.md#call) (it will be ignored)
-
-## Injectable
-
-The `@Injectable` annotation lets you set options on injectable classes:
-
-```php
-/**
- * @Injectable(lazy=true)
- */
-class Example
-{
-}
-```
-
-**The `@Injectable` annotation is optional: by default, all classes are injectable.**
-
-## Limitations
-
-There are things that can't be defined with annotations:
-
-- values (instead of classes)
-- mapping interfaces to implementations
-- defining entries with an anonymous function
-
-For that, you can combine annotations with [definitions in PHP](php-definitions.md).
-
-## Troubleshooting
-
-Since annotations are in PHP docblocks, the opcache option `opcache.save_comments` must be set to `1`. If it is set to `0`, comments will be stripped from the source code and annotations will not work.
-
-The default value for this option is `1` so everything should work by default.
-
-To check the value of this option, you can run the following command:
-
-```
-$ php -i | grep "opcache.save_comments"
-```
-
-Furthermore, please mind that annotations are case-sensitive. You should write `@Inject` and `@Injectable` instead of `@inject` and `@injectable` to avoid bugs on certain systems.
+**Since PHP-DI 7, annotations have been replaced by [PHP attributes](attributes.md).**