test: fix phpbench

Author: Chemaclass

CHANGELOG.md

@@ -229,7 +229,7 @@
 - Moved the "config readers" next to their config item itself
   - Performance improvement specially when using different config readers in the same project
 - Added OverrideResolvableTypes feature
-  - Allow overriding Gacela resolvable types (Factory, Config, AbstractProvider)
+  - Allow overriding Gacela resolvable types (Factory, Config, DependencyProvider)
 - Removed deprecated methods `getApplicationRootDir()` & `setApplicationRootDir()` from Config
   - Use `getAppRootDir()` & `setAppRootDir()` instead
 - Deprecated and removed `CustomService` feature. Use `MappingInterfaces` feature instead
@@ -303,5 +303,5 @@
 
 ## [0.1.0](https://github.com/gacela-project/gacela/compare/690484441389a2d3bd921ab7f278c6d945f50cac...0.1.0) - 2021-04-02
 
-- Added Facade, Factory, Config and AbstractProvider basic functionality
+- Added Facade, Factory, Config and DependencyProvider basic functionality
 - Provide documentation for each of these concepts with examples

README.md

@@ -38,8 +38,8 @@ It encourages your modules to interact with each other in a unified way by follo
 - Modules interact with each other **only** via their **Facade**
 - The [**Facade**](https://gacela-project.com/docs/facade/) is the *entry point* of a module
 - The [**Factory**](https://gacela-project.com/docs/factory/) manage the *intra-dependencies* the module
-- The [**AbstractProvider**](https://gacela-project.com/docs/dependency-provider/) resolves the *extra-dependencies* of the module
-- The [**Config**](https://gacela-project.com/docs/config/) has access to the project's *config files*
+- The [**Provider**](https://gacela-project.com/docs/provider/) resolves the *extra-dependencies* of the module
+- The [**Config**](https://gacela-project.com/docs/config/) access the project's *config files*
 
 ### Installation
 
@@ -70,7 +70,7 @@ application-name
 │   │   │ # These are the 4 "gacela classes":
 │   │   ├── Facade.php
 │   │   ├── Factory.php
-│   │   ├── AbstractProvider.php
+│   │   ├── Provider.php
 │   │   └── Config.php
 │   │
 │   └── ModuleB

src/Console/Domain/AllAppModules/AppModuleCreator.php

@@ -17,7 +17,7 @@ final class AppModuleCreator
     public function __construct(
         private readonly FactoryResolver $factoryResolver,
         private readonly ConfigResolver $configResolver,
-        private readonly ProviderResolver $dependencyProviderResolver,
+        private readonly ProviderResolver $providerResolver,
     ) {
     }
 
@@ -32,7 +32,7 @@ public function fromClass(string $facadeClass): AppModule
             $facadeClass,
             $this->findFactory($facadeClass),
             $this->findConfig($facadeClass),
-            $this->findAbstractProvider($facadeClass),
+            $this->findProvider($facadeClass),
         );
     }
 
@@ -89,10 +89,10 @@ private function findConfig(string $facadeClass): ?string
     /**
      * @param class-string $facadeClass
      */
-    private function findAbstractProvider(string $facadeClass): ?string
+    private function findProvider(string $facadeClass): ?string
     {
         try {
-            $resolver = $this->dependencyProviderResolver->resolve($facadeClass);
+            $resolver = $this->providerResolver->resolve($facadeClass);
 
             if ((new ReflectionClass($resolver))->isAnonymous()) {
                 throw new ProviderNotFoundException($resolver);

src/Framework/AbstractFactory.php

@@ -43,8 +43,8 @@ private function createContainerWithProvidedDependencies(): Container
     {
         $container = Container::withConfig(Config::getInstance());
 
-        $dependencyProvider = (new ProviderResolver())->resolve($this);
-        $dependencyProvider->provideModuleDependencies($container);
+        $provider = (new ProviderResolver())->resolve($this);
+        $provider->provideModuleDependencies($container);
 
         return $container;
     }

src/Framework/Bootstrap/GacelaConfig.php

@@ -120,7 +120,7 @@ public function addSuffixTypeConfig(string $suffix): self
     /**
      * Allow overriding gacela dependency provider suffixes.
      */
-    public function addSuffixTypeAbstractProvider(string $suffix): self
+    public function addSuffixTypeProvider(string $suffix): self
     {
         $this->suffixTypesBuilder->addProvider($suffix);
 

src/Framework/ClassResolver/GlobalInstance/AnonymousGlobal.php

@@ -22,7 +22,6 @@ final class AnonymousGlobal
         'Config',
         'Factory',
         'Provider',
-        'Provider',
     ];
 
     /** @var array<string,object> */

src/Framework/Config/GacelaFileConfig/GacelaConfigFileInterface.php

@@ -23,7 +23,7 @@ public function getBindings(): array;
      * @return array{
      *     Factory?:list<string>,
      *     Config?:list<string>,
-     *     AbstractProvider?:list<string>
+     *     Provider?:list<string>
      * }
      */
     public function getSuffixTypes(): array;

tests/Benchmark/Framework/ClassResolver/AnonymousGlobal/AnonymousGlobalsBench.php

@@ -32,7 +32,7 @@ public function setUp(): void
     public function bench_class_resolving(): void
     {
         $this->facade->getConfigValues();
-        $this->facade->getValueFromAbstractProvider();
+        $this->facade->getValueFromProvider();
     }
 
     private function setupAbstractConfig(): void
@@ -71,13 +71,13 @@ public function createDomainClass(): object
                     /** @var array $configValues */
                     $configValues = $this->getConfig()->getValues();
 
-                    /** @var string $valueFromAbstractProvider */
-                    $valueFromAbstractProvider = $this->getProvidedDependency('key');
+                    /** @var string $valueFromProvider */
+                    $valueFromProvider = $this->getProvidedDependency('key');
 
-                    return new class($configValues, $valueFromAbstractProvider) {
+                    return new class($configValues, $valueFromProvider) {
                         public function __construct(
                             private readonly array $configValues,
-                            private readonly string $valueFromAbstractProvider,
+                            private readonly string $valueFromProvider,
                         ) {
                         }
 
@@ -86,9 +86,9 @@ public function getConfigValues(): array
                             return $this->configValues;
                         }
 
-                        public function getValueFromAbstractProvider(): string
+                        public function getValueFromProvider(): string
                         {
-                            return $this->valueFromAbstractProvider;
+                            return $this->valueFromProvider;
                         }
                     };
                 }
@@ -106,11 +106,11 @@ public function getConfigValues(): array
                     ->getConfigValues();
             }
 
-            public function getValueFromAbstractProvider(): string
+            public function getValueFromProvider(): string
             {
                 return $this->getFactory()
                     ->createDomainClass()
-                    ->getValueFromAbstractProvider();
+                    ->getValueFromProvider();
             }
         };
     }

tests/Benchmark/Framework/ClassResolver/FileCache/FileCacheBench.php

@@ -65,11 +65,11 @@ private function gacelaBootstrapWithCache(bool $cacheEnabled): void
             $config->addSuffixTypeConfig('ConfigD');
             $config->addSuffixTypeConfig('ConfigE');
 
-            $config->addSuffixTypeAbstractProvider('DepProvA');
-            $config->addSuffixTypeAbstractProvider('DepProvB');
-            $config->addSuffixTypeAbstractProvider('DepProvC');
-            $config->addSuffixTypeAbstractProvider('DepProvD');
-            $config->addSuffixTypeAbstractProvider('DepProvE');
+            $config->addSuffixTypeProvider('DepProvA');
+            $config->addSuffixTypeProvider('DepProvB');
+            $config->addSuffixTypeProvider('DepProvC');
+            $config->addSuffixTypeProvider('DepProvD');
+            $config->addSuffixTypeProvider('DepProvE');
         });
     }
 

tests/Benchmark/Framework/ClassResolver/FileCache/ModuleF/DependencyProvider.php renamed to tests/Benchmark/Framework/ClassResolver/FileCache/ModuleF/Provider.php

@@ -7,7 +7,7 @@
 use Gacela\Framework\AbstractProvider;
 use Gacela\Framework\Container\Container;
 
-final class ModuleGAbstractProvider extends AbstractProvider
+final class ModuleGProvider extends AbstractProvider
 {
     public function provideModuleDependencies(Container $container): void
     {

tests/Benchmark/Framework/ClassResolver/FileCache/ModuleG/ModuleGDependencyProvider.php renamed to tests/Benchmark/Framework/ClassResolver/FileCache/ModuleG/ModuleGProvider.php

@@ -7,7 +7,7 @@
 use Gacela\Framework\AbstractProvider;
 use Gacela\Framework\Container\Container;
 
-final class NormalModuleAbstractProvider extends AbstractProvider
+final class NormalModuleProvider extends AbstractProvider
 {
     public function provideModuleDependencies(Container $container): void
     {

tests/Benchmark/Framework/ClassResolver/NormalModule/NormalModuleDependencyProvider.php renamed to tests/Benchmark/Framework/ClassResolver/NormalModule/NormalModuleProvider.php

@@ -12,10 +12,10 @@
         ->addSuffixTypeFacade('FacaModuleA')
         ->addSuffixTypeFactory('FactModuleA')
         ->addSuffixTypeConfig('ConfModuleA')
-        ->addSuffixTypeAbstractProvider('ProModuleA')
+        ->addSuffixTypeProvider('ProModuleA')
         // ModuleB
         ->addSuffixTypeFacade('FacadeModuleB')
         ->addSuffixTypeFactory('FactoryModuleB')
         ->addSuffixTypeConfig('ConfigModuleB')
-        ->addSuffixTypeAbstractProvider('ProviderModuleB');
+        ->addSuffixTypeProvider('ProviderModuleB');
 };

tests/Feature/Framework/UsingCustomSuffixTypes/gacela.php

@@ -11,4 +11,4 @@
     ->addSuffixTypeFacade('FacadeFromGacelaFile')
     ->addSuffixTypeFactory('FactoryFromGacelaFile')
     ->addSuffixTypeConfig('ConfigFromGacelaFile')
-    ->addSuffixTypeAbstractProvider('AbstractProviderFromGacelaFile');
+    ->addSuffixTypeProvider('AbstractProviderFromGacelaFile');

tests/Integration/Framework/Config/ConfigFactory/WithGacelaFile/gacela.php

@@ -102,7 +102,7 @@ public function test_gacela_file_set_suffix_types(): void
         $fileIo = $this->createStub(FileIoInterface::class);
         $fileIo->method('include')->willReturn(
             static fn (GacelaConfig $config): GacelaConfig => $config
-                ->addSuffixTypeAbstractProvider('Binding'),
+                ->addSuffixTypeProvider('Binding'),
         );
 
         $factory = new GacelaConfigUsingGacelaPhpFileFactory(