Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Commit

Permalink
Merge pull request #714 from anchorcms/master
Browse files Browse the repository at this point in the history
Bring in `contributing.md` changes
  • Loading branch information
CraigChilds94 committed Sep 23, 2014
2 parents bda49ee + 077ee46 commit 18c1a21
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions contributing.md
Expand Up @@ -28,3 +28,11 @@ If your fork is taking a while to get merged, you might end up getting behind An


1. `git fetch upstream master` This will give you all the latest updates from Anchor's master branch. 1. `git fetch upstream master` This will give you all the latest updates from Anchor's master branch.
1. Run `git rebase upstream/master` while inside your feature branch. This will add all the new commits **before** yours, so it's as if you made the changes to the latest codebase. 1. Run `git rebase upstream/master` while inside your feature branch. This will add all the new commits **before** yours, so it's as if you made the changes to the latest codebase.

### When coding, always use coding standards
If you're familiar with open source software, you probably know how important coding guidelines and standards are. Most common are (in order of appearance) PEAR, Zend(Framework) and [PSR-1](http://www.php-fig.org/psr/psr-1)/[PSR-2](http://www.php-fig.org/psr/psr-2).

Since the [PHP-FIG](http://www.php-fig.org) and their standards gain more and more followers and Anchor uses composer, which supports PSR-0 and PSR-4, all code should follow [PSR-1](http://www.php-fig.org/psr/psr-1) and [PSR-2](http://www.php-fig.org/psr/psr-2).
More help on best practices for PHP development can be found on [PHP the right way](http://www.phptherightway.com).

When working on a file, always enforce coding standards for the whole file. This increases the consistency of the code with every contribution!

0 comments on commit 18c1a21

Please sign in to comment.