Commit graph

19105 commits

Author SHA1 Message Date
Nathaniel Guse
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now
My method was not working correctly, will work on it more later.

PHPBB3-11598
2013-06-25 19:24:32 -05:00
Nathaniel Guse
7a9aec5fda [feature/twig] No longer using the phpbb_template_locator
This functionality is handled by the Twig Filesystem Loader

PHPBB3-11598
2013-06-25 19:23:42 -05:00
Nathaniel Guse
25f0ee9fb6 [feature/twig] Fixing template events test (and behavior)
According to the test, template event behavior was never correct.

Only ONE template event file is supposed to be included from EACH
extension. As it was before, EVERY matching template event file from
each extension was included (this was how it was designed).

E.g.
Event call in prosilver "foo"
Extension has template "foo" in prosilver AND all

foo from all would be included, then foo from prosilver would be included

This was clearly not designed correctly as only the most specific event
file from each extension should be loaded, otherwise events could only
ever be put in a single style tree (either only all, or only prosilver
and subsilver2 and any style that inherits from neither of those).
Otherwise the events would be duplicated on output (which is clearly not
desirable).

The Twig behavior already was correct as I designed it, so only the one
most specific template event file found would be included from each
extension. The tests had to be updated for the correct expected output.

PHPBB3-11598
2013-06-25 19:22:23 -05:00
Nathaniel Guse
3766b736da [feature/twig] Don't require phpbb_config, some tests pass null
PHPBB3-11598
2013-06-25 18:06:45 -05:00
Nathaniel Guse
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test
PHPBB3-11598
2013-06-25 16:51:50 -05:00
Nathaniel Guse
8bccba1a2f [feature/twig] INCLUDEPHP token, replace variable usage with $context
I could find no better way to do this...

PHPBB3-11598
2013-06-25 16:27:58 -05:00
Joseph Warner
5f3ed197e7 [feature/auth-refactor] Fix auth tests to use mock objects correctly
PHPBB3-9734
2013-06-25 16:26:20 -04:00
Nathaniel Guse
e227f05e9a [feature/twig] INCLUDEPHP token support
PHPBB3-11598
2013-06-25 15:02:55 -05:00
Nathaniel Guse
99b776a4e5 [feature/twig] Add a comment to tpl output if PHP used, but disabled
PHPBB3-11598
2013-06-25 14:59:41 -05:00
Nathaniel Guse
68225d9f29 [feature/twig] Pass parameters required to twig env via constructor
Instead of creating set functions

PHPBB3-11598
2013-06-25 14:58:55 -05:00
Nathaniel Guse
ea785efb30 [feature/twig] PHP token support
PHPBB3-11598
2013-06-25 14:22:40 -05:00
Joseph Warner
5444e5b683 [feature/auth-refactor] Test validate_session on provider_apache
Provides a test for the validate_session() method of
provider_apache.

PHPBB3-9734
2013-06-25 14:37:22 -04:00
Joseph Warner
9e04328545 [feature/auth-refactor] Test autologin() on provider_apache
Provides a test for the autologin() method of provider_apache
that assumes the user already exists in the database.

PHPBB3-9734
2013-06-25 14:25:45 -04:00
Joseph Warner
307dd9777b [feature/auth-refactor] Test login() for provider_apache
Provides a test for the login() method for provider_apache.
Appears to be failing due to an issue with the mock phpBB request
class.

PHPBB3-9734
2013-06-25 14:13:36 -04:00
Joseph Warner
e5de05d8db [feature/auth-refactor] Test for init on provider_apache
Provides a test for the init() method of provider_apache.
Appears to be failing due to an error with the mock request class.

PHPBB3-9734
2013-06-25 14:05:40 -04:00
Joseph Warner
91c80dfc8e [feature/auth-refactor] Skeleton of provider_apache_test
Creates a skeleton of the tests for provider_apache.

PHPBB3-9734
2013-06-25 13:38:01 -04:00
Joseph Warner
8e1a503f44 [feature/auth-refactor] Finish provider_db unit test for login
Finishes the provider_db unit test for login. The test currently
passes.

PHPBB3-9734
2013-06-25 13:23:57 -04:00
Marc Alexander
6fc997924c [ticket/11600] Use lowercase null and remove duplicate test cases
PHPBB3-11600
2013-06-25 11:44:37 +02:00
Marc Alexander
72377075f4 [ticket/11600] Use local variable for $user in test_localize_errors
PHPBB3-11600
2013-06-25 11:35:04 +02:00
Marc Alexander
25acf3f74c [ŧicket/11600] Split get driver tests into tests for all and only enabled ones
PHPBB3-11600
2013-06-25 11:31:15 +02:00
Nathaniel Guse
fe61527c52 [feature/twig] Remove duplicate test calls
PHPBB3-11598
2013-06-24 23:29:22 -05:00
Nathaniel Guse
dabc0edea2 [feature/twig] Delete template_spacing_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:50:09 -05:00
Nathaniel Guse
1d6a51f51a [feature/twig] Delete template_locate_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:44:57 -05:00
Nathaniel Guse
92391d2f4f [feature/twig] Correct template_inheritance_test.php
PHPBB3-11598
2013-06-24 22:44:12 -05:00
Nathaniel Guse
8bda356dab [feature/twig] Correct includejs test
PHPBB3-11598
2013-06-24 22:40:17 -05:00
Nathaniel Guse
3ca99f8122 [feature/twig] Append assets_version to includejs tag
Some fixes for main template parser

PHPBB3-11598
2013-06-24 22:37:58 -05:00
Nathaniel Guse
814d57d201 [feature/twig] Delete template_compile_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:58:09 -05:00
Nathaniel Guse
d986e124fe [feature/twig] Delete renderer_eval_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:57:01 -05:00
Nathaniel Guse
881bc60fbc [feature/twig] Delete invalid constructs template test
Invalid tags is no longer a valid test (invalid tags are ignored)

Twig contains tests for loading files, so we should not need to test this

PHPBB3-11598
2013-06-24 21:55:45 -05:00
Marc Alexander
79dd44061b [ticket/11531] Add changes for supporting modified testing framework
Additionally, the groups avatar is deleted after the avatar tests in the
ucp groups page in order to prevent issues with other tests that expect
that no avatar has been set for the admin group.

PHPBB3-11531
2013-06-25 00:17:51 +02:00
Nathan Guse
a1f957af84 [feature/twig] Working on fixing tests
PHPBB3-11598
2013-06-24 15:28:54 -05:00
Nathan Guse
ff84aed0b2 Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twig
# By Dhruv (35) and others
# Via Andreas Fischer (15) and others
* 'develop' of github.com:phpbb/phpbb3: (75 commits)
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/11503] similar implementation for mssql_native and odbc
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
  [ticket/11604] Skip installer step where config.php is created.
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11604] Fix case where config.php is not generated by phpBB.
  [ticket/11604] Use variables for config.php filesnames.
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
  [ticket/11094] Add textbox for jabber while memberlist search
  [ticket/10820] fix if condition to check for IE
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/10820] Add additional check for IE in condition
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  ...
2013-06-24 13:49:29 -05:00
Nathan Guse
2dd58413e2 [feature/twig] Fix controller/helper_url_test (missing globals)
PHPBB3-11598
2013-06-24 13:45:48 -05:00
Nathan Guse
2819a2641b [feature/twig] Only set extensions if extension manager is loaded
PHPBB3-11598
2013-06-24 13:45:23 -05:00
Nathan Guse
a61dd78fc9 [feature/twig] Change composer to load Twig 1.13.*
PHPBB3-11598
2013-06-24 13:40:05 -05:00
Nathan Guse
309ed5e5c3 [feature/twig] Fixing file header copyrights
PHPBB3-11598
2013-06-24 13:37:22 -05:00
Nathan Guse
1a0819bdc4 [feature/twig] Changing INCLUDEJS behavior
Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
2013-06-24 13:32:31 -05:00
Nathan Guse
63143a1a57 [feature/twig] Fix <!-- .blah since the being node was changed
PHPBB3-11598
2013-06-24 12:52:55 -05:00
Nathan Guse
c958155fb6 [feature/twig] Able to set chain of namespaces to search for loadTemplate()
This is done so that when event template files are included, if they
include files themselves, that namespace is checked first, then __main__
is checked to include the correct template file.

Also, when template files are included from a particular namespace, this is
done so that the files from that namespace are included first, then the
main namespace is checked.

We may want to change this behavior in the future to allow choosing which
locations have priority, but for now, this is what I am doing to make sure
the behavior is simple and always the same.

PHPBB3-11598
2013-06-24 12:39:28 -05:00
Nathan Guse
4881085f13 [feature/twig] Use twig->display rather than echo twig->render
PHPBB3-11598
2013-06-24 11:19:54 -05:00
Nathan Guse
3bd281fa27 [feature/twig] Event template tag
PHPBB3-11598
2013-06-24 11:18:29 -05:00
Joseph Warner
80e2d65399 [feature/auth-refactor] Initial auth unit test provider_db
Initial work on a unit test for the provider_db login function.
Does not work currently.

PHPBB3-9734
2013-06-24 12:07:28 -04:00
Nathan Guse
62fda07dd4 [feature/twig] Changing method for begin node to not use anonymous function
The way it was setup would actually require PHP 5.4, which isn't an option
right now. Leaving the old code there, just commented out, for now at least.

PHPBB3-11598
2013-06-23 22:28:39 -05:00
David King
fc99c86252 [ticket/11253] Put AND clause in correct SQL query
PHPBB3-11253
2013-06-23 19:47:13 -04:00
David King
8d86f88ac6 [ticket/11253] Fix a few things brought up in the PR 2013-06-23 09:43:32 -04:00
David King
158483ecad [ticket/11253] Fix typo in constant
PHPBB3-11253
2013-06-22 20:40:08 -04:00
David King
458d1c4961 [ticket/11253] Add migration to add auth check to UCP signature module
PHPBB3-11253
2013-06-22 19:59:33 -04:00
Dhruv
fdd60548bf [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
PHPBB3-9341
2013-06-22 03:44:22 +05:30
sakimahesh
465b515600 [ticket/9341] Correctly named template vars
PHPBB3-9341
2013-06-22 03:44:17 +05:30
Joseph Warner
b8610c4b98 [feature/auth-refactor] Refactor code to use services
Refactors all loading of auth providers to use services instead of
directly calling the class.

PHPBB3-9734
2013-06-21 18:04:11 -04:00