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
ad7563736f
Expand doc blocks for CakeRequest::addDetector.
2013-08-27 09:46:59 -04:00
Calin
075bf37030
Added test case for param with options detector.
...
Fix coding standards errors.
2013-08-27 09:38:46 -04:00
Calin
cf3dfb0c66
Allow 'options' to be given as array when adding a param detector - similar to env / options.
...
Allow the following when adding request detectors using CakeRequest::addDetector():
array('param'=>'{param-name}', 'options'=>array())
2013-08-27 11:00:32 +03:00
mark_story
499212a86e
Merge branch '2.4' into 2.5
2013-08-24 21:51:51 -04:00
mark_story
42feb8dff6
Fix failing test.
...
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
ceb35ac39a
Merge branch 'master' into 2.4
2013-08-24 21:50:02 -04:00
mark_story
f655e8a7bc
Minor simplification.
2013-08-24 21:49:17 -04:00
Saleh Souzanchi
d606bcb7fd
convert forbidden character in filename(Windows) with underline
2013-08-25 02:24:37 +04:30
Saleh Souzanchi
e157d8a7e6
convert forbidden character in filename(Windows) with underline
2013-08-25 02:09:13 +04:30
Chen Cohen
a0014e7a30
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
2013-08-24 02:02:01 +03:00
mark_story
6d45953525
Merge branch '2.4' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-23 12:57:08 -04:00
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
mark_story
59cef53ffe
Update docs to reflect the routes that are actually connected.
...
Refs #GH-1413
2013-08-22 17:54:05 -04:00
Renan Gonçalves
703d9881e9
Adding files to be compared against bake generated files, fixing bake templates in the meantime.
...
Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.
Things like:
```
} else {
}
```
Are very easy to happen (which was the case) and was not being covered by the test.
2013-08-21 23:44:07 +02:00
mark_story
faa2cbd3c3
Remove session.auto_start configuration.
...
It now fails in PHP >= 5.5.2 . Also it never did anything in earlier
versions as the session would have already been started if auto_start
was true.
Fixes #4010
2013-08-21 13:18:44 -04:00
mark_story
24123e2374
Add test for postLink with escape false + confirm option.
...
Closes #4008
2013-08-21 13:09:47 -04:00
José Lorenzo Rodríguez
8e21e255dc
Merge pull request #1543 from dereuromark/2.4-translations
...
remove code, class names and paths from translation strings.
2013-08-20 15:33:42 -07:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
6d80d6a3cb
Add missing return.
2013-08-20 18:03:52 -04:00
euromark
036954b52d
remove duplicate newlines according to CS
2013-08-20 20:27:06 +02:00
Renan Gonçalves
8ca92a1af0
Breaking trigger_error() to multiple lines to shorten the line length.
...
As proposed in https://github.com/cakephp/cakephp/pull/1525/files#r5779374
2013-08-20 17:48:56 +02:00
mark_story
67855896ef
Remove invalid code.
...
Fixes #4002
2013-08-20 11:34:30 -04:00
euromark
5ed9e5d691
sync and correct generic css
2013-08-19 21:51:04 +02:00
mark_story
b711d38bf3
Update version number to 2.4.0-RC2
2013-08-19 10:49:03 -04:00
mark_story
9ea2926bf3
Merge branch 'master' into 2.4
2013-08-19 10:40:29 -04:00
mark_story
f7a81a9aee
Conditionally define constants in the CLI environment.
...
Only define constants if they don't already exist. Users can modify
`app/Console/cake.php` and define constants before this code executes.
Fixes #4000
2013-08-19 10:40:09 -04:00
AD7six
09cf69c452
Pass Controller:$components config to mocked components
...
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
2013-08-19 10:33:16 +00:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
675f828e16
Remove insertQuery and deleteQuery.
...
These properties were never implemented and are misleading when people
try to use them.
Closes #3997
2013-08-18 21:37:37 -04:00
Phally
524aaf3449
Makes PHPCS pass again.
2013-08-18 16:12:23 +02:00
mark_story
a140b30435
Add a test for Hash::sort()
...
Closes #3956
2013-08-17 17:16:33 -04:00
Mark Story
005699eb49
Merge pull request #1533 from dereuromark/master-null-checks
...
unify null checks - avoid method call in favor of strict check
2013-08-17 12:05:52 -07:00
joostdekeijzer
7fe2395be3
RedirectRoute class does not honor persist as array with custom route elements.
...
Custom route elements like '/:lang/etc' should be persisted by redirect
routes as they are in standard routes.
Refs #GH-1531
2013-08-17 14:51:12 -04:00
Rachman Chavik
8e5a9cd7da
Accept 'connectOptions' in Router::mapResources()
2013-08-17 19:28:18 +07:00
euromark
6a14f37b74
a few more orders in test case corrected
2013-08-16 20:55:17 +02:00
euromark
47e8e0c57a
simplyfy test and correct some test param orders
2013-08-16 20:51:11 +02:00
mark_story
4e74b93106
Start the 2.5.x branch.
2013-08-16 14:47:44 -04:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
dmromanov
7989bad5b7
Corrected codestyle
2013-08-16 14:12:27 +04:00
dmromanov
b4092e374d
Corrected spelling
2013-08-16 14:06:36 +04:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
ADmad
8428928fd6
Merge pull request #1528 from mvdriel/caketime-fix
...
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
2013-08-15 10:55:03 -07:00
Mark Story
7c29aa5155
Merge pull request #1508 from fuga/feature/email-config
...
making the config method of email-transport-classes mergable
2013-08-15 08:26:11 -07:00
Mark van Driel
97aaa89b3f
Refactored the fix
2013-08-15 17:13:31 +02:00
Marc Würth
64f4adf626
Shortened line length of trigger_error calls and improved @param of write()
...
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/param.html
> The @param tag MAY have a multi-line description and does not need explicit delimiting.
2013-08-15 17:09:24 +02:00
Floris
85313e84af
Minor Sanitize::escape() update
...
If the Datasource is not going to be used, do access it.
2013-08-15 12:15:09 +02:00
Mark van Driel
1595287290
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
2013-08-15 08:58:05 +02:00
Mark Story
6bec7a36a4
Merge pull request #1525 from dmromanov/2.4-bugfix3986
...
Bugfix #3986
2013-08-14 16:57:04 -07:00