Commit graph

50 commits

Author SHA1 Message Date
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
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
mark_story
869d556d07 Fix typos & strict errors. 2012-11-24 22:42:14 -05:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
ADmad
084636bf9d Add App::uses() 2012-11-03 21:55:46 +05:30
Rachman Chavik
0cae19a14e enable PluginDot for routeClass parameter 2012-09-12 21:24:56 +07:00
Ber Clausen
bdac857293 Add plugin support to IniReader, and harden tests.
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
Renan Gonçalves
172e4bed5d Fix STRICT warnings on PHP 5.4 2012-08-21 13:08:43 +02:00
Rachman Chavik
595cad84b3 ensure that plain CakeLogInterface still works 2012-05-13 18:51:57 +07:00
Rachman Chavik
49bc818d36 new base class Log/Engine/BaseLog 2012-05-11 12:37:00 +07:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Jose Lorenzo Rodriguez
9f415d012c Merge branch '2.2-cache-groups' into 2.2
Conflicts:
	lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
Jose Lorenzo Rodriguez
70f3cc579c Renaming a few things in dispatcher filters to maccht general naming style in CakePHP 2012-04-16 23:41:32 -04:30
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
mark_story
0f2100767b Add failing test for #2661 2012-04-14 10:24:20 -04:00
Thomas Ploch
ce8b10e46f Fixing cache group related test cases. 2012-03-26 14:30:01 +02:00
mark_story
1e403c6a7f Fix more coding standards issues. 2012-03-17 23:53:13 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Rachman Chavik
fe479c636c adding tests for engine overrides 2012-02-14 23:28:57 +07:00
mark_story
01b45cc246 Add files I forgot in previous commit. 2012-01-30 22:29:52 -05:00
Ceeram
eaf6f0e2c1 add missing App::uses() 2012-01-12 18:01:27 +01:00
Jose Lorenzo Rodriguez
00a0c60733 Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales' 2012-01-05 19:56:01 -04:30
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
87f5b6cf26 Fix more strict errors.
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
mark_story
3f506b287b Rename file.
Fix build error caused by legacy workaround fixes.
2011-11-13 16:48:52 -05:00
mark_story
a7fcb0a61c Fix more strict errors. 2011-11-12 21:42:20 -05:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
Jose Lorenzo Rodriguez
ee7f417085 Test to disprove #2123, it is possible to load classes in plugin's Lib directory. App::uses() is intended for classes not procedural files. 2011-10-26 22:33:14 -04:30
Rachman Chavik
a60d71d19b removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
ADmad
97a975c6c4 Refactoring Model::invalidFields() a bit. 2011-09-12 05:10:34 +05:30
Juan Basso
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
Mark Story
7276f3357d Fixing issues where ControllerTestCase couldn't properly hit plugin
controllers.
Fixing some formatting.
Fixes #1918
2011-08-20 09:58:35 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
765164f33b Merge branch '2.0-extract-model-validation' into 2.0 2011-07-07 01:05:39 -04:30
Jose Lorenzo Rodriguez
33c74b6062 Implementing validation domain extraction in the ExtractionTask 2011-06-20 00:36:31 -04:30
Jose Lorenzo Rodriguez
2a39e6869c Merge branch '2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Test/Case/Model/ConnectionManagerTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
2011-06-17 18:04:03 -04:30
Juan Basso
cb88b952f4 Supporting template/layout in plugins for CakeEmail. Fixes #1743. 2011-05-31 22:57:08 -04:00
Juan Basso
6f821e0d4d Changes relatives to templates from last commit. 2011-05-30 23:11:09 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Jose Lorenzo Rodriguez
991501d489 Implementing a new option 'exclude-plugins' from the ExtractTask 2011-05-27 15:55:50 -04:30
Jose Lorenzo Rodriguez
b320e4323f Improving ConnectionManager tests 2011-05-27 02:13:35 -04:30
Jose Lorenzo Rodriguez
29298d746e Fixing App tests 2011-05-15 00:56:33 -04:30
Jose Lorenzo Rodriguez
91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
3b725290ba Renaming elements and layouts 2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826 Renaming more folders 2011-05-13 02:31:33 -04:30