Merge branch 'master' of https://github.com/silverstripe-labs/silverstripe-googlesitemaps

.travis.yml

@@ -0,0 +1,22 @@
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
+
+language: php 
+php: 
+ - 5.3
+
+env:
+ - DB=MYSQL CORE_RELEASE=3.1
+ - DB=PGSQL CORE_RELEASE=master
+
+matrix:
+  include:
+    - php: 5.4
+      env: DB=MYSQL CORE_RELEASE=master
+
+before_script:
+ - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+ - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
+ - cd ~/builds/ss
+
+script: 
+ - phpunit googlesitemaps/tests/

README.md

@@ -1,5 +1,7 @@
 # Google Sitemaps Module
 
+[![Build Status](https://secure.travis-ci.org/silverstripe-labs/silverstripe-googlesitemaps.png?branch=master)](http://travis-ci.org/silverstripe-labs/silverstripe-googlesitemaps)
+
 ## Maintainer Contact
 
 * Will Rossiter (Nickname: wrossiter, willr) <will@fullscreen.io>

code/controllers/GoogleSitemapController.php

@@ -17,7 +17,7 @@ class GoogleSitemapController extends Controller {
 	/**
 	 * @var array
 	 */
-	public static $allowed_actions = array(
+	private static $allowed_actions = array(
 		'index',
 		'sitemap'	
 	);

code/extensions/GoogleSitemapSiteTreeExtension.php

@@ -8,7 +8,7 @@ class GoogleSitemapSiteTreeExtension extends GoogleSitemapExtension {
 	/**
 	 * @var array
 	 */
-	public static $db = array(
+	private static $db = array(
 		"Priority" => "Varchar(5)"
 	);