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
18518 commits 7 branches 0 tags 44 MiB
Commit graph

7212 commits

Author SHA1 Message Date
Mark Story
58bede76d1 Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware 
Make fixture import from table aware of records found
 2015-08-03 16:01:35 -04:00
José Lorenzo Rodríguez
b89ac18e55 Merge pull request #7147 from cakephp/issue-7118 
Fix incorrectly parsed mo file context.
 2015-08-02 11:30:46 +02:00
Marc Würth
27c88a872b Use tabs and single spaces in all .htaccess files 2015-08-01 00:39:10 +02:00
mark_story
a73fc25657 Fix incorrectly parsed mo file context. 
The context from mo files should be parsed correctly.

Refs #7118
 2015-07-30 22:28:55 -04:00
mark_story
26ab829d5a Bootstrap Configure after the mb_* shims have been defined. 
By bootstrapping after the shims have been defined allows the shims to
be used by Inflector which is often involved with bootstrapping.

Refs #7135
 2015-07-29 22:01:27 -04:00
José Lorenzo Rodríguez
355eb1859c Merge pull request #7106 from cakephp/issue-7098 
Consistently remove plugin names in object collections.
 2015-07-28 15:58:41 +02:00
mark_story
58ea40e32c Don't stop reading when only a '0' has been read. 
Make tests simpler by using onConsecutiveCalls() instead of trying to
maintain mock method indexes.

Refs #7121
 2015-07-27 22:40:27 -04:00
Mark Story
97be4f893a Merge pull request #7117 from Tijme/2.7 
Disable SNI in HttpSocket
 2015-07-27 16:57:53 -04:00
t.gommers
b16d627b36 Disable SNI in HttpSocket 2015-07-27 13:03:21 +02:00
Mark Scherer
a239324a0d use constant PHP_SAPI 2015-07-26 15:35:03 +02:00
mark_story
7f6ab82c9b Merge branch '2.7' into 2.8 2015-07-25 21:49:03 -04:00
Mark Story
de4b44a37b Merge pull request #7077 from dereuromark/2.7-static 
Replacing self with static due to PHP5.3+. Following #7040.
 2015-07-23 22:27:37 -04:00
mark_story
b3a192add0 Add warning for irregular method. 
Refs #7096
 2015-07-23 21:49:22 -04:00
mark_story
418dcfd7f8 Consistently remove plugin names in object collections. 
We were sometimes removing plugin prefixes (set, and some subclass
methods). But many other methods were missing the pluginSplit() feature.
This change makes all of the methods in ObjectCollection strip plugin
prefixes, which increases consistency across the framework.

Refs #7098
 2015-07-23 21:46:21 -04:00
mark_story
45877df3eb Update version number to 2.7.1 2015-07-23 21:08:54 -04:00
Marc Würth
b412b405f9 Make fixture import from table aware of records found 2015-07-23 18:03:42 +02:00
Marc Würth
71e4ed91af Slightly improve the bake templates 2015-07-23 17:29:47 +02:00
antograssiot
94b2ea29a6 enable colors for windows ConEmu user 
backport of #7090
 2015-07-23 05:49:15 +02:00
Mark Story
e19f621314 Merge pull request #7086 from cakephp/issue-7069 
Fix issues saveMany & saveAssociated with boolean values.
 2015-07-22 22:01:39 -04:00
Yoshiyuki Kinjo
00919c5f01 Fix FormHelper::input ignoring value option. 
Signed-off-by: mark_story <mark@mark-story.com>

Backport fixes from #7082 to 2.7
 2015-07-22 22:00:20 -04:00
Yoshiyuki Kinjo
e25be3a47e Add failing test for FormHelper::input 
FormHelper::input does not respect 'value' option when form is of date/time type.

Signed-off-by: mark_story <mark@mark-story.com>

Backport fixes from #7082 to 2.7
 2015-07-22 21:59:44 -04:00
mark_story
c6e5026767 Fix issues saveMany & saveAssociated with boolean values. 
For non-atomic, save operations that include models with boolean fields.
The first false value would cause the save to abort. This regression was
introduced in #6947. Instead of checking the data from save() we should
be boolean casting save() to capture the success/failure.

Refs #7069
 2015-07-22 00:41:10 -04:00
mark_story
e4b2428735 Fix PHPCS errors. 2015-07-21 16:28:17 -04:00
Yoshiyuki Kinjo
5de9b022ea Fix FormHelper::input ignoring value option. 2015-07-21 23:04:20 +09:00
Yoshiyuki Kinjo
0e0775559c Add failing test for FormHelper::input 
FormHelper::input does not respect 'value' option when form is of date/time type.
 2015-07-21 22:58:50 +09:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02:00
mark_story
bd23fdeebf Simplify code and reduce test redundancy. 
We don't need the additional parameter, and some of the tests weren't
covering unique scenarios.

Refs #7040
 2015-07-20 22:16:50 -04:00
Chris Valliere
64f0ca0028 Fix Hash::maxDimensions 
The current Hash::maxDimensions function calls Hash::dimensions to try
to get the maximum depth of the passed in array.  However, this ends up
only getting the depth of the first element of each 1st dimension
element in the array passed to maxDimensions.  The function needs to be
called recursively in order to get the depth of ALL of the elements in
all of the dimensions of the passed in array.

I made the maxDimensions function more closely resemble the deprecated
Set::countDim function in order to restore the correct functionality.
 2015-07-20 22:07:58 -04:00
Chris Valliere
7b2d7ad748 Test Case for Hash::maxDimensions 
Added test case for Hash::maxDimensions using the example array in pull request #7040.
 2015-07-20 22:07:58 -04:00
David Yell
4af2e5489b Update deprecated method in docblocks 
So that the docblock doesn't point you to another deprecated method which then points you to the actual method.
 2015-07-17 16:14:06 +02:00
mark_story
9b313f86e4 Add tests for #7034 
These tests ensure that redirect() is never called which ensures the
Location header is never set. Ajax requests when no loginElement is
defined should get an empty response with a 403 status code.
 2015-07-16 23:00:20 -04:00
adam1010
1922a18d07 Ajax requests not properly returning 403 
When an AJAX request is made to a page that's not authorized, an infinite redirect loop to  /status:403/exit:1  is triggered. This bug has existed at least since CakePHP v2.3.0. The main use case is when a user's session has expired and they try to use an authenticated feature as a logged-out user.
 2015-07-16 22:47:13 -04:00
David Yell
cfabc9a719 Update deprecated method in docblocks 
So that the docblock doesn't point you to another deprecated method which then points you to the actual method.
 2015-07-16 11:37:41 +01:00
Mark Story
6fa3195de1 Merge pull request #7005 from wnasich/pot-without-references 
Generate .pot files without references
 2015-07-15 21:34:38 -04:00
Walter Nasich
9d74bb289c Fixing a coding standars issue 2015-07-14 00:04:04 -03:00
Walter Nasich
80896cef2a Replacing param --locations by boolean flag --no-location 2015-07-13 19:47:26 -03:00
mark_story
4b974aeef2 Merge branch '2.7' into 2.8 2015-07-13 11:49:50 -04:00
Mark Scherer
d98e7d8d27 Fix tests. 2015-07-13 08:37:11 +02:00
Mark Scherer
2eea245491 Backport utf fix for CakeText::tokenize(). 2015-07-13 08:23:05 +02:00
Walter Nasich
06b8cb0c30 Renaming option 'headers' to 'locations' 2015-07-13 00:54:11 -03:00
Walter Nasich
67d81e499e Removing trivial asserts from UT 2015-07-12 23:30:14 -03:00
Walter Nasich
44756eaac5 Adding a new option to i18n shell to generate .pot files without sentence references 2015-07-12 23:08:50 -03:00
mark_story
47dd42ae84 Start 2.8 branch. 2015-07-11 21:54:32 -04:00
mark_story
e07b64f4e3 Update version number to 2.7.0 2015-07-11 21:34:20 -04:00
mark_story
47378427e3 Merge branch '2.6' into 2.7 2015-07-11 21:25:26 -04:00
mark_story
65c1745349 Add missing parameter to rawQuery() 
Previously bound parameters were put in the incorrect position.

Refs #6992
 2015-07-10 12:56:49 -04:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
Anne
b4b10e75ac Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like: 
- Method _toString is not implemented for translated
 2015-07-08 09:35:06 -04:00
Anne
64951a3e7e Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like: 
- Method _toString is not implemented for translated
 2015-07-08 11:23:29 +02:00
Mark Story
97656d8edb Merge pull request #6965 from dy-dx/backport-csv-mapping 
Don't map text/plain to csv. Backport from 3.0. Refs #1696
 2015-07-07 22:07:02 -04:00
mark_story
7613e720e7 Fix PHPCS errors. 2015-07-07 22:06:47 -04:00
mark_story
59a18e7709 Merge branch '2.6' into 2.7 2015-07-07 22:05:56 -04:00
Chris Kim
94fbc6e5f2 Don't map text/plain to csv. Backport from 3.0. Refs #1696 
Jquery sets accepts header similar to "text/plain, */*; q=0.01" by
default for xhr requests. Due to this RequestHandler used to set
extension to csv thereby causing View class to look for views under
non-existent csv folders.
 2015-07-07 15:19:45 -04:00
mark_story
4102961cb5 Add tests for #6879 
I wasn't able to reproduce the issue the reporter had, but we have more
robust tests now.
 2015-07-06 22:43:52 -04:00
hiromi2424
deb62c8887 #6935 Fix deep saving for hasMany could not handle validation errors correctly 2015-07-04 06:10:58 +00:00
mark_story
c037e04ace Update version number to 2.6.8 2015-06-29 22:35:55 -04:00
mark_story
cbd45f702d Make FlashComponent/FlashHelper more backwards compatible. 
Merge branch 'issue-6874' into 2.7.

Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
 2015-06-26 22:05:32 -04:00
mark_story
97c5463387 Fix failing tests. 
FlashHelper uses `Message` not flash now. This is more backwards
compatible with 2.x

Refs #6874
 2015-06-26 22:04:00 -04:00
mark_story
e651d15df5 Add tests for less greedy field parsing in SQLite. 
Refs #6887
 2015-06-25 22:21:38 -04:00
Lawrence Barsanti
0b28c2e839 Added negative lookahead 
It is possible to have multiple occurrences of 'as' in a field name.
Use the last occurrence of 'as' when extracting field name.

Tested with following examples:
"WeldCheck"."weld_id"
count(*) as WeldCheck__num_measurements
count(case decision when 2 then 1 else null end) as
WeldCheck__num_failures
avg(cast (WeldMeasurement.surface_indentation as bigint)) as
WeldCheck__avg_indentation
avg(cast (WeldMeasurement.circle_diameter as bigint)) as
WeldCheck__avg_diameter
 2015-06-25 22:21:38 -04:00
mark_story
ae2ea1ea6c Merge branch '2.6' into 2.7 2015-06-25 21:50:47 -04:00
Highstrike
a9d77d26f0 fix failing tests 
fixing...
 2015-06-25 13:40:50 +03:00
mark_story
2f616a9e0c Fix greedy regex operators in Postgres driver. 
`*` is greedy in regex, and needs to be escaped so that SQL operators
don't cause invalid SQL conditions to be created.

Refs #6877
 2015-06-24 23:39:26 -04:00
Mark Scherer
1c56c723f5 Backport param() access. 2015-06-25 00:52:33 +02:00
Highstrike
8257100f54 How about this? 2015-06-24 15:46:48 +03:00
Highstrike
ef1fc7dfef PHPCS 2015-06-24 15:18:57 +03:00
Highstrike
833c747b41 Test append PR to Issue 
This commit fixes #6874
 2015-06-24 14:18:14 +03:00
Highstrike
7cdf19363d Tab instead of space 
IDE preference
 2015-06-24 14:09:32 +03:00
Highstrike
58983f717a 2.7.0-RC Auth doesn't use the new Flash component 
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
 2015-06-24 14:06:35 +03:00
Mark Story
0841c04351 Merge pull request #6853 from cakephp/2.6-template 
Cleanup method calls.
 2015-06-22 10:53:32 -04:00
Mark Scherer
fc57e43a5b Adjust tests. 2015-06-21 12:13:09 +02:00
Humberto Pereira
77150eb6f6 fixed tests cases to print html 2015-06-20 22:19:08 -04:00
Humberto Pereira
26630991a6 CakeShells should not print html in case of a error 2015-06-20 22:19:07 -04:00
Mark Scherer
6e5381a4e3 Cleanup method calls. 2015-06-20 23:27:32 +02:00
mark_story
26b3713bd6 Merge branch '2.7' of github.com:cakephp/cakephp into 2.7 2015-06-20 10:03:24 -04:00
mark_story
664ba53c89 Merge branch '2.6' into 2.7 2015-06-20 10:03:14 -04:00
Mark Scherer
1d03d5bd59 Consolidate template whitespace 2015-06-20 05:10:35 +02:00
mark_story
705f44e30a Fix regression where attributes were created with no whitespace. 2015-06-19 22:00:27 -04:00
Mark Scherer
4025f2fb22 add cast for clarification and to allow int 0. 2015-06-17 12:38:06 +02:00
Mark Scherer
1b81323462 Use strict check 2015-06-17 12:06:56 +02:00
Mark Scherer
7dedf7f86d Refactor cleanly. 2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c img tag needs manual space 2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be Remove overhead whitespace in templates. 2015-06-17 11:04:04 +02:00
Mark Scherer
ccac3b3e06 Allow deep options for radio() just as for select(). 2015-06-16 13:23:51 +02:00
Mark Story
65b64e0348 Merge pull request #6816 from cakephp/2.6-fix-validation-multiple 
Fix Validation::multiple() regarding 0 value.
 2015-06-15 12:20:13 -04:00
mark_story
97be9b9696 Fix PHPCS errors. 2015-06-15 12:19:20 -04:00
Mark Scherer
86c358f3f9 Fix Validation::multiple() regarding 0 value. 2015-06-15 16:35:27 +02:00
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
c3080873b9 Update version number to 2.7.0-RC 2015-06-14 22:50:05 -04:00
mark_story
947262e754 Fix PHPCS errors. 2015-06-14 21:56:48 -04:00
mark_story
ebb01f0fac Merge branch '2.6' into 2.7 2015-06-14 21:52:53 -04:00
Marc Würth
f3099fefdf Define code coverage explicitly 2015-06-15 00:56:09 +02:00
mark_story
56143c663e Update doc blocks for CakePlugin::load(). 
Refs #5665
 2015-06-11 22:17:18 -04: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
0524eb95ae Documentation update 2015-06-01 16:14:15 +02: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 Scherer
2a5cbb8037 Add missing static keyword. 2015-05-31 13:40:22 +02:00
mark_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04:00
mark_story
523597df43 Update version number to 2.6.7 2015-05-28 19:30:33 -04:00
mark_story
65691836be Fix syntax errors in PHP <5.4 2015-05-28 17:39:52 -04:00
mark_story
b66c1ce53c Update version number to 2.6.6 2015-05-28 09:50:27 -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
mark_story
dddc504f87 Merge branch 'issue-6635' into 2.6 
Fixes FormHelper generating invalid ID attributes when multibyte values
are used.
 2015-05-26 22:51:13 -04:00
mark_story
733ddc7ff4 Use mb* functions in Inflector humanize/underscore. 
Use the mbstring shims we already provide to make Inflector more robust
than it currently is. This solves the invalid ID attribute generation in
a way that never varies between environments.

Refs #6635
 2015-05-26 22:51:00 -04:00
Igor Padovan da Silva
bf550d13ce preventing error on trying to delete unexiting buffer 2015-05-26 17:46:08 -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
15f88533e8 Update version number to 2.6.5 2015-05-24 21:01:09 -04: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
29747995dc Add missing minimizable HTML attributes 2015-05-18 18:10:02 +02:00
Mark Scherer
f742fa51fe Dont include deprecated options for bake 2015-05-17 23:24:23 +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
mark_story
6ffc9670d2 Document missing option in loadAll(). 2015-05-13 22:37:52 -04: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
ovidiupruteanu
a55685c278 Replace preg_replace with basename in SchemaShell 2015-05-11 14:52:31 +03:00
ovidiupruteanu
4b3386c16f Replace rtrim with preg_replace in SchemaShell 
The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.
 2015-05-11 14:35:20 +03:00
mark_story
6cb21e6dc8 Change default value to allow code coverage on non-app files. 
Don't default to app, as it prevents generating code coverage for core
and plugin files.

Fixes #6533
 2015-05-10 21:34: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
8e618ed9e6 Fix documentation regarding attributes 2015-05-02 14:31:38 +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 Scherer
c31fcd6f39 Correct default value to false. 2015-04-21 14:32:34 +02:00
Mark Scherer
8cdf222cc0 Also fix hour() 2015-04-20 22:04:33 +02: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 Scherer
a9ae7fd5bb Fix year form field when magic input wrapper is used. 
s
 2015-04-20 18:31:00 +02:00
mark_story
f925511a54 Update version number to 2.6.4 2015-04-19 21:10:15 -04:00
Marc Würth
b19b76b9f2 Fix parameter type annotation 
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L265
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L293
 2015-04-13 18:20:16 +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
mark_story
b2958dad79 Re-add call to parent destructor. 
In 762ebd4 a destructor was added to DboSource, this accidentally
removed the rollback on destruct that Datasource provides. Restoring
this via a parent call allows pending transactions to be rolled back at
the end of a request.

Fixes #6251
 2015-04-01 20:37:06 -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
446dd408bb Renew the session even the session id is '0'. 
This fixes AuthComponent not being able to log a user in when they
inadvertently change their session id to 0.

Refs #6053
 2015-03-29 21:42:43 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
mark_story
b80e02c114 Fix coding standards errors. 
* Line lengths
* Whitespace.

Refs #2057
 2015-03-23 22:31:09 -04:00
Richard van den Berg
1d0d20e974 Account for SNI changes in HttpSocketTest 2015-03-23 22:31:08 -04:00
Richard van den Berg
1f7b787236 Use $host parameter 2015-03-23 22:31:08 -04:00
Richard van den Berg
9e6b1b6930 Support for SSL Server Name Indication 2015-03-23 22:31:08 -04:00
Richard van den Berg
23d4d1155a Do not use full uri in request line for HTTPS requests via proxy 2015-03-23 22:31:08 -04:00
Richard van den Berg
15c80f7c3d Move proxy code inside if (->connected) 2015-03-23 22:31:05 -04:00
Richard van den Berg
7704efdb28 Use feof() in while loop 2015-03-23 22:31:05 -04:00
Richard van den Berg
3995c70046 Strict === and space 2015-03-23 22:31:04 -04:00
Richard van den Berg
bb8e0ae835 Use enableCrypto() 2015-03-23 22:31:01 -04:00
Richard van den Berg
54a3f8724b Addapted quick hack from issue #2057 for 2.6.3 2015-03-23 22:31:01 -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
Dave Hensley
0003296f42 Add CAKE directory fallthrough for plugins/vendors 
Fixes issue #6124.
 2015-03-20 17:35:19 -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
Edgaras Janušauskas
b444fe7b81 Do not warn about i18n functions definitions on extract task 2015-03-16 23:16:50 +02:00
mark_story
02c40d5ca5 Update version number to 2.6.3 2015-03-15 22:06:30 -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
mark_story
8cadb553d7 Merge branch 'master' into 2.7 2015-03-14 22:08:53 -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
5002bd4dbe Use fall back json_last_error_msg 2015-03-14 09:21:15 +00:00
Rob McVey
10cfb878be fallback implementation of json_last_error_msg 2015-03-14 09:13:31 +00:00
Rob McVey
bcb6549565 add throws tag to function comment 2015-03-14 08:45:18 +00:00
Rob McVey
842cdf58f8 Don't translate errors 2015-03-14 08:34:06 +00:00
Jonas
5f40161e24 2.6.2: cake bake / ModelTask should respect decimal 
PR for https://github.com/cakephp/cakephp/issues/6066
 2015-03-13 21:35:12 +01:00
Rob McVey
3b01c5f842 suppress warnings so test runner doesn't fart 2015-03-13 16:58:29 +00:00
Rob McVey
b880714231 coding standards elseif 2015-03-13 16:27:24 +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
8e735c2db0 Fix class name in scaffold error. 
Fixes #6061
 2015-03-12 22:00:03 -04:00
David Yell
24edae5792 Update App.php 
Add a missing apostrophe
 2015-03-12 15:26:59 +00:00
Marc Würth
4f9d764fc2 Fixed link to cookbook 2015-03-11 11:27:30 +01:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
mark_story
cad57dcc28 Use DS instead of checking both slash styles. 
Refs #5905
 2015-03-09 21:55:07 -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
Chris Valliere
0dca5c8877 Using App::uses('CakeLog', 'Log') twice 
I think this was accidentally added twice?
 2015-03-06 13:41:40 -05:00
ADmad
7173f21dc8 Type hint model param 2015-03-04 21:15:24 +05:30
ADmad
a1286e9e7d Prefix fields with model alias 2015-03-04 21:11:18 +05:30
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
José Lorenzo Rodríguez
bc4bca9737 Merge pull request #5974 from cakephp/issue-5838 
Make global paths for vendors and plugins based on ROOT.
 2015-02-27 09:16:19 +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
aec0241a4c Make global paths for vendors and plugins based on ROOT. 
Using CAKE means that composer installed CakePHP will generate incorrect
'global' paths.

Refs #5838
 2015-02-26 12:49:04 -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
AD7six
5342605d92 The parentheses were unbalanced 2015-02-23 15:21:39 +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
Michael Houghton
4f2ed15612 fix for confirm message on the bake templates 2015-02-21 10:21:37 +00: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
mark_story
3fee5b9eaa Update version number to 2.6.2 2015-02-19 07:34:27 -05:00
Jan Dorsman
e3b5306521 Fixing issue #5764 2015-02-19 12:19:27 +05:30
Mark Story
c8ca7cbfd9 Merge pull request #5890 from cakephp/issue-5889 
Fix doubly linking URLs starting with //
 2015-02-16 20:09:25 -05:00
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
ADmad
18246daf17 Merge branch 'master' into 2.7 2015-02-15 21:15:02 +05:30
Mark Story
10b6ba7dc2 Merge pull request #5903 from cakephp/tree-optimization 
Reduced code nesting.
 2015-02-15 10:35:43 -05:00
ADmad
bdc6a1f010 Fix CS error 2015-02-15 19:22:44 +05:30
ADmad
0750a63ed4 Make code DRYer. 2015-02-15 18:36:30 +05:30
Markus Fischer
546941a79b i18n: Remove POT-Creation-Date 
Prevent app locale files getting marked as modified in VCS even if the actual
content didn't change.

Fixes #5887
 2015-02-15 12:38:48 +01:00
ADmad
844b4beaa6 Reduced code nesting. 2015-02-15 16:30:43 +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
James Tancock
3cee029aa7 Removed usage of __() for InternalError 2015-02-12 15:09:18 +00: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
James Tancock
1cb670bdfa Add deprecated doctag for current methods 2015-02-10 08:15:01 +00: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
David Yell
703be31c83 Update phpunit.php 
PHPUnit can no longer be installed using pear
 2015-02-05 12:02:18 +00:00
Emil Møller
3f715c4262 Load ClassRegistry Once 2015-02-04 21:29:16 +01: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
James Tancock
2ff6bdccec Back port of Flash component & helper 2015-02-04 12:18:31 +00:00
Rachman Chavik
acd32b71fe Fix: "bake plugin" generates incorrect directory for View/Layouts 2015-02-04 15:47:01 +07:00
James Watts
970cb81d03 Typo typo 2015-02-02 02:07:13 +01: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
tgskiv
97c6850005 Let IDE work better with ClassRegistry::init() 
This small change will allow some IDEs like NetBeans to work with returned object like with a instance of $class parameter.
I`m sure, this will help Cake users a lot!
 2015-01-27 19:06:46 +02: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
4fa5dd62c5 Remove conditional status setting. 2015-01-26 23:47:20 +01:00
Mark Scherer
70276b7a7a Doc block adjustment. 2015-01-26 10:35:02 +01:00
Mark Scherer
e753fbadca Fix ControllerTestCase redirect 2015-01-26 10:31:04 +01: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
5e89e893f2 Ignore counter cache also 2015-01-23 08:30:34 +00:00
AD7six
c0ee49fe88 Remove callbacks to speed up saving 2015-01-23 08:30:26 +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
4e33ef0386 Merge branch 'issue-5712' into master. 2015-01-21 23:32:25 -05:00
mark_story
58334996a2 Fix PHPCS errors. 2015-01-21 23:32:08 -05:00
Mark Story
49a08dc259 Merge pull request #5709 from cakephp-fr/2.x-pot-files 
put message in cake.pot file instead of default.pot
 2015-01-21 23:24:41 -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
Richan Fongdasen
fd47d26f6b Keep the user agent list in alphabetical order 2015-01-21 22:50:46 +07:00
cake17
2c251b80af put message in cake.pot file instead of default.pot 2015-01-21 16:41:34 +01:00
Richan Fongdasen
a7d604bca8 Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706 2015-01-21 13:47:03 +07:00
Mark Story
3cc3db8380 Merge pull request #5681 from robertpustulka/2.7-short-plugin-shell 
2.7 - Short plugin alias in shells
 2015-01-19 21:44:47 -05:00
mark_story
511ee1f776 Fix strict error with 2.6 code. 2015-01-19 21:43:14 -05: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
f4933b29a8 CS fix 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
David Steinsland
e5d1846d4b Fixed PHP 5.2 compatibility 2015-01-16 16:02:44 +01:00
David Steinsland
e37db25ce0 Change configuration property to static class property 2015-01-16 14:47:44 +01:00
Mark Scherer
d37721ab0e Fix notice in PaginatorHelper when model params are not available. 2015-01-16 14:11:32 +01:00
mark_story
09e5e43d09 Update version number to 2.6.1 2015-01-15 21:36:35 -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
8969565526 Merge pull request #5675 from cakephp/master-docs 
Correct CakeSocket docblocks.
 2015-01-15 21:27:30 -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
Mark Scherer
2b1e487530 Correct CakeSocket docblocks. 2015-01-15 23:39:09 +01:00
David Steinsland
a5e1be7abf Fixed tests 2015-01-15 23:11:36 +01:00
David Steinsland
e5134986e6 Reset Exception.bail just in case 2015-01-15 20:10:48 +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
David Steinsland
687d0b44f5 Backport of https://github.com/cakephp/cakephp/issues/5667 2015-01-15 11:00:27 +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 S.
77e8661cb7 Merge pull request #5651 from bcrowe/copyright 
Bump copyright year in license
 2015-01-12 21:47:04 +01:00
Bryan Crowe
6a83e6b1de Bump copyright year in license 2015-01-12 15:18:04 -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
José Lorenzo Rodríguez
0a4141c78c Merge pull request #5614 from cakephp/issue-5595 
Convert header_sent exception into a notice error.
 2015-01-09 22:25:09 +01:00
Mark Story
1fee3c030e Merge pull request #5616 from cakephp/issue-5603 
Fix radio buttons not being added to security hash.
 2015-01-09 15:32:44 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
18f02bf5b3 Don't emit errors or trigger exceptions when headers have been sent. 
After discussing it a bit, we've come to consensus that emitting errors
or throwing exceptions are both pretty disruptive and annoying to deal
with. Instead we'll revert to the previous 2.x behavior of doing
nothing.
 2015-01-09 15:16:14 -05:00
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01: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
a7aaa93131 Convert header_sent exception into a notice error. 
Throwing an exception here, causes an infinite loop when handling fatal
errors, as the shutdown function sends headers automatically.

Refs #5595
 2015-01-08 21:47:13 -05:00
dmromanov
eb414bdda1 Fix double encoding time strings (CakeTime) 
Fix time strings being double encoded when mb_string is not installed.
 2015-01-09 00:03:49 +03:00
Bryan Crowe
66a0e6226d Correct criterion inflection 2015-01-06 23:03:53 -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
José Lorenzo Rodríguez
f6975f5254 Merge pull request #5572 from cakephp/issue-5570 
Improve error used when a cache configuation fails to start.
 2015-01-05 10:15:35 +01:00
mark_story
d7bc73b1e3 Improve error used when a cache configuation fails to start. 
Refs #5570
 2015-01-04 19:54:58 -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
euromark
722e54279c Rename String to CakeText. 2015-01-05 00:53:32 +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
Gerd Katzenbeisser
bf3ff8e2ad Avoid connection to default for mocked models 
Fixes #5565
 2015-01-04 16:53:00 +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
9553c029c4 Merge branch 'autolink-brackets' into master 
Fixes #5544
 2015-01-03 14:34:30 -05:00
mark_story
b6029d7ad1 Add some additional tests for autoLink. 
Refs #5544
 2015-01-03 14:30:56 -05:00
Mark Story
0a4cffc603 Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir 
Also autocreate session folder in debug mode
 2015-01-02 11:36:53 -05:00
Rob McVey
76b7c8c594 More complex test case for GET params 2015-01-02 15:31:27 +00:00
Rob McVey
54e172b129 Regex modified to to not capture brackets 
Modified the existing regex from th TLD onwards

Credit to @gruber for the regex info
https://gist.github.com/gruber/249502
 2015-01-02 15:15:23 +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
euromark
5aff618109 Also autocreate session folder in debug mode 2014-12-27 20:34:47 +01: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
fe3d2b938c Added conditional to do not show rerun link if is warning of no test present 
CS Fix

Update CakeHtmlReporter.php

Removed spaces in array return
 2014-12-26 15:50:25 -03:00
Esteban
21f3a51ebc Rerun only one test option adding 
Changed scope of function and fix CS problem
 2014-12-26 15:50:23 -03: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
Esteban
b7510d4883 Avoids problem with code coverage switch when are to equaly named files in a test 2014-12-23 17:23:12 -03: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
02ca7f5fcb Update version number to 2.6.0 2014-12-23 11:26:27 -05:00
mark_story
f4b682d384 Revert version number. 
I forgot to merge a few pull requests before releasing.
 2014-12-23 11:25:54 -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
mark_story
8de2877573 Update version number to 2.6.0 2014-12-23 11:22:20 -05:00
mark_story
10717d9248 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-12-23 11:22:00 -05:00
mark_story
667e2be2d2 Update version number to 2.5.8 2014-12-23 11:21:16 -05:00
mark_story
5cf5fe53ee Clarify question. 
Fixes #1870
 2014-12-23 11:18:32 -05:00
euromark
22a4a2f5de Correct argument. Should not have a default string. 2014-12-23 15:36:25 +01:00
euromark
d089341ee7 Wording. 2014-12-23 13:46:55 +01: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
euromark
545ff20e1d Add component and helper wrapper methods. 2014-12-23 03:50:35 +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
euromark
14073dc742 Don't send response from view. 2014-12-22 21:02:52 +01:00
Mark Story
484b114e9b Merge pull request #5384 from okinaka/fix-mysql-describe 
2.5: Fixing Mysql::describe() for timestamp.
 2014-12-21 21:27:27 -05: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
Marc Würth
e778b5dce2 Corrected/Improved DocBlock 2014-12-19 18:20:48 +01: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
mark_story
2637d35543 Don't quit bake when a table is missing. 
When a table is missing print a warning to stderr but don't exit. This
allows people to use `bake fixture all` with non-conventional tables.

Refs #5377
 2014-12-15 21:28:55 -05:00
mark_story
ae8a540101 Remove trailing whitespace. 2014-12-14 18:05:20 -05:00
mark_story
f19916bccf Add comments for possibly confusing code. 2014-12-13 22:25:52 -05:00
mark_story
c58e7da667 Handle exception when RequestHandler::startup() fails. 
In the case that there is a request data type parser raises an
exception, or startup() otherwise fails the error page should be created
correctly. While I'm not able to write a test case for this, manual
testing confirmed the fix.

Refs #5311
 2014-12-13 15:04:11 -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
mark_story
cf108dbff3 Remove duplicate order key. 
This was a mistake made in 4b6dba0.

Fixes #5376
 2014-12-10 22:32:59 -05:00
mark_story
23c4b7b7d5 Fix whitespace. 2014-12-10 22:17:02 -05:00
Mark Story
2228afda0e Merge pull request #5334 from tranfuga25s/master 
Change output to show the difference between fixture data and fields
 2014-12-10 22:16:33 -05: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
tranfuga25s
360346acd0 Added PHPCS fixes 2014-12-09 09:35:12 -03:00
tranfuga25s
674af51d6b Added PHPCS fixes 2014-12-09 09:16:34 -03:00
tranfuga25s
9ecdaf7965 Added PHPCS fixes and better array diff handling on fixture data count difference 2014-12-09 08:56:34 -03:00
Mark Story
0ce38029d0 Merge pull request #5362 from cakephp/master-sniff 
Consolidate with conditions sniff.
 2014-12-08 22:23:25 -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
dc70da9d14 Only merge the _defaults keys. 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