Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/dev' into fix_teardown

  • Loading branch information...
commit 4c66158200312c12b422464fb237c7ff7ca871da 2 parents 1af9be5 + a715901
@hans-d authored
View
2  security/Auth.php
@@ -155,7 +155,7 @@ public static function check($name, $credentials = null, array $options = array(
if (!in_array($key, $options['persist'])) {
unset($data[$key]);
}
- }
+ }
} else {
unset($data['password']);
}
View
10 test/Unit.php
@@ -255,7 +255,7 @@ protected function _normalizeLineEndings($expected, $result) {
}
return array($expected, $result);
}
-
+
/**
* Checks that the actual result is equal, but not neccessarily identical, to the expected
* result.
@@ -1005,11 +1005,11 @@ protected function _arrayPermute($items, $perms = array()) {
}
/**
- * Removes everything from `resources/tmp/tests` directory. Call from
- * inside of your test method or `tearDown()`.
+ * Removes everything from `resources/tmp/tests` directory. Call from inside of your test
+ * method or `tearDown()`.
*
- * Uses `DIRECTORY_SEPARATOR` as `getPathname()` is used in a a direct
- * string comparison. The method may contain slashes and backslashes.
+ * Uses `DIRECTORY_SEPARATOR` as `getPathname()` is used in a a direct string comparison.
+ * The method may contain slashes and backslashes.
*
* If the file to unlink is readonly, it throws a exception (Permission denied) on Windows.
* So, the file is checked before an unlink is tried. (this will make the tests run slower
View
2  test/filter/Coverage.php
@@ -100,7 +100,7 @@ function($cls) { return Inspector::executable($cls, array('public' => false)); }
* @param array $result The raw line number results
* @return array
*/
- protected static function collectLines($result) {
+ public static function collectLines($result) {
$output = null;
$aggregate = array('covered' => 0, 'executable' => 0);
View
4 tests/cases/g11n/LocaleTest.php
@@ -425,9 +425,9 @@ public function testPreferredEmpty() {
public function testPreferredMalformedContainingChrome() {
$available = array('fr', 'de');
- $random_firefox_4 = 'de-DE,de;q=0.7,chrome://global/locale/intl.properties;q=0.3';
+ $randomFirefox4 = 'de-DE,de;q=0.7,chrome://global/locale/intl.properties;q=0.3';
$request = new ActionRequest(array(
- 'env' => array('HTTP_ACCEPT_LANGUAGE' => $random_firefox_4)
+ 'env' => array('HTTP_ACCEPT_LANGUAGE' => $randomFirefox4)
));
$result = Locale::preferred($request, $available);
$this->assertIdentical('de', $result);
View
18 tests/cases/util/InflectorTest.php
@@ -332,27 +332,27 @@ public function testStorageMechanism() {
Inflector::reset();
$expected = array('TestField' => 'test_field');
- $this->assertFalse($this->getProtectedValue('$_underscored'));
+ $this->assertFalse($this->_getProtectedValue('$_underscored'));
$this->assertEqual(Inflector::underscore('TestField'), 'test_field');
- $this->assertEqual($expected, $this->getProtectedValue('$_underscored'));
+ $this->assertEqual($expected, $this->_getProtectedValue('$_underscored'));
$this->assertEqual(Inflector::underscore('TestField'), 'test_field');
$expected = array('test_field' => 'TestField');
- $this->assertFalse($this->getProtectedValue('$_camelized'));
+ $this->assertFalse($this->_getProtectedValue('$_camelized'));
$this->assertEqual(Inflector::camelize('test_field', true), 'TestField');
- $this->assertEqual($expected, $this->getProtectedValue('$_camelized'));
+ $this->assertEqual($expected, $this->_getProtectedValue('$_camelized'));
$this->assertEqual(Inflector::camelize('test_field', true), 'TestField');
$expected = array('test_field:_' => 'Test Field');
- $this->assertFalse($this->getProtectedValue('$_humanized'));
+ $this->assertFalse($this->_getProtectedValue('$_humanized'));
$this->assertEqual(Inflector::humanize('test_field'), 'Test Field');
- $this->assertEqual($expected, $this->getProtectedValue('$_humanized'));
+ $this->assertEqual($expected, $this->_getProtectedValue('$_humanized'));
$this->assertEqual(Inflector::humanize('test_field'), 'Test Field');
$expected = array('field' => 'fields');
- $this->assertFalse($this->getProtectedValue('$_pluralized'));
+ $this->assertFalse($this->_getProtectedValue('$_pluralized'));
$this->assertEqual(Inflector::pluralize('field'), 'fields');
- $this->assertEqual($expected, $this->getProtectedValue('$_pluralized'));
+ $this->assertEqual($expected, $this->_getProtectedValue('$_pluralized'));
$this->assertEqual(Inflector::pluralize('field'), 'fields');
}
@@ -363,7 +363,7 @@ public function testStorageMechanism() {
* @param string $property
* @return string The value of the property.
*/
- private function getProtectedValue($property) {
+ protected function _getProtectedValue($property) {
$info = Inspector::info("lithium\util\Inflector::{$property}");
return $info['value'];
}
View
2  tests/mocks/console/command/MockLibraryService.php
@@ -58,7 +58,7 @@ public function send($method, $path = null, $data = array(), array $options = ar
}
}
- private function __data($type, $key = null) {
+ protected function __data($type, $key = null) {
$resources = Libraries::get(true, 'resources');
$plugins = array(
View
6 tests/mocks/data/MockSource.php
@@ -18,7 +18,7 @@ class MockSource extends \lithium\data\Source {
'relationship' => 'lithium\data\model\Relationship'
);
- private $_mockPosts = array(
+ protected $_mockPosts = array(
'id' => array('type' => 'int', 'length' => '10', 'null' => false, 'default' => null),
'user_id' => array(
'type' => 'int', 'length' => '10', 'null' => true, 'default' => null
@@ -40,7 +40,7 @@ class MockSource extends \lithium\data\Source {
)
);
- private $_mockComments = array(
+ protected $_mockComments = array(
'id' => array(
'type' => 'int', 'length' => '10', 'null' => false, 'default' => null
),
@@ -70,7 +70,7 @@ class MockSource extends \lithium\data\Source {
)
);
- private $_mockTags = array(
+ protected $_mockTags = array(
'id' => array(
'type' => 'int', 'length' => '10', 'null' => false, 'default' => null
),
View
2  tests/mocks/template/helper/MockFormPostInfo.php
@@ -18,4 +18,4 @@ class MockFormPostInfo extends \lithium\data\Model {
);
}
-?>
+?>

0 comments on commit 4c66158

Please sign in to comment.
Something went wrong with that request. Please try again.