adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13035 commits 7 branches 0 tags 44 MiB
Commit graph

2668 commits

Author SHA1 Message Date
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 c8326460a4
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 18:04:11 2011 -0600

    add a space after the comma in the $merge array

commit 22ad6cdca5
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 03:31:54 2011 -0600

    removing the condition and adding actsAs to the default list of merged keys.

commit afa4dd0dee
Author: Fitorec <chanerec@gmail.com>
Date:   Mon Dec 5 12:10:32 2011 -0600

    Solving the small defect in the array of behaviors(actsAs)

Signed-off-by: mark_story <mark@mark-story.com>
 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