Majna
78ea4da681
Add test for time input with interval on first hour of the day
2013-04-20 17:51:50 +02:00
Ceeram
842b1802d9
add assert that habtm save does not return false
2013-04-19 19:37:23 +02:00
mark_story
efd86a498a
Do type checks when looking for models in Controller::$uses.
...
This solves issues with models not being added when $uses = true.
Fixes #3774
2013-04-19 12:20:46 -04:00
mark_story
63b392a26b
Improve error message.
...
One of the cases was not explained in the existing error message.
Fixes #3773
2013-04-19 12:13:58 -04:00
mark_story
0f3d28c6ea
Fix condition parsing in mysql specific cases.
...
When using collation + array values the incorrect operator would be
used. IN should be used over =.
Fixes #3772
2013-04-18 21:52:22 -04:00
mark_story
3680ee0f1f
Add some docs for cookies.
2013-04-18 21:23:40 -04:00
mark_story
4d8dd12449
Add support for key => value cookies.
...
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.
Fixes #3771
2013-04-18 21:22:50 -04:00
spiliot
50e3307f00
Money validation accepts one decimal place
2013-04-19 01:58:08 +03:00
Rachman Chavik
331580bbad
Removing stray whitespace
2013-04-18 21:33:23 +07:00
Rachman Chavik
051fc0c140
Remove copyright information from bake templates
2013-04-18 21:28:06 +07:00
Simon Males
9c113247de
Avoid noticed that TMP is defined. Can be possibly defined in cake.php
2013-04-17 15:06:24 +08:00
mark_story
d01d291d13
Remove unused define.
...
The LOG_ERROR constant is no longer used by the logging system. It is an
unused relic from 1.x. Additionally changing the value of ERROR to not
be error creates counterintuitive code.
Fixes #3762
2013-04-16 12:32:00 -04:00
mark_story
aee8b50507
Merge branch 'master' into 2.4
2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8
Remove remaining reference operators.
...
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
mark_story
247d836174
Remove useless reference operator.
2013-04-14 21:29:04 -04:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
ADmad
ba56fb7064
Fixed issue where incorrect cached filesize was reported when appending to file.
2013-04-13 19:45:20 +05:30
mark_story
ed435870ae
Fix secure field lists when select elements have custom name attributes.
...
When a select element had a custom name attribute the secured field name
was incorrect.
Fixes #3753
2013-04-12 12:30:05 -04:00
mark_story
8bd1980dd4
DateTime::getTimestamp() is PHP5.3+
2013-04-11 13:39:05 -04:00
ADmad
548cccbbe2
"maxlength" is not a valid attribute for input element of type "number" in html5.
2013-04-11 21:06:52 +05:30
dogmatic69
7b0e5d9375
Moved stat cache clearing into a method for consitent usage.
...
Fixes issue where incorrect cached filesize was reported when appending to file.
Thanks dogmatic69 for the patch.
2013-04-11 11:16:10 +05:30
mark_story
b210849b95
Expand doc blocks for Model::query()
...
There were some undocumented options that had test cases.
Refs #3748
2013-04-10 21:43:25 -04:00
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
Mark
a13f7e1f8a
Merge pull request #1178 from dereuromark/2.4-bake-behaviors
...
Allow behaviors to be added for baked models
2013-03-21 06:16:19 -07:00
mark_story
819029e1f3
Only load the object cache when requested.
...
Instead of loading a cache key that may not exist on every request, it
should only be loaded when required.
Fixes #3717
2013-03-20 21:26:42 -04:00
mark_story
d1d3bcff04
Move import to top of file.
2013-03-20 20:37:13 -04:00
mark_story
729ef8fe58
Fix default null not being reflected by SqlServer
...
Apply patch from 'Josh Rehm' to fix null default values from being
stomped on when reflecting table schema.
Fixes #3615
2013-03-19 21:02:27 -04:00
mark_story
b821505014
Merge branch 'phantom-master'
...
Refs GH-1182
2013-03-18 21:40:14 -04:00
mark_story
2f79996140
Remove unused code and remove strict type checks.
...
Remove some unused code around manipulating hours. Also allow the
timeFormat option to be specified as either a string or an int. Both
types should be accepted and treated as equivalent.
2013-03-18 21:38:02 -04:00
mark_story
37532389d6
Add test cases for GH-1182
...
Add tests for afternoon times with an interval and 12 hour time format.
2013-03-18 21:37:38 -04:00
mark_story
ca10c49e21
Re-use existing string instead of making another one.
2013-03-18 21:27:00 -04:00
mark_story
1ebb2ed0a0
Fix coding style.
2013-03-18 21:17:24 -04:00
Ceeram
89ecd95e55
fix failing tests
2013-03-18 18:47:05 +01:00
Graham Watson
e38892ff06
Change equal operators to identity operators
2013-03-18 13:34:14 -03:00
euromark
6002d6913d
correct doc block
2013-03-18 17:17:16 +01:00
Ceeram
b28ea65b24
stop execution when unauthenticated, to prevent the page to show when canceling auth popup
2013-03-18 15:41:34 +01:00
Ceeram
99fba8c601
more coding standards fixes, minor rectaoring of testcase
2013-03-18 11:38:50 +01:00
Ceeram
89100f9476
fix coding standards
2013-03-18 11:12:28 +01:00
mark_story
83de70efcf
Tighten Canadian postal code validation.
...
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.
Fixes #3708
2013-03-17 18:14:56 -04:00
Mark Story
3f94d1d481
Merge pull request #1184 from tenebrousedge/uuid-improvement
...
Improvement to Validator::uuid
2013-03-15 07:10:20 -07:00
ADmad
7becd58237
Add test for Auth.redirect session var clearing.
2013-03-15 17:50:05 +05:30
euromark
dab0c5e753
Allow behaviors to be added to bake templates and improve doc blocks
2013-03-15 12:14:06 +01:00
Sethrin
99c41e0af4
Improvement to Validator::uuid
...
Properly matches version digit and variant digit, based on RFC4122
2013-03-15 04:11:22 -07:00
mark_story
e97b3acebb
Merge branch 'master' into 2.4
2013-03-14 20:54:42 -04:00
Mark Story
6d301394f4
Merge pull request #1183 from cincodenada/patch-1
...
Fix bug where differing key-ordering in fixtures causes errors.
When a fixtures first and last records differed data should be
inserted correctly.
2013-03-14 17:52:06 -07:00
Joel Bradshaw
9d7148e16f
Restructuring Strings test so that it is compatible with this change
2013-03-14 14:51:54 -07:00
Mark Story
76ea0803d5
Merge pull request #1174 from psparrow/master
...
Fixed issue with including including PHPUnit's Autoload script.
2013-03-14 14:36:16 -07:00
Joel Bradshaw
12a142d0ca
Remove key-ordering sensitivity in fixtures
...
Previously, the field order was effectively taken from the last record in the fixture, but the values were ordered according to the array_unique call above - primarily determined by the first record in the fixture. If these two orders differed, values were added under the wrong keys.
2013-03-14 14:17:59 -07:00
Graham Watson
2ac545291a
Fix incorrect default meridian
...
Forgot to remove a line
2013-03-14 16:58:13 -03:00
Graham Watson
ec56d828b0
Fix incorrect default meridian
...
Prevent the default meridian from being changed from 'pm' to 'am' when the default time is in a 12-hour format between 1:00pm and 11:59pm and both a minute interval and default minute value are specified.
2013-03-14 16:48:12 -03:00
mark_story
246c09ae40
Allow character classes in attribute patterns.
...
Fixes #3706
2013-03-14 12:55:03 -04:00
Mark Story
60f9131940
Merge pull request #1177 from yuya-takeyama/fix-alphaNumeric-validation
...
Fix alphaNumeric validation
2013-03-14 07:23:51 -07:00
Ceeram
18095ed42d
fix failing test with webrunner
2013-03-14 12:44:11 +01:00
Yuya Takeyama
14c81fe052
Fix alphaNumeric validation
2013-03-14 20:10:17 +09:00
ADmad
8e299fc404
Move 'Auth.redirect' session value clearing from AuthComponent::shutdown() to prevent unnecessary session start.
...
Closes #3702
2013-03-14 12:42:21 +05:30
mark_story
0900c32c03
Merge branch 'master' into 2.4
2013-03-13 21:01:03 -04:00
mark_story
f1d192f282
Fix issue with midnight hour & 12hr formats.
...
No hour would be selected in the case of 12hr formats and a time like
00:xx:yy
2013-03-13 20:56:04 -04:00
mark_story
81dc4c1e85
Merge branch 'master' into 2.4
2013-03-13 20:30:25 -04:00
mark_story
274a146b24
Move tests around.
...
Try to fix timing issues in formhelper tests.
2013-03-13 20:29:45 -04:00
mark_story
cec4e8b758
Force & when creating requests.
...
Some people will have entities in arg_seperator.output. Make HttpSocket
more resiliant.
Fixes #3692
2013-03-13 20:22:58 -04:00
Ceeram
8374eb92cc
fix failing tests. test and mocked sources would cause exceptions
2013-03-13 22:31:23 +01:00
José Lorenzo Rodríguez
abe6511d78
Merge pull request #1169 from ADmad/2.4-auth-take-2
...
Implemented stateless login for Auth
2013-03-13 14:22:18 -07:00
Ceeram
dde0912d1e
Throw exceptions only when datasource has wrong package, not check for instance of Datasource
2013-03-13 17:56:51 +01:00
pjskeptic
9b9cf3d165
Fixed code formatting.
2013-03-13 12:18:32 -04:00
Ceeram
f6477d58df
change formatOutput option name to pretty
2013-03-13 15:44:59 +01:00
pjskeptic
294dff7a26
Added test for CakeTestSuiteDispatcher::loadTestFramework.
2013-03-13 10:13:48 -04:00
Ceeram
2f79894852
improve docblock with possible values and default
2013-03-13 14:07:47 +01:00
Ceeram
fc34d9fe7f
Add formatoutput option to Xml::fromArray
2013-03-13 13:07:36 +01:00
pjskeptic
b17d8c9124
Added test for CakeTestSuiteDispatcher::loadTestFramework.
2013-03-12 23:34:30 -04:00
pjskeptic
5038e7eb38
Fixed PHPUnit include bug.
...
Fixed vendor include path bug.
2013-03-12 22:02:55 -04:00
mark_story
3d4ebc038c
Throw exceptions when non Datasource classes are used as Datasources.
...
Using models as datasources can cause segmentation faults. Guard against
that by checking types and raising exceptions early.
Fixes #3694
2013-03-12 21:59:45 -04:00
Rémi Dewitte
0875b84fa6
sprintf arguments mixed up
2013-03-12 17:29:26 +01:00
mark_story
026df62a1f
Merge branch 'master' into 2.4
2013-03-12 09:41:37 -04:00
mark_story
73310f9bfd
Fix dropTables being ignore in some cases.
...
When autoFixtures = false & dropTables = false, individually loaded
fixtures should not be dropped.
Fixes #3691
2013-03-12 09:34:20 -04:00
mark_story
f1da6b4cbc
Disable the cache when running schema commands.
...
This prevents stale cached schema definitions from preventing updates.
Fixes #3690
2013-03-11 13:10:14 -04:00
euromark
ab1f81b9a6
Add missing App::uses to prevent fatal error
2013-03-11 12:59:44 +01:00
euromark
f633241775
fix spacing error
2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6
fix coding standards
2013-03-10 18:11:50 +01:00
ADmad
b7834a2b16
Implemented stateless login for Auth
2013-03-10 00:11:35 +05:30
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
mark_story
0ba1aa6d38
Close the session out before erasing all the fixtures.
...
Not closing the session before closing fixtures results in fatal errors
when using database sessions.
Fixes #3683
2013-03-08 20:55:44 -05:00
Rémi Dewitte
a8f9cf787b
$result instead of $r
2013-03-08 15:54:41 +01:00
Rémi Dewitte
5b5180f661
code style in FileLog and FileLogTest
2013-03-08 09:32:46 +01:00
Rémi Dewitte
ab510d1700
Add settings array to connection parameters that executes SET statements once connected
2013-03-07 23:45:42 +01:00
Rémi Dewitte
278700677a
Add mask setting to FileLog
2013-03-07 21:40:06 +01:00
Mark
b105318bcc
Merge pull request #1148 from dereuromark/2.4-currency
...
Top 6 world currencies - UTF-8
2013-03-06 15:29:59 -08:00
euromark
eb874f87a3
Top 6 world currencies and make them utf8 per default
2013-03-06 23:35:18 +01:00
mark_story
3b7b322d41
Update API links.
2013-03-05 20:58:03 -05:00
Mark Story
69f416da1e
Merge pull request #1165 from cakephp/master-year-range
...
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 17:36:47 -08:00
euromark
a07c9f0c3c
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 22:11:23 +01:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
mark_story
cfc10a7c68
Fix failing test and unskip tests in SchemaShell::create()
...
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
2013-03-04 22:37:48 -05:00
mark_story
4a0df83783
Fix failing tests.
...
When the app did not have the correct models, tests would fail.
2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58
SchemaShell: Implement "exclude" parameter
...
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652 .
2013-03-04 22:37:44 +01:00
Ceeram
e2ebeefda0
add CAKE to the paths after handling parameters that depend on _isExtractingApp() return value, fixes LH-3442
2013-03-04 14:49:01 +01:00
mark_story
e3b870dbf7
Fix notice error for fixtures with imported tables.
...
Don't emit an error when a fixture has an imported table with no primary.
Fixes #3659
2013-03-03 20:59:09 -05:00
Phally
83f6161d1d
Fixes API parse error for link to Configure::read() in the book.
2013-03-03 20:10:09 +01:00
mark_story
48149cbb32
Update version number to 2.3.1
2013-03-02 22:23:11 -05:00
mark_story
47526e8b4d
Refactor code to not use extract()/compact()
2013-03-01 22:34:00 -05:00
Jad Bitar
8eb5ce410a
Add scopes to Object::log()
signature.
2013-03-01 22:25:10 -05:00