diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
| commit | 2bae9d90f860f3ccc5598420eb978cafd598451e (patch) | |
| tree | b742afddcfc882de15b9c075522cee4eae680db6 /misc | |
| parent | 41b579a9d94a05f7c0cb2e42bf7c03c2d374ed95 (diff) | |
merge master => 3.0
Diffstat (limited to 'misc')
| m--------- | misc/log-analytics | 0 | ||||
| -rw-r--r-- | misc/phpstorm-codestyles/Piwik_codestyle.xml | 34 | ||||
| -rw-r--r-- | misc/phpstorm-codestyles/README.md | 21 |
3 files changed, 0 insertions, 55 deletions
diff --git a/misc/log-analytics b/misc/log-analytics -Subproject f0d8d9722962275ff72316904d82a35bc78930c +Subproject f15f7271439380dbc7366aa117d3c8add358c26 diff --git a/misc/phpstorm-codestyles/Piwik_codestyle.xml b/misc/phpstorm-codestyles/Piwik_codestyle.xml deleted file mode 100644 index e863de94cd..0000000000 --- a/misc/phpstorm-codestyles/Piwik_codestyle.xml +++ /dev/null @@ -1,34 +0,0 @@ -<code_scheme name="Piwik-codestyle"> - <option name="LINE_SEPARATOR" value=" " /> - <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="LESS"> - <indentOptions> - <option name="INDENT_SIZE" value="4" /> - </indentOptions> - </codeStyleSettings> - <codeStyleSettings language="PHP"> - <option name="BLANK_LINES_AFTER_PACKAGE" value="1" /> - <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" /> - <arrangement> - <groups> - <group> - <type>DEPENDENT_METHODS</type> - <order>BREADTH_FIRST</order> - </group> - </groups> - </arrangement> - </codeStyleSettings> -</code_scheme>
\ No newline at end of file diff --git a/misc/phpstorm-codestyles/README.md b/misc/phpstorm-codestyles/README.md deleted file mode 100644 index 020f5d1cc8..0000000000 --- a/misc/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 `~/.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/phpstorm-codestyles/Piwik_codestyle.xml ~/.WebIde80/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: [Piwik Coding standards](http://developer.piwik.org/guides/contributing-to-piwik-core#piwik-core-code-standards) - |