diff options
| author | Shad Laws <shad@shadlaws.com> | 2013-06-26 14:59:04 -0700 |
|---|---|---|
| committer | Shad Laws <shad@shadlaws.com> | 2013-06-26 14:59:04 -0700 |
| commit | 6573fac04972fee3807f3700f46244fb517d5b04 (patch) | |
| tree | 10962a04e8ee7a04a89aa2141ab02eaf4257803f | |
| parent | 3b5817a1e08ac2344f71b9ca98ac80edf157164b (diff) | |
| parent | fe40dadd5c487b5d4d64097a72bb123ffed1e30c (diff) | |
Merge pull request #434 from shadlaws/fix_controller_auth_test_master
Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{". Update golden file.
| -rw-r--r-- | modules/gallery/tests/Controller_Auth_Test.php | 4 | ||||
| -rw-r--r-- | modules/gallery/tests/controller_auth_data.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/gallery/tests/Controller_Auth_Test.php b/modules/gallery/tests/Controller_Auth_Test.php index e1ca0a7b..6551decb 100644 --- a/modules/gallery/tests/Controller_Auth_Test.php +++ b/modules/gallery/tests/Controller_Auth_Test.php @@ -47,6 +47,10 @@ class Controller_Auth_Test extends Gallery_Unit_Test_Case { $function = null; for ($token_number = 0; $token_number < count($tokens); $token_number++) { $token = $tokens[$token_number]; + if (self::_token_matches(array(T_CURLY_OPEN), $tokens, $token_number)) { + // Treat this just like a normal open curly brace + $token = "{"; + } // Count braces. // 1 open brace = in class context. diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt index 4cd9f047..4f0b6ca5 100644 --- a/modules/gallery/tests/controller_auth_data.txt +++ b/modules/gallery/tests/controller_auth_data.txt @@ -37,6 +37,7 @@ modules/tag/controllers/admin_tags.php index modules/tag/controllers/tag.php __call DIRTY_CSRF|DIRTY_AUTH modules/tag/controllers/tag_name.php __call DIRTY_AUTH modules/tag/controllers/tags.php autocomplete DIRTY_CSRF|DIRTY_AUTH +modules/tag/helpers/tag_rss.php feed DIRTY_AUTH modules/user/controllers/admin_users.php index DIRTY_CSRF modules/user/controllers/password.php reset DIRTY_AUTH modules/user/controllers/password.php do_reset DIRTY_CSRF|DIRTY_AUTH |