8000 Implement PSR-11 · symfony/symfony@bde0efd · GitHub
[go: up one dir, main page]
Skip to content

Commit bde0efd

Browse files
greg0iregreg0ire
committed
Implement PSR-11
Delegate lookup is optional and thus, not implemented.
1 parent 46daa35 commit bde0efd

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

‎composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"doctrine/common": "~2.4",
2121
"twig/twig": "~1.28|~2.0",
2222
"psr/cache": "~1.0",
23+
"psr/container": "^1.0",
2324
"psr/log": "~1.0",
2425
"psr/simple-cache": "^1.0",
2526
"symfony/polyfill-intl-icu": "~1.0",
@@ -102,6 +103,7 @@
102103
},
103104
"provide": {
104105
"psr/cache-implementation": "1.0",
106+
"psr/container-implementation": "1.0",
105107
"psr/simple-cache-implementation": "1.0"
106108
},
107109
"autoload": {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<argument type="collection" />
4141
</service>
4242

43+
<service id="Psr\Container\ContainerInterface" alias="service_container" public="false" />
4344
<service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false" />
4445
<service id="Symfony\Component\DependencyInjection\Container" alias="service_container" public="false" />
4546

‎src/Symfony/Component/DependencyInjection/ContainerInterface.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\DependencyInjection;
1313

14+
use Psr\Container\ContainerInterface as PsrContainerInterface;
1415
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
1516
use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
1617
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -21,7 +22,7 @@
2122
* @author Fabien Potencier <fabien@symfony.com>
2223
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
2324
*/
24-
interface ContainerInterface
25+
interface ContainerInterface extends PsrContainerInterface
2526
{
2627
const EXCEPTION_ON_INVALID_REFERENCE = 1;
2728
const NULL_ON_INVALID_REFERENCE = 2;

‎src/Symfony/Component/DependencyInjection/Exception/ExceptionInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Exception;
1313

14+
use Psr\Container\ContainerExceptionInterface;
15+
1416
/**
1517
* Base ExceptionInterface for Dependency Injection component.
1618
*
1719
* @author Fabien Potencier <fabien@symfony.com>
1820
* @author Bulat Shakirzyanov <bulat@theopenskyproject.com>
1921
*/
20-
interface ExceptionInterface
22+
interface ExceptionInterface extends ContainerExceptionInterface
2123
{
2224
}

‎src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Exception;
1313

14+
use Psr\Container\NotFoundExceptionInterface;
15+
1416
/**
1517
* This exception is thrown when a non-existent service is requested.
1618
*
1719
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
1820
*/
19-
class ServiceNotFoundException extends InvalidArgumentException
21+
class ServiceNotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface
2022
{
2123
private $id;
2224
private $sourceId;

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9"
19+
"php": ">=5.5.9",
20+
"psr/container": "^1.0"
2021
},
2122
"require-dev": {
2223
"symfony/yaml": "~3.2",
@@ -32,6 +33,9 @@
3233
"conflict": {
3334
"symfony/yaml": "<3.2"
3435
},
36+
"provide": {
37+
"psr/container-implementation": "1.0"
38+
},
3539
"autoload": {
3640
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
3741
"exclude-from-classmap": [

0 commit comments

Comments
 (0)
0