Add standalone build for 3.4 series #562
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Windows 8 user agent detection
This reverts commit 97ccdec.
Conflicts: classes/kohana/core.php
It's possible that a different exception handler is defined than the default `Kohana_Exception::hander`. Refs #4627
When the CURLOPT_POSTFIELDS option is present, curl adds a default Content-Type header which can be changed but not removed, causing authentication problems with signed requests. The option should only be set if a request body is being sent.
Route::uri() does not handle special characters well, so now it uses rawurlencode to fix this problem See: http://dev.kohanaframework.org/issues/4079
#4201 - Issue with validation labels
When using Arr::merge to merge arrays, the deeper array merges failed and caused a ErrorException [ Notice ]: Array to string conversion See: http://dev.kohanaframework.org/issues/4482
Added extra entry to array in test and changed in_array to strict. Performance: Non Strinct: http://i.imgur.com/JiRtUxQ.png Strict: http://i.imgur.com/nRmgHVS.png
#4482 - Array to string conversion in deep Arr::merge
…type-on-request Don't set empty body on external curl requests [Fixes #4791]
…ther than the actual download file (which will probably not exist). Refs #4344 refs #4592 Conflicts: classes/kohana/response.php
Use the current exception handler during shutdown refs #4627
Outputing as inline style, so empty string doesn't help
Bug 3373: Avoid division by zero refs #3373
Update the license url, fixes #4778
except the occurance: github.com/isaiahdw/kohanaphp.com/blob/f2afe8e28b/application/bootstrap.php was not replaced
…orting related to R4813, removes redundant notice-disabling lines
Support URLs starting with // in HTML::script and HTML::style
…ad-of-dynamic-static Xdebug returns `dynamic` and `static` instead of using `->` and `::`
This works around the circular dependency on kohana/unittest > kohana/core which leads to resolution problems when working on a feature branch.
Configure Koharness for isolated Travis build
The cookie tests were all being skipped because headers are always sent by the PHPUnit test runner (fixes kohana/kohana#47). Additionally even when they ran they were covering very little of the actual logic of the class, mostly just asserting that setcookie returns TRUE. Rewrote the tests completely and slightly refactored the Cookie class to allow mocking of the timestamp and setcookie calls. Refs #547.
These tests were disabled in 46e2ee9 because they were generating an error if headers had already been sent. http://dev.kohanaframework.org/issues/4155 This appears no longer the case - presumably the Session class or test configuration/environment has changed since then. The tests could probably still be clearer and more comprehensive, but they run.
These tests aren't great, and the PHP mime-type test is particularly likely to be unreliable. We should be able to get a valid (eg image/png) result in all current environments though for the moment. Probably the File::mime method would be best reimplemented with some third-party component, surely this is a solved problem by now.
These tests were vulnerable to breakage if modules provide their own validation message files, so were being skipped. Fixed to use (hopefully) collision-proof message files with known values and to cover a broader range of cases including missing file and missing key. Would ideally be further refactored to mock/have complete control of the module search path outside global state.
Original test was being skipped because it was hitting the internet - the major relevant functionality here is the parsing rather than the remote access. Added local example feeds for RSS2.0 as well as the previously tested atom feed. Also improved the tests to check for the title as well as the number of elements since we now have known content to work with.
This test was originally implemented in bf0175f to fix http://dev.kohanaframework.org/issues/3767 - it was required because headers were sent directly by the response class, and once they had been sent it was then very difficult to test other variations. The fact that headers are not relevant in CLI appears to have been a side concern. Subsequently in a1943b0 header sending moved to HTTP_Header which mocks out `header` with a callback interface for testing instead. Since that refactoring (released in v3.2.0) the headers are always sent in CLI unless headers_sent is already true. Therefore this test is invalid and can be removed.
Fix skipped/incomplete core tests for 3.3 series
windows nt 6.3 equals Windows 8.1
Feature: tests covering Text::user_agent method
Merge conflicts resolution: The following files had merge conflicts. These files were kept as they were in 3.3/develop: - classes/Kohana/Arr.php - classes/Kohana/Config/Group.php - classes/Kohana/Config/Source.php - classes/Kohana/Config/Writer.php - classes/Kohana/Debug.php - classes/Kohana/HTTP.php - classes/Kohana/HTTP/Header.php - classes/Kohana/HTTP/Message.php - classes/Kohana/HTTP/Request.php - classes/Kohana/HTTP/Response.php - classes/Kohana/Log/StdErr.php - classes/Kohana/Log/StdOut.php - classes/Kohana/Response.php - classes/Kohana/UTF8.php - guide/kohana/index.md - guide/kohana/mvc/controllers.md - guide/kohana/routing.md - guide/kohana/upgrading.md - system/utf8/ucwords.php - classes/Kohana/Core.php - tests/kohana/ArrTest.php - tests/kohana/Config/File/ReaderTest.php - tests/kohana/Config/GroupTest.php - tests/kohana/CoreTest.php - tests/kohana/DebugTest.php - tests/kohana/Http/HeaderTest.php These files have some changes merged: - classes/Kohana/UTF8.php (mb_substitute_character set/reset) - classes/Kohana/Request.php (merged changes from 3.2.3) - classes/Kohana/Route.php (merged changes from 3.2.3) - classes/Kohana/Text.php (merged widont function from 3.2.3) - tests/kohana/RequestTest.php (merged tweaked changes from 3.2.3) - tests/kohana/RouteTest.php (merged changes from 3.2.3)
Resolves a flickering test (and flickering Debug::dump output) where internal recursion markers are left in dumped arrays if the current system microtime produces a uniqid with only numeric characters.
[skip ci]
Conflicts: classes/Kohana/UTF8.php tests/kohana/CoreTest.php tests/kohana/TextTest.php
enov
added a commit
that referenced
this pull request
Oct 10, 2014
Add standalone build for 3.4 series
As far as I can see, there's #530 that probably need test. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges the 3.3/develop branch up to 3.4/develop and updates the travis and composer configs for 3.4.x - continues kohana/kohana#50
This merge includes a significant number of 3.3 bugfixes and changes because the branch has not been merged up for some time - please review carefully.
Somewhat amazingly, the only merge conflicts in 78bccef were:
And the build is green, so either I've not broken any of your new 3.4 series changes, or you've not been writing tests for them.... 😀