euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
euromark
f6aedea271
coding standards elseif
2013-06-09 17:12:46 +02:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
euromark
dbc2a7a9e4
correct spelling mistake
2013-04-23 12:34:59 +02:00
mark_story
8eb56960d8
Remove remaining reference operators.
...
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
7008b812be
Fix string '0' not being exported correctly.
...
Fixes #3518
2013-01-09 23:04:58 -05:00
Graham Weldon
a9293aa385
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
Graham Weldon
604898ad0b
Added check for HHVM in Debugger,
2012-12-27 22:38:43 +09:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
mark_story
1e49be3472
Fix stack traces not being highlighted correctly.
...
Fixes #3439
2012-12-08 20:48:45 -05:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
euromark
0f978195d6
coding standards regarding whitespaces
2012-10-27 00:46:12 +02:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
Mark Story
93004fcf2f
Merge pull request #818 from shama/patch-unused-vars
...
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 15:57:53 -07:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
mark_story
4487673060
Merge branch 'master' into 2.3
2012-08-09 20:43:47 -04:00
mark_story
b29cc6a9b6
Try again at fixing errors in 5.2
2012-08-08 23:09:44 -04:00
mark_story
c94a684be8
Try to fix recursion issues in PHP5.2.
2012-08-08 22:42:44 -04:00
mark_story
dca050fbd6
Fix errors with recursion in debug()
...
Fixes #3102
2012-08-08 22:30:27 -04:00
mark_story
57c495f53a
Enabled Debugger::exportVar() to display private & protected properties.
...
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
2012-08-06 13:32:52 -04:00
mark_story
7d74f3e598
Increase context depth in error messages.
...
Fixes #3063
2012-07-24 23:39:48 -04:00
mark_story
70c714d600
Fix incorrect context being used for excerpt.
...
Fixes #3064
2012-07-24 23:37:37 -04:00
mark_story
7ae660c779
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
2012-06-10 20:05:25 -04:00
mark_story
0a182b918f
Fix $depth being decremented by 2.
...
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
2012-06-10 20:00:34 -04:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
a9c8a520b2
Port [c19b233] to 2.1
2012-03-12 12:33:20 -04:00
mark_story
9d325fe46e
Fixing most coding standard issues in Utility/
2012-03-03 17:31:47 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Thomas Ploch
94e5ec0545
Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger.
2012-02-05 12:10:07 +01:00
mark_story
29514b08fb
Fix re-numbering of values in exportVar()
...
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.
Fixes #2506
2012-01-24 20:52:43 -05:00
Jose Lorenzo Rodriguez
8b7f069415
Wrapping highlight_string into a helper function as hphp does not implemnet this function
2012-01-07 19:10:44 -04:30
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
mark_story
ed43c685b9
Fix string offset error in PHP 5.4
2011-12-29 22:10:12 -05:00