adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-24 07:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18518 commits 7 branches 0 tags 44 MiB
Commit graph

872 commits

Author SHA1 Message Date
Mark Story
051362a734 Merge pull request #836 from dogmatic69/simplify-object-collection 
PHP 5.4 strict error fix
 2012-09-13 14:37:40 -07:00
dogmatic69
95b895b19a Simplify the cake time class 
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.

Also removed setting variables that are returned on the next line.
 2012-09-13 22:17:01 +01:00
dogmatic69
173524ade2 PHP 5.4 strict error fix 2012-09-13 21:12:04 +01:00
dogmatic69
50333a2866 adjusting the way the regex is done so its easier to read 2012-09-13 21:03:38 +01:00
dogmatic69
dc3995f939 Simplify the ClassRegistry by removing else, early returns 2012-09-13 14:00:51 +01:00
José Lorenzo Rodríguez
395e5bab58 Merge pull request #832 from dogmatic69/cake-time-unused-var 
adding the timezone as it was not being used
 2012-09-13 00:10:22 -07:00
dogmatic69
cf361040a4 adding the timezone as it was not being used 2012-09-13 06:45:44 +01:00
dogmatic69
b1db2aeb31 fixing the missing space on the if 2012-09-13 06:24:36 +01:00
Mark Story
25b447149d Merge pull request #827 from dogmatic69/simplify-object-collection 
simplify the code for object collection
 2012-09-12 18:36:28 -07:00
Mark Story
5d8ca79b00 Merge pull request #825 from dogmatic69/sanitize-simplify-code 
Simplify the code for sanitize class
 2012-09-12 18:23:10 -07:00
dogmatic69
b84224804e that change did make wonky uuids 2012-09-12 23:52:04 +01:00
dogmatic69
91c09d87bc simplify the code for object collection 
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
 2012-09-12 21:56:59 +01:00
dogmatic69
44f8f84cd7 Simplify the code for sanitize class 
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
 2012-09-12 21:29:40 +01:00
dogmatic69
f886d874a6 simplify the code in the string class 
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
 2012-09-12 18:10:50 +01: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
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
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
Ber Clausen
63548267e9 Refactor Validator::decimal() to be more flexible with decimal 
separators and PHP magic.
Lots of testing added.
 2012-08-27 23:25:17 -03:00
mark_story
b68a2ed84d Update API docs. 2012-08-26 22:15:18 -04:00
mark_story
d66d37c92b Merge branch 'master' into 2.3 2012-08-24 22:50:29 -04:00
Ber Clausen
b75a6b440a Treat float numbers with trailing zeroes removed by PHP, accordingly. 
Revert #2800 (28bd6880df) regex changes. Also add more tests.

Signed-off-by: mark_story <mark@mark-story.com>
 2012-08-24 22:22:12 -04:00
mark_story
24b68ec1db Ensure = is removed from generated salt values. 2012-08-24 09:35:33 -04:00
euromark
7969062614 legacy support with test cases 2012-08-17 13:57:47 +02:00
euromark
f201684873 use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length) 2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4 Merge pull request #752 from dereuromark/2.3-truncate-tail 
String::tail()
 2012-08-16 11:02:06 -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
euromark
2a570e639c ellipsis instead of ending/beginning for core wide consistency 2012-08-04 19:58:23 +02:00
euromark
853fa7d95b doc block correction 2012-08-03 10:54:16 +02:00
euromark
917d912a43 String::tail() 2012-08-02 13:21:31 +02:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -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
2359fb7e2e Simplify number formatting. 2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137 Add bcrypt support to Security::hash() 2012-07-22 21:15:00 -04:00
mark_story
468302b526 Merge branch 'master' into 2.3 2012-07-21 20:59:56 -04:00
U-Zyn Chua
e7c4064a69 Fix URL validation to allow underscores in subdomain. 2012-07-19 20:51:33 +08:00
mark_story
3c6b50953b Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2012-07-18 22:12:51 -04:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
mark_story
6c905411ba Fix XML decoding attack via external entities. 2012-07-14 11:53:37 -04:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
ADmad
76f93178a8 Tweaked Validation::extension() 2012-06-25 19:15:52 +05:30
mark_story
3f78216e96 Revert changes in behavior made to timeAgoInWords() 
Changes made in [0729aca706] changed
the generated text to not match the behavior in 2.1.
 2012-06-24 20:54:47 -04:00
Juan Basso
ecdf0e6c6c Optimization for Hash method 2012-06-24 12:47:30 -04:00
Jelle Henkens
db7d5426ec CakeTime no longer sets the timezone out of its scope on the date object 2012-06-24 11:10:55 +01:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator 
Fixes #2958
 2012-06-18 23:13:09 -04:00
Ceeram
74a0bd98c2 throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype 2012-06-14 19:01:41 +02:00
mark_story
76dd49145a Merge branch '2.1' into 2.2 2012-06-10 20:34:20 -04:00
mark_story
c31858635f Don't OR options together. 
By default FILTER_VALIDATE_IP does both.
 2012-06-10 20:29:48 -04:00
mark_story
963f1ca449 Don't |= with null. 2012-06-10 20:21:59 -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
454fae9bd0 Fix Validation::ip() not respecting type. 
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.

Fixes #2944
 2012-06-10 19:37:44 -04:00
Jose Lorenzo Rodriguez
2a90baae0c Forgot to include complete patch in last commit :( 
Note: It's not good to commit while watching tv
 2012-06-09 15:01:27 -04:30
Jose Lorenzo Rodriguez
d13deb7da2 Fixing param usage introduced in previous commit 2012-06-09 14:52:03 -04:30
Jose Lorenzo Rodriguez
a2c2902dd6 Renaming param in CakeTime::format() to make its purpose more obvious, 
added some examples in doc block
 2012-06-09 08:45:46 -04:30
Jose Lorenzo Rodriguez
0d013f8da5 Fixing CakeTime, the actual params for format() is $date and $format, 
and not the other way around :)
 2012-06-09 08:28:39 -04:30
Mark Story
085ad0bb42 Merge pull request #672 from sitedyno/cookie-encryption-#471 
Add stronger encryption, and make it available in cookiecomponent.

Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
 2012-05-31 17:44:49 -07:00
mark_story
01b3135a63 You should be able to regex match null/'' 
Fixes #2926
 2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
 2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700 Allow Set::extract() to match null. 
Fixes #2926
 2012-05-30 21:19:46 -04:00
Heath Nail
304d001dfb Implement rijndael optional cookie encryption. 2012-05-30 03:49:25 -04:00
Florian Krämer
fea4ae6523 Changing File->info() to File->mime() in Validation::mimeType() 2012-05-28 00:48:22 +02:00
Florian Krämer
e3a6e9e169 Adding uploadError() and mimeType() to the Validation class 2012-05-28 00:32:30 +02:00
Mark Story
4485f597b7 Merge pull request #662 from jellehenkens/2.2-validation-natural-number 
Adding validation rule for natural numbers
 2012-05-27 11:01:31 -07:00
mark_story
4b8c469004 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/VERSION.txt
 2012-05-26 21:11:36 -04:00
Jelle Henkens
f6a6e3381e Fixing typo in the docblock 2012-05-24 20:07:48 +01:00
mark_story
5270721ade Remove bonus intval() 
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.

Fixes #2897
 2012-05-22 22:33:46 -04:00
Jelle Henkens
ecd869d4e3 Changing int to integer 2012-05-22 16:34:07 +01:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
ADmad
e58e3c5314 Fix regex for failing test on 5.2 2012-05-21 19:48:47 +05:30
Jelle Henkens
7546be6394 Adding a validation rule for checking natural numbers 2012-05-21 13:39:31 +01:00
ADmad
cfd9d8a815 Added CakeTime::listIdentifiers() 2012-05-21 03:05:42 +05:30
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
Jelle Henkens
5fe22cfc8d Adding support for DateTime objects in the CakeTime Utility class 2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a CakeTime::format crashed when timezone is passed 2012-05-17 19:05:45 +07: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
Jelle Henkens
0d9506fa2e Fixing issue where nice and niceShort did not use the timezone if no dateString is passed 2012-05-13 13:43:06 +01:00
Rachman Chavik
e6860fb856 changing LOG_ERROR to LOG_ERR in core files 2012-05-13 18:51:57 +07:00
mark_story
64f03acd4c Fix code standards errors. 2012-05-12 23:28:43 -04:00
mark_story
14bfd83dad Reduce complexity in timeAgoInWords. 
All the special cases were handled by the deeply
nested if.
 2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea Fix whitespace and formatting. 2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element. 2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3 Added test cases for new features. 2012-05-12 22:26:33 -04:00
Magnus Johansson
0729aca706 Added some more intelligence to the CakeTime class 2012-05-12 22:25:48 -04:00
ADmad
14b7210d2b Fixed server offset calculation 2012-05-13 06:20:29 +05:30
mark_story
7695da637c Use correct argument order. 2012-05-10 20:55:45 -04:30
Ceeram
fe0c7d348a add strict parameter to inList() and multiple() 2012-05-07 16:29:13 +02:00
mark_story
ed1a64ca04 Use correct argument order. 2012-05-04 08:16:43 -04:00
mark_story
7b5e45b965 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/VERSION.txt
 2012-05-03 21:06:35 -04:00
mark_story
73b0345ff4 Fix issue with non-sequential array keys. 
Xml::fromArray() should not cause errors with non-sequential
numeric array keys.

Fixes #2580
 2012-05-03 20:35:01 -04:00
ADmad
061483d03e Added missing keyword 2012-04-25 11:03:26 +05:30
Rachman Chavik
2f87992d15 File::create() does not need to change umask 
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.

FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.

Refs: f9f1c4df5
Cherrypicked from 2.2 branch.
 2012-04-24 23:35:32 +07:00
Rachman Chavik
74830b9b93 File::create() does not need to change umask 
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.

FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.

Refs: f9f1c4df5
 2012-04-24 23:17:28 +07:00
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04:00
mark_story
13468937cc Fix singularization of databases. 
Fixes #2822
 2012-04-23 21:01:03 -04:00
ADmad
3800029c9a Fix docblock 2012-04-22 02:22:48 +05:30
ADmad
d26f869455 Added function to get timezone object 2012-04-22 01:59:26 +05:30
ADmad
058d57a85a Added function to convert time from user timezone to server timezone. 2012-04-22 01:59:26 +05:30
ADmad
a96de99388 Tweak docblocks 2012-04-22 01:59:26 +05:30
ADmad
ebf304927b Added "Config.timezone" config param to avoid having to specify timezone in each function call. 2012-04-22 01:59:26 +05:30
ADmad
d34f0c2bd8 CakeTime functions can now use timezone string or DateTimeZone object for user offsets. (Passing numeric offsets has been kept for BC) 2012-04-22 01:59:08 +05:30
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
Cauan Cabral
28bd6880df Make Validation::decimal accept integers 
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
 2012-04-17 20:22:22 -04:00
mark_story
a4f0399f74 Fix coding standards warnings. 2012-04-10 22:16:14 -04:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
 2012-04-10 21:32:37 -04:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
 2012-04-09 21:55:02 -04:00
mark_story
3c9e79737d Update doc blocks for CakeNumber. 2012-04-08 12:35:44 -04:00
mark_story
eeec362741 Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash 2012-04-07 14:28:40 -04:00
mark_story
83789915a3 Update docs about PHP5.4 constant. 2012-04-04 21:36:56 -04:00
Ceeram
7700a0261b only use and test SORT_NATURAL on PHP 5.4 2012-04-04 18:21:52 +02:00
mark_story
e5ca80b711 Add additional sort flag support. 
Add natural, numeric, and string sorting to Hash.
Fixes #1700
 2012-04-01 23:09:15 -04:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
mark_story
6677127c8e Fix coding standard error. 2012-03-31 21:38:39 -04:00
mark_story
432d00de19 Another small optimization. 2012-03-31 21:37:10 -04:00
mark_story
7d098fa5f0 Some small performance optimizations. 2012-03-31 21:25:02 -04:00
mark_story
6a9fdd841a Fix failing tests. 
Set::merge() accepts anything even non-array values.
 2012-03-31 13:38:09 -04:00
Kyle Robinson Young
4370bf280a Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4 
Fixes #2602
 2012-03-28 10:46:31 -07:00
Mark Story
0443fe1507 Merge pull request #584 from shama/patch-inpath-test 
Add test/doc for reverse Folder::inPath()
 2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9 Add test/doc for reverse Folder::inPath() 2012-03-27 11:55:13 -07:00
mark_story
95d4549c9b Docs + coding standards. 2012-03-26 22:57:50 -04:00
mark_story
c087576f20 Port changes done to Set into Hash 
See #2722
 2012-03-26 22:39:13 -04:00
mark_story
6e0e15682f Remove duplication where possible. 2012-03-26 22:33:46 -04:00
mark_story
66eabe462a Copy Set::expand into Hash class. 2012-03-26 22:32:58 -04:00
mark_story
9015d78017 Port most recent changes in Set to Hash. 
See [68eeee80d8] and
[af575027da]
 2012-03-26 22:32:56 -04:00
mark_story
e55927c007 Update the doc links. 2012-03-26 22:32:56 -04:00
mark_story
0ef9adba93 Move and rename pushDiff onto Hash. 
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
 2012-03-26 22:32:54 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
mark_story
2231087ba3 Rename Set2 -> Hash. 2012-03-26 22:25:40 -04:00
mark_story
5b4b936157 Make filter() more flexible. 2012-03-26 22:25:40 -04:00
mark_story
239f52c48c Move nest() over 
Make get() able to take arrays for $path.
 2012-03-26 22:25:40 -04:00
mark_story
ae66682c35 Add apply(), map() and reduce() 
Add tests as well.
 2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5 Add tests for issue #104 2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7 Move Set::format across. 
Remove the {0} style of formatting.  Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
 2012-03-26 22:25:39 -04:00
mark_story
e4a505797d Move combine() across. 2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c Move Set::check across. 2012-03-26 22:25:39 -04:00
mark_story
771efd950e Fix sort() not working. 2012-03-26 22:25:38 -04:00
mark_story
57d50cd018 Extract common method. 2012-03-26 22:25:38 -04:00
mark_story
3d8a955043 Add remove() and insert() 
Also add support for multi insert and multi remove.
 2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a Extracting duplicate loops. 2012-03-26 22:25:38 -04:00
mark_story
e72127e359 WIP, adding sort() and remove() 2012-03-26 22:25:37 -04:00
mark_story
31181f58d6 Add attribute pattern matching. 2012-03-26 22:25:37 -04:00
mark_story
cbfa938303 Fix muliple attribute conditions. 2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba Making attributes work with any selector type. 
Attributes work with all base selectors.
 2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde Added some more operators. 
Attribute + {n} is still not working.
 2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef Implement presence and equality attributes. 2012-03-26 22:25:36 -04:00
mark_story
37181e99a8 Basic path selectors implemented for extract(). 2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc Move numeric() into Set2. 2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1 Moving filter() into Set2. 2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80 Make contains() non-recursive. 
Add a few more tests for contains().
 2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9 Move contains() across. 
Fix a few issues in contains() with nested needle values.
 2012-03-26 22:25:35 -04:00
mark_story
ad65098348 Move normalize() into Set2. 
Dropping the ability to 'normalize' string data.
 2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9 Move merge() into Set2. 2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28 Moving flatten() across. 
It is no longer recursive either.
 2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425 Adding dimensions() and maxDimensions() 
Splitting the Set::countDim() into two methods.  This creates a simpler
API, as each method only does one job, and only has one argument.  Also
replacing recursion with iteration.
 2012-03-26 22:25:34 -04:00
mark_story
db3485d47c Add function prototypes. 2012-03-26 22:25:34 -04:00
mark_story
328513d35e Start Set2. 2012-03-26 22:25:33 -04:00
mark_story
6b045318d8 Merge branch '2.1' into 2.2 2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82 Fix Set::insert() not overwriting values. 
Set::insert() failed to overwrite values that were previously
defined as strings.  Remove test in SessionComponentTest that was
ensuring this bug stuck around.

Fixes #2722
 2012-03-26 21:50:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/VERSION.txt
 2012-03-25 21:18:58 -04:30
mark_story
49a455a2cb Fix some code standards warnings. 2012-03-24 22:15:08 -04:00
dogmatic69
d3a44811ce adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible 2012-03-16 21:20:27 +00:00
Rachman Chavik
079ae8265c Set::expand as implemented by jeremyharris 2012-03-15 20:07:49 +07:00
Rachman Chavik
af575027da fix Set::sort() for issue in previous commit 2012-03-13 12:45:06 +07:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Ceeram
68eeee80d8 Set::sort() now correctly sorts when using {s}.path, fixes #2673 2012-03-12 21:58:24 +01:00
mark_story
a9c8a520b2 Port [c19b233] to 2.1 2012-03-12 12:33:20 -04:00
Majna
4543a4cb88 Make Validation class more strict when checking values in list. 
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
 2012-03-07 18:52:48 +01:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
9d325fe46e Fixing most coding standard issues in Utility/ 2012-03-03 17:31:47 -05:00
mark_story
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
mark_story
0b4f735b4c Update API docs for Set::extract() 
Fixes #2634
 2012-03-02 11:19:17 -05:00
Michael Hagedon
5eb4155236 Fixing case. 2012-02-28 13:20:47 -07:00
Michael Hagedon
ef80045fc5 Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected 2012-02-28 12:41:43 -07:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
2ddc3873c2 Update the Set::merge() documentation. 2012-02-18 16:01:07 -05:00
Mark Story
60df31cfb6 Merge pull request #487 from dogmatic69/2.1 
2.1
 2012-02-17 17:38:03 -08:00
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01: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
dogmatic69
be49b2b942 fixing up the docs for Collection::attached(), was showing behaviors but is for all collections 2012-02-17 13:25:37 +00:00
mark_story
6412797dfc Add missing static. 2012-02-16 20:58:43 -05:00
Rachman Chavik
d6fd051fb4 changing methods in CakeTime class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4 changing methods in CakeNumber class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445 changing methods in String class to static 2012-02-14 09:34:36 +07: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
Jose Lorenzo Rodriguez
fd17e33e78 Making CakeNumber::addFormat static so it is easier to configure globally for the app 2012-02-10 22:25:59 +07:00
Rachman Chavik
2dc9986fad moving methods from TextHelper to String 2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8 moving NumberHelper to CakeNumber 2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126 moving TimeHelper to CakeTime 2012-02-10 22:25:59 +07: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
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
 2012-01-20 20:28:15 -05:00
mattpotts
1c645152ca added sftp to url() 2012-01-19 22:05:10 -05: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
2c239cc851 Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487 2012-01-20 03:31:08 +05:30
AD7six
f1f1ce0db4 allow specifying an explicit root 2012-01-18 13:05:44 +01:00
AD7six
7414d0f77b rename set::getValue to set::get - and make it public 2012-01-12 09:45:28 +01:00
AD7six
3b1dd82603 add tests for set nest method 2012-01-10 10:18:59 +01:00
AD7six
d534013570 reduce code repetition 2012-01-10 09:47:51 +01:00
AD7six
5608d63541 allow set nest to work with any-d arrays 
not just model-formatted arrays
 2012-01-10 01:24:20 +01:00
AD7six
442d889f99 move the paths used into options 2012-01-10 00:48:36 +01:00
AD7six
7b640b8123 move find threaded logic to the set class 2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0 Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.

Conflicts:

	lib/Cake/Utility/ClassRegistry.php
 2012-01-09 23:42:09 +01:00
AD7six
336c750b7e Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
 2012-01-09 23:38:32 +01: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
Jose Lorenzo Rodriguez
44dd25010d Adding a replacement for zend_thread_id() to use within hiphop 2012-01-07 18:41:16 -04:30
mark_story
de7921a5d4 Merge branch '2.0' into 2.1 2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f Add missing else for non SQLServer db's. 2012-01-06 23:06:12 -05:00
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
d69c3f3db6 Fix failing tests with SQLServer. 2012-01-06 22:53:39 -05:00
mark_story
e649a0516e Fix singularization of 'foes' 
Fixes #2424
 2012-01-05 21:22:40 -05:00
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
mark_story
23178df504 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-12-29 20:03:42 -05:00
mark_story
5936fa5930 Fix strict errors. 2011-12-29 11:10:25 -05:00
Mark Story
e9813d7a97 Fix errors with illegal string offsets. 
If $_list becomes a string notice errors are triggered when trying
to do offsets in PHP 5.4
 2011-12-27 21:38:14 -05:00
Jose Lorenzo Rodriguez
1651257919 Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again 2011-12-26 13:06:48 -04:30
Jose Lorenzo Rodriguez
35ecbfebde Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests 2011-12-25 23:17:08 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4 Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller 2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
078a2dfd72 Migrating View and Helpers events to use the CakeEvenManager 2011-12-25 19:00:19 -04:30
Jose Lorenzo Rodriguez
5d67195bf7 Migrating Controller events to use the CakeEventManager 2011-12-25 14:44:34 -04: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
mark_story
2d68e7da1e Fix failing tests. 
You can't use finfo on files that don't exist.
 2011-12-18 23:26:57 -05:00
mark_story
f959fcefc4 Add File::mime() 
Fixes #1051
 2011-12-18 23:02:05 -05:00
mark_story
39b1203e9a Making modParams work with non-array values. 
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
 2011-12-17 22:23:36 -05:00
Kyle Robinson Young
d794084d38 More code standards formatting 2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
ADmad
16d29a8d0e Making Folder::delete() code more PHP5ish 2011-12-15 03:07:17 +05:30
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
645ef47878 Fix multiple date formats in Validation::date() 
Fixes #2364
 2011-12-12 20:21:10 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
 2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
mark_story
bc8ae11fc1 Fix fatal error with abstract/interface classes 
Abstract/Interface classes + ClassRegistry::init() should
raise an exception, not cause fatal errors.

Update CakeSchema to swallow and ignore any exceptions coming from
ClassRegistry.

Fixes #2328
 2011-12-07 20:58:01 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
c1f5dc1e40 Make XmlView consistent with JsonView. 
Both allow a view script or a serialize key with the name
of the variable to be serialized.
 2011-11-27 23:51:48 -05:00
Christian Hieke
a51626840e Escape special characters in XML. 
Fixes #2188.
 2011-11-25 21:20:26 -05:00
mark_story
21cd3f00ac Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
 2011-11-19 20:40:07 -05:00
Kyle Robinson Young
708ae873a5 Add @link to Set methods 2011-11-18 11:13:46 -08:00
Kyle Robinson Young
53f7a716ec Add @link to File/Folder properties 2011-11-18 11:05:30 -08:00
ADmad
90b007ef75 Implemented priority based triggering of callbacks for objects in collection 2011-11-17 12:36:54 +05:30
Rachman Chavik
aab8e98531 Configure ClassRegistry in test mode 
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
 2011-11-17 11:31:36 +07:00
mark_story
fb7d931bef Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
 2011-11-15 23:10:34 -05:00
Kyle Robinson Young
3248e34819 Add @link to File and Folder utilities 2011-11-14 22:40:02 -08:00
mark_story
2c7854cc2f Replace complicated $$foo with simple variable. 2011-11-12 21:42:20 -05:00
ADmad
e1354b2ee6 Merge branch '2.0' into 2.1 2011-11-06 20:39:08 +05:30
ADmad
a7d08a6b39 Removed unused option triggerDisabled from ObjectCollection::trigger(). 
Fixed docblock for ObjectCollection::load();
 2011-11-06 20:29:46 +05:30
mark_story
0304bb8796 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
 2011-11-03 22:04:00 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
Renan Gonçalves
53be552370 Fixing use of options['exclude'] in Debugger::trace(), tests added. 2011-10-27 16:01:54 +02:00
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
mark_story
bd87400131 Fix inflection for words ending in media. 
Fixes #2149
 2011-10-24 21:05:56 -04:00
Daniel Pakuschewski
318ea27c8d File::info() return the file size. 2011-10-22 11:01:22 -04:00
mark_story
52010a3e9d Fix double encoding in debug(). 2011-10-20 21:38:31 -04:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
mark_story
535b45b600 Fix strict warnings on Validation class. 2011-10-19 23:18:46 -04:00
mark_story
bca6492309 Update debug() 
debug() now uses Debugger to output content and generate traces.
This improves the readability of its output as null/true/false are better
represented.  Objects are easier to interpret as well.
 2011-10-19 22:27:55 -04:00
mark_story
49f687b0c4 New Debugger::exportVar() formatting. 
Better resembles var_dump().
Includes types, and is less noisy to read than before.
 2011-10-19 22:27:55 -04:00
mark_story
183ffb29d7 Improving the exception stack traces. 
Adding Debugger::getType()
 2011-10-19 22:27:55 -04:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00
Renan Gonçalves
3a04bb4733 Dropping short syntax support for Behavior configuration. 
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
 2011-10-15 20:52:41 +02:00
Jose Lorenzo Rodriguez
f23d62d411 Fixing more @link annotations 2011-10-15 12:42:23 -04:30
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
mark_story
788d38ccef Merge branch '1.3' into 1.3-merge 
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
 2011-10-10 09:37:06 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger 
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
 2011-10-01 22:38:20 -04:00
mark_story
dff45740ea Add 'trace' to the data provided to Debugger formats. 
Allows custom debugger output formats to display
a stack trace.
 2011-09-28 23:26:38 -04:00
mark_story
864cb70645 Moving basic templates to the 'base' key. 2011-09-28 23:25:14 -04: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
027dba72c9 Removing the helpPath feature as its not documented, not tested and most likely 
entirely unused.
 2011-09-03 12:18:03 +01:00
mark_story
f1f4afacbd Fixing duplication of classes. cake-debug was used for debug and error messages. 2011-09-03 10:06:01 +01:00
mark_story
815b78c2f9 More tweaks to the error output and headings. 
Removing extra | from debugger output.
 2011-09-03 10:06:00 +01:00
mark_story
efbeab6199 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
 2011-09-03 00:48:09 +01:00
Mark Story
59c6b419e5 Merge branch '1.3' into merger 
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
 2011-08-28 22:08:49 -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
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
Mark Story
68b2d67b0a Adding support for callback style error formatters. 
This will allow other classes to inject custom error formatting
code into debugger.  Hopefully making it possible to remove the getInstance() workarounds.
 2011-08-22 20:44:33 -04:00
Mark Story
daf1251473 Adding tests for Debugger::outputAs() 
Adding exceptions for invalid state checking.
 2011-08-22 20:44:32 -04:00
Mark Story
35fc8352ce Extracting methods from nasty Debugger::output(). 2011-08-22 20:44:32 -04:00
Mark Story
ea3b38ef3e Adding doc block info for Debugger::output(). 2011-08-22 20:44:32 -04:00
Juan Basso
f7f3515135 Fixed documentation to methods that use func_get_args(). 2011-08-21 21:45:34 -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
0575e92833 Added visibility in some methods and attributes. 2011-08-18 22:30:28 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -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
mark_story
d93c8cb200 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
 2011-08-14 14:39:49 -04:00
ADmad
b781762903 Fixing regression in Set::extract(). Refs #1895, #1816, #1692. 2011-08-14 03:11:55 +05:30
Jose Lorenzo Rodriguez
1726bad396 Adding ability to Set class to iterate on ArrayObjects, or any object implementing ArrayAccess and Traversable 2011-08-11 13:26:06 -04:30
Majna
48e681424f Fix for wrong 'cake_dev' i18n domain param. 2011-08-09 16:24:41 +02:00
Mark Story
4ab9dedd58 Updating doc blocks in Debugger and CakeLog. 2011-08-07 14:31:14 -04:00
mark_story
e4a7c8f3d7 Cleanup of minor issues found with phpmd. 2011-08-06 21:15:31 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
fedadc091c Included @throws in API that was missing. 2011-07-31 16:55:52 -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
Juan Basso
a0ee8b49fe Fixed some API doc in console. 2011-07-28 22:05:29 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0 
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
 2011-07-25 14:44:23 -04:30
Jose Lorenzo Rodriguez
31efa022df Adding a backwards compatible check to ClassRegistry::init() so it is still able to return classes that are not instance of Model 2011-07-24 14:02:16 -04:30
Jose Lorenzo Rodriguez
108505a6a0 Merge branch '2.0-form-helper' into 2.0 2011-07-16 17:32:07 -04:30
Jose Lorenzo Rodriguez
fb264d9671 Adding a datetime validation method to the Validation class, closes #1021 2011-07-15 01:20:37 -04:30
Jose Lorenzo Rodriguez
0c79ad88a3 Cleaning up the code and adding tests for new features 2011-07-14 17:26:55 -04:30
Jose Lorenzo Rodriguez
dcd8811771 Fixing typo 2011-07-14 16:05:23 -04:30
Jose Lorenzo Rodriguez
ef5650c034 Fixing ClassRegistry that was incorrectly checking class inheritance 
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
 2011-07-14 01:30:52 -04:30
Jose Lorenzo Rodriguez
e8efc67d3d Ensuring that classes returned by ClassRegistry::init() are model instances 2011-07-14 01:02:50 -04:30
Jose Lorenzo Rodriguez
60b44e074a Cleaning up the ClassRegistry::init() method, removing the use of the second parameter as it always accepted but one value 
The second parameter is now $strict, meaning that if the model class is not found it will not try to create an AppModel instance
 2011-07-14 00:06:01 -04:30
ADmad
1bccc7713d Fixing singularization of "curves" 2011-07-07 23:08:03 +05:30
AD7six
fcd0505d42 Hide db credentials 
To protect users who have publically accessible installs with debug
turned on - *** out db login credentials
 2011-06-24 10:25:20 +02:00
Mark Story
3e4388d7d7 Fixing failures from merging. 2011-06-23 13:22:08 -07:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger 
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-06-23 12:48:06 -07:00
AD7six
26aeb11550 remove needless line of code 
as pointed out by maurymmarques, in pull request 126
 2011-06-22 15:39:33 +02:00
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
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
ADmad
ccc3b9dbb4 Updating docblock for Sanitize::stripScripts() 2011-06-05 03:19:12 +05:30
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
Jose Lorenzo Rodriguez
ad456bd479 Removing code that should not have existed in the first place 2011-05-27 01:42:03 -04:30
AD7six
afa8f6b441 remove LIBS constant 
libs always means the Cake lib - so use the CAKE constant
 2011-05-15 18:29:52 +02:00
mark_story
bd30510e87 Fixing non-unique id's being generated for Debugger rendered errors. 2011-05-04 23:33:36 -04:00
Jose Lorenzo Rodriguez
f2c1f9d6b2 Removing unneeded lines in Debugger 2011-05-04 01:17:28 -04:30
Jose Lorenzo Rodriguez
d83555cc52 Merge remote-tracking branch 'origin/1.3' into merger 
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/controller.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/pages/home.ctp
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/xml.test.php
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/View/Helper/TextHelper.php
	lib/Cake/View/Helper/TimeHelper.php
	lib/Cake/config/config.php
	lib/Cake/tests/Case/Cache/CacheTest.php
	lib/Cake/tests/Case/Model/CakeSchemaTest.php
	lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
 2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
07b84a71ab Removing unneeded assignments by reference 2011-04-29 11:49:46 -04:30
evilbloodydemon
f9db4270c6 Unused variables in Utility removed 2011-04-23 00:02:10 +04:00
Jose Lorenzo Rodriguez
000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
 2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
d9da6b00c6 Moving Utility related tests 2011-04-10 17:06:55 -04:30
AD7six
32df3156a7 consolidate cake_error and cake_developer to simply "cake_dev" 
it's a lot easier for adding new translations to think:
	is it for the end user?
		use 'cake' as the domain
	is it for the developer
		use 'cake_dev' as the domain
	is it for the console
		use 'cake_console' as the domain

also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
 2011-03-20 16:38:31 +01:00
AD7six
a3447592d5 updating langauge domains 
cake - end user
cake_error - error messages
cake_developer - not an error just for the developer
 2011-03-19 18:23:01 +01:00
AD7six
e2dfafddb2 translation changes for the Utility dir 2011-03-12 20:02:37 +01:00
Jose Lorenzo Rodriguez
bab30bd48d More fixes after the recent changes in App::core() 2011-03-12 00:32:44 -04:30
José Lorenzo Rodríguez
ff1942d271 Automatically adding the declaration of the PluginAppModel class in ClassRegistry::init(), making more controller tests pass 2011-02-22 23:03:04 -04:30
José Lorenzo Rodríguez
d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
 2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	lib/Cake/Console/Command/Task/FixtureTask.php
 2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
 2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
75bfbe0e37 Fixing Set::merge, broken in previous optimizations 2010-12-21 22:24:55 -04:30
José Lorenzo Rodríguez
8436fd53d0 Changing initial uses of App::uses() to the new packages system 2010-12-15 01:20:02 -04:30
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
 2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
e57b3d8e74 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	lib/Cake/View/Helper.php
 2010-12-10 01:25:00 -04:30
José Lorenzo Rodríguez
b8344ecd33 Replacing some of the App::import by App::uses 2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
02ad049559 Fixing more shells, and updating code in home.ctp 2010-12-07 20:42:50 -04:30
José Lorenzo Rodríguez
7828f7d2fb Lazy loading connections in ConnectionManager, changing some class names and imports 2010-12-07 19:59:07 -04:30
José Lorenzo Rodríguez
6de52f795f Completing the round of micro optimization, it was fun while it lasted 2010-12-06 23:15:18 -04:30
José Lorenzo Rodríguez
575a6b4b78 A couple of micro-optimizations found using a profileA couple of micro-optimizations found using a profilerr 2010-12-06 09:38:06 -04:30
José Lorenzo Rodríguez
3f64844de9 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/basics.php
 2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
b19b25a788 Moving some spare clases to the corresponding packages 2010-12-05 13:21:28 -04:30
José Lorenzo Rodríguez
c542ac20c9 Moving core view to the new folder and allowing the view class to find those views 2010-12-05 13:07:01 -04:30
José Lorenzo Rodríguez
fcd23b0978 Starting to change the class loading for app classes 2010-12-05 10:54:42 -04:30
José Lorenzo Rodríguez
fa83ecda5b Beginnings of model loading 2010-12-04 02:57:20 -04:30
José Lorenzo Rodríguez
ec93152c9a Loading the set class successfully 2010-12-04 02:51:42 -04:30
José Lorenzo Rodríguez
fbbb5c9337 Moving more clases to the new layout while trying to make controller related classes load 2010-12-04 02:45:22 -04:30
José Lorenzo Rodríguez
b4387d2f51 More replacements to get class loaded using the new file scheme 2010-12-04 02:34:30 -04:30
José Lorenzo Rodríguez
ca34b22dbb Renaming more core classes, next step would be to tweek the autoloader to find only on Cake/ "namespace" (for now) 2010-12-03 20:15:54 -04:30