adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-24 07:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18861 commits 7 branches 0 tags 44 MiB
Commit graph

3780 commits

Author SHA1 Message Date
Mark Story
32fe09835b Merge pull request #6809 from ravage84/2.7-code-coverage 
Explicit definition of the code coverage
 2015-06-15 10:13:12 -04:00
mark_story
947262e754 Fix PHPCS errors. 2015-06-14 21:56:48 -04:00
Marc Würth
f3099fefdf Define code coverage explicitly 2015-06-15 00:56:09 +02:00
mark_story
c47196fe08 Merge branch '2.6' into 2.7 2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x 
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
 2015-06-07 15:45:16 -04:00
mark_story
0e6fcc02b8 Add/correct some tests for humanize. 
The arguments for assertEquals() were backwards. While there are many
more flipped assertions I will change the others separately.
 2015-06-05 10:31:29 -04:00
mark_story
239c83938f Fix regression in camelize(). 
The input should not be lowercased before camelizing, as this can cause
inputs that were previously camelized to create incorrect results.

Refs #6735
 2015-06-05 10:20:51 -04:00
mark_story
df0f2295c3 Fix issue with overlapping irregular inflections. 
When irregular inflections overlap we should choose the longest match,
not the shortest.

Refs #6659
 2015-06-02 23:09:29 -04:00
Mark Scherer
4ad001b9ca Use options array. 2015-06-01 16:12:45 +02:00
Mark Scherer
670d93b6f6 Extract formatTreeList() from generateTreeList(). 2015-06-01 12:36:20 +02:00
mark_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04:00
mark_story
65691836be Fix syntax errors in PHP <5.4 2015-05-28 17:39:52 -04:00
mark_story
995d8d22c6 Disable reading XML files and URLs when handling user data. 
Allowing users to load arbitrary files/URLs with Xml is not desirable
when handing user input.
 2015-05-27 09:45:53 -04:00
nojimage
c6e4208bda refs #6635 Inflector::underscore, humanize support multibyte string inputs 2015-05-26 13:29:05 +09:00
nojimage
8ebc9cdd87 refs #6635 FormHelper::radio() return collect id attributes with multibyte 2015-05-25 22:10:50 +09:00
mark_story
9626f0e726 Exclude deprecated validators from bake. 
Don't include deprecated validators in bake.

Refs #6581
 2015-05-22 22:03:32 -04:00
mark_story
4a3b2e2a03 Fix failing test in SQLite. 
SQLite does not handle subqueries in virtual fields well. However, the
original issue was that the generated query was invalid which
find(first) will still catch.
 2015-05-21 21:58:12 -04:00
mark_story
52a0d642ec Fix incorrectly quoted table aliases in virtual fields. 
DboSource::_quoteFields() is already a bit of a mess, and while I'm not
happy about having to add more regex replacement, it seems to be the
only reasonable solution given that the code is already 'parsing' SQL
to apply identifier quoting.

Fixes #6602
 2015-05-20 22:40:47 -04:00
Marc Würth
508b9d1443 Rename test methods after notBlank change 
Was a left-over from #6579
 2015-05-19 15:13:28 +02:00
Mark Scherer
4f3602ad5f Adjust bake, docblocks and tests for notBlank. 2015-05-17 22:27:16 +02:00
Mark Scherer
866242643f Deprecate notEmpty in favor of notBlank. 2015-05-17 22:13:04 +02:00
ndm2
323e8d8d76 Add underscore support for multi word irregulars. 
Underscore separated words were not catched by the irregular regex,
tests however didn't fail as the default rules matched the tested words
too. The added test should ensure that this won't happen again.

Fixes the gap left by the previous #6538 fix.
 2015-05-12 14:33:15 +02:00
mark_story
d4740c9c09 Fix incorrect handling of irregular values. 
When inflecting irregular values, both plural and singular forms were
generated incorrectly.

Fixes #6538
 2015-05-11 21:35:08 -04:00
Mark Scherer
4915e802c1 Fix tableCells() 2015-05-02 16:52:51 +02:00
Mark Scherer
f510dac32a fix cs 2015-05-02 16:16:27 +02:00
Mark Scherer
cdbf5a0dec Correct brackets. 2015-05-02 14:26:57 +02:00
Mark Scherer
ed21f84236 Backport _xmlOptions 2015-05-02 14:24:02 +02:00
mark_story
032c01d18c Add other key types to {*} test. 2015-05-01 22:41:41 -04:00
mark_story
5e9d4893a8 Add the {*} matcher to Hash::extract() 
This matcher will match anything and is useful when you just want to
traverse through data and you're not too picky.

I've also refactored the conditions to use a case as it is slightly more
readable and uses fewer lines of code.

Refs #6447
 2015-05-01 22:03:40 -04:00
Mark Story
bcb403078d Merge pull request #6455 from cakephp/2.6-status-code-429 
Backport #6431
 2015-04-30 20:13:36 -04:00
Mark Scherer
adf2eb03f2 Backport jsonOptions 2015-04-30 15:51:13 +02:00
Mark Scherer
309aee9fe5 Backport #6431 2015-04-30 15:18:28 +02:00
mark_story
345d8d8390 Merge branch '2.6' into 2.7 2015-04-29 19:54:53 -04:00
mark_story
096a2ebb72 Merge branch '2.6' into 2.7 
Conflicts:
	lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
	lib/Cake/VERSION.txt
 2015-04-20 15:42:54 -04:00
Mark Scherer
3ba4308356 Use hour as field name. 2015-04-20 18:39:54 +02:00
Mark Scherer
c71a478876 Add test case. 2015-04-20 18:38:19 +02:00
mark_story
5f2aa4c307 Fix errors when testing controllers that use file() 
Fix errors related to ob_end_clean() closing PHPUnit's output buffer
when testing controller methods that use response->file().
 2015-04-09 20:38:37 -04:00
mark_story
a6aefdd4d3 Fix null path in Hash::get() causing exceptions. 
This was a regression introduced in 2.6.x

Refs #6297
 2015-04-09 07:50:29 -04:00
Mark van Driel
4a7344ae80 Keep only test for null value as path 2015-04-09 07:49:35 -04:00
Mark van Driel
900fd3e7e5 Test to demonstrate issue with non-string paths in Hash::get 2015-04-09 07:47:25 -04:00
mark_story
f55111bdc1 Allow empty headers to be read. 
Allow headers with '' and '0' as their values to be read.

Fixes #6299
 2015-04-08 16:33:28 -04:00
José Lorenzo Rodríguez
405e725767 Merge pull request #6238 from cakephp/issue-6224 
Fix maxDimensions() for empty/1 dimensional arrays.
 2015-04-01 09:26:50 +02:00
Justin Yost
f32d1c1362 Updates Inflector For Irregular Case Sieves 
Sieves incorrectly singualrized as sief.
Adds sieve, sieves as an irregular case and test cases to
match for the Inflector class.
Closes Issue #6240 in CakePHP 2.6 Branch

Signed-off-by: Justin Yost <justin.yost@yostivanich.com>
 2015-03-31 22:21:05 -07:00
mark_story
69971505a2 Fix maxDimensions() for empty/1 dimensional arrays. 
maxDimensions() should not emit warnings or mis-calculate an array's
dimensions.

Fixes #6224
 2015-03-31 22:21:15 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
Richard van den Berg
1d0d20e974 Account for SNI changes in HttpSocketTest 2015-03-23 22:31:08 -04:00
mark_story
5a6a74e2f8 Fix failing tests. 
The test was taking the wrong index when creating mock path choices.

Refs #6125
 2015-03-20 20:35:43 -04:00
mark_story
744952e344 Fix FormHelper::create() dropping 0 value parameter. 
When 0 is the first passed parameter we shouldn't drop it.

Fixes #6107
 2015-03-19 21:15:20 -04:00
Walther Lalk
359c0ab816 Fix issue with memcache and domains starting with letter "u" 2015-03-19 11:42:14 +02:00
José Lorenzo Rodríguez
277f641108 Merge pull request #6064 from robmcvey/jsonView 
2.6 jsonView should throw exception if json_encode fails
 2015-03-18 10:01:40 +01:00
mark_story
6df7bf9c21 Fix notice errors in pagination link generation. 
No errors should be emitted when creating links for models that were not
paginated.

Refs #6090
 2015-03-17 22:19:17 -04:00
Rob McVey
4741abcd63 Remove whitespace 2015-03-15 11:14:49 +00:00
Rob McVey
d94e05cf76 Assert exception msg contains UTF-8 
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
 2015-03-15 11:01:51 +00:00
Rob McVey
a59a057133 assert correct exception msg thrown 2015-03-15 10:36:06 +00:00
mark_story
827465fa30 Merge branch 'postgres_altercolum_error' into master 
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
 2015-03-14 22:23:43 -04:00
mark_story
c32e5559bb Add test to ensure column was converted to integer. 
Refs #5512
 2015-03-14 22:23:17 -04:00
Rob McVey
fe0ddf2171 Assert exception is thrown, reset error handler in tearDown 2015-03-14 13:27:34 +00:00
Rob McVey
56c6f02efc Remove tabs 2015-03-14 13:16:05 +00:00
Rob McVey
d3c24be84b add a custom error handler for tests of json_encode 2015-03-14 13:12:09 +00:00
Rob McVey
2ba9f3b8fb Encoding false is OK - should return string null 2015-03-13 16:21:54 +00:00
Rob McVey
ddfcb06d02 Coding standards 2015-03-13 16:13:29 +00:00
Rob McVey
08620704be Handle json_encode failure 2015-03-13 16:12:21 +00:00
Rob McVey
05aba7afb6 Assert CakeException throw when json_encode fails 2015-03-13 15:52:22 +00:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
Mark Story
43f16f38f0 Merge pull request #5905 from davidsteinsland/fix_file_response_dots 
Fix file response dots
 2015-03-09 21:54:02 -04:00
mark_story
a9519d39f7 Fix whitelist being empty during afterSave. 
whitelist should only be reset after afterSave event.

Refs #6028
 2015-03-08 13:51:46 -04:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
José Lorenzo Rodríguez
a6ceec149a Merge pull request #5981 from cakephp/issue-5973 
Make maxLimit and limit settings independent.
 2015-03-01 19:48:26 +01:00
mark_story
02c9dda9a7 Make maxLimit and limit settings independent. 
Having maxLimit infer what it should be based on limit was not a very
transparent default behavior. The documentation states that maxLimit
will default to 100, but the code would default it to 'limit' if set.
This created confusing behavior when only one setting was defined.

Refs #5973
 2015-02-27 22:35:52 -05:00
mark_story
8dba9879d4 Don't generate maxlength properties for decimal columns. 
Int casting the decimal scale isn't going to work in a number of
situations as users may end up trying to include decimal points, commas
or spaces in larger amounts.

Fixes #5977
 2015-02-27 21:08:54 -05:00
KullTC
a7c2f26599 Make sure default datasource is not used for mock 
When a non-default datasource is used for a model and no test_ version of
that datasource is available, the getMockForModel method used the
models standard datasource, rahter than 'test'.
 2015-02-27 15:26:49 +01:00
Mark Story
19f28c419e Merge pull request #5954 from cakephp/issue-5948 
Check line length to account for fence post.
 2015-02-26 19:58:06 -05:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2015-02-26 12:50:35 -05:00
mark_story
c92cfb413f Allow numeric sorts in PaginatorComponent. 
When paginating data, we should not ignore numerically indexed order
conditions. Instead they should be handled similar to Model::find().

This creates a slightly different behavior when model's have default
sorting applied as more default sort options forms will be honoured.

Refs #5964
 2015-02-25 21:38:56 -05:00
mark_story
ea79cf5d13 Fix words with WWW in them being autolinked. 
Don't autolink words that don't have `www.` in them.

Fixes #5968
 2015-02-25 20:52:35 -05:00
mark_story
b80a8947d7 Check line length to account for fence post. 
When we have exactly 998 bytes CakeEmail should not emit an error.

Refs #5948
 2015-02-24 21:52:34 -05:00
AD7six
d7d2516dc1 Remove unwanted whitespace 2015-02-23 17:22:55 +00:00
AD7six
5066bc33b4 Fix whitespace for paginator counter call 2015-02-23 16:46:43 +00:00
AD7six
b151295f1b Add a better test for the index being correct 2015-02-23 16:46:23 +00:00
mark_story
831fe53f79 Ignore LC_TIME category when extracting messages. 
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.

Refs #5933
 2015-02-22 22:39:38 -05:00
ADmad
2a57d9b65f Avoid reloading config file and recreating config instance. 2015-02-20 08:48:25 +05:30
David Steinsland
463fa660bc Updated test 2015-02-19 17:28:32 +01:00
Jan Dorsman
e3b5306521 Fixing issue #5764 2015-02-19 12:19:27 +05:30
David Steinsland
960ddd0eb8 Added DocBlock 2015-02-15 19:34:28 +01:00
David Steinsland
5fd7396e47 Fixed downloading of files with dots 2015-02-15 19:32:33 +01:00
ADmad
204f50bb97 Allow level field to be null for pqsql and sqlite. 2015-02-15 23:04:13 +05:30
ADmad
e095885dc4 Fix test case 2015-02-15 22:35:42 +05:30
ADmad
6ad68ae1e2 Allow setting level (depth) of tree nodes on save. 
Backported from 3.0.
 2015-02-15 22:29:19 +05:30
Mark Story
9f1f158cc0 Merge pull request #5855 from tanuck/2.7-custom-flash-message 
Backport of 3.x flash messages #5823
 2015-02-14 22:07:30 -05:00
mark_story
b3c9c1615e Fix doubly linking URLs starting with // 
Fixes #5889
 2015-02-13 21:40:50 -05:00
mark_story
eb85a875c0 Merge branch 'master' into 2.7 2015-02-10 23:00:43 -05:00
mark_story
3dfa22b021 Fix order of hasOne assocation. 
This should fix non-deterministic failures.
 2015-02-10 22:46:53 -05:00
mark_story
b974daac7b Don't create invalid maxlength attributes for decimal columns. 
Converting the maxlength to an int avoids any commas from decimal
columns.

Refs #5832
 2015-02-05 22:53:40 -05:00
James Tancock
e173c29d33 Fix for phpcs 2015-02-04 15:31:50 +00:00
James Tancock
b8b6b67abd Tests for ported Flash component & helper 2015-02-04 15:05:40 +00:00
Rachman Chavik
acd32b71fe Fix: "bake plugin" generates incorrect directory for View/Layouts 2015-02-04 15:47:01 +07:00
ADmad
54fe7ed204 Add method to get depth of tree's node. 
Backported from 3.0.
 2015-02-01 17:27:46 +05:30
Mark Story
151f6e90e0 Merge pull request #5673 from davidsteinsland/fix_exception_handler_nesting 
Fixed nesting when ExceptionRenderer throws exception
 2015-01-28 22:00:57 -05:00
Mark Scherer
611889235a Fix clear(). Add test cases. 2015-01-28 23:54:32 +01:00
Mark Story
35e0dc2bbd Merge pull request #5760 from cakephp/master 
Merge master into 2.7
 2015-01-27 20:48:15 -05:00
Mark Story
b5cbe4de58 Merge pull request #5744 from cakephp/master-hotfix-testing 
Fix ControllerTestCase redirect assert by always using 302 for redirect()
 2015-01-26 20:27:36 -05:00
Mark Scherer
76f7754014 Adding a status code test. 2015-01-26 10:29:52 +01:00
mark_story
a8ae12a700 Fix warnings when php://output is used with ConsoleOutput. 
The php://output stream is not compatible with posix functions.

Refs #4901
 2015-01-25 22:24:24 -05:00
AD7six
f9ba950ad4 Skip Sqlite 
Sqlite will accept an insert with duplicate primary keys and silently
drop the query. There is no exception, or indication that the insert
failed.
 2015-01-23 08:47:05 +00:00
AD7six
838d23300b Remove some exists checks by not validating 2015-01-23 08:29:59 +00:00
AD7six
51bd1d0a2b If a PDOException is thrown, try again. 
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
 2015-01-23 08:28:08 +00:00
AD7six
e86365ca0f Add a failing test for session concurrency problems 2015-01-22 23:04:34 +00:00
mark_story
58334996a2 Fix PHPCS errors. 2015-01-21 23:32:08 -05:00
Ceeram
9ce75e6fd6 No need to get the datasource if column is defined in schema. Fixes #5712 2015-01-22 00:46:55 +01:00
Robert
c755d9b5e5 Updated comments 2015-01-19 08:55:40 +01:00
Robert
db1442573d Fix failing tests 2015-01-19 08:51:57 +01:00
Robert
dedb2e4191 Added short plugin alias in shells 2015-01-19 08:51:57 +01:00
mark_story
3078a1eb52 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2015-01-16 22:22:26 -05:00
Mark Story
2a9f2d4b58 Merge pull request #5668 from cakephp/issue-5649 
Fix numeric values not being quoted for MySQL set columns.
 2015-01-15 21:29:57 -05:00
mark_story
396d501d1e Fix / being handled incorrect by referer() 
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'

Fixes #4812
 2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0 Fix numeric values not being quoted for MySQL set columns. 
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.

Refs #5649
 2015-01-15 21:10:33 -05:00
David Steinsland
a5e1be7abf Fixed tests 2015-01-15 23:11:36 +01:00
David Steinsland
ed3b15f13b Fixed phpcs 2015-01-15 20:04:06 +01:00
David Steinsland
f621bb7fe5 Fixed nesting when ExceptionRenderer throws exception 2015-01-15 19:20:28 +01:00
mark_story
d39c744c28 Fix PHPCS error. 2015-01-12 21:37:34 -05:00
mark_story
7b20884d43 Fix failing tests. 2015-01-12 21:36:28 -05:00
mark_story
ac9a212d44 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/Utility/String.php
 2015-01-11 15:25:18 -05:00
mark_story
cd58fa0b61 Backport changes from #5635 to 2.x 
In case the path passed to the File class doesn't exists, this will
cause File::$path to be set to a partial path, that is the filename
of the passed path with a slash prepended, ex with

    $file = new File('/non/existent/file');

calling $file->pwd() will return/set /file, possibly causing that
file in the root to be accessed.
 2015-01-11 15:20:34 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
98909fb465 Fix radio buttons not being added to security hash. 
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.

Refs #5603
 2015-01-08 23:25:34 -05:00
Mark Story
c4f9727720 Merge pull request #5576 from istvanp/2.7 
Prevent NULL value on NOT NULL column when value is an empty string
 2015-01-06 21:23:53 -05:00
euromark
389f745d16 Stop goofy formatting when newlines are present already. 2015-01-06 13:13:33 +01:00
Istvan Pusztai
22b0275a58 Prevent NULL value on NOT NULL column when value is an empty string (MySQL) 2015-01-05 12:04:24 -05:00
euromark
52ecccb1a2 App::uses and usage replacements for String => CakeText. 2015-01-05 01:00:57 +01:00
euromark
63093e1d30 More String CakeText replacements and a BC class. 2015-01-05 00:55:23 +01:00
euromark
274b78e44c Rename test case. 2015-01-05 00:54:36 +01:00
Mark S.
b76fbd8da1 Merge pull request #5557 from cakephp/2.7-configure-backport 
Backport of 3.0 Configure corrections.
 2015-01-04 23:57:56 +01:00
euromark
394da88d23 Stay 100% BC for 2.7 2015-01-04 10:52:18 +01:00
euromark
dabf55785f Simplify test assert. 2015-01-04 02:30:11 +01:00
euromark
a947958dc9 Fix cs 2015-01-04 02:27:40 +01:00
euromark
d848c5f327 cs 2015-01-04 02:22:37 +01:00
euromark
b936a34471 Backport of 3.0 Configure corrections. 2015-01-04 01:57:06 +01:00
euromark
39e0ce415d Backport of 3.0 Session API hardening and clear(). 2015-01-04 01:40:09 +01:00
mark_story
4cd2c8fdcb Merge branch 'master' into 2.7 2015-01-03 14:34:55 -05:00
mark_story
b6029d7ad1 Add some additional tests for autoLink. 
Refs #5544
 2015-01-03 14:30:56 -05:00
Rob McVey
76b7c8c594 More complex test case for GET params 2015-01-02 15:31:27 +00:00
Rob McVey
2bf41f3d85 Add missing double quote to link in test 2015-01-02 15:09:40 +00:00
Rob McVey
1ebcd9bf72 Test brackets are not autolinked inside href tag 2015-01-02 15:08:21 +00:00
José Lorenzo Rodríguez
fcb6520ef1 Merge pull request #5513 from cakephp/issue-4916 
Don't set content-length when serving assets.
 2014-12-30 10:12:19 +01:00
mark_story
a65354225e Don't set content-length when serving assets. 
Setting content-length on assets causes long pauses when fetching assets
that contain PHP code. These assets are invariably larger than their
response bodies. By not setting a content-length, we can allow the
webserver to calculate it for us.

Refs #4916
 2014-12-29 21:07:46 -05:00
Kaz Watanabe
e5fc1858f9 fix error at change type of text field to integer in PostgreSQL 2014-12-30 09:27:46 +09:00
mark_story
ec57fb4579 Fix length reflection in SQLServer 
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.

Refs #5506
 2014-12-29 16:47:50 -05:00
José Lorenzo Rodríguez
8a4b0e8754 Merge pull request #5478 from tranfuga25s/HtmlCodeCoverageFix 
Html Testing Renderer & Code Coverage Improvement
 2014-12-27 00:09:01 +01:00
Esteban
58eb7b80ab Added All options enabled when running test from webfrontend 
Fix failing test

Fix CS problem with new code

Fix test for code coverage generator

Fix tests

Fix CS Errors

Removed spaces in tabulation
 2014-12-26 15:49:42 -03:00
Mark Story
7bbc3dfd90 Merge pull request #5470 from cakephp/2.7-session 
Backport Session consume() to 2.x
 2014-12-26 12:22:20 -05:00
Mark S.
c7940f57ac Merge pull request #5469 from cakephp/2.7-configure 
Backport Configure::consume() to 2.x
 2014-12-25 22:23:44 +01:00
Edgaras Janušauskas
3ae61e9e16 Fix Extract task to correctly extract messages with context 2014-12-25 14:28:44 +02:00
mark_story
eba6105a52 Merge branch '2.7' of github.com:cakephp/cakephp into 2.7 
Conflicts:
	lib/Cake/TestSuite/ControllerTestCase.php
 2014-12-23 11:30:29 -05:00
mark_story
d21ae178bf Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2014-12-23 11:29:57 -05:00
Mark Story
033d968766 Merge pull request #5468 from dereuromark/2.6-i18n 
Allow apps to overwrite translation domains from third party plugins.
 2014-12-23 11:25:10 -05:00
Mark Story
96c458f300 Merge pull request #5467 from cakephp/2.6-mediaview 
Don't send response from view.
 2014-12-23 11:24:47 -05:00
euromark
53f1390b7d Backport array support for testAction() 2014-12-23 13:42:21 +01:00
euromark
5c5fb59c8d Allow apps to overwrite translation domains from third party plugins. 2014-12-23 13:09:53 +01:00
mark_story
6db96d5e41 Merge branch '2.6' into 2.7 2014-12-22 21:39:08 -05:00
euromark
813925abee Backport Session consume() 2014-12-23 03:39:05 +01:00
mark_story
c540e2b798 Merge branch 'master' into 2.6 2014-12-22 21:38:58 -05:00
euromark
5af24bdb31 Correct array syntax. 2014-12-23 03:29:52 +01:00
euromark
515302528d Backport Configure::consume() to 2.x 2014-12-23 03:26:03 +01:00
euromark
0a974dd59f Adjust tests 2014-12-22 22:07:51 +01:00
Rachman Chavik
45be270a7b Enable use of Containable with TreeBehaviors 
This patch allows Containable use with:

- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
 2014-12-20 16:32:20 +07:00
Mark Story
1651e7742c Merge pull request #5088 from sebastienbarre/ticket-5041 
Ticket #5041: have Auth::login() send Auth.afterIdentify event
 2014-12-18 00:12:22 -05:00
mark_story
839ef73d43 Merge branch '2.6' into 2.7 2014-12-17 21:46:54 -05:00
mark_story
4d6611b328 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-12-17 21:38:32 -05:00
Walther Lalk
9be725613e Backport helper method for view blocks from 3.0 
Related PR is #5385
 2014-12-11 16:44:11 +02:00
OKINAKA Kenshin
8c008ad97d Update. 2014-12-11 13:55:41 +09:00
OKINAKA Kenshin
5cff6aa746 Fixing Mysql::describe() for timestamp. 2014-12-11 10:31:19 +09:00
mark_story
ac6d5cc70f Fix incorrect pluralization of Human. 
Human should become humans, unlike other words ending in man.

Fixes #5370
 2014-12-09 21:51:42 -05:00
Mark Story
1a1583a832 Merge pull request #5360 from ADmad/i18n-arabic 
Fix plural calculation for Arabic
 2014-12-09 12:54:02 -05:00
euromark
1e6876b627 Fix tests 2014-12-09 03:43:35 +01:00
euromark
f63d955f73 Add additional test. 2014-12-09 03:43:35 +01:00
euromark
dc41a1ff56 Fix paginator options when disabled. 2014-12-09 03:43:34 +01:00
euromark
e1c128bb99 Consolidate with conditions sniff. 2014-12-09 03:17:35 +01:00
ADmad
850edf47a0 Fix plural calculation for Arabic. 
Refs #5348
 2014-12-08 23:58:27 +05:30
mark_story
c32e165052 Merge branch '2.6' into 2.7 2014-12-06 21:29:13 -05:00
mark_story
ad2d6edda9 Merge branch 'master' into 2.6 2014-12-06 21:28:59 -05:00
euromark
11981f80fa Correct doc block. 2014-12-06 04:54:22 +01:00
mark_story
bbfe3170dc Fix incorrect hardcoded database name. 2014-12-01 23:03:47 -05:00
Guy Warner
327fcb4846 Fix some missed doc block issues 2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b Add @trigger doc blocks of methods triggering CakeEvent 2014-11-30 14:45:40 -07:00
mark_story
1c913d29b6 Merge branch '2.6' into 2.7 2014-11-29 22:00:24 -05:00
mark_story
543f05e3d0 Merge branch 'master' into 2.6 2014-11-29 22:00:00 -05:00
Florian Krämer
43f7fcc735 Adding a few more ways to detect HTTP headers, extensions and the accept header. 2014-11-27 01:00:44 +01:00
euromark
d0f75a03af Allow RLIKE in conditions. 2014-11-26 19:56:58 +01:00
mark_story
1e6d22b8cb Make the version option function as intended. 
The version option is documented but does not work. While this 'breaks'
behavior, it also fixes what I think is a more important issue.

Refs #5234
 2014-11-24 22:38:00 -05:00
Sebastien Barre
20e2882bf6 Remove duplicate class declaration 2014-11-23 21:49:29 -05:00
Sebastien Barre
5ac47487f9 Merge branch 'ticket-5041' of github.com:sebastienbarre/cakephp into ticket-5041 
Conflicts:
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
 2014-11-22 13:38:11 -05:00
Sebastien Barre
a2e7896038 Fix uses, style 2014-11-22 13:31:39 -05:00
Sebastien Barre
7da48669c8 Have BaseAuthenticate implement CakeEventListener instead 2014-11-22 13:31:38 -05:00
Sebastien Barre
50e5b5e8fe Move App::uses() again 2014-11-22 13:31:38 -05:00
Sebastien Barre
d7b353dcf9 Move App::uses(), rename helper class to avoid conflict 2014-11-22 13:31:38 -05:00
Sebastien Barre
43413f029e Ticket 5041: have Auth::login() send Auth.afterIdentify event 2014-11-22 13:31:38 -05:00
Florian Krämer
4ff07b745a Adding a test for the new json and xml detectors that were added to the CakeRequest class. 2014-11-22 17:30:53 +01:00
Florian Krämer
24c4cab4f3 phpcs fix in Cake/Test/Case/Network/CakeRequestTest.php 2014-11-20 22:50:12 +01:00
Florian Krämer
728764c543 Adding a test for the refactored CakeRequest code. 2014-11-20 21:14:17 +01:00
Rachman Chavik
7bea96f534 Add test for css() and script() with the same resource identifier 2014-11-19 11:20:37 +07:00
Mark Story
5dab175aa9 Merge pull request #5196 from cakephp/issue-5140 
Gracefully handle invalid chunks in HttpSocket
 2014-11-18 21:58:41 -05:00
ndm2
bae556e73f Prevent zero only lines from being emptied 2014-11-18 17:26:31 +01:00
mark_story
8cbf975943 Gracefully handle invalid chunks in HttpSocket 
When invalid chunks are detected we should assume the server is
incorrect and handle the remaining content as a single large chunk.

Refs #5140
 2014-11-17 22:23:46 -05:00
mark_story
e00aa596b1 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-11-14 21:25:24 -05:00
mark_story
decce4daf2 Merge branch 'master' into 2.6 2014-11-14 21:25:09 -05:00
Mark Story
f570f931ce Merge pull request #5159 from cakephp/issue-5155 
Add order=>false to all treebehavior queries.

Refs #5155
 2014-11-14 10:02:17 -05:00
mark_story
4b6dba0c0a Add order=>false to all treebehavior queries. 
Models can define default order conditions that will cause issues with
postgres. By setting order=>false on all the queries emitted by
TreeBehavior, we can avoid this issue and not have issues with models
that define a default ordering.

Refs #5155
 2014-11-13 21:21:47 -05:00
mark_story
6092c168a9 Fix issues with sqlite field parsing. 
The previous attempt would still fail on unions or derived table join
queries. This new approach is a bit slower but more robust.

Refs #3972
 2014-11-12 20:49:19 -05:00
mark_story
93a6fd5648 Fix SQLite parsing fields incorrectly when using subqueries. 
When using subqueries or joining against tables containing FROM the
results were bizzare and unexpected. By tokenizing the entire query we
can more accurately grab the fields.

Refs #3972
 2014-11-11 23:16:08 -05:00
euromark
8e18e5a1c7 Correct argument order for assert. 2014-11-11 01:51:46 +01:00
euromark
2990c2143c Correct assert argument order. 2014-11-11 01:49:19 +01:00
mark_story
3095187952 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-11-10 19:38:31 -05:00
mark_story
7718d473c4 Remove singularization on schema class names. 
Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.

Refs #4993
 2014-11-09 21:52:10 -05:00
ndm2
f0b6657113 Make unsetting the email pattern work as expected. 
When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
 2014-11-09 16:33:57 +01:00
Mark Story
4242ce453f Merge pull request #5093 from cakephp/2.6-returns 
Simplify return types.

Update code to use documented return types where possible, and reduce number of return types.
 2014-11-08 14:58:22 -05:00
euromark
41c646c5a1 Simplification of return types. No need to return more mixed than necessary. 2014-11-08 20:07:47 +01:00
mark_story
0e4fb9d648 Merge branch 'master' into 2.6 2014-11-07 15:13:46 -05:00
mark_story
6aaac6b7e2 Fix HttpSocket mishandling encoded URIs 
The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1
we'll continue to replace `%2F` and no longer decode the entire URI.

Fixes #5076
 2014-11-05 22:18:48 -05:00
Sebastien Barre
4bada05028 Fix doc/style 2014-11-05 18:37:20 -05:00
Sebastien Barre
ee73c1732b Have BaseAuthenticate implement CakeEventListener instead 2014-11-05 18:03:26 -05:00
Sebastien Barre
f78e6c0621 Move App::uses() again 2014-11-05 13:46:45 -05:00
Sebastien Barre
4c59ab6eca Move App::uses(), rename helper class to avoid conflict 2014-11-05 13:36:29 -05:00
Sebastien Barre
0cdb93b265 Ticket 5041: have Auth::login() send Auth.afterIdentify event 2014-11-05 12:34:25 -05:00
mark_story
07c91d4b3e Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-11-04 22:44:28 -05:00
mark_story
48101e6bf5 Merge branch 'master' into 2.6 2014-11-04 22:44:11 -05:00
euromark
e7f76a983a Add a method for generating pagination meta links. 2014-11-02 22:29:02 +01:00
Sebastien Barre
544ddac08c Fix indentation 2014-10-31 16:38:09 -04:00
Sebastien Barre
60917974bf Add test for userFields and related models 2014-10-31 16:35:55 -04:00
Sebastien Barre
f6c71024c5 Add test for the 'contain' setting, which was missing (unrelated to feature) 2014-10-31 16:04:09 -04:00
Sebastien Barre
2f62ee2cde ticket #5017 add userFields setting to BaseAuthenticate 2014-10-31 15:00:19 -04:00
mark_story
579b16d90b Merge branch 'master' into 2.6 2014-10-30 21:20:53 -04:00
euromark
0f9890720e Correct test 2014-10-31 01:45:41 +01:00
euromark
bb67df4305 Simplify test 2014-10-31 01:18:08 +01:00
euromark
70acd2fe3f doc block update. 2014-10-30 19:15:23 +01:00
euromark
e5b45bcdea Fix IN replacement in virtual fields for MYSQL. 2014-10-30 19:14:04 +01:00
Mark Story
94d56a3d74 Merge pull request #4985 from fixon/issue-2172 
Make CakeResponse::file() accept ranges even when download option is fal...
 2014-10-29 07:52:09 -04:00
José Lorenzo Rodríguez
9d0390ca63 Merge pull request #4953 from jrbasso/2.6-route-set-state 
Implementing __set_state for CakeRoute
 2014-10-28 09:36:42 +01:00
Juan Basso
6171ef69c3 Update test cases for CakeRoute::__set_state 
It removes the eval and test the __set_state more explicitly.
 2014-10-27 23:45:46 -04:00
mark_story
d228d83b1e Relative paths should be created relative to pwd. 
If create() is called with a relative directory and the path does not
exist, it should be created inside of the folder->pwd() and not inside
the process' cwd.

Refs #4990
 2014-10-27 21:32:28 -04:00
mark_story
ebc1bcb624 Add additional useful tests for autoLink() 
These new tests cover an important case that could easily be missed in
the future. Links with URL's should not be re-linked.

Refs #4998
 2014-10-27 21:03:03 -04:00
mark_story
177b797aab Merge branch 'master' into 2.6 2014-10-26 21:25:05 -04:00
Marek Władysz
65cb186652 Use assertNotSame() instead of assertTrue($result !== false) 2014-10-26 14:19:19 +01:00
Jan Ptacek
797635d26b fixing testcases + do not disable the hidden input on partial disables 2014-10-25 21:05:37 +02:00
Marek Władysz
090e85a5a4 Make CakeResponse::file() accept ranges even when download option is false. 2014-10-25 19:49:56 +02:00
mark_story
b5050db643 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-10-24 22:06:03 -04:00
mark_story
b98d2a3365 Merge branch 'master' into 2.6 2014-10-24 22:05:46 -04:00
Juan Basso
f7320cd8cd Fixed PHPCS issues 2014-10-21 23:47:17 -04:00
Juan Basso
b2a92f9cd8 Implementing __set_state for CakeRoute 
It helps the applications to cache the routes using var_export when possible.
 2014-10-21 23:04:08 -04:00
mark_story
cdc67116c5 Handle query string arguments in digest auth data. 
Handle &, ? in digest auth data uri.

Refs #4908
 2014-10-17 23:12:41 -04:00
Marc Würth
b3770974f1 Added tests for MySQL table comment feature 2014-10-16 16:44:09 +02:00
mark_story
4c93f103c7 Merge branch 'master' into 2.6 2014-10-15 23:28:27 -04:00
mark_story
afcd0312bf Fix Memcached test failures. 
The Memcached extension does not provide enough information to PHP's
Reflection API to allow mock objects to be generated correctly. We'll
skip the affected tests until php-memcached-dev/php-memcached#126 has
been resolved.
 2014-10-15 11:11:50 -04:00
mark_story
b86aae4d8b Add default prefix to RedisEngine 
This makes redis work like the other cache engines. Also by having
a default prefix the clear() method will not wipe all the data in the
current redis database.

Refs #4876
 2014-10-14 22:47:34 -04:00
José Lorenzo Rodríguez
e686a43524 Merge pull request #4867 from cakephp/issue-4694 
Fix getMockForModel() using the incorrect datasource.
 2014-10-14 14:13:01 +02:00
mark_story
1c440e2cb2 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-10-13 21:11:52 -04:00
mark_story
87fcc9f0b9 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-10-13 21:11:38 -04:00
mark_story
b55a88508f Fix PHPCS and PHP5.3 error. 2014-10-13 21:07:08 -04:00
mark_story
50b3893e65 Make rule sniff less complicated and tidy up doc block. 
Refs #4871
 2014-10-13 17:59:31 -04:00
Rachman Chavik
dc7b8cbb89 Add BC test for #4851 2014-10-13 19:40:30 +07:00
mark_story
9b9e886df6 Fix getMockForModel() using the incorrect datasource. 
Because getMockForModel() does not go through the test datasource
injection in ClassRegistry::init() we need to duplicate the basics of
that logic here. Thankfully, we already have a mock so we can do that
datasource switching without reflection. Of course this means there will
be limitations to how/when this will work, but I feel those scenarios
can probably be solved by not using mocks, or by mocking out the
problematic methods. This set of changes makes getMockForModel() work
with secondary datasources, as one would expect it to do, but I'm not
sure it ever did.

Refs #4694
 2014-10-12 22:30:22 -04:00
ADmad
6dc98afa1e Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-10-12 20:20:14 +05:30
Mark Story
63ffb2215b Merge pull request #4853 from ceeram/2.6-atomic-translate 
TranslateBehavior now uses original atomic option value, if set
 2014-10-10 17:48:31 -04:00
Ceeram
43e998422e Fix PHPCS errors 2014-10-10 16:52:01 +02:00
Ceeram
12ebf8b427 add test for atmoic save of TranslateBehavior 2014-10-10 16:44:01 +02:00
mark_story
39011cd9d8 Fix Model::isUnique() not working as a validator. 
While it *did* work for single fields, isUnique could not be used to
validate the uniqueness across multiple fields as documented. Because
validation methods pass arguments in an order the validator did not
expect the validation method would not work correctly.

Fixes #4571
 2014-10-09 22:49:17 -04:00
mark_story
0ff9545e5a Add test for find() and array conditions. 
Add a test for conditions using an array with only one element.

Closes #4848
 2014-10-09 19:58:18 -04:00
ADmad
94e718372a Make CakeSession::read() return null for all failure cases. 2014-10-09 19:27:27 +05:30
Ceeram
fcffe3961f Revert "add test to prove requesthandler works correct with Angular wonky accept headers" 
This reverts commit 8507ef83f1.

Incorrect header was used for this test, Cake cannot safely determine correct header.
To get CakePHP to respond with json, you can modify the angular common headers.
 2014-10-02 22:12:35 +02:00
Ceeram
8507ef83f1 add test to prove requesthandler works correct with Angular wonky accept headers 2014-10-02 16:07:10 +02:00
Schlaefer
fd2dd58360 code formatting, fixes PHPCS errors 2014-10-01 11:25:24 +02:00
Schlaefer
388e412a82 fixes failing test cases from last CakeTime::timeAgoInWords changes 
at b96eb1fb46
 2014-10-01 11:09:00 +02:00
Schlaefer
b96eb1fb46 cleans up CakeTime::timeAgoInWords and adds option for custom futures string 2014-10-01 10:35:41 +02:00
mark_story
af43bc1706 Merge branch 'master' into 2.6 2014-09-25 22:39:51 -04:00
euromark
9c8ab826bf Correct a few more misleading assert orders. 2014-09-24 14:34:24 +02:00
euromark
fce16189d5 Fix tests 2014-09-24 14:25:18 +02:00
mark_story
1877cab341 Fix UUID primary key columns not being reflected properly. 
When UUID columns are converted into varchar(36) they should also be
default = null, null = false.

Fixes #4695
 2014-09-23 22:16:18 -04:00
Yves
b70cb132fd Fix Hash::remove() removing data even if the path is not matched 2014-09-23 22:00:49 +02:00
mark_story
249dc5650b Merge branch 'relative-sprintf' into 2.6 
Refs #4550
 2014-09-22 20:56:33 -04:00
mstra001
d6abfcaf90 Update tests for strfime() in timeAgoInWords() 
Add test asserts for testTimeAgoInWordsWithFormat with strftime format
 2014-09-22 20:50:37 -04:00
mark_story
cf45d3fab8 Merge branch 'master' into 2.6 2014-09-22 20:46:28 -04:00
Mischa ter Smitten
a69e9bc63b Cs fixes 2014-09-18 10:50:35 +02:00
euromark
4d1a65ede2 Add intl email test. 2014-09-16 10:14:00 +02:00
wisoot
eb14a64d0b Check whether the filter key is a valid class name before assuming that value is class settings 2014-09-15 15:29:30 +10:00
mark_story
0d11cf7a33 Merge branch 'master' into 2.6 2014-09-14 23:26:33 -04:00
euromark
c65cb6f62b wording 2014-09-13 13:39:11 +02:00
antograssiot
0215ada9dd fix failling test on Jenkins after ee1e270 
This test is failling build on 2.5, 2.6 and 3.0 since #4477
 2014-09-13 08:19:40 +02:00
euromark
03d92494f1 Fix maxlength for manual type set and add textarea maxlength support. 2014-09-13 04:03:33 +02:00
ADmad
3fb252ad2f Merge branch 'master' into 2.6 2014-09-13 00:37:16 +05:30
Yves
90ad813b40 Fix Hash not returning correct value with special paths 
When doing a Hash::insert() with a part of the path starting with a '0', Hash::get() returned null even if the same path was used.
 2014-09-10 22:47:25 +02:00
euromark
04ef39217f Take care of more int casts. 2014-09-10 16:29:23 +02:00
euromark
e77f96d8b7 Use (int) cast instead of intval() function for performance reasons and to unify it. 2014-09-10 15:52:57 +02:00
mark_story
58bf005c09 Merge branch 'folder_overwrite_fix' 
Merge pull request #4521 into master.
 2014-09-09 21:33:29 -04:00
mark_story
86bc7f1861 Add tests for #4521 and reformat code. 
Add a regression test for #4521 as the original author didn't have one.
Reformat a long line since I was nearby already.

Closes #4521
 2014-09-09 21:33:17 -04:00
Marc Würth
6cac5d0af3 Removed use of @lastmodified annotation 2014-09-09 23:04:29 +02:00
Marc Würth
9812147779 Removed use of @modifiedby annotation 2014-09-09 23:03:43 +02:00
Marc Würth
80788c3c00 Removed use of @version annotation 2014-09-09 23:03:11 +02:00
mark_story
734bb9223b Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
 2014-09-06 23:04:20 -04:00
Mark Story
2311c13f12 Merge pull request #4417 from jeremyharris/3331 
Fix for #3331
 2014-09-04 20:26:55 -04:00
José Lorenzo Rodríguez
b5bfbfcf15 Merge pull request #4223 from chinpei215/2.6-issue2529-fix 
Fix different format of $results in afterFind
 2014-09-03 10:39:37 +02:00
ADmad
d60cd3ab2f Revert "Merge pull request #4405 from php-engineer/master-session-bugfix" 
This reverts commit 5863adda42, reversing
changes made to 4c37cf6d4b.

There was no real issue. The lack of session cookie in CLI makes writing
tests a bit tricky which caused the confusion. Refs #4405, #4451.
 2014-09-01 00:17:53 +05:30
mark_story
7c316bbc56 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/basics.php
 2014-08-30 21:28:11 -04:00
mark_story
c26b381469 Make words ending in data uninflected. 
Since both metadata and word ending in metadata have caused issues in
the past, uninflecting them seems like the best option. This will also
cover cases like ProfileData not being inflected to ProfileDatum which
seems like an improvement to me.

Fixes #4419
 2014-08-30 20:27:37 -04:00
Jeremy Harris
66b2173566 Made AuthComponent::mapActions() act as a getter refs #3331 2014-08-29 08:23:41 -05:00
Jeremy Harris
2dac6d29c2 Clearing HABTM (unique) when HABTM array is empty, refs #2461 2014-08-28 17:52:13 -05:00
chinpei215
010bbc6764 Resolve ambiguous column names for Sqlite 2014-08-27 16:06:28 +09:00
chinpei215
c06b7162ef Resolve ambiguous column names 2014-08-27 15:32:57 +09:00
chinpei215
31204832c2 Ensure that afterFind is called when using 'joins' with 'recursive' = -1 2014-08-27 15:16:13 +09:00
chinpei215
b74774bb0c hasOne/belongsTo associations should contain associated records in afterFind 
Before 1fe943d6f1,
afterFind() is called twice with belongsTo/hasOne associations.
Although $results also doesn't contain associated records on first time,
it contains them on second time.

After 1fe943d6f1,
it doesn't work if associated records are used in afterFind.
This commit fixes it.
 2014-08-27 09:32:00 +09:00
Mark Story
5863adda42 Merge pull request #4405 from php-engineer/master-session-bugfix 
CakeSession::delete() bugfix
 2014-08-26 12:43:02 -04:00
Stefan Dickmann
66ccfaf5e2 session bugfix 2014-08-26 17:47:45 +02:00
David Yell
04a8053af6 Update TagFixture.php 
Updated the tag fixture so that it doesn't break `CakeSchema::_arrayDiffAssoc()`
 2014-08-26 14:53:31 +01:00
ADmad
ff3273d8eb Merge pull request #4386 from cakephp/issue-4184 
Fix CURRENT_TIMESTAMP being stored as a default value.
 2014-08-25 21:06:41 +05:30
euromark
cc0acd1556 Fix CS. 2014-08-25 16:54:12 +02:00
mark_story
7936b5e764 Fix CURRENT_TIMESTAMP being stored as a default value. 
When reflecting timestamp columns in MySQL current_timestamp comes back
as the default value. This causes insertion errors later on as
'current_timestamp' is an invalid value for timestamp columns.

Refs #4184
 2014-08-25 11:17:11 +02:00
Mark Story
7a8cb4315e Merge pull request #4366 from hmic/ticket#2707 
Fixed i18n __*() bug
 2014-08-24 17:25:30 +02:00
Hans-Joachim Michl
b4620b4c6c Fixes #2707 
When the first variable argument = null, but there are more arguments given.
Added testcases to show the change (to fail before the fix)
 2014-08-24 14:27:49 +00:00
mathieu strauch
85cd11384a fix failing testLogError 2014-08-24 15:46:44 +02:00
mark_story
f0f1531fac Add test for #4309 
The Router internals don't handle // which is good.
 2014-08-24 12:13:05 +02:00
mark_story
4a805af5c6 Merge branch 'master' into 2.6 2014-08-23 09:20:19 +02:00
Jeremy Harris
8f420d74fa HttpSocket: not overwriting auth header if it is set in request configuration 2014-08-21 11:24:10 -05:00
mark_story
0400a63004 Forward port fixes for #4294 from 1.3 to 2.x 
CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
1969 on invalid input can be very confusing and un-helpful.

Refs #4294
 2014-08-20 00:25:01 +02:00
euromark
07937d5a5f Correct typo. 2014-08-19 13:49:34 +02:00
Marc Würth
edc6490f11 Removed Vendor folder from plugin baking task, updated test 2014-08-18 18:55:17 +02:00
Marc Würth
6e1b8f3ce8 Added missing folders to plugin baking task, updated test 2014-08-18 18:54:48 +02:00
ADmad
9d53a1e9ce Merge branch 'master' into 2.6 2014-08-15 12:37:13 +05:30
Brian Porter
9b9600fe18 CakeSchema naming fallback. 
Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility.

Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.
 2014-08-11 10:40:57 -05:00
chinpei215
c246695518 Fix different format of $results in afterFind 
Refs #2529

As of this commit, we can get consistent format of $resutls in afterFind.
And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
 2014-08-11 01:19:40 +09:00
chinpei215
c227c14bf2 Fix afterFind() called twice with hasMany relationship 
It occurs when a model and the children models are related to a same model.
For example, such as the following:

* User hasMany Comment
* User hasMany Article
* Article hasMany Comment
 2014-08-11 00:12:03 +09:00
mark_story
9c3089796f Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Model/Model.php
 2014-08-08 23:28:06 -04:00
mark_story
d114fa1431 Update join building to not error out on empty conditions. 
When conditions are empty we can assume one of two things:

* The person made a mistake.
* The person is doing the join conditions in the where clause.

In both cases we should attempt to generate proper SQL.

Fixes #4189
 2014-08-08 10:02:09 -04:00
José Lorenzo Rodríguez
64e74cbaac Merge pull request #4175 from chinpei215/master-issue2268-fix 
Fix afterFind() called twice with belongsTo and hasOne relationships
 2014-08-06 10:48:45 +02:00
Mark Story
221fc862aa Merge pull request #4140 from chinpei215/master-issue2849-fix 
Fix transactions do not get rollbacked in saveAssociated/saveMany.

Fixes #2849
 2014-08-05 20:05:15 -04:00
chinpei215
1fe943d6f1 Fix afterFind() called twice with belongsTo and hasOne relationships 
Refs #2268
 2014-08-06 07:27:04 +09:00
euromark
9ef7b5713a CS fixes. 2014-08-04 13:53:52 +02:00
chinpei215
cb376bf420 Add some more transaction tests 
And remove 2 else clauses.
 2014-08-03 22:34:11 +09:00
ADmad
713f430fc4 Merge branch 'master' into 2.6 2014-08-03 01:05:36 +05:30
chinpei215
799500ce6d Fix transactions do not get rollbacked in saveAssociated/saveMany 
Refs #2849
 2014-08-02 10:12:33 +09:00
chinpei215
3d77ce5d34 Fix serveral tests pass regardless of whether data is valid or not 2014-08-02 09:55:29 +09:00
chinpei215
f3e1a18740 Fix a fatal error occurs in combination with a scaffold error. 2014-07-31 05:49:23 +09:00
mark_story
f9785042bc Fix indentation. 
Refs #4108
 2014-07-29 21:53:55 -04:00
Steve Tauber
e6f6ded334 Adding unit test for HTTP DELETE and RequestHandlerComponent::requestedWith 2014-07-29 16:34:11 +02:00
ADmad
4e52941f59 Fix CS errors. 2014-07-27 12:54:15 +05:30
ADmad
9e21d048ce Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-07-27 12:29:39 +05:30
euromark
b188d670b7 Make year range validation less strict by default. 2014-07-26 04:06:26 +02:00
Mark Story
adf739b893 Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix 
Make SMTP auth reply code checks work properly.
 2014-07-24 08:42:22 -04:00
Rachman Chavik
aad89444d1 Fix: Blackholed request when POSTing to a URL with space 
Eg:

Actual Posted URL:
    /admin/settings/settings/prefix/Access%20Control
$_GET value:
    /admin/settings/settings/prefix/Access_Control

Since $unsetUrl differs, the $_GET value will get copied in to
CakeRequest::$query, causing CakeRequest::here() to return:

    /admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control=

This confuses SecurityComponent in the following line:

    f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)
 2014-07-24 16:25:03 +07:00
David Steinsland
6e777a54a3 Mocking _sendHeader instead of send() 2014-07-22 15:05:06 +02:00
David Steinsland
d98abc58d1 Added test case for CakeResponse::send() and ajaxLogin 2014-07-22 14:45:18 +02:00
Denys Kyselov
79dc624062 Add removeSubcommand in ConsoleOptionParser 2014-07-21 23:55:42 -04:00
mark_story
0d14bf7cc8 Update doc blocks. 
There were a few trailing comments in #3706 that have now been
addressed.
 2014-07-20 22:00:07 -04:00
Mark Story
7ef7ce2dbb Merge pull request #3706 from MelvinRoss/httpsocketheader 
Add support for specifying protocol in Cakesocket/HttpSocket.  Add HEAD function to HttpSocket
 2014-07-20 21:58:37 -04:00
mark_story
0dfce1abf3 Add . to the list of allowed characters. 
This was missed when the email validation rules were relaxed in
dc34d80f6f.

Fixes #4027
 2014-07-19 19:57:33 -04:00
Mark Story
dbe7329e54 Merge pull request #3703 from MMS-Projects/i18n-context-2.6 
Basic support for I18n contexts as requested by #2063
 2014-07-18 21:48:19 -04:00
ndm2
f03bf8067c Add some more exception message checks 2014-07-18 14:56:10 +02:00
ndm2
bf7d01ac66 Make SMTP auth reply code checks work properly. 2014-07-18 14:53:22 +02:00
Mark Story
d62d6061b2 Merge pull request #3906 from ravage84/hash-nest-exception 
Hash::nest() should throw an exception instead of returning an empty arr...
 2014-07-17 09:27:38 -04:00
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves cakephp/cakephp#2063 
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
 2014-07-17 11:01:11 +02:00
mark_story
051d78c1a5 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Model/Model.php
 2014-07-16 23:11:58 -04:00
Melvin Ross
09a7020119 Fix spacing to conform to coding standards 2014-07-14 14:54:26 -05:00
Melvin Ross
0eaf650d9f Test for new HEAD function inside HttpSocket 2014-07-14 14:34:27 -05:00
chinpei215
ca93bbcd15 Fix CS 2014-07-14 01:21:09 +09:00
chinpei215
ace30fdd8a Fix a race condition problem 
Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.

Refs #3857
 2014-07-12 23:27:39 +09:00
mark_story
03c2a8b722 Unify datetime column default values between MySQL and Postgres. 
Datetime columns should have 'default' => null, in both Postgres and
MySQL.

Fixes #3837
 2014-07-11 23:10:16 -04:00
mark_story
9fd1a51a52 Merge branch 'master' into 2.6 2014-07-10 14:39:32 -04:00
mark_story
a098d96c94 Remove flaky test that was of questionable value. 2014-07-10 14:39:20 -04:00
euromark
ac0053d660 Added a shorthand stackTrace() method 2014-07-10 01:49:28 +02:00
mark_story
3a70d9c033 Merge branch 'master' into 2.6 2014-07-09 10:17:05 -04:00
chinpei215
0c1fc36b14 Fix an infinite recursion caused by missing plugin 
When a MissingPluginException has caught when rendering an exception,
we should disable the plugin as needed to prevent an infinite recursion.
 2014-07-09 15:55:41 +09:00
Marc Würth
c321a8fa93 Hash::nest() should throw an exception instead of returning an empty array 
Refs: https://github.com/cakephp/cakephp/pull/3498#issuecomment-48316204
 2014-07-08 13:01:02 +02:00
Schlaefer
1e961a8aac increases time window in CSRF token expiry tests to 2 seconds 
travis-cs failed with 1 second margin
 2014-07-06 13:54:24 +02:00
Schlaefer
9fa7afa354 fixes #3887 CSRF reusable token expires 2014-07-06 10:39:00 +02:00
José Lorenzo Rodríguez
396725dc8c Merge pull request #3880 from markstory/incorrect-validation 
Fix issues with Validation::inList() and SecurityComponent
 2014-07-05 14:41:15 +02:00
ADmad
1eccec02e4 Merge pull request #3872 from CostaC/response-sharable-fix 
Fix for CakeResponse::sharable() header to include private caches
 2014-07-04 10:32:51 +05:30
mark_story
3936cce4b8 Disallow hexadecimal input with inList. 
Instead of turning on/off strict mode based on the user supplied input,
cast everything to strings and always use a strict check. This avoids
the potential issue of a bad user using hexadecimal when they should not
be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.
 2014-07-03 22:10:49 -04:00
Costa Caruso
4f559f5cc9 Fixed failing test for CakeResponse::sharable + spacing 2014-07-03 15:03:48 -04:00
ADmad
e410501791 Fix CS errors. 2014-07-03 23:13:55 +05:30
mark_story
2bcd817367 Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines. 
Remove superfluous empty lines.
 2014-07-03 15:36:42 +02:00
mark_story
b1610c145e Merge branch 'master' into 2.6 2014-07-02 23:39:16 -04:00
mark_story
adcf9ab723 Fix failing test. 
CakeEmail now has a default validation pattern.

Refs #3742
 2014-06-30 13:29:39 -04:00
mark_story
dc34d80f6f Relax email validation rules even more. 
While filter_var() allows a number of email addresses that
Validation::email() does not, it misses out of email address that
contain IDN host names, and unicode mailboxes. Both of these are
generally deliverable, and should be permitted. filter_var() also fails
on local mailboxes like `root@localhost` which is useful in the context
of cron jobs.

Fixes #3742
 2014-06-30 10:42:37 -04:00
mark_story
30952f2b64 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-06-29 22:57:59 -04:00
Derek Perkins
b1a3ab9e64 Added unit test for CakeRequest::setInput 
Don't use mocks as the tests weren't really testing anything when mocks
were involved.

Refs #3764
 2014-06-29 22:55:38 -04:00
ADmad
607200fa7b Add pluralization rule for "stadia". 
Refs #3830
 2014-06-29 14:51:23 +05:30
Mark Story
187272c06a Merge pull request #3824 from NickBeeuwsaert/element_events 
Added view type getter and ensured element render events would get the proper type
 2014-06-28 06:21:46 -04:00
Nick Beeuwsaert
733a610bf7 More coding standard fixes 2014-06-27 18:03:29 +00:00
Nick Beeuwsaert
6623a8a7f4 Adhering to CakePHP coding standards 2014-06-27 17:28:43 +00:00
Nick Beeuwsaert
f9aa954562 Changed Event names back, added view type getter 
Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter for
`View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected

Changed Event names back, added view type getter

Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter and
setter for `View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected
 2014-06-27 15:40:12 +00:00
Bryan Crowe
a1ae31e554 Fix identifier typos 2014-06-26 23:06:08 -04:00
Renan Gonçalves
1a89a3cb9d Exiting with 1 when Exception::getCode() returns non-integer values. 
From php.net/exception.getcode
> Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException).
 2014-06-26 13:26:20 +02:00
Nick Beeuwsaert
7cef19fe96 Changed View::element() to have an appropriately named event 
And also made it so when the event fires the subjects type is
`View::TYPE_ELEMENT`. Wrote some tests which I hope are done right I
don't really know the bes way to write a test for a event listener
 2014-06-25 22:08:59 -05:00
mark_story
a2673d8bf0 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Core/App.php
 2014-06-25 09:22:10 -04:00
mark_story
a40fa5cae9 Add test for #3754 2014-06-25 09:19:24 -04:00
José Lorenzo Rodríguez
3df972faa2 Merge pull request #3782 from cakephp/issue-3779 
Whitelist more URL-y characters in digest parsing.
 2014-06-24 21:56:40 +02:00
euromark
26fe1265ab Mark App::pluginPath as deprecated and don't use it anymore. 2014-06-24 11:52:29 +02:00
mark_story
b4bcd74e60 Whitelist more URL-y characters in digest parsing. 
Android clients include a full URL instead of just the URI. Also handle
situations where URLencoded bytes and document fragments are used.

Refs #3779
 2014-06-23 14:39:35 -04:00
ADmad
9a1a965b1c Update isAbsolute() to recognize stream wrapper paths. 
This has the benefit that the realpath() method is not applied to a
registered stream wrapper in the constructor of the Folder class.
Using the realpath() method will break the stream.

Thank "davalb" for the original patch.
 2014-06-22 13:43:14 +05:30
mark_story
497ecd3f80 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-06-19 21:41:02 -04:00
mark_story
9136f63874 Fix autoLinkEmail() not working when emails are adjacent to HTML. 
When an email address is adjacent to HTML it should be autolinked
correctly.

Refs #3656
 2014-06-16 21:48:30 -04:00
mark_story
74d8e9ea40 Convert test to use a dataprovider instead of multiple calls. 
Dataproviders are generally a bit easier to work with in the future.
 2014-06-16 21:46:34 -04:00