Merge pull request #284 from PhileCMS/develop

Develop

Author: james2doyle

.editorconfig

@@ -1,22 +1,14 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# top-most EditorConfig file
 root = true
-charset = utf-8
-# Get rid of whitespace to avoid diffs with a bunch of EOL changes
-trim_trailing_whitespace = true
 
-# Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
 insert_final_newline = true
 
-# Tab indentation
-[*.js]
-indent_style = tab
-indent_size = 4
-
-# Indentation for PHP files
 [*.php]
-indent_style = tab
 indent_size = 4

.gitattributes

@@ -1,7 +1,9 @@
 build.xml export-ignore
+/CONTRIBUTING.md export-ignore
 Icon.png export-ignore
 phing export-ignore
 tests/ export-ignore
+.github/ export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .editorconfig export-ignore

.github/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+## Contributing
+
+Help make PhileCMS better by checking out the GitHub repository and submitting pull requests.
+
+Fork and make pull requests to the `develop` branch.
+
+[See Phile wiki for detailed info.](https://github.com/PhileCMS/Phile/wiki/%5BDEVELOPER%5D-Developer-Guidelines)
+
+If you create a plugin please add it to the [Plugin Wiki](https://github.com/PhileCMS/Phile/wiki/%5BCOMMUNITY%5D-Plugins).

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+Please report your issue with the following information:
+
+### Excpected behavior
+
+### Actual behavior
+
+### Steps to reproduce the behavior
+
+### Additional information

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+[TASK|BUGFIX|FEATURE] A meaningfull first line of your pull request
+
+Fixes: # .
+
+Changes proposed in this pull request:
+
+
+@PhileCMS/Phile please review this pull request

.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 # Env
 env:
   global:
@@ -7,10 +9,15 @@ language: php
 php:
 - 5.4
 - 5.5
-- 5.6
+
+env:
+  global:
+    - PHPCS=0
 
 matrix:
   include:
+    - php: 5.6
+      env: PHPCS=1
     - php: hhvm
       env: HHVM=1
 
@@ -33,6 +40,8 @@ before_script:
   - sh -c "if [ '$HHVM' = '1' ]; then echo 'session.gc_probability = 0' >> /etc/hhvm/php.ini; fi"
   - composer selfupdate --quiet
   - composer install -n --prefer-source --no-dev
+
+  - sh -c "if [ '$PHPCS' = '1' ]; then composer install --prefer-dist --no-interaction; fi"
 script:
 - |
   echo;
@@ -45,3 +54,4 @@ script:
       exit 99;
     fi
   "
+- sh -c "if [ '$PHPCS' = '1' ]; then lib/vendor/bin/phpcs --standard=PSR2 -p --extensions=php --ignore=lib/vendor/ lib/ plugins/phile/ .; fi"

README.md

@@ -57,7 +57,7 @@ composer create-project --no-dev phile-cms/phile
 
 Copy it to your server web root. Open the root of PhileCMS on you web server. If you are using the default MAMP install, that would be [http://localhost:8888/Phile](http://localhost:8888/Phile). Using WAMP, [http://localhost/Phile](http://localhost/Phile). If you are using something else, you probably know how to run a typical PHP site.
 
-On first run you will hit a setup page. **Follow the instructions on the [setup page](https://github.com/PhileCMS/Phile/blob/master/content/setup.md) to complete the installation**.
+On first run you will hit a setup page. **Follow the instructions on the [setup page](https://github.com/PhileCMS/Phile/blob/master/plugins/phile/setupCheck/setup.md) to complete the installation**.
 
 [For detailed instructions please see the Installation wiki page](https://github.com/PhileCMS/Phile/wiki/%5BHOW-TO%5D-Installation).
 
@@ -98,6 +98,7 @@ Issues with plugins should be reported **on the offending plugins homepage** thi
 ## Contributing
 
 Help make PhileCMS better by checking out the GitHub repository and submitting pull requests.
+See [developer guildlines](https://github.com/PhileCMS/Phile/wiki/%5BDEVELOPER%5D-Developer-Guidelines) for more information.
 
 If you create a plugin please add it to the [Plugin Wiki](https://github.com/PhileCMS/Phile/wiki/%5BCOMMUNITY%5D-Plugins).