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: Move phpstorm codestyles one level up

---
 .../others/phpstorm-codestyles/Piwik_codestyle.xml | 159 ---------------------
 misc/others/phpstorm-codestyles/README.md          |  21 ---
 2 files changed, 180 deletions(-)
 delete mode 100644 misc/others/phpstorm-codestyles/Piwik_codestyle.xml
 delete mode 100644 misc/others/phpstorm-codestyles/README.md

(limited to 'misc/others')

diff --git a/misc/others/phpstorm-codestyles/Piwik_codestyle.xml b/misc/others/phpstorm-codestyles/Piwik_codestyle.xml
deleted file mode 100644
index 0fd9a921b5..0000000000
--- a/misc/others/phpstorm-codestyles/Piwik_codestyle.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="Piwik-codestyle">
-  <option name="LINE_SEPARATOR" value="&#10;" />
-  <option name="RIGHT_MARGIN" value="160" />
-  <PHPCodeStyleSettings>
-    <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
-    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
-    <option name="LOWER_CASE_NULL_CONST" value="true" />
-  </PHPCodeStyleSettings>
-  <XML>
-    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-  </XML>
-  <codeStyleSettings language="JavaScript">
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
-    <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-  </codeStyleSettings>
-  <codeStyleSettings language="PHP">
-    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-    <arrangement>
-      <groups>
-        <group>
-          <type>DEPENDENT_METHODS</type>
-          <order>BREADTH_FIRST</order>
-        </group>
-      </groups>
-      <rules>
-        <rule>
-          <match>
-            <CONST />
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PUBLIC />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PROTECTED />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PRIVATE />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PUBLIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PROTECTED />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <FIELD />
-              <PRIVATE />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <CONSTRUCTOR />
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PUBLIC />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PROTECTED />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PRIVATE />
-              <STATIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PUBLIC />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PROTECTED />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <AND>
-              <METHOD />
-              <PRIVATE />
-            </AND>
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <TRAIT />
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <INTERFACE />
-          </match>
-        </rule>
-        <rule>
-          <match>
-            <CLASS />
-          </match>
-        </rule>
-      </rules>
-    </arrangement>
-  </codeStyleSettings>
-</code_scheme>
-
diff --git a/misc/others/phpstorm-codestyles/README.md b/misc/others/phpstorm-codestyles/README.md
deleted file mode 100644
index ce4f8e94bb..0000000000
--- a/misc/others/phpstorm-codestyles/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Phpstorm has an awesome feature called "Reformat code" which reformats all PHP code to follow a particular selected coding style.
-
-Piwik uses PSR coding standard for php source code. We use a slightly customized PSR style
-(because the default PSR style in Phpstorm results in some unwanted changes).
-
-Steps:
- * Use latest Phpstorm
- * Copy this Piwik_codestyle.xml file in your  ~/.WebIde60/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`
-
- * Restart PhpStorm.
- * Select this coding in Settings>Code style.
-
-Phpstorm can also be configured to apply the style automatically before commit.
-
-You are now writing code that respects Piwik coding standards. Enjoy!
-
-Reference: http://piwik.org/participate/coding-standards/
-
-- 
cgit v1.2.3