adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-25 08:17:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18156 commits 7 branches 0 tags 44 MiB
Commit graph

836 commits

Author SHA1 Message Date
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
euromark
f6aedea271 coding standards elseif 2013-06-09 17:12:46 +02:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an array to XML object.
 2013-06-09 00:52:06 +02:00
Mark Story
e26a05ce04 Merge pull request #1235 from ADmad/2.3-caketime 
Fix datetime comparison in relative datetime functions.
 2013-06-05 06:12:50 -07: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
Marc Würth
2bbd391972 Synced PHP version annotations 
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
 2013-05-29 20:19:14 +02:00
mark_story
cce9e84907 Merge branch 'master' into 2.4 2013-05-28 22:40:32 -04:00
Ceeram
49aded5399 fix coding standard error 2013-05-28 18:39:38 +02:00
mark_story
7334643b55 Fix issues with getting Xml as SimpleXmlElement and invalid Xml. 
Fixes #3855
 2013-05-27 13:22:14 -04:00
mark_story
df872dde28 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-05-10 21:58:48 -04:00
mark_story
b533c1b3ba Make named capture groups compatible with older PCRE versions. 
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.

Fixes #3821
 2013-05-09 12:18:26 -04:00
mark_story
cdede82b7e Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Core/Object.php
 2013-05-07 22:22:48 -04:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem 
Fix bug in Xml::_toArray Method
 2013-05-07 19:03:18 -07:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an XML object to an array.
 2013-05-08 00:56:17 +02:00
mark_story
06e7ba66c9 Update docs for Security::cipher() 
This method is not cryptographically strong. Note that, and the
issues related to suhosin.

Related to #GH-1100
 2013-05-06 23:03:20 -04:00
ADmad
a10275fb8b Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
 2013-05-05 14:36:46 +05:30
mark_story
2b0e10eebb Exclude domain names starting with - 
Related to 479aefc438

Refs #3414
 2013-04-29 21:31:30 -04:00
Mark Story
619f66178b Merge pull request #1233 from spiliot/patch-1 
Money validation should accept one decimal place.
 2013-04-28 18:06:49 -07:00
ADmad
19f8274a95 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-04-25 03:06:04 +05:30
euromark
dbc2a7a9e4 correct spelling mistake 2013-04-23 12:34:59 +02:00
Simon Males
880c70cc8c No use of type key in ClassRegistry::init() 2013-04-22 13:55:28 +08:00
spiliot
2d7f6fc707 Added tests 2013-04-22 03:42:19 +03:00
ADmad
ae8386c48a Fix datetime comparison in relative datetime functions. 
Closes #2987,#3514
 2013-04-20 13:10:06 +05:30
spiliot
50e3307f00 Money validation accepts one decimal place 2013-04-19 01:58:08 +03:00
mark_story
aee8b50507 Merge branch 'master' into 2.4 2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8 Remove remaining reference operators. 
These were left over from the days of 1.x and aren't needed anymore.
 2013-04-15 21:23:48 -04:00
mark_story
247d836174 Remove useless reference operator. 2013-04-14 21:29:04 -04:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Utility/File.php
 2013-04-14 00:05:18 +05:30
ADmad
ba56fb7064 Fixed issue where incorrect cached filesize was reported when appending to file. 2013-04-13 19:45:20 +05:30
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
dogmatic69
7b0e5d9375 Moved stat cache clearing into a method for consitent usage. 
Fixes issue where incorrect cached filesize was reported when appending to file.
Thanks dogmatic69 for the patch.
 2013-04-11 11:16:10 +05:30
mark_story
5c83bc177d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-04-09 22:09:56 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString() 
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
 2013-04-09 21:30:20 -04:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
mark_story
d28c2f8e72 Fix code & tests for isPast() and isFuture() 
The methods and tests now follow coding standards and work.
 2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d Adds two new time testing methods: 'isFuture' and 'isPast' 
TestCases included
 2013-03-30 22:24:08 -04:00
mark_story
3fc627c5f8 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-03-30 22:12:27 -04:00
bcrowe
70d9ae9a03 Fix docblock typo of ObjectCollection class 2013-03-28 20:14:41 -04:00
ADmad
733116d15d Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in ClassRegistry::init(). 
Closes #3724
 2013-03-27 15:44:48 +05:30
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
euromark
f633e59091 keep the deprecated three-letter-code 2013-03-24 11:08:40 +01:00
euromark
47f388a4c0 correct and unify country codes for validation 2013-03-23 22:27:40 +01:00
mark_story
5d6a6fa203 Fix error when generating Xml. 
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
 2013-03-21 21:12:21 -04:00
mark_story
83de70efcf Tighten Canadian postal code validation. 
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.

Fixes #3708
 2013-03-17 18:14:56 -04:00
Mark Story
3f94d1d481 Merge pull request #1184 from tenebrousedge/uuid-improvement 
Improvement to Validator::uuid
 2013-03-15 07:10:20 -07:00
Sethrin
99c41e0af4 Improvement to Validator::uuid 
Properly matches version digit and variant digit, based on RFC4122
 2013-03-15 04:11:22 -07:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
mark_story
246c09ae40 Allow character classes in attribute patterns. 
Fixes #3706
 2013-03-14 12:55:03 -04:00
Yuya Takeyama
14c81fe052 Fix alphaNumeric validation 2013-03-14 20:10:17 +09:00
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01:00
Ceeram
2f79894852 improve docblock with possible values and default 2013-03-13 14:07:47 +01:00
Ceeram
fc34d9fe7f Add formatoutput option to Xml::fromArray 2013-03-13 13:07:36 +01:00
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Mark
b105318bcc Merge pull request #1148 from dereuromark/2.4-currency 
Top 6 world currencies - UTF-8
 2013-03-06 15:29:59 -08:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-03-04 21:55:29 -05:00
mark_story
7d84960b72 Remove appending to $errors on success/failure. 
Logging boolean values offers no real value, and just balloons memory
consumption. While removing this may cause userland problems having it does as
well.

Fixes #3657
 2013-03-01 13:41:10 -05: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
mark_story
341c0d17f0 Attempt to fix failures in travisci. 
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
 2013-02-19 20:53:28 -05:00
Marc Würth
33fbace4c7 Added 'ym'- & 'y'-date validation 
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
 2013-02-15 14:35:20 +01:00
Marc Würth
af4451de7f Removed superfluous brackets in regex 
The outer brackets are just another grouping
 2013-02-14 17:24:58 +01:00
Andrei Neacsu
abe57cecd4 Inflector transliteration for S, s, T, t with comma bellow 2013-02-13 20:47:30 +02:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
mark_story
974ac44fb4 Use random iv values in rijndael. 
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
 2013-02-09 20:48:27 -05:00
mark_story
613aa19d94 Use constants instead of strings. 
Using built-in constants where possible is generally a good idea,
making code less error prone.
 2013-02-09 14:14:27 -05: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
calinseciu
d2b97f12e8 Update lib/Cake/Utility/Sanitize.php 
Correctly use the $start variable in Sanitize::escape().
 2013-02-01 18:10:24 +02:00
mark_story
4af6039107 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
 2013-01-26 21:16:26 -05:00
Majna
5250c92635 Fix Hash::sort() 'natural' type fallback on PHP < 5.4 2013-01-25 01:07:45 +01:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
AD7six
51946ff8fd Remove Security.level from core.php 
it's not used by cake, and it can confuse users familiar with 1.3
that this setting exists yet doesn't do anything in later versions
 2013-01-22 09:56:01 +01:00
mark_story
0cdef75060 Fix failing tests. 
I have no idea why the updated session test was expected to fail as the
data was written to the session.

Refs #3551
 2013-01-21 21:13:35 -05:00
mark_story
75495705a6 Fix Hash::get($data, '0') 
Fixes #3555
 2013-01-21 20:50:46 -05:00
Renan Gonçalves
76fe9f8787 Fixing the way to follow redirects when fetching XML files. 
See: 689745d705
 2013-01-18 12:27:43 +01:00
mark_story
689745d705 Follow redirects when fetching XML files. 
Previously file_get_contents followed redirects, restore that behavior.
See fb275c5fa2
 2013-01-17 09:51:47 -05:00
mark_story
ad0d6644c4 Partially revert default niceShortFormat 
In 9fa531d6e3 the default niceShortFormat
was changed, which has been interpreted as a regression in #3533.

This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.

Refs #3533
 2013-01-14 21:12:11 -05:00
dogmatic69
bcb3eb89dc Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string 
version while doing calculations will normally end up as floats.

This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.

	Number::currency(0.00, 'GBP') -> &#163;0.00
	Number::currency('0.00', 'GBP') -> 0p

Both versions will return `&#163;0.00` (or whatever 0 is configured to return).
 2013-01-11 17:00:06 +00:00
mark_story
7008b812be Fix string '0' not being exported correctly. 
Fixes #3518
 2013-01-09 23:04:58 -05:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
Marco Tisi
8af76a5662 Closes ticket #3080 in CakePHP Lighthouse (http://cakephp.lighthouseapp.com/projects/42648/tickets/3080-hashflatten-endless-loop-on-single-0-int-keys). 
Hash::flatten has a bug which causes an endless loop when try to flatten an integer key.
Probably the $data array pointer won't reset itself when doing:

$data = $element

and

list($data, $path) = array_pop($stack)

The solution is to reset the pointer after the assignments.
 2013-01-08 11:49:52 +01:00
and-ers
c72c612625 Replaced simple and therefore pointless array_push function references with the ordinary way of adding an array element. This will increase the performance and the code looks much cleaner this way IMHO 2013-01-02 23:47:27 +01:00
Graham Weldon
a9293aa385 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
 2012-12-27 22:42:18 +09:00
Graham Weldon
604898ad0b Added check for HHVM in Debugger, 2012-12-27 22:38:43 +09:00
Mark Story
79c6cbd929 Merge pull request #1048 from dereuromark/2.3-inflection 
cookie is not uninflected but irregular
 2012-12-25 08:30:21 -08:00
euromark
500a9805b7 cookie is not uninflected but irregular 2012-12-25 00:21:12 +01:00
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678 Merge pull request #961 from dereuromark/2.3-unify-object-collection 
2.3 unify object collection
 2012-12-22 14:24:26 -08:00
ADmad
a340c19c08 Added support for php.ini style values 2012-12-23 02:25:59 +05:30
mark_story
554d5794ce Merge branch 'master' into 2.3 2012-12-19 21:18:52 -05:00
mark_story
f326058a6d Update docs for Hash::apply() 2012-12-16 23:03:43 -05:00
dogmatic69
2266292594 fixing bug in Hash where array is not similar to the path required 2012-12-14 22:45:52 +00:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
 2012-12-13 20:20:42 -05:00
mark_story
1e49be3472 Fix stack traces not being highlighted correctly. 
Fixes #3439
 2012-12-08 20:48:45 -05:00
mark_story
8b0a7ee13d Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2012-12-07 20:53:10 -05:00
mark_story
6cf6903982 Fix incorrect argument order. 2012-12-07 14:40:27 -05:00
dogmatic69
85de93a4a7 fixing issue where merge is renumbering array keys 2012-12-07 01:26:14 +00:00
Jose Lorenzo Rodriguez
0f5fa290ed Merge remote-tracking branch 'origin/master' into 2.3 2012-12-01 23:19:53 +01:00
mark_story
479aefc438 Update TLD validation to accept gTLD variations 
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.

Fixes #3414
 2012-11-30 22:11:57 -05:00
mark_story
889c1ebc09 Fix sorting empty data with Hash & Set. 
Fixes #3420
 2012-11-30 13:05:14 -05:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
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
4611c987db Merge pull request #959 from ceeram/phpcsw 
Make phpcs pass
 2012-11-19 15:10:47 -08:00
mark_story
fb275c5fa2 Fix warnings from file_get_contents() in Xml::build() 
Use HttpSocket to get proper exceptions when trying to load XML from
remote servers.

Fixes #3379
 2012-11-19 14:46:45 -05:00
mark_story
6b4afb989e Fix Set::merge() failing to merge correctly. 
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.

Fixes #3384
 2012-11-19 14:03:03 -05:00
euromark
83b0c5042f correct the doc block 2012-11-16 23:32:56 +01:00
euromark
94f19ef4b8 deprecate attached() 2012-11-16 12:19:23 +01:00
euromark
8acdb129b2 unify object load/unload and loaded methods 2012-11-16 12:14:28 +01:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
Heath Nail
895fcac0cd Improve Blowfish Docblocks 2012-11-12 14:36:43 -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
mark_story
8b7b139353 Fix failing tests using chr(226) instead of unicode codes. 2012-11-09 22:32:29 -05:00
Alexander Hofbauer
c7fda5674e Use bytcode sequence for unicode ellipsis 
The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
 2012-11-09 09:38:28 +01:00
mark_story
ec3e85e31d Update docs for the escape option in CakeNumber::currency() 
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
 2012-11-08 22:20:17 -05:00
mark_story
fe4f9f246a Update docs for the escape option in CakeNumber::currency() 
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
 2012-11-08 22:19:51 -05:00
Ber Clausen
8b2b077119 Set::flatten() fails to generate keys when 'tip' value is an empty 
array.
 2012-11-02 19:23:55 -03:00
mark_story
60f9626838 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
 2012-11-02 16:52:51 -04:00
Schlaefer
dfe54e90d6 removed Inflictor::slug()replacement from Ä to A 
The slug replacement for Ä -> A is not necessary, because the better
replacement Ä -> Ae is already defined and also covered by the test case.
 2012-11-01 15:47:50 +01:00
Ceeram
0196c6f686 code optimizing and simplify _crypt(), see PR #853 2012-11-01 14:15:52 +01:00
euromark
0f978195d6 coding standards regarding whitespaces 2012-10-27 00:46:12 +02:00
Ceeram
f4f4aa4a2a Squashed commit of the following: 
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
 2012-10-26 19:32:39 +02:00
mark_story
c4b9fa6c7a Fix failing tests. 2012-10-24 21:00:56 -04: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
ADmad
1763f46340 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/bootstrap.php
 2012-10-23 16:53:01 +05:30
Jose Lorenzo Rodriguez
9dc3b243ac Correct inflection rules for cookies, fixes fixes #3291 2012-10-22 23:07:42 +02:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments 
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
 2012-10-15 18:19:37 -06:00
mark_story
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
2232c7e15d Update doc blocks to reflect reality. 
Closes #3263
 2012-10-08 10:58:53 -04: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
mark_story
e5503326ac Fix coding standard error. 2012-09-27 21:44:19 -04:00
mark_story
8bbb1f166c Revert "Attempting to get passing builds on travisci" 
This reverts commit 61d6f716bc.
 2012-09-26 21:58:14 -04:00
mark_story
61d6f716bc Attempting to get passing builds on travisci 
Currently the 5.2 builds fail due to the length checks on blowfish
hashes.  Try a shorter wall to see if those builds will pass.
 2012-09-26 21:48:05 -04: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
Jose Lorenzo Rodriguez
6818d69fc3 Fixed issue in CakeTime that it would apply userOffset twice when using 
the format() function
 2012-09-25 15:23:46 +02:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta 
adding CakeNumber::formatDelta() and fixing issue with format()
 2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7 adding a plugin propery to models wwith tests for ticket #85 
Merge pull request #696
 2012-09-20 21:31:31 -04:00
euromark
8a070ca3dd doc block 2012-09-20 01:45:05 +02:00
euromark
3fa6b96ad0 adding CakeNumber::formatDelta() and fixing issue with near-zero values and format() 2012-09-20 01:41:41 +02:00
mark_story
99cbd22969 Fix coding standards. 2012-09-18 14:52:46 -04:00
Ceeram
ff676b5ea4 allow for lowercase as well, also strip the unit part off before pow() 2012-09-18 17:15:33 +02:00
Ceeram
90c32add9c opmitisation of fromReadableSize 2012-09-18 09:34:05 +02:00
Mark Story
07c5102de5 Merge pull request #850 from ceeram/2.2-filesize 
Add CakeNumber::fromReadableSize() and Validation::filesize()
 2012-09-17 17:55:23 -07:00
Ceeram
9530e68ae6 add default return value as parameter to use when size can not be determined 2012-09-17 13:21:50 +02:00
dogmatic69
aa87791432 replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01: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
Mark Story
5081be171f Merge pull request #821 from dereuromark/2.3-folder-merge 
allow Folder to merge recursivly and add scheme option
 2012-09-13 18:00:02 -07:00
mark_story
921c2c67ab Fix strict error in 5.4 2012-09-13 20:59:17 -04:00
mark_story
ec54fa57c5 Merge branch 'simplify-cake-time' into 2.3 
Conflicts:
	lib/Cake/Utility/CakeTime.php
 2012-09-13 20:45:59 -04:00
Mark Story
31ca237709 Merge pull request #831 from dogmatic69/sanitize-regex-cleanup 
adjusting the way the regex is done so its easier to read
 2012-09-13 14:41:36 -07:00
Mark Story
0f8262ec45 Merge pull request #833 from dogmatic69/simplify-class-registry 
Simplify the ClassRegistry by removing else, and adding early returns
 2012-09-13 14:39:37 -07:00
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