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

8010 commits

Author SHA1 Message Date
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
mark_story
ef28b42b2b Update version number to 2.5.7 2014-12-08 20:50:35 -05:00
ADmad
31c7b01c3a Add reference links to docblock 2014-12-09 00:03:24 +05:30
ADmad
850edf47a0 Fix plural calculation for Arabic. 
Refs #5348
 2014-12-08 23:58:27 +05:30
euromark
2937ea9ba5 Make comparison stricter. 2014-12-08 11:39:15 +01:00
euromark
f302d8c4d3 Extract being less verbose until explicitly asked for. 2014-12-08 11:36:24 +01:00
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
tranfuga25s
b0d0143b82 Fix PHPCS problems 2014-12-05 16:14:47 -03:00
tranfuga25s
ec2530ba58 Fix PHPCS problems and a better comparation of schema and data 2014-12-05 16:01:49 -03:00
tranfuga25s
fc756ac0b8 fix some small typo changing variables names 2014-12-05 15:34:53 -03:00
tranfuga25s
a2d04589a6 Change to output the difference between fixture data and fields 2014-12-05 15:23:48 -03:00
shin1x1
a5843dbe87 add binary protocol option in MemcachedEngine 2014-12-02 19:56:30 +09: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
e7f554cba7 Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo. 2014-11-29 03:04:07 +01: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
Tsuyoshi Sadakata
1f4402cd4c check ob_get_level() before ob_flush() 2014-11-26 17:25:10 +09: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
Lawrence Barsanti
9631b54244 remove space 2014-11-24 16:36:43 -05:00
Lawrence Barsanti
bb5088cda3 PHPUnit can be included as a phar file. 
No need to install phpunit in order to run unit tests.  Simply place
'phpunit.phar' in the vendors folder.
 2014-11-24 14:51:36 -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
mark_story
b6caddcf49 Fix file_map being regenerated on every request. 
A mistake a few months ago caused the file_map to always be regenerated
as Configure::write() would cause both Configure and Hash to be loaded,
invalidating the file map. By entering bootstrap mode earlier we can
avoid that.

Refs #5229
 2014-11-22 12:21:28 -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
83eb8ce7de Changes to Cake/Network/CakeRequest.php as discussed on Github for the detector code changes. Fixed the description of a few doc blocks, removed the use of getallheaders(), removed the failsafe (based on extension) for the xml and json detectors. 2014-11-22 12:55:22 +01:00
Florian Krämer
17e5d41e55 Restructuring the CakeRequest::is() code and related code a little. 2014-11-21 18:49:36 +01:00
Stephen Cuppett
ffb7e86641 Enable sslmode for PostgreSQL connections 
By default, PHP 5.5 and PostgreSQL PDO will not allow SSL connections. This adds the default of "allow", but also the user may override the setting to "require" or any of the other potential values. 

See: http://php.net/manual/en/function.pg-connect.php
 2014-11-20 22:37:39 -05: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
3f5f8cbc15 phpcs fixes in Cake/Network/CakeRequest.php 2014-11-20 22:16:36 +01:00
Florian Krämer
728764c543 Adding a test for the refactored CakeRequest code. 2014-11-20 21:14:17 +01:00
Florian Krämer
88bfa70cad Refactoring the detector code for CakeRequest::is() and adding default detectors for JSON and XML. 2014-11-20 21:14:07 +01:00
Rachman Chavik
a37e007d9f BC fix for css() and script() with identical resource names 2014-11-19 11:20:37 +07: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
fe6d3e36d5 Bump version number to 2.7.0-dev 
Open a branch for any development on 2.7.x which will be a 2.x API
compatible release.
 2014-11-18 23:06:24 -05:00
mark_story
23c5805763 Fix mistake with previous commit. 
I forgot to put the correct variable into the query like a doofus.

Refs #4168
 2014-11-18 22:03:30 -05: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
Mischa ter Smitten
f2c84602b9 Bugfix for: Memcached Engine segfaults with memcached client version < 2.0.0 
Fixes #5028
 2014-11-18 21:26:57 +01:00
ndm2
bae556e73f Prevent zero only lines from being emptied 2014-11-18 17:26:31 +01:00
mark_story
ddc3eee84c Use name() instead of hand quoting sequence names. 
By using name() we can easily accomodate postgres sequences that exist
out side of sequences.

Fixes #4168
 2014-11-17 22:47:07 -05: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
Bryan Crowe
e3e54d40fa Fix CS, remove extra space 2014-11-13 16:47:10 -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
watermark
8712dc01df Cleanup of isUnique 
isUnique takes the count of the args multiple times.  Store the count in a variable to cut down on overhead.
 2014-11-11 16:13:16 -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
mark_story
9ce3d89c81 Clean up formatting and make a failure exit non-zero. 
Console tools should exit non-zero when a comman fails.

Refs #4993
 2014-11-09 21:21:42 -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
cc1fd33d0b Update version number to 2.6.0-RC1 2014-11-07 20:36:25 -05:00
mark_story
c151ea585d Update version number to 2.5.6 2014-11-07 20:35:12 -05: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
mark_story
dac8b7b644 Update return type for Model::saveField(). 
Fixes #5086
 2014-11-05 20:37:43 -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
euromark
345a18f15f Merge branch 'master' into 2.6 2014-11-05 23:29:06 +01: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
euromark
0d5d6b19b5 Wording correction. 2014-11-05 13:14:45 +01:00
euromark
768f2c809c Correct doc block return types. 2014-11-05 13:03:27 +01: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
Mark Story
96b82e4226 Merge pull request #5021 from dereuromark/master-mysql 
Fix IN replacement in virtual fields for MYSQL.
 2014-11-04 08:24:03 -05:00
euromark
a6bd133413 Correct typos. 2014-11-02 22:41:17 +01:00
euromark
e7f76a983a Add a method for generating pagination meta links. 2014-11-02 22:29:02 +01:00
euromark
00432fa427 Show stack trace for fatal errors if xdebug is loaded. 2014-11-02 20:44:17 +01:00
Sebastien Barre
2995d9319c Prepend model alias for safety 2014-11-01 09:36:59 -04:00
Sebastien Barre
417c137d11 Fix DigestAuthenticate test 2014-10-31 21:42:18 -04: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
Mark Story
a8c5b70b22 Merge pull request #4489 from busgurlu/patch-1 
to correctly return SET() type
 2014-10-30 19:56:47 -04: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
1e8f12f9f5 Bump the depth of variables in stack traces to 4. 
Giving more context allows developer to look at request/response data
more easily.

Fixes #5005
 2014-10-29 21:43:18 -04: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
José Lorenzo Rodríguez
431578d956 Merge pull request #4931 from jrbasso/2.6-router-optimization 
Simplified way to add new prefixes to the router
 2014-10-26 22:09:17 +01: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
4b5783c5fe Add deterministic ordering to translate associations. 
Having a deterministic ordering based on the primary key resolves
tests potentially failing when postgres returns data in a non-sequential
order.
 2014-10-24 22:21:06 -04: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
ptica
abb0c7cb9d Update FormHelper.php 
disabled multiple checkbox input should not generate an enabled hidden input,
as it leads to saving empty data upon submission -> carrying the disabled attribute to the hidden input prevents this
 2014-10-24 18:25:31 +02: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
Bryan Crowe
6f4c3b2765 Fix views overwrite warning text 2014-10-21 14:39:09 -04:00
Juan Basso
833ca68a55 Replaced for loops by foreach 2014-10-20 16:43:11 -04:00
Juan Basso
9b4379b17d Simplified way to add new prefixes to the router 2014-10-19 21:55:33 -04:00
Juan Basso
ba0901d40e Removed the code that was never being executed 2014-10-19 18:56:02 -04:00
dmromanov
959a22a8b2 Documentation correction 2014-10-19 00:05: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
2ad181b6e1 Now the tableParameters array gets escaped through values(), too 2014-10-16 19:10:52 +02:00
Marc Würth
b3770974f1 Added tests for MySQL table comment feature 2014-10-16 16:44:09 +02:00
Marc Würth
84b0fe1c88 Added comment to $tableParameters array 2014-10-16 16:06:33 +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
dcb605c700 Possible fix for isUnique backward compatibility 2014-10-13 19:46:10 +07: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
ADmad
ecf030796b Fix docblock 2014-10-11 19:37:22 +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
Ceeram
1dfd3405a4 TranslateBehavior now uses original atomic option value, if set 2014-10-10 14:17:16 +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
Bryan Crowe
e16bef1868 Fix missing 'r' from your 2014-10-08 15:06:30 -04:00
suzuki86
e4c0dee6ee Fix small typo 2014-10-08 23:37:38 +09:00
mark_story
7b44d5d7a3 Update version number to 2.6.0-beta 2014-10-04 23:01:03 -04:00
mark_story
ce98a1ff57 Update version number to 2.5.5 2014-10-04 22:59:03 -04:00
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
Mark Story
d99d9bc37f Merge pull request #4780 from Schlaefer/timeAgoInWords-futureString 
adds option for future string to CakeTime::timeAgoInWords & code cleanup
 2014-10-01 20:34:41 -04:00
mark_story
2ee0827161 Fix PHPCS errors. 2014-10-01 20:34:33 -04:00
Hunter Perrin
be8c591dd8 Fixed coding standard violations. 2014-10-01 12:40:22 -07:00
Hunter Perrin
050e368bd0 Improvements to Hash::expand and Hash::merge. 
Because of the recursion in these functions, processing very large
arrays would take a very long time. I rewrote the functions to
eliminate any unnecessary recursion and function calls. Large arrays
are now processed much faster.
 2014-10-01 12:08:43 -07: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
euromark
af7916b1a7 Fix bug in CakeEmail::reset() 2014-09-24 14:02: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
mstra001
244acc724d Add strftime() support to CakeTime::timeAgoInWords() 
When an absolute date is generated CakeTime will automatically use
strftime() if the format string contains %. This allows for simpler
localization.

Refs #4550
 2014-09-22 20:49:20 -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
Joseph Sutton
faaba42aa7 Fixed type-casting for AuthComponent::login() 2014-09-14 11:15:08 -05:00
Joseph Sutton
87a58eeaea AuthComponent::login() returning deprecated method 
Changed $this->loggedIn() to $this->user(), as per the PHPDOC for loggedIn() at line 817
 2014-09-14 00:28:30 -05:00
mark_story
9e4446fe5f Trim whitespace from columns before checking for operators. 
Fixes #4599
 2014-09-13 21:50:35 -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
a6df3300b9 Wording. 2014-09-10 17:57:26 +02:00
euromark
eedefb9dec Clarify octal input instead. 2014-09-10 17:56:02 +02:00
euromark
3e25282d4c Fix PHP flaw around intval with custom base. 2014-09-10 17:40:01 +02:00
euromark
e3dc51bb68 Manually correct remaining casts. 2014-09-10 16:40:22 +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
ptica
1959b97ba3 hardcode a relative path to core installed via composer 
as book suggests
 2014-09-08 11:57:01 +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
Angel S. Moreno
29570e1d99 Fixed overwriting of files when Folder::SKIP is set 2014-09-06 18:32:45 -04:00
Mark Story
2311c13f12 Merge pull request #4417 from jeremyharris/3331 
Fix for #3331
 2014-09-04 20:26:55 -04:00
Burak USGURLU
996ad04b95 to correctly return SET() type 2014-09-04 18:07:30 +03:00
Jeremy Harris
3a41433c94 Deprecated AuthComponent::mapActions 2014-09-04 08:35:40 -05:00
Mark Story
f82fd2d982 Merge pull request #4463 from ravage84/deprecated-annotaions 
Update all @deprecated annotations
 2014-09-04 08:48:45 -04:00
Markus Fischer
0c55adebe0 console: don't use colored output if there's no TTY 
This prevents ANSI escape codes and style tags showing up in
cron-jobs, pipes or redirects.
 2014-09-03 10:47:05 +02: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
mark_story
638d2ea7b6 Add array cast for method_cache data. 
Fixes #4186
 2014-09-02 22:39:28 -04:00
Marc Würth
67ba9cb406 Update all @deprecated annotations 
to adhere to the @deprecated <version> <description> format, where version and description are mandatory.
 2014-09-02 17:03:22 +02:00
mark_story
9c2a25d4c0 Update version number to 2.5.4 2014-09-01 22:05:27 -04: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
cd7438d33d Fix 0 index not being properly parsed for files. 2014-08-23 13:05:16 +02:00
Karma Dice
f03393a2a3 Preventing multiple iterations 2014-08-23 15:47:12 +05:30
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
Majna
380ac9e88e Optimize FileEngine::gc() 
SplFileObject constructor throws an exception if the file does not exist or is a directory.
 2014-08-20 23:56:26 +02:00
Mark Story
90499971e0 Merge pull request #4304 from mtak3/ignore_exception_cache_file_engine 
Ignore RuntimeException
 2014-08-20 21:24:39 +02: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
mtak3
6b95764619 Ignore RuntimeException 
RuntimeException is thrown at race condition.
However, since for the processing at Garbage Collection, other processes
is determined that the expired.
this process is acceptable to ignore the RuntimeException even if there is
missing file.
 2014-08-19 17:44:25 +09: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
5c69ac5578 All CakeSchema doc blocks conform to coding standards. 
As laid out here: http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html#typehinting
 2014-08-12 12:55:55 -05:00
Brian Porter
4a0f42e179 Doc block capitalization corrections as requested. 2014-08-12 10:48:12 -05:00
Brian Porter
7d8d2f2f18 Code sniff fix. 2014-08-11 11:51:09 -05:00
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
Brian Porter
543e520ccb Corrects logic to only apply default filename in **all** cases where none provided. 2014-08-11 10:34:30 -05:00
Brian Porter
6358208e32 Figures it'd be a missing paren. 2014-08-11 09:23:56 -05:00
Brian Porter
be9be48c46 More predictable default for CakeShema class naming. 
Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'.

This is related to CakeDC/migrations#184 and should fully resolve #4174.
 2014-08-11 09:12:16 -05:00
Brian Porter
f93029b29f SchemaShell always uses --file param when present. 
Addresses **part** of the problem described in #4174.

Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.
 2014-08-11 09:08:59 -05:00
Marc Würth
120bd37ffa Be forward compatible to PHP 7's "Uniform Variable Syntax" 
https://wiki.php.net/rfc/uniform_variable_syntax
 2014-08-11 01:33:25 +02: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
cb45821c43 Fix reversed arguments in error message. 2014-08-08 23:29:29 -04: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
92957913d9 Merge pull request #4023 from cvo-technologies/2.6-basics-context 
Add the other translation shortcuts for context support
 2014-08-07 08:54:11 +02:00
Marc Würth
49bdde88d2 Added links to book 2014-08-07 01:56:53 +02:00
euromark
5f5218f3b2 Fix cookie reading. 2014-08-06 22:53:54 +02:00
Mark S.
2471c64aae Merge pull request #4158 from dereuromark/master-cakesession-hotfix 
Fix notice in CakeSession.
 2014-08-06 18:25:55 +02: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
Mathew Foscarini
4957418a4b Added missing return statement. 
PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.
 2014-08-05 08:39:19 -04:00
euromark
e714341ce3 Auto-detect composer installed CakePHP folder. 2014-08-05 03:53:40 +02:00
euromark
816e64bec8 Adjust wording. 2014-08-04 16:46:56 +02:00
euromark
bbcdf2404e Deprecate ssn() validation in favor of plugin Localized. 2014-08-04 16:39:43 +02:00
euromark
9ef7b5713a CS fixes. 2014-08-04 13:53:52 +02:00
euromark
864f5e06f6 Fix notice in CakeSession. 2014-08-04 13:32:20 +02:00
mark_story
4e168ca004 Fix incorrect docs. 2014-08-03 20:36:31 -04:00
chinpei215
cb376bf420 Add some more transaction tests 
And remove 2 else clauses.
 2014-08-03 22:34:11 +09:00
ADmad
c193ce708a Throw exception instead of logging in debug mode. 2014-08-03 03:16:39 +05:30
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
William Notowidagdo
23954e6ad3 Update HtmlHelper.php 
No need to add `null` to `$options` param as mentioned in the docs section: [Using blocks for script and CSS files](http://book.cakephp.org/2.0/en/views.html#using-blocks-for-script-and-css-files)
 2014-08-01 11:22:29 +07:00
Mark Story
a6caf28ea6 Merge pull request #4122 from chinpei215/master-scaffold-error-fix 
Fix a fatal error occurs in combination with a scaffold error.
 2014-07-31 10:44:33 -04:00
chinpei215
f3e1a18740 Fix a fatal error occurs in combination with a scaffold error. 2014-07-31 05:49:23 +09:00
Anthony GRASSIOT
aa42b80a4d a / an typo fixes fot API 2014-07-30 22:11:03 +02: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
Steve Tauber
0af698c591 Updating RequestHandlerComponent to accept body of HTTP Delete requests 2014-07-29 16:08:33 +02:00
mark_story
0b85c35635 Fix up code formatting and structure for #3998 
* Fix the various PHPCS errors.
* Make the logic less complex.
 2014-07-28 21:47:35 -04:00
Xinquan Zhu
e08b8148a5 throw CakeException instead, putting throws tag in the comment 2014-07-28 21:41:51 -04:00
Xinquan Zhu
809de69dcf replace whitespaces with TABs and only throw exception when Cake is in Debug mode 2014-07-28 21:41:51 -04:00
Xinquan Zhu
792c251890 throw an Exception when header is already been sent 2014-07-28 21:41:51 -04:00
mark_story
3c1d3ee461 Deprecate CacheHelper. 
It has been removed from 3.0 as it was a bad idea, and better solutions
have been created outside of PHP.
 2014-07-27 22:20:47 -04: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
euromark
99d6932ecc Fix project baking 2014-07-24 18:43:48 +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
mark_story
08de917b3c Fix accidental typo in SQL file. 
Fixes #4061
 2014-07-22 09:38:46 -04: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
David Steinsland
b61972871a Fixed sending of headers when ajaxLogin is set 2014-07-22 13:21:42 +02:00
Denys Kyselov
1434e79330 Typo fix 2014-07-21 23:55:49 -04:00
Denys Kyselov
79dc624062 Add removeSubcommand in ConsoleOptionParser 2014-07-21 23:55:42 -04:00
mark_story
9b8e6403fd Add indexes to db_acl.sql in skel directory. 
Copy changes in app/Config/Schema into the skel directory.

Refs #4052
 2014-07-21 21:31:05 -04:00
Marlin Cremers
fbeb8fe26b Add the other translation shortcuts for context support 2014-07-21 15:47:04 +02:00
Ceeram
02b8bce641 Fix cs error introduced after resolving merge conflict with master to 2.6 2014-07-21 14:01:43 +02:00
mark_story
ac9af7e326 Update version number to 2.5.3 2014-07-20 22:20:47 -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
0aabc5d910 Merge branch 'master' into 2.6 2014-07-18 21:50:05 -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
David Yell
28ec1c40a5 When specifying Session as a component and using Session flash messages, you end up with 'Paginator, Session, Session' which doesn't make sense. Added an array_unique to remove any duplicated components. 2014-07-18 15:37:22 +01: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
Carl Sutton
8d58d93636 Make the error message better for fixture errors 
The stack trace has no details about which fixture is the actual problem.
 2014-07-15 13:21:48 +01: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
ADmad
53259cb389 Deprecate $confirmMessage argument. 2014-07-10 23:31:51 +05:30
chinpei215
1a58b76e42 A micro optimization of h() 
In most cases, the first argument of h() will be a string.
 2014-07-10 20:53:10 +09:00
David Yell
79be5e6805 Update Model.php 
Fixed the case on the link to the book, to match the anchor in the page.
 2014-07-10 10:46:48 +01: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
mark_story
b3dfad614a Correct pattern matching. 
Instead of 10 digits, it should limit at 10 groups.

Refs 1988e89e73
 2014-07-06 09:42:20 -04: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
Ceeram
a266a9493d minor optimisation, refs comments on 81875cfeb1 2014-07-04 17:25:41 +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
mark_story
1988e89e73 Add an upper bound to the POST data SecurityComponent will consider. 
'Kurita Takashi' has let us know that the previous patterns could be
abused by an evil doer. One could potentially send a very large deeply
nested POST data structure. Matching that structure could overflow the
PCRE limits causing a segmentation fault. Adding an upper bound will
solve the problem and I doubt anyone is doing POST data structures with
more than 10 levels of nesting.
 2014-07-03 22:02:00 -04:00
mark_story
765be87d88 Overwrite the schemaName property if it is not defined in the class. 
If a model class does not define a schemaName we should use the
datasource's schemaName. We can assume that people using schemaName want
to lock the model onto a specific schema given the changes in #3210

Fixes #3720
 2014-07-03 21:53:54 -04:00
Costa Caruso
8bfebd64fb Fix for failing test "Whitespace found at end of line" 2014-07-03 15:45:03 -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
33a5b6e451 Fix additional missing API doc tags. 2014-07-02 23:38:34 -04:00
Costa Caruso
1164c0bcad Fix for CakeResponse::sharable() header to include private caches 2014-07-02 17:34:09 -04:00
Mark Story
2c53bc8a1b Merge pull request #3838 from cakephp/revert-3646-no-truncate-fixture 
Revert "No truncate when drop table."

Not truncating tables when they are created causes a number of 
issues in ControllerTestCases as indicated by the comments in #3646 post merge.
 2014-07-01 22:02:57 -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
1686edf016 Revert "No truncate when drop table." 2014-06-30 14:14:20 +02: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
Derek Perkins
6bf0b22195 Add setInput function to CakeRequest 
Modify data originally from `php://input`. Useful for altering json/xml
data in middleware or DispatcherFilters before it gets to
RequestHandlerComponent or other controllers.
 2014-06-29 22:55:29 -04:00
Mark Story
a966f089d2 Merge pull request #3832 from ADmad/2.5-inflector 
Add pluralization rule for "stadia" to uninflected list.
 2014-06-29 09:34:09 -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
mark_story
91721244a4 Fix more doc block errors in lib/ 2014-06-27 22:58:34 -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
euromark
73dcb2cb91 cs correction 2014-06-26 14:22:34 +02: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
Mark Story
e9da7b8f80 Merge pull request #3596 from zeroasterisk/2.6 
MySQL DbdSource alter field support 'after'
 2014-06-25 23:10:29 -04: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
Dan Voyce
239af0322e Raise an exception when Hash::get() receives invalid parameters 
I'm not sure on whether this is a problem with my local app but I have
seen it a couple of times in a couple of projects: Warning (2): Invalid
argument supplied for foreach() [CORE/Cake/Utility/Hash.php, line 52]

I think Hash::get should be able to handle this better rather than
throwing an error in a core Util file.

Refs #3754
 2014-06-25 09:15:46 -04:00
euromark
b3507b199a Update doc blocks regarding return $this 2014-06-25 00:06:51 +02:00
José Lorenzo Rodríguez
bf33e1cf57 Merge pull request #3761 from aka-toxa/master 
improving acl perfomance
 2014-06-24 21:58:30 +02: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
José Lorenzo Rodríguez
e9e09bf19a Merge pull request #3788 from dereuromark/master-composer 
Fix composer app issues with cake.php
 2014-06-24 21:56:01 +02:00
euromark
05709908a7 Fix composer app issues with cake.php 2014-06-24 17:49:18 +02:00
suzuki86
8f9589f7c8 Fix typo 2014-06-25 00:20:54 +09: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
Anatoliy Petrovskiy
ad678e3988 improving acl perfomance 2014-06-23 13:51:52 +03:00
mark_story
6bacc5bb46 Merge branch 'master' into 2.6 2014-06-22 21:25:06 -04:00
mark_story
59c3b73f7a Skip autoloaders for APCIterator 
We can skip autoloaders for this class as it is provided by
a C extension and will never come from userland code.
 2014-06-22 21:22:00 -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
ffe811935c Remove else. 
By returning early we can avoid the else statement entirely.
 2014-06-20 16:07:47 -04:00
mark_story
e683616329 Apply patch from 'biesbjerg' to ApcEngine 
This set of changes allows ApcEngine to work with APCu and newer
versions of APC.

Fixes #3749
 2014-06-20 13:59:05 -04:00
Anatoliy Petrovskiy
bb15271622 improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function 2014-06-20 20:49:02 +03:00
euromark
d81d568cc0 make coredispatcher fully BC again 2014-06-20 14:05:18 +02:00
mark_story
497ecd3f80 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-06-19 21:41:02 -04:00
José Lorenzo Rodríguez
5f81a745c4 Merge pull request #3744 from markstory/2.6-missing-views 
2.6 Improve missing view error pages
 2014-06-19 20:40:02 +02:00
mark_story
8f3ce9c9c4 Filter out core paths from missing view/layout errors. 
End developers shouldn't be dropping files in /lib/Cake so lets not tell
them to.
 2014-06-19 10:03:00 -04:00
euromark
9c035ff315 doc block corrections 2014-06-19 13:25:36 +02:00
euromark
53a544d9f0 Improve toList to allow localization 2014-06-18 17:56:35 +02:00
Mark Story
282a5d1cb5 Merge pull request #3731 from cakephp/issue-3656 
Fix TextHelper::autoLinkEmail() near HTML

Refs #3656
 2014-06-18 09:53:30 -04:00
Mark Story
163cacbd1d Merge pull request #3734 from voycey/patch-1 
Add 'research' to the list of uninflected words.
 2014-06-18 09:31:54 -04:00
mark_story
31956c2abb Remove dead code. 
The list of paths is now output on the default error page, we don't need
to make an educated guess here anymore.
 2014-06-18 09:26:38 -04:00
Mark Story
c99c68684b Merge pull request #3646 from nanapi/no-truncate-fixture 
Don't truncate test fixtures when the table has been freshly created.
 2014-06-18 09:18:24 -04:00
Mark Story
562ed73562 Merge pull request #3726 from dereuromark/master-console-cake-unification 
DS console cake unification
 2014-06-18 08:55:53 -04:00
mark_story
fecc687f81 Cleanup missing view/layout errors. 
Fix formatting issues and make path listings correct.
 2014-06-17 23:20:49 -04:00
Dan Voyce
4915639efb Update Inflector.php 
Added Research
 2014-06-18 11:48:16 +10:00
mark_story
e548dfcaea First pass at making MissingView/MissingLayout exceptions show all 
paths.

Showing all the paths a template file could be located help expose
developers to the view path cascade and helps ensure we don't tell
people the wrong place to put a view file.

Refs #3712
 2014-06-17 16:30:50 -04:00
euromark
6161aae54e also bring template one in sync. 2014-06-17 13:08:13 +02:00
euromark
a927f5d954 remove wrong App::uses() call 2014-06-17 05:10:19 +02:00
Bryan Crowe
1db10b4dd1 Basic grammar update to BasicAuthenticate docblock 2014-06-16 21:48:35 -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
euromark
a9de83daeb console cake cleanup and unification 
remove duplicate define
 2014-06-17 02:28:52 +02:00
mark_story
96df2c4b68 Update version number to 2.5.2 2014-06-14 21:36:39 -04:00
mark_story
fa19c34580 Fix Hash::extract() not matching 1/0 to true/false. 
Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.

This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.

Refs #3288
 2014-06-12 11:30:48 -04:00
Melvin Ross
ad4dbdcee5 Fix HttpSocket test to actually reset protocols for correct test. Modify HttpSocket so that Https with non-passed in protocol doesn't set it to tcp and fail test. 2014-06-12 09:37:03 -05:00
Melvin Ross
460cc29fff Remove unneeded comment out line that I just saw in compare view on GH 2014-06-12 08:51:35 -05:00
Melvin Ross
361531509e Fix coding standard violations 2014-06-12 08:47:40 -05:00
Mark Story
7ea6626a15 Merge pull request #3692 from MMS-Projects/i18n-refactor 
Refactor i18n basics
 2014-06-12 08:10:46 -04:00
Marlin Cremers
4f91e14cab Refactor translation functions arguments handeling 2014-06-12 08:48:28 +02:00
mark_story
8e14b2f807 Merge branch 'master' into 2.6 2014-06-11 23:05:59 -04:00
Melvin Ross
86923e3593 Modify CakeSocket and HttpSocket so that the "protocol" parameter can be used to specify which protocol to use for creating sockets. These are protcols in the php "[a-z]://" wrapper sense. I also modified the test for these two files respectively to accomodate these new changes. 
Unrelated to this bug, I added a "head" function inside of HttpSocket to go along with the GET/POST/PUT/DELETE/PATCH combination that's already present. Came in handy for me for deciding if I wanted to hit a resource with HttpSocket or not.
 2014-06-11 19:04:58 -05:00
Bryan Crowe
d8b4c3967c Fix typo 2014-06-10 23:31:42 -04:00
ADmad
0b4ba0b049 Fix api docblocks for behaviors. 2014-06-10 00:38:44 +05:30
ADmad
4ee7cf6564 Remove lies from API docblock for BasicAuthenticate class. 
Add info on how to configure for cookieless/stateless operation without redirection.
 2014-06-08 14:05:08 +05:30
ADmad
4c83563501 Deprecate App::pluginPath() 2014-06-07 22:59:02 +05:30
mark_story
146053c980 Update datasource API docs. 2014-06-06 14:06:32 -04:00
mark_story
d8b0083632 Fix api doc errors in TestSuite/ 2014-06-06 13:57:48 -04:00
mark_story
07b43403fb Fix doc errors in Component/Acl. 2014-06-06 13:57:15 -04:00
Carl Sutton
4a4a35768b simplify connect code for redis 2014-06-06 13:54:54 +01:00
mark_story
849ad9a4f5 Remove dead, untested and unreachable code in FormHelper. 
Closes #3650
 2014-06-06 08:17:49 -04:00
José Lorenzo Rodríguez
91224b0ec1 Merge pull request #3653 from markstory/2.6-html-css 
Add once option to css().
 2014-06-06 09:55:06 +02:00
José Lorenzo Rodríguez
932bf47481 Merge pull request #3604 from Haititi/2.6-save-atomic 
2.6 add 'atomic' option to "save()" API - delivery
 2014-06-05 13:55:52 +02:00
akiyan
6d2402fbf6 No truncate when drop table. 2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f Fix the test suite package doc block errors. 2014-06-05 00:24:01 -04:00
mark_story
7058921275 Fix doc comment errors in Acl classes. 2014-06-05 00:15:45 -04:00
mark_story
758599e6f4 Add once option to css(). 
The default value is false for backwards compatibility. In 3.0, the
default will be made consistent with script().

Refs #1973
Refs #3628
 2014-06-04 22:15:56 -04:00
ADmad
1d40f3e685 Fix API docblock CS errors. 2014-06-05 00:28:55 +05:30
Haithem BEN GHORBAL
31615ce415 add 'atomic' option to "save()" API 
This commit adds a transaction context to 'save()' API in order to rollback
possible modifications done in some 'Model.beforeSave' listener callback.
This will allow cakephp 2.x to behave like 3.0 .
It uses try/catch to better handle transaction.
Previous save() API is renamed to protected _doSave() method.
A new save() method is created for transaction handling.
'atomic' option is disabled for internal 'save()' call.
 2014-06-03 09:37:17 +02:00
mark_story
92eeef8ae0 Merge branch 'master' into 2.6 2014-06-02 22:57:25 -04:00
mark_story
55672b6df3 Merge branch 'router-stars' from Hikkijp 
Refs #3582, #3581
 2014-06-02 22:38:27 -04:00
mark_story
4362f7bf8b Add tests for CakeRoute::match() and trailing * routes. 
Add tests for /pages/** routes, and fix coding standards errors.

Refs #3581
 2014-06-02 22:37:37 -04:00
mark_story
9ba7abd89f Merge branch 'FormAuthenticate_empty_fix' from KeinBaum 
Closes #3624
 2014-06-02 22:03:40 -04:00
mark_story
975e4c3af0 Allow username of 0 in basic authentication. 
Refs #3624
 2014-06-02 22:02:28 -04:00
mark_story
d1e4dfac47 Add tests for #3624 
The username of '0' should be accepted by FormAuthenticate.

Refs #3624
 2014-06-02 21:58:50 -04:00
KeinBaum
88b3629f4f #3623: Allow username "0" with FormAuthenticate 2014-06-02 19:11:02 +02:00
ADmad
e7debd8692 More API docblock CS fixes. 2014-06-02 18:27:11 +05:30
Stefan Dickmann
91907b5c6c correct docblock 
invalid certificate domain
 2014-06-01 13:23:47 +02:00
mark_story
47ce5928e1 Fix api doc errors in Cache. 2014-05-31 22:02:55 -04:00
mark_story
86a071353d Fix api doc comment errors in Error/ 2014-05-31 21:57:17 -04:00
mark_story
fe2003888b Fix api doc errors in basics.php 2014-05-31 21:53:54 -04:00
mark_story
15f63e9c81 Removing peer verification failure test. 
Since we are not running a domain with an invalid certificate relying on
someone else to do that is quite unreliable.
 2014-05-31 21:51:03 -04:00
Mark Story
e467457319 Merge pull request #3612 from cakephp/api-doc-comments 
More API docblock fixes.
 2014-05-31 19:12:20 -04:00
ADmad
3d9b2b80cb More API docblock fixes. 2014-06-01 03:06:05 +05:30
MaziyarMK
596c1c27cb added HTML for styling tables 
added <thead> and <tbody> to table for easier styling of generated templates.
 2014-05-31 20:50:29 +00:00
ADmad
543066f34a Set default sort direction to 'asc'. 2014-05-30 19:43:09 +05:30
Mark Story
136f026f77 Merge pull request #3548 from dogmatic69/patch-3 
Allow getting params the same way data() works
 2014-05-29 21:49:09 -04:00
mark_story
7e8d378502 Merge branch 'master' into 2.6 2014-05-29 21:46:16 -04:00
ADmad
16df061d66 Fix api docblocks for View layer classes. 2014-05-30 01:23:12 +05:30
alan bount
c273ed8d2c MySQL DbdSource alter field support 'after' 
The ALTER FIELD for MySQL should support 'after' just like the ADD FIELD
 2014-05-29 11:06:44 -04:00
Mark Story
a135378950 Merge pull request #3590 from Haititi/2.6-fix-habtm 
2.6 fix save() with habtm returning error
 2014-05-29 10:09:33 -04:00
David Yell
1e3730c988 Updated the default Cake routes to include a defaultRoute true flag to allow differentiation 
Merge #3579 from davidyell/routing-markers onto 2.6

Fixes #3535
 2014-05-29 00:55:51 -04:00
mark_story
390441d3b9 Accept older blowfish hashes. 
Both `2a` and `2x` are valid types of blowfish hashes, that while being
older should be accepted.

Backport 00c94bd582b83f8b92228b750aea0e8816a4ea89 from 3.x to 2.5.x,
I see this as a bug fix as it fixes incompatibilities with hashes
created by hash_password().

Refs #3575
 2014-05-28 22:53:21 -04:00
Haithem Ben Ghorbal
35c2a7ef31 restore previous (erroneous ?) behaviour 2014-05-29 02:36:13 +02:00
Haithem Ben Ghorbal
67af8b37db clean code and remove unneeded checks 2014-05-28 23:53:47 +02:00
dogmatic69
59fe581912 adding doc block for tests related to CakeRequest::param() 2014-05-28 22:28:44 +01:00
ADmad
7a4244d0a6 More docblock CS fixes. 2014-05-28 22:09:54 +05:30
Haithem BEN GHORBAL
d4a0883cb9 fix typo/coding style 2014-05-28 18:31:03 +02:00
Haithem BEN GHORBAL
a8e410ee20 fix save with habtm returning false 2014-05-28 18:17:16 +02:00
mark_story
f6c868d706 Fix remaining doc block errors in Console/ 2014-05-27 23:34:53 -04:00
mark_story
8f5acb0932 Fix CS errors in skel/ 2014-05-27 23:21:32 -04:00
mark_story
bb58bbe642 Fix API doc errors in Console/ 2014-05-27 23:16:05 -04:00
mark_story
2546b79c62 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-05-27 20:55:16 -04:00
mark_story
0c8406c034 Merge branch 'master' into 2.6 2014-05-27 20:55:06 -04:00
mark_story
edcbf4e92f Manually port f287bc76c0 to 2.6 
Git won't let me merge the changes as I have 'unstaged changes'.
 2014-05-27 20:54:36 -04:00
Mark Story
f287bc76c0 Force .bat files to have CRLF endings. 
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.

Hopefully this fixes the issue.

Fixes #3585
 2014-05-27 19:06:08 -04:00
Hikkijp
c622a9dfc2 Fixes bug #3581 
Fixes bug #3581 and the issue noticed by markstory
 2014-05-27 17:30:38 -03:00
Hikkijp
f7e98e7427 Revert "Fixes bug described in #3581" 
This reverts commit e6c6e0bf2c.
 2014-05-27 17:25:28 -03:00
Hikkijp
e6c6e0bf2c Fixes bug described in #3581 
Routes with '/**' are now correctly handled by the HtmlHelper->link()
 2014-05-27 14:03:56 -03:00
Hikkijp
952c7192f4 Revert "Fixes bug described in #3581" 
This reverts commit 6c75e3697d.
 2014-05-27 14:00:20 -03:00
Hikkijp
6c75e3697d Fixes bug described in #3581 
Routes with '/**' are now correctly handled when called by
$this->Html->link() in a view.
 2014-05-27 13:50:08 -03:00
Mischa ter Smitten
329fd3fe4c Consistent use of Shell::err for errors 2014-05-27 12:29:09 +02:00
José Lorenzo Rodríguez
05d92ddc0a Merge pull request #3560 from cakephp/2.6-memcached-options 
2.6 memcached options
 2014-05-26 21:47:45 +02:00
dogmatic69
bcdc530391 adding support to write values to param like can be done with data(), method returns $this as does ->data() when writing 2014-05-25 00:52:30 +01:00
dogmatic69
9dca564519 make the default return false so it matches previous use, improve tests for new method 2014-05-25 00:46:40 +01:00
Mark Story
9c9d45596f Merge pull request #3478 from Schlaefer/#3303-lengthBetween 
closes #3303 RFC: Rename Validator::between() into Validator::length()
 2014-05-24 16:48:05 -04:00
mark_story
86c7d1ff5e Add addtional options array for memcached. 
Memcached supports a number of options that we should afford in our
memcached adapter.

Fixes #3477
 2014-05-23 22:29:03 -04:00
mark_story
db86b0c050 Don't disable the entire select when disabled is array(1) 
When the disabled attribute is just array(1), then the attribute should
be filtered out of select element attributes. This is kind of a hacky
workaround but changing the underlying attribute handling is going to be
pretty tricky and far more dangerous.

Fixes #3546
 2014-05-23 13:26:11 -04:00
mark_story
587f2da09e Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-05-22 14:29:43 -04:00
mark_story
81875cfeb1 Optimize renew(). 
Don't call session_id() twice when we can use a local variable to store
the current session id.

Fixes #3531
 2014-05-22 14:28:56 -04:00
mark_story
cd68002246 Add additional test case for named parameters. 
Refs #3525
 2014-05-22 14:14:35 -04:00
akiyan
781430c4af Removed unnecessary conditional branch, fixed test and comment. 2014-05-22 14:08:18 -04:00
akiyan
67f256297d Fixed secure form hash for special url. 
No htmlspecialchars encode and without fragment identifer.
 2014-05-22 14:08:11 -04:00
Carl Sutton
a657e410b2 Allow getting params the same way data() works 
I could improve this to do the `hash::insert()` to replace `addParams()` as is done in `data()`
 2014-05-22 17:32:19 +01:00
mark_story
270e8774e4 Fix incorrect status line parsing in HttpSocketResponse. 
Allow for multi-word status reasons.

Closes #3545
 2014-05-21 21:53:18 -04:00
Mark Story
b1fe9134c6 Merge pull request #3528 from Marlinc/patch-1 
Add 'feedback' to uninflected single and plurals
 2014-05-19 16:46:16 -04:00
Marlin Cremers
1977d51a49 Add 'feedback' to uninflected single and plurals 2014-05-19 20:57:11 +02:00
Brian Porter
9452d5e1b6 Harden the bin/cake script to avoid breakage when local shell environment has a CDPATH set. 2014-05-19 11:05:28 -05:00
mark_story
0fd12c7a68 Update version number to 2.5.1 2014-05-17 22:39:27 -04:00
mark_story
2e4d6eb009 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-05-16 21:26:30 -04:00
mark_story
153141a6c7 Make help clearer around how to use UpgradeShell. 
Closes #3504
 2014-05-15 11:32:32 -04:00
euromark
143e8e4c56 Make sure invalid arrays return empty array instead of throwing notices. 2014-05-14 23:53:58 +02:00
James Watts
992ab5ea11 Removed the little doc that lied 
View::get() never looked up blocks
 2014-05-14 20:06:37 +02:00
mark_story
20ef10aca2 Fix inline attachments being broken when only sending an HTML text body. 
The rel boundary was closed too early causing inline images to be
incorrectly included in the email message.

Refs #3474
 2014-05-14 09:42:25 -04:00
José Lorenzo Rodríguez
5ab02a0ed1 Merge pull request #3493 from Schlaefer/fix-failingModelTaskTest 
fixes failing test cases in ModelTaskTest if not run in test-suite
 2014-05-14 11:47:28 +02:00
Schlaefer
6b80ae35b1 fixes model task test-cases for 'between' validation rule alias 2014-05-14 10:55:24 +02:00
José Lorenzo Rodríguez
73f725e7ff Merge pull request #3489 from rchavik/2.5-composer 
Updated the test suite dispatcher to allow use of PHPUnit from Composer
 2014-05-14 10:34:21 +02:00
Schlaefer
bf0edd1112 fixes failing test cases in ModelTaskTest if not run in test-suite 
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
 2014-05-14 10:34:09 +02:00
mark_story
66e733f8b1 Fix test I forgot to fix in b8fa7ce134 2014-05-13 22:12:39 -04:00
David Yell
140e0bbbd3 Updated the test suite dispatcher to allow use of PHPUnit from Composer 
Closes #3479
 2014-05-14 09:09:53 +07:00
mark_story
b8fa7ce134 Fix issues where emails would have multipart/mixed when they should not. 
When sending multi-part emails with no attachments we shouldn't include
the outer multipart/mixed header as it confuses Outlook and causes it to
show the email as having attachments even though there are none.

A bunch of tests need to be adjusted as the empty multipart/mixed
container has been removed.

Fixes #3474
 2014-05-13 22:03:06 -04:00
euromark
8af76a3705 Hotfix for older baked templates regarding postLink() 2014-05-13 20:51:39 +02:00
Mark Story
418c0a7b7c Merge pull request #3481 from okinaka/master 
Unset $db in DboSource::read().
 2014-05-13 14:01:33 -04:00
mark_story
e9ecfe0936 Remove x bit on files. 
PHP files should not have executable permission set.
 2014-05-13 12:30:14 -04:00
Schlaefer
3ac731273e adds backwards compatible 'between' alias for 'lengthBetween' validation rule 2014-05-13 17:36:23 +02:00
euromark
aefc459907 Fixes baked postLink()s 2014-05-13 17:14:11 +02:00
Kenshin Okinaka
91cb3ddc27 Unset $db in DboSource::read(). 
After calling $db->queryAssociatin(), it is necessary to unset db. 
This reverts commit 52d425737a.
 2014-05-13 21:17:34 +09:00
Schlaefer
e10e8fcb15 fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X 
thousand separator isn't set in de_DE but in da_DK
 2014-05-13 13:25:53 +02:00
Schlaefer
021d765620 fixes falling test case for 'lengthBetween' validator 2014-05-13 10:46:50 +02:00
Schlaefer
815838f150 replaces validator 'between' with 'lengthBetween' 2014-05-13 10:46:25 +02:00
Schlaefer
4848b63189 closes #3303 RFC: Rename Validator::between() into Validator::length() 2014-05-13 09:31:03 +02:00
mark_story
780132f892 Update version number to 2.5.0 2014-05-12 22:17:12 -04:00
mark_story
a34d5f733d Fix PaginatorComponent tests. 
Because count() queries don't happen in many cases now, the lastQueries
index needs to shift up by one because a query isn't happening anymore.

Refs #3333
 2014-05-12 22:10:27 -04:00
mark_story
b2207c1ca8 Reverse conditions to make the cheapest condition first. 
We don't need to do a count() if the page is not 1.

Refs #3333
 2014-05-12 22:09:27 -04:00
Toby Cox
823f01601d enhancement to paginator 
As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid
 2014-05-12 21:49:08 -04:00
Toby Cox
296ea215b1 Enhancement to paginator 
No point in finding the count (via model) if the returned result count
is less than our limit. We then know that the count is the count of our
results
 2014-05-12 21:49:07 -04:00
mark_story
89cd114e6f Merge branch 'master' into 2.5 2014-05-12 14:30:02 -04:00
mark_story
92e6c138c5 Add missing static on Debugger::output() 
This method should have been static the whole time, and the lack of
static was causing tests to fail on PHP 5.6
 2014-05-12 14:29:10 -04:00
Coen Coppens
91fbbdf6ca Added $type as an argument. 
See https://github.com/cakephp/cakephp/issues/2122
 2014-05-12 12:08:06 +02:00
Dominik
cd445f2526 Add unix socket support to Redis cache engine 
Refs #3438
 2014-05-11 21:49:32 -04:00
mark_story
d0b995ad79 Merge branch '2.5' into 2.6 2014-05-11 21:47:42 -04:00
Stephen Cuppett
ed83df5bed Fixes #3469, explicit isset check for counterCache 2014-05-11 19:17:18 -04:00
mark_story
cc49d28ef8 Fix double / in missing component error page. 
Fixes #3466
 2014-05-10 22:02:22 -04:00
mark_story
cd37810b02 Merge branch 'fix-formhelper' 
Fix failing tests on PHP5.2.x
 2014-05-09 17:17:23 -04:00
mark_story
51909ae738 Only parse URLs when they contain :// 
Parsing incomplete URLs fails in PHP5.2.
 2014-05-09 17:01:24 -04:00
euromark
8f0e203fb5 test failed. reverted and corrected doc block instead for BC. 2014-05-08 01:52:48 +02:00
euromark
1caf1cac4b Remove wrong return. 2014-05-08 01:46:08 +02:00
José Lorenzo Rodríguez
751d2d8f2d Merge pull request #3448 from dereuromark/master-controller 
Controller::referer() and local URL
 2014-05-07 22:42:28 +02:00
mark_story
5469840c80 Fix incorrectly generated URL path. 
Refs #3442
 2014-05-07 08:52:42 -04:00
mark_story
1103ca7816 Ensure that only the path and query are used to make the hash. 
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.

Fixes #3442
 2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7 Make test names match the rest of the tests. 2014-05-06 22:13:44 -04:00
Renan Gonçalves
87683b10f1 Allowing same Authenticate object to be setup with different settings. 2014-05-06 22:10:41 +02:00
Walther Lalk
2dd3cecfaa Fixes issue with Sql Server driver when loading fixtures 
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.

This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
 2014-05-06 12:43:36 +02:00
ADmad
aa7f18840c Merge branch '2.5' into 2.6 2014-05-04 14:40:39 +05:30
ADmad
d466e00644 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
 2014-05-04 14:35:36 +05:30
euromark
57cb7ea260 Correct documentation. 2014-05-02 13:48:39 +02:00
euromark
fecf321cce This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it. 2014-05-02 13:33:57 +02:00
Mathew Foscarini
2244e02017 remove constructor return value. 
Not sure why this was here, but constructors shouldn't return a value. Nothing in the docs says that a controller's implementation of appError should return a value either. So I figure this was a mistake.
 2014-04-30 16:25:01 -04:00
Mathew Foscarini
f7453500b9 fixed case. 2014-04-30 16:19:15 -04:00
Mathew Foscarini
bb726d58ba Grammar fixes 
@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.
 2014-04-30 16:09:53 -04:00
Mathew Foscarini
ceab9f185f Removed incorrect usage of @deprecated phpDoc 
@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
 2014-04-30 09:55:27 -04:00
mark_story
4b5e3c176e Update version number to 2.4.9 2014-04-29 21:52:10 -04:00
mark_story
e1057e3e6b Fix FormHelper::postLink() not working when SecurityComponent is enabled. 
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
 2014-04-29 11:23:52 -04:00
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
mark_story
1d1a2f859c Fix coding standards error. 2014-04-28 20:56:06 -04:00
euromark
06aa747b21 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite 2014-04-29 02:35:20 +02:00
mark_story
a0eb736151 Update version number to 2.4.8 2014-04-28 20:35:20 -04:00
mark_story
5432f834ff Merge branch '2.5' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-04-28 20:34:29 -04:00
euromark
5e5a776de8 Backporting overwrite() from 3.0 to 2.6. 2014-04-29 02:18:27 +02:00
euromark
8679c5cd18 Fix test 2014-04-28 17:33:56 +02:00
euromark
43d359b1d7 Make referer() behave as expected. 2014-04-28 17:23:26 +02:00
mark_story
99a7ddf195 Update version number to 2.5.0-RC2 2014-04-26 22:04:40 -04:00
mark_story
cf96e9f54f Merge branch 'master' into 2.5 2014-04-26 22:04:19 -04:00
mark_story
a28158d614 Add additional test for f23d811ff5 
I neglected to put a negative test to ensure validatePost fails when the
URL differs.
 2014-04-26 10:23:27 -04:00
Mark Story
5b46eb71ec Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock 
fixed FormHelper to allow create() on Mock Models without errors
 2014-04-26 08:53:43 -04:00
ADmad
68572d8046 Cannot use php 5.4+ array syntax for 2.x. 2014-04-26 17:30:31 +05:30
Jorge González
5cf2ce723c fixed FormHelper to allow create() on Mock Models without errors 2014-04-26 10:33:58 +01:00
mark_story
460204913a Merge branch '2.5' into 2.6 2014-04-25 22:10:14 -04:00
mark_story
de0062de77 Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
mark_story
f23d811ff5 Use the form action URL in generated form hashes. 
By including the URL in generated hash for secured forms we prevent
a class of abuse where a user uses one secured form to post into a
controller action the form was not originally intended for. These cross
action requests could potentially violate developer's mental model of
how SecurityComponent works and produce unexpected/undesirable outcomes.

Thanks to Kurita Takashi for pointing this issue out, and suggesting
a fix.
 2014-04-25 22:05:58 -04:00
ADmad
27699d1f12 Fix auto linking urls with subdomain with underscore. 
Closes #3392
 2014-04-25 22:28:34 +05:30
Mark Story
00be120e7a Merge pull request #3381 from planardothum/shell-requires-cli 
Add check to abort if $argv is undefined.
 2014-04-24 12:32:54 -04:00
Harold Putman
d62e5e1b00 Prevent infinite loop caused when argv not set. 
If shell is invoked with the wrong PHP executable (not CLI) and argv is not an array,  array_search on null causes infinite number of error messages.
 2014-04-24 11:48:19 -04:00
mark_story
9d19801cfa Clear data and validationErrors *after* calling clearCache(). 
Having both properties cleaned after clearCache() means that you can use
the model data in specialized clearCache() implementations.

Fixes #3386
 2014-04-24 09:19:00 -04:00
Stefan Dickmann
f90f718e11 change parameter order 2014-04-24 12:54:45 +02:00
ADmad
971a845eb1 Merge pull request #3379 from dereuromark/2.5-inflector 
2.5 inflector
 2014-04-24 13:13:59 +05:30
mark_story
eeb4e635a4 Merge branch '2.5' into 2.6 2014-04-23 22:22:11 -04:00
mark_story
04edb547f3 Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
mark_story
6f68049bf5 Reject file paths containing ... 
Paths containing `..` are generally up to no good. Throw an exception,
as developers can use realpath() if they really need to get relative
paths.

Fixes #3370
 2014-04-23 22:20:14 -04:00
mark_story
2333c3d535 Update docs for file(). 
Mention that relative paths will be prepended with APP.

Refs #3370
 2014-04-23 22:15:10 -04:00
euromark
0c036f6370 Remove unncessary language support. 2014-04-23 18:07:08 +02:00
euromark
7e6bc48ef2 Complete Inflector transliterations. 2014-04-23 16:43:44 +02:00
ADmad
ead494eec1 Allow setting only default layout without specifying template in email config. 
Closes #3336
 2014-04-22 20:02:36 +05:30
ADmad
6bdfdfd436 Optimize view paths caching for plugins. 
Closes #2047
 2014-04-20 02:02:07 +05:30
mark_story
6de35a357b Merge branch '2.5' into 2.6 2014-04-18 22:14:08 -04:00
mark_story
d54fbe6f60 Merge branch 'master' into 2.5 2014-04-18 22:13:56 -04:00
Carl Sutton
5ac60288fd Fix closing non resource 
I get a load of these errors when running tests in the shell, this check stops the errors from happening

Warning: 2 :: fclose() expects parameter 1 to be resource, integer given on line 298 of CORE\Cake\Console\ConsoleOutput.php
Trace:
fclose - [internal], line ??
ConsoleOutput::__destruct() - CORE\Cake\Console\ConsoleOutput.php, line 298
ToolbarComponent::_saveState() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ToolbarComponent::beforeRedirect() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::redirect() - CORE\Cake\Controller\Controller.php, line 765
AuthComponent::_unauthenticated() - CORE\Cake\Controller\Component\AuthComponent.php, line 364
AuthComponent::startup() - CORE\Cake\Controller\Component\AuthComponent.php, line 304
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::startupProcess() - CORE\Cake\Controller\Controller.php, line 675
Dispatcher::_invoke() - CORE\Cake\Routing\Dispatcher.php, line 182
Dispatcher::dispatch() - CORE\Cake\Routing\Dispatcher.php, line 160
 2014-04-14 14:15:46 +01:00
Bryan Crowe
1a73906a50 Fix failing NoActions comparison test 2014-04-13 23:28:13 -04:00
Bryan Crowe
f7cc0c1802 Add newline after actions in controller template 2014-04-13 21:56:27 -04:00
mark_story
f1b57d14ab Revert changed added in #2750. 
While the had the potential to make 404s going through AssetDispatcher
much faster, they broke plugins + extension routing. While explicit
extensions could be fixed, routing all extensions could not. Because we
are trying to keep 2.x as API compatible as possible it makes sense to
revert the previous changes.
 2014-04-13 20:00:34 -04:00
mark_story
749f2b99d9 Don't 404 extensions that could be handled by routing. 
Fixes an error in #2750 where routed extensions would always return
404's for plugin requests. When a file extenion could be handled by
router, AssetDispatcher cannot 404 the request.

Refs #3305
 2014-04-13 06:48:51 -04:00
mark_story
d4ae2b0b88 Correct types for Validation::range(). 
Refs #3304
 2014-04-13 06:16:24 -04:00
euromark
4f3578ebda Fix CakeHtmlReporter output for HTML 2014-04-12 13:37:36 +02:00
Mark Story
d2fa1b444f Merge pull request #3301 from ubermaniac/Sqlserver-trim 
Trim $sql before checking for SELECT
 2014-04-11 18:48:41 -04:00
Joseph Woodruff
9aeea2fcc3 Trim $sql before checking for SELECT 2014-04-11 15:25:07 -06:00
Stephen Young
b55fa98a2d Updated documentation 
* Removed references to nonexistent `AclBase` class
* Added references to `AclInterface` requirements
 2014-04-11 15:10:56 -04:00
mark_story
0fb1f82416 Bump version for 2.6.0-dev. 2014-04-10 22:28:17 -04:00
mark_story
6122869d89 Update version number to 2.5.0-RC1 2014-04-10 20:54:20 -04:00
mark_story
bf9c3029cb Merge branch 'master' into 2.5 2014-04-10 20:51:49 -04:00
mark_story
c6173a0054 Add tests for #3288 and remove nested ternaries. 
Nested ternaries are complicated to maintain and hard to read. Break
down the nested ternary into two conditionals.
 2014-04-10 20:37:08 -04:00
Guillaume Lafarge
db450a96e9 Fix Hash type casting 
When using comparison with a boolean, as the filter is a string, we have to convert the data boolean to "boolean string" to avoid type-casting troubles.

## Example
```php
$users = [
    [
        'id' => 2,
        'username' => 'johndoe',
        'active' => true
    ],
    [   'id' => 5,
        'username' => 'kevin',
        'active' => true
    ],
    [
        'id' => 9,
        'username' => 'samantha',
        'active' => false
    ],
];
$unactiveUsers = Hash::extract($users, '{n}[active=false]');
print_r($unactiveUsers);
```

This example returns the two unwanted active users because `"false"` is `true` but not `false` :)

I think this pull request will fix this issue by converting true/false boolean to string (to match with our filter).
 2014-04-10 20:19:32 +02:00
euromark
8e0f15b3d6 Revert the removal of a BC relevant part. 2014-04-10 20:11:58 +02:00
Mark Story
f9a6c1905b Merge pull request #3210 from ubermaniac/Sqlserver-schema-prefix 
Sqlserver schema prefix #3208
 2014-04-09 14:31:09 -04:00
euromark
c321ee5fec correct doc block 2014-04-09 03:07:19 +02:00
euromark
4679a30b37 move cast up 2014-04-08 12:22:29 +02:00
euromark
e948598277 update doc block 2014-04-08 12:19:29 +02:00
euromark
9058f0f6f1 Make CakePlugin::loadAll behave correctly regarding merging of settings. 2014-04-08 12:18:17 +02:00
mark_story
debdc6bccc Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-04-07 21:46:11 -04:00
mark_story
ac66c2c03a Merge branch 'master' into 2.5 2014-04-07 21:45:57 -04:00
Mark Story
bb7b450404 Merge pull request #3260 from dereuromark/2.5-count-dim 
Without any params this method does not make sense
 2014-04-07 21:45:31 -04:00
Mark Story
caf0217fe0 Merge pull request #3259 from dereuromark/2.5-array-merge 
microptimize options and default merge and other string key array merges
 2014-04-07 21:44:38 -04:00
mark_story
b05ab740d6 Merge branch '2.5-AssetDispatcher-404' into 2.5 
Return a 404 much earlier when handling missing theme/plugin assets.

Fixes #2750
 2014-04-07 21:43:37 -04:00
euromark
fdc42a24ca Without any params this method does not make sense 2014-04-08 03:27:45 +02:00
mark_story
513f7bfe86 Cleanup file header. 2014-04-07 21:26:35 -04:00
mark_story
7eb569c439 Add test case for #2750 2014-04-07 21:26:11 -04:00
euromark
a7744e6ff4 a few more corrections 2014-04-08 01:49:33 +02:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
euromark
ad5e62515f Use Hash instead of Set class 2014-04-07 03:23:51 +02:00
euromark
cb0ac6f9f3 Add a note to offsetSet() on why it cannot chain. 2014-04-06 22:59:18 +02:00
euromark
6f53529520 Correct doc blocks 2014-04-06 22:27:51 +02:00
José Lorenzo Rodríguez
2dd57c7191 Merge pull request #3246 from cakephp/2.5-event 
Make dispatch return CakeEvent - resolves #2819
 2014-04-06 21:51:48 +02:00
Jose Lorenzo Rodriguez
925db9e25e Revert "Revert "Merge pull request #3002 from moberemk/patch-2"" 
This reverts commit 0d80c92ffb.
 2014-04-06 21:51:03 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2014-04-06 21:50:41 +02:00
Jose Lorenzo Rodriguez
0d80c92ffb Revert "Merge pull request #3002 from moberemk/patch-2" 
This reverts commit 8e3d6cffb7, reversing
changes made to 92800889a6.
 2014-04-06 21:48:59 +02:00
euromark
5d4bb9c2e0 Make dispatch return CakeEvent - resolves #2819 2014-04-06 21:17:51 +02:00
José Lorenzo Rodríguez
8e3d6cffb7 Merge pull request #3002 from moberemk/patch-2 
Allow chaining in the addCrumb method
 2014-04-06 21:09:10 +02:00
mark_story
92800889a6 Update version number to 2.4.7 2014-04-04 22:25:48 -04:00
mark_story
7fb920c256 Add file missed in last commit. 2014-04-04 22:22:38 -04:00
mark_story
4ec81542db Fix email rendering when using 2 different plugins. 
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.

Fixes #3062
 2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee Only count _id if it is the last 3 characters in the field name. 
This prevents issues when baking models for tables containing `_id`.

Fixes #3230
 2014-04-04 21:26:31 -04:00
euromark
854a53b3cb generalize sentence 2014-04-04 19:19:10 +02:00
euromark
823909603a correct deprecation notices 2014-04-04 19:18:02 +02:00
Saleh Souzanchi
40b7694891 adding options for react to response when asset not exists 2014-04-04 19:50:37 +04:30
Ceeram
5c31641ea8 Change argument type to mixed in docblock, as debug() and pr() accept not just a single type 2014-04-02 23:53:54 +02:00
Joseph Woodruff
8536371501 Sqlserver Datasource how properly appends the schemaName prefix in the describe() method 2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1 Base model class no longer changes an already defined schemaName value 2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501 Merge pull request #3197 from dereuromark/master-cs 
cs
 2014-04-02 08:32:26 +02:00
euromark
b150e33472 correct missed cs errors 2014-04-02 03:16:03 +02:00
euromark
e544340d67 fix indentation 2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439 more cs 2014-04-02 03:09:42 +02:00
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02:00
euromark
44952b06a4 cs 2014-04-02 02:23:43 +02:00
Brian Porter
e5dd8acb60 Adds phpunit required version to TestShell "not found" error message. 2014-04-01 11:08:46 -05:00
Bryan Crowe
b93f373f16 Fix yoda condition in File test 2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0 Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-03-30 21:25:19 -04:00
mark_story
f9b45f1b60 Merge branch 'master' into 2.5 2014-03-30 21:24:55 -04:00
Mark Story
11a5a0ae35 Merge pull request #3152 from ADmad/2.5-controller-invoking 
2.5 controller invoking
 2014-03-30 20:50:52 -04:00
ADmad
10f294d6bb Remove $reponse param of Dispatcher::_invoke(). 
Use controller's $response property by default.
 2014-03-30 19:29:07 +05:30
mark_story
d713ff2c6a Correct docblock. 
Refs #3147
 2014-03-29 20:19:34 -04:00
sam-at-github
dbbf6c6ad9 No array short syntax in 2.4\! 2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9 Fixed CS issues. Fixed bug - added missing condition to find. 2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245 on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many. 2014-03-29 13:37:08 +11:00
Harold Putman
522b5048f8 Expose canUseMemory 
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
 2014-03-28 09:24:49 -04:00
sam-at-github
5ceb4abe1a Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better. 2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43 Update doc blocks to not be lies. 2014-03-27 11:55:54 -04:00
mark_story
c17cc39f08 Update version number to 2.5.0-beta 2014-03-25 21:31:38 -04:00
mark_story
381b3fc9c3 Merge branch 'master' into 2.5 2014-03-25 21:30:56 -04:00
mark_story
ff73229ab8 Fix failing tests. 
Not everyone uses the same database names as me.
 2014-03-24 10:04:19 -04:00
mark_story
2fe8c4050b Insert manual joins *after* generated joins. 
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.

Refs #2179
Refs #2346
 2014-03-23 21:09:08 -04:00
mark_story
de9a5a5845 Add deprecated flag to methods that are removed in 3.0. 
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.

Refs #3105
 2014-03-23 20:40:17 -04:00
func0der
06f47ee01f Introduced I18n category constants (#1894) 
Replaced all hard coded category values
 2014-03-23 17:00:17 +01:00
mark_story
57b8008dbe Merge branch 'master' into 2.5 2014-03-23 11:01:13 -04:00
mark_story
75fcc7c2f8 Don't use count() in a loop. 
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
 2014-03-23 11:00:59 -04:00
Mark Story
dea6709d89 Merge pull request #3014 from ndm2/smtp-extensibility-response-access 
SMTP transport - Extensibility and response access
 2014-03-23 09:24:21 -04:00
Mark Story
90ca41d436 Merge pull request #2941 from lucasff/master 
Allow the passing parameter escape of the getCrumbList method
 2014-03-23 09:23:06 -04:00
mark_story
8acb75425d Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
 2014-03-21 22:55:28 -04:00
mark_story
a801be30d9 Use alternate quoting in assertTags() 
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
 2014-03-21 22:53:25 -04:00
mark_story
f12b272758 Fix a few flaky/bad attribute matchers. 2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a Make assertTags() run much faster. 
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.

Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.

Fixes #3072
 2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb Fix typo. 2014-03-21 22:52:52 -04:00
mark_story
a827b96804 Clean up doc blocks for assertTags. 2014-03-21 22:52:52 -04:00
James Watts
2eadb89ff6 Update in_array() check to avoid fatal error 
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
 2014-03-21 16:16:32 +01:00
Mark Story
514974900f Merge pull request #3021 from wvdongen/master 
Fixed bug where select query in deleteAll could return wrong table name
 2014-03-21 08:21:24 -04:00
wbkostan
fea60bfe51 Update InflectorTest.php 
Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.
 2014-03-19 19:17:52 -04:00
wbkostan
9a36ed5785 Update Inflector.php 
Modified singularizer inside inflector to accurately inflect most words ending in -aves. Removed irregular cases solved by this fix.
 2014-03-19 19:12:44 -04:00
euromark
97c148a170 Correct typo 2014-03-19 12:47:31 +01:00
mark_story
afc8587949 Merge branch 'master' into 2.5 2014-03-18 22:12:14 -04:00
mark_story
ee895a8bb1 Add form attribute to hidden inputs when present. 
If inputs are placed outside of the form elements the form attribute
needs to be set on the hidden inputs. Without this attribute the empty
state does not submit correctly.

Fixes #3053
 2014-03-18 22:11:57 -04:00
Hadrien
d55a167830 Themed CakeEmail should load view helpers with the theme set 2014-03-18 14:22:24 +01:00
mark_story
9888209e9a Add tests and fix issues with multiple trailing whitespaces. 
Closes #3016
 2014-03-17 13:08:46 -04:00
Mark Story
9534d0d1e7 Merge pull request #3027 from ADmad/2.5-requesthandler-ext 
Remove setting of Controller::$ext by RequestHandler.
 2014-03-16 11:36:58 -04:00
ADmad
961f9d7669 Merge branch 'master' into 2.5 2014-03-16 20:17:24 +05:30
ADmad
abacf0d14b Remove setting of Controller::$ext by RequestHandler. 
Closes #3022
 2014-03-16 20:09:08 +05:30
ndm2
0ae225615c Match SP as per rfc2821 2014-03-15 11:47:13 +01:00
Wouter van Dongen
5035613157 * Fixed bug where select query in deleteAll could return wrong table name. 
PDOStatement::getColumnMeta (in mysql.php) sometimes returns the actual
table name when using a MySQL view with the distinct select query, and not
the alias table name. By returning the actual table name the records
could not be removed.
By the way PDOStatement::getColumnMeta is an experimental function,
perhaps it's better to avoid it.
 2014-03-14 15:20:12 +01:00
samokspv
9e15042eff changed regexp for response code 
Facebook servers have now HTTP response without status string. The use 
"HTTP/1.1 200 "
while CakePHP needs 
"HTTP/1.1 200 Ok"
because preg_match() in code use + instead *
 2014-03-13 19:11:14 +02:00
mark_story
7b2ac816c6 Retain the original file name so errors can be generated properly. 
We should hold onto the original file so we can generate a error message
when the file is not found.

Fixes #2990
Closes #3011
 2014-03-13 12:29:16 -04:00
ndm2
c1824071c9 Expose last SMTP response. 2014-03-13 16:28:54 +01:00
ndm2
5326073c80 Refactor some code into overridable methods. 
This should make the transport a little more extensibility friendly.
 2014-03-13 16:06:43 +01:00
mark_story
3a226b03c3 Remove typehint from generateAssociationQuery() 
While I think typehints are generally a good idea, this one broke a few
plugins, notably CakeDC/search. I don't think it is wise for 2.X release
to break BC in that way. I think reverting this change is probably the
safest path right now.
 2014-03-12 23:42:21 -04:00
mark_story
5a944734b8 Remove typehint on $LinkModel argument. 
Adding a typehint here causes errors in a few userland plugins. We
should honor the previous interface as best we can.
 2014-03-12 23:30:46 -04:00
Lucas Freitas
4cd6ac2f15 Fix break of the CS on Travis 2014-03-13 00:24:16 -03:00
Mark Story
0d4a6e358e Merge pull request #3005 from Tounu/2.5 
Allow sub-directories in Fixture folder
 2014-03-12 09:15:49 -04:00
Mark Oberemk
3f7eff1843 Update HtmlHelper.php 
Updated documentation to include the chained $this return
 2014-03-12 08:59:12 -04:00
Mark Story
fda242f000 Merge pull request #2961 from ovidiupruteanu/patch-3 
Sqlserver->describe failing for models with a schemaName
 2014-03-11 21:03:54 -04:00
mark_story
c5b6dda82f Merge branch 'master' into 2.5 2014-03-11 21:02:27 -04:00
Tounu
482b90e6b1 Php cs fixed 2014-03-11 21:16:30 +01:00
Tounu
e4c47f87dd Creation of a method to parse fixture path 
Creation of `_parseFixturePath`
 2014-03-11 20:55:46 +01:00
Tounu
316fd50443 Allow sub-directories for Fixture folder 
Allow sub-directories for Test/Fixture folder (for app. and plugin.)
The directory separator is '/'.
A file ``MyClassFixture.php` in the folder `Fixture/MyFolder` will be included like this :
`'app.MyFolder/my_class'`
 2014-03-11 20:12:52 +01:00
Mark Oberemk
8a8d2697d1 Allow chaining in the addCrumb method 
For convenience I think it might be valuable to allow addCrumb (and possibly other similar functions) to return $this to permit chained calls such as this:

    $this->Html->addCrumb('Admin', '/admin')->addCrumb('Blogs', '/admin/users')->addCrumb('Add');

as opposed to the considerably more verbose version that needs to be used now:

    $this->Html->addCrumb('Admin', '/admin');
    $this->Html->addCrumb('Blogs', '/admin/users');
    $this->Html->addCrumb('Add');

I'm not sure if this violates some API conventions for helpers but it does seem rather more convenient to work with to me.
 2014-03-11 10:37:47 -04:00
mark_story
c0ac61117e Only sort the keys once per request instead of on each match. 
Sorting the keys property by value sorts keys with the same prefix for
free. This does change the order of the keys, but I don't think that is
actually a large issue as it is just a list.

Refs #2991
 2014-03-10 21:42:26 -04:00
Mark Story
0c207dba4b Merge pull request #2991 from mikegibson/route_params 
Fixed incorrect replacement of route elements beginning with same string
 2014-03-10 21:28:38 -04:00
Mike Gibson
0de1307110 Changed if statement to force Travis rebuild 2014-03-10 18:46:28 +00:00
Thomas Smith
4927cf6901 #2994, unnecessary calls to Model::__isset(null) 2014-03-10 10:16:32 -07:00
Mike Gibson
60319832b5 Fixed PHPCS error 2014-03-10 15:28:00 +00:00
Mike Gibson
7205f5ec9c Made it slightly neater 2014-03-10 15:01:52 +00:00
Mike Gibson
d40452b43d Test if keys are empty before sorting 2014-03-10 14:25:28 +00:00
Mike Gibson
9be789d371 Use array_keys instead of array_flip 2014-03-10 13:29:43 +00:00
Mike Gibson
17652575f3 Fixed key sorting 2014-03-10 13:09:19 +00:00
Mike Gibson
5e896aa94a Removed comparison method 2014-03-10 13:03:04 +00:00
Mike Gibson
1202658396 Added a test case 2014-03-10 12:03:04 +00:00
Mike Gibson
00956110f5 Sort route keys in reverse length order before replacing to prevent incorrect matching 2014-03-10 11:43:28 +00:00
Kunal Panchal
a77a0f76a1 Documentation correction 
TimeHelper::$niceFormat to CakeTime::$niceFormat
 2014-03-10 14:05:03 +05:30
Jorge González
4d51092259 fixing Set docblocks 2014-03-08 10:26:03 +00:00
Jorge González
6049009cac improving docblock for Set::extract and Set::classicExtract return types 2014-03-07 19:33:02 +00:00
Rachman Chavik
aa0f1c1862 Fix: Stray [] syntax in php 5.3 codebase 2014-03-07 09:23:06 +07:00
Rachman Chavik
e71d650ade Fix: Regression with format specifiers in i18n methods 
Refs: #2589
 2014-03-07 09:22:56 +07:00
mark_story
6c3bc48ce0 Merge branch 'master' into 2.5 2014-03-06 17:45:00 -05:00
Mark
3ca338fe26 Merge pull request #2781 from davidsteinsland/2.5 
Fixed HTTP Status code when ajaxLogin is set
 2014-03-06 12:37:51 +01:00
ovidiupruteanu
7b1086e632 Add missing spaces 2014-03-06 05:18:31 +02:00
ovidiupruteanu
56a3f093a1 Sqlserver->describe failing for models with a schemaName 
When models have a schemaName set it was searching for TABLE_NAME = 'schema_name.table_name'.
Instead it should search for TABLE_NAME = 'table_name' AND TABLE_SCHEMA = 'schema_name'
 2014-03-06 04:54:03 +02:00
Mark Story
8b1e5e31c7 Merge pull request #2925 from ndm2/invocation-verification-fix 
Fix verification of expected invocations
 2014-03-04 22:54:54 -05:00
mark_story
5544fcc4c2 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2014-03-03 21:20:58 -05:00
Lucas Freitas
b522b1e724 Entire UL element was being outputted directly (escaped), added to the unset list and fixed 2014-03-03 05:28:59 -03:00
Lucas Freitas
d4b91166bc Fixing stupidity and adding the PHPDoc param 2014-03-03 05:10:21 -03:00
Lucas Freitas
7096495943 Allow the passing parameter escape of the getCrumbList method and reflecting that into the outputted link too 2014-03-03 05:01:49 -03:00
mark_story
549908738b Include the last error if available when sending with mail() fails. 
When sending email using mail() include the last error if available.

Fixes #2910
 2014-03-02 21:07:25 -05:00
ndm2
1015b38a27 Use convenience methods to create a (case-insensitive) negation matcher 2014-03-02 17:56:35 +01:00
Marlin Cremers
5795111391 Moved Limburgish to correct the order 2014-03-02 14:30:26 +01:00
Marlin Cremers
7ab028e9d7 Added the Limburgish language 2014-03-02 10:40:39 +01:00
mark_story
45cabd40fe Update version number to 2.4.6 2014-03-01 21:22:04 -05:00
ndm2
70a1b87db6 Fix wrong test model association class name 2014-03-01 23:01:33 +01:00
ndm2
01e1b5ca61 Fix failing tests caused by already existing classes 2014-03-01 20:24:32 +01:00
ndm2
008ad3237c Fix verification of expected invocations #2919 2014-03-01 19:06:17 +01:00
ADmad
a707709e1d Added test for FormHelper::radio(). 
Tests generating radio input for field with model other than one used
in create(). Refs #2911.
 2014-02-28 02:34:16 +05:30
mark_story
706ddfccae Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-02-26 21:09:06 -05:00
mark_story
25f94f9b71 Add test to prove the fix made in pull/2899 
Ensure that event listeners are not lost when merging the global and
local listeners.

Fixes #2897
Fixes #2899
 2014-02-26 21:06:32 -05:00
ADmad
a0c399e374 Remove whitespace. 2014-02-26 10:40:53 +05:30
Saleh Souzanchi
9d4f3e92ab fix issues #2897 2014-02-26 08:02:21 +03:30
mark_story
0f584c0e8b Merge branch 'master' into 2.5 2014-02-24 21:19:17 -05:00
mark_story
0776b87214 Fix postLink() & postButton() with nested data. 
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.

Closes #2894
 2014-02-24 21:17:31 -05:00
Mark Story
e0e8f91d9e Merge pull request #2866 from paddythenerd/master 
Unsetting url both with & w/o this->base to allow proper handling when app n...
 2014-02-24 20:27:25 -05:00
Mark Story
97ebfd6341 Merge pull request #2856 from cvandeplas/master 
fixes issue #2855 where cafile is not set in HttpSocket
 2014-02-21 22:29:35 -05:00
Patrick Barabe
08ba104543 Merge remote-tracking branch 'upstream/master' 2014-02-20 08:52:36 -07:00
Sam
62cb733988 One liner. Dont call function parseAccept() twice in RequestHandlerComponent. 2014-02-21 00:54:10 +11:00
mark_story
a80cbc205a Simplify conditionals. 
Set default values to remove else cases.
 2014-02-19 21:46:53 -05:00
jalbertocr
8b2e1ab9e5 Don't do assignments inside conditionals. 2014-02-19 22:41:33 -03:00
jalbertocr
cdeb51167b Fix types in docblocks. 2014-02-19 20:54:00 -03:00
jalbertocr
35f152b333 Make sure a datetime instance is valid to avoid fatal errors. 2014-02-19 20:50:30 -03:00
Patrick Barabe
a69aeb67c1 A better fix for issue #2711. Allows url to be unset from request array regardless of this->base context 2014-02-19 13:37:01 -07:00
Patrick Barabe
a9d7792678 Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot 2014-02-19 11:02:25 -07:00
AD7six
4e0627232c account for localized floats more robustly. 
Normalize floats, strings too, so that they are validated as

    dddddddddd.dd

ref #2853
 2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4 Merge branch 'master' into 2.5 2014-02-18 22:19:12 -05:00
mark_story
0a51458ffd Fix Validation::decimal() not working with localized floats. 
Use similar workarounds as DboSource::value() for accepting localized
floats.

Fixes #2853
 2014-02-18 22:18:56 -05:00
Mark Story
3d00ca9643 Merge pull request #2861 from ujwaltrivedi/master 
Get unlimited number of slabs when clearing cache keys in memcache.
 2014-02-18 20:46:50 -05:00
Ujwal Trivedi
1045a5e0a5 Update MemcacheEngine.php 
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
 2014-02-18 18:40:17 -05:00
Christophe Vandeplas
f018e4ff4d fixes issue #2855 where cafile is not set in HttpSocket 2014-02-18 09:39:56 +01:00
Mark Story
4353507ebb Merge pull request #2852 from ujwaltrivedi/master 
Update MemcacheEngine.php
 2014-02-17 16:44:13 -05:00
Ujwal Trivedi
cb0580a91a Update MemcacheEngine.php 
removing variable assignment
 2014-02-17 15:29:49 -05:00
mark_story
3433f4a1f0 Clean up changes code standards and tests. 
Refs #2582
 2014-02-17 11:03:49 -05:00
Jonas
b32deed4aa changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables 
improved tests for testing against additional attributes for Form::secure()

improved tests for testing against additional attributes for Form::end()

removed array cast, fixed test

fixed docblock format

format

Fixed a bug, this won't work as some forms are just empty
 2014-02-17 10:54:02 -05:00
mark_story
a965903777 Merge branch 'master' into 2.5 2014-02-17 10:51:32 -05:00
mark_story
070b165527 Mark compatibility shims as deprecated. 
Fixes #2845
 2014-02-17 10:29:03 -05:00
Mark Story
c325a93998 Merge pull request #2741 from ADmad/2.5-mimetype 
Added regex support to Validation::mimeType().
 2014-02-17 10:10:48 -05:00
Ujwal Trivedi
91ef655854 Update MemcacheEngine.php 
adding $limit=0 to clear function so it deletes all the keys for real
 2014-02-17 02:51:00 -05:00
ADmad
9ae7f11a2a Made mimetype check case insensitive. 2014-02-17 11:48:00 +05:30
mark_story
cde93ca7b9 2.x needs to be compatible with PHP<5.4 2014-02-16 21:37:28 -05:00
mark_story
3919f93149 Use simpler assertions. 2014-02-16 14:37:29 -05:00
mark_story
7a4cabe5d3 Add depth to log(). 
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.

Refs #2834
 2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
 2014-02-16 14:24:19 -05:00
José Lorenzo Rodríguez
4f424007fa Merge pull request #2822 from dereuromark/master-validation 
Fix uploadError validation rule
 2014-02-13 19:58:40 +01:00
AD7six
5334fe04c3 handle loose % signs in __() function 
While it's passed to sprintf and translation markers may contain
variable placeholders (%s, %d) that doesn't mean translators need to be
aware of all relevant rules. A % sign in a translation message shouldn't
cause a warning (and no return) it should be handled as a literal
percent sign.
 2014-02-13 15:30:16 +00:00
ADmad
54a395cc3e Updated docblock. 
BlowfishAuthenticate is deprecated.
 2014-02-13 17:54:53 +05:30
euromark
1725386c16 Fix uploadError validation rule to work with OS Win. Here the error is string, not integer. 2014-02-12 21:52:18 +01:00
mark_story
827dc77a11 Fix incorrect assertion. 2014-02-11 22:00:24 -05:00
mark_story
96a37d5917 Fix temporary associations that replace fields not being restored. 
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.

Fixes #2816
 2014-02-11 21:56:05 -05:00
mark_story
a5d50da040 Remove dead and unused code. 2014-02-11 16:38:24 -05:00
ADmad
9de3418079 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Permission.php
 2014-02-11 18:17:59 +05:30
ADmad
d838e7b56f Updated upgrade shell to change CakeRequest::onlyAllow() usages. 2014-02-10 18:18:09 +05:30
ADmad
1da79080ac Updated bake templates to use CakeRequest::allowMethod() 2014-02-10 17:56:57 +05:30
ADmad
bea30e62cb Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod(). 
Existing name is unintuitive and it's not easily apparent what
the method does. Closes #2803
 2014-02-10 17:38:55 +05:30
Mark Story
7a72431442 Merge pull request #2770 from ukk1337/master 
Added missing 'Session'-Component in bake
 2014-02-09 16:04:25 -05:00
mark_story
91349c306e Remove trailing whitespace. 
Refs #2799
 2014-02-09 16:03:37 -05:00
Mark Story
6b3a062927 Merge pull request #2799 from sam-at-github/master 
Fixed prefixed action prefix reverse routing match. One liner.
 2014-02-09 16:02:44 -05:00
Sam
f3cd0fc808 Test added for previous fix in CakeRoute.php. Refs #2797. 2014-02-10 02:20:00 +11:00
Sam
a9059d4a4f Fix formatting - one space too much. Refs #2799. 2014-02-10 02:02:41 +11:00
Sam
7fd13d406c Fixed prefixed action prefix reverse routing match. One liner. 2014-02-10 01:38:32 +11:00
Eric Martins
2793dca671 Fix ApiGen errors 2014-02-07 18:29:54 -02:00
Sam
9691e54248 Minor comments only. Added more explanation of $defaults parameter to Router::connect(). Trying to clarify how it relates to the routing destination and the template string tokens. 2014-02-06 20:34:02 +11:00
Sam
ae3c791b6c Minor documentation corrections about Router::connect(). 2014-02-06 18:41:37 +11:00
Mark Story
278349aff9 Merge pull request #2782 from jimmymadon/feature-clarify-acl-errors 
Clarified ACL node lookup failed error.
 2014-02-05 17:55:11 -05:00
ADmad
d9489257d3 Don't return true from view classes' render() method. 
It cause's Controller:render() to set the response body as `true`.

Refs #2780
 2014-02-06 03:06:00 +05:30
Jimmy Madon
fcd41e45a7 Clarified ACL node lookup failed error. 
Original error was ambiguous in stating whether the ARO node lookup failed or the ACO node lookup failed.
 2014-02-05 18:25:14 +00:00
David Steinsland
f2b9aa5ca4 Fixed HTTP Status code when ajaxLogin is set 2014-02-05 16:05:02 +01:00
mark_story
be8ebfc005 Merge branch 'master' into 2.5 2014-02-05 09:22:46 -05:00
mark_story
919cb7d90e Fix bake templates to generate functioning code. 
Closes #2776
 2014-02-05 09:21:49 -05:00
ukk1337
3cd6bb39bd fixed coding standard errors 2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68 removed indentation 2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88 Added missing 'Session'-Compomnent in bake 
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
 2014-02-04 13:35:48 +01:00
AD7six
adc0bf3ded BC fix for checkbox ids 
Revert to previous behavior for id generation of checkboxes, This commit
can be reverted for 2.5+ is desired

Fixes #2733
 2014-02-03 17:57:26 +00:00
mark_story
ecf5aec1ae Add '@' to the list of characters removed from radio/checkbox ID. 
This character can easily show up in email addresses and can cause
invalid HTML.

Refs #2733
 2014-02-02 21:20:31 -05:00
José Lorenzo Rodríguez
e36c954da7 Merge pull request #2693 from ADmad/2.5-session-start 
Don't start a session if it's known to be empty.
 2014-02-01 04:08:48 -08:00
Mark Story
a6459a6c2f Merge pull request #2740 from rchavik/2.5-event-manager-regression 
RFC Fix: CakeEventManager regression
 2014-01-31 07:10:46 -08:00
Mark Story
405f3a1cb9 Merge pull request #2752 from rchavik/2.4-postgres-alterschema 
Fix: Changing boolean to integer for Postgres
 2014-01-31 06:46:52 -08:00
Rachman Chavik
9f978e9bf7 Check event against listeners registered in local and global manager 
Closes #2730
 2014-01-31 16:52:29 +07:00
Rachman Chavik
35c22a291e Add test to prove Event Manager regression 2014-01-31 16:52:26 +07:00
Rachman Chavik
59549b7ebe Fix: Changing boolean to integer for Postgres 
Closes #2751, CakeDC/migrations#149
 2014-01-31 15:14:20 +07:00
mark_story
4d57d3ce5b Fix plugin path filtering when directories do not exist. 
When paths do not exist we should correctly remove them from the output
paths.

Fixes #2748
 2014-01-30 21:40:08 -05:00
mark_story
605351d0c9 Allow empty values in checkboxes. 
Allow the checkbox value attribute to be empty. This is required to make
checkboxes with a value of 0.

Fixes #2717
 2014-01-30 21:12:06 -05:00
Walter Nasich
a7f50e0ce7 Using sprintf to convert number into non-scientific notation 2014-01-30 19:07:23 -03:00
Walter Nasich
43604f64d5 Rendering a proper value for html5 attribute 'step' 2014-01-30 17:17:50 -03:00
Matt Alexander
dedefee87e Fix link in comment 2014-01-30 10:07:45 -06:00
ADmad
2d10707d18 Added regex support to Validation::mimeType(). 2014-01-30 21:05:04 +05:30
mark_story
c1ab6fa9d1 Merge branch 'master' into 2.5 2014-01-30 10:13:37 -05:00
Walker Hamilton
df2fc07940 Grammatical fix in API docs only 
Grammatical fix in API docs only

reset
 2014-01-29 11:51:29 -06:00
Mark Story
6eb5a38f22 Merge pull request #2692 from jrbasso/2.5-cors 
Added support to cross origin requests
 2014-01-29 06:45:11 -08:00
Mark Story
8db034cbf1 Merge pull request #2731 from joostdekeijzer/console-extract-not-handling-validation-quotes 
Console Extract task doesn't handle validation messages with qoutes correctly
 2014-01-29 06:43:23 -08:00
Mark Story
5629dfdcc3 Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior 
Fix Model::field() and  TranslateBehavior::beforeFind() not working together.

Fixes #2721
 2014-01-29 06:40:27 -08:00
joostdekeijzer
42daa25340 Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly 2014-01-29 14:53:52 +01:00
joostdekeijzer
987187ef8c Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname') 2014-01-29 13:37:47 +01:00
joostdekeijzer
827c815cf1 correct property comment 2014-01-29 12:25:09 +01:00
Rachman Chavik
b83b59a9d7 Log errors instead of calling trigger_error() 2014-01-29 17:51:07 +07:00
mark_story
9b4c2f3c86 Update version number to 2.4.5 2014-01-26 15:06:00 -05:00
ADmad
c093804b35 Merge branch 'master' into 2.5 2014-01-26 17:39:50 +05:30
Giampaolo Falqui
ef08534460 Improves next() and prev() documentation 
Adds the explanation for the URL available option, which is really useful when dealing with non-default CakePHP routes, now lacking from the official documentation.
 2014-01-26 11:38:11 +01:00
mark_story
d7d8fc00d1 Check data with isset() before accessing it. 
Don't blindly access data that may not exist.

Fixes #2712
 2014-01-25 22:15:47 -05:00
mark_story
cf16ae055f Remove pointless code. 
After the changes in #2709 this code just heats the earth.
 2014-01-25 22:13:42 -05:00
Melvin.Ross@gmail.com
7f496fad94 _Trailing_ and $this->keys also do not need to be urldecoded. Both _trailing_ and $this->keys gets set in _writeRoute, which also makes the regex that used to create the array $route. 
Any keys in $route that match [_trailing_] or any values in $this->keys are put there through the exection of preg_match. The URL is decoded before being passed to preg_match, which means the values
inside of [_trailing_]etc. have already been decoded.
 2014-01-24 17:44:31 -06:00
Melvin.Ross@gmail.com
83f37e48a9 Fix typo that removed '$' from '$key' 2014-01-24 16:33:59 -06:00
Melvin.Ross@gmail.com
8d6814e63f Remove rawurldecode from the _parseArgs function in CakeRoute since urldecode is already called on the URL string in CakeRoute::parse() when creating the $route array that is passed to _parseArgs. 
The result of the double urldecodes is parameters with meaningful '%' signs being stripped away on accident, and the web server reporting that the requested address doesn't exist.
 2014-01-24 16:14:58 -06:00
José Lorenzo Rodríguez
ddf046a246 Merge pull request #2694 from bar/patch-3 
Correctly remove routing url from query string.
 2014-01-22 05:15:03 -08:00
ADmad
4407cdb010 Avoid code duplication. 2014-01-22 11:36:45 +05:30
mark_story
61dd1c3f9d Fix trailing whitespace. 2014-01-21 20:23:12 -05:00
Juan Basso
dae756c84a Added option to allowed headers 2014-01-21 15:31:05 -05:00
Ber Clausen
5b4121f643 Update tests. 2014-01-21 16:56:37 -03:00
ADmad
84932fcc4a Don't start a session if it's known to be empty. 
If an app only reads/checks the session there's no need to start a
session to know that the read/checked session value is empty.

Fixes #1981
 2014-01-22 01:17:16 +05:30
ber clausen
d241a06a65 Correctly remove routing url from query string. 
It mostly happens when in nxing setups, because of location defined like:

try_files $uri $uri/ /app/webroot/index.php?$uri&$args;
 2014-01-21 16:57:46 -02:00
Juan Basso
5d9d62ba57 Fixed doc description 2014-01-21 11:42:04 -05:00
Juan Basso
a8ea1c6b55 Fixed CS 2014-01-21 10:47:08 -05:00
Juan Basso
5af3da7fe6 Changed tests to support PHP 5.2 :( 2014-01-21 10:44:00 -05:00
Juan Basso
5d016a7dbf Fixed code for PHP 5.2 2014-01-21 09:55:11 -05:00
Juan Basso
ec7196013c Added support to cross origin requests 2014-01-21 09:44:49 -05:00
mark_story
55e1619c59 Fix issue with find(count) and TranslateBehavior. 
Fixes #2667
 2014-01-18 21:54:09 -05:00
Rob McVey
7a27650297 Test case that demonstrates issue with count and Translate 2014-01-18 21:49:07 -05:00
mark_story
46eda802e5 Fix mising connection parameter to schema objects. 
When calling create/update the created schema object should be passed
the current connection.

Fixes #2668
 2014-01-16 17:19:22 -05:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
José Lorenzo Rodríguez
8b5336ade1 Merge pull request #2654 from mouyang/2.5-responseCodes 
allow additional status codes through constructor
 2014-01-16 00:49:19 -08:00
Matthew Ouyang
0536e058f9 correct the option key 
documentation fix
'statusCodes' instead of 'codes'
 2014-01-16 00:09:21 -05:00
mark_story
f25e84f4fb Don't select year 0 when there are all 0's. 
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.

Fixes #2658
 2014-01-15 10:23:45 -05:00
Matthew Ouyang
7b27b0d1ab add whitespace to end-of-file 2014-01-15 09:53:21 -05:00
Christian Winther
ace586e367 Merge pull request #2656 from makusu/fix-debugger-templates-array 
fix multiple log array key definition on templates property in Debugger
 2014-01-14 23:29:05 -08:00
Max Meiden Dasuki
9cc7c465d1 fix multiple log array key definition on templates property in Debugger 2014-01-15 15:14:00 +08:00
Matthew Ouyang
0661d7832b add AllTestsTest for skeleton app 2014-01-14 17:51:50 -05:00
Matthew Ouyang
84eb46dbdc allow additional status codes through constructor 
through $options['statusCodes']
 2014-01-14 11:18:57 -05:00
euromark
690f54ad9d more corrections in order 2014-01-10 00:33:27 +01:00
euromark
3ff23c732f unify and correct assert order 2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez
606362d519 Merge pull request #2636 from dereuromark/2.5-title-for-layout 
Follow the deprecation note in the doc block of View class
 2014-01-09 15:13:07 -08:00
euromark
97e43e5806 unify to expected 2014-01-09 16:52:21 +01:00
euromark
738b34c2d0 Correct assert param order 2014-01-09 16:50:27 +01:00
euromark
29e15386b2 Follow the deprecation note of 2.1 migration guide and switch to fetch(title) 
correct assert order for test
 2014-01-09 16:45:49 +01:00
Bryan Crowe
cd27012405 Simple docblock updates to CakeTime 2014-01-08 21:38:45 -05:00
Mark Story
9bf7513ba9 Merge pull request #2628 from pummra/patch-1 
Add message to let user know that no controllers were generated.
 2014-01-08 06:43:12 -08:00
mark_story
b20ca3f4e0 Fix errors with postgres tests. 2014-01-08 09:42:13 -05:00
pummra
5605ff48ab Update ControllerTask.php 
Removed $admin from message in regards to no controllers being baked in all() function
 2014-01-08 12:23:03 +00:00
pummra
a981c7fa8c Removed trailing whitespace. 2014-01-08 10:16:06 +00:00
pummra
0214ac403e Update ControllerTask.php 
Updated if statement for clarity and also fixed spelling mistake.
 2014-01-08 10:10:40 +00:00
pummra
d41bb0b1b3 Update ControllerTask.php 
Added an output message if no controllers are baked using the all() function.
 2014-01-08 09:52:05 +00:00
Mark Story
7f2e0a29a4 Merge pull request #2624 from dereuromark/2.5-loggedin 
2.5 loggedin
 2014-01-07 11:27:39 -08:00
euromark
e3befe30df deprecated loggedIn 2014-01-07 16:12:38 +01:00
Mark Story
cd9c135c88 Merge pull request #2601 from dereuromark/2.5-upgrade 
2.5 upgrade
 2014-01-07 06:43:10 -08:00
mark_story
312b2c3cd1 Merge branch 'translate-patch' 2014-01-06 21:21:25 -05:00
mark_story
3763350667 Add test for issue #2595 
Fold conditions that did the same thing and add a test case.

Closes #2595
 2014-01-06 21:21:13 -05:00
euromark
ecfd64c082 adding test 2014-01-06 21:07:00 +01:00
euromark
865ca7acd6 wording 2014-01-06 20:43:30 +01:00
euromark
1201887ad1 Clearer error message 2014-01-06 20:42:17 +01:00
euromark
483cd13a26 rename method 2014-01-06 20:00:45 +01:00
ADmad
18255bdcf3 Fixed typo in var name. 2014-01-06 02:32:34 +05:30
mark_story
5fd8883691 Merge branch 'master' into 2.5 2014-01-05 15:45:09 -05:00
euromark
3e48d2e082 Add return early statements for redirecting in controllers. 2014-01-04 13:18:14 +01:00
euromark
71fb17e092 keep name as well 2014-01-03 16:33:02 +01:00
Raffaele
a4f138813b Return value if value are 0 
Save correctly if the value is 0, but after the find is returned as an empty string.
 2014-01-03 15:46:09 +01:00
euromark
85337a5d15 correct templates 2014-01-03 13:28:45 +01:00
euromark
a02ab67521 unify exception and error handling. 2014-01-03 12:42:52 +01:00
euromark
3d51bfee3b Correct casing. 2014-01-03 04:09:19 +01:00
mark_story
3cee3b0e99 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-12-30 21:28:22 -05:00
Mark Story
4ae1feaf2d Merge pull request #2571 from cuppett/patch-1 
Must double quote the schema name in query
 2013-12-30 08:18:22 -08:00
ADmad
f37eb9ad4b Merge pull request #2572 from bcrowe/hotfix-controllerBlocks 
Update some grammar in Controller
 2013-12-29 21:30:01 -08:00
Bryan Crowe
49bb441cef Update some grammar in Controller 2013-12-30 00:13:26 -05:00
Stephen Cuppett
ed749fdc97 Must double quote the schema name in query 
Schema names with reserved words such as "create" will fail this query without double quotes. 

Attempted prepared statement with ? placeholder. This failed with the following CakePHP error:

Error: A Database connection using "Postgres" was missing or unable to connect.	
The database server returned this error: SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "$1" LINE 1: SET search_path TO $1 ^
 2013-12-29 21:43:56 -05:00
euromark
2f02d0c755 Add missing pkpass mimetype 2013-12-30 01:19:09 +01:00
Rachman Chavik
c4f8289b53 Fix test by checking against an empty array instead of false 2013-12-27 12:37:39 +07:00
Rachman Chavik
c48afae2dc Add test to prove issue when saving invalid tree data 2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7 Add tests for uncovered case of :0 replacements. 
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
 2013-12-24 13:13:05 -05:00
Mark Story
1cb7e4f0ff Merge pull request #1635 from dereuromark/master-dom-ids 
Fix duplicate ID generation of for multiple checkboxes.
 2013-12-24 07:02:38 -08:00
euromark
b392254c92 fix cs 2013-12-24 15:20:32 +01:00
mark_story
af9611d460 Update version number to 2.4.4 2013-12-23 21:44:46 -05:00
mark_story
99e4dbd827 Merge branch 'master' into 2.5 2013-12-23 11:58:07 -05:00
mark_story
70530135d6 Don't use FORWARDED_HOST when getting referer values. 
HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the
original HTTP_HOST value. It has nothing to do with referer values.

Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header
in proxied setups, add a trustProxy parameter to host() and default it
to false. This maintains existing behavior and allows people to access
the proxied value.

Fixes #2537
 2013-12-23 11:32:14 -05:00
Saleh Souzanchi
328125ad43 Merge branch 'master' into master-phpcs-error-fix 2013-12-23 11:43:54 +03:30
Mark Story
321347e52b Merge pull request #2532 from bar/patch-2 
Trivial continue.

fix phpcs error "Missing @throws tag in function comment"
 2013-12-23 11:21:18 +03:30
Mark Story
fb8472ae40 Merge pull request #2532 from bar/patch-2 
Trivial continue.
 2013-12-22 20:03:56 -08:00
ber clausen
e0c85a18bc Trivial continue. 2013-12-22 22:15:47 -02:00
ber clausen
4e70e44247 Parenthesis are preferred. 2013-12-22 22:10:37 -02:00
ber clausen
98962806cd Double rainbow. 2013-12-22 21:47:19 -02:00
Ber Clausen
f30b43b4c9 Update documentation and typehint. 2013-12-21 22:02:45 -03:00
mark_story
62e89734ab Throw exceptions from Hash::combine() 
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.

Fixes #2470
 2013-12-21 17:46:05 -05:00
Mark Story
0c4a5c59e4 Merge pull request #2520 from bar/2.5-dbosource-read 
Document and try to order part of ```DboSource```.
 2013-12-21 14:04:29 -08:00
José Lorenzo Rodríguez
60d2ece035 Merge pull request #2506 from dereuromark/2.5-string 
Correct tokenize for empty strings.
 2013-12-21 10:31:52 -08:00
Ber Clausen
c15f7de164 Re-expose DboSource::fetchAssociated() for BC. 
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
 2013-12-21 11:34:40 -03:00
Ber Clausen
5ccb77e25d Be consistent with the result set variable name. 2013-12-21 10:57:40 -03:00
Ber Clausen
0adc062cfa Process query only when needed. 2013-12-21 10:57:40 -03:00
Ber Clausen
422be67a03 Avoid recalculating whether the relationship is a self join. 2013-12-21 10:57:40 -03:00
Ber Clausen
86b69964ef Be more semantic with variable names. 
Isue less loockups for deep arrays.
A bit of documentation added.
 2013-12-21 10:57:40 -03:00
Ber Clausen
7a378c3b22 Conveniently fetch hasAndBelongsToMany associations from within a function (like hasMany). 
Variable names should represent their values.
Remove unnecessary references.
 2013-12-21 10:57:38 -03:00
Ber Clausen
60a8f0900b Get Model associations only when needed. 2013-12-21 10:49:22 -03:00
Ber Clausen
8355d32bb1 Be more semantic indicating that association fields must be empty. 2013-12-21 10:49:22 -03:00
Mark Story
99c8503578 Merge pull request #2518 from bar/2.5-dbosource-getconstraint 
Document DboSource::getConstraint().
 2013-12-21 05:43:52 -08:00
Ber Clausen
5860cd4b8e Still more documentation. 2013-12-21 07:04:45 -03:00
Ber Clausen
c5c8cb80ba Document DboSource::getConstraint(). 
Also, update the function signature (to be compliant with other
functions) and type hint $LinkModel.
 2013-12-21 06:24:23 -03:00
Ber Clausen
09188cc3d0 More documentation. 2013-12-21 06:11:31 -03:00
Ber Clausen
c1cdf190e3 Add documentation. Strict check. 2013-12-21 05:41:23 -03:00
Ber Clausen
1bdb783f91 Update documentation. 2013-12-21 05:39:42 -03:00
mark_story
a7ecf44007 Deprecated scaffold and scaffoldview. 
They have already been removed in 3.0, so mark them accordingly.
 2013-12-20 14:16:44 -05:00
mark_story
7e5c0f7185 Merge branch 'master' into 2.5 2013-12-20 14:15:35 -05:00
mark_story
df4b978ce4 Clarify the docs for DboSource::fetchAll() 
Refs #2508
 2013-12-19 17:39:44 -05:00
mark_story
5bddc477a3 Fix incorrectly handled time values around 12:00:00 
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.

Fixes #2507
 2013-12-19 17:36:27 -05:00
euromark
3ecce19732 Correct tokenize for empty strings. 2013-12-19 15:58:08 +01:00
Saleh Souzanchi
bbbf3076ab undo remove end line break 2013-12-19 00:36:20 +03:30
Mark Story
ca2fb6fcfc Merge pull request #2503 from dereuromark/master-string 
Correct doc block
 2013-12-18 09:27:00 -08:00
euromark
3100118a4e Correct doc block 2013-12-18 12:10:23 +01:00
OKINAKA Kenshin
3433e10fbd Fix Postgres for bigint primary key. 2013-12-18 14:58:18 +09:00
Saleh Souzanchi
4639d3597c add DispatcherFilter Settings 2013-12-18 06:54:27 +03:30
ADmad
49a9d24ca7 By default use filter_var() to valid email addresses in CakeEmail. 
Refs #2477
 2013-12-18 01:07:40 +05:30
mark_story
30e139412d Fix input type inference when type=>checkbox 
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.

Fixes #2491
 2013-12-16 23:26:20 -05:00
mark_story
44b7d013ae Fix whitespace error. 2013-12-16 21:39:06 -05:00
mark_story
01be15d654 Don't always wipe a Model's _schema property when calling setSource() 
Only wipe the internal schema cache if listSources() returned a useful
list of sources. Otherwise retain the old schema. This lets datasources
that don't implement listSources to be combined with models that define
static schema properties.

Fixes #2467
 2013-12-16 14:42:21 -05:00
ADmad
27979286b2 Revert change done in 11f543f1f2. 
The change is unneeded now as Security::encrypt() no longer throws exception
for falsey values.
 2013-12-15 20:29:41 +05:30
ADmad
8a666fb37e Don't throw exception when trying to encrypt falsey value. 2013-12-15 19:28:56 +05:30
mark_story
ef899f0c93 Make API docs easier to read. 2013-12-14 23:08:07 -05:00
mark_story
47497029bb Fix mixed tabs/spaces. 2013-12-14 23:03:34 -05:00
mark_story
e15d1652ed Relax the 'my' and 'ym' date validation formats. 
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.

Closes #2436
 2013-12-14 23:02:12 -05:00
Mark Story
bf96ea36d9 Merge pull request #2482 from zoghal/2.5-cookie-fix2 
fix CookieComponent - when write null or empty string
 2013-12-14 16:21:58 -08:00
mark_story
15c390586f Pull out some re-used subpatterns. 
Having smaller segments makes reading the larger patterns simpler, and
allows for less duplication across the various patterns.

Refs #2436
 2013-12-14 18:20:20 -05:00
mark_story
c2b8778ce8 Merge branch 'master' into 2.5 2013-12-14 17:45:49 -05:00
Saleh Souzanchi
11f543f1f2 fix CookieComponent - when write null or empty string 2013-12-15 02:15:36 +03:30
Mark Story
384c3a815d Merge pull request #2350 from tuffz/formatting_app_uses_blocks 
formatting app::uses blocks
 2013-12-14 12:37:02 -08:00
Mark Story
e61ac62bfa Merge pull request #2458 from bar/2.5-model-typehints 
Add Model type hints, and ease testing for Model.
 2013-12-14 12:34:58 -08:00
mark_story
79701af501 Make Hash::numeric() accept more numeric things. 
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.

Fixes #2478
 2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez
fc6edf4d9c Fixed small coding standard error 2013-12-12 09:07:00 +01:00
ADmad
87440bba87 Fixed docblock. Closes #2476 2013-12-12 11:00:29 +05:30
mark_story
3b867a048e Add test for saveMany + validate=false. 
Closes #2468
 2013-12-11 12:43:18 -05:00
Mark Story
8e6d26773c Merge pull request #2438 from bar/2.5-console-options-format 
Set console options in the same fashion for every shell/task.
 2013-12-10 19:53:54 -08:00
Ber Clausen
2d67604182 Add more Model type hints, and ease the model testing replacing is_object() for '!== null'. 2013-12-10 00:20:12 -03:00
Ber Clausen
63a192ea39 Update DboSource::group(): 
* Update documentation.
* Add Model type hint.
* Bail early when fields are empty.
 2013-12-10 00:18:19 -03:00
Ber Clausen
5c595b90d2 Remove is_object() calls when the test subject is already type hinted as a Model. 2013-12-10 00:18:18 -03:00
Ber Clausen
2f24de81cb Model objects should be in CamelCase. 
Add a Model type hint.
 2013-12-10 00:18:18 -03:00
Mark Story
19122414fc Merge pull request #2459 from bar/2.5-patch 
Test for self join only when needed.
 2013-12-09 18:55:31 -08:00
Ber Clausen
b7527c6c3b Test for a self join only when needed. 2013-12-09 23:11:42 -03:00
Ber Clausen
2366e7c7b5 Make getConstraint() a tiny bit more readable. 2013-12-09 22:25:03 -03:00
Mark Story
a2f043d2a3 Merge pull request #2445 from young-steveo/2.5 
CakeFixtureManager::load now calls CakeTestFixture::truncate
 2013-12-09 09:23:02 -08:00
mark_story
2a58e529b7 Merge branch 'glorand-master' 
Fix Hash::extract() operating on non-array data.

Closes #2433
 2013-12-09 12:17:36 -05:00
mark_story
edcfe2d3a8 Add tests for #2433 2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez
6358741944 Merge pull request #2449 from cakephp/fix-session-cyclic-error 
Fixed error in CakeSession that would call start() in an infinite loop
 2013-12-09 02:18:21 -08:00
mark_story
48d2618c62 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Routing/Router.php
 2013-12-08 21:25:59 -05:00
mark_story
abf4af14a8 Change quotes to keep postgres happy. 2013-12-08 11:58:26 -05:00
mark_story
530c95725f Attempt to fix errors with postgres tests. 2013-12-08 11:46:17 -05:00
Jose Lorenzo Rodriguez
3a2c497206 Fixed failing test 2013-12-08 14:08:57 +01:00
Jose Lorenzo Rodriguez
70d5c37834 Ensuring session is configured before trying to destory it 2013-12-08 13:44:16 +01:00
Rachman Chavik
2d5a153c0d Set 'order' to false to prevent issues with postgres 
See: https://github.com/cakephp/cakephp/pull/2421#issuecomment-30074971
 2013-12-08 16:40:22 +07:00
Rachman Chavik
98e645a1ea Add test to prove issues with deleteAll with $order set 2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez
848a0ce217 Fiexed error in CakeSession that would call start() in an infinite loop 
when the session is marked as invalid
 2013-12-07 22:25:33 +01:00
Stephen Young
8645e05ab1 Removed leading underscores from ReflectionProperty variables in test case 2013-12-07 12:10:03 -05:00
Stephen Young
f0036b3ebc CakeFixtureManager::load now calls CakeTestFixture::truncate 2013-12-07 09:47:06 -05:00
ADmad
738d0e2277 Fixed edge case which allowed login with empty password. 
Ensure skipping call to FormAuthenticate::_checkFields() does not allow
logging in with empty password. Closes #2441.
 2013-12-07 18:40:08 +05:30
Brian Porter
bfdc41e8bb Baked test methods are marked incomplete. 
Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing.

It is much easier when _running_ tests to locate incomplete test methods.

Fixes 2437.
 2013-12-05 22:54:26 -06:00
Ber Clausen
5c08c77b93 Set console options in the same fashion for every shell/task. 2013-12-05 22:59:01 -03:00
Gombos Lorand
764e368dc3 Check if the item is an array. 2013-12-05 12:03:07 +02:00
mark_story
85a9132c9b Append / to the start/end of the mapResources prefix. 
This makes the method easier to use and less error prone.

Fixes #2431
 2013-12-04 21:46:59 -05:00
Eliu Florez
6ee5277c9f Update CakeEventManager.php 
Cast resultados de implementedEvents a una matriz.

e6f2c92005
 2013-12-04 14:26:02 -04:30
mark_story
e6f2c92005 Cast results of implementedEvents to an array. 
This makes using mocks much easier with event listeners as they don't
need to provide a returnValue for implementedEvents.

Refs #2333
 2013-12-03 22:39:14 -05:00
euromark
8ebf004450 Also make DOM ids for radio element values unique. 2013-12-04 02:14:08 +01:00
euromark
587a04ab84 prevent possible XSS attack via form helper selects and unescaped output. 2013-12-04 01:51:39 +01:00
euromark
aae0f762dd Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064. 2013-12-04 01:30:57 +01:00
ADmad
f3900e89fd Fixed bug where deleteAll tried to delete same id multiple times. 
Ensure find done in deleteAll only returns distinct ids. A wacky
combination of association and conditions can sometimes generate
multiple rows per id.
 2013-12-03 22:18:17 +05:30
mark_story
8578708e76 Merge branch 'master' into 2.5 2013-12-01 21:37:37 -05:00
ADmad
c72def4840 Moved exception throwing to after paging info it set for request. 
This fixes the regression caused in 2096d3f632. When catching exception
thrown by PaginatorComponent::paginate() in controller, developer again
has access to paging info in request object.

Closes #2402
 2013-11-30 19:00:08 +05:30
mark_story
a9ca1bdc58 Add tests and fix other cases where autoLinkEmail would fail. 
Refs #2403
 2013-11-29 22:57:43 -05:00
mark_story
7c66d0db50 Fix autoLink() when URLs contain email addresses. 
Add whitespace lookbehind to ensure the email address is preceded by
whitespace, this obviously means that emails starting with word/symbols
are not detected, however those symbols are generally valid in an email
address anyways, and will form the local part.

Fixes #2403
 2013-11-29 22:24:03 -05:00
mark_story
bbe4c659aa Add tests for TextHelper::autoLink() 
Add tests for email addresses embedded in urls.

Refs #2403
 2013-11-29 21:57:08 -05:00
ADmad
155c7585e0 Fixed docblock 2013-11-29 00:14:43 +05:30
mark_story
97ab2c0e9b Merge branch 'imsamurai-2.5' into 2.5 
Add unsigned integer support to MySQL. Unsigned integers have not been
added to other databases as they either do not support them (postgres,
sqlserver) or they are 'faked' and don't do anything (sqlite).

Fixes #2321
 2013-11-27 20:12:28 -05:00
mark_story
430ef88118 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-11-25 23:15:15 -05:00
mark_story
eb34e011e2 Update version number to 2.4.3 2013-11-24 21:25:25 -05:00
José Lorenzo Rodríguez
edc6fc6701 Merge pull request #2379 from rspenc29/2.5 
Added support for passing additional flags to mysql connection
 2013-11-24 01:07:58 -08:00
Rob Spencer
b8e32dd2b3 Adding flags override to additional pdo drivers 2013-11-24 01:04:17 -05:00
Rob Spencer
cda9320e96 Added support for passing additional flags to mysql connection 2013-11-24 00:47:06 -05:00
mark_story
eac6d7850f Remove pointless array cast. 2013-11-23 12:36:15 -05:00
mark_story
5e77183afe Fix failing tests when Console group was run in isolation. 2013-11-23 12:36:02 -05:00
mark_story
311189a662 Sort tables before returning them. 
This fixes unsorted table lists in the various bake related tasks.

Fixes #2386
 2013-11-23 12:34:16 -05:00
mark_story
d97cf79545 Add coverage for comma in email alias. 
Closes #2381
 2013-11-22 13:14:21 -05:00
mark_story
37e387fed2 Replace non-breaking spaces with Inflector::slug(). 
Fixes #2363
 2013-11-22 10:13:10 -05:00
imsamurai
62a53d26bb fix typo 2013-11-22 16:17:25 +02:00
mark_story
a4460ff228 Fix tests even better than before. 
The current tests work on travis, but fail on jenkins. Fix that up.
 2013-11-21 22:57:50 -05:00
mark_story
71312932e8 Merge branch 'master' into 2.5 2013-11-21 21:46:21 -05:00
mark_story
0e7b0ad111 Fix failing test. 2013-11-21 21:46:03 -05:00
ber clausen
1b9bf7b0fd Always remove verify_host from SSL context. 
It is only used to be able to set ```CN_match```.
 2013-11-21 16:23:01 -02:00
José Lorenzo Rodríguez
df5fc2304a Merge pull request #2289 from bar/2.5-optimize-dbosource 
First part of the DboSource cleanup.
 2013-11-21 01:02:36 -08:00
Eric Büttner
8c319c7dbc fix the failing test case. 2013-11-20 12:26:03 +01:00
mark_story
1be40d5d64 Fix coding standards error. 
Refs #2364
 2013-11-19 18:36:52 -05:00
mark_story
ec38ee1c48 Only enable cacheSources if both the datasource + model agree on it. 
This prevents models from flipping cacheSources on when the datasource
has it disabled already.

Refs #2364
 2013-11-19 17:36:20 -05:00
mark_story
99fd6e40fe Leave db->cacheSources unaltered. 
When a model uses cacheSources = false, it should not have side effects
on the datasource.

Fixes #2364
 2013-11-19 15:06:55 -05:00
davidsteinsland
c29d2abf69 Fixed test 2013-11-19 12:10:01 +01:00
davidsteinsland
22d9cd8a00 Fixed test case 2013-11-19 11:58:52 +01:00
davidsteinsland
881f81d01a Fixed undefined constant 2013-11-19 11:50:28 +01:00
davidsteinsland
7056ccd38a Added msgpack support for Memcached 2013-11-19 11:35:05 +01:00
imsamurai
f817beb8b6 change method public unsigned to protected _unsigned 2013-11-19 10:55:44 +02:00
imsamurai
1313b81913 fix since phpdoc tag for fixture 2013-11-19 10:48:51 +02:00
mark_story
3b8208be2e Merge branch 'master' into 2.5 2013-11-18 21:49:13 -05:00
Matheus Pedroso
4677ddf490 Fix duplicated webroot path on HtmlHelper::meta('icon'). 2013-11-18 23:38:01 -02:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7 formatting app::uses blocks (refs #2265) 2013-11-18 11:56:00 +01:00
imsamurai
20dc92291e fix broken test 2013-11-17 23:34:22 +02:00
imsamurai
0286e4120d fix code style 2013-11-17 23:12:51 +02:00
imsamurai
8bcfe452da not add unsigned to not numeric fields, fix broken test, add new test 2013-11-17 23:10:53 +02:00
imsamurai
2f6122cb01 add unsigned property in Model::describe 2013-11-17 22:37:01 +02:00
imsamurai
00fb663f90 remove numeric from unsigned config 2013-11-17 21:23:13 +02:00
imsamurai
1d9ecc6c94 Merge upstream/2.5 into 2.5 2013-11-17 21:13:25 +02:00
Marc Würth
229bd69903 Added link to three hash methods 2013-11-17 03:40:39 +01:00
mark_story
016c3aed44 Add test for saveAssociated and expression objects. 
Add a test for #1514. This issue was fixed during recent refactorings.

Closes #1514
 2013-11-16 10:51:14 -05:00
mark_story
cee2801700 Add 'metadata' to the uninflected list. 
Fixes #2332
 2013-11-15 21:49:05 -05:00
mark_story
b6b8d83980 Remove non-portable data type from MySQL. 
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
 2013-11-14 10:28:09 -05:00
Mark Story
17ae40f0ce Merge pull request #2319 from ravage84/php-5-removal 
Removed "PHP 5" from file header DocBlocks
 2013-11-14 06:41:31 -08:00
imsamurai
f1a2c1a75c add decimal type for unsigned 2013-11-14 10:56:51 +02:00
imsamurai
15805e668e fix phpcs errors 2013-11-14 02:39:16 +02:00
imsamurai
7bc8dac453 fix phpcs errors 2013-11-14 02:19:41 +02:00
imsamurai
87fef89737 fix phpcs errors 2013-11-14 02:19:31 +02:00
imsamurai
fd64d952b5 change position from afterDefault to beforeDefault during to wrong order, add test 2013-11-14 01:36:27 +02:00
imsamurai
e35823e72a fix tests, add numeric type for unsigned 2013-11-14 01:33:11 +02:00
imsamurai
5a40944a6f fix test name testBuildColumn3 to testBuildColumnUnsigned 2013-11-14 01:20:21 +02:00
imsamurai
2fcb4c3c6c - change check to strict for options of $fieldParameters 
- add `types` parameter and strict check if it present in `$fieldParameters` (if it present and not contain column type field parameter will be skipped)
- add `noVal` parameter to `$fieldParameters` if it present and not empty value of this parameter from column will be ignored
- add `unsigned` column type for integer, float and biginteger. If it set to `true` an 'UNSIGNED' will be add in sql column part, if not set or set not to `true` this parameter will be skipped
 2013-11-14 01:11:30 +02:00
Marc Würth
7018997979 Fixed some copyright and license statements in the file header DocBlocks 2013-11-14 00:07:03 +01:00
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks 
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
 2013-11-13 22:58:39 +01:00
Marc Würth
ce47890e98 Replaced all remaining license references to the Open Group Test Suite License with the MIT License 2013-11-13 18:52:06 +01:00
Marc Würth
19b972cfeb Implemented skipping of fields for the data validation rules when baking a model 2013-11-13 13:36:19 +01:00
Andy Dawson
d94c187adc Merge pull request #2305 from kimegede/docblock-construct-destruct-return-void 
Docblock construct destruct remove @return
 2013-11-13 01:44:35 -08:00
Ber Clausen
ed142d8c89 Add missing type hints. 2013-11-13 00:09:45 -03:00
Ber Clausen
0e74a0757a Keep insertQueryData() DRY, issue less lookups. Remove unused $assocData 
and $LinkModel from the signature.
Model objects should be CamelCase.
 2013-11-13 00:09:39 -03:00
Ber Clausen
52d425737a Call getDataSource() instead of the directly calling 
ConnectionManager::getDataSource().
 2013-11-12 03:38:47 -03:00
Ber Clausen
c1f3d9c274 Model objects should be in CamelCase. 2013-11-12 01:37:38 -03:00
Ber Clausen
014d2dd2d9 Remove 'self' key from getConstraint() calculations because it is not necessary anymore. 2013-11-12 01:30:57 -03:00
Ber Clausen
e658e071d1 Remove unused variable from the signature. 2013-11-12 01:17:11 -03:00
Ber Clausen
67a65663a7 Assign before actually using it. 2013-11-12 01:13:55 -03:00
Ber Clausen
026565033b Model objects variables should be CamelCase. 2013-11-12 00:49:06 -03:00
Ber Clausen
6b8a79be6d Remove reference from the signature. 2013-11-12 00:29:36 -03:00
Ber Clausen
cb42b056ac Remove the 'Line indented incorrectly' PHPCS error. 2013-11-12 00:08:39 -03:00
Ber Clausen
7f570f33e4 Unindent, and remove unnecessary getDataSource() call. 
Also, objects should be CamelCase.
 2013-11-12 00:01:18 -03:00
mark_story
a07608cbb9 Fix incorrect CSRF token fields when using postLink() 
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.

Fixes #2308
 2013-11-11 21:56:55 -05:00
Ber Clausen
b35c9671ad Explicitly build SQL statements, calling buildAssociationQuery(). 2013-11-11 23:27:50 -03:00
Ber Clausen
f0fcaa1305 Improve generateAssociationQuery(): 
* bail early when $linkModel is Null (BC for now).
* move SQL fields warmup and SQL statement building to its own functions
 (it will payoff later improving self documentation and readability).
* make assignments and function calls only when needed (depending on the
 association type).
 2013-11-11 23:27:50 -03:00
Ber Clausen
64f34b75a2 Fix a couple of failing tests. 2013-11-11 23:27:50 -03:00
Ber Clausen
dcadfcbcab Remove inline assignment. 2013-11-11 23:27:50 -03:00
Ber Clausen
53c6df554c Remove unused $resultSet argument from generateAssociationQuery(). 2013-11-11 23:27:50 -03:00
Ber Clausen
5da05d9216 Remove unneeded test inside conditional. 2013-11-11 23:27:50 -03:00
Ber Clausen
f16695db5f Move variables to logical blocks. 
Unindent to ease readability, and avoid assigning variables when
unneeded.
Free a little memory before entering to recursive intensive loops.
 2013-11-11 23:27:50 -03:00
Ber Clausen
fdb4b11d0b Remove unnecessary call to getDataSource(). 2013-11-11 23:27:50 -03:00
Ber Clausen
c9e0131d6a Only generate query data for hasOne and belongsTo associations. 
Avoid calling generateAssociationQuery():

* when the return value will never be usefull (True in this case)
* to avoid polluting $queryData with uneeded fields

Later, the SQL statement for the primary, and 'hasOne' plus 'belongsTo'
relationships, is built.
 2013-11-11 23:27:50 -03:00
Ber Clausen
2532228844 Improve readability and optimize minimizing variable lookups. 2013-11-11 23:27:49 -03:00
mark_story
1f5d1eee98 Remove duplicated reference for behaviors in ClassRegistry 
The 2nd key in the registry was to support persistModel which has long
since been removed. With this registry key not being used it can be
removed with reasonable safety.

Fixes #2306
 2013-11-11 12:30:00 -05:00
Kim Egede Jakobsen
18e0dc95dd Remove @return from docblock (for __construct && __destruct methods) 2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad Try to make same comments for constructors. 
Conflicts:
	lib/Cake/I18n/L10n.php
 2013-11-11 11:03:57 +01:00
mark_story
63d867c98b Restore global event managers that were causing cascading failures. 
Refs #2105
 2013-11-10 22:35:00 -05:00
Andy Hobbs
3e373771d7 Corrected coding standards violations in CaKeEventManagerTest.php 
- Changed combining of arrays in CakeEventManager::listeners() to be more efficient

Refs #2105
 2013-11-10 22:34:50 -05:00
Andy Hobbs
7656ffd12e Corrected coding standards violations in CateEventMAnagerTest.pnp 
Refs #2105
 2013-11-10 22:34:43 -05:00
Andy Hobbs
11db7c1631 Removed EventManager test that tested using a closure as it breaks compatability with php < 5.3.0 
Refs #2105
 2013-11-10 22:34:35 -05:00
Andy Hobbs
615f700d22 Added EventManager::prioritisedListeners() function to alow the global event manager to return unprocessed listeners array 
Refs #2105
 2013-11-10 22:34:27 -05:00
Andy Hobbs
e8984a9033 Profiles and optimised EventManager::listeners() function, reducing execution time by 14.5% 
Refs #2105
 2013-11-10 22:34:05 -05:00
mark_story
3561929be7 Merge branch 'master' into 2.5 2013-11-10 21:53:09 -05:00
José Moreira
b1e366c500 Model.php PHPDoc Description: Chang afterFilter with afterFind 2013-11-10 16:59:28 +00:00
mark_story
8d38861a2e Fix missing HTML encoding on URL's generated by Html->meta(). 
The input URL was not correctly handled as an asset URL and thus was
not correctly HTML or URL escaped. This created invalid HTML when
favicon URLs included query string arguments.

Refs #2233
 2013-11-09 14:31:09 -05:00
mark_story
bf2f2e772e Split existing tests up, and add tests for Router based image URL's 
Refs #2233
 2013-11-09 12:00:56 -05:00
mark_story
3c1f775ab2 Merge branch 'master' into 2.5 2013-11-09 09:37:27 -05:00
mark_story
ada0ec4c77 Fix formatting of decimal values when there is no fractionSymbol. 
When a currency format does not include a fractionSymbol it should be
able to format fractional values.

Fixes #2253
 2013-11-09 09:36:38 -05:00
mark_story
407c420176 Remove CRLF from To headers in MailTransport. 
Like other header fields To should not contain CRLF.

Refs #2209
 2013-11-08 13:25:51 -05:00
mark_story
2e7d687b98 Merge branch 'master' into 2.5 2013-11-07 23:01:25 -05:00
Bryan Crowe
9ee5efaa2d Add missing return type 2013-11-07 22:14:11 -05:00
mark_story
145dbacb78 Fix incorrectly encoded headers in MailTransport. 
When encoded values are present in header fields, they need to have
newlines removed as leaving the newlines in place and interfere with
delivery on Qmail based SMTP servers.

Fixes #2209
 2013-11-04 22:17:21 -05:00
ADmad
d647fe8a91 Added buffering of form tags generated by FormHelper::postLink() 2013-11-03 23:11:11 +05:30
mark_story
afd182898f Merge branch 'master' into 2.5 2013-11-01 16:54:57 -04:00
mark_story
d8acf531cb Merge branch 'postgres-sequence' 
Merge changes for pull request #2248
 2013-10-31 19:53:51 -04:00
mark_story
9e4ac31dc3 Correctly identifier quote column names before adding them to queries. 
Closes #2248
 2013-10-31 19:53:42 -04:00
davidsteinsland
94998763a5 Fixing whitespace 2013-10-31 23:58:52 +01:00
davidsteinsland
e68a61c375 Added configurable default value to Hash::get() 2013-10-31 23:31:48 +01:00
Rachman Chavik
fb436644c3 RedisEngine: Support for selecting database number 
Closes GH-2254
 2013-10-31 20:45:39 +07:00
Bryan Crowe
94d7ac1dd6 Correct spelling of retrieve 2013-10-30 23:13:07 -04:00
Luis Ramos
e33653a8d7 Add test case 2013-10-30 16:06:27 -06:00
Luis Ramos
db63ba2d8f Parse cookie values "{}" & "[]" as array 2013-10-30 15:26:50 -06:00
mark_story
aaac360833 Merge branch 'master' into 2.5 2013-10-30 14:58:20 -04:00
Mark Story
d6f5f2f0bb Merge pull request #2244 from dereuromark/2.5-debugger 
Pass depth through for Debugger::dump().
 2013-10-30 11:26:28 -07:00
Zach Gambino
927a4933d1 Fix for #2247 | Use correct column when calculating next sequence value 
See #2247 for more details.
 2013-10-30 11:25:06 -07:00
euromark
fecbef5949 Pass depth through for Debugger::dump(). 2013-10-30 18:31:48 +01:00
Mark Story
9d87f6fcb5 Merge pull request #2239 from bcrowe/hotfix-strictTimeCompare 
Update date comparisons to be strict in CakeTime
 2013-10-29 20:14:19 -07:00
Bryan Crowe
507bb44301 Update date comparisons to be strict in CakeTime 2013-10-29 23:02:14 -04:00
mark_story
16be5722ba Fix COUNT(DISTINCT x) queries from getting corrupted in Sqlserver. 
Add into the tower of hacks that is the SQL generation and stop breaking
COUNT(DISTINCT foo) style queries. Previously these would be converted
into DISTINCT COUNT(foo) which will give the non-distinct results.
 2013-10-29 23:01:55 -04:00
mark_story
0f8dae55c9 Add missing trim() around Sqlserver queries. 
This solves issues with queries failing.

Fixes #2222
 2013-10-29 23:01:49 -04:00
Bryan Crowe
00c5e88570 Make use of timezone parameter in CakeTime::dayAsSql() 2013-10-29 20:29:01 -04:00
mark_story
525efcb808 Remove use of deprecated constants. 
Fixes #2232
 2013-10-29 17:49:16 -04:00
ADmad
d9ca148499 Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-10-30 02:34:09 +05:30
mark_story
a098ff28b8 Update doc block and remove inline assignment. 2013-10-29 12:32:20 -04:00
José Lorenzo Rodríguez
bd8f6e3d06 Merge pull request #2219 from zoghal/2.x-fix-download-multi-connection 
2.x fix download multi connection/optimise serve file
 2013-10-29 05:02:09 -07:00
mark_story
a753718387 Update docs for CookieComponent::delete(). 
Refs #2182
 2013-10-28 23:13:51 -04:00
mark_story
07f4779efe Fix cookie component being inconsistent about writes. 
Instead of treating multi-key and single key writes differently, they
should be treated consistently to allow simpler and more consistent interactions
with the stored data. This also results in fewer cookies being sent
across the wire which is an added benefit.

Fixes #2182
 2013-10-28 23:13:51 -04:00
Bryan Crowe
8eb6652fd7 Change Cake to CakePHP 2013-10-28 22:14:50 -04:00
Saleh Souzanchi
8844e54647 Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection 2013-10-28 03:35:44 +03:30
Saleh Souzanchi
cc0c65d7ea update tests 2013-10-28 02:24:58 +03:30
Saleh Souzanchi
7c4a698bde update tests 2013-10-28 02:11:49 +03:30
Saleh Souzanchi
ab96ed56f3 fix multi connection/part downloading file 2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144 optimise download file 2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f fix spell of contentType 2013-10-28 00:49:40 +03:30
Saleh Souzanchi
1f13f86367 add mkv mime file type 2013-10-28 00:14:38 +03:30
José Lorenzo Rodríguez
81e6a56543 Merge pull request #2201 from ravage84/start-viewblock-twice 
Throw an exception when starting a view block twice
 2013-10-27 03:22:35 -07:00
Phally
9260a78ea3 Fixes last items for #1665. 
- Changes double quotes to single quotes.
- Documents and tests array-based string replace.
- Rewrites test case.

Rewrites the test case because the tests didn't work as well as
they should be. The test file copied itself to the tmp directory,
did some string replace stuff on it and then loaded the data to
test its contents. However in those contents were also the
expectations, so assertContains() would always see the string in
the file... even if the replacing didn't work.

Closes #1665.
 2013-10-26 14:50:42 +02:00
rooseveltrp
98e11cea5d Adds File::replaceText(). 
Added File::replace()

Searches for a given text and replaces the text if found

Renamed File::replace() to File::replaceText()

Updated the replaceText() method to utilize File Locking

Updated File::replaceText()

1. Method now checks if the lock is not identical to null
2. Since the method uses File::read() to get the contents of the file,
there is no need for a temporary file. Removed the temporary file
creation

File::replaceText() update

Opening file with r+ mode
 2013-10-26 14:05:12 +02:00
mark_story
411f510406 Fix file always being set to 'schema.php' 
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.

Fixes #2202
 2013-10-25 23:36:25 -04:00
Marc Würth
39cd7565ef Throw an exception when starting a view block twice 2013-10-26 03:35:12 +02:00
Mark Story
3dc60af166 Merge pull request #2204 from thatcode/master 
Models fetched by Containable find depend on number of fields in intermediate Model
 2013-10-25 17:33:32 -07:00
euromark
4048c686b7 coding standards 2013-10-25 19:29:33 +02:00
mark_story
7624884240 Use + instead of array_merge. 
If you have numeric columns in your database, array_merge() will re-key
the array dropping the original values.

Fixes #2198
 2013-10-25 10:23:50 -04:00
Robert Sworder
456645d7ad Update tests for incorrect containable behaviour if a model only finds 1 field. 2013-10-25 15:15:52 +01:00
Robert Sworder
940a51b5fa Update definition of an empty model. 2013-10-25 15:12:03 +01:00
euromark
8a90cbd4fe coding standards 2013-10-24 23:14:09 +02:00
Mark Story
ea0c66e713 Merge pull request #2187 from bar/model-optimizations 
Optimize conditionals and reduce lookups.
 2013-10-24 14:09:47 -07:00
Mark Story
d7f37efc34 Merge pull request #2196 from ravage84/orphaned-home 
Emptied home.ctp in test_app as much as possible
 2013-10-24 09:21:00 -07:00
Marc Würth
86bc9d73cf Emptied home.ctp in test_app as much as possible 
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
 2013-10-24 16:57:58 +02:00
José Lorenzo Rodríguez
a6eb348e2f Merge pull request #2194 from ravage84/gh-link-home.ctp 
Improved wording of link to GH repo in home.ctp
 2013-10-24 07:33:19 -07:00
ADmad
df523ded7c Fixed docblock. Closes #2193 2013-10-24 19:27:56 +05:30
Marc Würth
0e348dfbbd Improved wording of link to GH repo in home.ctp 2013-10-24 15:51:59 +02:00
Marc Würth
3773311cc0 Normalized associated models in unbindModel. 
Resolves #1764

 Had to cast $models to an array since ``Hash::normalize()`` doesn't support strings which ``Set::normalize()`` does (but which is deprecated).
 Reused existing tests.
 2013-10-24 15:28:31 +02:00
Ber Clausen
1fbe9c0021 Optimize conditionals and reduce lookups. 
Also, make the code easier to read removing unneded indentations.
 2013-10-24 10:16:55 -03:00
José Lorenzo Rodríguez
230b9dac66 Merge pull request #2191 from jameswatts/feature/skel-links 
Updated links to CakePHP resources
 2013-10-24 05:42:37 -07:00
José Lorenzo Rodríguez
45bd01fdc0 Merge pull request #2132 from dereuromark/2.5-paginator-sort 
Ability to use PaginatorHelper::sort() with only one direction.
 2013-10-24 05:40:42 -07:00
James Watts
12f0cc0559 Updated links to CakePHP resources 2013-10-24 14:39:32 +02:00
Marc Würth
7c07d37fb3 Some DocBlock improvements for Model.php 2013-10-24 13:05:32 +02:00
Ber Clausen
6dcfd28600 Optimize _clearCache(). 
It is cheaper to make an assignment or call strtolower() than to pluralize.
 2013-10-23 22:29:42 -03:00
Mark Story
43fccc1cbf Merge pull request #2184 from ravage84/sortby 
Renamed $sortby to $sortBy in sortByKey
 2013-10-23 09:42:28 -07:00
mark_story
23b23d8050 Fix delivery issues with long subject lines and MailTransport. 
A few people have reported issues sending wrapped messages via
MailTransport. Removing the new lines has been suggested as a fix.

Refs #2176
 2013-10-23 12:41:57 -04:00
Marc Würth
c44135a50b Renamed $sortby to $sortBy in sortByKey 2013-10-23 17:28:48 +02:00
Mark Story
b4a0182bf0 Merge pull request #2181 from bcrowe/hotfix-classname 
Add space between classname(s)
 2013-10-23 04:37:23 -07:00
Mark Story
bd4aff13ee Merge pull request #2180 from bcrowe/hotfix-strict 
Strict null check on group parameter
 2013-10-22 20:13:37 -07:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
mark_story
328fcdc376 Sync skel and app directories. 
Closes #1698
 2013-10-22 22:18:59 -04:00
Bryan Crowe
79846d25f8 Strict null check on group parameter 2013-10-22 22:11:02 -04:00
mark_story
75624c0279 Update version number to 2.4.2 2013-10-22 21:49:25 -04:00
Frank de Graaf
ab89f6ec97 Makes DboSource less string dependent. 2013-10-22 16:43:32 +02:00
Bryan Crowe
d39ced8381 Correct 'an URL' to 'a URL' in docblocks 2013-10-22 00:09:34 -04:00
mark_story
e27e887707 Deprecate features being removed in 3.0 2013-10-21 16:55:21 -04:00
euromark
fca8a01c15 Correct casing of class names. 2013-10-21 22:34:29 +02:00
mark_story
bcafde6212 Add numeric validator for float fields by default. 
Make bake add numeric validator to float fields.

Fixes #2163
 2013-10-20 22:54:30 -04:00
euromark
c08df2a7f9 Correct wording of Hash::expand() 2013-10-19 17:54:43 +02:00
euromark
def015108d Ability to use PaginatorHelper::sort() with only one direction. 2013-10-19 12:44:50 +02:00
Cameri
2b234236d6 Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest(). 2013-10-18 11:41:38 -04:00
Cameri
069b309249 Added test case for JqueryEngineHelper::request() to validate 'xhr' callback. 2013-10-18 11:00:15 -04:00
Cameri
bb33d52cc6 Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript. 2013-10-17 18:26:39 -04:00
mark_story
1ae470a284 Fix inflection rules for curves. 
Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.

Fixes #2148
 2013-10-17 12:15:56 -04:00
mark_story
935a51c892 Add tests for curve<->curves 
Closes #2148
 2013-10-17 12:10:49 -04:00
Bryan Crowe
1f2a4113bf Readability update for Dispatcher::_invoke() 2013-10-17 00:48:17 -04:00
Bryan Crowe
bc2fcf421f Remove extra space around the brace in CakeSchema::_arrayDiffAssoc() 2013-10-16 09:52:29 -04:00
Mark Story
ff0b963941 Merge pull request #2142 from bcrowe/hotfix-strictNull 
Change is_null() calls to strict checks
 2013-10-15 20:00:12 -07:00
Bryan Crowe
5addb2cc9f Change is_null() calls to strict checks in CakeSchema::_arrayDiffAssoc() 2013-10-15 22:53:04 -04:00
Bryan Crowe
39b7023e75 Change is_null() calls to strict checks 2013-10-15 22:32:46 -04:00
Marc Würth
fcb7f86b76 include calls without parentheses 
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
 2013-10-16 01:40:45 +02:00
mark_story
5c8eb5c5a7 Add test cases for pluralization/singularlization of quota. 
Closes #2077
 2013-10-15 17:48:26 -04:00
Marc Würth
bf8a13a77c Added binary type to field type map, defaulting to file input field 
Refs  https://github.com/cakephp/cakephp/issues/2071
 2013-10-15 22:25:51 +02:00
mark_story
5a394c379a Merge branch 'master' into 2.5 2013-10-14 22:57:50 -04:00
Bryan Crowe
f9435aff27 Add missing return tags 2013-10-14 22:43:17 -04:00
Mark Story
d4ecb7d185 Merge pull request #2134 from dereuromark/master-test-case 
Make tests pass on win.
 2013-10-14 17:47:34 -07:00
euromark
69d0253109 coding standards 2013-10-15 02:07:36 +02:00
euromark
afb6471128 Make tests pass on win. 2013-10-14 23:59:14 +02:00
Mark Story
ce74153389 Merge pull request #1691 from uzyn/2.5-decimal 
Add support for decimal type in Schema.

Fixes #3171
 2013-10-14 08:36:15 -07:00
Bryan Crowe
bb821a426d Remove duplication of throws 2013-10-13 21:40:35 -04:00
euromark
ed2054f4f2 Allow international domains to pass validation. Fixes #1763 2013-10-13 23:43:29 +02:00
euromark
ee0ed3a43a coding standards 2013-10-13 18:18:24 +02:00
euromark
1cb24ae537 CS fixes using phpcs-fixer auto-correction. 2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
Jose Lorenzo Rodriguez
9673048c30 Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master 2013-10-12 01:03:20 +02:00
Jose Lorenzo Rodriguez
63b65e2f69 Fixing CS 2013-10-12 00:58:14 +02:00
José Lorenzo Rodríguez
8cdbafd312 Merge pull request #1631 from ovidiupruteanu/patch-2 
flushMethodCache not working if called before cacheMethod
 2013-10-11 15:56:19 -07:00
José Lorenzo Rodríguez
6c2eb6e7c6 Merge pull request #1546 from rchavik/2.3-sqlite-truncate 
Sqlite::truncate(): Verify `sqlite_sequence` exists before _execute()
 2013-10-11 15:52:49 -07:00
José Lorenzo Rodríguez
99620ab58e Merge pull request #1593 from kimegede/more-readable-code 
More readable code
 2013-10-11 15:51:28 -07:00
Mark Story
3c6d0af01d Merge pull request #1644 from WyriHaximus/2.5 
Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.
 2013-10-11 13:17:05 -07:00
mark_story
4265dbcc33 Use App.base when there are no requests to generate URL's 
Setting App.fullBaseUrl to a non-host value causes issues generating
URL's in a web context. However, not including the base path generates
incorrect URL's in a CLI context. This change allows the use of App.base
to populate the base path which is used as a fallback when there are no
requests, or when the base path is empty.

Refs #2931
 2013-10-10 23:07:03 -04:00
mark_story
5aa8a458b1 Update UUID pattern to accept the 'nil' UUID. 
Fixes #4133
 2013-10-10 21:11:55 -04:00
Mark Story
04eae1fc24 Merge pull request #1715 from bcrowe/hotfix-docblocks 
Additional Cake references to CakePHP and docblock typo.
 2013-10-10 09:54:14 -07:00
Rick Guyer
a091c630d7 Prevent name param from overwriting file if both are passed 2013-10-09 23:20:25 -05:00
Bryan Crowe
46c21a9a20 Revert Cake to CakePHP in ShellDispatcher::_initEnvironment() 2013-10-09 23:41:15 -04:00
Bryan Crowe
4242bd4f3d Additional Cake references to CakePHP and docblock typo 2013-10-09 19:38:16 -04:00
euromark
ce1939c4d6 Correct argument order. 2013-10-09 20:43:54 +02:00
Bryan Crowe
81c2e9db84 Capitalize UUID acronym 2013-10-08 21:46:30 -04:00
Mark Story
25c4175736 Merge pull request #1713 from ADmad/2.5-modelvalidator-optimize 
Optimized whitelist jugglery.
 2013-10-08 13:31:53 -07:00
Mark Story
8f9b75d016 Merge pull request #1712 from dereuromark/master-deprecated 
Replace deprecated methods.
 2013-10-08 13:30:39 -07:00
mark_story
59f441e6bc Make equality checks more strict. 2013-10-08 16:29:24 -04:00
ADmad
f9c1c2aa7f Optimized whitelist jugglery. 2013-10-09 00:17:34 +05:30
euromark
b5bd087bc5 Replace deprecated methods. 2013-10-08 20:23:57 +02:00
euromark
eb852a0247 Strict checks where applicable. 2013-10-08 20:16:55 +02:00
mark_story
f82b00c25e Fix content view variable being stomped by send() parameter. 
The content of send() should only be used if it is a non-empty value.

Fixes #4129
 2013-10-08 12:28:45 -04:00
ADmad
105f032e81 Merge pull request #1705 from Schlaefer/FileLog-RotateOlderLogs 
fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'
 2013-10-07 20:58:07 -07:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
euromark
381a8c1216 Simplify test. 2013-10-08 00:47:47 +02:00
euromark
35ca40635e Add doc block 2013-10-08 00:32:11 +02:00
euromark
c621985f69 Fix whitelist to be modifiable from behaviors to work with validate. 2013-10-07 23:45:27 +02:00
euromark
7b57df5554 Correct method names and missing parent calls. 2013-10-07 20:24:28 +02:00
mark_story
60b0893c79 Merge branch 'master' into 2.5 2013-10-06 23:49:32 -03:00
José Lorenzo Rodríguez
9472b3149b Merge pull request #1704 from cakephp/2.5-cache 
2.5 - Add Cache::remember()
 2013-10-06 07:02:54 -07:00
mark_story
e85ac9339e Fix coding standards in comment. 2013-10-06 10:35:21 -03:00
Schlaefer
8060f1b4be fixes FileLog doesn't delete on rotation if rotate = 0 2013-10-06 15:04:57 +02:00
Schlaefer
83d340a3af fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate' 2013-10-06 13:59:52 +02:00
euromark
cd3defcc0b Correct spelling mistake in class name. 2013-10-06 02:12:57 +02:00
Mark Story
0608ea2e7b Merge pull request #1654 from kamisama/improvement/2.5-memcached-cache-engine-fix 
Add option to select a serializer engine in Memcached Cache engine
 2013-10-05 11:44:26 -07:00
mark_story
1ce89545bd Fix 5.4 only syntax. 2013-10-05 14:40:23 -03:00
Mark Story
49ddf6a5cf Merge pull request #1687 from Schlaefer/model-cache-improvements 
performance improvements in Model::_clearCache
 2013-10-05 07:50:07 -07:00
mark_story
cb91a2d33c Add example to documentation for Cache::remember() 2013-10-05 10:56:55 -03:00
mark_story
f146d4334a Add Cache::remember() 
This method provides a really simple approach to read-through caching.
A callable or Closure can be used to provide results when the cache is
empty.
 2013-10-05 10:47:07 -03:00
ADmad
aa60b8791a Fixed setting "required" attribute for file input. Closes #4124 
In general fixed the issue where enabling SECURE_SKIP for a field
skipped "required" attribute check altogether. Instead now "required"
is set to false for hidden fields by default.
 2013-10-04 20:35:38 +05:30
Mark Story
ba1eb7e495 Merge pull request #1700 from bcrowe/hotfix-filedocblocks 
Updated returns in docblocks in File utility
 2013-10-04 05:27:44 -07:00
Mark Story
7df9925618 Merge pull request #1699 from dereuromark/2.5-page-title 
2.5 page title
 2013-10-04 05:18:22 -07:00
Bryan Crowe
8895405577 Rrue to True, simple typo 2013-10-04 02:06:32 -04:00
Bryan Crowe
c729b56b23 Additional grammatical corrections to File utility 2013-10-04 02:03:53 -04:00
Kamisama
5d30cb1559 Improve serializer engine assignment code 2013-10-04 00:05:01 -04:00
Bryan Crowe
79c3336b7e Updated returns in docblocks in File utility 2013-10-03 20:40:00 -04:00
euromark
eb98770304 Remove leftover of pageTitle. 2013-10-04 00:35:56 +02:00
Renan Gonçalves
4f3b3737a5 Fixing CS errors. 2013-10-03 14:09:24 +02:00
Bryan Crowe
0cffcd1eca Added missing semi-colon in return 2013-10-02 22:55:09 -04:00
Bryan Crowe
b9003e5f7c Allow Folder::addPathElement() to accept arrays, also corrected docblock 2013-10-02 22:45:22 -04:00
wyrihaximus
ac9b7f3882 Refactored the shell reflection portion into a seperate task. 2013-10-02 22:30:12 +02:00
Cees-Jan
5c523a0cd5 Updated the shell given @renansaddam pointers 2013-10-02 22:02:40 +02:00
Cees-Jan
79202ad8a0 Updated doc blocks 2013-10-02 22:02:40 +02:00
Cees-Jan
cdf2b8c40d Base completion files from @AD7six/cakephp-completion adjusted to be part of the framework 2013-10-02 22:02:40 +02:00
mark_story
530731ec5d More gracefully handle invalid data in Accept headers. 
Some browsers have invalid accept headers, we should ignore the invalid
extension data as assuming it will be a qualifier can result in
incorrect results.

Fixes #4105
 2013-10-02 11:29:04 -04:00
Mark Story
942bb77046 Merge pull request #1695 from renan/2.4-wordwrap 
Make String::wrap() unicode aware. Fixes #3981.
 2013-10-02 05:04:02 -07:00
Kamisama
85e5ef4d4e Change $serializer visibility, and other fix 2013-10-01 21:13:26 -04:00
Renan Gonçalves
a73e926467 Make String::wrap() unicode aware. Solves #3981. 2013-10-01 22:35:11 +02:00
mark_story
314ae1c8b4 Merge branch 'master' of github.com:cakephp/cakephp 2013-10-01 15:12:34 -04:00
Simon Males
c998888fe7 Do not assume CONTENT_TYPE is available. 
In some server environments notably the CLI server, _SERVER['CONTENT_TYPE'] is not available.
In these cases, fall back to the HTTP_CONTENT_TYPE header.

Refs #GH-1661
 2013-10-01 15:10:33 -04:00
ovidiupruteanu
dd3b1e41bc Test case for DboSource::flushMethodCache 2013-10-01 21:34:40 +03:00
euromark
1c6a379346 Fix issue 4116 and also merge both versions of home.ctp 2013-09-30 20:45:26 +02:00
U-Zyn Chua
4806d09d7e Setting of step for decimal field based on precision. 2013-09-29 22:44:50 +08:00
U-Zyn Chua
091658a752 Decimal support for FormHelper. 2013-09-29 22:40:35 +08:00
U-Zyn Chua
e527506c39 MySQL: Numeric data type now supported under decimal column. #3171 2013-09-28 23:05:53 +08:00
U-Zyn Chua
73cae88a6f SQL Server support of numeric type. #3171 
Float & real map to float. Numeric & decimal map to numeric.
 2013-09-28 22:48:37 +08:00
José Lorenzo Rodríguez
06a89f128a Changing order of jpeg aliases so that mapType() returns the most common one 2013-09-28 14:24:13 +02:00
Schlaefer
be61a5023f Refactors Model::_clearCache 
- don't use mixed keys in $assoc array
- removes unnecessary strtolower on Inflector::underscore result
- return early
 2013-09-28 10:16:23 +02:00
U-Zyn Chua
c74c8d49a1 Decimal support for SQLite. #3171 2013-09-28 14:36:55 +08:00
U-Zyn Chua
e0eb8f8e18 Added decimal CakeSchema test case and DatatypeFixture. #3171 2013-09-28 14:29:39 +08:00
U-Zyn Chua
a1a3e70039 Decimal support for PostgreSQL. #3171 2013-09-28 14:07:00 +08:00
mark_story
5e9b22271a Merge branch 'master' into 2.5 2013-09-27 22:26:33 -04:00
mark_story
e96fe515a1 Rename config class used in test cases. 
Having a separate classname for testing allows the testsuite to not
provide a classname that the application would. This allows composer to
generate the correct classmap when CakePHP is installed with composer.

Fixes #4112
 2013-09-27 22:22:23 -04:00
Bryan Crowe
bb65765d70 Updated additional references of Cake to CakePHP 2013-09-27 21:31:35 -04:00
U-Zyn Chua
7fb51ab50f Decimal support for MySQL. #3171 2013-09-28 09:23:46 +08:00
Frank de Graaf
3e8af8b180 Merge pull request #1689 from dereuromark/master-cakephp-name 
Cake to CakePHP name
 2013-09-27 12:16:25 -07:00
Frank de Graaf
ceb78fee9c Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect 
Fixed infinite redirects when authenticated user tried to access login p...
 2013-09-27 12:13:36 -07:00
euromark
9a86f7e883 correct spelling mistake 2013-09-27 20:28:03 +02:00
euromark
df269ba0ef Cake to CakePHP name 2013-09-27 19:36:43 +02:00
ADmad
4dbf9107a8 Fixed infinite redirects for authenticated users accessing login page. 2013-09-27 22:33:07 +05:30
Schlaefer
99ec97bd19 performance improvements in Model::_clearCache 
- don't empty cache twice if pluralized name is identical to underscored
- refactors for fewer function calls
 2013-09-27 16:39:23 +02:00
Mark Story
355e2efbc6 Merge pull request #1685 from dereuromark/master-autolink 
Test to prove that autoLink has issues with umlauts.
 2013-09-27 06:53:38 -07:00
Mark Story
066e0b6677 Merge pull request #1684 from dereuromark/master-shell 
Bugfix: Assert own tasks are loaded before trying to access taskNames.
 2013-09-27 06:52:12 -07:00
euromark
bd87ef45f2 complete autoLinkEmail() 2013-09-27 15:01:46 +02:00
euromark
205f7a504b also fix autoLinkEmail() 2013-09-27 14:56:53 +02:00
Frank de Graaf
41a7739b69 Merge pull request #1686 from andydhobbs/ticket-4108 
Fixes bad merge of #1683.

Refs #4108.
 2013-09-27 05:53:10 -07:00
euromark
2a954b6095 Make TextHelper::autoLink() work properly with umlauts. 2013-09-27 14:48:57 +02:00
Andy Hobbs
56f1c9b8b5 Ticket 4108 
- updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver
 2013-09-27 13:03:32 +01:00
Renan Gonçalves
bd1c0b18ff Merge pull request #1679 from dereuromark/master-cleanup-tests 
Don't use comp. wrappers anymore.
 2013-09-27 04:10:39 -07:00
euromark
c23531e806 Assert own tasks are loaded before trying to access taskNames. 2013-09-27 12:53:18 +02:00
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04:00
Andy Hobbs
0f7d6a90a1 Ticket 4108 
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
 2013-09-26 11:56:14 +01:00
Bryan Crowe
ab4bc16463 Updated Controller:: doc block and ControllerMergeVarsTest:: 2013-09-25 22:53:23 -04:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
euromark
0b45a2eca8 correct order of params 2013-09-25 22:07:52 +02:00
John Long
1e7f11aaff $var in debug() docblock should be declared as mixed, not boolean 2013-09-25 14:53:23 -05:00
euromark
9844da8e99 Don't use comp. wrappers anymore. 2013-09-25 20:58:29 +02:00
Mark Story
ce9f547175 Merge pull request #1655 from dereuromark/2.5-inlist-clean 
2.5 inList(), multiple() and case sensitivity
 2013-09-25 11:45:29 -07:00
Mark Story
1c148c28f0 Merge pull request #1677 from dereuromark/master-cleanup 
App::import to App::uses
 2013-09-25 11:40:17 -07:00
euromark
0ae69aace9 App::import to App::uses 2013-09-25 19:40:14 +02:00
Mark Story
bb4716a9ee Merge pull request #1675 from bar/patch-1 
Wrong signature.
 2013-09-25 06:37:39 -07:00
ber clausen
39bc8dff97 Wrong signature. 2013-09-25 09:12:49 -03:00
euromark
2455af09c5 Resolves ticket #4100 2013-09-25 14:01:35 +02:00
Bryan Crowe
3e05ab897c Missed a couple instanceOf asserations 2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b Replaced true asserations with instanceOf asserations in test cases 2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
Bryan Crowe
1393325ad1 Use instanceof instead of is_a() in Controller.php 2013-09-23 21:37:27 -04:00
euromark
f7e507145c Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity. 2013-09-24 02:01:50 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
euromark
cbbd3ec6b3 correct doc block 2013-09-20 19:31:16 +02:00
euromark
b6a7cb7c7e Output overall coverage. 2013-09-20 19:15:51 +02:00
mark_story
a30f861f2c Use array_key_exists instead of isset() 
This allows contains() to work with null values.

Fixes #4083
 2013-09-19 21:44:09 -04:00
Kamisama
d099c5ad7e Add doc about the new serialize setting 2013-09-19 18:56:33 -04:00
Kamisama
7c83f7140f Rename serializer to serialize 2013-09-19 18:40:41 -04:00
Kamisama
0a704cc288 Fix test 2013-09-19 18:38:02 -04:00
euromark
f62f46562c add missing create() for creating a new record. 2013-09-19 00:23:56 +02:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
Kamisama
72965f793c Remove unnecessary sprintf 2013-09-18 12:45:08 -04:00
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
Kamisama
5d509e23c2 Throw exception when selected serializer is not installed 2013-09-18 00:46:21 -04:00
Kamisama
bd3f005ab6 Add serializer option to Memcached Cache engine 
Add option to select a serializer engine among php, json or igbinary
 2013-09-18 00:29:48 -04:00
Bryan Crowe
5c329b4875 Updated CakeTime::i18nFormat() doc block description 2013-09-17 23:09:46 -04:00
mark_story
809f6129e0 Update docs for HttpSocket methods. 
delete() uses the request body, not the query string.
 2013-09-17 21:17:26 -04:00
Bryan Crowe
24a522f972 Updated doc block for JsonView's subDir property 2013-09-17 20:25:32 -04:00
Bryan Crowe
878e599976 Corrected some grammar in the JsonView class doc blocks 2013-09-17 20:15:18 -04:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-17 10:11:24 -04:00
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +02:00
euromark
12f2f729c8 more cs 2013-09-17 14:53:07 +02:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf Fix label element for attributes not matching their inputs. 
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().

Fixes #4071
 2013-09-16 22:38:28 -04:00
spiliot
37c9832dc1 removed duplicate test case 
Was exact duplicate of case starting line 692
 2013-09-17 00:48:09 +03:00
mark_story
4ea6c158d1 Fix wording and remove trailing spaces. 2013-09-16 12:04:29 -04:00
Jerome Roethlisberger
3a4a0e54eb Improved wording of Model::invalidFields() 
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
 2013-09-16 16:13:58 +02:00
euromark
c8b18164c5 fix test 2013-09-16 00:49:01 +02:00
euromark
910ee33710 remove wrong trailing slash 2013-09-16 00:40:37 +02:00
mark_story
085636ea1b Update version number to 2.4.1 2013-09-14 22:07:19 -04:00
mark_story
7379d32b59 Simplify & fix phone number validation. 
The changes made in fa3d4a0bb5 tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.

Fixes #4066
 2013-09-13 23:05:40 -04:00
José Lorenzo Rodríguez
d40f9f7f67 Merge pull request #1574 from dereuromark/2.5-logging 
2.5 logging - deprecate/disallow magic logging
 2013-09-13 00:29:22 -07:00
Marc Würth
0a7d5b9c3f Corrected a CakeLog example in a DocBlock about scopes and types 
> Its important to remember that
> when using scopes you must also define the `types` of log messages
>  that a logger will handle. Failing to do so will result in the logger
>  catching all log messages even if the scope is incorrect.

According to this the previous example would fail to log correctly.
 2013-09-13 03:07:46 +02:00
euromark
61b05c40c6 remove autologging 2013-09-13 02:28:25 +02:00
mark_story
ba4afcc074 Fix incorrectly encoded address fields. 
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.

Fixes #4058
 2013-09-12 20:14:11 -04:00
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04:00
Mark Story
ba016c2c68 Merge pull request #1630 from dereuromark/master-cleanup 
Master cleanup
 2013-09-12 16:46:18 -07:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
ovidiupruteanu
f416a321c7 flushMethodCache not working if called before cacheMethod 
When calling flushMethodCache it correctly empties self::$methodCache but if cacheMethod is called afterwards self::$methodCache gets populated with data from the Cache.
 2013-09-12 22:02:39 +03:00
Marc Würth
446792987a Replaced two elseifs by if in sqlserver datasource 2013-09-11 23:15:05 +02:00
Simon Males
8311a16ebd Accurate description of what is returned 2013-09-11 22:28:09 +08:00
Simon Males
50ad043092 View::get() default param test 2013-09-11 22:22:50 +08:00
Simon Males
0c3197a435 View::get() to support a fallback param 2013-09-11 11:10:27 +08:00
Adam Taylor
186f2a27e0 Make the "pr" function use printf instead of echo sprintf 2013-09-10 19:52:18 -06:00
Mark Story
fd50c5277e Merge pull request #1624 from ADmad/fix-paginator-order 
Fix setting of order in Paginator options when using model's order. 

Refs #3902
 2013-09-10 13:41:51 -07:00
euromark
beff12d8a5 add missing params for parent call 2013-09-10 21:19:30 +02:00
ADmad
1d0c785725 Fixed setting of order in Paginator options when using model's order. Refs f680c76, #3902 2013-09-10 22:47:31 +05:30
Ber Clausen
0a52061d86 Update afterFind() callback signature to be PHP5.4+ compliant. 2013-09-10 14:15:01 -03:00
Mark
994a5b00b6 Merge pull request #1622 from bar/php54-afterSave 
Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.
 2013-09-10 04:04:04 -07:00
mark_story
fc2e1fac4e Fix clearing groups with FileCache and no prefix. 
If you used FileCache + groups + an empty prefix cached files would not
be cleared as strpos() would fail.
 2013-09-09 22:24:18 -04:00
Ber Clausen
867d4b312d Update afterSave() callback signature to be PHP5.4+ compliant. 2013-09-09 21:34:11 -03:00
Ber Clausen
98a32c334a Fix CS. 2013-09-09 21:25:22 -03:00
mark_story
5210f831c8 Add test for insertMulti with id in the last spot. 
Both tests work, so there are no changes to the implementation.

Closes #4048
 2013-09-09 19:43:15 -04:00
mark_story
2fc3222322 Fix whitespace. 2013-09-09 12:20:54 -04:00
ovidiupruteanu
7019c79b81 Quoting test for null value and string column 2013-09-09 17:14:09 +03:00
ovidiupruteanu
b58940e9b5 Fixed handling null values in Sqlserver->value 
The value function quoted a null value as N'' instead of NULL.
As a result is produced queries like [name] IS N'' instead of [name] IS NULL which resulted in an SQL error.
 2013-09-09 16:33:54 +03:00
ADmad
c27aa99af9 Merge branch 'master' into 2.5 2013-09-08 20:36:40 +05:30
Ber Clausen
c3ee9a2058 JsonView should return null if no data is set, regardless of the type of '_serialize'. 
It should also honor true/false/0/'' values.
 2013-09-07 02:38:52 -03:00
Mark Story
f82814d7ac Merge pull request #1618 from dereuromark/master-cs 
Remove last yoda conditions as per coding standards guidelines.
 2013-09-06 11:11:24 -07:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
mark_story
0891073d19 Add coding standards ignore comments to FileEngine 
We normally disallow error supression but it is the only way to
atomically delete files.
 2013-09-06 12:19:23 -04:00
davidsteinsland
45b3417bd7 Fixed race conditions for FileEngine 2013-09-06 15:46:01 +02:00
Mark Story
0f528c279a Merge pull request #1614 from okinaka/2.x-disused-code 
Postgres::truncate(): Delete disused code.
 2013-09-05 18:16:22 -07:00
Mark Story
66394f2201 Merge pull request #1610 from bar/php54-callback-signatures 
Update Model/Behaviors callback signature to be PHP5.4+ compliant.

This may require updates to userland behaviours.
 2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4 Fix CROSS JOINs 
While seldomly used, CROSS joins should not generate invalid SQL.

Fixes #4050
 2013-09-05 12:45:48 -04:00
mark_story
e3e4efba0a Add test for issue #3936 
radio() method should accept an array for the label element.

Refs #3936
 2013-09-05 11:04:47 -04:00
Christian Winther
a1866733a0 Merge pull request #1611 from ADmad/2.4-log-suffix 
Dropping 'Log' suffix from log configs as per change in cb24dbb084.
 2013-09-05 07:24:41 -07:00
mark_story
f22c4cf90b Merge branch 'master' into 2.5 2013-09-05 10:21:41 -04:00
mark_story
3c9500a3cb Fix whitespace error. 2013-09-05 10:21:24 -04:00
Mark Story
f191ff017b Merge pull request #1597 from aread22/master 
Potential Fix for LightHouse Ticket #3936

Fixes #3936
 2013-09-05 07:20:48 -07:00
Ber Clausen
c524645738 Update Model/Behaviors callback signature to be PHP5.4+ compliant. 2013-09-05 11:17:02 -03:00
ADmad
29d0e26710 Dropping 'Log' suffix from log configs as per change in cb24dbb084. 
Reverts regressive change done in 7e28636a72.
 2013-09-05 19:37:41 +05:30
Schlaefer
82da8d9d07 performance improvements in CakeTime::timeAgoInWords Edit 
- rearranges code to move return statements before otherwise dead code
- only do translation if translated string is actually used
 2013-09-05 12:22:28 +02:00
Hadrien Collongues
7e28636a72 Fix log classname in skeleton 
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
 2013-09-05 11:20:39 +02:00
okinaka
e0f24d0ade Postgres::truncate(): Delete disused code. 2013-09-05 14:11:50 +09:00
aread22
cb056a5cbe Use FormHelper->label instead of HtmlHelper->useTag 
Implementing suggested fix by mark_story
 2013-09-04 13:32:36 -04:00
Rob McVey
7f44cc01b5 Plural of breif is breifs not breives 2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada Reorder inflection rules. 
Place rules for words like 'archives' and 'relatives' before words like
'knives'.

Fixes #4040
 2013-09-03 12:50:02 -04:00
mark_story
800ffa804b Fix invalid CSS in fixture files. 
Fixes #4041
 2013-09-03 09:55:04 -04:00
Marc Würth
84a669aa7a Shortened the if clause line length by doing it the @markstory style ;-) 
Also shortened the line length  of some arrays
 2013-09-02 20:38:31 +02:00
mark_story
59bb05b433 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-02 11:35:09 -04:00
Alexander Hofbauer
78d5b69bec Load helpers of email view 2013-09-02 14:36:08 +02:00
Renan Gonçalves
6750a65e1b Merge pull request #1568 from markstory/2.5-encrypt 
2.5 - Add Security::encrypt() and Security::decrypt()
 2013-09-02 01:19:47 -07:00
mark_story
13b870d7e1 Fix coding standards error. 2013-09-01 21:44:45 -04:00
mark_story
229c824da6 Remove a default helper from View. 
This goes back to the days of yore and combined with
b8320fdbb7 it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
 2013-09-01 21:39:59 -04:00
aread22
4ab1c8c225 Format to CakePHP code sniffs 2013-09-01 21:08:17 -04:00
aread22
64bb74a7e8 Potential Fix for LightHouse Ticket #3936 
I believe I found a fix for this issue. I am here at #CakeFest2013 and during the #HourOfContribution I ran across this issue.

Currently in CakePHP 2.4 on Line 1522 - 1524 you can see the following code:

@@@ php
if ($label) {
	$optTitle = $this->Html->useTag('label', $tagName, '', $optTitle);
}
@@@

The $label variable here the is the $label array passed into the input method in Sethathi example above. The problem is that the $label array is completely ignored and instead a label is created using the HtmlHelper->useTag method.

I have what I believe is a fix for this issue but it hasn't been extensively tested. I tested against Sethathi example in the ticket and it produced the correct result.

The fix is simple. We detect if an array is passed in and then send it to the FormHelper label method instead of the HtmlHelper useTag method. The FormHelper label methods accepts an options array, so we pass in the $label array.

This will probably need to be fixed for checkbox also

"ask":https://cakephp.lighthouseapp.com/users/235987 helped me with this fix
 2013-09-01 20:56:44 -04:00
Matt Reishus
bb98ac761f ConsoleInput::_canReadLine change from private -> protected 2013-09-01 17:15:51 -05:00
Matt Reishus
3b057cb82b Correct style 2013-09-01 16:58:23 -05:00
Matt Reishus
916d992162 Use readline in console when supported 
$this->stdin->read(); will use readline if the system is detected to
support it.  In linux, you will be able to use the left and right arrow
keys to edit the current line, use the up and down keys to navigate
history, press ^U to delete the entire line, etc.

Before this, using arrow keys in linux will just spam characters like
^[[C^[[A^[[D^[[C^[[A^.  Useful for "Console/cake console"
 2013-09-01 16:20:29 -05:00
Kim Egede Jakobsen
63dfbe55f7 Added/removed newlines to make the code more readable. 2013-09-01 12:09:14 -07:00
Kim Egede Jakobsen
09bdad6ceb Reduce variable use/duplicate code. 2013-09-01 12:08:48 -07:00
Kim Egede Jakobsen
b64c7e3e84 Remove the $state === 'after' condition. 
Can only be before / after.
 2013-09-01 11:06:45 -07:00
euromark
eb71eeeac5 add scope for generateTreeList - resolves ticket 4028 2013-09-01 01:02:26 -07:00
José Lorenzo Rodríguez
fec646b69f Merge pull request #1588 from kimegede/caketime-docblock-update 
Added @link CakeTime.
 2013-08-31 21:59:11 -07:00
Kim Egede Jakobsen
539040aa07 Added @link CakeTime. 2013-08-31 21:56:15 -07:00
Phally
f4929c1b04 Strict checks for I18n::loadLocaleDefinition(). 2013-09-01 06:20:53 +02:00
Phally
4f91465af7 Safer way to prevent the array to string notice. 2013-09-01 06:16:10 +02:00
Ceeram
84c980f1f4 avoid notices when loading locale file 
Conflicts:

	lib/Cake/Test/Case/I18n/I18nTest.php
 2013-09-01 06:05:40 +02:00
euromark
a36456cc87 Correct doc blocks for AuthComponent 2013-08-31 19:58:10 -07:00
Kim Egede Jakobsen
fcf9f34392 Added @link to CakeNumber's docblock 2013-08-31 17:32:48 -07:00
Kim Egede Jakobsen
46d3d8e48e Added @link to all public functions there have documentation. 
And correct a small 'typo'.
 2013-08-31 17:12:29 -07:00
mark_story
b8ad7f314a Fix doc blocks. 2013-08-31 14:03:32 -04:00
mark_story
9b0e26cc21 Deprecate MemcacheEngine and update defaults for Memcached 
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.

Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
 2013-08-31 13:29:54 -04:00
mark_story
9e8c4ad285 Rename persistent_id to persistentId. 
The new name is more consistent with other settings in CakePHP.
 2013-08-31 13:15:53 -04:00
Mark Story
0f9560c5cf Merge pull request #1562 from kamisama/feature/2.5-memcached-cache-engine 
2.5: Add Memcached storage engine for cache 

Fixes #3511
 2013-08-31 10:12:16 -07:00
Phally
28dbc5b89b PHPCS fixes. 2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f Remove JS constant use from tests. 2013-08-31 11:45:59 +05:30
mark_story
83db877765 Update version number to 2.4.0 2013-08-30 16:03:49 -04:00
mark_story
4f237e6a93 Merge branch '2.4' making 2.4 into the master branch. 
Conflicts:
	lib/Cake/VERSION.txt
 2013-08-30 16:02:42 -04:00
mark_story
ca9a305679 Update version number to 2.3.10 2013-08-30 15:56:44 -04:00
mark_story
7bd2174c5b Refactor tests to use a data provider. 2013-08-30 15:36:18 -04:00
mark_story
94b602b684 Merge pull request #1456 'fix-for-3515' into 2.4 
Conflicts:
	lib/Cake/Test/Case/View/ViewTest.php

Fixes #3515
 2013-08-30 15:27:49 -04:00
Mark Story
824a6f700b Merge pull request #1563 from mvdriel/fix-i18n-extract 
Extract category strings to separate .po files
 2013-08-30 12:19:17 -07:00
mark_story
95ad5f5c78 Add hmac to encrypted data. 
Using an HMAC ensures that the ciphertext has not been
modified.
 2013-08-29 14:40:01 -04:00
Mark van Driel
256e1f6532 Removed unused variable 2013-08-29 10:49:23 +02:00
Gilles Wittenberg
a54e8f238e Add y/yes option to schema create and update subcommands 2013-08-29 09:13:54 +02:00
Mark Story
a902529702 Merge pull request #1570 from cakephp/issue-4030 
2.4 - Load helpers at View construction.
 2013-08-28 14:28:00 -07:00
mark_story
c03edd9d1a Don't load Helpers in dataviews when _serialize is set. 
Loading helpers when they aren't going to be used is wasteful.
 2013-08-28 15:47:44 -04:00
Mark van Driel
cce1fafd80 Fixed typo in comments 2013-08-28 18:49:34 +02:00
mark_story
130ccf4714 Merge branch '2.4' into 2.5 2013-08-28 12:35:17 -04:00
mark_story
f18d354f55 Merge branch 'master' into 2.4 2013-08-28 12:35:07 -04:00
mark_story
b8320fdbb7 Load helpers at View construction. 
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.

This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.

Refs #4030
 2013-08-28 12:27:07 -04:00
mark_story
c5092851d1 Fix compatibility with PHP 5.2 2013-08-27 23:03:08 -04:00
mark_story
005a7d841d Add support for aes encrypted cookies. 
With Security supporting AES encryption it is also ideal to have AES
compatible cookies. Refactor and simplify code. Dynamic invocation of
static method is a bit obtuse and the various methods don't all have the
same arguments.
 2013-08-27 21:34:18 -04:00
mark_story
215d43eb06 Add encrypt() and decrypt() methods. 
These methods use AES-256 and provide a simple to use API with easy to
remember names.
 2013-08-27 21:20:22 -04:00
mark_story
c1ae41da51 Correctly generate bigint primary keys in sqlite. 
generate bigint primary keys correctly. Autoincrement cannot be set as
it only works with INTEGER columns[1]. I decided to use some string
manipulations as the entire SQL generation bits are a bit janky and I've
already re-written them for 3.0.

[1] https://www.sqlite.org/autoinc.html

Closes #GH-1552
 2013-08-27 18:11:04 -04:00
Mark van Driel
ed10c3332d Fixed typos in text and comments 2013-08-27 21:12:03 +02:00
Kamisama
244df0764f Coding standard and readability 2013-08-27 14:22:45 -04:00
Kamisama
bdd00c2307 Throw an exception if attempting to use authentication without SASL support installed 2013-08-27 13:57:57 -04:00
Kamisama
f093a31740 Remove unnecessary return 2013-08-27 13:22:03 -04:00
Andras Kende
17f9661961 Added mask to File cache docblock 2013-08-27 10:02:48 -04:00