From 5a169ee6563c3d7a3f575979799fd0e9a6c3d208 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 4 Nov 2014 14:35:57 +0100 Subject: [PATCH] Fix "PreservingIniWriter not found" The class was renamed a few commits ago to "IniWriter" --- application/forms/Config/General/ApplicationConfigForm.php | 4 ++-- library/Icinga/Application/ApplicationBootstrap.php | 6 +++--- library/Icinga/Installation/AuthenticationStep.php | 6 +++--- library/Icinga/Installation/GeneralConfigStep.php | 4 ++-- library/Icinga/Installation/ResourceStep.php | 4 ++-- .../library/Monitoring/Installation/BackendStep.php | 6 +++--- .../library/Monitoring/Installation/InstanceStep.php | 4 ++-- .../library/Monitoring/Installation/SecurityStep.php | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php index 736975e0d..d7237bff0 100644 --- a/application/forms/Config/General/ApplicationConfigForm.php +++ b/application/forms/Config/General/ApplicationConfigForm.php @@ -9,7 +9,7 @@ use Icinga\Web\Form; use Icinga\Util\Translator; use Icinga\Data\ResourceFactory; use Icinga\Web\Form\Element\Number; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; /** * Form class to modify the general application configuration @@ -76,7 +76,7 @@ class ApplicationConfigForm extends Form 'description' => t( 'This is the global default file mode for new configuration files created by Icinga Web 2.' ), - 'value' => decoct(PreservingIniWriter::$fileMode) + 'value' => decoct(IniWriter::$fileMode) ) ) ); diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 7b7e3a396..c9403db6f 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -14,8 +14,8 @@ use Icinga\Exception\NotReadableError; use Icinga\Application\Logger; use Icinga\Util\DateTimeFactory; use Icinga\Util\Translator; +use Icinga\File\Ini\IniWriter; use Icinga\Exception\IcingaException; -use Icinga\Config\PreservingIniWriter; /** * This class bootstraps a thin Icinga application layer @@ -373,9 +373,9 @@ abstract class ApplicationBootstrap } if ($this->config->global !== null) { - PreservingIniWriter::$fileMode = octdec($this->config->global->get('filemode', '0664')); + IniWriter::$fileMode = octdec($this->config->global->get('filemode', '0664')); } else { - PreservingIniWriter::$fileMode = 0664; + IniWriter::$fileMode = 0664; } return $this; diff --git a/library/Icinga/Installation/AuthenticationStep.php b/library/Icinga/Installation/AuthenticationStep.php index 17826820b..ea2e096cc 100644 --- a/library/Icinga/Installation/AuthenticationStep.php +++ b/library/Icinga/Installation/AuthenticationStep.php @@ -8,8 +8,8 @@ use Exception; use Zend_Config; use Icinga\Web\Setup\Step; use Icinga\Application\Config; +use Icinga\File\Ini\IniWriter; use Icinga\Data\ResourceFactory; -use Icinga\Config\PreservingIniWriter; use Icinga\Authentication\Backend\DbUserBackend; class AuthenticationStep extends Step @@ -50,7 +50,7 @@ class AuthenticationStep extends Step } try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($config), 'filename' => Config::resolvePath('authentication.ini'), 'filemode' => octdec($this->data['fileMode']) @@ -74,7 +74,7 @@ class AuthenticationStep extends Step ); try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($config), 'filename' => Config::resolvePath('permissions.ini'), 'filemode' => octdec($this->data['fileMode']) diff --git a/library/Icinga/Installation/GeneralConfigStep.php b/library/Icinga/Installation/GeneralConfigStep.php index 73f0bde49..725c7ffab 100644 --- a/library/Icinga/Installation/GeneralConfigStep.php +++ b/library/Icinga/Installation/GeneralConfigStep.php @@ -9,7 +9,7 @@ use Zend_Config; use Icinga\Logger\Logger; use Icinga\Web\Setup\Step; use Icinga\Application\Config; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; class GeneralConfigStep extends Step { @@ -36,7 +36,7 @@ class GeneralConfigStep extends Step } try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($config), 'filename' => Config::resolvePath('config.ini'), 'filemode' => octdec($this->data['fileMode']) diff --git a/library/Icinga/Installation/ResourceStep.php b/library/Icinga/Installation/ResourceStep.php index d51d38bc4..606d7c6a7 100644 --- a/library/Icinga/Installation/ResourceStep.php +++ b/library/Icinga/Installation/ResourceStep.php @@ -8,7 +8,7 @@ use Exception; use Zend_Config; use Icinga\Web\Setup\Step; use Icinga\Application\Config; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; class ResourceStep extends Step { @@ -39,7 +39,7 @@ class ResourceStep extends Step } try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($resourceConfig), 'filename' => Config::resolvePath('resources.ini'), 'filemode' => octdec($this->data['fileMode']) diff --git a/modules/monitoring/library/Monitoring/Installation/BackendStep.php b/modules/monitoring/library/Monitoring/Installation/BackendStep.php index f16cadc23..ae48269b9 100644 --- a/modules/monitoring/library/Monitoring/Installation/BackendStep.php +++ b/modules/monitoring/library/Monitoring/Installation/BackendStep.php @@ -8,7 +8,7 @@ use Exception; use Zend_Config; use Icinga\Web\Setup\Step; use Icinga\Application\Config; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; class BackendStep extends Step { @@ -39,7 +39,7 @@ class BackendStep extends Step ); try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($config), 'filename' => Config::resolvePath('modules/monitoring/backends.ini'), 'filemode' => octdec($this->data['fileMode']) @@ -64,7 +64,7 @@ class BackendStep extends Step $config = Config::app('resources', true); $config->merge(new Zend_Config(array($resourceName => $resourceConfig))); - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => $config, 'filename' => Config::resolvePath('resources.ini'), 'filemode' => octdec($this->data['fileMode']) diff --git a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php b/modules/monitoring/library/Monitoring/Installation/InstanceStep.php index a86fe060d..fa9b58f18 100644 --- a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php +++ b/modules/monitoring/library/Monitoring/Installation/InstanceStep.php @@ -8,7 +8,7 @@ use Exception; use Zend_Config; use Icinga\Web\Setup\Step; use Icinga\Application\Config; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; class InstanceStep extends Step { @@ -28,7 +28,7 @@ class InstanceStep extends Step unset($instanceConfig['name']); try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config(array($instanceName => $instanceConfig)), 'filename' => Config::resolvePath('modules/monitoring/instances.ini'), 'filemode' => octdec($this->data['fileMode']) diff --git a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php index d070e7dc6..24239dd6c 100644 --- a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php +++ b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php @@ -8,7 +8,7 @@ use Exception; use Zend_Config; use Icinga\Web\Setup\Step; use Icinga\Application\Config; -use Icinga\Config\PreservingIniWriter; +use Icinga\File\Ini\IniWriter; class SecurityStep extends Step { @@ -27,7 +27,7 @@ class SecurityStep extends Step $config['security'] = $this->data['securityConfig']; try { - $writer = new PreservingIniWriter(array( + $writer = new IniWriter(array( 'config' => new Zend_Config($config), 'filename' => Config::resolvePath('modules/monitoring/config.ini'), 'filemode' => octdec($this->data['fileMode'])