mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7
formatting app::uses blocks (refs #2265 )
2013-11-18 11:56:00 +01:00
Mark Story
17ae40f0ce
Merge pull request #2319 from ravage84/php-5-removal
...
Removed "PHP 5" from file header DocBlocks
2013-11-14 06:41:31 -08:00
Marc Würth
7018997979
Fixed some copyright and license statements in the file header DocBlocks
2013-11-14 00:07:03 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Schlaefer
8060f1b4be
fixes FileLog doesn't delete on rotation if rotate = 0
2013-10-06 15:04:57 +02:00
Schlaefer
83d340a3af
fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'
2013-10-06 13:59:52 +02:00
euromark
61b05c40c6
remove autologging
2013-09-13 02:28:25 +02:00
euromark
8141dd2d5d
unify other log types as well
2013-06-21 16:43:01 +02:00
euromark
cb24dbb084
unify engine to not require the suffix (as Cache and other places do).
2013-06-21 15:04:27 +02:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
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
José Lorenzo Rodríguez
e466af05b9
Removing copy pasted extra line
2013-05-16 17:25:39 +02:00
Jose Lorenzo Rodriguez
018e5d0659
Adding Sylog as a logging engine
2013-05-14 23:21:38 +02:00
Rémi Dewitte
5b5180f661
code style in FileLog and FileLogTest
2013-03-08 09:32:46 +01:00
Rémi Dewitte
278700677a
Add mask setting to FileLog
2013-03-07 21:40:06 +01:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
ADmad
4ab27ca840
Implemented log file rotation.
2013-02-19 00:36:18 +05:30
Mark
3b02013f7d
Merge pull request #1127 from dereuromark/master-strict-comparison
...
Strict comparison for strings where applicable
2013-02-14 01:10:48 -08:00
ADmad
f6215129f6
Fix type casting of string scopes to array in log engines
2013-02-13 00:10:32 +05:30
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
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01: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
ADmad
fa5ccf46d0
Fix coding standard errors
2012-11-04 02:52:00 +05:30
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 19:21:51 -03:00
mark_story
57681ff115
Fix code style errors.
2012-10-09 13:20:53 -04:00
mark_story
72f4d4fac0
Fix issue with logging scopes
...
Logging scopes should be exclusive and not allow messages matching on
level alone to be logged. By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.
Fixes #3264
2012-10-08 12:57:02 -04:00
mark_story
6286b43329
Make tests pass on windows.
...
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.
Refs #3055
2012-07-21 20:59:05 -04:00
Rachman Chavik
86a74e3887
fix: windows console may not have ansi color support
2012-07-03 12:41:29 +07:00
Rachman Chavik
c9b801b96d
making CakeLog to work with bogus $type and $scope
...
closes #2881
2012-05-16 08:16:20 +07:00
mark_story
7d9f441020
Add documentation.
2012-05-15 21:00:18 -04:00
Rachman Chavik
6bb29ea03b
changing CakeLog::_autoConfig for better bc
...
closes #2880
2012-05-15 08:16:55 +07:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
Rachman Chavik
595cad84b3
ensure that plain CakeLogInterface still works
2012-05-13 18:51:57 +07:00
Rachman Chavik
8e8763d69d
change to match syslog levels & customizable levels
2012-05-13 18:51:57 +07:00
Rachman Chavik
e5b33627d5
minor updates to the logging changeset
...
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
2012-05-11 21:19:45 +07:00
Rachman Chavik
be9bcfd4b5
adding convenience methods for CakeLog
2012-05-11 12:37:01 +07:00
Rachman Chavik
6040d96710
adding scoped logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
e11f6b7fe4
adding tests for ConsoleLog engine
2012-05-11 12:37:01 +07:00
Rachman Chavik
70177e4dbd
updating tests for CakeLog
...
- ObjectCollection operations
- Selective logging
2012-05-11 12:37:01 +07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
