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 |
|
euromark
|
394bf1054d
|
remove name attribute where not necessary, clean up doc blocks
|
2013-06-08 04:29:08 +02:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
mark_story
|
cce9e84907
|
Merge branch 'master' into 2.4
|
2013-05-28 22:40:32 -04: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 |
|
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
|
041c2d289f
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Shell.php
|
2013-03-26 20:31:54 -04:00 |
|
euromark
|
3a1ff36d5e
|
correct coding standards
|
2013-03-25 13:06:38 +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 |
|
Ceeram
|
f6477d58df
|
change formatOutput option name to pretty
|
2013-03-13 15:44:59 +01:00 |
|
Ceeram
|
fc34d9fe7f
|
Add formatoutput option to Xml::fromArray
|
2013-03-13 13:07:36 +01:00 |
|
Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
Ceeram
|
16be9d4990
|
remove unused local vars
|
2013-01-23 17:22:06 +01:00 |
|
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
|
fb92bde0fe
|
Loosen exception types.
|
2012-07-14 16:18:21 -04:00 |
|
mark_story
|
22d4cb3794
|
Allow warnings for Xml entities.
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
|
2012-07-14 16:08:54 -04:00 |
|
mark_story
|
6c905411ba
|
Fix XML decoding attack via external entities.
|
2012-07-14 11:53:37 -04:00 |
|
José Lorenzo Rodríguez
|
33eb46cd87
|
Merge pull request #666 from boast/patch-1
Fixed XmlArticle and XmlUser Models associations.
|
2012-05-22 21:41:04 -07:00 |
|
David Thalmann
|
81fedbba9c
|
Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel test and does no longer try to use the 'default' datasource.
|
2012-05-23 07:19:06 +03:00 |
|
mark_story
|
4ab6d37abb
|
Update assertions.
Use assertXmlStringEqualsXmlString() it gives
better error reporting. Also update string concat
into heredocs.
|
2012-05-03 21:00:52 -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 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
Kyle Robinson Young
|
90e7afbdc7
|
Correct parameter order of assertEquals and assertNotEquals
|
2012-03-22 23:37:12 -07:00 |
|
mark_story
|
1efee89169
|
Fix most coding standards issues in Test/Case/Utility
|
2012-03-13 22:59:20 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
Kyle Robinson Young
|
4176e59e52
|
Typo fixes in tests
|
2012-02-23 15:29:53 -08:00 |
|
Kyle Robinson Young
|
5388237099
|
Consistently setting setUp() and tearDown() on test cases
|
2011-12-04 13:27:51 -08:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
Kyle Robinson Young
|
5876744709
|
Adhering to coding standards
|
2011-11-30 07:44:11 -08:00 |
|
m
|
fb3d3ca943
|
Add test for XML.
Test xml with multiple model results
Fixes #2304
|
2011-11-26 14:43:19 -05:00 |
|
mark_story
|
54aef7216f
|
Add failing test for #2188
|
2011-11-25 21:19:31 -05:00 |
|
Kyle Robinson Young
|
98f03dc6df
|
Replacing test case compatibility functions
|
2011-11-16 21:07:08 -05:00 |
|
mark_story
|
d68053c4d4
|
Fix exception expectations.
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
|
2011-11-04 22:54:08 -04:00 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Renan Gonçalves
|
438050dcaa
|
Adding 'public' visibility to all public methods.
|
2011-05-30 22:02:32 +02:00 |
|
AD7six
|
afa8f6b441
|
remove LIBS constant
libs always means the Cake lib - so use the CAKE constant
|
2011-05-15 18:29:52 +02:00 |
|
Jose Lorenzo Rodriguez
|
d24aca34f1
|
Replacing more string to match new paths
|
2011-05-13 03:31:12 -04:30 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|