Minor refactoring

meritoo · Jun 4, 2019 · ae39426 · ae39426
1 parent bb09236
commit ae39426
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/DependencyInjection/Base/BaseExtension.php b/src/DependencyInjection/Base/BaseExtension.php
@@ -146,26 +146,26 @@ protected function getKeysToStopLoadingParametersOn(): array
      */
     private function loadServices(ContainerBuilder $container): BaseExtension
     {
-        $services = $this->getServicesFileName();
-        $servicesWithExtension = $this->verifyServicesFileExtension($services);
+        $name = $this->getServicesFileName();
+        $nameWithExtension = $this->getConfigurationFileWithExtension($name);
 
-        return $this->loadConfigurationFile($container, $servicesWithExtension);
+        return $this->loadConfigurationFile($container, $nameWithExtension);
     }
 
     /**
-     * Verifies if given services' configuration file has extension. If not, the default extension of configuration
-     * files will be used (".yaml" extension).
+     * Returns name of given configuration file with extension.
+     * If the file name does not contain extension, default extension will be used (the ".yaml" extension).
      *
-     * @param string $fileName Name of configuration file
+     * @param string $fileName Name of configuration file (with or without extension)
      * @return string
      */
-    private function verifyServicesFileExtension(string $fileName): string
+    private function getConfigurationFileWithExtension(string $fileName): string
     {
         $fileExtension = Miscellaneous::getFileExtension($fileName);
 
         // Use the default extension, if extension of configuration file is unknown
         if (empty($fileExtension)) {
-            $fileName = Miscellaneous::includeFileExtension($fileName, static::CONFIGURATION_DEFAULT_EXTENSION);
+            return Miscellaneous::includeFileExtension($fileName, static::CONFIGURATION_DEFAULT_EXTENSION);
         }
 
         return $fileName;

diff --git a/tests/DependencyInjection/Base/BaseExtensionTest.php b/tests/DependencyInjection/Base/BaseExtensionTest.php
@@ -28,7 +28,7 @@
  * @copyright Meritoo <http://www.meritoo.pl>
  *
  * @internal
- * @covers \Meritoo\CommonBundle\DependencyInjection\Base\BaseExtension
+ * @covers    \Meritoo\CommonBundle\DependencyInjection\Base\BaseExtension
  */
 class BaseExtensionTest extends BaseTestCase
 {