summaryrefslogtreecommitdiffstats
path: root/.idea
diff options
context:
space:
mode:
authorSimon Rettberg2017-04-21 18:23:02 +0200
committerSimon Rettberg2017-04-21 18:23:02 +0200
commited4b392bb5bfef36b847f9b89bc1d1ef19f4059c (patch)
tree683b759c1dacbe1aac4af00f1d574d929e5e8a14 /.idea
parent[inc/Dictionary] Add $returnTagOnMissing to :translateFile() (diff)
downloadslx-admin-ed4b392bb5bfef36b847f9b89bc1d1ef19f4059c.tar.gz
slx-admin-ed4b392bb5bfef36b847f9b89bc1d1ef19f4059c.tar.xz
slx-admin-ed4b392bb5bfef36b847f9b89bc1d1ef19f4059c.zip
Update phpStorm stuff
Diffstat (limited to '.idea')
-rw-r--r--.idea/codeStyleSettings.xml1
-rw-r--r--.idea/php.xml5
2 files changed, 6 insertions, 0 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 9237b675..851e676d 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -47,6 +47,7 @@
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="5" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
diff --git a/.idea/php.xml b/.idea/php.xml
index cd67c36e..4052c39a 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" />
+ <component name="PhpUnit">
+ <phpunit_settings>
+ <PhpUnitSettings />
+ </phpunit_settings>
+ </component>
</project> \ No newline at end of file