Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php b/tests/phpunit/data/helpers/WellProtectedClass.php
new file mode 100644
index 00000000..99c7f642
--- /dev/null
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -0,0 +1,21 @@
+<?php
+
+class WellProtectedClass {
+	protected $property;
+
+	public function __construct() {
+		$this->property = 1;
+	}
+
+	protected function incrementPropertyValue() {
+		$this->property++;
+	}
+
+	public function getProperty() {
+		return $this->property;
+	}
+
+	protected function whatSecondArg( $a, $b = false ) {
+		return $b;
+	}
+}