Skip to content

Commit 63d4cb8

Browse files
edmondscommerceedmondscommerce
authored
Merge pull request #80 from edmondscommerce/update-php-storm-settings
Update php storm settings
2 parents abb13dd + c6da117 commit 63d4cb8

File tree

3 files changed

+236
-5
lines changed

3 files changed

+236
-5
lines changed

‎phpstorm/PHPQA_Code_Style_Scheme.xml‎

Lines changed: 228 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-
<code_scheme name="Default" version="173">
1+
<code_scheme name="PHPQA" version="173">
2+
<DBN-PSQL>
3+
<case-options enabled="false">
4+
<option name="KEYWORD_CASE" value="lower" />
5+
<option name="FUNCTION_CASE" value="lower" />
6+
<option name="PARAMETER_CASE" value="lower" />
7+
<option name="DATATYPE_CASE" value="lower" />
8+
<option name="OBJECT_CASE" value="preserve" />
9+
</case-options>
10+
<formatting-settings enabled="false" />
11+
</DBN-PSQL>
12+
<DBN-SQL>
13+
<case-options enabled="false">
14+
<option name="KEYWORD_CASE" value="lower" />
15+
<option name="FUNCTION_CASE" value="lower" />
16+
<option name="PARAMETER_CASE" value="lower" />
17+
<option name="DATATYPE_CASE" value="lower" />
18+
<option name="OBJECT_CASE" value="preserve" />
19+
</case-options>
20+
<formatting-settings enabled="false">
21+
<option name="STATEMENT_SPACING" value="one_line" />
22+
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
23+
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
24+
</formatting-settings>
25+
</DBN-SQL>
226
<PHPCodeStyleSettings>
327
<option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
428
<option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
@@ -11,13 +35,36 @@
1135
<option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
1236
<option name="LOWER_CASE_NULL_CONST" value="true" />
1337
<option name="ELSE_IF_STYLE" value="COMBINE" />
14-
<option name="FIELDS_DEFAULT_VISIBILITY" value="protected" />
1538
<option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
1639
<option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
1740
<option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
1841
<option name="ALIGN_CLASS_CONSTANTS" value="true" />
1942
<option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
2043
</PHPCodeStyleSettings>
44+
<DBN-PSQL>
45+
<case-options enabled="false">
46+
<option name="KEYWORD_CASE" value="lower" />
47+
<option name="FUNCTION_CASE" value="lower" />
48+
<option name="PARAMETER_CASE" value="lower" />
49+
<option name="DATATYPE_CASE" value="lower" />
50+
<option name="OBJECT_CASE" value="preserve" />
51+
</case-options>
52+
<formatting-settings enabled="false" />
53+
</DBN-PSQL>
54+
<DBN-SQL>
55+
<case-options enabled="false">
56+
<option name="KEYWORD_CASE" value="lower" />
57+
<option name="FUNCTION_CASE" value="lower" />
58+
<option name="PARAMETER_CASE" value="lower" />
59+
<option name="DATATYPE_CASE" value="lower" />
60+
<option name="OBJECT_CASE" value="preserve" />
61+
</case-options>
62+
<formatting-settings enabled="false">
63+
<option name="STATEMENT_SPACING" value="one_line" />
64+
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
65+
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
66+
</formatting-settings>
67+
</DBN-SQL>
2168
<codeStyleSettings language="PHP">
2269
<option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
2370
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
@@ -48,5 +95,184 @@
4895
<option name="WHILE_BRACE_FORCE" value="3" />
4996
<option name="FOR_BRACE_FORCE" value="3" />
5097
<option name="WRAP_ON_TYPING" value="0" />
98+
<arrangement>
99+
<groups />
100+
<rules>
101+
<section>
102+
<rule>
103+
<match>
104+
<CONST>true</CONST>
105+
</match>
106+
</rule>
107+
</section>
108+
<section>
109+
<rule>
110+
<match>
111+
<AND>
112+
<FIELD>true</FIELD>
113+
<PUBLIC>true</PUBLIC>
114+
</AND>
115+
</match>
116+
</rule>
117+
</section>
118+
<section>
119+
<rule>
120+
<match>
121+
<AND>
122+
<FIELD>true</FIELD>
123+
<PROTECTED>true</PROTECTED>
124+
</AND>
125+
</match>
126+
</rule>
127+
</section>
128+
<section>
129+
<rule>
130+
<match>
131+
<AND>
132+
<FIELD>true</FIELD>
133+
<PRIVATE>true</PRIVATE>
134+
</AND>
135+
</match>
136+
</rule>
137+
</section>
138+
<section>
139+
<rule>
140+
<match>
141+
<CONSTRUCTOR>true</CONSTRUCTOR>
142+
</match>
143+
</rule>
144+
</section>
145+
<section start_comment="//PHP Unit helper methods" end_comment="//PHP Unit helper methods end">
146+
<rule>
147+
<match>
148+
<AND>
149+
<METHOD>true</METHOD>
150+
<NAME>setupAfterContainer</NAME>
151+
<PUBLIC>true</PUBLIC>
152+
</AND>
153+
</match>
154+
</rule>
155+
<rule>
156+
<match>
157+
<AND>
158+
<METHOD>true</METHOD>
159+
<NAME>setUpBeforeClass</NAME>
160+
<PUBLIC>true</PUBLIC>
161+
<STATIC>true</STATIC>
162+
</AND>
163+
</match>
164+
</rule>
165+
<rule>
166+
<match>
167+
<AND>
168+
<METHOD>true</METHOD>
169+
<NAME>setUp</NAME>
170+
<PUBLIC>true</PUBLIC>
171+
</AND>
172+
</match>
173+
</rule>
174+
<rule>
175+
<match>
176+
<AND>
177+
<METHOD>true</METHOD>
178+
<NAME>tearDown</NAME>
179+
<PUBLIC>true</PUBLIC>
180+
</AND>
181+
</match>
182+
</rule>
183+
<rule>
184+
<match>
185+
<AND>
186+
<METHOD>true</METHOD>
187+
<NAME>tearDownAfterClass</NAME>
188+
<PUBLIC>true</PUBLIC>
189+
<STATIC>true</STATIC>
190+
</AND>
191+
</match>
192+
</rule>
193+
</section>
194+
<section start_comment="//PHP Unit Tests" end_comment="//PHP Unit Tests end">
195+
<rule>
196+
<match>
197+
<AND>
198+
<METHOD>true</METHOD>
199+
<NAME>itThrows.*</NAME>
200+
<PUBLIC>true</PUBLIC>
201+
</AND>
202+
</match>
203+
</rule>
204+
<rule>
205+
<match>
206+
<AND>
207+
<METHOD>true</METHOD>
208+
<NAME>itCan.*</NAME>
209+
<PUBLIC>true</PUBLIC>
210+
</AND>
211+
</match>
212+
<order>BY_NAME</order>
213+
</rule>
214+
<rule>
215+
<match>
216+
<AND>
217+
<METHOD>true</METHOD>
218+
<NAME>itWill.*</NAME>
219+
<PUBLIC>true</PUBLIC>
220+
</AND>
221+
</match>
222+
</rule>
223+
</section>
224+
<section>
225+
<rule>
226+
<match>
227+
<AND>
228+
<METHOD>true</METHOD>
229+
<PUBLIC>true</PUBLIC>
230+
</AND>
231+
</match>
232+
</rule>
233+
</section>
234+
<section>
235+
<rule>
236+
<match>
237+
<AND>
238+
<METHOD>true</METHOD>
239+
<PROTECTED>true</PROTECTED>
240+
</AND>
241+
</match>
242+
</rule>
243+
</section>
244+
<section>
245+
<rule>
246+
<match>
247+
<AND>
248+
<METHOD>true</METHOD>
249+
<PRIVATE>true</PRIVATE>
250+
</AND>
251+
</match>
252+
</rule>
253+
</section>
254+
<section>
255+
<rule>
256+
<match>
257+
<TRAIT>true</TRAIT>
258+
</match>
259+
</rule>
260+
</section>
261+
<section>
262+
<rule>
263+
<match>
264+
<INTERFACE>true</INTERFACE>
265+
</match>
266+
</rule>
267+
</section>
268+
<section>
269+
<rule>
270+
<match>
271+
<CLASS>true</CLASS>
272+
</match>
273+
</rule>
274+
</section>
275+
</rules>
276+
</arrangement>
51277
</codeStyleSettings>
52278
</code_scheme>

‎phpstorm/README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# PHPQA Coding Standard PHPStorm Configs
22

3-
In this folder you have 2 files that both acheive the same things
3+
In this folder you have 2 files that both acheive the same things, and one that does something different
44

5-
First is a settings export that just contains code style. We might extend this with other relevant settings
5+
## Code Styles
66

7-
The second is just the code style edit itself.
7+
The first [jar file](./settings-code-style.jar) is a settings export that just contains code style.
8+
The [XML file](./PHPQA_Code_Style_Scheme.xml) is just the code style edit itself.
9+
10+
## Template Settings
11+
12+
The second [jar file](./fileTemplates.jar) is a templates export file. It will set sane defaults for PHP and Bash files
813

914

1015
## Importing Settings

‎phpstorm/fileTemplates.jar‎

3.41 KB
Binary file not shown.

0 commit comments

Comments
 (0)