Commit graph

116 commits

Author SHA1 Message Date
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
renan.saddam
7116c01642 Fixing Xml::toArray() when blank nodes are provided. Fixes #87. 2009-09-22 17:58:12 -03:00
renan.saddam
42fac9ec71 Fixing Xml::toArray() when blank nodes are provided. Fixes #87. 2009-09-22 17:47:11 -03:00
renan.saddam
317049b736 Fixing bug when value is '0', it was generating a blank node. 2009-09-17 23:08:32 -03:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
mark_story
5a971ddbf0 Fixing Xml::toArray() Where camelcased data was collapsed and corrupted. Causing unpredictable data structures with empty tags. Minor changes to existing behavior. See modified test cases. Fixes #8 2009-08-13 22:47:17 -04:00
mark_story
ab50bbe595 Cleaning up doc blocks.
Removing commented out code.
Removing use of a()
2009-08-13 21:29:33 -04:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
gwoo
9e1dec3ff3 fixes #6538, xml serialization on multi dimensional
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8264 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 01:50:14 +00:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
975e4452d2 Fixing Xml parsing where multiple child elements of the same name, with no value are collapsed causing data errors when Xml object was converted to an array. Test cases from 'burzum' added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8209 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 18:58:05 +00:00
mark_story
fd7cf5e5e6 Adding test cases for boolean and boolean-ish values. Fixes false being converted to '' when using Xml::toString().
Fixes #6478

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8206 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 01:14:20 +00:00
nate
9f15226e46 Fixes #6318: Incorrect whitespace handling/parsing of XML documents
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8158 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 13:23:37 +00:00
davidpersson
bbfee7ba17 Updating Xml class to always use #document as the very root node and to create a node below it if the root option is set.
Adding test. 
Fixes #6294

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8147 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-17 13:26:07 +00:00
nate
92cc331341 Updating docblocks and code formatting in XML classes, adding test change to previous commit.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8089 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 04:09:35 +00:00
phpnut
92e04703b7 Adding ability to turn off Camel Casing of nodes in Xml::toArray();
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7894 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-26 18:21:21 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
nate
34c5f74300 Changing handling of numeric node values in Xml class, fixes #5520
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7700 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-04 19:50:38 +00:00
mark_story
0f9a4e0470 Optimizing in_array() checks to isset().
No more in_array($a, array_keys($b)) patterns exist.
Closes #5161

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7624 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:40:28 +00:00
gwoo
06ee84a128 fixes #5429, Xml::toString() quotes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7607 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-15 11:50:51 +00:00
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
TommyO
5014b9d330 Found bug where mulitple instances of mulitple nodes within the same parent node caused conflicts in toArray(). Added test and fix.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7557 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-05 17:20:18 +00:00
gwoo
2a84ec9944 fixes #5384, Xml::toArray()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7555 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 15:34:08 +00:00
mark_story
7e039ee62d Adding additional tests to XML.
Added XML group, updated RssHelper and XmlHelper tests to not cause issue when run as part of a group.  
Updated assertions on helper test.  
Fixed broken methods in XML

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7514 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 23:15:48 +00:00
gwoo
59efe5c445 fixes #5209, appending node in Xml. Adds more test coverage form Xml class and adds removeNamespace for convenience.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7505 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 01:18:15 +00:00
gwoo
fb3eb24a0d fix for xml::toArray to allow any node to use it
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7450 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-10 16:26:43 +00:00
nate
0119c0d46f Fixing HTML entity escaping in helpers, fixing broken XmlHelper test, all helper tests now passing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7403 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 04:53:16 +00:00
gwoo
b0d2451a97 removing optional instantiation of Set class. Adding toArray() to xml class and calling it from Set::reverse(); updated test cases.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7398 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 23:50:32 +00:00
gwoo
38bbfb66ce fixes #4976, escape chars in attributes of xml tags
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7253 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 01:38:40 +00:00
gwoo
42db64bbb3 fixes #4778, rss helper addNs, closes #4949 xml helper serialize with test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7227 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-21 15:23:58 +00:00
TommyO
eaf4dc9ff5 Rework of Xml class to better handle namespaces. closes #4760
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7107 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 18:41:04 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
DarkAngelBGE
88a2f0936e fixes #4559
bringing xmlhelper to 100% code coverage
fixing small bugs in XmlHelper::__parseContent

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6838 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 07:56:33 +00:00
nate
017c07c7bf Fixing case of Xml class references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6652 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-10 19:43:06 +00:00
gwoo
afedfae4bf fixes #4260, removed php5 syntax in xml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6504 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-03 16:55:36 +00:00
john
18dc1fd456 Undefined var in parse() method causing problems. Original author most likely meant $attr.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6463 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-15 20:47:44 +00:00
nate
14523dc8c4 Fixing XML class references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6450 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-11 02:24:10 +00:00
nate
acfc38e57d Fixing XML support in Model and Set classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6427 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-02 20:45:37 +00:00
gwoo
6e537beb73 fix typo in xml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6424 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-01 09:32:01 +00:00
nate
5fcf4c7bb3 Clean-up from XML commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6423 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-01 05:00:44 +00:00
nate
172d355e05 Adding namespace support to XML class, as well as XML generation options, entity conversion, whitespace output support, node filtering, I could go on. Props to Mike O'Toole. Fixes #3476
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6422 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-01 04:53:09 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
f9c1058a20 "Closes #3295, Centralize encoding / charset setting in one Configure setting"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6253 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 09:08:36 +00:00
gwoo
194ab8364a updating XML class, fixes #3696
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6194 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-22 05:09:28 +00:00
nate
c128439fef Updating XML class to use _name_ in place of __identity__ for Set object conversions (Ticket #3696)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6192 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-22 04:46:00 +00:00
phpnut
8a2b51c3ec "Removing all shortcut function usage from the core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440 Correcting @return int
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
nate
3e7044d4b8 Implementing prefix-based routing, and transitioning configuration away from global constants
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5531 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-16 05:44:06 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
mariano.iglesias
c9cd07139c Adding documentation for Socket, Validation and Xml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5201 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-26 19:33:55 +00:00
nate
033ced9d7a Changing order of XML class defs (Ticket #2572)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5098 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-14 14:58:52 +00:00
nate
709e257707 Fixing null child reference issue in XML
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4461 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-06 17:19:11 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
gwoo
9b659da949 1.2: changing some names in Xml class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3804 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 19:20:50 +00:00
nate
b002cd0ec3 Updating method names in XML and XMLNode
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3803 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 18:08:21 +00:00
nate
5a170cc2da Fixing XML header generator, and adding ability to build XML from objects or model results arrays
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3605 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-08 14:30:28 +00:00
nate
4de9ca6a6c Fixing code formatting of XML and XMLNode classes, and fixing XMLNode constructor
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3415 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-20 22:20:44 +00:00
nate
3a738d1521 Adding new XML class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3095 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 23:04:23 +00:00