Merge pull request #47 from kevinpapst/config

Fix cached config
mxgross · Sep 25, 2022 · e520e05 · e520e05
2 parents 22371fd + 457a546
commit e520e05
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 30 deletions.
diff --git a/Configuration/EasyBackupConfiguration.php b/Configuration/EasyBackupConfiguration.php
@@ -9,22 +9,20 @@
 
 namespace KimaiPlugin\EasyBackupBundle\Configuration;
 
-use App\Configuration\StringAccessibleConfigTrait;
-use App\Configuration\SystemBundleConfiguration;
+use App\Configuration\SystemConfiguration;
 
-class EasyBackupConfiguration implements SystemBundleConfiguration, \ArrayAccess
+final class EasyBackupConfiguration
 {
-    use StringAccessibleConfigTrait;
+    private $configuration;
 
-
-    public function getPrefix(): string
+    public function __construct(SystemConfiguration $configuration)
     {
-        return 'easy_backup';
+        $this->configuration = $configuration;
     }
 
     public function getMysqlDumpCommand(): string
     {
-        $config = $this->find('setting_mysqldump_command');
+        $config = $this->configuration->find('easybackup.setting_mysqldump_command');
         if (!\is_string($config)) {
             return 'NOT SET';
         }
@@ -34,7 +32,7 @@ public function getMysqlDumpCommand(): string
 
     public function getMysqlRestoreCommand(): string
     {
-        $config = $this->find('setting_mysql_restore_command');
+        $config = $this->configuration->find('easybackup.setting_mysql_restore_command');
         if (!\is_string($config)) {
             return 'NOT SET';
         }
@@ -43,8 +41,8 @@ public function getMysqlRestoreCommand(): string
     }
 
     public function getBackupDir(): string
-    {   
-        $config = $this->find('setting_backup_dir');
+    {
+        $config = $this->configuration->find('easybackup.setting_backup_dir');
         if (!\is_string($config)) {
             return 'NOT SET';
         }
@@ -54,7 +52,7 @@ public function getBackupDir(): string
 
     public function getPathsToBeBackuped(): string
     {
-        $config = $this->find('setting_paths_to_backup');
+        $config = $this->configuration->find('easybackup.setting_paths_to_backup');
         if (!\is_string($config)) {
             return 'NOT SET';
         }

diff --git a/Controller/EasyBackupController.php b/Controller/EasyBackupController.php
@@ -58,18 +58,12 @@ final class EasyBackupController extends AbstractController
      */
     private $filesystem;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    public function __construct(string $dataDirectory, EasyBackupConfiguration $configuration, LoggerInterface $logger = null)
+    public function __construct(string $dataDirectory, EasyBackupConfiguration $configuration)
     {
         $this->kimaiRootPath = dirname(dirname($dataDirectory)).DIRECTORY_SEPARATOR;
         $this->configuration = $configuration;
         $this->dbUrl = $_SERVER['DATABASE_URL'];
         $this->filesystem = new Filesystem();
-        $this->logger = $logger;
     }
 
     private function log($logLevel, $message)
@@ -296,7 +290,7 @@ public function restoreAction(Request $request)
             $this->filesystem->remove($restoreDir);
         } else {
             $this->flashError('backup.action.filename.error');
-            $this->log(self::LOG_ERRROR_PREFIX, "Backup '$backupName' not found.");
+            $this->log(self::LOG_ERROR_PREFIX, "Backup '$backupName' not found.");
         }
 
         return $this->redirectToRoute('easy_backup');
@@ -397,7 +391,7 @@ private function restoreDirsAndFiles($restoreDir)
                         $this->log(self::LOG_ERROR_PREFIX, "Unable to copy to '$filenameAbsNew'. Please check the file permissions and try it again.");
                     }
                 } else {
-                    $this->log(self::LOG_ERROR_PREFIX, "Failed to change permissions of '$filenameAbsNew' to '$filePermissions'.");
+                    $this->log(self::LOG_ERROR_PREFIX, "Failed to change permissions of '$filenameAbsNew' to '$newFilePermissions'.");
                 }
             }
         }
@@ -505,7 +499,7 @@ private function unzip($source, $destination)
             }
         } else {
             $this->flashError('backup.action.zip.error.extension');
-            $this->log(self::LOG_ERROR_PREFIX, "Extension '$zip' not found.");
+            $this->log(self::LOG_ERROR_PREFIX, "Extension ZIP not found.");
         }
 
         return false;

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -18,7 +18,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('easybackup');
         /** @var ArrayNodeDefinition $rootNode */

diff --git a/DependencyInjection/EasyBackupExtension.php b/DependencyInjection/EasyBackupExtension.php
@@ -28,7 +28,6 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $this->registerBundleConfiguration($container, $config);
-        $container->setParameter('easy_backup_settings', $config);
 
         $loader = new Loader\YamlFileLoader(
             $container,

diff --git a/EventSubscriber/MenuSubscriber.php b/EventSubscriber/MenuSubscriber.php
@@ -43,7 +43,7 @@ public static function getSubscribedEvents(): array
     /**
      * @param \App\Event\ConfigureMainMenuEvent $event
      */
-    public function onMenuConfigure(ConfigureMainMenuEvent $event)
+    public function onMenuConfigure(ConfigureMainMenuEvent $event): void
     {
         $auth = $this->security;
 

diff --git a/EventSubscriber/SystemConfigurationSubscriber.php b/EventSubscriber/SystemConfigurationSubscriber.php
@@ -25,7 +25,7 @@ public static function getSubscribedEvents()
         ];
     }
 
-    public function onSystemConfiguration(SystemConfigurationEvent $event)
+    public function onSystemConfiguration(SystemConfigurationEvent $event): void
     {
         $event->addConfiguration(
             (new SystemConfigurationModel())

diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
@@ -13,7 +13,3 @@ services:
     KimaiPlugin\EasyBackupBundle\Controller\:
         resource: '../../Controller'
         tags: ['controller.service_arguments']
-
-    KimaiPlugin\EasyBackupBundle\Configuration\EasyBackupConfiguration:
-        arguments:
-            $settings: '%easy_backup_settings%'