Commit graph

4436 commits

Author SHA1 Message Date
mark_story
5c83bc177d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
mark_story
c77c7a7347 Fix warning with FormHelper::inputs()
introspectModel() can return non-array data sometimes. Casting avoids
warnings when forms are generate for models with no or faulty schema()
methods.

Refs #3602
2013-04-09 21:46:51 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString()
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
2013-04-09 21:30:20 -04:00
mark_story
9cd54bd736 Update version number to 2.3.2 2013-04-07 15:00:11 -04:00
ADmad
819d9e2cbc docblock tweaks for apigen 2013-04-08 00:26:59 +05:30
mark_story
853e19e70e Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
2013-04-07 14:35:23 -04:00
ADmad
20047c5060 Tweak docblock for api generator 2013-04-07 23:13:03 +05:30
ADmad
56df02f720 Improved docblocks 2013-04-07 18:53:32 +05:30
ADmad
e55877d171 Merge branch 'master' into 2.4 2013-04-06 00:57:46 +05:30
ADmad
431ab2aebd Fix CS errors 2013-04-04 17:37:51 +05:30
mark_story
d8d8e9644d Fix array('disabled') and array('disabled' => true) working differently.
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.

Fixes #3734
2013-04-03 12:46:39 -04:00
Rémi Dewitte
c70a3868a9 schema update CREATEs non-existing tables instead of ALTER 2013-04-03 17:37:09 +02:00
Andreas Kristiansen
8bc7bc9bb1 Fixing comment for in TimeHelper __construct 2013-04-03 12:54:42 +02:00
Mark Story
bb776cfa72 Merge pull request #1213 from markstory/improve-request-is
Improve CakeRequest::is()

Fixes #3714
2013-04-02 10:20:13 -07:00
José Lorenzo Rodríguez
0b73c8b6ac Merge pull request #1171 from remidewitte/feature/filelog-mask2
Add mask setting to FileLog
2013-04-01 23:44:02 -07:00
mark_story
2d6ee3cdb1 Remove pointless code.
Add a missing call to parent::setUp() and remove code that it takes
care of.
2013-04-01 22:30:27 -04:00
mark_story
3a06dc5e1c Make JS,CSS,IMAGES conditionally defined.
This allows app's to redefine these constants as necessary.
This makes these constants consistent with their *_URL relatives.
Fixes #GH-1170
2013-04-01 21:59:41 -04:00
mark_story
ce04d6afa1 Add CakeRequest::isAll().
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.

Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f Add support for is() with multiple types.
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.

Refs #3714
2013-04-01 21:52:15 -04:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
mark_story
d28c2f8e72 Fix code & tests for isPast() and isFuture()
The methods and tests now follow coding standards and work.
2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d Adds two new time testing methods: 'isFuture' and 'isPast'
TestCases included
2013-03-30 22:24:08 -04:00
mark_story
3fc627c5f8 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
ADmad
7b90542230 Fix CS error 2013-03-31 00:23:03 +05:30
mark_story
dea4fa4d73 Fallback to the default renderer if the config key is missing. 2013-03-30 13:40:58 -04:00
mark_story
ceb46b5d2c Try to fix random test failures on postgres.
Sorting in postgres is undefined and no based on the primary key when
sorting is not supplied.
2013-03-30 13:38:47 -04:00
Mark Story
84c0de7e2d Merge pull request #1203 from cincodenada/patch_httpsocket
Add a bit of backwards compatibility for specifying auth in the config.

Restore compatibility with older versions when providing auth data in the
request data.
2013-03-29 18:19:46 -07:00
Joel Bradshaw
ece6ac3663 Backwards compat for auth in the config array of HttpSocket::request()
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
Renan Gonçalves
96c9174ee2 Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
2013-03-29 15:24:08 +01:00
euromark
3a728762af spelling correction. 2013-03-29 11:16:20 +01:00
bcrowe
70d9ae9a03 Fix docblock typo of ObjectCollection class 2013-03-28 20:14:41 -04:00
Mark
42ea6895b2 Merge pull request #1107 from TeckniX/patch-1
Added autoParagraph functionality to 2.4 Branch
2013-03-28 03:30:15 -07:00
euromark
2df65fe9da Add missing App::uses() to avoid fatal error 2013-03-27 17:03:24 +01:00
ADmad
733116d15d Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in ClassRegistry::init().
Closes #3724
2013-03-27 15:44:48 +05:30
ADmad
342bf65811 Ensure referrer is saved in session even when AuthComponent::$loginRedirect is set.
Clarified redirectUrl() docblock.
2013-03-27 15:11:02 +05:30
mark_story
041c2d289f Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
Andy Dawson
913f3dccf0 Merge pull request #1193 from cakephp/feature/faster-tree-recover
make tree recovery much, much simpler
2013-03-26 13:23:55 -07:00
ADmad
9d367e1add Fix docblock of bake template 2013-03-27 00:12:24 +05:30
José Lorenzo Rodríguez
8c9a16ab9f Merge pull request #1186 from ceeram/2.4-blacklist
2.4 blacklist
2013-03-26 07:35:43 -07:00
Ceeram
6bf9363217 Add option to skip exception types for logging.
add blacklisting for logging exceptions

add test for skipping exception logging, and fix typo and cs

add example to docblock in core.php for skipLog

remove app_error.php skips, those are no longer used in 2.x

use assertContains instead of assertRegExp

check for instanceof, instead of matching names
2013-03-26 15:11:39 +01:00
Loki
d260f4a5b3 Added autoParagraph to TextHelper with proper test cases and made it non-static 2013-03-25 11:00:37 -04:00
euromark
3a1ff36d5e correct coding standards 2013-03-25 13:06:38 +01:00
Andy Dawson
e92e3df2fb Even less queries 2013-03-25 09:46:02 +01:00
Andy Dawson
8ea0212265 make tree recovery much, much simpler 2013-03-24 22:03:20 +00:00
euromark
f633e59091 keep the deprecated three-letter-code 2013-03-24 11:08:40 +01:00
euromark
47f388a4c0 correct and unify country codes for validation 2013-03-23 22:27:40 +01:00
mark_story
a7708c914f Remove test case that is no longer useful.
It is impossible for the current test to ever fail in the test suite, as
PHPUnit will always be loaded.
2013-03-22 21:36:11 -04:00
mark_story
386be52c71 Be compatible with PHPUnit installed with composer.
Doing a class_exists() check is a simple way to check for PHPUnit being
installed via an autoloader. It also keeps things compatible with
a Vendor dir installation.

Fixes #3721
2013-03-22 21:01:20 -04:00
José Lorenzo Rodríguez
c3222f746f Merge pull request #1185 from ceeram/2.4-unauthenticated
stop execution when unauthenticated, to prevent the page to show when ca...
2013-03-22 05:09:47 -07:00
mark_story
5d6a6fa203 Fix error when generating Xml.
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
2013-03-21 21:12:21 -04:00