Commit graph

18156 commits

Author SHA1 Message Date
k-halaburda
2655d16c13 Fixed tabbing in some places 2013-08-09 11:17:12 +02:00
k-halaburda
3855c0690e Fixed tabing formating 2013-08-09 10:26:44 +02:00
k-halaburda
faff191cca Problems with files :/ 2013-08-09 10:19:35 +02:00
k-halaburda
c033df3218 Fixed duplication of Model's afterFind callback in HABTM relation and content of array passed to that callback [ticket 3970] 2013-08-09 09:56:33 +02:00
Marc Würth
2a540ff8a8 Fix for #3515, functional extension & tests
https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515

I used (string) because it is faster than strval() and there are no real benefits in this case.
Also enabled assign(), append() and prepend() to take any values convertible to string.

Removed try/catch as discussed with ADmad.
Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.
2013-08-09 01:34:08 +02:00
Marc Würth
4c13a39f3e Removed else clauses after redirects and added return before redirect() and flash() calls 2013-08-08 21:10:41 +02:00
Mark Story
49d66af12e Merge pull request #1491 from ravage84/sql_dump
Improved code readability
2013-08-08 11:45:39 -07:00
Marc Würth
14f876fbc9 Improved code readability
Changed table echo to printf for more readable code
Wrapped sql_dump error message in __d(), as discussed here:
4c4fdc6f70 (commitcomment-3155723)
and here:
https://github.com/cakephp/cakephp/pull/1491/files#r5646701
2013-08-08 15:43:37 +02:00
euromark
fc2d28974b remove undocumented code and uncessary in_array() checks + cleanup 2013-08-08 03:56:58 +02:00
Mark Story
8ccdf629bb Merge pull request #1492 from dereuromark/master-phpcs
coding standards according to new sniffer rules
2013-08-07 18:42:19 -07:00
euromark
e7e5f46916 prevent rtrim to remove whitespace from test 2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1 coding standards according to new sniffer rules 2013-08-08 01:03:21 +02:00
Mark Story
2dd423644b Merge pull request #1490 from dereuromark/2.4-mime
2.4 mime
2013-08-07 14:52:01 -07:00
euromark
e1365336e2 avoid notice in mime() 2013-08-07 23:35:19 +02:00
Mark Story
19b4021276 Merge pull request #1486 from dmromanov/translation-title
Do not translate "CakePHP"
2013-08-07 13:52:19 -07:00
Mark Story
dfb000fb89 Merge pull request #1488 from dmromanov/translation-optimization
Combined strings of Testsuite Shell's description to a one translatable ...
2013-08-07 13:51:44 -07:00
dmromanov
af48904117 Combined strings of Testsuite Shell's description to a one translatable sentence. 2013-08-08 00:28:38 +04:00
D. Romanov
4d3c049f25 Do not translate "CakePHP" 2013-08-07 22:54:19 +04:00
ADmad
faa4262969 Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783 Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Mark Story
054668f149 Merge pull request #1194 from dereuromark/2.4-file-improvements
Allow creating of missing tmp directories in debug (development) mode
2013-08-07 09:52:07 -07:00
mark_story
e36c537cf6 Switch from LEFT to INNER joins.
INNER joins are often more efficient as they can result in fewer rows
being examined before a result set is generated.

Fixes #3968
2013-08-07 12:50:02 -04:00
euromark
f5859ca719 allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files 2013-08-07 13:24:45 +02:00
ADmad
339cd00fec Merge pull request #1482 from ADmad/2.4-l10n
L10n cleanup
2013-08-07 00:42:09 -07:00
Mark Story
dc15c78710 Merge pull request #1483 from tigrang/debugger-fix
Added case for `unknown` type.

Fixes #3966
2013-08-06 19:39:13 -07:00
mark_story
9efad54e31 Fix missing expiry times on cookies.
When writing multiple cookies in a single request with the default
expiry time, cookies after the first should continue to have the default
expiry time used.

Fixes #3965
2013-08-06 22:01:13 -04:00
Juan Basso
330f8d168d Merge pull request #1228 from jrbasso/2.4-router-parse
Supoprt query parameters on Router::parse.
2013-08-06 18:57:37 -07:00
Tigran Gabrielyan
2150e8dce5 Added case for unknown type. Fixes #3966 2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52 Merge pull request #1426 from dereuromark/2.4-currency-fraction
Fix currency output for fraction values.

Fixes #1329
2013-08-06 18:19:01 -07:00
Mark Story
3f186d6c97 Merge pull request #1484 from tigrang/code-cleanup
Loop instead of duplicate code
2013-08-06 18:12:12 -07:00
Tigran Gabrielyan
84dcd30730 Loop instead of duplicate code 2013-08-06 15:50:58 -07:00
euromark
ad6fcd43d7 Fix currency output for fraction values using fractionExponent option. 2013-08-07 00:36:37 +02:00
ADmad
18cd3729e4 Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default.
Cleaned up L10n::_setLanguage(). Removed unused L10n::$found
2013-08-07 03:37:26 +05:30
Tigran Gabrielyan
34d848d0ca Fixed order of assert params 2013-08-06 12:59:36 -07:00
Mark Story
f57e315061 Merge pull request #1480 from uzyn/fix/shell-space-docroot
Fixes a bug where server would not run when there are spaces in documentRoot
2013-08-06 10:01:51 -07:00
Christian Winther
a2c8392e9b Merge pull request #1481 from uzyn/csfix
Removed a stray tab.
2013-08-06 02:42:21 -07:00
U-Zyn Chua
3559aa35af Removed a stray tab. 2013-08-06 17:13:53 +08:00
Tigran Gabrielyan
a6e3bb37a6 Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself
Added ability to send multiple values with the same type of header in CakeResponse
2013-08-06 01:35:45 -07:00
Alexander Hofbauer
8601e0078a Implement a Helper method to generate confirm() links
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
2013-08-06 10:04:44 +02:00
U-Zyn Chua
d9b99d0599 Fixes a bug where server would not run when there are spaces in documentRoot. 2013-08-06 15:19:59 +08:00
José Lorenzo Rodríguez
a54c92fc0f Merge pull request #1475 from cakephp/feature/2.4-mock-app-model
Make mocking random models easier
2013-08-05 00:22:53 -07:00
Mark Story
c01aacf72d Merge pull request #1476 from ADmad/enhance/travis
Run all tests only once, not for all databases.
2013-08-04 18:40:15 -07:00
ADmad
04fb1eb614 Added more tests to db related tests group 2013-08-04 23:38:30 +05:30
ADmad
f68701d647 Created new test group for all db related tests 2013-08-04 21:23:45 +05:30
ADmad
e5be99844d Run all tests only once, not for all databases. 2013-08-04 20:30:05 +05:30
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
AD7six
ff856b7ebb bark if the model doesn't exist
Getting the following warning:

    ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments

Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
2013-08-03 16:00:34 +00:00
AD7six
35b4ac0286 make it possible to run this test on its own
Without setting up paths to the test_app - two of the tests will fail

Verify/demonstrate how to mock a model without a model existing
2013-08-03 16:00:04 +00:00
AD7six
46b28aae50 merge config in getMockForModel
Otherwise, to override just one key, it's necessary to set all the other
defaults too
2013-08-03 16:00:04 +00:00
Juan Basso
cda1a1e6c9 Added test for relative path using app asset configuration 2013-08-03 11:04:52 -04:00