Enable PHP 5.6 testing, enable PHPCS, pull test dependencies via Comp…

…oser
joomla-framework · Aug 29, 2014 · f37b175 · f37b175
1 parent 27bd082
commit f37b175
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,5 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.gitmodules export-ignore
+.travis/ export-ignore
 .travis.yml export-ignore
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".travis/phpcs/Joomla"]
+	path = .travis/phpcs/Joomla
+	url = git://github.com/joomla/coding-standards.git
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,11 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 before_script:
   - composer update --dev
 
 script:
-  - phpunit
+  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpcs -p --report=full --extensions=php --standard=.travis/phpcs/Joomla/ruleset.xml src/
diff --git a/.travis/phpcs/Joomla b/.travis/phpcs/Joomla
diff --git a/composer.json b/composer.json
@@ -9,10 +9,14 @@
         "php": ">=5.3.10",
          "joomla/string": "~1.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.*",
+        "squizlabs/php_codesniffer": "1.*"
+    },
     "autoload": {
-    	"psr-4": {
-    		"Joomla\\Utilities\\": "src/",
+        "psr-4": {
+            "Joomla\\Utilities\\": "src/",
             "Joomla\\Utilities\\Tests\\": "Tests/"
-    	}
+        }
     }
 }