Commit graph

15833 commits

Author SHA1 Message Date
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
Mark Story
3f4be3bc38 Merge pull request #541 from tkyk/paginatorhelper-merge-query
PaginatorHelper should merge request->query to url options
2012-03-03 09:26:22 -08:00
Takayuki Miwa
1475e87b38 Update PaginatorHelper::beforeRender to merge request->query with url options 2012-03-03 13:46:46 +09:00
José Lorenzo Rodríguez
4f2d7b5f9a Merge pull request #540 from radig/2.0
Make UpgradeShell recognize different code style
2012-03-02 14:06:24 -08: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