Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfabiocarneiro <fahecs@gmail.com>2015-05-27 12:56:17 +0300
committerfabiocarneiro <fahecs@gmail.com>2015-05-27 12:56:17 +0300
commita2a63d34ebb460174e1a3e8d8022fe3e3ab4b469 (patch)
treefbfc480352bc711bc03f12849824507e56b5034a /core/Settings
parentb2f5b5489ceca056217fc6663ec6c2c6b052cd42 (diff)
fix core folder with php-cs-fixer for psr-2
Diffstat (limited to 'core/Settings')
-rw-r--r--core/Settings/Manager.php2
-rw-r--r--core/Settings/Setting.php1
-rw-r--r--core/Settings/Storage.php3
-rw-r--r--core/Settings/Storage/Factory.php1
-rw-r--r--core/Settings/Storage/StaticStorage.php2
-rw-r--r--core/Settings/UserSetting.php4
6 files changed, 4 insertions, 9 deletions
diff --git a/core/Settings/Manager.php b/core/Settings/Manager.php
index f3862989e1..e757e44d60 100644
--- a/core/Settings/Manager.php
+++ b/core/Settings/Manager.php
@@ -37,7 +37,6 @@ class Manager
}
if (empty(static::$settings)) {
-
$settings = PluginManager::getInstance()->findComponents('Settings', 'Piwik\\Plugin\\Settings');
$byPluginName = array();
@@ -155,5 +154,4 @@ class Manager
return !empty($settings);
}
-
}
diff --git a/core/Settings/Setting.php b/core/Settings/Setting.php
index 4b1b36e5a1..51e7942146 100644
--- a/core/Settings/Setting.php
+++ b/core/Settings/Setting.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Settings;
+
use Piwik\Piwik;
use Piwik\SettingsServer;
diff --git a/core/Settings/Storage.php b/core/Settings/Storage.php
index 09525cb6d3..5e3b8fc793 100644
--- a/core/Settings/Storage.php
+++ b/core/Settings/Storage.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Settings;
+
use Piwik\Option;
/**
@@ -71,7 +72,6 @@ class Storage implements StorageInterface
$this->loadSettingsIfNotDoneYet();
if (array_key_exists($setting->getKey(), $this->settingsValues)) {
-
return $this->settingsValues[$setting->getKey()];
}
@@ -140,5 +140,4 @@ class Storage implements StorageInterface
return array();
}
-
}
diff --git a/core/Settings/Storage/Factory.php b/core/Settings/Storage/Factory.php
index c007e30e9f..87d54ad3b1 100644
--- a/core/Settings/Storage/Factory.php
+++ b/core/Settings/Storage/Factory.php
@@ -25,5 +25,4 @@ class Factory
return $storage;
}
-
}
diff --git a/core/Settings/Storage/StaticStorage.php b/core/Settings/Storage/StaticStorage.php
index ada437fa1c..d8a43b6c9a 100644
--- a/core/Settings/Storage/StaticStorage.php
+++ b/core/Settings/Storage/StaticStorage.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Settings\Storage;
+
use Piwik\Settings\Storage;
/**
@@ -30,5 +31,4 @@ class StaticStorage extends Storage
public function save()
{
}
-
}
diff --git a/core/Settings/UserSetting.php b/core/Settings/UserSetting.php
index 60f63e3037..aa3a08c400 100644
--- a/core/Settings/UserSetting.php
+++ b/core/Settings/UserSetting.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Settings;
+
use Piwik\Common;
use Piwik\Piwik;
@@ -130,16 +131,13 @@ class UserSetting extends Setting
$pluginsSettings = Manager::getAllPluginSettings();
foreach ($pluginsSettings as $pluginSettings) {
-
$settings = $pluginSettings->getSettings();
foreach ($settings as $setting) {
-
if ($setting instanceof UserSetting) {
$setting->setUserLogin($userLogin);
$setting->removeValue();
}
-
}
$pluginSettings->save();