euromark
|
0ece694a75
|
microptimize options and default merge and other string key array merges
|
2014-04-08 01:25:14 +02:00 |
|
ADmad
|
9de3418079
|
Merge branch 'master' into 2.5
Conflicts:
lib/Cake/Model/Permission.php
|
2014-02-11 18:17:59 +05:30 |
|
Eric Martins
|
2793dca671
|
Fix ApiGen errors
|
2014-02-07 18:29:54 -02:00 |
|
Bryan Crowe
|
0cffcd1eca
|
Added missing semi-colon in return
|
2013-10-02 22:55:09 -04:00 |
|
Bryan Crowe
|
b9003e5f7c
|
Allow Folder::addPathElement() to accept arrays, also corrected docblock
|
2013-10-02 22:45:22 -04:00 |
|
euromark
|
a90cb29c0f
|
simplify else cases
|
2013-07-03 01:14:41 +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
|
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
|
3f4d24bfc0
|
remove unused local variables and a few improvements
|
2012-12-23 13:53:13 +01:00 |
|
euromark
|
18fb132d41
|
some doc block corrections as well a !! to (bool) convertion
remove nonsense default value
|
2012-11-22 14:28:09 +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 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
euromark
|
7383298410
|
making messages() and errors() reset themselves by default
|
2012-10-01 14:20:53 +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
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
mark_story
|
c13ed3366b
|
Fix whitespace errors.
|
2012-09-13 21:06:14 -04:00 |
|
euromark
|
2d9d400ecb
|
correct spelling
|
2012-09-10 23:08:14 +02:00 |
|
euromark
|
37068539bd
|
allow Folder to merge recursivly and add scheme option
|
2012-09-10 10:23:52 +02:00 |
|
Kyle Robinson Young
|
bc40ac7d3f
|
Remove unused variables and code
|
2012-09-05 17:19:13 -07:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
Kyle Robinson Young
|
deb5a57cb9
|
Add test/doc for reverse Folder::inPath()
|
2012-03-27 11:55:13 -07:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
9d325fe46e
|
Fixing most coding standard issues in Utility/
|
2012-03-03 17:31:47 -05:00 |
|
Majna
|
c40d132f81
|
Fix Folder::tree() when excluding dot files or folders.
When 'exclude' param is array('.') files/folders are not skipped. Added test.
|
2012-02-17 20:46:52 +01:00 |
|
ADmad
|
d61b6dc7d3
|
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
|
2012-01-20 04:05:40 +05:30 |
|
ADmad
|
bcab3d0cb9
|
Made default value and behavior of param $exceptions for Folder::tree() identical to same param in Folder::read()
|
2011-12-22 03:29:21 +05:30 |
|
ADmad
|
b84c9a1aaa
|
Removing unused function Folder::_tree(). Added exception handling in Folder::delete().
|
2011-12-22 03:22:46 +05:30 |
|
ADmad
|
389072708a
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
|
2011-12-22 03:15:04 +05:30 |
|
ADmad
|
7339640ef2
|
Fixed files inside dot folder showing up even when hiding dot files/folder in Folder::tree(). Closes #2395
|
2011-12-22 02:55:24 +05:30 |
|
ADmad
|
16d29a8d0e
|
Making Folder::delete() code more PHP5ish
|
2011-12-15 03:07:17 +05:30 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
Kyle Robinson Young
|
53f7a716ec
|
Add @link to File/Folder properties
|
2011-11-18 11:05:30 -08:00 |
|
Kyle Robinson Young
|
3248e34819
|
Add @link to File and Folder utilities
|
2011-11-14 22:40:02 -08:00 |
|
mark_story
|
36928d35f9
|
Redoing fix done in 155968349f
Adding more test cleanup to try and solve build issues.
|
2011-09-22 22:05:36 -04:00 |
|
mark_story
|
eccc05d8b1
|
Revert previous commit. Trying to fix jenkins build.
|
2011-09-22 21:39:00 -04:00 |
|
mark_story
|
155968349f
|
Skip . and .. when generating trees.
Fixes #2012
|
2011-09-22 21:14:27 -04:00 |
|
mark_story
|
02a6883b22
|
Using Folder class in CakeTestSuite, this fixes issues where
hidden directories from VCS would be added as test cases.
Fixes #1933
|
2011-08-27 10:34:08 -04:00 |
|
mark_story
|
682dc5e24b
|
Make Folder::tree use SPL Iterators.
|
2011-08-27 10:20:59 -04:00 |
|
mark_story
|
7656feb0bb
|
Converting internals of Folder::read() to use DirectoryIterator.
|
2011-08-27 10:20:59 -04:00 |
|
Juan Basso
|
61833294f0
|
Changed the visibility to methods that not affect others classes.
|
2011-08-20 01:39:30 -04:00 |
|
Juan Basso
|
f5a54d00dd
|
Changed methods and attributes from private to protected.
|
2011-08-20 00:43:34 -04:00 |
|
Juan Basso
|
620a65b2fc
|
Merge branch '2.0' into 2.0-api-doc
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
|
2011-08-14 21:12:05 -04:00 |
|
Majna
|
48e681424f
|
Fix for wrong 'cake_dev' i18n domain param.
|
2011-08-09 16:24:41 +02:00 |
|
Juan Basso
|
895c10af7b
|
Adjusted some types in @param, @return and @var.
|
2011-07-31 22:57:17 -04:00 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Juan Basso
|
9e75de2f28
|
Fixed some API doc in core and utility folders.
|
2011-07-28 23:33:17 -04:00 |
|