Commit Graph

95 Commits

Author SHA1 Message Date
Ingo Schommer
5bf5b744d8 MINOR Moved ContentController, ModelAsController, NestedController, RootURLController (and related tests) to "cms" module 2011-03-29 18:07:55 +13:00
Ingo Schommer
2184acf17d Revert "MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10)" - cased too many problems with mixed build environments that require PHP 3.4
This reverts commit 65f6104cd6.
2011-03-11 15:06:09 +13:00
Ingo Schommer
65f6104cd6 MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10) 2011-02-21 18:49:09 +13:00
Ingo Schommer
f056abc818 ENHANCEMENT Added NullHTTPRequest as a placeholder for new RequestHandler/Controller instances that haven't handled a URL yet. This means RequestHandler->request can be safely called from singleton controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 04:06:13 +00:00
Ingo Schommer
b15019a95f ENHANCEMENT Added SS_HTTPResponse->setStatusDescription() as equivalent to setStatusCode(). Added documentation.
BUGFIX Strip newlines and carriage returns from SS_HTTPResponse->getStatusDescription() (fixes #6222, thanks mattclegg)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-23 19:38:15 +00:00
Sam Minnee
83e31e1f8a MINOR Fixed DirectorTest to restore it's REQUEST_URI state to the original one after each test method is run (from r108665)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:50:15 +00:00
Sam Minnee
6a83da1455 MINOR Fixed Director::forceSSL() breaking unit tests because headers were already sent (from r108435)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:36:06 +00:00
Sam Minnee
8d5c684453 MINOR Reverted r108433 (from r108434)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:33:52 +00:00
Sam Minnee
07329cc45c MINOR DirectorTest should not extend from FunctionalTest (regression from r108428) (from r108433)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:33:30 +00:00
Sam Minnee
63e425b418 ENHANCEMENT #2856 Limiting of relative URLs for Director::forceSSL() using a map of PCRE regular expressions (from r108428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:32:42 +00:00
Ingo Schommer
ecb758de10 MINOR Added DirectorTest->testURLParam() and DirectorTest->testURLParams() (from r104711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112376 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:10:43 +00:00
Ingo Schommer
971d0f108f BUGFIX: When finding an old page in the 404 handler, favour existing subpages over historical ones. (from r104468)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112349 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:28:02 +00:00
Ingo Schommer
253c27e2a8 BUGFIX: Fix legacy URL redirection for pre-nestedurls URLs, after it has been enabled. (from r104463)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:05:18 +00:00
Sam Minnee
2662896ed2 BUGFIX: ModelAsController test failed for projects which do not support nested urls. This fix stores the original configuration and enables 'nested-urls' at the beginning of the tests and reset the state in tearDown. (from r103591)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112151 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:58:29 +00:00
Sam Minnee
752869e23b BUGFIX Renamed Nested URLs are automatically redirected to their new location with 301 HTTP status code in ModelAsController/ContentController (fixes #5393, thanks cbarberis) (from r103461)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:55:34 +00:00
Sam Minnee
135b65ee04 BUGFIX Fixed SiteTree->Content link shortcode parsing introduced in r101093 (#5227) (from r101302)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:42:17 +00:00
Ingo Schommer
0f0f29c35e MINOR Fixed typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-28 07:16:21 +00:00
Ingo Schommer
4703aa6e81 MINOR Fixed SapphireTest->logInWithPermission() spelling (from r99491)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:41:30 +00:00
Ingo Schommer
5c71cbbffa MINOR: permission code is case sensitive in some cases (from r98017)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:48:59 +00:00
Ingo Schommer
ee4174c0e2 Added values for new permission code 'VIEW_DRAFT_CONTENT' test (from r97898)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:43:29 +00:00
Ingo Schommer
9a04ca62d2 Added test for new permission code. (from r97897)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:42:50 +00:00
Sam Minnee
2996cb39e3 MINOR: Fixed deep-nested-URLs test to work on sites in subfolders
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@96836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-13 01:13:18 +00:00
Andrew Short
0c13c7a091 BUGFIX: Fixed nested URLs operation for pages more than 4 levels deep.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95902 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-18 05:19:28 +00:00
Sean Harvey
d8b67c4a2e MINOR Removed whitespace from DirectorTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-18 03:58:36 +00:00
Sean Harvey
5be077cd83 BUGFIX: fixed typing error (from r94721)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:43:02 +00:00
Sean Harvey
439ca0e466 MINOR: test support for superglobals in testrequest (from r94711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:42:56 +00:00
Sean Harvey
775945d197 MINOR: test support for superglobals in testrequest (from r94710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:42:50 +00:00
Ingo Schommer
8bf1dc5eee ENHANCEMENT Added SiteTree->canViewStage() and using it in ContentController->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@94253 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-02 09:40:45 +00:00
Ingo Schommer
38c71c56a3 MINOR Added flag to remaining SapphireTest subclasses
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:56:05 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 03:06:31 +00:00
Sam Minnee
72bda196e1 MINOR disable realtime publishing for unit tests
MINOR fix a test that makes no sense
MINOR a couple bugs around embargo/expiry have been fixed (from r85505)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89159 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:47:28 +00:00
ajshort
97ac0008b3 ENHANCEMENT: Cached the value for RootURLController::get_homepage_link() between calls.
From: ajshort <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:22 +00:00
Andrew Short
4cc56abecb MINOR: Updated ContentController->ChildrenOf() to use new SiteTree functions, and added tests.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:19 +00:00
Andrew Short
ad7194cc40 FEATURE: Refactored RootURLController to allow nested home pages.
MINOR: Deprecated RootURLController::get_homepage_urlsegment() in favour of get_homepage_link().
MINOR: Updated SiteTree->RelativeLink() to return a link to the site root for the home page.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:17 +00:00
Andrew Short
da2fd13b38 FEATURE: Allow you to access nested pages by falling over to a child page in ContentController if one is available.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:07 +00:00
Ingo Schommer
99c1fe9f93 BUGFIX Allowing translated homepages in RootUrlController
BUGFIX Limiting RootURLController to just trigger Translatable if no DomainForHomepage value is found
BUGFIX Using $locale parameter in Translatable::get_homepage_urlsegment_by_locale()
BUGFIX Updated enabling mechanism in Translatable->alternateGetByUrl()
MINOR Removed HTTP_HOST setting in TranslatableTest, wasn't necessary
API CHANGE Deprecated Translatable::get_homepage_urlsegment_by_language(), use get_homepage_urlsegment_by_locale()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 23:08:39 +00:00
Ingo Schommer
47f2deee7f BUGFIX Fixed Director::makeRelative() to accept https:// protocol
BUGFIX Fixed GET-parameter replacement in Director::is_absolute_url()
ENHANCEMENT Added Director::is_relative_url() and Director::is_site_url()
BUGFIX Validating $_FILES array in Director::direct()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-17 22:22:55 +00:00
Ingo Schommer
74ab33f23b ENHANCEMENT Added Director::is_absolute_url()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-11 21:07:58 +00:00
Sam Minnee
8da5af457e New test for old URL redirection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:18:12 +00:00
Ingo Schommer
97fed5ae57 BUGFIX Director::fileExists() fails on windows with absolute paths (#2935) - thanks to ajshort!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-12 16:16:25 +00:00
Sam Minnee
2af039785c ENHANCEMENT: Updated cli-script handling to be more in line with web calls, and improved Director::setBaseURL() calls.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 23:41:50 +00:00
Ingo Schommer
b8846a9ab3 MINOR Temporarily disabled RSSFeedTest as its overriding environment variables that should be handled by Director class with Director::setBaseURL() (which is currently not fully working). Added stub-tests for Director.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:04:01 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Ingo Schommer
2f51144a85 Merged revisions 47488 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47488 | ischommer | 2007-12-21 16:03:04 +1300 (Fri, 21 Dec 2007) | 1 line
  
  in fileExists(): replace any appended query-strings, e.g. /path/to/foo.php?bar=1 to /path/to/foo.php
........

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:00:43 +00:00
Sam Minnee
f88a481026 Merged revisions 51436 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51436 | sminnee | 2008-03-19 15:58:05 +1300 (Wed, 19 Mar 2008) | 2 lines
  
  Fixed HomepageForDomain behaviour when entering multiple domains
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51464 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:41 +00:00