euromark
48fa358260
Remove leftover param that is now wrongly triggering "strict"
2013-04-22 11:36:17 +02:00
Simon Males
77feac9ef6
Second parameter of ClassRegistry::init() is a boolean, not a string
2013-04-22 14:06:30 +08:00
Simon Males
880c70cc8c
No use of type key in ClassRegistry::init()
2013-04-22 13:55:28 +08:00
mark_story
62660c6706
Re-assign $db after beforeSave.
...
This allows model/behavior methods to change the datasource in the
beforeSave callback. If you use drivers from different SQL platforms
things will go very poorly.
Fixes #3606
2013-04-21 21:15:44 -04:00
spiliot
2d7f6fc707
Added tests
2013-04-22 03:42:19 +03:00
mark_story
c2c096428c
Uncomment test.
...
I missed this earlier, because I'm a doofus.
2013-04-21 11:29:25 -04:00
mark_story
64da4e75c4
Remove silly code.
...
Changing the 12'th hour into 0 shouldn't be done when figuring out the
meridian, it makes sorting things out later more complicated. Remove
some duplicated code.
2013-04-20 14:48:54 -04:00
mark_story
f6c3015705
Add additional tests and fix incorrect meridian selection
...
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.
Refs #GH-1237
2013-04-20 14:39:47 -04:00
Majna
78ea4da681
Add test for time input with interval on first hour of the day
2013-04-20 17:51:50 +02:00
ADmad
ae8386c48a
Fix datetime comparison in relative datetime functions.
...
Closes #2987,#3514
2013-04-20 13:10:06 +05:30
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
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
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
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
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
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
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
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
Andreas Kristiansen
8bc7bc9bb1
Fixing comment for in TimeHelper __construct
2013-04-03 12:54:42 +02: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
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
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
ADmad
9d367e1add
Fix docblock of bake template
2013-03-27 00:12:24 +05:30
euromark
3a1ff36d5e
correct coding standards
2013-03-25 13:06:38 +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
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_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
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
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
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
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
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
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
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
pjskeptic
294dff7a26
Added test for CakeTestSuiteDispatcher::loadTestFramework.
2013-03-13 10:13:48 -04: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
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
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
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
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
474210d007
Properly initialize variable.
...
Fixes #3658
2013-03-01 13:42:39 -05:00
mark_story
7d84960b72
Remove appending to $errors on success/failure.
...
Logging boolean values offers no real value, and just balloons memory
consumption. While removing this may cause userland problems having it does as
well.
Fixes #3657
2013-03-01 13:41:10 -05:00
Mark Story
75539ce56c
Merge pull request #1160 from remidewitte/feature/schema-update-default
...
Keep default=false for boolean columns
2013-03-01 10:05:43 -08:00
Rémi Dewitte
9ecbdf4971
better with strict comparison
2013-03-01 15:51:15 +01:00
Rémi Dewitte
e2e5dfb91e
Keep default=false for boolean columns
2013-03-01 15:43:14 +01:00
Renan Gonçalves
fd72f894ad
Expanding year range based on the provided value.
...
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
2013-03-01 13:45:55 +01:00
mark_story
1d529c1dd2
Add type hints in SchemaShell.
...
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -05:00
Mark
8d3cd6e8fd
Merge pull request #1155 from dereuromark/master-test-404
...
proper response and response code for test.php with debug 0 (404 instead of 200)
2013-02-27 00:35:13 -08:00
mark_story
1d3095ece5
Fix formatting and expand find() docs.
2013-02-26 22:00:55 -05:00
mark_story
d9fbe5e00a
Tidy up doc blocks.
...
These kind of changes make tidyier method summaries in apigen.
2013-02-26 21:43:53 -05:00
mark_story
33bd7a571a
Restore whitelist when save fails.
...
Fixes whitelist not being restored when save fails due to no data.
Fixes #3646
2013-02-25 20:57:56 -05:00
mark_story
3d0920a405
Fix failing tests.
...
Two buffers are needed now that handleFatalError() is blowing one up.
Related to pull request #1158
2013-02-25 14:19:13 -05:00
U-Zyn Chua
af29fc5f8e
Fix an issue which gives gibberish output when gzip is enabled.
2013-02-26 00:23:00 +08:00
Marc Würth
f3262f768b
Fix two typos in CacheEngine.php
2013-02-25 07:53:28 +01:00
ADmad
b32e855a3d
Fixing behavior prioritizing
2013-02-24 22:52:31 +05:30
Mark Story
51d2cb60fa
Merge pull request #1139 from ADmad/2.3-dispatcher
...
Prevent response object being set as response body
2013-02-24 09:07:15 -08:00
euromark
eb49c4b666
proper response and response code (404 instead of 200)
2013-02-22 10:36:05 +01:00
nojimage
84725993e5
Postgres datasource support regular expression operators.
2013-02-22 10:14:06 +09:00
mark_story
9f25da49ef
Attempt to get more tests passing on travis ci.
2013-02-19 22:17:47 -05:00
mark_story
27dc666c8d
Fix incorrect method names.
2013-02-19 22:04:44 -05:00
mark_story
3e34a09e8b
Make skips more permissive.
...
Hopefully this fixes issues on travisci.
2013-02-19 21:05:05 -05:00
mark_story
341c0d17f0
Attempt to fix failures in travisci.
...
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
2013-02-19 20:53:28 -05:00
José Lorenzo Rodríguez
fd7158c108
Merge pull request #1119 from ravage84/patch-2
...
Adjusted link for my docs-patch
2013-02-16 06:12:48 -08:00
ADmad
484801ecf4
Prevent response object being set as response body
2013-02-16 02:07:02 +05:30
Mark Story
89b1f32751
Merge pull request #1135 from ravage84/my-regex
...
Removed superfluous brackets in regex
2013-02-14 09:35:31 -08:00
mark_story
a6441d7381
Switch from instanceof to method_exists.
...
This change lets custom loggers implement scopes without inheriting from
BaseLog.
2013-02-14 12:33:40 -05:00
Marc Würth
af4451de7f
Removed superfluous brackets in regex
...
The outer brackets are just another grouping
2013-02-14 17:24:58 +01:00
Mark
3b02013f7d
Merge pull request #1127 from dereuromark/master-strict-comparison
...
Strict comparison for strings where applicable
2013-02-14 01:10:48 -08:00
mark_story
f104bd3504
Use simpler asserts.
...
Refs #3622
2013-02-13 22:43:18 -05:00
nojimage
fbb1a812dd
Create rename field statements in postgres
...
Refs #3622
2013-02-13 22:24:21 -05:00
ADmad
1b22d48a35
trivial optimization
2013-02-13 00:54:03 +05:30
ADmad
213e81bdbd
Removing redudant code.
...
Filelog with scopes needs the file name to be specified so the first `if` covers scopes too.
2013-02-13 00:42:21 +05:30
ADmad
f6215129f6
Fix type casting of string scopes to array in log engines
2013-02-13 00:10:32 +05:30
mark_story
0d9ef854ff
Fix FULLTEXT column generation
...
Fixes #3618
2013-02-12 09:00:57 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Marc Würth
019c3aa721
Fixed small typo
2013-02-11 22:21:50 +01:00
ADmad
ee4a116936
Fix coding standards
2013-02-10 12:51:22 +05:30
ADmad
a7c751922d
Replace loose comparison with casting to boolean.
...
In any case AuthComponent::user() returns null not empty array when user isn't logged in.
2013-02-10 12:16:20 +05:30
mark_story
974ac44fb4
Use random iv values in rijndael.
...
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
2013-02-09 20:48:27 -05:00
mark_story
613aa19d94
Use constants instead of strings.
...
Using built-in constants where possible is generally a good idea,
making code less error prone.
2013-02-09 14:14:27 -05:00
mark_story
fee6172958
Update docs for SecurityComponent::requireAuth()
2013-02-09 14:06:24 -05:00
mark_story
e4110b1e01
Deprecate features in SecurityComponent
...
These features are available in CakeRequest now. The CakeRequest
version is improved as it raises more appropriate exceptions.
2013-02-09 13:57:55 -05:00
ADmad
74b9cdb36f
Fix failing tests caused by previous commit
2013-02-09 18:24:27 +05:30
ADmad
a9bbfd80c7
Added type hinting
2013-02-09 18:09:11 +05:30
Marc Würth
514d9675d8
Updated .gitignore, synced app & skel
...
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)
Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
ADmad
431e610317
Fix broken tests
2013-02-08 19:04:41 +05:30
Graham Weldon
a3702fcf2b
More copyright updates
2013-02-08 21:29:18 +09:00
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
97a60c28c7
Updated copyright and added references to license file for non-standard copyright references
2013-02-08 21:26:18 +09:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
ea4545e914
Formatted CSF address
2013-02-08 21:08:15 +09:00
Graham Weldon
3a0e0181b8
Updated copyright date, added CSF address (Thanks Larry)
2013-02-08 21:06:59 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
fb8c2a5e46
Make paths platform dependent.
...
This fixes issues with the built-in PHP webserver on windows.
Fixes #3608
2013-02-07 20:41:04 -05:00
mark_story
95bc8be4d5
Make path to router script absolute in server shell.
...
Relative paths fail when you run the server from inside app/Console
or any other path.
2013-02-07 20:32:26 -05:00
Mark
abf1bd8d12
Merge pull request #1105 from dereuromark/master-fix-disabled
...
Resolve incomplete regression fix for FormHelper selection and disabled.
2013-02-07 07:09:16 -08:00
euromark
d522f412db
Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105
2013-02-07 15:36:00 +01:00
mark_story
7d72a6f249
Fix issue where bake was missing habtm associations
...
If the current model is not the first table, habtm associations would be
missed. This was caused by eff4004261
Refs #3532
Fixes #3605
2013-02-06 20:31:15 -05:00
Marc Würth
94ca499dec
Brought home.ctp in skel folder in sync
2013-02-06 03:16:48 +01:00
Marc Würth
02e2fbe800
Fixed wrong statement in Sqlserver class header
...
http://www.php.net/manual/en/ref.pdo-sqlsrv.php
--> PDO_SQLSRV is a driver that implements the PHP Data Objects (PDO) interface to enable access from PHP to MS SQL Server (starting with SQL Server 2005) and SQL Azure databases.
2013-02-05 18:32:40 +01:00
Marc Würth
fa118a73a9
Fix for CakeShell schema generate for Sqlsrv
...
Do not generate invalid schema.php when using SQLServer
Refs #3559
2013-02-04 21:19:56 -05:00
euromark
05546aff32
coding standards
2013-02-04 09:26:50 +01:00
Marc Würth
72765a2afc
Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync
2013-02-03 20:00:32 +01:00
ravage84
af8b1e22ef
Added a note about plugin assets not working witout url rewrite
...
http://cakephp.lighthouseapp.com/projects/42880/tickets/25-i-installed-but-dont-see-the-images-and-css-of-debugkit
> Plugin assets do not work without url rewriting, this is in the
documentation for CakePHP itself. I guess it could be repeated for this
and every other plugin.
> I could have sworn it was with the Plugin Assets section, but
apparently its not there. Perhaps its just something I know from
experience.
See also:
* http://cakephp.lighthouseapp.com/projects/42648/tickets/1755-plugin-webroot-without-mod_rewrite-problem
* http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/500-plugin-css-directories-bug#ticket-500-8
Signed-off-by: mark_story <mark@mark-story.com>
Refs #GH-1113
2013-02-03 13:12:29 -05:00
calinseciu
d2b97f12e8
Update lib/Cake/Utility/Sanitize.php
...
Correctly use the $start variable in Sanitize::escape().
2013-02-01 18:10:24 +02:00
mark_story
00078e007c
Import ClassRegistry before using.
...
Fixes #3594
2013-02-01 10:46:25 -05:00
Mark Story
e0ce0ac8e3
Merge pull request #1103 from perrywky/master
...
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
Fixes #3579
2013-02-01 06:36:06 -08:00
Perry
af71d5528f
apply code convention
2013-02-01 09:30:45 +08:00
Ceeram
fa1d22dc5e
added test to disprove #3588
2013-01-31 16:21:01 +01:00
Perry
5ac5e784de
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
2013-01-31 17:01:59 +08:00
euromark
ee08fe5c1f
BC fixes for disabled checkboxes
...
see: d504642
see: #3545
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd
Merge branch '2.2'
2013-01-31 09:42:55 +07:00
euromark
d504642c9b
BC fixes for habtm. Closes #3545 .
...
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31
Fix issue with inputs() and plugin models.
...
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.
Fixes #3571
2013-01-29 22:02:21 -05:00
mark_story
410981296c
Fix ServerShell not being able to handle plugin assets.
...
Fixes #3575
2013-01-28 22:21:58 -05:00
Jose Lorenzo Rodriguez
d3fdd2c911
Update version number to 2.3.0
2013-01-28 23:00:32 +01:00
Jose Lorenzo Rodriguez
0a96e200a6
Update version number to 2.2.6
2013-01-28 22:55:39 +01:00
Mark Story
7a184708fc
Merge pull request #1086 from burzum/refactor/controller-render
...
Refactoring the Controller::render method
Create Controller::_getViewObject() which is responsible for creating
the view instance. This gives an easier way to override view construction.
2013-01-27 17:49:29 -08:00
ADmad
bb767408d3
Fix cs errors
2013-01-27 23:03:06 +05:30
ADmad
04ec9dd614
Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
...
Closes #3268
2013-01-27 21:22:11 +05:30
ADmad
422ceaff85
Added "tel" and "email" input type guessing.
...
Closes #3557
2013-01-27 08:59:54 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Mark Story
1fc9641af3
Merge pull request #1089 from majna/2.3-sort-natural
...
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 18:49:16 -08:00
mark_story
ce7f85abe8
Fix Token fields being added to GET forms.
...
They are not used so there is not much point in appending them.
Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51
Merge pull request #864 from dereuromark/2.3-radio-multiple-between
...
allow between to be an array of strings
Fixes #2859
2013-01-25 12:06:55 -08:00
Florian Krämer
d269b28ece
Changing the doc block of Controller::_getViewObject()
2013-01-25 12:45:08 +01:00
Florian Krämer
d242081067
Fixing typo in Controller::_getViewObject doc block and changing the view class comparison from != to !==
2013-01-25 11:30:04 +01:00
Florian Krämer
8d9acd9a8a
Renaming Controller::_view() to Controller::_getViewObject()
2013-01-25 10:30:06 +01:00
Majna
5250c92635
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 01:07:45 +01:00
Florian Krämer
bb91bebc4d
Fixing a code formatting mistake in Controller::render()
2013-01-24 22:01:25 +01:00
Florian Krämer
f9d27b6291
Refactoring the Controller::render method, moved the part that constructs the view instance into Controller::_view() for easier overloading this part and better modularization
2013-01-24 18:38:39 +01:00
mark_story
e4f241dd23
Merge branch 'pr-1075'
...
Merge changes in pull request 1075.
2013-01-23 21:19:53 -05:00
mark_story
0b659d513e
Add tests for #3545
...
Fix included in GH-1075
Closes #3545
2013-01-23 21:19:37 -05:00
Gordon Pettey (petteyg)
ec619eec04
Remove some spacial overkill
2013-01-23 23:20:41 +00:00
Mark Story
6ade91e83b
Merge pull request #1083 from ceeram/2.3-pmdvars
...
Remove unused local vars.
2013-01-23 14:51:11 -08:00
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
ADmad
82f34c4cb3
Don't set "required" attribute for checkboxes (unless explicitly specified).
...
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
2013-01-23 20:38:24 +05:30
AD7six
51946ff8fd
Remove Security.level from core.php
...
it's not used by cake, and it can confuse users familiar with 1.3
that this setting exists yet doesn't do anything in later versions
2013-01-22 09:56:01 +01:00
mark_story
0cdef75060
Fix failing tests.
...
I have no idea why the updated session test was expected to fail as the
data was written to the session.
Refs #3551
2013-01-21 21:13:35 -05:00
mark_story
75495705a6
Fix Hash::get($data, '0')
...
Fixes #3555
2013-01-21 20:50:46 -05:00
mark_story
efadf3dcd3
Make sure sessions are started before destroying them.
...
Fixes #3551
2013-01-21 20:46:41 -05:00
Rachman Chavik
622d2f04f9
removing extra newline in baked files
2013-01-20 09:07:31 +07:00
jroberts0001
e8647d77eb
Added App::uses to the PluginAppController and PluginAppModel bake templates
2013-01-20 08:47:52 +07:00
ADmad
db8127626a
Update helper usage to 2.x style in code examples
2013-01-19 13:15:33 +05:30
mark_story
631da2d04a
Update doc block.
2013-01-18 11:05:02 -05:00
Renan Gonçalves
76fe9f8787
Fixing the way to follow redirects when fetching XML files.
...
See: 689745d705
2013-01-18 12:27:43 +01:00
mark_story
7790bcacff
Allow afterFind() to fully remove an associated record.
...
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.
Fixes #3541
2013-01-17 20:35:37 -05:00
mark_story
773666ddad
Fix coding standards and save a function call.
2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f
Merge pull request #1039 from bfanger/master
...
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08:00
mark_story
18e282f3aa
Fix space between function + parenthesis.
2013-01-17 19:36:46 -05:00
johnymonster
84b10ba707
Strict in_array for mixed id variable types
...
Setting the in_array check to strict, as this would return true
incorrectly when and if values are of mixed type.
2013-01-17 14:14:12 -05:00
mark_story
689745d705
Follow redirects when fetching XML files.
...
Previously file_get_contents followed redirects, restore that behavior.
See fb275c5fa2
2013-01-17 09:51:47 -05:00
Renan Gonçalves
23d4807933
Fixing expected value from find when it results in failure.
...
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
2013-01-17 13:00:56 +01:00
Mark Story
70171f5403
Merge pull request #1073 from cakephp/issue-3533
...
Partially revert default niceShortFormat
The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.
Fixes #3533
2013-01-16 18:08:44 -08:00
mark_story
95ed471c41
Reduce duplication in code.
...
This will result in all tests being skipped when any of the required
models pre-exists.
2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1
Add support for --admin to bake controller all.
...
I missed this when originally implementing bake controller all.
Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
0ed9e3c120
Only bake HABTM associations for tables that exist.
...
bake often guesses wrong when it comes to habtm. Only add associations
we're highly confident of. This includes tables where the foreign table
also exists.
Refs #3532
2013-01-15 21:43:30 -05:00
mark_story
ad0d6644c4
Partially revert default niceShortFormat
...
In 9fa531d6e3
the default niceShortFormat
was changed, which has been interpreted as a regression in #3533 .
This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.
Refs #3533
2013-01-14 21:12:11 -05:00
mark_story
eff4004261
Don't treat tables that substring match as associations
...
The table structure of:
- packages
- userpackages
- georegions
- userpackages_georegions
Should not create a habtm between packages & georegions.
Fixes #3532
2013-01-14 20:39:01 -05:00
mark_story
9c29fab4a4
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
euromark
19cfe40fd1
fix return type in docblock
2013-01-12 16:26:44 +01:00
ADmad
d5ddaa4cb7
Added missing keyword
2013-01-12 11:30:25 +05:30
ADmad
d6c2df7b6b
Display exact PDO error on default homepage
2013-01-12 11:30:25 +05:30
ADmad
d8551c49e5
Improve messages logged for exceptions
2013-01-12 11:30:25 +05:30
ADmad
676872d623
Allow AuthComponent::$unauthorizedRedirect to be an url.
...
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585
Merge pull request #1067 from ceeram/paginatecount
...
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez
d571b056f4
Merge pull request #1063 from ADmad/2.3-cakeplugin
...
Added feature to ignore include errors for CakePlugin
2013-01-11 15:13:54 -08:00
dogmatic69
bcb3eb89dc
Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
...
version while doing calculations will normally end up as floats.
This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.
Number::currency(0.00, 'GBP') -> £0.00
Number::currency('0.00', 'GBP') -> 0p
Both versions will return `£0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Cauan Cabral
099ca310e2
Ensure $sources is Array before use
2013-01-11 10:14:05 -03:00
Ceeram
92d9b11aee
fix double semicolon
2013-01-11 11:15:15 +01:00
Ceeram
d3f9cc10b5
fix failing test
2013-01-10 18:10:24 +01:00
Ceeram
88240b2874
avoid paginate count when no results
2013-01-10 16:39:07 +01:00
mark_story
7008b812be
Fix string '0' not being exported correctly.
...
Fixes #3518
2013-01-09 23:04:58 -05:00
mark_story
735517ade1
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2013-01-08 22:27:17 -05:00
mark_story
e3692225ff
Fix lint errors.
2013-01-08 22:26:43 -05:00
mark_story
d21a621972
Update version number to 2.3.0-RC2
2013-01-08 21:51:52 -05:00
mark_story
5dede3879f
Update version number to 2.2.5
2013-01-08 21:48:59 -05:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
c2e087dc9b
Add test for recursion issues in Hash::expand().
...
Refs #3080
2013-01-08 19:42:12 -05:00
ADmad
970fdca89d
Added feature to ignore include errors for CakePlugin
2013-01-09 01:08:42 +05:30
euromark
a266d8bede
add test case
2013-01-08 13:06:02 +01:00
Marco Tisi
8af76a5662
Closes ticket #3080 in CakePHP Lighthouse ( http://cakephp.lighthouseapp.com/projects/42648/tickets/3080-hashflatten-endless-loop-on-single-0-int-keys ).
...
Hash::flatten has a bug which causes an endless loop when try to flatten an integer key.
Probably the $data array pointer won't reset itself when doing:
$data = $element
and
list($data, $path) = array_pop($stack)
The solution is to reset the pointer after the assignments.
2013-01-08 11:49:52 +01:00
mark_story
3f21d09c1d
Fix radio() and boolean values.
...
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.
Fixes #3512
2013-01-07 21:12:53 -05:00
mark_story
e132a7c856
Remove duplicated assertions.
...
These assertions are effectively duplicated in the next test method.
2013-01-07 21:00:14 -05:00
euromark
05167a6420
assert that the cache does not silently fail
2013-01-07 13:43:21 +01:00
AD7six
967526540a
app/Console/cake is not pwd sensitive
...
the app dir does not need to be guessed based on the pwd - derive
from the path to the executable
2013-01-06 22:09:07 +01:00
mark_story
ac1f64abc9
Start and end transactions on the fixtures datasource.
...
Fixes #3490
2013-01-05 14:50:09 -05:00
mark_story
6d743971e9
Consistently inflect theme names.
...
Themes should be consistently converted into CamelCase, this
makes the camelization consitent with the treatment in App::themePath().
Fixes #3508
2013-01-03 21:06:46 -05:00
mark_story
75f654b87b
Fix double encoding in JsHelper request methods.
...
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters. Remove HTML entities as they aren't
required in the Javascript context.
Fixes #3495
2013-01-02 23:09:37 -05:00
and-ers
c72c612625
Replaced simple and therefore pointless array_push function references with the ordinary way of adding an array element. This will increase the performance and the code looks much cleaner this way IMHO
2013-01-02 23:47:27 +01:00
ADmad
ea3fa67c79
Added new html5 boolean attributes
2013-01-02 12:15:58 +05:30