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
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
Ceeram
3a18384929
fix failing testcase
2012-05-03 10:13:18 +02:00
mark_story
1b288b74d9
Merge branch '2.2-configure' into 2.2
2012-05-02 21:21:43 -04:00
mark_story
b57489f3f1
Remove duplicate template.
...
Also remove double creating the home.ctp file.
Fixes #2842
2012-05-02 20:54:50 -04:00
ADmad
49f8e73ab3
Allow bulk storing/updating of mime types. Closes #2844
2012-05-03 01:39:12 +05:30
mark_story
e18200ad87
Fix assertion.
2012-05-01 21:45:06 -04:00
mark_story
e7153b5333
Add more tests
...
Fix an issue in IniReader and add tests
to ensure that dumped files can be re-read.
2012-05-01 21:43:01 -04:00
mark_story
7c4b7a2cbe
Fix mistake in path.
...
Remove incorrectly added file.
2012-05-01 21:06:24 -04:00
mark_story
d43e0aa0db
Update dump() to allow partial dumps.
2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f
Make the configure adapters responsible for persistence.
...
Each adapter should be handling persistence. This allows
different adapters to handle saving config files in different ways
or places.
2012-05-01 21:00:41 -04:00
mark_story
9f37277dab
Add Configure::dump().
2012-05-01 21:00:41 -04:00
mark_story
578dac9259
Add dump() to PhpReader.
2012-05-01 21:00:41 -04:00
mark_story
c703a633bd
Add dump() method to IniReader.
2012-05-01 21:00:41 -04:00
Rachman Chavik
e7fa2a526f
remove whitespace at eol
2012-05-01 21:35:48 +07:00
mark_story
128c719bd0
Add no-op method to base class.
...
Fixes #2839
2012-04-30 20:52:17 -04:00
mark_story
004bc5b6e7
Fix overwriting of GET/POST
...
ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.
Fixes #2841
2012-04-30 20:36:19 -04:00
Graham Weldon
c77c6f3b57
Removed unncessary line to fix coding standards
2012-05-01 09:51:22 +10:00
Jose Lorenzo Rodriguez
7fd19551db
Update version number to 2.1.2
2012-04-29 21:07:12 -04:30
Jose Lorenzo Rodriguez
f14f18f0d7
Update version number to 2.2.0-beta
2012-04-29 21:03:38 -04:30
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
mark_story
f6b33db02c
Add test for accept header.
...
Refs #2828
2012-04-29 14:48:45 -04:00
AD7six
9444af2f81
classify the first cli argument for this task
...
the $type is used to lookup in the $classTypes property what kind of
entity is being baked. if it's underscored, getRealClassName will bail
on it's first condition of "is it in the $classTypes property" producing
mostly useless test stubs for everything except models
2012-04-29 17:20:14 +02:00
AD7six
6a744b277e
create tests for baking a test for a component, behavior and helper
2012-04-29 17:20:14 +02:00
AD7six
6b6fdd2b84
don't dump fatal errors as html on the cli
2012-04-29 16:25:07 +02:00
José Lorenzo Rodríguez
d80b1ef7f6
Merge pull request #630 from shama/patch-typos
...
Typos in Test Cases
2012-04-27 07:42:40 -07:00
Tigran Gabrielyan
77f6d88a9e
Fixed bug in model validation translate
2012-04-26 21:24:22 -07:00
Kyle Robinson Young
eb059d3fa6
Fix typos in test cases
2012-04-26 20:14:52 -07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
mark_story
46bce1a00f
Merge branch '2.1' into 2.2
2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb
Fix space indented code.
2012-04-26 22:27:34 -04:00
Mark Story
1876b2f579
Merge pull request #627 from dereuromark/2.2-utf8-test-cases
...
2.2 utf8 test cases
2012-04-26 18:14:58 -07:00
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0
Renamed method to check if the driver supports nested transaction.
2012-04-26 20:58:25 -04:00
euromark
ba8a3c5f07
added missing utf8_encode to pass tests on windows
2012-04-27 02:39:32 +02:00
Mark Story
f150ebb9cc
Merge pull request #623 from dereuromark/2.2-bake-theme-order
...
Correct order of bake themes so app and plugin precede core ones
Fixes #2825
2012-04-26 09:43:53 -07:00
Thomas Ploch
daa695b4d3
Added NotImplementedException with status code 501
2012-04-25 15:44:48 +02:00
ADmad
061483d03e
Added missing keyword
2012-04-25 11:03:26 +05:30
Juan Basso
10a4b87979
Fixed tests with nested transaction in DboSource.
2012-04-24 22:28:47 -04:00
Juan Basso
5bec15d3e1
Added file that was missing in previous commit.
2012-04-24 21:43:43 -04:00
Juan Basso
5f722cb3d4
Update nested transaction test to use InnoDB table in MySQL.
2012-04-24 21:42:32 -04:00
Juan Basso
f6288a491a
Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications.
2012-04-24 21:42:32 -04:00
mark_story
eefb2e81fa
Fix issue where prefixes mid action would be truncated.
...
If a prefix occured mid action name it would be removed,
corrupting the action name.
Fixes #2831
2012-04-24 20:48:23 -04:00
mark_story
ef1da3146e
Fix scaffold delete messages with uuids.
...
Fixes #2826
2012-04-24 20:11:58 -04:00
mark_story
4ffca8457e
Fix coding standards.
2012-04-24 20:09:39 -04:00
Juan Basso
12392b6285
Fixed variable name.
2012-04-24 20:03:43 -04:00
Juan Basso
4e480eaca5
Disabling nested transaction for fixtures.
2012-04-24 20:01:22 -04:00
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