Kyle Robinson Young
c34bf673d5
Remove extra space in HtmlHelper radio tag
2011-12-18 09:40:23 -08:00
Fitorec
e7c913acba
Fix unreachable code in Model mergeVars
...
Squashed commit of the following:
commit c8326460a422ad6cdca5afa4dd0dee
2011-12-18 10:38:17 -05:00
ADmad
1358af783b
Added test case for TreeBehavior::recover(). Refs #2392
2011-12-18 15:23:49 +05:30
ADmad
248a2d3f26
Adding missing Model::create() when using Model::save() in a loop. Fixing some code formatting. Fixes #848
2011-12-18 03:55:14 +05:30
mark_story
e05d7d1791
Make dispatcher::cached() use here()
...
This allows separate cache files to be created
for different query parameters.
Fixes #2381
2011-12-17 12:19:34 -05:00
mark_story
a71b0f9867
Adding test for CacheHelper.
...
Refs #2381
2011-12-17 12:09:50 -05:00
mark_story
78325a13b9
Remove un-used variable.
...
Fixes #2382
2011-12-16 23:02:27 -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
mark_story
f1b566b88e
Fix failing tests.
...
Remove duplicated test.
2011-12-15 23:45:13 -05:00
mark_story
321caf6db6
Fix incorrect value being stored in Auth.redirect.
...
An incorrect value would be stored in Auth.redirect when
a custom route with the `pass` key set.
Fixes #2366
2011-12-15 22:56:39 -05:00
Mark Story
4ed2185876
Merge pull request #379 from shama/patch-code-formatting
...
Patch code formatting
2011-12-15 05:44:17 -08:00
Kyle Robinson Young
54ed278284
Code formatting
2011-12-14 22:54:03 -08:00
Kyle Robinson Young
b3396538b7
Add debug flag to flush output
2011-12-14 22:48:41 -08:00
euromark
9d6ea57c30
Fix missing App::uses() added
...
Fixes #2374
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-14 08:08:35 -05:00
Mark Story
102b96f25c
Merge pull request #377 from shama/2.0
...
Fix typo on TranslateBehavior error message
2011-12-14 05:04:00 -08:00
Kyle Robinson Young
e6e0027ec7
Fix typo on TranslateBehavior error message
2011-12-13 22:28:55 -08:00
Kyle Robinson Young
060e225b76
Add test for Model::getID(), simplify return and remove dated @see link
2011-12-13 22:19:50 -08:00
Graham Weldon
d83115927d
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-12-14 16:04:40 +11:00
mark_story
b61e3e0378
Fix lies in Shell::createFile()
...
It could lie if the file was not writable.
Fixes #2371
2011-12-13 21:59:58 -05:00
mark_story
8d1edd72f2
Moving tests and un-skipping them.
...
Adding tests for proper field quoting in conditions.
Closes #2369
2011-12-13 21:26:03 -05:00
mark_story
dd335cb183
Fix error in FixtureTask
...
The options are always set, use empty() instead.
Fixes #2373
2011-12-13 20:40:30 -05:00
Kyle Robinson Young
5110b976f8
Update api link to 2.0 on default home page
2011-12-13 04:47:08 -08:00
Kyle Robinson Young
b46c4b3e3f
Correcting assertEquals parameter order
2011-12-12 20:35:31 -08:00
mark_story
645ef47878
Fix multiple date formats in Validation::date()
...
Fixes #2364
2011-12-12 20:21:10 -05:00
Kyle Robinson Young
096ff76295
Fix overreaching Inflector when ControllerTestCase autoMocks
2011-12-12 10:29:33 -08:00
mark_story
8bb6f8803c
Fix infinite loop when minYear/maxYear are not int.
...
Refs #2361
2011-12-11 22:11:14 -05:00
mark_story
205bfb506f
Add Shell::$plugin and update getOptionParser()
...
Adding a plugin property allows the correct
usage/help information to be generated.
Fixes #2359
2011-12-10 21:31:21 -05:00
José Lorenzo Rodríguez
47b2f3e70c
Merge pull request #371 from shama/patch-caketestsuite
...
Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile
2011-12-10 10:57:08 -08:00
Kyle Robinson Young
17fcd0534f
Fix spacing for coding standards
2011-12-10 09:06:59 -08:00
Jose Lorenzo Rodriguez
cf03b33a0d
Properly using sort() before asserting values, asserting the result of sort() is cheating :P
2011-12-10 10:38:24 -04:30
Ceeram
1eb55bc201
ensure test pass when files are returned in different order
2011-12-10 14:26:14 +01:00
José Lorenzo Rodríguez
039e041665
Merge pull request #370 from shama/patch-foldertree-test
...
Add test case for Folder::tree with hidden files
2011-12-10 00:45:45 -08:00
Kyle Robinson Young
7fa1984a43
Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile
2011-12-09 23:27:17 -08:00
Kyle Robinson Young
97fbcd1079
Add test case for Folder::tree with hidden files
2011-12-09 21:44:15 -08:00
mark_story
c3f17c24f3
Fix issue with duplicate prefixes.
...
Postgres::truncate() was double prefixing
table names.
Fixes #2355
2011-12-09 21:14:57 -05:00
ADmad
f367249bdb
Fixing visibility keyword for constructor
2011-12-09 14:08:20 +05:30
mark_story
b7f6645cec
Fix issue with url parsing and /?
...
PHP's parse_url fails to parse url's containing
`/?`. It returns false instead of something useful.
Fixes #2354
2011-12-08 21:48:40 -05:00
mark_story
bbd6e22e26
Add test for FormHelper::select() + 0
...
Closes #2352
2011-12-08 20:15:54 -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
ADmad
df097796c4
Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer()
2011-12-08 14:03:39 +05:30
Jose Lorenzo Rodriguez
73aeb6ba62
Lazy-loading the $tablePrefix property in models, Fixes #2277
2011-12-08 00:10:22 -04:30
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
3974ea87d8
Move Route docblocks to make text available in the API
2011-12-07 00:03:11 -08:00
Fitorec
c8326460a4
add a space after the comma in the $merge array
2011-12-06 18:04:11 -06:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
euromark
be770bd9b8
Typo fix in HttpSocket
...
`schema` should be `scheme`, this fixes the only use of
schema in HttpSocket.
Fixes #2345
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-06 21:07:12 -05:00
mark_story
495b7f279f
Adding test for #2345
2011-12-06 21:06:45 -05:00
mark_story
e7a7e57ba6
Fix bare require() to use App::uses()
...
Fixes #2346
2011-12-06 20:09:05 -05:00
Mark Story
a44c4aa291
Merge pull request #359 from shama/patch-texthelper
...
Fix TextHelper excerpt method to work as documented
2011-12-06 09:37:09 -08:00
euromark
f9d12563a3
Translation fix
...
Fixes #2340
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-06 12:33:47 -05:00
Fitorec
22ad6cdca5
removing the condition and adding actsAs to the default list of merged keys.
2011-12-06 03:31:54 -06:00
Kyle Robinson Young
7f22fcdbf5
Fix TextHelper excerpt method to work as documented
...
Fixes #2339
2011-12-05 12:12:09 -08:00
Mark Story
ba81754a1a
Merge pull request #352 from shama/patch-cakeschema-test-fix
...
CakeSchemaTest: Skip testSchemaReadWithConfigPrefix test if an existing prefix has been set
2011-12-05 11:46:47 -08:00
Mark Story
a32eabe492
Merge pull request #355 from shama/patch-casing
...
Consistently setting setUp() and tearDown() on test cases
2011-12-05 11:44:15 -08:00
Fitorec
afa4dd0dee
Solving the small defect in the array of behaviors(actsAs)
2011-12-05 12:10:32 -06:00
Ceeram
3b8990ffca
Fix other failing test by 1 second difference
2011-12-05 17:13:22 +01:00
Ceeram
09a623e07b
Fix failing tests by 1 second difference
2011-12-05 17:11:41 +01:00
Ceeram
e4e26a852b
Making non-interactive behave same as interactive with odd table names
2011-12-05 17:00:48 +01:00
ADmad
a062135d87
Merge pull request #354 from shama/patch-databasesession-test-fix
...
Fix DatabaseSessionTest garbage collection test case
2011-12-05 06:00:59 -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
66b3e9a7c9
Fix DatabaseSessionTest garbage collection test case
2011-12-04 13:04:42 -08:00
Kyle Robinson Young
8e70f4ac12
Fix CakeSession testCheckKeyWithSpaces and testUsingPluginHandler test cases
2011-12-04 12:43:27 -08:00
Kyle Robinson Young
42583ff6a5
Skip testSchemaReadWithConfigPrefix test if an existing prefix has already been set
2011-12-04 12:10:01 -08:00
mark_story
1bc3583133
Add usage to HttpSocket::configAuth()
...
Fixes #2336
2011-12-04 13:45:53 -05:00
mark_story
71b41ed91c
Unskip some tests.
2011-12-03 15:00:06 -05:00
mark_story
457dd73ed0
Move viewVars assignment after callbacks.
...
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.
Fixes #2335
2011-12-03 14:45:21 -05:00
mark_story
0670b96c24
Fix issue with incorrect date handling.
...
Fixes #2321
2011-12-03 14:38:55 -05:00
mark_story
22352a0227
Fix missing directory in dispatcher with rewrite off.
...
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.
Fixes #2330
2011-12-02 23:39:33 -05:00
Mark Story
d4fd1b3743
Merge pull request #348 from petteyg/apptheme
...
Make TemplateTask prioritize App templates over Core templates
2011-12-02 17:28:01 -08:00
Kyle Robinson Young
4174ddff0f
Always set ControllerTestCase::testAction result variables
2011-12-02 06:19:15 -08:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Gordon Pettey (petteyg)
a800dcbbca
Merge branch 'master' into apptheme
2011-12-02 02:29:43 +00:00
mark_story
0f71254fe1
Fix double inflection in bake all <foo>
...
ViewTask re-pluralizes the model name. Sometimes this leads to
things like Menuses which is totally wrong.
Fixes #2318
2011-12-01 20:41:17 -05:00
mark_story
8b3c72f7c1
Fix issue with nested named parameters.
...
Nested named parameters were not being correctly flattened.
Fixes #2329
2011-12-01 20:32:28 -05:00
mark_story
79d6a850ad
Fix theme files with spaces in them.
...
Fixes #2324
2011-12-01 18:16:01 -05:00
Ceeram
faddfbe2d0
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-12-01 20:30:45 +01:00
Ceeram
0a1772c929
adding default name, for dbs that dont expose a PK
2011-12-01 20:30:36 +01:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
49708ec837
Fix cachefiles being generated with "
...
Cache files with SQLite should not contain "
Fixes #2323
2011-11-30 21:56:25 -05:00
mark_story
65b87af6c0
Adding set to autoloader.
...
Fixes #2319
2011-11-30 21:14:39 -05:00
mark_story
4b292b139e
Fix build, I'm a dork.
2011-11-30 21:00:07 -05:00
ADmad
166e03e7de
Merge pull request #344 from majna/2.0-controller-template
...
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 11:18:52 -08:00
Majna
87a3937def
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 20:06:07 +01:00
Ceeram
b5c4b85601
Fixing cascading delete, when using foreignKey false and setting condition on hasOne.
2011-11-30 20:02:36 +01:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Kyle Robinson Young
1d50562931
Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers
2011-11-29 21:23:02 -08:00
mark_story
7f68699fcd
Fix return values in Cache.
...
The documentation indicates that false/or the value will be returnned.
Using both null and false to indicate failure is confusing. Use only
false to indicate failure. It might be better in the future to use
exceptions for trying to read/write on missing cache configs.
2011-11-29 23:17:17 -05:00
mark_story
992a1554e1
Fix incorrect alias/name usage.
...
Fixes #2317
2011-11-29 20:44:30 -05:00
Renan Gonçalves
8568ac6613
Trying to take into account the number of days in a month.
2011-11-30 01:14:39 +01:00
Graham Weldon
af2e7c1e9b
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-29 23:00:47 +11:00
ADmad
c653d8361f
Merge pull request #341 from andraskende/master
...
removing $i as its no longer being used here.
2011-11-28 23:59:39 -08:00
Andras Kende
4f64a9f6cd
removing $i as its no longer being used here. (probably was used before on zebra striping.)
2011-11-28 23:33:55 -06:00
Ceeram
57a1a2814d
Fixing modeltask to use correct table
...
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
Jose Lorenzo Rodriguez
1668067740
Releasing 2.0.4
2011-11-28 11:20:58 -04:30
teddyzeenny
803e7be363
Apply base64 encoding after helper serialization
2011-11-28 14:02:39 +02:00
teddyzeenny
a4aaaff53a
Escape single quotes after Helper serialization
2011-11-28 13:15:23 +02:00
Jose Lorenzo Rodriguez
8f1125ed4d
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-28 00:54:16 -04:30
Jose Lorenzo Rodriguez
f6534d2962
Fixing issue where changing the case for an action in the url would allow the action in the AuthComponent making it accessible to not-logged in users
2011-11-28 00:52:47 -04:30
mark_story
390db7beba
Fix issue with dots in request URLs.
...
Dots in request url's often resulted in an additional get parameter
being added.
Fixes #2303
2011-11-26 21:24:53 -05:00
Kyle Robinson Young
1d843f84b9
Add @link to global functions
2011-11-26 14:42:37 -08:00
m
fb3d3ca943
Add test for XML.
...
Test xml with multiple model results
Fixes #2304
2011-11-26 14:43:19 -05:00
Christian Hieke
a51626840e
Escape special characters in XML.
...
Fixes #2188 .
2011-11-25 21:20:26 -05:00
mark_story
54aef7216f
Add failing test for #2188
2011-11-25 21:19:31 -05:00
ADmad
73674c648c
Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278
2011-11-26 02:48:49 +05:30
Jose Lorenzo Rodriguez
2bffd4c26d
Preventing memory leak in PDO when retrieving results from the driver, fixes #2293
2011-11-25 13:36:14 -04:30
mark_story
5180540d1f
Fix protocol relative urls for CSS and JS files.
...
Protocol relative urls are generally not on the same host
don't try and run them through the asset filters.
Fixes #2285
2011-11-24 21:04:57 -05:00
Ceeram
179a5c8559
remove order, which was required with setting default order on CakeTestModel
2011-11-24 22:20:29 +01:00
Ceeram
c12c853f10
moving order for finds from constructor to beforeFind
2011-11-24 22:12:39 +01:00
mark_story
2969a8f6ac
Make a few more tests run in AllTests.
2011-11-23 21:30:28 -05:00
mark_story
4103fe14a2
Fix double / issue in ExtractTask
...
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.
Fixes #2284
2011-11-23 21:03:24 -05:00
mark_story
07462f0bef
Fix nested name attributes for submit()
...
Nested name attributes and Security component did not co-operate.
Fixes #2271
2011-11-23 20:40:25 -05:00
Renan Gonçalves aka renan.saddam
0cd45d4711
Merge pull request #329 from shama/patch-doc
...
Add @link to CookieComponent docblocks
2011-11-23 00:58:21 -08:00
Kyle Robinson Young
bc0e0b5c05
Add @link to CookieComponent docblocks
2011-11-22 22:32:13 -08:00
Ceeram
07d1621bc5
fixing CakeTestModel constructor of previous commit, cleaning up after schema() call
2011-11-23 01:32:27 +01:00
Ceeram
05940ae1ec
adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified
2011-11-22 21:50:17 +01:00
Ceeram
f57c287c43
fixing test to ensure tests dont fail on 1 second timestamp diff
2011-11-22 17:21:00 +01:00
Ceeram
7d6637f55b
ensure test doesnt fail by 1 second diff in timestamp
2011-11-22 10:57:36 +01:00
Kyle Robinson Young
bb51b0f497
Add @link to Shell docblocks
2011-11-21 21:33:07 -08:00
ADmad
0e6697dbc6
Skipping failing test when run through web browser.
2011-11-22 02:00:58 +05:30
Mark Story
340d112693
Merge pull request #327 from bigclick/patch-1
...
Fix for when trying to use "Console/cake schema generate snapshot"
2011-11-21 07:20:07 -08:00
mark_story
ceaf6871e0
Fix import.
2011-11-21 10:18:12 -05:00
mark_story
6d6ac10834
Fix failing tests caused by previous commit.
2011-11-20 23:00:58 -05:00
m
58a2ee064c
CakeSchema updated for 2.0
...
Converting var to public.
Fixes #2276
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-20 22:44:52 -05:00
bigclick
037f2c016e
preg_quote'd $fileName to avoid issues when using a special character in their schema filename
2011-11-21 13:19:57 +11:00
bigclick
7a68f7fed1
Fix for when trying to use "Console/cake schema generate snapshot" command, line 67 was making the name param snapshot, also fixed auto numbering in the case where the filename wasn't "schema"
2011-11-21 11:43:51 +11:00
José Lorenzo Rodríguez
02efc24b12
Merge pull request #325 from ProLoser/patch-5
...
Unecessary if statement in basics.php config()
2011-11-19 17:39:15 -08:00
mark_story
3e2f8ddf98
CakeException subclasses render correctly now.
...
CakeException subclasses without their own view files, would trigger
a MissingViewException, which would result in no application helpers
being used. This could cause issues when app helpers are used
in the layout.
Instead a error500 template is rendered using app helpers.
Fixes #2274 , fixes #2004
2011-11-19 20:25:20 -05:00
Dean Sofer
e6c49766c7
Unnecessary if statement. The else clause covers all necessary scenarios
2011-11-19 17:08:46 -08:00
mark_story
95b85118c7
Fix issue with button() and nested name attributes.
...
Buttons with nested name attributes were not properly unlocked
and caused SecurityComponent to black hole the request.
Fixes #2271
2011-11-19 11:43:09 -05:00
mark_story
f36c43bfe4
Add protected to method picked from 1.3
2011-11-19 11:37:37 -05:00
mark_story
c8ab4ad05b
Fix issue in TimeHelper with translated values.
...
LC_TIME files using unicode code points would incorrectly display.
Use either the Multibyte class or mbstring to correctly detect
and convert values.
Fixes #912
Conflicts:
lib/Cake/View/Helper/TimeHelper.php
2011-11-19 10:12:05 -05:00
m
2957a33b23
assertEqual to assertEquals in core test files
...
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-19 09:25:03 -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
Gordon Pettey (petteyg)
99e6072fd3
Make App::path('Console') overwrite App::core('Console') for themes
2011-11-18 05:00:45 +00:00
mark_story
cb49b242ae
Fix issue in Router with prefixes.
...
Prefixes should not be interpreted as named parameters.
Fixes #2269
2011-11-17 20:30:34 -05:00
Ceeram
0f299a1542
use old timestamp variable, to ensure test to pass
2011-11-17 13:09:03 +01:00
mark_story
92aea9de88
Update comment.
2011-11-16 23:17:48 -05:00
mark_story
2f599e8a2a
Removing extra new lines.
...
Removing extra new lines and duplicated tests.
2011-11-16 21:51:49 -05:00
Kyle Robinson Young
99793fd654
Test case compatibility skipUnless() to markTestSkipped()
2011-11-16 21:07:09 -05:00
Kyle Robinson Young
c97dca1570
Test case compatibility assertIsA() to assertInstanceOf()
2011-11-16 21:07:08 -05:00
Kyle Robinson Young
98f03dc6df
Replacing test case compatibility functions
2011-11-16 21:07:08 -05:00
Mark Story
2c5350bb4b
Merge pull request #297 from markomarkovic/73429b357f06cd76f35d81482dd789b1737fe2b9
...
Fixed inconsistent debug parameters and empty '(line )'
2011-11-16 17:56:05 -08:00
mark_story
8981f49bd5
Add stricter validation to TestTask.
...
Empty classnames, and classnames without the correct type suffix
are no longer accepted. They did the wrong thing anyways.
Fixes #2267
2011-11-16 20:38:31 -05:00
mark_story
9c5ad71abc
Add CakeRequest::__isset()
...
Fixes #2266
2011-11-16 20:21:07 -05:00
Ceeram
e5c8a446d6
Add sorting on joined model virtual field, fixes #2250
2011-11-17 00:18:12 +01:00
Ceeram
3cb5188b2d
Fix failing test, moving timestamp define before the save to ensure it cannot be off by a second
2011-11-16 13:16:36 +01:00
Ceeram
025133db32
Fix tests which might fail due to unexpected order on finds
2011-11-16 13:15:14 +01:00
ADmad
8450b8bbc4
Fixing TMP cleanup code in FolderTest
2011-11-16 14:03:18 +05:30
