Skip to content

Commit

Permalink
Merge pull request #135 from websharks/feature/134
Browse files Browse the repository at this point in the history
PR: feature/134
  • Loading branch information
jaswsinc committed Aug 23, 2016
2 parents 13dfbff + 5e9a71c commit 87877ac
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 9 deletions.
15 changes: 14 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,14 @@ Icons -export-ignore
# Export Ignore (More) -------------------------------------------------------------------------------------------------
# These are in addition to what we have in `.gitignore`.

# IDE Helpers

_ide.php export-ignore

# TODO Lists

TODO.md export-ignore

# SASS

*.scss export-ignore
Expand Down Expand Up @@ -395,8 +403,13 @@ Icons -export-ignore
/src/includes/phar-stub.php export-ignore
/src/vendor/websharks/*/src/includes/phar-stub.php export-ignore

# PsySH Stub

/src/includes/psysh-stub.php export-ignore
/src/vendor/websharks/*/src/includes/psysh-stub.php export-ignore

# LFS Storage (Assets) -------------------------------------------------------------------------------------------------
# NOTE: Here we need to match all assets explictly; i.e., requires `/**`
# NOTE: Here we need to match all assets explicitly; i.e., requires `/**`

/assets/** filter=lfs diff=lfs merge=lfs -text

Expand Down
1 change: 1 addition & 0 deletions .gitchange
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
1464312672
49dd4154d8f5d3b70691c8e3f52a063a49137fb7:57bcd244eec132.67573610
22 changes: 15 additions & 7 deletions src/psr4/setups/patterns/git/export-ignore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@
<exclude pattern="*.bak" />
<exclude pattern="**/*.bak" />

<!-- Vendor
NOT excluded here.
<exclude pattern="vendor/**" />
<exclude pattern="**/vendor/**" />
-->

<!-- Node -->

<exclude pattern="node_modules/**" />
Expand Down Expand Up @@ -181,6 +174,16 @@
<!-- These are in addition to what we have in `.gitignore`. -->
<!-- ——————————————————————————————————————————— -->

<!-- IDE Helpers -->

<exclude pattern="_ide.php" />
<exclude pattern="**/_ide.php" />

<!-- TODO Lists -->

<exclude pattern="TODO.md" />
<exclude pattern="**/TODO.md" />

<!-- SASS -->

<exclude pattern="**.scss" />
Expand Down Expand Up @@ -300,6 +303,11 @@
<exclude pattern="src/includes/phar-stub.php" />
<exclude pattern="src/vendor/websharks/*/src/includes/phar-stub.php" />

<!-- PsySH Stub -->

<exclude pattern="src/includes/psysh-stub.php" />
<exclude pattern="src/vendor/websharks/*/src/includes/psysh-stub.php" />

</patternSet>

</project>
2 changes: 1 addition & 1 deletion src/psr4/targets/linters/phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<arg value="--report=full" />
<arg value="--encoding=utf-8" />
<arg value="--extensions=php" />
<arg value="--ignore=*/vendor/*" />
<arg value="--ignore=*/vendor/*,*/_ide.php" />
<arg value="--standard=${_tmp_sub_dir}/.php-cs.ws-psr2.xml" />
<arg value="${project.basedir}/.~build/${project_slug}" />
</exec>
Expand Down

0 comments on commit 87877ac

Please sign in to comment.