Merge pull request #94 from rask/feature/cs-as-dependency

Add WP Coding Standards as a dependency

Author: k1sul1

.travis.yml

@@ -14,12 +14,8 @@ before_install:
   # Update Composer
   - composer self-update
 
-  # Install phpcs with wp-coding-standards
-  - composer create-project wp-coding-standards/wpcs:0.12.0 --no-dev $HOME/wpcs
-
 script:
-  # Check project with phps
-  - ~/wpcs/vendor/bin/phpcs --extensions=php --standard=./phpcs.xml -n -p .
-
-  # Check that composer is valid and installs correctly
   - composer install -o --prefer-dist --no-interaction
+
+  # Check project with phps
+  - ./vendor/bin/phpcs -n -p .

CONTRIBUTING.md

@@ -14,15 +14,17 @@ This project comes with a phpcs configuration (`phpcs.xml`) you can use to check
 Run phpcs in the project root directory:
 
 ```
-phpcs --extensions=php --standard=./phpcs.xml -n -p .
+./vendor/bin/phpcs ./
 ```
 
-Before you can run phpcs, you need to install PHP Codesniffer and WordPress coding standards like so:
+You need to install the plugin's development dependencies before you can run the PHPCS checks. A regular
 
 ```
-composer create-project wp-coding-standards/wpcs:dev-master --no-dev $HOME/wpcs
+composer install
 ```
 
-Or read the official installation instructions here:
+should install all the required packages.
+
+You can read the official WPCS installation instructions here:
 
 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards

composer.json

@@ -12,5 +12,9 @@
   ],
   "require": {
     "php": ">=5.3.0"
+  },
+  "require-dev": {
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+    "wp-coding-standards/wpcs": "0.12.0"
   }
 }

composer.lock

@@ -2,11 +2,15 @@
 <ruleset name="anttiviljami-wordpress">
   <description>For nicer WordPress and PHP development</description>
 
-  <!-- Don't check composer dependencies -->
-  <exclude-pattern>/vendor/</exclude-pattern>
-
-  <!-- Exclude language files -->
-  <exclude-pattern>/lang/</exclude-pattern>
+  <!-- Files and directories to parse -->
+  <file>./classes/</file>
+  <file>./inc/</file>
+  <file>./wp-libre-form.php</file>
+
+  <!-- Excluded directories and files -->
+  <exclude-pattern>*/vendor/*</exclude-pattern>
+  <exclude-pattern>*/lang/*</exclude-pattern>
+  <exclude-pattern>*/assets/*</exclude-pattern>
 
   <!-- Disallow tabs altogether -->
   <rule ref="Generic.WhiteSpace.DisallowTabIndent.TabsUsed"/>