Skip to content

Commit

Permalink
Merge branch 'PKLIBS-48' into 'master'
Browse files Browse the repository at this point in the history
It's now possible to override the coding standards per project. One shouldn't bu…

…t it's useful to disable/enable experimental rules once we introduce them.

See merge request !2
  • Loading branch information
Jaap van Otterdijk committed Aug 9, 2015
2 parents 978505a + 9841b2a commit 15e770f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions build.properties.dist
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#codestyle
codestyle.standard = ${project.vendor}/polderknowledge/coding-standards/PolderKnowledge/ruleset.xml
codestyle.phpcodesniffer.enabled = true
codestyle.phpdoc.enabled = true

Expand Down
2 changes: 0 additions & 2 deletions common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
</then>
</if>


<import file="${phing.commons.root}/targets/test/phpunit.xml" />
<import file="${phing.commons.root}/targets/phpmd/phpmd.xml" />
<import file="${phing.commons.root}/targets/phpcpd/phpcpd.xml" />
Expand All @@ -64,7 +63,6 @@
<import file="${phing.commons.root}/targets/codestyle/checkstyle.xml" />
<import file="${phing.commons.root}/targets/phpdoc/phpdoc.xml" />


<target name="clean" description="cleans the workspace">
<delete dir="${project.build}" includeemptydirs="true" failonerror="false" />
</target>
Expand Down
3 changes: 2 additions & 1 deletion targets/codestyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<if>
<equals arg1="${codestyle.phpcodesniffer.enabled}" arg2="true"/>
<then>
<echo message="Checking codestyle using standard ${codestyle.standard}"/>
<phpcodesniffer
standard="${project.vendor}/polderknowledge/coding-standards/PolderKnowledge/ruleset.xml"
standard="${codestyle.standard}"
format="summary" skipversioncheck="true">
<fileset refid="${validation.fileset}"/>
<formatter type="full" usefile="false"/>
Expand Down

0 comments on commit 15e770f

Please sign in to comment.