Commit graph

314 commits

Author SHA1 Message Date
Joe
70ead28a1d Redo commits on 2.next branch 2017-05-12 02:02:36 -04:00
Mark Sch
7207d8f16a Remove class extension. 2016-04-10 16:38:03 +02:00
Mark Sch
e26cdc989d Add class_alias() 2016-04-10 16:16:03 +02:00
mscherer
3e2b84052a Add deprecated BC wrapper class. 2016-04-08 14:36:23 +02:00
mscherer
dda9e83ab6 Refactor Object to CakeObject for future PHP7 comp. 2016-04-08 14:33:26 +02:00
mark_story
7bbdcb207b Merge branch 'memory-fix' into 2.8.
This change automatically increases the memory limit when handling fatal
errors. The intent is to bump the memory limit enough to allow logging
of the fatal error source.

Refs #7224
2015-11-19 21:41:07 -05:00
mark_story
89d5449270 In CLI mode default the error handlers to Console flavors.
In the somewhat rare case where an error or exception occurs during
application bootstrap, we should not emit HTML to the stdout.

Refs #7661
2015-11-09 21:47:16 -05:00
Marc Würth
e690662f0e Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
adam1010
20c22444ba Increase memory during shutdown for Fatal Error handling 2015-09-10 22:01:59 -05:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02:00
mark_story
ebb01f0fac Merge branch '2.6' into 2.7 2015-06-14 21:52:53 -04:00
mark_story
56143c663e Update doc blocks for CakePlugin::load().
Refs #5665
2015-06-11 22:17:18 -04:00
mark_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04:00
mark_story
6ffc9670d2 Document missing option in loadAll(). 2015-05-13 22:37:52 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
Dave Hensley
0003296f42 Add CAKE directory fallthrough for plugins/vendors
Fixes issue #6124.
2015-03-20 17:35:19 -04:00
mark_story
8cadb553d7 Merge branch 'master' into 2.7 2015-03-14 22:08:53 -04:00
David Yell
24edae5792 Update App.php
Add a missing apostrophe
2015-03-12 15:26:59 +00:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
Chris Valliere
0dca5c8877 Using App::uses('CakeLog', 'Log') twice
I think this was accidentally added twice?
2015-03-06 13:41:40 -05:00
mark_story
aec0241a4c Make global paths for vendors and plugins based on ROOT.
Using CAKE means that composer installed CakePHP will generate incorrect
'global' paths.

Refs #5838
2015-02-26 12:49:04 -05:00
mark_story
ac9a212d44 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
euromark
52ecccb1a2 App::uses and usage replacements for String => CakeText. 2015-01-05 01:00:57 +01:00
euromark
b936a34471 Backport of 3.0 Configure corrections. 2015-01-04 01:57:06 +01:00
euromark
515302528d Backport Configure::consume() to 2.x 2014-12-23 03:26:03 +01:00
mark_story
4d6611b328 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
euromark
e1c128bb99 Consolidate with conditions sniff. 2014-12-09 03:17:35 +01:00
mark_story
0e4fb9d648 Merge branch 'master' into 2.6 2014-11-07 15:13:46 -05:00
euromark
768f2c809c Correct doc block return types. 2014-11-05 13:03:27 +01:00
mark_story
87fcc9f0b9 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-10-13 21:11:38 -04:00
Bryan Crowe
e16bef1868 Fix missing 'r' from your 2014-10-08 15:06:30 -04: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
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
ADmad
713f430fc4 Merge branch 'master' into 2.6 2014-08-03 01:05:36 +05:30
Anthony GRASSIOT
aa42b80a4d a / an typo fixes fot API 2014-07-30 22:11:03 +02:00
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
a2673d8bf0 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Core/App.php
2014-06-25 09:22:10 -04:00
euromark
26fe1265ab Mark App::pluginPath as deprecated and don't use it anymore. 2014-06-24 11:52:29 +02:00
ADmad
4c83563501 Deprecate App::pluginPath() 2014-06-07 22:59:02 +05:30
ADmad
e7debd8692 More API docblock CS fixes. 2014-06-02 18:27:11 +05:30
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
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
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +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
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00