Updating container code

cultuurnet · Apr 22, 2024 · cdae80e · cdae80e
1 parent f646ba8
commit cdae80e
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 16 deletions.
diff --git a/app/BaseServiceProvider.php b/app/BaseServiceProvider.php
@@ -12,7 +12,7 @@ abstract class BaseServiceProvider extends AbstractServiceProvider
      */
     protected function add(string $serviceName, callable $function, ?string $tag = null): void
     {
-        $definition = $this->getLeagueContainer()
+        $definition = $this->getContainer()
             ->add($serviceName, $function);
 
         if ($tag !== null) {
@@ -25,8 +25,8 @@ protected function add(string $serviceName, callable $function, ?string $tag = n
      */
     protected function addShared(string $serviceName, callable $function, ?string $tag = null): void
     {
-        $definition = $this->getLeagueContainer()
-            ->share($serviceName, $function);
+        $definition = $this->getContainer()
+            ->addShared($serviceName, $function);
 
         if ($tag !== null) {
             $definition->addTag($tag);

diff --git a/app/CommandServiceProvider.php b/app/CommandServiceProvider.php
@@ -9,10 +9,15 @@
 
 class CommandServiceProvider extends BaseServiceProvider
 {
-    protected $provides = [
+    protected array $provides = [
         Application::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->add(

diff --git a/app/CultureFeed/CultureFeedServiceProvider.php b/app/CultureFeed/CultureFeedServiceProvider.php
@@ -10,12 +10,17 @@
 
 class CultureFeedServiceProvider extends BaseServiceProvider
 {
-    protected $provides = [
+    protected array $provides = [
         ConsumerCredentials::class,
         CultureFeedFactoryInterface::class,
         UserServiceInterface::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->addShared(

diff --git a/app/Factory/ContainerFactory.php b/app/Factory/ContainerFactory.php
@@ -17,14 +17,13 @@ class ContainerFactory
     public static function forCli(Config $config): Container
     {
         $container = self::build($config);
-        $container->addServiceProvider(CommandServiceProvider::class);
+        $container->addServiceProvider(new CommandServiceProvider);
         return $container;
     }
-
     public static function forWeb(Config $config): Container
     {
         $container = self::build($config);
-        $container->addServiceProvider(RoutingServiceProvider::class);
+        $container->addServiceProvider(new RoutingServiceProvider);
         return $container;
     }
 
@@ -37,10 +36,10 @@ private static function build(Config $config): Container
             $config
         );
 
-        $container->addServiceProvider(CultureFeedServiceProvider::class);
-        $container->addServiceProvider(JwtServiceProvider::class);
-        $container->addServiceProvider(OAuthServiceProvider::class);
-        $container->addServiceProvider(RequestTokenStorageServiceProvider::class);
+        $container->addServiceProvider(new CultureFeedServiceProvider);
+        $container->addServiceProvider(new JwtServiceProvider);
+        $container->addServiceProvider(new OAuthServiceProvider);
+        $container->addServiceProvider(new RequestTokenStorageServiceProvider);
 
         return $container;
     }

diff --git a/app/Jwt/JwtServiceProvider.php b/app/Jwt/JwtServiceProvider.php
@@ -19,7 +19,7 @@
 
 class JwtServiceProvider extends BaseServiceProvider
 {
-    protected $provides = [
+    protected array $provides = [
         Builder::class,
         Signer::class,
         'jwt.keys.private',
@@ -29,6 +29,11 @@ class JwtServiceProvider extends BaseServiceProvider
         JwtDecoderServiceInterface::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->addShared(

diff --git a/app/OAuth/OAuthServiceProvider.php b/app/OAuth/OAuthServiceProvider.php
@@ -9,12 +9,17 @@
 
 class OAuthServiceProvider extends BaseServiceProvider
 {
-    protected $provides = [
+    protected array $provides = [
         OAuthService::class,
         OAuthCallbackHandlerInterface::class,
         OAuthUrlHelper::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->addShared(

diff --git a/app/RequestTokenStorage/RequestTokenStorageServiceProvider.php b/app/RequestTokenStorage/RequestTokenStorageServiceProvider.php
@@ -7,10 +7,15 @@
 
 class RequestTokenStorageServiceProvider extends BaseServiceProvider
 {
-    protected $provides = [
+    protected array $provides = [
         RequestTokenStorageInterface::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->addShared(

diff --git a/app/RoutingServiceProvider.php b/app/RoutingServiceProvider.php
@@ -10,10 +10,15 @@ class RoutingServiceProvider extends BaseServiceProvider
 {
     public const AUTHORIZATION_PATH = '/authorize';
 
-    protected $provides = [
+    protected array $provides = [
         Router::class,
     ];
 
+    public function provides(string $id): bool
+    {
+        return in_array($id, $this->provides, true);
+    }
+
     public function register(): void
     {
         $this->add(