Commit graph

2072 commits

Author SHA1 Message Date
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
ADmad
7339640ef2 Fixed files inside dot folder showing up even when hiding dot files/folder in Folder::tree(). Closes #2395 2011-12-22 02:55:24 +05:30
euromark
a41539dfa4 Indentation fix (tab instead of spaces)
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
c8fd7c090b Make App test cases the default.
Fixes #2372
2011-12-19 23:13:46 -05:00
mark_story
c272a8b3ca Update doc blocks. 2011-12-19 22:13:02 -05:00
mark_story
c13e6588f5 Datetime labels should point at the first input.
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.

Fixes #427
2011-12-19 22:09:46 -05:00
mark_story
866177f37d Fix issue with link generation and no title.
Fix urlencoded text from being displayed in text of links.

Fixes #2387
2011-12-19 20:49:01 -05:00
Kyle Robinson Young
5225fe2b5c Ability to set hiddenField value with FormHelper::checkbox
Fixes #1811
2011-12-18 23:34:19 -08:00
mark_story
2d68e7da1e Fix failing tests.
You can't use finfo on files that don't exist.
2011-12-18 23:26:57 -05:00
mark_story
f959fcefc4 Add File::mime()
Fixes #1051
2011-12-18 23:02:05 -05:00
Kyle Robinson Young
c34bf673d5 Remove extra space in HtmlHelper radio tag 2011-12-18 09:40:23 -08:00
Kyle Robinson Young
c93dab69a3 Correct placement of between on FormHelper radio and input
Fixes #1992
2011-12-18 08:25:42 -08:00
Fitorec
e7c913acba Fix unreachable code in Model mergeVars
Squashed commit of the following:

commit c8326460a4
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 18:04:11 2011 -0600

    add a space after the comma in the $merge array

commit 22ad6cdca5
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 03:31:54 2011 -0600

    removing the condition and adding actsAs to the default list of merged keys.

commit afa4dd0dee
Author: Fitorec <chanerec@gmail.com>
Date:   Mon Dec 5 12:10:32 2011 -0600

    Solving the small defect in the array of behaviors(actsAs)

Signed-off-by: mark_story <mark@mark-story.com>
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
mark_story
0607437abd Fix various failing tests. 2011-12-17 23:50:41 -05:00
mark_story
e9779e7126 Fix failing test in Debugger test case. 2011-12-17 22:53:21 -05:00
mark_story
3b57704a27 Update doc blocks. 2011-12-17 22:23:37 -05:00
mark_story
0b0a69de1e Update default layouts to use blocks. 2011-12-17 22:23:37 -05:00
mark_story
46bb6c8ad6 Adding tests and functionality for nested blocks. 2011-12-17 22:23:37 -05:00
mark_story
f0f3eb9ba9 Fix a few outstanding issues with blocks.
- Blocks left open after rendering files should trigger
  an exception.
- Fix strict errors.
- Correct doc blocks.
2011-12-17 22:23:37 -05:00
mark_story
bcb8444ab1 Make CacheHelper able to handle nocache tags in elements.
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
2011-12-17 22:23:37 -05:00
mark_story
fb20841d25 Doing some internal re-factoring in CacheHelper.
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
2011-12-17 22:23:37 -05:00
mark_story
a8f0eb2b49 Making afterViewFile callbacks able to modify the rendered content
CacheHelper will need this.
2011-12-17 22:23:36 -05:00
mark_story
dcf8c0fd04 Re-factoring duplicated code out. 2011-12-17 22:23:36 -05:00
mark_story
39b1203e9a Making modParams work with non-array values.
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
2011-12-17 22:23:36 -05:00
mark_story
c5c2859800 Fixing failing tests. 2011-12-17 22:23:36 -05:00
mark_story
44a8d7907e Deprecating View::$output.
Replacing it with a magic __get/__set to the content block.
This helps deprecate $content_for_layout as well.
2011-12-17 22:23:36 -05:00
mark_story
c49e261eba Adding new callbacks into View. 2011-12-17 22:23:36 -05:00
mark_story
3fe79564b5 Adding new callbacks - testing them out. 2011-12-17 22:23:35 -05:00
mark_story
d8c6594ff6 Adding constants and a property to track the current type.
This helps with resolving parent elements.
2011-12-17 22:23:35 -05:00
mark_story
9b2fd8f251 Extracting ViewBlock from View.
View was getting too fat.
2011-12-17 22:23:35 -05:00
mark_story
e06895ef91 Adding view files for tests.
Adding test case for elements + extending
Making elements extend each other.
2011-12-17 22:23:35 -05:00
mark_story
b6919a0268 Starting the extend() feature.
Adding a simple test case.
Still need to add callbacks around every view fragment rendered.
Without that CacheHelper will not be able to cache extended views
correctly.
2011-12-17 22:23:35 -05:00
mark_story
b866c00318 Renaming methods so they are shorter and still make sense. 2011-12-17 22:23:35 -05:00
mark_story
82139fe8f6 Updating HtmlHelper to allow custom blocks.
Adding tests for blocks.
Adding missing tests.
2011-12-17 22:23:34 -05:00
mark_story
7854f9dd52 Add View::getBlock()
View::get() had two jobs.  That's almost always a bad thing.
Add a new method instead.
2011-12-17 22:23:34 -05:00
Mark Story mark@mark-story.com
90f035c54d Updating block appending to work better. 2011-12-17 22:23:34 -05:00
Mark Story
6d425dfbcb Adding Backwards compatibility for $scripts_for_layout. 2011-12-17 22:23:34 -05:00
Mark Story
4606ea39a9 Updating HtmlHelper and its tests to use View::append(). 2011-12-17 22:23:34 -05:00
Mark Story
bd4ee41e24 Deprecating addScript() its replaced by blocks feature.
Adding View::blocks() for getting the list of blocks.
2011-12-17 22:23:33 -05:00
Mark Story
9107913c07 Implementing basic features of view 'blocks' 2011-12-17 22:23:33 -05:00
Mark Story
3e2bde523b Adding tests for Blocks in View.
Blocks should replace scripts_for_layout and content_for_layout
in a future version of CakePHP.
2011-12-17 22:23:33 -05:00
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
Rachman Chavik
577225b8a6 include schema name when storing in _sequenceMap 2011-12-15 13:49:48 +07:00
Kyle Robinson Young
b3396538b7 Add debug flag to flush output 2011-12-14 22:48:41 -08:00
Ceeram
3f8934634b remove cheating, sort() always returns true 2011-12-15 01:18:11 +01:00
ADmad
01b04314c9 Fixing possible test case failure 2011-12-15 03:20:09 +05:30
ADmad
16d29a8d0e Making Folder::delete() code more PHP5ish 2011-12-15 03:07:17 +05:30
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
Rachman Chavik
a8d0447e61 fix fullTableName duplicate prefix, closes #2355 2011-12-14 14:35:20 +07:00
Rachman Chavik
d2eac08e6b fixing previous incomplete fix 2011-12-14 14:34:41 +07: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
cfb6ed4cda Fix failing tests. 2011-12-13 22:11:06 -05:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05: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
Rachman Chavik
6505dd8e29 fixing conflict resolution in 2e8498e1 re: pgsql 2011-12-14 07:50:44 +07:00
Rachman Chavik
d77f9aacde updating multidb tests to use ConnectionManager 2011-12-13 21:10:16 +07:00
Rachman Chavik
a88ca54a8d updating usage of assertEqual -> assertEquals 2011-12-13 21:03:40 +07: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
Rachman Chavik
8b4e79c795 adding tests for LH 275
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:18:02 +07:00
Rachman Chavik
90af608489 keep existing data in unique HABTM closes LH 275
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07:00
mark_story
ab5bfdccfd Fix bad merge and failing test. 2011-12-11 23:20:19 -05:00
mark_story
d63d51e3dd Fix failing tests caused by incorrect mocks. 2011-12-11 23:07:01 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05: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
64eb38a953 Fix disabled + SecurityComponent
Disabled inputs should be omitted from the secured fields.
This will enable forms to submit successfully as long as those
inputs stay excluded from the form submission.

Fixes #2333
2011-12-07 22:30:40 -05:00
mark_story
123a1a21ba Fix issues with stack trace output.
Traces without files and without classes caused errors in printing
the fancy trace.
2011-12-07 21:19:57 -05:00
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
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
mark_story
545694d84b Fix undefined variable error. 2011-12-06 12:35:18 -05:00
euromark
f9d12563a3 Translation fix
Fixes #2340

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-06 12:33:47 -05:00
mark_story
fc4846d676 Move overflow limits to only take effect after expiration. 2011-12-06 12:23:15 -05: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
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
ADmad
72497147bd Changing default docType to 'html5' 2011-12-05 07:04:00 +05:30
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
9296f770d5 Adding SecurityComponent::$csrfLimit
This property allows you to control the number of tokens
that will be kept active.  Its possible to make really large
CSRF collection sizes.  Capping the number of tokens allows developers
to better control session sizes.
2011-12-03 20:13:17 -05:00
mark_story
e421b3bc8f Adding SecurityComponent::generateToken()
This method allows end developers to add the csrf tokens
manually, if they aren't added automatically.

Tokens are cheap to generate, simplifying the logic
makes things a bit easier to understand.
2011-12-03 20:13:03 -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
545f4d2811 Fix bad merge. 2011-12-03 13:56:55 -05:00
m
73de68f5f4 Test suite should display current PHPUnit version.
Fixes #2316
2011-12-03 13:47:40 -05:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -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