mark_story
67698248ca
Fix some coding standards errors.
2012-03-18 21:48:50 -04:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
dbb2dd44d7
Fix more coding standards.
2012-03-18 21:20:33 -04:00
Ceeram
4191e2e573
adding test to disprove ticket, closes #2691
2012-03-19 01:27:35 +01:00
mark_story
e33dc98124
Fix more coding style errors.
2012-03-18 18:52:35 -04:00
mark_story
480c1bbb54
Fix coding standards.
2012-03-18 18:06:10 -04:00
mark_story
7798914676
Fix most code standards errors in Case/TestSuite.
2012-03-18 17:31:53 -04:00
mark_story
fc234d82f1
Fix coding standards in Case/Model/Behavior.
2012-03-18 14:31:13 -04:00
mark_story
346e048371
Fix coding standards in Datasource tests.
2012-03-18 13:08:27 -04:00
mark_story
6f8e7f1bc5
Revert "Fix coding standards errors."
...
This reverts commit 3362100512
2012-03-18 12:29:39 -04:00
mark_story
3362100512
Fix coding standards errors.
2012-03-18 12:20:24 -04:00
Thomas Ploch
b28b25f642
Added 'Fixed whitespace.
2012-03-18 11:12:19 +01:00
Thomas Ploch
7cfcef54ed
Added 'Enable Debug Output' link to CakeHtmlReporter.
2012-03-18 11:10:12 +01:00
ADmad
0832e18e9e
Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682
2012-03-18 14:05:41 +05:30
ADmad
bdddc85946
Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats.
2012-03-18 13:43:21 +05:30
mark_story
1e403c6a7f
Fix more coding standards issues.
2012-03-17 23:53:13 -04:00
mark_story
fab9547ac9
Fix coding standard issues with fixtures.
2012-03-17 23:31:17 -04:00
mark_story
c54ac257f1
Fix getCrumbs() with no crumbs and first link.
...
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.
Fixes #2689
2012-03-17 23:23:42 -04:00
mark_story
d0733ceb00
Fix most coding standards in Case/Network
2012-03-16 22:19:01 -04:00
mark_story
544930f882
Skip validation when recovering trees.
...
Fixes #2663
2012-03-16 21:57:20 -04:00
mark_story
8fdd57568b
Make method protected.
...
API changes should be minimized in bug fix releases.
Fix broken builds.
2012-03-16 21:46:07 -04:00
mark_story
381e5b10bc
Add tests for GH-558
2012-03-16 21:05:06 -04:00
Mark Story
6e4456fbd7
Merge pull request #558 from stefanozoffoli/patch-3
...
Prevent blackhole auth error for multi fields.
Fields with .1.0 should not blackhole.
2012-03-16 18:04:49 -07:00
mark_story
111db16ca6
Restore error handlers.
...
When switching error handlers, remember to pop off the stack.
2012-03-16 20:56:24 -04:00
Mark Story
fd824c1da5
Merge pull request #561 from tPl0ch/2.1-configure-error
...
Fixed resetting of ErrorHandlers when custom error handlers are set in core.php
2012-03-16 17:46:39 -07:00
dogmatic69
d3a44811ce
adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible
2012-03-16 21:20:27 +00:00
Thomas Ploch
a06eba7e24
Adding basic implementation of DataSource::close().
...
Since this method will be called in Destructor.
2012-03-16 21:08:48 +01:00
Norio Suzuki
358b84b577
Add charset() / headerCharset() methods to CakeEmail class
2012-03-16 12:54:30 +00:00
mark_story
f5804cb4ca
Fix most coding standards in Test/Case/View
2012-03-15 22:50:05 -04:00
mark_story
6a55749e27
Fix reading multiple keys in a single request.
...
Fixes #2676
2012-03-15 21:45:48 -04:00
mark_story
5713cd3269
Fix the way bash is invoked.
...
Using /usr/bin/env is more portable to various *nix flavours.
Fixes #2688
2012-03-15 20:20:39 -04:00
Thomas Ploch
cadfe15549
Fixed problems with custom Error handlers when inclusion of APP bootstrap is defered.
2012-03-15 16:06:54 +01:00
Rachman Chavik
079ae8265c
Set::expand as implemented by jeremyharris
2012-03-15 20:07:49 +07:00
Rachman Chavik
8fdb11121e
Merge branch '2.1' into 2.2
2012-03-15 20:07:26 +07:00
mark_story
f1931e43ef
Add class_exists() check for view class.
...
Check that the view class hasn't already been mapped in the autoloader
before mapping it. This allows developers to map view classes from
plugins.
Fixes #2684
2012-03-14 20:57:11 -04:00
Ceeram
3e0294a695
Several fixes for testcases.
...
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-15 01:31:28 +01:00
Ceeram
9f9c6fdd67
ensure correct order in results as postgres does not always return in same order
2012-03-15 01:31:09 +01:00
mark_story
1254a1068f
Fixing issues with unwanted querystring parameters.
...
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params. This is
yet another case where named parameters are fail. Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.
Fixes #2678
2012-03-14 20:20:55 -04:00
Ceeram
40f4f54b34
Several fixes for testcases.
...
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-14 15:08:46 +01:00
mark_story
1efee89169
Fix most coding standards issues in Test/Case/Utility
2012-03-13 22:59:20 -04:00
mark_story
4e94ebe710
Fix doc blocks.
2012-03-13 21:04:56 -04:00
Ceeram
b871095125
ensure correct order in results as postgres does not always return in same order
2012-03-14 01:12:35 +01:00
Ceeram
7145bd6574
fix another failing test on postgres
2012-03-14 00:49:04 +01:00
Ceeram
467b0f1c45
fix failing test for postgres
2012-03-13 22:03:22 +01:00
dogmatic69
2ad0f8b8db
setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779
2012-03-13 17:40:25 +00:00
Stefano Zoffoli
60b9cd80a0
Prevent blackhole auth error where are present multi fields (part 2)
2012-03-13 17:02:22 +01:00
Rachman Chavik
af575027da
fix Set::sort() for issue in previous commit
2012-03-13 12:45:06 +07:00
Rachman Chavik
beb0474d67
tests for regression in Set::sort(), re: #2673
2012-03-13 12:44:11 +07:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
907596b2f5
Fix coding standards in Case/Routing
2012-03-12 21:36:27 -04:00
mark_story
b2d393eeb9
Fix coding standards in Case/Event
2012-03-12 21:22:17 -04:00
mark_story
8b797b2577
Fix coding standards in Case/Error
2012-03-12 21:21:02 -04:00
mark_story
b4a444fb14
Fix coding standards in Case/Core
2012-03-12 21:17:50 -04:00
mark_story
5687d97a98
Merge branch '2.1' into 2.2
2012-03-12 20:31:33 -04:00
Ceeram
a2fb4178fb
Testcase added, refs #2672
2012-03-12 20:24:53 -04:00
Mark Story
5033fb60d6
Merge pull request #557 from sime/2.1
...
array_merge breaks CakeSchema column type change
Fixes #2672
2012-03-12 17:24:44 -07:00
Ceeram
68eeee80d8
Set::sort() now correctly sorts when using {s}.path, fixes #2673
2012-03-12 21:58:24 +01:00
mark_story
a9c8a520b2
Port [c19b233] to 2.1
2012-03-12 12:33:20 -04:00
Simon Males
791cc1a657
array_merge inappropriate for certain column types. e.g. Switching from VARCHAR(45) to DATETIME will carry length, collate and charset properties
2012-03-12 21:30:52 +11:00
mark_story
edb582944c
Fix coding standards in Test/Case/Controller
2012-03-11 22:20:25 -04:00
mark_story
75f1a84069
Fix docs about ordering of callbacks.
...
Refs #GH-555
2012-03-11 21:35:11 -04:00
Ceeram
a4952166f7
make acl methods available in permission model
2012-03-11 17:07:42 +01:00
mark_story
8c611b236d
Fixing missed cache reads for table schema.
...
Because cache keys were different, model schema would not be read from
the cache. Make keys used consistent.
Fixes #2670
2012-03-11 10:24:05 -04:00
Ceeram
baf8991a1f
updating version.txt
2012-03-11 15:19:32 +01:00
Ceeram
bbfaa9e947
Paginating now work well with custom find methods.
...
_findCount() will now pass $query['operation'] = 'count' for more flexibility.
Custom finders can distinguish the operation and return other $query if needed.
2012-03-11 15:14:50 +01:00
mark_story
4b3d8612e9
Fix typo causing notice errors.
...
Fixes #2658
2012-03-11 08:17:01 -04:00
mark_story
83a29f054e
Fix Session.cookieTimeout default behavior.
...
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.
Fixes #2669
2012-03-11 08:14:54 -04:00
mark_story
72d0105e20
Add plugin. prefix for plugin files.
...
This prevents app/plugin bleedthrough. This is
particularly problematic in controllers, as plugin
controllers were partially accessible from non-plugin
routes.
Fixes #2658
2012-03-10 23:33:21 -05:00
mark_story
ed1d34accc
Fix most coding standards issues in Test/Console
2012-03-10 23:32:02 -05:00
mark_story
fdcb3dc34f
Fix coding standards.
2012-03-10 23:12:08 -05:00
mark_story
82d8df9c3e
Fix more coding standards.
2012-03-10 22:30:56 -05:00
mark_story
932c9d4e2f
Fix coding standards.
2012-03-10 22:29:35 -05:00
mark_story
7d256d0f7b
One more time.
2012-03-10 22:00:16 -05:00
mark_story
81b487159b
Try again at fixing the build.
2012-03-10 21:40:38 -05:00
mark_story
2d343070fe
Try to fix build.
2012-03-10 21:33:40 -05:00
mark_story
69ab443ed6
Fix whitespace for coding standards.
2012-03-10 21:19:04 -05:00
Mark Story
f26d24b445
Merge pull request #552 from tPl0ch/2.1-error-handler-bootstrap
...
Move inclusion of APP bootstrap after initialization of ErrorHandler
2012-03-10 17:59:03 -08:00
ADmad
13b748ad86
Fixed bug where registering new packages would reset extra paths set for other packages. Closes #2666
2012-03-10 04:40:50 +05:30
Thomas Ploch
cc9b445ece
Fixed warnings in stack trace element when no stack args are set.
2012-03-09 18:38:16 +01:00
Thomas Ploch
2c55c7c193
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-error-handler-bootstrap
2012-03-09 18:37:53 +01:00
mark_story
150c9fc6a3
Remove parse_str() its buggy and wrong.
...
parse_str() replaces `.` with _ and drops duplicated keys, which is
incorrect. Replace parse_str with an updated version of parseQuery
from 1.x
Fixes #2629
Fixes #2647
2012-03-08 21:05:28 -05:00
Mark Story
621b086d9c
Merge pull request #549 from zoghal/fix2
...
urldecode trailing star
2012-03-08 17:03:56 -08:00
Thomas Ploch
7a93276ecf
Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap().
2012-03-08 16:00:13 +01:00
Mark Story
a4da64cacb
Merge pull request #550 from majna/2.1-validation
...
Make Validation class more strict when checking values in list.
2012-03-07 17:34:54 -08:00
mark_story
3a8c49e319
Add check for simple category elements.
...
Fixes #2655
2012-03-07 19:52:06 -05:00
Majna
32f5b6f191
Fix failing test.
2012-03-07 19:27:23 +01:00
Saleh Souzanchi
683607de5e
fix test Parse Trailing UTF8
2012-03-07 21:51:09 +03:30
Majna
4543a4cb88
Make Validation class more strict when checking values in list.
...
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
2012-03-07 18:52:48 +01:00
Saleh Souzanchi
5e9af65486
testParseTrailingUTF8
2012-03-07 08:50:11 +03:30
Saleh Souzanchi
e741d79f9a
urldecode trailing pass
2012-03-07 06:06:59 +03:30
mark_story
17eb0e4f68
Fix duplicate values when merging POST data.
...
Fixes #2648
2012-03-06 20:22:13 -05:00
Kyle Robinson Young
c7963835c7
Correct path in debug()
2012-03-05 14:44:45 -08:00
Thomas Ploch
79cab67be7
Adding missing 'recursive' option to DigestAuthenticate object.
...
Used integer casting in _findUser() method for 'recursive' option.
2012-03-05 11:06:46 +01:00
mark_story
664b0538b8
Fix more coding standards problems.
2012-03-04 22:49:38 -05:00
mark_story
c2f42343a3
Fix most coding standards issues in TestSuite/
2012-03-04 21:51:50 -05:00
mark_story
9a6ad7e1e2
Fixing most coding standard issues in Model/
2012-03-04 21:51:50 -05:00
Jose Lorenzo Rodriguez
9b395eb23b
Update version number to 2.1.0
2012-03-04 19:36:50 -04:30
mark_story
a6da736149
Fix coding standards errors in Network/
2012-03-04 11:18:20 -05:00
mark_story
863aaad4e3
Update docs for GH-322
2012-03-04 09:59:40 -05:00
Mark Story
ca25e75852
Merge pull request #322 from ingk/2.1
...
FormHelper: Allow a boolean value for the disabled attribute in function radio
2012-03-04 06:51:02 -08:00
mark_story
50e7f4c995
Merge branch '2.0' into 2.1
2012-03-03 23:20:18 -05:00
mark_story
dde19f97c7
Fix sortDir() to read default params.
...
sortDir() also did not reflect the default paging parameters.
This would result in initial links not matching the query used.
Fixes #2640
2012-03-03 23:19:50 -05:00
mark_story
8f72b696a0
Fix sortKey() not looking at default params.
...
sortKey() only looked at the options values, which do not include
default sorting options declared as settings in the helper.
Fixes #2640
2012-03-03 23:06:45 -05:00
mark_story
4640b8ea23
Fix coding standar errors in Routing/
2012-03-03 20:28:22 -05:00
mark_story
dc2f6efe13
Fix coding standard errors in Log/
2012-03-03 20:24:02 -05:00
mark_story
9d1e88ba13
Fix error from previous commit.
2012-03-03 20:22:21 -05:00
mark_story
c5be343b72
Fix most of the coding standards issues in I18n/
...
There are a number of whitespace related issues in Multibyte, and
variable name related ones in I18n that cannot be easily changed.
2012-03-03 20:15:21 -05:00
mark_story
15e6e9d981
Fix coding standards in Event/
2012-03-03 19:55:18 -05:00
mark_story
60989ad6c8
Fix coding standard issues in Error/
2012-03-03 19:46:15 -05:00
mark_story
63c992a85b
Fix coding standards in Core/
2012-03-03 19:37:46 -05:00
mark_story
61aba0f0f8
Fix most coding standard issues in Controller.
2012-03-03 19:27:46 -05:00
mark_story
db8c6b5c78
Fix most of the coding standards issues in Console/
2012-03-03 18:55:29 -05:00
Ceeram
2a7bee0a5c
make sure locale is restored correct in tests
2012-03-04 00:36:21 +01:00
Ceeram
169c99cedf
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-03-03 23:55:20 +01:00
Ceeram
08a4d0bf63
Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds
2012-03-03 23:55:03 +01:00
mark_story
c8b113ac91
Fix coding standards in Configure/
2012-03-03 17:36:59 -05:00
mark_story
b06e15ce6f
Fix coding standards in Config/
2012-03-03 17:35:47 -05:00
mark_story
04c843b17b
Fix coding standards in Cache/
2012-03-03 17:34:13 -05:00
mark_story
9d325fe46e
Fixing most coding standard issues in Utility/
2012-03-03 17:31:47 -05:00
mark_story
acccdcde1f
Fix coding standard issues in View/
2012-03-03 17:10:12 -05:00
mark_story
0df239de2b
Fix some coding standards issues.
2012-03-03 15:59:36 -05:00
mark_story
7d51db9e63
Merge branch '2.0' into 2.1
2012-03-03 12:27:22 -05:00
Takayuki Miwa
1475e87b38
Update PaginatorHelper::beforeRender to merge request->query with url options
2012-03-03 13:46:46 +09:00
Cauan Cabral
a3a2d55c94
Enable UpgradeShell to recognize new line between class name and {
2012-03-02 17:43:02 -04:00
mark_story
0b4f735b4c
Update API docs for Set::extract()
...
Fixes #2634
2012-03-02 11:19:17 -05:00
Renan Gonçalves
3412c0cb0f
Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer.
2012-03-02 15:59:59 +01:00
Renan Gonçalves
6d3bc7be86
Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer.
2012-03-02 15:55:58 +01:00
Jose Lorenzo Rodriguez
c84e25e5b4
Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it
2012-03-01 14:56:56 -04:30
José Lorenzo Rodríguez
96f73d6392
Merge pull request #538 from mcammaert/2.1
...
Merging input defaults with passed options to preserve nested keys
2012-02-29 09:09:11 -08:00
Mark Story
9d017c2b5c
Merge pull request #535 from michaelhagedon/2.1
...
Fixing _fromArray()
2012-02-29 08:32:45 -08:00
Manu Cammaert
9c24f81379
Test Case for Formhelper Bug
2012-02-29 11:03:55 +01:00
mark_story
1ddcde7c86
Fix how $uses is handled.
...
$uses now defaults to true. All falsey values turn some features
off, and most truthy values enable them.
Fixes #2590
2012-02-28 19:35:06 -05:00
Manu Cammaert
cd2dca205c
default options are lost in case of eg. validation error
2012-02-28 23:39:16 +01:00
Rob McVey
8e93c4cd34
Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters
...
being returned incorrectly
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 15:21:59 -05:00
Michael Hagedon
5eb4155236
Fixing case.
2012-02-28 13:20:47 -07:00
Mark Story
6599422a7a
Merge pull request #534 from dogmatic69/2622
...
Fixes #2622
2012-02-28 12:11:44 -08:00
Michael Hagedon
ef80045fc5
Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected
2012-02-28 12:41:43 -07:00
dogmatic69
ac06880241
making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests.
2012-02-28 16:05:32 +00:00
mark_story
2665178ec9
Merge branch '2.0' into 2.1
2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1
Fixed a testcase, support PostgreSQL 9.1
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 06:32:31 -05:00
ADmad
12364cac8c
Fixed indentation
2012-02-28 02:04:43 +05:30
mark_story
0568746bfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e
Change cake.php to allow cake libs at ROOT
...
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.
Fixes #2613
2012-02-26 12:03:22 -05:00
mark_story
faeb7b4536
Fix error creating schema files.
...
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.
Fixes #2618
2012-02-26 10:25:39 -05:00
mark_story
2a9a103d62
Fix bad xml help generation.
...
Fixes #2619
2012-02-26 10:21:04 -05:00
ADmad
a31be56f42
Wrapping error string in translator function.
2012-02-26 20:34:30 +05:30
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f
Fix strict and warning errors from type hints.
2012-02-25 20:06:48 -05:00
euromark
973dce916a
php5 corrections
2012-02-25 19:46:07 -05:00
euromark
42762fffa9
fix broken test
2012-02-25 19:46:06 -05:00
euromark
45112088a1
type hinting models
2012-02-25 19:46:06 -05:00
euromark
22452f61f8
type hinting controllers and views
2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e
visibility attributes
2012-02-25 19:46:06 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Ceeram
677f0708dc
create View instance after adding model params for request
2012-02-24 18:16:53 +01:00
José Lorenzo Rodríguez
2840dc74d3
Merge pull request #528 from vantienvnn/2.0
...
CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
2012-02-24 06:51:12 -08:00
vantienvnn
c0b2d8ad9d
Fixed #2615
2012-02-24 21:35:50 +07:00
ADmad
4edb378ef8
Added ability to pass ID as parameter to Model::exists()
2012-02-24 19:42:23 +05:30
Mark Story
fd927207c1
Merge pull request #524 from shama/patch-typos
...
Typo fixes in the tests
2012-02-23 17:11:08 -08:00
mark_story
ed22c17eba
Fix path in Testsuite.
2012-02-23 20:09:11 -05:00
Ceeram
8eea263d71
fixing incorrect post data
2012-02-23 20:00:51 -05:00
Ceeram
9d71df475d
another attempy to set correc order for expected and result in assert, definitely time for some coffee
2012-02-23 20:00:43 -05:00
Kyle Robinson Young
4176e59e52
Typo fixes in tests
2012-02-23 15:29:53 -08:00
Kyle Robinson Young
ea652394c7
Move DbAcl and IniAcl into Acl subfolder and rename Model/DbAclTest to AclNodeTest
2012-02-23 10:45:32 -08:00
Mark Story
94db313e39
Merge pull request #516 from dogmatic69/tree-behavior-optimization
...
Tree behavior optimization
Fixes #2600
2012-02-23 09:27:41 -08:00
Mark Story
3a391529d2
Merge pull request #520 from dogmatic69/2610
...
Closes #2610
2012-02-23 09:26:11 -08:00
Ceeram
6d3c659260
fixed expected and result order in asserts, also added extra test
2012-02-23 12:24:31 -05:00
Ceeram
836f913a64
testcase for incorrect merge of post data
2012-02-23 12:24:26 -05:00
Mark Story
1ddc8f6489
Merge pull request #519 from shama/patch-vis-convention
...
Correct convention with public visibility
2012-02-23 09:23:13 -08:00
Mark Story
66fd891503
Merge pull request #518 from shama/patch-cake-request-test
...
Fix failing tests with CakeRequest when ran in webrunner
2012-02-23 09:22:23 -08:00
Rachman Chavik
e59bff2729
prevent deletion of views/cache/empty in test runs
2012-02-23 22:20:23 +07:00
dogmatic69
c02912261b
setting recursive to -1
2012-02-23 11:36:44 +00:00
dogmatic69
2787052bdd
adding a truncate test for a url as explained in #2610
2012-02-23 11:17:58 +00:00
Kyle Robinson Young
c202859523
Correct convention with public visibility
2012-02-23 00:03:31 -08:00
Kyle Robinson Young
86fafd0ae5
Fix failing tests with CakeRequest when ran in webrunner
2012-02-22 23:50:13 -08:00
Rachman Chavik
c6449f649f
adding missing ','
2012-02-23 09:08:17 +07:00
Rachman Chavik
b545d8b201
fix getSchemaName() for Sqlserver.
...
Closes #2609 .
2012-02-23 08:25:07 +07:00
dogmatic69
74a84c96f1
optimization of tree behavior as per ticket #2600
2012-02-23 00:56:20 +00:00
Ceeram
55b8f66095
fixing incorrect post data
2012-02-22 22:49:42 +01:00
Ceeram
2e2ee3b096
another attempy to set correc order for expected and result in assert, definitely time for some coffee
2012-02-22 22:31:28 +01:00
Ceeram
d5cdc46661
fixed expected and result order in asserts, also added extra test
2012-02-22 22:25:24 +01:00
Ceeram
44ea3fb122
testcase for incorrect merge of post data
2012-02-22 21:53:51 +01:00
Mark Story
b7302850b5
Merge pull request #467 from tPl0ch/2.1-required-update-create
...
Added support for simplified required validation on 'create' or 'update'. Fixes #230 .
2012-02-22 09:43:13 -08:00
José Lorenzo Rodríguez
74d837bef3
Merge pull request #512 from shama/patch-test-fixes
...
Fix missing class errors with ComponentCollectionTest and DbAclTest
2012-02-22 03:48:40 -08:00
Stef van den Ham
98b84ce40b
Fixed typo in TestSuiteShell
2012-02-22 09:38:59 +01:00
Mark Story
e5205a8dcc
Merge pull request #511 from tigrang/crumb-list-opt
...
Moving duplicate logic to a new method
2012-02-21 19:50:35 -08:00
Mark Story
cee8f2cebb
Merge pull request #508 from shama/patch-app-build
...
Updates to App::build() uses
2012-02-21 19:48:21 -08:00
Tigran Gabrielyan
95ba5f45a5
Keeping code dry in HtmlHelper::getCrumbs/getCrumbList
2012-02-21 11:38:13 -08:00
Mark Story
f138c73a77
Merge pull request #483 from tigrang/getCrumbList-enhancement
...
Added `startText` feature to HtmlHelper::getCrumbList()
2012-02-21 18:24:16 -08:00
mark_story
6684b775cd
Fix failing tests.
2012-02-21 20:45:44 -05:00
Mark Story
3e79038b06
Merge pull request #505 from shama/patch-htaccess
...
Remove extraneous space in .htaccess
2012-02-21 17:40:58 -08:00
Mark Story
c2d753ffb4
Merge pull request #500 from shama/patch-visibility
...
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Mark Story
540f6669fd
Merge pull request #498 from shama/patch-loadFixtures
...
Remove unnecessary loadFixtures() calls
2012-02-21 17:28:52 -08:00
Mark Story
d7026204d5
Merge pull request #497 from shama/patch-crossSchemaTest
...
Cleaning up ModelCrossSchemaHabtm test case
2012-02-21 17:27:01 -08:00
ceeram
6eb4f39afd
Merge pull request #499 from shama/patch-dbAcl-uses
...
Use ComponentCollection and AclComponent on DbAclTest to avoid error
2012-02-21 01:20:52 -08:00
ADmad
007ac45b26
Merge pull request #496 from shama/patch-loadSingle-docblock
...
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-20 22:06:47 -08:00
Mark Story
fe4f0009c9
Merge pull request #495 from shama/patch-cakeplugin-loadall
...
Load specific test plugins rather than all to avoid conflicts
2012-02-20 20:43:41 -08:00
mark_story
89df484fc5
Remove un-necessary Set::merge().
...
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.
Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
2ddc3873c2
Update the Set::merge() documentation.
2012-02-18 16:01:07 -05:00
mark_story
fce70df6ff
Fix failing tests.
...
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -05:00
teddy
0ea00c5f07
urldecode $this->url before unsetting it from CakeRequest->query
2012-02-18 11:03:36 -05:00
teddy
e6905b44c3
urldecode custom route element values
2012-02-18 10:59:46 -05:00
mark_story
2f51ef00ed
Add failing tests for patches from 'teddyzeenny'.
2012-02-18 10:53:47 -05:00
Kyle Robinson Young
962fe7c571
Fix missing class errors
2012-02-18 06:32:48 -08:00
Kyle Robinson Young
32e7943b00
Fix merge conflict with 62f8dea
2012-02-18 04:39:32 -08:00
Kyle Robinson Young
22582aee63
Upgrade legacy uses of App::build() types
2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8
Use App::RESET instead of true with App::build()
2012-02-18 04:04:54 -08:00
Kyle Robinson Young
1312cdaedf
Remove extraneous space in .htaccess
2012-02-17 21:32:09 -08:00
mark_story
2097d5a968
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:10:14 -05:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
Jose Lorenzo Rodriguez
a9c279aab0
Update version number to 2.1.0-RC
2012-02-20 18:10:22 -04:30
Jose Lorenzo Rodriguez
715c848577
Bringing theme code up to date with 2.0, cleaning logic a bit
2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
6918b70ec3
REmoving usage of deprecated ThemeView
2012-02-20 16:49:16 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b
Fixing a few failing test cases
2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4
Adding a simpler solution to the missing view files problem without altering the built paths in App
2012-02-20 15:39:03 -04:30
Jose Lorenzo Rodriguez
cec9d2e615
Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
...
This reverts commit 5c792aa831
2012-02-20 15:21:03 -04:30
Ceeram
ee54daef35
AclNode now throws exception instead of trigger_error
2012-02-20 15:41:57 +01:00
Mark Story
9e8152f949
Merge pull request #417 from 0x20h/php-acl
...
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
Christopher Vrooman
585f1e2c31
Minor changes to two error messages.
2012-02-19 14:47:49 -02:00
mark_story
943d928084
Merge branch '2.0' into 2.1
2012-02-18 22:19:38 -05:00
mark_story
20229eeb43
Merge branch '2.0' into 2.1
2012-02-18 11:22:18 -05:00
mark_story
89b9bb7297
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00
Mark Story
60df31cfb6
Merge pull request #487 from dogmatic69/2.1
...
2.1
2012-02-17 17:38:03 -08:00
euromark
77624552eb
added missing assertText methods to assert cross OS
2012-02-17 23:36:57 +01:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
Majna
c40d132f81
Fix Folder::tree() when excluding dot files or folders.
...
When 'exclude' param is array('.') files/folders are not skipped. Added test.
2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942
fixing up the docs for Collection::attached(), was showing behaviors but is for all collections
2012-02-17 13:25:37 +00:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
Kyle Robinson Young
0c27a26cb8
Use ComponentCollection and AclComponent on DbAclTest to avoid error
2012-02-16 22:57:31 -08:00
Kyle Robinson Young
75882507bc
Remove unnecessary loadFixtures() calls
2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637
Cleaning up ModelCrossSchemaHabtm test case
2012-02-16 22:25:53 -08:00
Kyle Robinson Young
2d43f1873c
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-16 21:45:37 -08:00
Kyle Robinson Young
4141a3ab5b
Load specific test plugins rather than all to avoid conflicts
2012-02-16 20:03:44 -08:00
Tigran Gabrielyan
af2fd03590
Added startText feature to HtmlHelper::getCrumbList()
2012-02-16 19:17:43 -08:00
mark_story
14228fa469
Fix more tests to use assertTextEquals()
...
Refs #2148
2012-02-16 21:51:56 -05:00
euromark
2afece41a0
email component osFix removal due to new assertTextEquals
2012-02-16 21:34:43 -05:00
mark_story
6412797dfc
Add missing static.
2012-02-16 20:58:43 -05:00
Kyle Robinson Young
9fdc17eb1f
Fix failing AuthComponent test
2012-02-16 15:58:42 -08:00
Majna
d41e5621b7
Fix missing and invalid assertions in tests.
...
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
dogmatic69
3246cf7c1e
adding the model alias so that there are no issues when the find has a join on it
2012-02-16 16:22:45 +00:00
ADmad
5c792aa831
Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit.
2012-02-16 18:15:12 +05:30
Mark Story
df0d1d681f
Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878
...
Option 'currentClass' always defaults to 'current'.
2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7
Option 'currentClass' always defaults to 'current'.
2012-02-16 00:11:43 -03:00
ADmad
bda05293d7
Fixed failing test cases
2012-02-16 02:22:20 +05:30
ADmad
c7cfd45884
Syncing bake skeleton with app
2012-02-16 01:58:11 +05:30
ADmad
90f4c03627
Moving view files from core to app
2012-02-16 01:58:11 +05:30
mark_story
6fda055a1e
Move initialize logic to __construct().
...
Fixes #2582
2012-02-15 14:15:44 -05:00
ADmad
55f63bbd5b
Fixing error message. Closes #2579
2012-02-15 12:41:01 +05:30
mark_story
27367b491a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Rachman Chavik
89d4b58073
fix indentation and add __construct() docblocks
2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04
rename protected variable to $_engine
2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c
adding tests for engine overrides
2012-02-14 23:28:57 +07:00
AD7six
369d316835
Restructure internals of Extract task
...
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
2012-02-14 15:30:09 +01:00
Vinícius Krolow
07adcfe2f7
fixing regex of autoLinks to work with urls that have www
2012-02-14 11:08:37 -02:00
Rachman Chavik
d6fd051fb4
changing methods in CakeTime class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4
changing methods in CakeNumber class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445
changing methods in String class to static
2012-02-14 09:34:36 +07:00
mark_story
25ee90ace4
Fix failing tests.
2012-02-13 21:28:07 -05:00
mark_story
76711c9f71
Add missing rawurlencode()
...
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.
Fixes #2572
2012-02-13 21:16:57 -05:00
mark_story
afecb713ab
Make button type nullable.
...
Fixes #GH365
2012-02-13 21:00:57 -05:00
Thomas Ploch
1a07f55d43
Renamed parameter to CakeResponse::cookie() to match cakephp standard naming.
2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response
2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4cfc033387
Fixing failing test cases
2012-02-13 00:26:10 -04:30
Jose Lorenzo Rodriguez
4f176d4284
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-02-12 21:04:35 -04:30
Ceeram
bc07ba3839
Added option['deep'] to saveAll, to save unlimited levels associated data
...
Squashed commit of the following:
commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 22:29:33 2012 +0100
update docblocks for deep save
commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff12afb05b95aa7e34f1be12
2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701
Updating docblock
2012-02-12 22:11:55 +05:30
mark_story
ad09b910ee
Remove pointless comparison.
2012-02-12 10:09:25 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
ab09229d40
Update API docs
...
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
4c01ba7224
Add ics mime type.
...
Fixes #2565
2012-02-11 11:39:24 -05:00
mark_story
7e17da0ae8
Fix notice error when reading empty values.
...
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.
Fixes #2537
2012-02-11 11:33:04 -05:00
mark_story
6f914174a6
Fix issues with double / & leading/trailing /
...
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated. This also allows settings[actionPath] to be
permissive in what it accepts.
Fixes #2563
2012-02-11 10:29:18 -05:00
mark_story
0207a61e9b
Move alias wrapping into _formatAddress()
...
Fixes #2502
2012-02-11 10:16:08 -05:00
ADmad
e1dba6798f
Added missing echos
2012-02-11 13:53:46 +05:30
Kyle Robinson Young
730ac10ae4
Add missing options to NumberHelper docblocks
2012-02-10 22:17:58 -08:00
ADmad
83e8d436f8
Fixing docbloc and adding tests for FormHelper::tagIsInvalid(). Refs #2562
2012-02-11 06:09:58 +05:30
Mark Story
6502ab8f39
Merge pull request #473 from majna/2.1-cache-clear
...
Fix Cache::clear() calls in tests.
2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138
Adding order on created to the find, avoid failing test by incorrect order in postgres
2012-02-10 23:51:41 +01:00
Ceeram
2897c72215
AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
...
Conflicts:
lib/Cake/Model/AclNode.php
lib/Cake/Model/Aco.php
lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
Majna
42cbb8cafe
Fix Cache::clear() calls in tests.
2012-02-10 20:38:41 +01:00
Ceeram
7e5ef1dc0d
avoid failing tests by 1 second diff
2012-02-10 19:53:04 +01:00
mark_story
9c1fa28d60
Its EXECUTE not EXECUCUTE
...
Also make the search insensitive as casing bugs are no fun.
2012-02-10 12:43:07 -05:00
Ceeram
f8fef907c8
avoid failing tests by 1 second off
2012-02-10 18:29:25 +01:00
Ceeram
028ba27522
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-02-10 17:26:16 +01:00
Ceeram
97f48dcdb3
fix failing test, caused by postgres ordering
2012-02-10 17:26:05 +01:00
Rachman Chavik
9b62e7ddab
changing test order
...
L10nTest defines DEFAULT_LANGUAGE causing CakeTimeTest to fail
2012-02-10 22:26:00 +07:00
Rachman Chavik
b4f51df491
recreating TimeHelperTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
fbd3f87be6
recreating TextHelperTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
8074959637
moving TimeHelperTest to CakeTimeTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
4574dbc273
fix failing test
2012-02-10 22:26:00 +07:00
Rachman Chavik
59342e0524
moving methods from TextHelperTest to StringTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
ef73fff6be
adding NumberHelperTest
2012-02-10 22:25:59 +07:00
Rachman Chavik
cd7a8452a2
renaming NumberHelperTest to CakeNumberTest
2012-02-10 22:25:59 +07:00
Jose Lorenzo Rodriguez
fd17e33e78
Making CakeNumber::addFormat static so it is easier to configure globally for the app
2012-02-10 22:25:59 +07:00
Rachman Chavik
2dc9986fad
moving methods from TextHelper to String
2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8
moving NumberHelper to CakeNumber
2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126
moving TimeHelper to CakeTime
2012-02-10 22:25:59 +07:00
ADmad
e2b273e891
Renaming option type to tag to avoid potential conflict in future with html attribute.
2012-02-10 19:44:55 +05:30
ADmad
7a42290021
$options param in Helper::assetUrl() now defaults to empty array.
2012-02-10 19:05:15 +05:30
ADmad
be694d8d6b
Allowed specifying media path using 'src' attribute
2012-02-10 13:06:55 +05:30
mark_story
0cfec525b2
Allow SqlServer to execute procs correctly.
...
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.
Fixes #2558
2012-02-09 22:27:30 -05:00
mark_story
bea50f5246
Fix whitespace.
2012-02-09 20:00:25 -05:00
Thomas Ploch
059a5f21ed
Fixed TODO: Refactored setting of Cookies into CakeResponse.
2012-02-09 14:24:10 +01:00
Mark Story
ae9ff9fbd0
Merge pull request #421 from tigrang/plugin-assets
...
Plugin.asset support for HtmlHelper::css , script, and image
2012-02-08 17:31:44 -08:00
Mark Story
7fb4738506
Merge pull request #468 from majna/2.1-bake-skel
...
Fix console option parser for --empty in ProjectTask.
2012-02-08 17:29:02 -08:00
Yasushi Ichikawa
e8a9d93eb5
Add params option to logQuery()
...
Parameters for prepared statements are now part of the
logged query data.
2012-02-08 20:15:40 -05:00
Tigran Gabrielyan
07899938b5
Changed hard-coded full base url to use FULL_BASE_URL constant
2012-02-07 20:26:16 -08:00
Tigran Gabrielyan
7fe6a4d5ea
Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests
2012-02-07 20:20:50 -08:00
ADmad
bf700c826a
Made specifying 'extension' optional. Fixed bug where downloaded file did not have extension when 'name' was specified. Fixes #2554
2012-02-08 01:08:04 +05:30
Majna
b61f46b030
Add Console/Templates and webroot/files to bake skel. Update tests.
2012-02-07 18:51:04 +01:00
Majna
454f383951
Fix console option parser for --empty in ProjectTask.
...
Command 'cake bake project --empty myapp' ignores argument myapp.
2012-02-07 18:35:12 +01:00
Thomas Ploch
07b16987a3
Fixed strict checking of 'required' attributes.
2012-02-07 15:31:27 +01:00
Thomas Ploch
4f3b266491
Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230 .
2012-02-07 12:15:04 +01:00
mark_story
4949a87b7e
Fix issues with duplicate msgid values.
...
Msgid values could be duplicated if the same string was used
for singular and pluralized translations. Re-index how the data is
stored so duplicate singular detection per domain is easier.
Fixes #2538
2012-02-06 21:25:11 -05:00
Vinícius Krolow
fa5f175244
Improve the extract to know when there is the same string inside one plural
...
Fixes #2538
2012-02-06 20:10:33 -05:00
ADmad
b6f99bc0b9
Refactored Helper::assetUrl() a bit and added test cases.
2012-02-07 03:25:59 +05:30
ADmad
610213dd6c
Added test for deleting dependent hasMany associated records. Refs #2553
2012-02-07 01:12:14 +05:30
ADmad
c0690a3eff
Added reponse object as property of View class View::$response. Refactored HtmlHelper::media() a bit.
2012-02-06 20:45:00 +05:30
ADmad
c57275636c
Replacing HtmlHelper::video() with HtmlHelper::media() which can generate either audio or video element
2012-02-06 18:57:16 +05:30
ADmad
2f7f00daa2
"preload" is not a minimized attribute
2012-02-06 12:37:13 +05:30
Mark Story
87f463f40b
Merge pull request #461 from ProLoser/appshell-patch
...
Added missing AppShell.php file to core
2012-02-05 17:20:09 -08:00
Jose Lorenzo Rodriguez
5886b25345
Releasing 2.0.6
2012-02-05 19:33:52 -04:30
ADmad
e0f86d83b7
Merge pull request #464 from scottharwell/2.1-not-in-test-case
...
Added test case for fix in e1738c8
2012-02-05 14:04:32 -08:00
ADmad
22220074f2
Added HtmlHelper::video() for html5 video element generation. Extracted asset url generation code to new function Helper::assetUrl().
2012-02-06 01:30:38 +05:30
Scott Harwell
dddcdd105e
Added test case for fix in e1738c8c
2012-02-05 13:37:54 -05:00
mark_story
f799d1c056
Add absolute path to cake/vendors.
...
When the app + cake are on different paths, `VENDORS` is incorrect, and
the built-in repo/vendors directory is not reachable by the default
paths.
Fixes #2545
2012-02-05 13:07:01 -05:00
mark_story
4bb4040851
Check method existence before calling.
...
Datasource does not implemente calculate() or
expression(). Only call them if they exist.
Fixes #2535
2012-02-05 12:54:20 -05:00
mark_story
f3b990bf0f
Correct path display for plugins.
...
Fixes #2548
2012-02-05 12:00:55 -05:00
Mark Story
d56cc43cc5
Merge pull request #462 from tPl0ch/2.0-deprecated
...
Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger.
2012-02-05 06:46:49 -08:00
0x20h
3abfaeecf3
Don't let every role inherit from default role. Filter empty aco paths
2012-02-05 15:30:26 +01:00
ADmad
12bf1348f5
Merge branch '2.0' into 2.1
2012-02-05 17:55:46 +05:30
ADmad
b5c7ca2ee9
Added self closing tag format.
2012-02-05 17:43:23 +05:30
Thomas Ploch
94e5ec0545
Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger.
2012-02-05 12:10:07 +01:00
Dean Sofer
ff91a7978e
Added missing AppShell.php file to core
2012-02-05 01:47:56 -08:00
ADmad
6f09f5dfc8
Added missing file extension to mime type mapping for files used with html5 audio/video tags
2012-02-05 05:41:02 +05:30
mark_story
18cb9a2fc8
Fix content type errors.
...
'serialize' should be '_serialize'.
2012-02-04 11:12:45 -05:00
mark_story
07dc558fb1
Sync CSS file with app/webroot.
2012-02-04 11:03:01 -05:00
mark_story
5cf5ee4410
Clarify which cache is using the indicated engine.
2012-02-04 10:42:48 -05:00
mark_story
ace9fefb02
Merge branch '2.0' into 2.1
2012-02-03 21:54:50 -05:00
mark_story
49a48ced89
Don't restrict to BASE_TABLE.
...
This allows Views, and custom table types
to be connected to models in SqlServer.
Fixes #2529
2012-02-03 21:54:26 -05:00
mark_story
437d68c60b
Handle the case where viewPath changes.
...
Fixes #2537
2012-02-03 21:29:37 -05:00
Shadow6363
62e671f6b8
Changed MySQL in comment to SQLite.
2012-02-03 21:03:34 -05:00
mark_story
ee083e047e
Fix errors with missing sub directories.
...
Missing content-type specific errors shouldn't trigger fatal errors.
Instead a html view should be rendered as a last resort.
Fixes #2537
2012-02-02 21:25:46 -05:00
mark_story
f5d05d9ea9
Fix https + query string requests.
...
Using https + query strings would result in port 80 instead of the
default https port.
Fixes #2530
2012-02-01 21:10:56 -05:00
mark_story
e697c68da5
Uncommented code works better.
2012-02-01 20:24:02 -05:00
mark_story
b03d7ba9b3
Fix reset() missing delivery property.
...
Fixes #2533
2012-02-01 20:20:14 -05:00
mark_story
167a551656
Fix incorrect doc block.
2012-02-01 19:30:56 -05:00
Ceeram
62df929342
adding test for image in subdir and fullbase, closes #2534
2012-02-01 14:37:46 +01:00
Ceeram
c8eae93292
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/Http/HttpSocket.php
2012-02-01 12:11:01 +01:00
Ceeram
cccf663c23
omit equal sign if query component is not a key value pair
2012-02-01 12:04:52 +01:00
mark_story
94778ef673
Add block option to HtmlHelper::scriptBlock()
2012-01-31 22:20:21 -05:00
Stefano Zoffoli
edeca2fd3c
Fix for extending plugin's view
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-31 21:04:21 -05:00
mark_story
e8d3d7ce38
Fix failing test.
...
Paths changed. The Lib directory shouldn't be in the view paths.
2012-01-30 22:31:19 -05:00
mark_story
01b45cc246
Add files I forgot in previous commit.
2012-01-30 22:29:52 -05:00
mark_story
6c7a14e482
Adding fallback path to plugin.
...
This matches the recent changes for the app dir.
Adding tests for the plugin variant.
2012-01-30 22:21:00 -05:00
Matthew Lanigan
8ed4876830
Add APP/Package to tested paths in App::load()
2012-01-30 10:31:35 -05:00
Anton
57eec6e6fc
added decoding of keys for named parameters
2012-01-30 00:26:56 +02:00
Anton
57bd1ea5f9
added test for check nested url
2012-01-30 00:25:48 +02:00
mark_story
a275555297
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
mark_story
4dd13ef554
Fix issue where session would always be regenerated.
...
Fixes #2519
2012-01-29 15:37:14 -05:00
mark_story
a4740f02f1
Remove odd inflection.
...
This additional inflection isn't needed. People can type the classname
they want.
Refs #2514
2012-01-29 13:56:53 -05:00
mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
mark_story
1600322a54
Splitting ConfigReaderInterface out into a separate file.
...
Refs #2514
2012-01-29 13:30:05 -05:00
mark_story
b9053161f4
Split I18nModel into a separate file.
...
Refs #2514
2012-01-29 13:28:08 -05:00
mark_story
0fb6f88a2e
Split Cache + CacheEngine into separate files.
...
Refs #2514
2012-01-29 13:25:06 -05:00
ADmad
ca32ca185a
Fixing API docblock
2012-01-29 22:24:26 +05:30
Tigran Gabrielyan
30d6341e7f
Fixed bug in CacheHelper where PluginAppController was not being loaded
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-28 22:35:42 -05:00
Mark Story
21cf8ad018
Merge pull request #448 from majna/2.1-paging-current
...
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 10:06:56 -08:00
Majna
d7b06194a4
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 18:24:28 +01:00
slimus
7c08e4b0f4
Update lib/Cake/Console/Shell.php
2012-01-28 23:45:44 +07:00
slimus
57e4751a82
fix shell help for incorrect user input
2012-01-28 16:36:59 +07:00
mark_story
752711e963
Fix missing behavior constructor.
2012-01-27 21:10:57 -05:00
mark_story
fb7717c0da
Fix wonky tabs.
2012-01-27 20:59:03 -05:00
mark_story
3b9f88030e
Add tests for previous commit.
2012-01-27 20:59:03 -05:00
mark_story
9ff0739504
Improving test generation.
...
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00
mark_story
d904ab00fa
Merge branch '2.0' into 2.1
2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8
fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464
2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
ADmad
00649cbdde
Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748 . Closes #2509
2012-01-26 17:56:42 +05:30
mark_story
9089bba84b
Fix failing test.
2012-01-25 21:19:16 -05:00
mark_story
5b9d69fcc8
Update image() docs.
2012-01-25 21:14:01 -05:00
Mark Story
7cfd27e7f6
Merge pull request #419 from radig/2.1
...
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476 )
2012-01-25 18:05:56 -08:00
mark_story
f02a3b0531
Wrap aliases containing , in ""
...
Fixes #2502
2012-01-25 21:03:03 -05:00
AD7six
ecbe337052
Make extending a missing element throw an exception
...
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception
in addition "absolute" paths can be used such that (using elements as an
example)
$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp
Closes #2504
2012-01-25 13:04:45 +01:00
Ceeram
6d69ec3a78
update book link
2012-01-25 10:12:59 +01:00
mark_story
154b001552
Fix tests that fail on windows.
...
Refs #2148
2012-01-24 21:12:26 -05:00
mark_story
bd0104d972
Add methods to CakeTestCase
...
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.
Refs #2148
2012-01-24 21:08:56 -05:00
mark_story
29514b08fb
Fix re-numbering of values in exportVar()
...
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.
Fixes #2506
2012-01-24 20:52:43 -05:00
mark_story
dbece1f157
Add test for saveField() + foreign key.
...
Closes #2507
2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588
Fix indentation.
2012-01-24 20:32:06 -05:00
AD7six
11ed1e6ea5
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-24 13:55:56 +01:00
AD7six
def96c0460
throw an exception if the view you try to extend doesn't exist
...
or element, or layout
2012-01-24 13:54:39 +01:00
Ceeram
95aa7e32c3
include theme in _passedVars array
2012-01-24 10:42:18 +01:00
mark_story
354716cf60
Fix issues with sparse arrays in ThemeView.
...
Fixes #2500
2012-01-23 20:22:06 -05:00
Kyle Robinson Young
f69edb5c80
Remove incorrect parameter in HtmlHelper::script docblock example
...
Fixes #76
2012-01-23 16:01:38 -08:00
Ceeram
4f1be12046
Merge branch '2.1-appshell' into 2.1
2012-01-23 15:29:03 +01:00
Jose Lorenzo Rodriguez
62b203f54c
Update version number to 2.1.0-beta
2012-01-22 21:18:22 -04:30
Graham Weldon
64d4387c82
Added default prefix to cache configurations.
2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
9d0a67ddec
Avoiding class name conflicts
2012-01-22 16:46:41 -04:30
José Lorenzo Rodríguez
5cc2860c41
Merge pull request #437 from josegonzalez/2.1-theme-view
...
2.1 theme view
2012-01-22 12:52:00 -08:00
Jose Diaz-Gonzalez
c2519e702d
Merging ThemeView and View class
...
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
2012-01-22 15:45:26 -05:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a
Set encoding in CSS file.
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -05:00
Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -04:30
Jose Lorenzo Rodriguez
1884cd1f28
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-21 15:49:25 -04:30
Jose Lorenzo Rodriguez
37314a2188
Logging transaction commands in DboSource, fixes #2457
2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52
Preventing datasource creationa and access on models having $useTable = false;
2012-01-21 14:03:11 -04:30
mark_story
70bb839de9
Add validation guess for not null + text types.
...
Fixes #2493
2012-01-21 13:10:30 -05:00
mark_story
bc689151a4
Add note about PHP's include_path.
...
Refs #2497
2012-01-21 10:23:25 -05:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257
Merge changes from hmic/CakeEmail-2.0
...
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.
Fixes #GH433
2012-01-20 20:17:02 -05:00
Ceeram
d4e2fbf6b8
set correct default validate option, now matches saveAll/saveMany default value, fixes #2492
2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3
Merge changes from 1.3 to 2.0
...
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
2012-01-19 22:50:40 -05:00
mattpotts
1c645152ca
added sftp to url()
2012-01-19 22:05:10 -05:00
mark_story
69a69d48a2
Add test for Validation::url() + sftp.
2012-01-19 22:04:10 -05:00
Jose Lorenzo Rodriguez
00a5510b1d
Readability changes
2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
5df2a0957f
Not sending the response in beforeRender, better let Dispatcher do its work
2012-01-19 22:26:32 -04:30
mark_story
1693478889
Adding test for #GH424
2012-01-19 21:50:51 -05:00
mark_story
ad304e0b43
Reformat long line.
2012-01-19 21:50:51 -05:00
Mark Story
599d8b885c
Merge pull request #424 from stefanozoffoli/patch-2
...
Prevent blackhole auth error where are present multi fields
2012-01-19 18:50:39 -08:00
mark_story
eb101b9eb8
Update Model::saveAssociated() documentation
...
Fixes #2492
2012-01-19 21:10:46 -05:00
wnasich
c95ab282dc
Test case and Fix for: Number::currency() issue
...
Fixes currency() for custom formats and numbers between -1 and 1.
Fixes #2489
Conflicts:
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
lib/Cake/View/Helper/NumberHelper.php
2012-01-19 21:07:27 -05:00
ADmad
d61b6dc7d3
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 04:05:40 +05:30
Ceeram
2a9e6771c3
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
2012-01-19 23:26:43 +01:00
ADmad
2c239cc851
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 03:31:08 +05:30
Stefano Zoffoli
c3b806ce8c
Prevent blackhole auth error where are present multi fields
2012-01-19 17:48:39 +01:00
AD7six
b62d9729a9
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab
Merge branch 'feature/set-nest' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
2012-01-19 10:51:09 +01:00
Jose Lorenzo Rodriguez
769a5c24e6
Fixing some failing test cases
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd
Making it possible to cancel the render() process from any beforeRender listener
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450
Fixing typo in docblock
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
a7662eba57
fixing doc comment identation
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc
Implementing RequestHandler::checkNotModified() as a helper for HTTP caching
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e
Implementing CakeResponse::notModified()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb
Implementing the CakeResponse::etag()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6
Adding CakeResponse::vary()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e
Implementing mustRevaidate()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571
Removing Pragma headers, implementing sharedMaxAge in CakeResponse
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f
Adding test case for maxAge()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db
Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f
Implementing the modified() method in CakeResponse to have an easier way of setting the modification time
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2
Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e
Not appending the charset information for content types that are not text/* in CakeResponse
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6
Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130
Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e
Adding protocol() method to CakeResponse to be able to change it on the fly
2012-01-19 01:08:43 -04:30
Scott Harwell
e1738c8c4a
Added check for NOT in key when array count === 1 to prevent SQL error
2012-01-18 15:04:53 -05:00
0x20h
4532659fed
code cleanup, added some tests
2012-01-18 20:59:44 +01:00
AD7six
f1f1ce0db4
allow specifying an explicit root
2012-01-18 13:05:44 +01:00
Cauan Cabral
03bac42366
Change fullPath option to fullBase in HtmlHelper::image for consistency
...
Updated test cases for that.
Included doc block about that option.
2012-01-18 08:32:40 -03:00
mark_story
5e495ad90c
Simplify how options are checked.
2012-01-17 21:57:22 -05:00
Mark Story
e080bb27b9
Merge pull request #411 from fitorec/2.0
...
Check the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-17 18:53:00 -08:00
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Cauan Cabral
90426674cb
Merge branch 'master' into 2.1
2012-01-17 23:18:54 -03:00
Cauan Cabral
d2315ef35b
Fix test for HtmlHelper::link
2012-01-17 23:15:11 -03:00
Cauan Cabral
0c0135ff5e
Option to return img src with fullpath address
2012-01-17 22:55:24 -03:00
Majna
d2dd861417
Update doc block for 'keepExisting' HABTM option.
2012-01-17 22:02:30 +01:00
Majna
e947df36a5
Remove unnecessary condition in Model::getID().
2012-01-17 21:57:40 +01:00
Majna
826374e57c
Remove unnecessary param when calling begin, commit and rollback on datasource.
2012-01-17 21:52:22 +01:00
Ceeram
828117583f
fix that argument with 0 as value will stop parsing args, tests added
2012-01-17 20:01:40 +01:00
mark_story
c81fe6249d
Fix prefix = false in connect()
...
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.
Fixes #2479
2012-01-16 21:30:26 -05:00
Scott Harwell
153b9f9ee2
Updated to use camelize rather than classify
2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667
Added check for duplicate methods to prevent fatal php error
2012-01-16 14:45:12 -05:00
Renan Gonçalves
3a3d89d6d1
Updating test to reflect last changes made by pull #413 .
2012-01-16 16:51:49 +01:00
Bob Fanger
5cb974ee70
Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page
2012-01-16 16:21:06 +01:00
Fitorec
ddbaa66997
Reviewing the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-15 21:16:45 -06:00
Jose Diaz-Gonzalez
adde2a9af5
Fixed broken Controller::setAction() testcase
2012-01-15 15:16:49 -05:00
Jose Diaz-Gonzalez
ad2472aab0
Testcase for Controller::setAction()
2012-01-15 15:00:30 -05:00
Jose Diaz-Gonzalez
6046b8d013
Properly set the current action on CakeRequest when invoking Controller::setAction()
2012-01-15 14:32:09 -05:00
ADmad
f11389fd10
Merge pull request #404 from tigrang/router-defaultRouteClass-fix
...
Router::defaultRouteClass() now returns currently set route class if no param is passed. Also added Router::_validateRouteClass() for route class validation.
2012-01-15 00:44:43 -08:00
Jose Lorenzo Rodriguez
ef568b1159
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-14 23:31:56 -04:30
Jose Lorenzo Rodriguez
81b41aa561
Optimizing Configure::delete(), you can now delete arbitrarily nested keys
2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66
Optimizing Configure::read(), now it is possible to read arbitrarily nested keys
2012-01-14 23:22:08 -04:30
Tigran Gabrielyan
f5b62eb84c
Fixed typo in DocBlock
...
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
2012-01-14 18:45:51 -08:00
AD7six
67f4fa0f20
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-15 01:03:48 +01:00
AD7six
22f844c48f
prevent block="css" when using inline=false css
2012-01-15 01:03:17 +01:00
mark_story
c89c49c310
Enhance HtmlHelper::getCrumbs() $startText param
...
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.
Fixes #2475
2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252
fix magic __isset()
2012-01-14 12:42:10 -05:00
Jose Lorenzo Rodriguez
3a48f64370
Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys
2012-01-14 02:15:31 -04:30
0x20h
c6624faf76
more clear test setup
2012-01-13 23:51:18 +01:00
0x20h
9838338976
docblocks
2012-01-13 23:34:35 +01:00
0x20h
bfaea78504
allow more elaborate regex rules
2012-01-13 23:29:23 +01:00
0x20h
95a41af9db
allow multiple roles for a rule to be specified as string or array
2012-01-13 22:02:25 +01:00
0x20h
ef5eead038
use more appropriate array key when passing options to the adapter
2012-01-13 21:55:47 +01:00
0x20h
6ddf6dad36
reverting my mistake
2012-01-13 21:50:03 +01:00
0x20h
153152642c
PHP configuration file base Acl implementation
2012-01-13 21:43:48 +01:00
mark_story
b14072aa6f
Add Router::defaultRouteClass()
...
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.
Fixes #2435
2012-01-12 22:19:55 -05:00
Mark Story
533feea2b1
Merge pull request #403 from rintaun/patch-2
...
$action in AclShell::_getParams() should default to '*', not NULL
2012-01-12 19:08:42 -08:00
Mark Story
b76f8f8832
Merge pull request #260 from tPl0ch/2.1-authenticate
...
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
2012-01-12 18:53:19 -08:00
mark_story
b6040aec5a
Update UpgradeShell for App classes.
...
Correctly move AppController and AppModel.
Fixes #2472
2012-01-12 21:37:34 -05:00
Jose Lorenzo Rodriguez
2c5cb1157f
Merge branch '2.1-alltests' into 2.1
2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79
Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP
2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e
Merge remote-tracking branch 'origin/2.1' into 2.1
2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9
Fixing php 5.2 specific problem, closes #2468
2012-01-12 19:13:56 -04:30
Ceeram
eaf6f0e2c1
add missing App::uses()
2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573
add missing tests
2012-01-12 13:06:24 +01:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b
rename set::getValue to set::get - and make it public
2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880
$action in AclShell::_getParams() defaults to '*', not NULL
2012-01-11 21:59:58 -05:00
mark_story
97ce118294
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
Jose Lorenzo Rodriguez
1a741b853b
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877
Explicitly casting to string a variable that could in times be either string or integer
2012-01-11 21:25:22 -04:30
mark_story
4d73f4e6a1
Fix boundaries used in multi-part messages.
...
Inline attachments should use the multipart/related boundary. Otherwise
sections will be incorrectly nested.
Fixes #2413
2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41
Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries.
...
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de
Ensure helpers are loaded in data views.
...
Both XmlView and JsonView should load helpers when
they use view files.
Fixes #2465
2012-01-11 20:21:56 -05:00
Victor Yap
cf8c1cd93b
Return length 36 for uuid columns in Postgres.describe()
...
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.
Fixes #2467
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7
Replace smart quotes with ASCII equivalents.
...
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745
Add additional empty() for tablePrefix.
...
Fixes compatibility issues with plugins that worked correctly in
previous point releases.
Fixes #2462
2012-01-10 21:01:03 -05:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
a8bc916104
Move check out of the loop, and allow nulls.
...
Refs #2341
2012-01-10 20:15:59 -05:00
AD7six
941d503726
documentation clarification
2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3
whitespace
2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51
add a test for what happens when you nest on a field that doesn't exist
2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603
add tests for set nest method
2012-01-10 10:18:59 +01:00
AD7six
d534013570
reduce code repetition
2012-01-10 09:47:51 +01:00
mark_story
d238d8c0bb
Fix incorrect __isset().
...
There was a missing $ before name. Fixes issues
with dynamic properties not being handled correctly.
Fixes #2450
2012-01-09 21:47:57 -05:00
mark_story
dbea15650b
Add iPad to the list of mobile clients.
...
Fixes #2452
2012-01-09 21:33:13 -05:00
AD7six
5608d63541
allow set nest to work with any-d arrays
...
not just model-formatted arrays
2012-01-10 01:24:20 +01:00
AD7six
442d889f99
move the paths used into options
2012-01-10 00:48:36 +01:00
AD7six
7b640b8123
move find threaded logic to the set class
2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-09 23:42:09 +01:00
AD7six
336c750b7e
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
2012-01-09 23:38:32 +01:00
ADmad
0be71a08d6
Adding / updating I18n class test cases.
2012-01-10 01:46:19 +05:30
ADmad
30522d0219
Adding $language parameter to I18n::translate()
2012-01-10 00:51:48 +05:30
ADmad
08825e54b7
Replacing hardcoded default domain with static property I18n::$defaultDomain
2012-01-10 00:51:48 +05:30
ADmad
1f246d61ca
Refactoring I18n class to expose public methods to read .po, .mo and locale definition files.
2012-01-10 00:51:47 +05:30
mark_story
1ffde95239
Update version number to 2.1.0-alpha
2012-01-08 22:23:56 -05:00
mark_story
1bc4562f3a
Fix failing test in App.
2012-01-08 22:14:32 -05:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc
Fix errors generated when option['order'] is undefined.
...
Fixes #2447
2012-01-08 21:55:51 -05:00
mark_story
3c48552f81
Fix error with more case-sensitive databases.
2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a
Fix issue with find(count) and translated conditions.
...
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.
Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.
Fixes #2349
2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
c029316a62
Merge branch '2.1-hiphop' into 2.1
2012-01-08 20:12:40 -04:30
Jose Lorenzo Rodriguez
850dbb9453
More explicit fetch mode in Mysql datasource
2012-01-08 18:46:42 -04:30
mark_story
9a67a70703
Fix failing test.
2012-01-07 20:24:33 -05:00
mark_story
79564fb7d4
Remove incorrect constant.
2012-01-07 20:10:14 -05:00
mark_story
72b9eb540e
Update core cake.php to match other versions.
...
This makes the pear package install play nice as well.
2012-01-07 20:05:11 -05:00
mark_story
da5d4bb816
Revert version number change.
...
Add trim to fix cli display.
2012-01-07 20:05:11 -05:00
mark_story
6361500124
Update version number to 2.1.0-alpha
2012-01-07 20:05:10 -05:00
Jose Lorenzo Rodriguez
8b7f069415
Wrapping highlight_string into a helper function as hphp does not implemnet this function
2012-01-07 19:10:44 -04:30
Jose Lorenzo Rodriguez
44dd25010d
Adding a replacement for zend_thread_id() to use within hiphop
2012-01-07 18:41:16 -04:30
Jose Lorenzo Rodriguez
67d18b0c59
Making sure the Validation class exists before checking methods on it
2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0
Initializing CakeSession class only when required, mixing procedural code with class definitions is not good
2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77
Extracting the CakeSessionHandlerInterface into its own file
2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5
Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage
2012-01-07 18:06:02 -04:30
Jose Lorenzo Rodriguez
fa99b58622
Ensuring the javascript provider class is loaded before checking method on it
2012-01-07 18:03:22 -04:30
mark_story
beced84d2d
Fix illegal offset caused by TranslateBehavior.
...
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.
Fixes #2443
2012-01-07 11:58:35 -05:00
mark_story
87924414fc
Update Configure::load() to use Set::merge()
...
This fixes some of the awkward behavior that using
array_merge_recursive() could create.
Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
1991430584
Removing test that does not relate anymore to SqlServer datasource
2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d
Fixing a few SqlServer failing tests
2012-01-07 02:14:07 -04:30
Jose Lorenzo Rodriguez
abb370fe3f
Fixing windows failing test case on the debug function
2012-01-07 01:39:40 -04:30
Jose Lorenzo Rodriguez
ba097d404f
Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks
2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba
Fixing a couple failing tests on windows using sqlserver
2012-01-07 00:37:50 -04:30
mark_story
de7921a5d4
Merge branch '2.0' into 2.1
2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f
Add missing else for non SQLServer db's.
2012-01-06 23:06:12 -05:00
mark_story
15c7493e39
Merge branch '2.0' into 2.1
2012-01-06 23:02:16 -05:00
mark_story
f23226b937
Fix failing test on windows
...
File permissions do not work the same on windows, skip the test.
2012-01-06 23:01:59 -05:00
mark_story
d69c3f3db6
Fix failing tests with SQLServer.
2012-01-06 22:53:39 -05:00
mark_story
f22c80e9ec
Add skip for test that fails on SQLServer.
...
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
2012-01-06 22:21:54 -05:00
mark_story
e649a0516e
Fix singularization of 'foes'
...
Fixes #2424
2012-01-05 21:22:40 -05:00
Jose Lorenzo Rodriguez
7c0297a92c
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
Majna
8ad989cabe
Fix dispatching event when event key name is used.
2012-01-05 18:31:00 +01:00
Simon Males
adc6846145
schema update fails with -f flag, although it's supported.
2012-01-05 16:54:02 +11:00
mark_story
95ec741b6c
Changing SCRIPT_NAME to PHP_SELF
...
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.
Fixes #2437
Fixes #2334
Fixes #2268
2012-01-04 21:10:29 -05:00
José Lorenzo Rodríguez
f9c8d0cbf9
Merge pull request #394 from majna/2.0-sess-doc
...
Remove unused property CakeSession::$security.
2012-01-04 16:20:24 -08:00
Majna
75b4e7d550
Remove unused property CakeSession::$security.
2012-01-04 22:09:40 +01:00
José Lorenzo Rodríguez
3589eaebcf
Merge pull request #393 from majna/2.0-sess-doc
...
Fix incorrect doc block in CakeSession.
2012-01-04 12:49:36 -08:00
Majna
ba02cf7a9a
Fix incorrect doc block in CakeSession.
2012-01-04 21:40:14 +01:00
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08
Remove duplicate methods.
...
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
c43b099894
Fix null bytea columns.
...
Apply patch from 'opiazer' Fixes #2432
2012-01-03 20:51:56 -05:00
mark_story
101148c10f
Return 0 if there is no result.
...
The documented return is an integer. Stick to that.
Fixes #2430
2012-01-02 20:18:01 -05:00
mark_story
b4faa00703
Adding error to find(threaded).
...
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
2012-01-02 13:46:35 -05:00
Mark Story
81d7ef46c5
Merge pull request #392 from vesln/resource-map
...
Resource map
2012-01-02 05:23:30 -08:00
Veselin Todorov
3eea2e2073
Adding resourceMap accessor test
2012-01-02 13:53:32 +02:00
Veselin Todorov
8864805277
Adding resourceMap accessor
2012-01-02 13:53:21 +02:00
mark_story
997aa8a37b
I'm an idiot. Fix the parse error.
2012-01-01 21:29:13 -05:00
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3
Add Windows Phone OS to mobile browser list.
...
Fixes #2428
2012-01-01 12:57:35 -05:00
Kyle Robinson Young
8b9770d34d
Fix types in docblocks in App class
2011-12-31 14:51:24 -08:00
mark_story
c3e9a931d6
Should have been association name, not field name.
2011-12-30 20:54:26 -05:00
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -05:00
mark_story
6c902a19b3
Fix issue with rendering elements inside blocks.
...
Fixes exceptions being raised when you tried to render
elements inside blocks. Instead compare the number of open blocks.
This should not change before/after rendering a view.
2011-12-30 14:56:31 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196
Merge pull request #387 from shama/patch-text-truncate
...
Prevent TextHelper::truncate() from breaking HTML
2011-12-30 07:15:35 -08:00
mark_story
ed43c685b9
Fix string offset error in PHP 5.4
2011-12-29 22:10:12 -05:00
mark_story
ff29b194ed
Fix version config.
2011-12-29 20:12:45 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
tigrang
015f9957be
Changed order of controller var merging
...
From AppController -> PluginAppController to
PluginAppConroller -> AppController
Fixes #2420
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-29 20:02:00 -05:00
mark_story
9cdf8042bf
Fix issue with scripts_for_layout compatibility.
2011-12-29 11:58:05 -05:00
mark_story
5936fa5930
Fix strict errors.
2011-12-29 11:10:25 -05:00
Ceeram
929a40364f
adding magic method__isset() for overloaded properties
2011-12-29 16:22:08 +01:00
Rachman Chavik
1d333fd8b7
fullTableName needs to check for empty schemaName
2011-12-29 19:18:37 +07:00
Rachman Chavik
b1aae5b5ab
add fullTableName tests with empty schemaName
2011-12-29 19:17:06 +07:00
mark_story
339259c841
Update version to 2.0.5
2011-12-28 22:00:12 -05:00
Jose Lorenzo Rodriguez
a47c8160dd
Merge remote-tracking branch 'origin/2.1' into 2.1
2011-12-28 19:29:48 -04:30
Mark Story
83b28c42cf
Fix failing tests and missing boundary markers.
...
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83
Add test for inline attachments.
2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6
Update sending attachments.
...
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now. Re-built the internals
of message rendering to remove duplication and redundant code paths.
Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
53598c722c
Pulling out view rendering from boundary setting.
2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017
Add a few regression tests for CakeEmail.
2011-12-27 22:51:47 -05:00
Mark Story
bbef4aa36d
Convert assertions to assetContains.
2011-12-27 22:51:47 -05:00
Mark Story
8414d37e48
Add docblock examples for attachments.
2011-12-27 22:51:47 -05:00
Jose Lorenzo Rodriguez
6ac3b10a5e
Making beforeDelete trigger first on behaviors and then in model
2011-12-27 22:49:50 -04:30
Mark Story
21ac8492b1
Adding an int cast.
...
PHP 5.4 doesn't like floats for string offsets.
2011-12-27 21:57:33 -05:00
Mark Story
e9813d7a97
Fix errors with illegal string offsets.
...
If $_list becomes a string notice errors are triggered when trying
to do offsets in PHP 5.4
2011-12-27 21:38:14 -05:00
Mark Story
2cc38b5ba7
Fix failing test in PHP5.4
2011-12-27 19:40:51 -05:00
mark_story
0b9b23fe38
Fix caching of paths when a plugin param is used.
...
Plugin paths should not be cached as it makes subsequent look-ups
behave incorrectly.
2011-12-27 19:24:16 -05:00
mark_story
69b1c33f1f
Fix extending in loops.
2011-12-27 19:24:16 -05:00
mark_story
70981d05ca
Throw an exception when a view extends itself.
2011-12-27 19:24:15 -05:00
mark_story
047e93e285
Clean up internal API's
...
- There was some duplication in element() for handing plugins.
- Deprecate options[plugin] for element()
- Add file omitted in previous commit.
2011-12-27 19:24:15 -05:00
Ceeram
d8cbe8a1f7
Cleaning up
...
- Adding docblock
- Adding visibility keyword
- Update assertion methods.
- Split up tests into smaller methods.
2011-12-27 19:23:52 -05:00
Ceeram
210f8c9e2c
adding tests for plugindot syntax in view filenames
2011-12-27 19:22:21 -05:00
Ceeram
a72ccf28e3
accept dot syntax for element,view and layout filename from plugins fixes #2247
2011-12-27 19:22:21 -05:00
Mark Story
7f46ede097
Add more complete api docs for label()
...
Fixes #2415
2011-12-27 10:08:54 -05:00
Jose Lorenzo Rodriguez
33705f24bf
returning the correct query in beforeFind in case callbacks return true
2011-12-26 13:38:04 -04:30
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30
Mark Story
eda916d85b
Update tests to use assertContains
2011-12-26 12:03:48 -05:00
Mark Story
0750069126
Remove pointless condition.
2011-12-26 11:56:44 -05:00
mark_story
d8bc13f996
Fix incorrect time handling in deconstruct()
...
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.
Fixes #2412
2011-12-26 10:03:14 -05:00
mark_story
bbad5d86bc
Adding louder more informative error to i18n.
...
When a plural form is wrong, or the Plural-Forms header is wrong, we should
give a more useful error message than strlen() does. Also make a dumb guess
at what the correct translation is.
Fixes #2045
2011-12-25 23:27:01 -05:00
Jose Lorenzo Rodriguez
35ecbfebde
Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests
2011-12-25 23:17:08 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4
Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller
2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
ffa12f4d47
Fixing test and implementing return values for events
2011-12-25 21:52:12 -04:30
Jose Lorenzo Rodriguez
078a2dfd72
Migrating View and Helpers events to use the CakeEvenManager
2011-12-25 19:00:19 -04:30
Jose Lorenzo Rodriguez
5d67195bf7
Migrating Controller events to use the CakeEventManager
2011-12-25 14:44:34 -04:30
Jose Lorenzo Rodriguez
0a49bd987c
Refactoring subscriber attaching and making it possible to define multiple functions per event
2011-12-25 14:42:25 -04:30
Jose Lorenzo Rodriguez
07d358d2cd
Making it possible to access name and subject directly on CakeEvent
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
32fe854fab
Adding test for event stopPropagation
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
f1acd70bad
Implementing a global event manager
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
bb62f05890
Implementing subscriber detaching
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
adf95a7ac6
Testing the subscriber object attaching to the manager
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
bef20e6175
Starting to add subscriber classes support, inverted the parameter order for CakeEventManager::attach()
2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
e8044cd528
Adding new general purpose event system, thanks to Florian Krämer for the original implementation
2011-12-25 14:42:24 -04:30
Kyle Robinson Young
acca796d10
Fix tag order when closing open tags with TextHelper::truncate()
2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f
Prevent TextHelper::truncate() from breaking HTML
...
Fixes #2397
2011-12-24 21:25:07 -08:00
mark_story
2c0e030831
Move call to tagIsInvalid to FormHelper
...
tagIsInvalid() doesn't exist in Helper, and shouldn't be
called from that class.
Fixes #2411
2011-12-23 20:41:16 -05:00
ADmad
e4cc18c0e7
Changing test case to make it pass on Sqlite
2011-12-24 01:18:07 +05:30
ADmad
053ebf211e
More test case fixing
2011-12-24 01:04:38 +05:30
ADmad
f24c01c1f4
Fixed failing test cases.
2011-12-24 00:59:51 +05:30
Kyle Robinson Young
c8650165bb
Add returnPath to test on SmtpTransport
2011-12-22 23:16:43 -08:00
ADmad
ba27c8c201
Added multi-model fieldList support
2011-12-23 02:07:48 +05:30
ADmad
e077cf8535
Fixing failing test case.
2011-12-22 03:37:04 +05:30
ADmad
bcab3d0cb9
Made default value and behavior of param $exceptions for Folder::tree() identical to same param in Folder::read()
2011-12-22 03:29:21 +05:30
ADmad
b84c9a1aaa
Removing unused function Folder::_tree(). Added exception handling in Folder::delete().
2011-12-22 03:22:46 +05:30
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 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
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
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
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
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
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
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
Jose Lorenzo Rodriguez
76e334ca38
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-28 22:30:36 -04:30
Mark Story
8dd9846676
Merge pull request #335 from rchavik/remove-timestamp-lines
...
Removing timestamp lines from generated files
2011-11-28 18:46:37 -08:00
mark_story
a56ad0ccac
Fixing failing tests.
2011-11-28 21:36:44 -05:00
mark_story
168c6f14c2
Checking types before calling methods.
2011-11-28 21:36:13 -05: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
cff980b45d
Call parent::__construct so helpers are available.
2011-11-27 23:51:50 -05:00
mark_story
6e1b1df2b2
Change serialize to _serialize
...
Its possible that a developer would use 'serialize' as a legitimate
view variable. Prefix with an _ to minimize that.
2011-11-27 23:51:49 -05:00
mark_story
04463c4ee5
Fix errors found in review.
2011-11-27 23:51:49 -05:00
mark_story
50ec08f9bd
Adding support for array serialize values.
...
Using an array for 'serialize' gives a set of view vars
to convert into the view output.
2011-11-27 23:51:49 -05:00
mark_story
d9482fef25
Limit what exceptionrenderer outputs.
...
The exception object should not be part of production errors.
2011-11-27 23:51:49 -05:00
mark_story
b0d0e06b97
Update RequestHandler tests for new View classes.
2011-11-27 23:51:49 -05:00
mark_story
c1f5dc1e40
Make XmlView consistent with JsonView.
...
Both allow a view script or a serialize key with the name
of the variable to be serialized.
2011-11-27 23:51:48 -05:00
mark_story
5e9b1583e5
Making JsonView work more like the XmlView.
2011-11-27 23:51:48 -05:00
mark_story
011fd51539
starting to refactor views.
...
Adding comments.
Incomplete.
2011-11-27 23:51:48 -05:00
mark_story
c64e41eb45
Fix casing of vars in tests.
2011-11-27 23:51:48 -05:00
mark_story
b20803bb6f
Fix parse error when short tags are on.
2011-11-27 23:51:48 -05:00
Juan Basso
a6c1aafcc4
Added XmlView.
2011-11-27 23:51:47 -05:00
Juan Basso
e737845e95
Removing unnecessary code.
2011-11-27 23:51:47 -05:00
Juan Basso
873489053c
Not loading helpers and others stuffs not necessary to Json view. Tests added.
2011-11-27 23:51:47 -05:00
mark_story
cfbc43671e
Starting content type specific error pages.
...
- Adding RequestHandler to the error controller. This allows reuse
of all of Cake's internals.
- Adding a simple JsonView class to do serialized JSON views.
- Adding serialize hooks, and wiring things together.
2011-11-27 23:51:47 -05:00
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
Rachman Chavik
6874e4904e
removing 'id' from fixtures (lh ticket 2296)
2011-11-25 22:36:44 +07:00
Rachman Chavik
1677e87512
fixing broken tests: update expected regex pattern
2011-11-25 22:36:44 +07:00
Rachman Chavik
1f7c292651
fixing broken tests: updating fullTableName() use
...
At the same time, reversing arguments since phpunit wants 'expected' as
the first parameter.
2011-11-25 22:36:44 +07:00
Rachman Chavik
c4cbf1c635
Adding cross schema test
2011-11-25 22:29:23 +07:00
Rachman Chavik
813ecb6348
set schemaName for joinTable object in TranslateBehavior
2011-11-25 22:29:23 +07:00
Rachman Chavik
204851842b
In a multidb habtm, we cannot rely on 'joinTable'
...
Instead, we should use value from 'with' when it's available.
2011-11-25 22:29:23 +07:00
Rachman Chavik
fd07b961d4
Use the correct datasource when saving multiple model
2011-11-25 22:29:23 +07:00
Rachman Chavik
144b556d1f
Adding new property Model::schemaName
...
Just like physical table name, the schema name is an important information
that should be available in models. The property will be populated accordingly
by the model's datasource.
2011-11-25 22:29:23 +07:00
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
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07: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
Rachman Chavik
211146fb7a
Enable short option for --plugin and --connection
...
This is done to make things more consistent with the bake shell
2011-11-24 19:29:27 +07:00
Christian Hieke
6757891a33
Ceeram suggested this change https://github.com/cakephp/cakephp/pull/322#issuecomment-2780158
2011-11-24 09:51:05 +01:00
Christian Hieke
61b9d77b75
Ceeram suggested this change https://github.com/cakephp/cakephp/pull/322#issuecomment-2780158
2011-11-24 09:41:58 +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
AD7six
adf73abb07
another bulletproofing for schemaless baking
2011-11-20 16:08:01 +01:00
AD7six
d2514f34c0
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-20 15:45:25 +01:00
AD7six
43ae7af17d
prevent missing-index notices
...
when baking with a schemaless db
2011-11-20 15:44:44 +01:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05: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
AD7six
f0fa6c7875
code standards
2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7
allow baking models with missing tables - even for rdbms
...
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304
allow creating models without the table existing
...
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01: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
Christian Hieke
d6b9b48d4a
Update test case for disabled radio buttons (allow boolean value)
2011-11-17 16:39:37 +01:00
Christian Hieke
7dfe72708f
Allow a boolean value for the disabled attribute in function radio.
2011-11-17 15:59:14 +01:00
Ceeram
0f299a1542
use old timestamp variable, to ensure test to pass
2011-11-17 13:09:03 +01:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
Jose Lorenzo Rodriguez
02912b6eeb
Correctly getting connection configs in CakeSchemaTest
2011-11-17 01:03:46 -04:30
Rachman Chavik
aab8e98531
Configure ClassRegistry in test mode
...
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07:00
Rachman Chavik
408e785d5e
Display datasource name in exceptions and error page.
...
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
2011-11-17 11:24:45 +07:00
Rachman Chavik
073d04931a
Adding tests for loading multischema fixtures
2011-11-17 11:24:45 +07:00
Rachman Chavik
a5ac328a71
Adding multidb fixture support
...
CakeTestFixture now has a $useDbConfig property, that is similar
to Model::useDbConfig. CakeFixtureManager now uses this property
to decide which connection to use. CakeTestFixture::$created
records datasources it was created on.
2011-11-17 11:24:45 +07: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
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -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
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Daniel Pakuschewski
841c0c2295
Dropped support for wildcard in AuthComponent::allow()
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2011-11-15 23:01:04 -05:00
Ceeram
2bb4ed01be
Removing _Token from request data.
...
It is not used outside the component and could possibly affect Model::save().
Fixes #2256
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-15 22:51:04 -05:00
mark_story
6e4493cc14
Fix ambiguous content types in RequestHandler.
...
Treat xhtml + html as content types that should trigger no
response/extension setting. They are different but similar in
that they both generally use the same HTML templates.
Fixes #2257
2011-11-15 22:48:54 -05:00
José Lorenzo Rodríguez
55d4fd3be3
Merge pull request #318 from shama/folder-test
...
Add test cases to include $exceptions with Folder::chmod()
2011-11-15 09:57:48 -08:00
Ceeram
9fd04307ff
adding sort on testresults, to avoid incorrect order returned by MySQL
2011-11-15 17:18:27 +01:00
Kyle Robinson Young
1ebaaf4dd1
Update to assertEquals on Folder tests
2011-11-15 08:18:05 -08:00
Ceeram
bc5b6f7cb2
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-15 16:47:38 +01:00
Ceeram
37a932b6a7
adding testcase for saving habtm associations with no primary model data set
2011-11-15 16:47:25 +01:00
Renan Gonçalves aka renan.saddam
1db915faec
Merge pull request #314 from challet/HttpSocket_handle_redirect
...
move 'redirect' to request, and allow to use int values as ttl
2011-11-15 03:09:15 -08:00
Kyle Robinson Young
d725869507
Add test cases to include $exceptions with Folder::chmod()
2011-11-14 23:58:58 -08:00
Kyle Robinson Young
3248e34819
Add @link to File and Folder utilities
2011-11-14 22:40:02 -08:00
Graham Weldon
eefdc43214
Fix plugins not being loaded before looking for pluign paths
2011-11-15 17:30:49 +11:00
Kyle Robinson Young
4e8239a2a5
Add missing @link to docs if available to helpers
2011-11-13 22:08:20 -08:00
mark_story
87f5b6cf26
Fix more strict errors.
...
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
Jose Lorenzo Rodriguez
de5a4ead25
Releasing 2.0.3
2011-11-13 20:32:23 -04:30
Jose Lorenzo Rodriguez
7658af354c
Removing var_dump from test cases
2011-11-13 19:54:07 -04:30
mark_story
3f506b287b
Rename file.
...
Fix build error caused by legacy workaround fixes.
2011-11-13 16:48:52 -05:00
mark_story
ccefe02de9
Fix issue with duplicate class inclusions.
...
When trying to load a class that shared a prefix with an existing
class on case insensitive file systems duplicate class errors could
occur. This would happen primarily with models and missing model classes.
Fixes #2223
2011-11-13 16:15:32 -05:00
ADmad
233a63366f
Syncing files between app directory and bake skeleton
2011-11-14 02:32:59 +05:30
ADmad
87f12de1ab
Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper.
2011-11-14 02:11:18 +05:30
Kyle Robinson Young
dba4d21492
Add @link to App docblocks and missing _packageFormat docblock
2011-11-13 10:18:42 -08:00
Clément Hallet
ecb88791c8
move 'redirect' to request, and allow to use int values as ttl
2011-11-13 17:45:33 +01:00
mark_story
9347ca2dc8
Fix requestAction post simulation.
...
POST data should not trigger notice errors.
Also fix issue where POST data could not be simulated with a
string URL.
Fixes #2248
2011-11-13 09:44:48 -05:00
mark_story
a7fcb0a61c
Fix more strict errors.
2011-11-12 21:42:20 -05:00
mark_story
17ffcde505
Update test.
...
Add fixtures so app tables aren't touched.
Replace construction with method calls.
2011-11-12 21:42:20 -05:00
mark_story
2c7854cc2f
Replace complicated $$foo with simple variable.
2011-11-12 21:42:20 -05:00
mark_story
42f9f8e2c3
Fixing strict errors.
...
While this is a minor API change, its required to
make CakePHP pass E_STRICT in testing.
2011-11-12 21:42:20 -05:00
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
Ceeram
0c0bb60486
avoid MissingPluginExceptions
2011-11-13 03:29:54 +01:00
ADmad
38d7433359
Fixing tests broken by previous commit.
2011-11-13 00:44:56 +05:30
Ceeram
d8194a5818
Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0
2011-11-12 18:09:58 +01:00
ADmad
f2a58117ca
Moving AppModel, AppController, PagesController out of core to app
2011-11-12 22:30:42 +05:30
mark_story
92688e2a49
Fix keying in SessionHelper::flash()
...
It shouldb e looking for the plugin in the params key. This
makes SessionHelper compatible with SessionComponent.
2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591
Fix session flash with plugins.
...
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
2011-11-12 11:03:17 -05:00
mark_story
50b253565a
Adding more verbose info to connection errors.
...
The start page now shows the connection exception message.
Fixes #875
2011-11-11 23:04:54 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
mark_story
5934a7a324
Fix html coverage reporting.
...
HTML coverage reports now work with PHPUnit 3.6
Fixes #2235
2011-11-11 22:13:20 -05:00
mark_story
ee6d1cfdf0
Adding changes to test controller.
...
Refs #2198
2011-11-11 21:39:30 -05:00
mark_story
99caa98df3
Update message for PHPUnit3.6
2011-11-11 21:28:34 -05:00
mark_story
493ce3a442
Fix issue where REST actions were not easily testable.
...
Fixes #2198
2011-11-11 21:28:33 -05:00
Kyle Robinson Young
7df3252d6b
Add missing @link to TimeHelper docblocks and correct @return
2011-11-11 10:51:14 -08:00
mark_story
7d756fda81
Fix Helper::field() for Model.min
...
This field would be treated as a field suffix even though
it is not. Expand existing tests, and reformat some code.
Fixes #2240
2011-11-10 22:22:11 -05:00
mark_story
0b0d180aad
Changing how insertMulti handles boolean values.
...
Binding values individually allows boolean to work correctly.
2011-11-09 22:31:06 -05:00
mark_story
1487357ba6
Convert another long test to use a dataprovider.
2011-11-09 21:25:12 -05:00
mark_story
bc40a55f20
Re-factor dispatcher asset test to use a data provider.
2011-11-09 21:25:11 -05:00
Ceeram
767d1afcd8
fixing helptext for AclShell
2011-11-09 21:07:01 +01:00
José Lorenzo Rodríguez
497ada8895
Merge pull request #311 from challet/HttpSocket_handle_redirect
...
optionnaly handles redirect before return the response
2011-11-09 09:42:52 -08:00
teddyzeenny
bdbc34bbed
Remove session.save_handler from php ini array
2011-11-09 16:40:32 +02:00
mark_story
89ced25fad
Making HttpResponse more tolerant of line endings.
2011-11-08 19:23:36 -05:00
Ceeram
cfbc6d4989
adding extra test, disproves ticket [ #2233 state:works-for-me]
2011-11-08 20:29:33 +01:00
Clément Hallet
62ae6d57e9
optionnaly handles redirect before return the response
2011-11-08 18:55:58 +01:00
Mark Story
e8e2bbc4d7
Merge pull request #304 from jamiemill/2.0-upgradefix2
...
Add exception migration to the upgrade shell.
2011-11-08 06:47:52 -08:00
Kyle Robinson Young
1b95b01265
Fix docblock formatting with Time Helper Test
2011-11-07 22:16:55 -08:00
mark_story
2c91f119cb
Remove redundant check.
2011-11-07 23:17:08 -05:00
Mark Story
946753acde
Merge pull request #306 from shama/patch-2
...
Fix incorrect toQuarter docblock return tag
2011-11-07 06:18:44 -08:00
Renan Gonçalves aka renan.saddam
2a33bc862a
Merge pull request #296 from majna/2.0-dbconfig-task
...
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Renan Gonçalves
f09904ca91
Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt
2011-11-07 10:44:28 +01:00
Ceeram
7224de962e
removing unused variable, fixes #2227
2011-11-07 09:19:01 +01:00
Kyle Robinson Young
72502e8fec
Remove extra fromString in TimeHelper::gmt and update docblock
2011-11-06 22:54:52 -08:00
Kyle Robinson Young
09300433f5
Fix incorrect toQuarter docblock return tag
2011-11-06 22:26:58 -08:00
Majna
57afa1873e
Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes.
2011-11-07 01:01:56 +01:00
jamiemill
e16890225c
Fixed mistake in UpgradeShell::exceptions()
...
My fault ;)
2011-11-06 23:19:30 +00:00
jamiemill
c966a35beb
Fixed bug in UpgradeShell::findFiles().
...
$this->_files was reset on each loop through paths, which means, for
example, if you still had the old 'views' directory kicking around
the results from 'View' would be overwritten.
2011-11-06 21:53:20 +00:00
jamiemill
4368b62dfb
Added an 'exceptions' method to the UpgradeShell.
...
This just replaces some of the basic cakeError() calls with
equivalent exceptions.
2011-11-06 21:53:11 +00:00
jamiemill
1d52dc05e1
Fix for UpgradeShell::helpers() not discovering core helpers.
2011-11-06 21:53:03 +00:00
Mark Story
6fd69b022d
Merge pull request #303 from shama/patch-1
...
Remove 5.3 notice from Config/core timezone comment
2011-11-06 13:47:31 -08:00
mark_story
d87f9f060b
Make parent method check explicit to Shell.
...
This makes only methods on Shell inaccessible on the command line.
Parent methods in AppShell or other parent classes can now be called directly.
Fixes #2193
2011-11-06 16:32:51 -05:00
Kyle Robinson Young
b2414a777f
Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment
2011-11-06 13:17:07 -08:00
Mark Story
db41a7dd16
Merge pull request #302 from majna/2.0-viewtask-methods
...
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 12:59:38 -08:00
ADmad
01aa91b3cf
Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225
2011-11-07 02:04:57 +05:30
mark_story
aae8a89623
Change var -> public in controllertask.
...
Makes the confirmation message and generated code the same.
Fixes #2216
2011-11-06 11:50:16 -05:00
mark_story
a2b6f18000
Merge branch '2.0' into 2.1
2011-11-06 11:39:01 -05:00
mark_story
3fa0bdb60f
Revert "Fix missing objects in App::objects()"
...
This change caused non controller objects to show in the
controller list. Reverting until a better implementation
can be done.
This reverts commit ba6f3c17fa
2011-11-06 11:24:33 -05:00
mark_story
cfe38985cf
Fix failing tests caused by changes in App::objects()
2011-11-06 11:23:11 -05:00
Majna
d84b66e744
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 16:14:55 +01:00
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30
ADmad
a7d08a6b39
Removed unused option triggerDisabled from ObjectCollection::trigger().
...
Fixed docblock for ObjectCollection::load();
2011-11-06 20:29:46 +05:30
mark_story
ba6f3c17fa
Fix missing objects in App::objects()
...
App::objects() should include core objects when asking
for application objects.
2011-11-06 09:42:15 -05:00
mark_story
3e54ffd8c1
Defaulting autoMock to true.
...
This fixes issues with mock controllers being discarded after use.
Not always mocking controllers causes issues with using redirect().
Fixes #2200
2011-11-06 09:36:35 -05:00
jamiemill
13ebd60b26
Removed invalid 'Helper' suffix in UpgradeShell::helpers()
2011-11-06 12:02:19 +00:00
jamiemill
6c9c36bc0e
Fixed missing array wrap in UpgradeShell::tests()
2011-11-05 22:18:49 +00:00
mark_story
c2eae6caf8
Nerfing coverage generation with PHPUnit3.6 for now.
...
PHPUnit3.6 totally changed how coverage data can be accessed, its going
to take some time to update things. This is a quick work around until
more time can be dedicated to fixing it.
2011-11-05 17:46:59 -04:00
mark_story
ad237ec681
Don't collect code coverage on every request.
2011-11-05 17:29:55 -04:00
mark_story
61d6a720d6
Add test for using autoMock and multiple redirects.
...
Having multiple redirects and not calling generate() before each test, or
using autoMock results in an exit. This is related to
[c5ca10ca69#2200
2011-11-05 17:28:13 -04:00
Graham Weldon
812e449680
Created a buffer for CakeResponse testing
2011-11-06 08:21:10 +11:00
mark_story
15753ab641
Apply patch from 'Carlos Gant'
...
Remove un-necessary loop when deleting without cascade.
Fixes #2050
2011-11-05 16:16:13 -04:00
Majna
3374406bbf
Fix View task missing 'app' param when baking custom action.
2011-11-05 19:54:21 +01:00
Vitor Pacheco
2b5b7694c9
Property 'name' removed of PagesController.
2011-11-05 15:25:41 -02:00
mark_story
cd81f9c30a
Fix comment in I18n
...
Move construction details to a protected constructor.
Fixes #2222
2011-11-05 08:19:57 -04:00
Marko Marković
4e702b2fae
Updated test for debug
...
It now detects being called from CLI
2011-11-05 10:24:46 +01:00
mark_story
bfd95d0e04
Fixing remaining failing tests in PHPUnit 3.6
2011-11-04 22:54:09 -04: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
mark_story
13900dc75c
Starting to fix issues with PHPUnit 3.6 compatibility.
2011-11-04 22:54:08 -04:00
Majna
1b9b90d2e7
Replacing 'driver' with 'datasource'.
2011-11-04 23:07:31 +01:00
Majna
1455c59e0c
Fix notice when baking db config: Undefined variable 'driver'.
2011-11-04 22:49:38 +01:00
Marko Marković
c7363bb042
Updated tests for debug()
2011-11-04 19:43:43 +01:00
Jose Lorenzo Rodriguez
d74b64d475
Merge remote-tracking branch 'origin/2.0' into 2.1
2011-11-04 12:09:31 -04:30
Jose Lorenzo Rodriguez
b983aa9192
Small optimization in DboSource
2011-11-04 10:01:45 -04:30
Marko Marković
73429b357f
Fixed inconsistent debug parameters and empty '(line )'
2011-11-04 14:58:06 +01:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Jose Lorenzo Rodriguez
926ac32549
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-03 21:21:38 -04:30
Yosuke Basuke Suzuki
f861cc6e09
Proposal. Adding new package using App::build().
...
For instance, adding new 'Service' package to app search paths.
2011-11-03 21:47:28 -04:00
Jose Lorenzo Rodriguez
2711178b4b
Fixing Content-Length calculation when there is buffered output that will be sent before the response body. fixes #2208
2011-11-03 21:09:30 -04:30
mark_story
a929951038
Fix issue with Controller::setAction()
...
Calling setAction did not modify which view file was
rendered. This was a regression with 1.3
Fixes #2212
2011-11-03 20:13:41 -04:00
Majna
51ccbad170
Fixing ignored '--exclude-plugins' option on Windows for Extract task.
2011-11-03 21:34:32 +01:00
Jose Lorenzo Rodriguez
606c30b77f
Releasing 2.0.2
2011-11-02 23:44:50 -04:30
mark_story
98a8f44fa7
Make formatting tag removal smarter.
...
Instead of removing all tags, only known
formatting tags.
Fixes #2203
2011-11-02 21:50:16 -04:00
mark_story
18a34c03a4
Fix issue where unknown exceptions would be squashed.
...
Fix issue where unknown exceptions with error codes that were not
in HTTP ranges would be ignored. In development those messages
should display.
Fixes #2205
2011-11-02 21:21:48 -04:00
mark_story
201231cd42
Fix encoding issues with debug().
...
Fixes #2199
2011-11-02 13:45:34 -04:00
Jose Lorenzo Rodriguez
3fc6d293fc
Fixing regression in ControllerTestCase after changes done in RequestHandlerComponent
2011-11-01 13:49:40 -04:30
Marko Marković
385f6f164f
Fixed typos in css
2011-11-01 16:59:11 +01:00
Lubos Remplik
985dcad802
MimeType audio/ogg added
2011-11-01 08:17:36 -07:00
mark_story
f531e7f24b
Fix UUID issue in SQLite
...
Only varchar(36) was interpreted as a uuid. char(36)
should also be treated this way. Most documentation refers
to this type. Also char(x) fields should be treated as strings,
not text.
Fixes #2184
2011-10-31 23:10:48 -04:00
mark_story
550076d75e
Fix issue in RequestHandlerComponent.
...
Fixes issues where response and request properties would
not be set as the initialize() callback would have not fired.
Fixes #2190
Fixes #2189
2011-10-31 22:41:43 -04:00
mark_story
6623b7dc9d
Update generated cache files.
...
- Cache files should contain a response object on the controller.
Without it bad things happen.
- Include the $request and $response contructor arguments for Controller.
- Update import -> uses()
Refs #2190
2011-10-31 22:27:43 -04:00
mark_story
bf43a5ee24
Fix whitespace and add usage to doc block.
2011-10-31 21:56:16 -04:00
Yasushi Ichikawa
4aeb5b461d
delete App::uses Multibyte class. It is no longer needed.
2011-10-31 23:47:36 +09:00
Yasushi Ichikawa
f39c683130
check mbstring.func_overload before using strlen()
2011-10-31 23:29:59 +09:00
Yasushi Ichikawa
e53287583e
return byte length instead of number of characters in Content-Length
2011-10-31 18:31:08 +09:00
Jose Lorenzo Rodriguez
7141dff5d1
Releasing 2.0.1
2011-10-30 18:28:32 -04:30
Jose Lorenzo Rodriguez
d49096aab9
Fixing DbConfigTask to produce correct configurations
2011-10-30 18:25:43 -04:30
José Lorenzo Rodríguez
f51be0a82c
Merge pull request #278 from Danielpk/enhancement_auth_deny
...
Added enhancement to AuthComponent::deny().
2011-10-30 15:38:21 -07:00
mark_story
92f9a6c1db
Fix missing urlencod/urldecode in routing.
...
Named params and passed args should be urlencoded, as they
may contain non-ascii characters.
Refs GH-214
2011-10-29 20:42:07 -04:00
Juan Basso
fcd96bcc60
Using native methods to query in HttpSocket.
2011-10-29 15:40:41 -04:00
mark_story
bcdf61a9d5
Adding escaping by default for TextHelper::autoLink()
...
TextHelper::autoLink, autoLinkEmails, and autoLinkUrls now all
escape HTML by default, this can be disabled using the escape => false option.
Fixes #1625
2011-10-29 12:08:43 -04:00
Daniel Pakuschewski
7cde0b654c
Removed tests for deny('*') to prevent people get confused with it
2011-10-29 13:57:04 -02:00
Daniel Pakuschewski
09579198a9
Droped support to deny('*').
2011-10-29 13:54:35 -02:00
Jose Lorenzo Rodriguez
66cf86c154
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-28 23:46:13 -04:30
Jose Lorenzo Rodriguez
60e3f02eac
Setting a correct Content-Length for plugin assets
2011-10-28 23:45:31 -04:30
mark_story
ce9bb6b632
Fix validation detection in FormHelper
...
string values for validation means a single validation method.
That implies the field is required.
Fixes #2181
2011-10-28 21:35:43 -04:00
Mark Story
11e2ef6674
Merge pull request #281 from majna/2.0-schema-dump
...
Added missing 'write' param for schema dump shell. Fixes #2179 .
2011-10-28 16:56:40 -07:00
Majna
14efc4daae
Added missing 'write' param for schema dump shell. Fixes #2179 .
2011-10-29 00:51:40 +02:00
Juan Basso
e682b446e6
Added space back to not break the test case.
2011-10-28 18:48:38 -04:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
AD7six
4fd3bccf78
don't have the version in 2 places
2011-10-28 12:12:28 +02:00
José Lorenzo Rodríguez
8945dcbf57
Adding test case for previous commit
2011-10-27 22:53:20 -05:30
José Lorenzo Rodríguez
29ca42ed7a
Not sending a content-length for redirection status codes that are not supposed to have any content
2011-10-27 22:44:42 -05:30
Jose Lorenzo Rodriguez
9866882506
Not sending a content-length for redirection status codes that are not supposed to have any content
2011-10-27 23:18:49 -04:30
Jose Lorenzo Rodriguez
aabfad9a09
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-27 22:25:37 -04:30
Jose Lorenzo Rodriguez
4a453cc384
Fixes #2175
...
Adding automatic Content-Length header to hint browser of the end of the response when using persistent connections
2011-10-27 22:15:37 -04:30
mark_story
adf52235d0
Make h() not puke when objects are passed in.
...
This can happen in the default Exception rendering,
if an object is in the viewVars.
2011-10-27 21:30:50 -04:00
mark_story
8529d76e6f
Removing Xml prolog from default xml layouts.
...
Both DOMDocument and SimpleXML output the prolog when
saving xml.
Fixes #2171
2011-10-27 20:58:03 -04:00
Jose Lorenzo Rodriguez
95acaba295
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-27 10:06:30 -04:30
Renan Gonçalves
53be552370
Fixing use of options['exclude'] in Debugger::trace(), tests added.
2011-10-27 16:01:54 +02:00
Daniel Luiz Pakuschewski
eb6c07f77e
Fixed: _passedArgs now is _passedVars
2011-10-27 10:16:38 -02:00
Daniel Luiz Pakuschewski
24bb6663ab
Fixed typo
2011-10-27 10:10:57 -02:00
mark_story
24fd87398d
Fix issue with 0.Model.field inputs.
...
These inputs would be incorrectly prefixed with another Model name.
2011-10-26 23:46:15 -04:00
Jose Lorenzo Rodriguez
bc8b522eec
Merge remote-tracking branch 'origin/2.0' into 2.0
2011-10-26 22:33:24 -04:30
Jose Lorenzo Rodriguez
ee7f417085
Test to disprove #2123 , it is possible to load classes in plugin's Lib directory. App::uses() is intended for classes not procedural files.
2011-10-26 22:33:14 -04:30
mark_story
43df8d34e7
Use String::tokenize() to split up fields.
...
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.
Fixes #2163
2011-10-26 21:17:20 -04:00
m
010abd9e18
Inheritance fix for CakeTestCase
...
Fix overriden methods to be static like other methods in
PHPUnit_Framework_Assert.
Fixes #2170
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-26 20:28:42 -04:00
Daniel Luiz Pakuschewski
8738ef3dc2
Added tests to deny() and deny('*')
2011-10-26 22:07:57 -02:00
Daniel Luiz Pakuschewski
5246e7dd1d
Allow AuthComponent to deny all actions with single deny() or deny('*')
2011-10-26 22:07:17 -02:00
ADmad
1244656595
Prevent unneeded afterFind callback triggering on associated models. Fixes #2057
2011-10-26 19:36:32 +05:30
ADmad
8473d6a660
Fixed code formatting
2011-10-26 13:00:52 +05:30
mark_story
ad524b25ef
Merge branch '2.0' into 2.1
2011-10-25 22:29:03 -04:00
m
5a5a542a71
Missing ini_set of include path for test.php
...
Fixes #2167
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-25 22:26:59 -04:00
Maggion Emmanuel
3dc9fee5c0
Typo
2011-10-25 22:22:10 -04:00
mark_story
c2c63d373c
Fix incorrect field detection for habtm fields.
...
Fields on habtm models would always be treated as multiselects.
Even when there were additional fields specified.
Fixes #2153
2011-10-25 22:21:27 -04:00
mark_story
5efddd11c8
Add comment for test.
2011-10-25 21:08:56 -04:00
mark_story
477c492e86
Fix issue where named parameters would not be urldecoded.
...
Fixes #2155
2011-10-25 21:07:27 -04:00
mark_story
7547d2c2d1
Update doc block concerning plugins.
...
Fixes #2146
2011-10-25 20:33:55 -04:00
mark_story
d92c73d821
Remove reference to XmlHelper.
...
Refs #2164
2011-10-25 20:16:58 -04:00
mark_story
e80c548887
Update link on home page.
...
Fixes #2159
2011-10-25 12:36:13 -04:00
m
dcc17f2091
ucfirst object names part two (Folder/File)
...
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-24 21:36:48 -04:00
mark_story
621cb43e93
Add Opera Mobi to mobile detectors.
...
This was missed in a merge with 1.3.
Fixes #2087
2011-10-24 21:12:06 -04:00
mark_story
bd87400131
Fix inflection for words ending in media.
...
Fixes #2149
2011-10-24 21:05:56 -04:00
fiblan
9c4a9bbd06
Fix missing prefix when reading table schema.
...
When using prefixes, table metadata would be lost.
Fixes #1522
Signed-off-by: mark_story <mark@mark-story.com>
Conflicts:
lib/Cake/Model/CakeSchema.php
2011-10-24 20:40:47 -04:00
Majna
42042c2a76
Fixing incorrect theme view doc block.
2011-10-24 16:32:19 +02:00
mark_story
d6bf1479c8
Add documentation and test for FormHelper::select()
...
An alternate syntax was undocumented and untested. Fix that.
Refs #1794
2011-10-23 22:27:07 -04:00
mark_story
c3f647217d
Implement trailing greedy star star.
...
Trailing args grabs all trailing arguments as a single passed
parameter. This is useful when you want to have trailing arguments
that contain / in them.
2011-10-23 21:27:28 -04:00
mark_story
d6f7669f54
Merge branch '2.0' into 2.1
2011-10-23 21:07:09 -04:00
mark_story
d62351eb36
Revert the changes done to remove the 'cake' domain
...
After some discussion, polutting the app POT file
with unchanging Cake strings was incorrect. Having these
strings in a separate POT file allows reuse of translations across
projects.
Refs #2103
2011-10-23 20:36:31 -04:00
Majna
a9dbde0cbd
Fixing incorrect doc blocks regarding error handler.
2011-10-23 21:55:20 +02:00
mark_story
205d75587c
Move registration of CakePlugin.
...
Move the uses() call to Cake/bootstrap.php
CakePlugin is used by App, and should be loaded along with
other core classes like Configure and Cache.
Fixes #2147
2011-10-23 13:54:13 -04:00
mark_story
e457c14dec
Fix issues with stateless authentication.
...
Cookies and sessions are no longer required for stateful authentication.
AuthComponent::user() also works correctly in these situations as well.
Fixes #2134
2011-10-23 12:54:51 -04:00
James Larking
75daff8df9
Camelize type of test being generated.
...
This fixes use for:
`cake bake model ModelName`
When classTypes and directories should be CamelCase.
This solves issue whereby model tests are written directly to Cases folder rather than into Cases/Model
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-23 11:13:56 -04:00
mark_story
ab77afbaec
Adding tests for lowercase type names.
2011-10-23 11:11:07 -04:00
mark_story
72006b9369
Fix options in OptionParser for TestTask
...
Fix the allowed options for type to allow Camelcase versions as well.
2011-10-23 11:10:52 -04:00
mark_story
30225520ff
Update assertEqual to assertEquals.
2011-10-23 10:44:19 -04:00
mark_story
b02155e766
Remove tests, that interact with RedirectRoute.
...
RedirectRoute now has exit() in it. This makes hitting those
routes in testing dangerous.
2011-10-22 23:27:04 -04:00
mark_story
6d6aa3cb75
Add _stop() to RedirectRoute.
...
Moved from CakeResponse to RedirectRoute,
as RedirectRoute is the only place its currently needed.
Refs #2143
2011-10-22 22:56:50 -04:00
mark_story
8e69df9013
Revert "Fix RedirectRoute by stopping execution."
...
This reverts commit 841e7aa560
2011-10-22 22:44:21 -04:00
mark_story
32b48ecc7c
Fix issue with missing base on redirect route.
...
The request data wasn't set in Router when redirect routes are processed.
This caused the base to become missing. This causes issues with applications
running in a subdirectory.
2011-10-22 18:48:31 -04:00
Majna
841e7aa560
Fix RedirectRoute by stopping execution.
...
If CakeResponse sends a Location header, it will stop execution.
This fixes issues with where a body would be sent with redirect headers.
Tests updated.
Fixes #2143
2011-10-22 13:22:28 -04:00
mark_story
f0ca6e4a99
Merge branch '2.0' into 2.1
2011-10-22 12:53:27 -04:00
mark_story
7b169ed084
Fix broken tests.
2011-10-22 12:53:10 -04:00
mark_story
ab6aab8a1a
Merge branch '2.0' into 2.1
2011-10-22 11:03:42 -04:00
Daniel Pakuschewski
318ea27c8d
File::info() return the file size.
2011-10-22 11:01:22 -04:00
mark_story
c5ca10ca69
Remove controller reuse between testAction() calls.
...
Reusing controllers between various testAction calls would
mean that calls that needed to render views, would break on the
second call to testAction(). Controllers are rebuilt for each testAction()
call now.
Fixes #2142
2011-10-22 10:58:21 -04:00
Graham Weldon
b165acd926
Fixed EmailComponent test
2011-10-23 00:28:47 +11:00
Graham Weldon
212028cda2
Remove comments, and fix debug transport for email.
2011-10-23 00:23:50 +11:00
Graham Weldon
2844f4a477
Fixed sending BCC with DATA for CakeEmail, as well as 7->8bit conversion tests passing
2011-10-23 00:20:37 +11:00
Graham Weldon
f8697ccb55
Added skip if mbstring not available
2011-10-22 17:52:41 +11:00
Graham Weldon
7ed6e041b9
Changed getContentTransferEncoding to protected
2011-10-22 15:24:26 +11:00
Graham Weldon
51dd024a1a
Merge remote-tracking branch 'origin/2.0' into 2.0
2011-10-22 14:55:53 +11:00
mark_story
fe9e595913
Fix issue with postgres and virtualFields
...
If a virtualField was set to a literal value it would be quoted.
Test added.
Fixes #2085
2011-10-21 22:17:48 -04:00
mark_story
7e89442a13
Make App::_loadVendor() static.
...
Fixes strict warnings.
Fixes #2137
2011-10-21 20:37:24 -04:00
Ceeram
4d795a7383
ensure SmtpTransportTest passes, always use localhost as hostname
2011-10-21 15:02:53 +02:00
Renan Gonçalves
d9e8b3b6a2
Parsing every parameter until there is no more. Good to have alias but with the ability to override the arguments.
2011-10-21 12:20:43 +02:00
mark_story
0bb9f3f99e
Fix failing test caused by changes in debug().
2011-10-20 21:42:14 -04:00
mark_story
7b9acc5c16
Fix failing test caused by addition of TestShell.
2011-10-20 21:39:58 -04:00
mark_story
52010a3e9d
Fix double encoding in debug().
2011-10-20 21:38:31 -04:00
mark_story
0cf389e3ce
Fix broken AllTests.
2011-10-20 21:24:54 -04:00
mark_story
eb17653965
Implement $request->is('requested');
...
Add tests and new detector type for request parameters
Fixes #1995
2011-10-20 21:11:42 -04:00
mark_story
9f80004920
Remove unused parameter.
2011-10-20 20:14:30 -04:00
Ceeram
2890e6659e
Fixing execute() $this->_result was not instance of PDOStatement after queries other then SELECT, lastAffected() now returns correct integer
2011-10-20 14:27:48 +02:00
AD7six
53bc963315
Merge branch '2.0' into 2.1
2011-10-20 08:57:49 +02:00
mark_story
a7404e8e83
Remove more incorrect __d() calls.
2011-10-19 23:25:22 -04:00
mark_story
71a55f52f8
Fixing incorrect translation usage.
2011-10-19 23:21:43 -04:00
mark_story
535b45b600
Fix strict warnings on Validation class.
2011-10-19 23:18:46 -04:00
mark_story
25e9aaf6c8
Removing the remaining cake domain translations.
...
3rd time is a charm.
Fixes #2103
2011-10-19 23:09:21 -04:00
mark_story
7c70b371bf
Removing the rest of the 'cake' domain.
...
These string should all be part of the app POT files.
Fixes #2103
2011-10-19 22:55:50 -04:00
mark_story
bca6492309
Update debug()
...
debug() now uses Debugger to output content and generate traces.
This improves the readability of its output as null/true/false are better
represented. Objects are easier to interpret as well.
2011-10-19 22:27:55 -04:00
mark_story
986b7d3eaa
Updating other debugger tests.
2011-10-19 22:27:55 -04:00
mark_story
49f687b0c4
New Debugger::exportVar() formatting.
...
Better resembles var_dump().
Includes types, and is less noisy to read than before.
2011-10-19 22:27:55 -04:00
mark_story
183ffb29d7
Improving the exception stack traces.
...
Adding Debugger::getType()
2011-10-19 22:27:55 -04:00
mark_story
f5ae9622e6
Add missing argument.
...
Without this argument calls with two arguments would be
treated as invalid shell commands.
2011-10-19 22:26:51 -04:00
mark_story
edfb0884c8
Adding test for form->submit() and timestamps.
...
Conflicts:
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2011-10-19 21:53:47 -04:00
Johannes N
30504ef32b
Enable Asset timestamp for image submit buttons.
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2011-10-19 21:51:18 -04:00
mark_story
7a4aa401d1
Adding backwards compatible plugin syntax.
...
Thie got lost during 2.0, and it inflecting only the shell name
is kind of bad.
2011-10-19 21:33:03 -04:00
mark_story
bad819773e
Update CommandListShell to give better help.
...
plugins require plugin prefixes now. Update the help
to suggest how to run plugin shells.
Fixes #2121
2011-10-19 21:26:31 -04:00
Mark Story
714e2812bc
Merge pull request #261 from rchavik/misc
...
display model and field that is causing schema generate to fail
2011-10-19 17:27:47 -07:00
Rachman Chavik
a02fd82db2
display offending model and column
2011-10-20 07:07:42 +07:00
Jose Lorenzo Rodriguez
3735c7db67
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-19 16:47:58 -04:30
Jose Lorenzo Rodriguez
d666d6175a
Improving the upgrade shell by adding more renaming rules and making it more robust in case insensitive systems
2011-10-19 16:46:55 -04:30
ADmad
6d51ce54fe
Revert "Fixed failing smtp tests when testing on host other then hardcoded 'localhost'."
...
This change you cause the tests to fail when run through CLI
This reverts commit f361509f10
2011-10-20 00:49:43 +05:30
Majna
f361509f10
Fixed failing smtp tests when testing on host other then hardcoded 'localhost'.
2011-10-19 20:34:02 +02:00
Thomas Ploch
521dff8468
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate to have a bit more fine grained control in custom Authenticate objects.
2011-10-19 17:54:08 +02:00
Norio Suzuki
712822ef83
add some test for ISO-2022-JP charset mails
2011-10-20 00:18:42 +09:00
Renan Gonçalves
fe9762d053
Making the test assert what it is intended to assert.
2011-10-19 16:48:03 +02:00
Renan Gonçalves
d1be66f2e1
Fixing failing test introduced in fb4a003522.
2011-10-19 15:57:46 +02:00
Renan Gonçalves
646b8f1aa0
Fixed issue when using multiple extensions in Router::parseExtensions() could result in undefined index notice by RequestHandlerComponent.
2011-10-19 15:36:00 +02:00
Rachman Chavik
a60d71d19b
removing 'empty' files from nonempty directories
2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
Graham Weldon
86a081463c
Added content transfer encoding detection based on charset.
2011-10-19 16:02:31 +11:00
Graham Weldon
e3898585be
Added test for content transfer encoding for iso-2022-jp. Thanks @suzuki
2011-10-19 15:49:30 +11:00
Graham Weldon
cef441c16b
Added test for ISO-2022-JP to demonstration fail for charset. Thanks @suzuki
2011-10-19 15:32:20 +11:00
Graham Weldon
bd291456e8
Changed CakeEmail transport to 8bit
2011-10-19 15:20:55 +11:00
Graham Weldon
cdc21e46cb
Changed expectation for CakeEmail to 8bit for transport.
2011-10-19 15:20:09 +11:00
mark_story
95737d7adf
Fix issue writing to file cache
...
Reading/writing to the same file cache key multiple times
in a row during a single request would result in failed reads.
Fixes #2114
2011-10-18 21:21:05 -04:00
mark_story
d7155d374b
Making apc feature test rely on apc_dec.
...
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.
Fixes #2105
2011-10-18 20:48:58 -04:00
Majna
0a9033ba1e
Fixing failing i18n ExtractTask tests on Windows.
2011-10-19 00:41:19 +02:00
ADmad
fc5a465189
Cleaning up code left over from 1.3. If no black-hole callback is specified Security::blackHole() now throws an exception. Closes #1532
2011-10-19 02:32:38 +05:30
mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
AD7six
485c15d55d
went missing in the merge
...
from 92d028630c
2011-10-18 17:49:52 +02:00
AD7six
a538c5d220
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
2011-10-18 17:46:00 +02:00
AD7six
13f5ec1ca8
Merge branch '2.1' into 2.1-simpler-test
2011-10-18 15:21:38 +02:00
mark_story
92d028630c
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/VERSION.txt
2011-10-18 08:57:44 -04:00
AD7six
d309df9efe
update version file to be representative
2011-10-18 12:32:07 +02:00
AD7six
25ce1cc823
remove inherited logic
2011-10-18 12:28:52 +02:00
AD7six
2e547cad19
revert to original code
2011-10-18 12:24:59 +02:00
AD7six
11a11bf583
add a backwards compatibility shell for the previous syntax
2011-10-18 12:18:50 +02:00
AD7six
868f8d21ad
don't duplicate the arguments description
2011-10-18 12:18:01 +02:00
AD7six
cccb6e9867
the category will say app
...
because it's under app
2011-10-18 12:00:46 +02:00
AD7six
1dae2735af
more not a a test tests
2011-10-18 11:58:34 +02:00
AD7six
230d67976d
add a test for mapping not-test files to nothing
2011-10-18 11:57:14 +02:00
AD7six
27fa6a8cdd
add test checking that tests map to .. tests.
2011-10-18 11:54:58 +02:00
AD7six
71ce18de8b
use constants for APP and CAKE
2011-10-18 11:48:12 +02:00
AD7six
baf1ce93f2
add a plugin parsing test
2011-10-18 11:40:53 +02:00
AD7six
4addd9faae
a random test
2011-10-18 11:37:47 +02:00
AD7six
f82ae66790
add a couple of tests for detecting the right app file
2011-10-18 11:36:30 +02:00
AD7six
6ab5f1f2a2
make it possible to test for files that don't exist
2011-10-18 11:02:08 +02:00
AD7six
d492c86ddc
update main descrition
2011-10-18 10:28:05 +02:00
AD7six
511207494e
remove incorrect description text
2011-10-18 10:24:09 +02:00
AD7six
6ccb1f2fb0
update test case
2011-10-18 10:21:53 +02:00
AD7six
b4228dcaee
Merge branch '2.1' into 2.1-simpler-tests
2011-10-18 10:03:32 +02:00
Jason Pirkey
eb5b4fa301
Fixing a phpdoc-type for Controller->Components property
2011-10-18 01:10:10 -04:00
mark_story
55064b6573
Applying fix from 'euromark' to fix protocol relative links
...
Fixes #2107
2011-10-17 21:03:25 -04:00
mark_story
1d8199b86d
Update the PHPUnit install instructions.
...
Fixes #2106
2011-10-17 09:36:47 -04:00
Ceeram
56b4e1e388
moved test_element.xml to correct directory, accidentally re-added during 1.3 merge
2011-10-17 11:30:18 +02:00
ADmad
1432e78431
Merge pull request #250 from majna/2.0-php-reader
...
Refactoring PhpReader::read() to check for .php file first
2011-10-16 23:17:38 -07:00
Jose Lorenzo Rodriguez
abdddd1271
Releasing 2.0.0
2011-10-16 18:33:00 -04:30
mark_story
3e17fee237
Fix error created in merge with 1.3
2011-10-16 18:58:59 -04:00
mark_story
1731b62644
Fix recursive errors caused by unwritable cache directories.
...
Fixes #2104
2011-10-16 18:51:02 -04:00
Jose Lorenzo Rodriguez
7c5352a6c2
Merge branch 'master' into 2.0
...
Conflicts:
cake/libs/controller/components/request_handler.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
cake/tests/cases/libs/view/view.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/cake
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/VERSION.txt
2011-10-16 17:56:22 -04:30
Majna
f0d10b4d69
Refactoring PhpReader::read() to check for .php file first. Fixed error when there's a directory with the same name.
2011-10-16 22:21:01 +02:00
Jose Lorenzo Rodriguez
e47b970811
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4
Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
...
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
mark_story
6ecbcccf25
Updating links to the book.
2011-10-16 09:36:51 -04:00
Renan Gonçalves
e37703efdd
Fixed typo from last commit.
2011-10-16 13:42:50 +02:00
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
229bf8e984
Keeping BC on short syntax for Acl and Tree behavior.
2011-10-16 12:06:41 +02:00
Renan Gonçalves
3a04bb4733
Dropping short syntax support for Behavior configuration.
...
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
Renan Gonçalves
d2a664c2df
Fixing @package at in Cake/Console/Templates/skel files.
2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653
Fixing @package at in Cake/Console/Templates files.
2011-10-15 20:26:48 +02:00
Renan Gonçalves
282d322523
Fixing @package tag in Cake/View files.
2011-10-15 20:17:44 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Florian Krämer
b6d7766e78
Updating the @link's in the doc blocks for the views
2011-10-15 12:46:22 -04:30
Jose Lorenzo Rodriguez
f23d62d411
Fixing more @link annotations
2011-10-15 12:42:23 -04:30
Jose Lorenzo Rodriguez
f9f0eedca1
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-15 12:35:01 -04:30
Jose Lorenzo Rodriguez
d1a530f53b
Fixing all @link annotations in model class
2011-10-15 12:34:31 -04:30
Renan Gonçalves
d9815dbd65
Fixing file_get_contents() call on the last commit.
2011-10-15 18:55:42 +02:00
Renan Gonçalves
704a9f454d
Moving binary data to external file, it was causing failures on other tests.
2011-10-15 18:51:48 +02:00
Jose Lorenzo Rodriguez
d406889b14
changing @link in containable behavior
2011-10-15 11:47:10 -04:30
Jose Lorenzo Rodriguez
91d0a081fb
Fixing more links in doc blocks
2011-10-15 11:38:49 -04:30
Jose Lorenzo Rodriguez
670917070e
Changing a bunch of links in doc blocks
2011-10-15 10:43:26 -04:30
Jose Lorenzo Rodriguez
f8772dc524
Also changing shell script in skel directory
2011-10-15 10:18:36 -04:30
mark_story
bda8df1b50
Fix issues with bash quoting and directories with spaces.
2011-10-15 09:56:04 -04:00
Jose Lorenzo Rodriguez
36fa2e87b4
Adding symlink support to the cake console executable
2011-10-14 22:15:26 -04:30
mark_story
6d9b709c7a
Fix method signatures of database drivers.
...
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.
Fixes #2100
2011-10-14 21:25:14 -04:00
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
Gonçalo Marrafa
4adc042882
Fix association lazy-loading when used with ContainableBehavior
2011-10-14 17:53:37 -04:30
Yosuke Basuke Suzuki
0b6c93cf82
Refactoring App::build() so it looks more readable
2011-10-14 17:11:45 -04:30
Thomas Ploch
0a70963a74
Removed creation of unneeded file handle object in FileEngine::write(). Added configuration option 'mask' to FileEngine::. Now able to provide a permission mask to create cache files with specific permissions.
...
Set '0664' as default value for the 'mask' setting in FileEngine::. Adjusted corresponding test cases.
Added new warning if the file could not be opened for writing.
2011-10-14 16:47:18 -04:30
José Lorenzo Rodríguez
36c931592b
Merge pull request #247 from sitedyno/2.0-app-skel
...
Syncing the skel and app directories
2011-10-14 13:34:47 -07:00
Heath Nail
9e9b1f0382
Windows newlines for .bat files.
2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf
Incresing sync between app and skel directories.
2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b
Incresing sync between app and skel directories.
2011-10-14 15:06:36 -04:00
Ceeram
981f40758c
Fixing incorrect theme paths for plugins, tests updated. Fixes #2099
2011-10-13 15:22:10 +02:00
mark_story
4090b3e8c6
Fix content-type detection to accomodate jQuery.
...
Add tests for jQuery content type strings.
Refactor tests, add in missing assertions and missing parent calls.
The new behavior is more lenient and allows for a single requested
content type to switch the view type.
Fixes #2088
2011-10-12 23:21:07 -04:00
mark_story
7f3c5662ba
Fix issue where plugin prefixes would be included in generated view.
...
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
2011-10-12 21:09:19 -04:00
mark_story
3c611eef90
Replacing direct construction with method calls.
2011-10-12 21:00:47 -04:00
mark_story
f65d763551
Removing ?> from AppModel and AppController plugin templates.
2011-10-12 20:42:23 -04:00
Mark Story
648a1f7dec
Merge pull request #245 from evilbloodydemon/remove-cr-flush
...
Removed unnecessary ClassRegistry::flush() from test template.
2011-10-12 09:23:01 -07:00
Renan Gonçalves
49f4035412
Fixing bug when trying to Paginate ordering by multiple keys.
2011-10-12 14:51:46 +02:00
evilbloodydemon
8e78308261
Removed unnecessary ClassRegistry::flush() from test template.
2011-10-12 13:37:50 +04:00
mark_story
b261024111
Make fixtures disable source caching.
...
Disabling source caching when using fixtures fixes
issues with test suites. Testsuites could previously have
test order errors caused by differences in cached and un-cached sources listings.
Fixes #1942
2011-10-11 22:10:09 -04:00
mark_story
c4eb19ab91
Adding another import for helpers appended by RequestHandlerComponent.
...
Fixes #2084 .
2011-10-11 12:42:45 -04:00
Dave
db51c0539a
Fix TextHelper::autoLinkUrls() from linking iframes
...
iframe and img elements should not be autolinked.
Fixes #GH-208
2011-10-10 22:16:46 -04:00
mark_story
3b1a11e2d2
Add a test for src and href attributes
...
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04:00
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
Majna
8c3f64be52
Fixing doc blocks in Test suite and some visibility keywords.
2011-10-10 23:18:48 +02:00
mark_story
788d38ccef
Merge branch '1.3' into 1.3-merge
...
Conflicts:
cake/console/cake.php
cake/console/libs/shell.php
cake/tests/cases/console/libs/shell.test.php
2011-10-10 09:37:06 -04:00
mark_story
455787ade9
Fixing undefined variable reference.
...
Fixes #2078
2011-10-09 22:34:59 -04:00
mark_story
3f778d8936
Fix inconsistency between app and skel directory.
...
Fixes #2077
2011-10-08 14:40:11 -04:00
mark_story
e07256b6d4
Update the .htaccess files to increase
...
compatibility with shared hosting servers.
Fixes #2010
2011-10-07 20:59:20 -04:00
Thomas Ploch
d9cd69ac6e
Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 .
2011-10-07 15:03:05 +02:00
Jose Lorenzo Rodriguez
c56797a15f
Adding destructor in CacheSession handler to avoid a fatal error when closing the session
2011-10-06 23:10:13 -04:30
Jose Lorenzo Rodriguez
a14abd6281
Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
...
This allows to remove an old hack in ConnectionManager
2011-10-06 23:01:49 -04:30
kaz29
5eb4c5c6da
Fixing bug in getEncoding/setEncoding for PostgreSQL.
...
Fixes #2028
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012
Making test less specific as this float cast is different
...
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a
Fixing failing tests caused by merge with 1.3
2011-10-06 21:23:35 -04:00
mark_story
055224ef68
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/lib/cake_test_suite_dispatcher.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
ADmad
fa214e8716
Updating old usage Configure::read() to new Configure::read('debug'). Closes #2070
2011-10-06 17:02:15 +05:30
Jose Lorenzo Rodriguez
17963e980b
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-05 21:37:11 -04:30
Jose Lorenzo Rodriguez
ade9e4d154
Fixing another postgres failing test
2011-10-05 21:36:36 -04:30
mark_story
a853c0f93a
Fix another typo.
2011-10-05 22:03:18 -04:00
mark_story
c11c5c5719
Fix typo in doc block.
2011-10-05 22:02:15 -04:00
mark_story
ea113922bd
Removing extra 0 index in request parameters.
...
When using requestAction with the return parameter, there
would be an extra 0 index element that would create incorrect
routes in the requestedAction.
Fixes #2067
2011-10-05 20:55:17 -04:00
mark_story
2cc9523509
Adding old webkit gradient prefixes.
...
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
d40bd240ac
Add missing echo in MissingHelperClass error page.
...
Fixes #2065
2011-10-05 17:51:19 -04:00
Jose Lorenzo Rodriguez
fca6fefb4a
Weakening the assertion in order to make tests pass, actual difference are in the order of 30 bytes
2011-10-05 13:25:54 -04:30
Jose Lorenzo Rodriguez
16ffee0065
More fixes in checking dates in tests
2011-10-05 12:16:00 -04:30
Jose Lorenzo Rodriguez
746062d4a4
Fixing a couple of problem when testing dates in ModelWriteTest
2011-10-05 10:16:38 -04:30
Jose Lorenzo Rodriguez
ecb63d93bc
Merge branch 'refactoringAppBuild' of https://github.com/basuke/cakephp into basuke-refactoringAppBuild
2011-10-05 10:03:31 -04:30
Yosuke Basuke Suzuki
fbf4449b9e
Refactoring: clean up the foreach loop.
...
- cleaner code.
- reduce call of array_values and array_unique.
- clear intent of code.
2011-10-05 15:13:19 +09:00
Yosuke Basuke Suzuki
810e2a4ffe
Bypass unnecessary foreach loop when $paths is empty to improve speed.
2011-10-05 15:08:30 +09:00
mark_story
0e47c98c91
Moving cache disabling earlier so it takes
...
effect.
Refs #2063
2011-10-04 23:03:44 -04:00
mark_story
e56a2cdb2b
Set debug=2 when bake is run.
...
This should help with model caches being re-used when they shouldn't.
Fixes #2063
2011-10-04 22:25:18 -04:00
mark_story
cb1ce83a54
Removing duplicate inflection.
...
Fixes #2058
2011-10-04 20:10:25 -04:00
ADmad
dcb704a12b
Fixing bug where you couldn't set CakeRequest::$base to empty string using config variable App.base
2011-10-05 00:46:25 +05:30
mark_story
042e817e1b
Fix issue where missing command would exit as success.
2011-10-03 23:08:48 -04:00
mark_story
aa7448e3ed
Fixing incorrect exit codes on console exceptions.
...
Uncaught exceptions on the console would result in exit code 0.
This is not helpful in *nix scripting.
- Update the ConsoleErrorHandler to not inherit from the web error handler.
- Make ErrorHandler::_mapErrorCode() public as it isn't overly private.
- Make ConsoleErrorHandler methods instance methods so mocking can be done.
- Add a _stop method to correctly exit.
- Update tests.
2011-10-03 22:48:50 -04:00
Jose Lorenzo Rodriguez
bab131b8fd
Releasing 2.0.0-RC3
2011-10-03 18:36:56 -04:30
Jose Lorenzo Rodriguez
0a2553cce5
Making model tests less time dependent
2011-10-03 14:51:07 -04:30
Jose Lorenzo Rodriguez
71c73503c6
Making test case less configuration independent
2011-10-03 12:13:11 -04:30
Jose Lorenzo Rodriguez
4110ab7952
Fixing error introduced in my last commit
2011-10-03 12:08:08 -04:30
Jose Lorenzo Rodriguez
d08f916179
Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases
2011-10-03 11:54:40 -04:30
mark_story
84f805419d
Fixing issue where DbConfigTask would try to rebuild
...
database configuration.
This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
2011-10-02 22:53:45 -04:00
mark_story
aae2b0c257
Fixing issue baking controller tests.
...
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
2011-10-02 22:53:37 -04:00
mark_story
adcb80b5b9
Making the HtmlHelper a default helper for emails.
2011-10-01 22:55:04 -04:00
mark_story
3907c2bdf3
Fixing build failure in Postgres.
2011-10-01 22:49:57 -04:00
mark_story
aa8965d3f3
Merge branch 'merger' into 2.0
2011-10-01 22:38:39 -04:00
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Graham Weldon
02cf5d3926
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-02 12:10:13 +11:00
Graham Weldon
f69fc937cb
Fixed missing string append operator for baked homepage to include banner.
2011-10-02 11:58:11 +11:00
mark_story
ff570d9daf
Removing unnecessary ReflectionClass instance.
...
Refs #2048
2011-10-01 20:43:49 -04:00
Jose Lorenzo Rodriguez
5d19b6ded9
Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass
2011-10-01 15:25:17 -04:30
Jose Lorenzo Rodriguez
a94b049c53
Fixing fixtures to make them run with postgresql
2011-10-01 14:41:55 -04:30
Jose Lorenzo Rodriguez
61be5b1d5c
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589
Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times.
2011-10-01 14:06:41 -04:30
mark_story
d9db8c8124
Fixing failing test on postgres build.
2011-10-01 09:08:18 -04:00
mark_story
df82aa09e4
Removing test that causes problems in AllTests.
2011-09-30 22:47:47 -04:00
mark_story
0fc6d7a98d
Making test more generic so it passes on Jenkins.
2011-09-30 22:44:04 -04:00
mark_story
4810518c7d
Fix issue where abstract or interface controllers
...
would be constructed by Dispatcher.
Tests added.
Fixes #2048
2011-09-30 22:40:30 -04:00
mark_story
115c656dcc
Update expectation to account for umask()
...
Updating a number of simple assertEqual -> assertEquals.
Fixes #2045
2011-09-30 22:10:16 -04:00
mark_story
f4b2e03295
Errors should be output on stderr.
2011-09-30 21:56:57 -04:00
mark_story
af4b0c9c1b
Make DboSource::lastError() fallback to the connection.
...
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError(). Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00
Jose Lorenzo Rodriguez
705593908b
Fixing some @package declarations
2011-09-30 13:17:12 -04:30
Jose Lorenzo Rodriguez
5a181d8705
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-30 01:56:19 -04:30
Jose Lorenzo Rodriguez
fff42e92ed
Adding a few class loading related changes to make the ApiGenerator plugin happy
2011-09-30 01:55:33 -04:30
mark_story
a3f25ee5e3
Fixing issue with integer columns and NULL values.
...
Fixes #2037
2011-09-29 20:28:52 -04:00
ADmad
11f38687f7
Fixing doc block
2011-09-29 20:04:06 +05:30
Ceeram
883f579670
fixing duplicate emails being sent with MailTransport fixes #2022
2011-09-29 15:00:48 +02:00
Ceeram
22029a1199
fixing email.php.default, from should have email as key
2011-09-29 14:59:27 +02:00
Jose Lorenzo Rodriguez
8acd980895
Converting more pattern assertions into simple string contains
2011-09-29 00:42:24 -04:30
Jose Lorenzo Rodriguez
fbdb058441
Converting regular expression assertions to simple string contains, those perform faster and consume less memory
2011-09-29 00:05:15 -04:30
Jose Lorenzo Rodriguez
27ab12dd2a
Simplifying assertions in FixtureTask test
2011-09-28 23:39:07 -04:30
Jose Lorenzo Rodriguez
6196e74339
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-28 22:59:00 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29
Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite
2011-09-28 22:57:50 -04:30
mark_story
dff45740ea
Add 'trace' to the data provided to Debugger formats.
...
Allows custom debugger output formats to display
a stack trace.
2011-09-28 23:26:38 -04:00
mark_story
9e080951b1
Adding additional documentation for CrudAuthorize.
...
Fixes #2034
2011-09-28 23:25:14 -04:00
mark_story
864cb70645
Moving basic templates to the 'base' key.
2011-09-28 23:25:14 -04:00
Jose Lorenzo Rodriguez
6b7c752478
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-28 21:23:43 -04:30
Jose Lorenzo Rodriguez
df2ef0e4f1
Bringing the SQlserver datasource up to date, fixing a doc block
2011-09-28 21:23:06 -04:30
Majna
681207e327
Fixed doc block comments.
2011-09-28 22:33:46 +02:00
mark_story
08b974d64b
Adding the _x and _y fields to the unlocked fields
...
for image submits.
Fixes #2032
2011-09-27 21:14:36 -04:00
mark_story
6e22f1d0a8
Excluding hidden files from test directory adding.
...
Fixes #2031
2011-09-27 20:43:47 -04:00
mark_story
421a2116be
Adding error code checking around CakeException handling
...
SocketExceptions can have error codes outside of the HTTP values.
2011-09-27 20:39:32 -04:00
Majna
8d6fc84135
Fixing failing test for Router. Debugger test fails on windows due to different directory separator.
2011-09-27 23:47:44 +02:00
ADmad
33030a4502
Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677 , #573
2011-09-28 02:58:48 +05:30
mark_story
7e44836837
Fixing failing test.
2011-09-26 21:46:25 -04:00
mark_story
6008e0e8a0
Adding quoting around SET NAMES.
...
Fixes #2028
2011-09-26 21:46:16 -04:00
mark_story
a5fe702624
Updating CrudAuthorize to work like ActionsAuthorize.
...
Updating tests.
Fixes #1749
2011-09-26 20:38:38 -04:00
ADmad
2a554237f4
Improving error view. Closes #2027
2011-09-26 11:49:49 +05:30
mark_story
79687a2dcf
Making locking file caching the default.
...
Locking files prevents many issues with unserialize() warnings
caused by partially written files.
Fix a locking issue where files would be left locked.
Fixes #1988
2011-09-25 09:26:32 -04:00
mark_story
b1dad6e5bd
Adding session renewal upon login/logout.
...
This helps improve session security, as it reduces the opportunity
of replaying a session id successfully.
Fixes #836
2011-09-24 22:35:21 -04:00
mark_story
50a0a51f53
Renaming method to better match what it does.
2011-09-24 21:56:37 -04:00
mark_story
dffcf048d9
Fix incorrect documentation.
2011-09-24 12:06:44 -04:00
mark_story
8272758eb9
Adding block to home page for PHP version.
...
Fixes #2010
2011-09-24 10:41:22 -04:00
Yosuke Basuke Suzuki
5612d411f3
Added unittest for saveAll() validation with the data no id assigned.
2011-09-23 22:23:26 +09:00
mark_story
36928d35f9
Redoing fix done in 155968349f
...
Adding more test cleanup to try and solve build issues.
2011-09-22 22:05:36 -04:00
mark_story
eccc05d8b1
Revert previous commit. Trying to fix jenkins build.
2011-09-22 21:39:00 -04:00
mark_story
155968349f
Skip . and .. when generating trees.
...
Fixes #2012
2011-09-22 21:14:27 -04:00
Renan Gonçalves
0bcb8d0dfa
Improving the regex and moving more files around.
...
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
2011-09-22 15:03:42 +02:00
mark_story
ceed424770
Updating doc blocks.
2011-09-21 22:30:02 -04:00
Jose Lorenzo Rodriguez
90d86678fa
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-21 13:32:03 -04:30
Jose Lorenzo Rodriguez
c45538ab08
Making CakePlugin::loadAll() static as its fellow class methods
2011-09-21 13:31:11 -04:30
José Lorenzo Rodríguez
b1f8d21434
Fixing doc block in core AppController file
2011-09-21 07:52:17 -05:30
mark_story
7cabb4e4d5
Extracting password hashing into as separate method.
...
This makes is much easier for a subclass to only change how passwords
are hashed.
2011-09-21 07:38:22 -04:00
Jelle Henkens
957a75c45e
Removing PHP4 compatibility code
...
Signed-off-by: mark_story <mark@mark-story.com>
2011-09-20 21:10:32 -04:00
Renan Gonçalves
1b2b191212
Updating cake.generic.css to its newest version from app directory.
2011-09-20 20:29:55 +02:00
Gordon Pettey (petteyg)
744558de90
Add validation guess for Postgress inet field
2011-09-20 17:45:35 +00:00
Jose Lorenzo Rodriguez
b3157cdd71
Releasing 2.0.0-RC2
2011-09-18 16:54:14 -04:30
Jose Lorenzo Rodriguez
8ccf90437a
Typo in last commit. Making flexible the range for memory usage in theme view after changing internal templates
2011-09-18 16:43:00 -04:30
Jose Lorenzo Rodriguez
a2daa39a98
Making theme test more flexible so it passes after recent changes in templates
2011-09-18 16:37:17 -04:30
mark_story
8d43764801
Fix issue with duplicate associations when using string form.
...
Fixes #2002
2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc
Merge branch '1.3' into merger
...
Conflicts:
cake/basics.php
cake/console/libs/tasks/extract.php
cake/libs/view/helpers/js.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/test_app/views/pages/extract.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Model/Behavior/ContainableBehavior.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
lib/Cake/Test/Case/Model/CakeSchemaTest.php
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
ADmad
670fea6e37
Fixing doc block
2011-09-18 19:58:47 +05:30
ADmad
08026e5828
The 'default' config for Configure class is now auto created on first use if not already created.
2011-09-18 00:06:37 +05:30
mark_story
0e5797d69d
Make full page caching + Themes work.
...
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
2011-09-17 13:19:43 -04:00
mark_story
85b86cb282
Fix entity names for associated model date fields.
...
Fixes #1993
2011-09-17 12:29:21 -04:00
mark_story
09e7f1d491
Splitting apart the Scaffold and ScaffoldView tests.
...
Fixes #1985
2011-09-16 22:08:19 -04:00
Renan Gonçalves
4378bb6dc4
Fixed bug in CakeSchema where it determines the field position.
...
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
2011-09-16 15:28:28 +02:00
ADmad
7c87e9abc1
For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994
2011-09-16 13:40:04 +05:30
Graham Weldon
9d1e3cbb05
Fix comment for ife() Upgrade. Thanks SkieDr.
2011-09-16 00:38:26 +10:00
