From 0eb6f899db0ea22ec1cf2fb8dc3d5fc78ea1950d Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 12 Sep 2014 12:02:40 +1200
Subject: [PATCH] Move phpstorm codestyles one level up
---
misc/{others => }/phpstorm-codestyles/Piwik_codestyle.xml | 0
misc/{others => }/phpstorm-codestyles/README.md | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename misc/{others => }/phpstorm-codestyles/Piwik_codestyle.xml (100%)
rename misc/{others => }/phpstorm-codestyles/README.md (71%)
diff --git a/misc/others/phpstorm-codestyles/Piwik_codestyle.xml b/misc/phpstorm-codestyles/Piwik_codestyle.xml
similarity index 100%
rename from misc/others/phpstorm-codestyles/Piwik_codestyle.xml
rename to misc/phpstorm-codestyles/Piwik_codestyle.xml
diff --git a/misc/others/phpstorm-codestyles/README.md b/misc/phpstorm-codestyles/README.md
similarity index 71%
rename from misc/others/phpstorm-codestyles/README.md
rename to misc/phpstorm-codestyles/README.md
index ce4f8e94bb..0dc8868440 100644
--- a/misc/others/phpstorm-codestyles/README.md
+++ b/misc/phpstorm-codestyles/README.md
@@ -5,13 +5,13 @@ Piwik uses PSR coding standard for php source code. We use a slightly customized
Steps:
* Use latest Phpstorm
- * Copy this Piwik_codestyle.xml file in your ~/.WebIde60/config/codestyles/
+ * Copy this Piwik_codestyle.xml file in your `~/.WebIde80/config/codestyles/`
* If you use Windows or Mac see which path to copy at: http://intellij-support.jetbrains.com/entries/23358108
* To automatically link to the file in Piwik:
- `$ ln -s ~/dev/piwik-master/misc/others/phpstorm-codestyles/Piwik_codestyle.xml ~/.WebIde70/config/codestyles/Piwik_codestyle.xml`
+ `$ ln -s ~/dev/piwik-master/misc/phpstorm-codestyles/Piwik_codestyle.xml ~/.WebIde80/config/codestyles/Piwik_codestyle.xml`
- * Restart PhpStorm.
- * Select this coding in Settings>Code style.
+ * Restart PhpStorm
+ * Select this coding in Settings > Code style.
Phpstorm can also be configured to apply the style automatically before commit.
--
GitLab