mark_story
96968f7194
Moving the modParams option into ObjectCollection, so it can replace the specific trigger method in BehaviorCollection.
...
Changed how break behaves, so it is works better with modParams and collectReturn options.
Tests updated and expanded.
2010-12-12 14:10:22 -05:00
mark_story
d14d148948
Making scaffold form view names consistent with those used in bake.
...
Renaming test_app files.
Fixes #501
2010-12-12 13:18:28 -05:00
mark_story
11df32148f
Updating scaffold templates to use post forms for delete buttons. Updating test case.
2010-12-12 13:13:00 -05:00
mark_story
495061537f
Changing Scaffold to use exceptions to indicate error states.
...
Starting to convert record deletion to POST only.
2010-12-12 12:59:25 -05:00
mark_story
661195db6c
Updating __() use in scaffold to take advantage of sprintf() being built into __() now.
2010-12-12 12:44:48 -05:00
mark_story
44c080d5ad
Making all core classes throw CakeException subclasses, this allows developers to catch framework exceptions with one catch.
...
Adding package specific exceptions.
Replacing generic exceptions in the codebase with CakeException + package exceptions.
2010-12-11 19:26:10 -05:00
Jeremy Harris
7ed19eae88
Allowed comma-delimited list in smtp $to var to be consistent with standard mail delivery. Fixes #1353
2010-12-11 15:11:54 -08:00
Juan Basso
d332f0624f
Making the cookies independent for each host.
2010-12-11 16:49:19 -02:00
mark_story
6c0efb62e7
Adding a base HttpException for all the various HttpExceptions that cake provides, this should make it easier to write concise catch blocks.
2010-12-11 13:38:09 -05:00
mark_story
60ada4432a
Making unknown errors with codes higher than 500 render as error500.
...
Test added.
2010-12-11 13:30:29 -05:00
mark_story
504b4d495f
Adding stack traces to logged exceptions, as I forgot them last time around.
2010-12-11 12:47:16 -05:00
Juan Basso
eeafb55d31
Support to download requests.
2010-12-11 14:44:45 -02:00
mark_story
ceca179184
Fixing more tests that were failing post merge.
2010-12-10 23:17:42 -05:00
mark_story
1e108748e9
Fixing validation methods + features lost in [ f51ce734
] due to a bad
...
merge.
Fixing additional tests to reflect changes in 2.0
2010-12-10 22:52:22 -05:00
mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
Juan Basso
453c5364c2
Putting the auth and proxy data in request attribute after request.
2010-12-10 10:44:28 -02:00
Juan Basso
d97103d739
Making the format attribute customizable in helpers.
2010-12-10 02:42:38 -02:00
mark_story
1548b7badb
Expanding and correcting the doc block for ObjectCollection.
2010-12-09 23:22:08 -05:00
mark_story
a830632071
Changing View::element() to not overwrite viewVars with helpers that
...
have the same name.
Test added.
Fixes #1354
2010-12-09 22:06:23 -05:00
Graham Weldon
33d2f9a6ed
Refs #621 . Provides default maxLimit for pagination to prevent url manipulation causing long queries.
2010-12-10 12:22:12 +11:00
jblotus
48f32a11e0
Fixed incorrect docblock. Fixes #1350
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-12-08 22:08:43 -05:00
Juan Basso
bcacace061
Updating docs.
2010-12-06 12:04:00 -02:00
Juan Basso
7c23d289e0
Minor optimizations.
2010-12-06 12:03:22 -02:00
Juan Basso
d656bdae3b
Renamed proxy method and calling togheter from host config.
2010-12-06 11:28:40 -02:00
Juan Basso
30a70b700b
HttpSocket::_configUri() always change config attribute and it is public. This function dont need return it.
2010-12-06 04:04:37 -02:00
Juan Basso
33bb253dfa
Minor optimization in HttpSocket::reset().
2010-12-06 03:56:16 -02:00
Juan Basso
151ea2804f
Default value to raw key, avoiding warnings if line is false.
2010-12-06 03:23:09 -02:00
mark_story
c096eea664
Fixing failing tests caused by constants changing.
2010-12-05 23:32:34 -05:00
mark_story
55e06ec244
Merge branch '2.0-config' into 2.0
...
Conflicts:
cake/libs/configure.php
2010-12-05 23:00:05 -05:00
Juan Basso
97fe32f87c
Request return a pointer to body. It will reduce the memory usage in big responses.
2010-12-05 23:36:28 -02:00
José Lorenzo Rodríguez
c559b9c22d
Merge remote branch 'origin/2.0' into 2.0
...
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
mark_story
7024d14c74
Removing private annotations for File::__construct() and File::__destruct() as its just not true. This also prevents them from being included in the API docs.
2010-12-05 18:41:26 -05:00
mark_story
5f47de7658
Adding @package tags.
...
Moving MissingModelException with the other exceptions.
2010-12-05 00:02:20 -05:00
mark_story
d202ea643d
Fixing issue loading plugin models when uses == false.
2010-12-04 23:49:00 -05:00
mark_story
9dd78c7dc1
Updating Multibyte class to use new Configure api.
2010-12-04 22:59:07 -05:00
mark_story
5ad8d8af41
Adding a parameter to configured() to allow you to check if a particular config has been configured.
2010-12-04 22:57:33 -05:00
Juan Basso
c52d5320c8
Replaced the *printf with i18n aliases by i18n aliases with params.
2010-12-04 23:37:13 -02:00
mark_story
b49c4402e5
Implementing store and restore for Configure.
...
Test cases added.
2010-12-04 17:26:59 -05:00
mark_story
539f2cd785
Removing a cakeError that slipped through the cracks.
2010-12-04 16:34:20 -05:00
mark_story
94258e14d7
Doing some reformatting and removing calls to read() since we are already in Configure.
2010-12-04 16:29:34 -05:00
mark_story
ae814db2dd
Changing IniAcl to use IniReader.
2010-12-04 14:47:47 -05:00
mark_story
8031d33d33
Fixing more E_STRICT notices and adding a type check to DboSource::dropSchema().
2010-12-04 14:37:02 -05:00
mark_story
a6c5065e9c
Fixing a few more E_STRICT errors in postgres test/class.
2010-12-04 14:31:11 -05:00
mark_story
7e3c98024e
Removing reference operators in ModelBehavior.
2010-12-04 14:19:36 -05:00
mark_story
18fb12c95c
Removing & pass by ref operators as they aren't needed any more.
...
Fixing a bunch of E_STRICT errors.
2010-12-04 14:15:32 -05:00
mark_story
d13759522b
Removing strtolower() calls. You must now call model magic findBy and findAllBy using camelcase forms.
2010-12-04 13:45:42 -05:00
mark_story
466137485d
Removing a duplicated property.
...
Changing is_a() to instanceof as it marginally faster.
Adding a comment to getConnection as it was missing it.
Minor optimization to a regular expression.
2010-12-04 13:28:43 -05:00
mark_story
98704d3ecd
Adding nested value support to IniReader.
...
Adding boolean conversions.
Adding test cases.
2010-12-04 12:56:37 -05:00
mark_story
1e569f509a
Changing IniFile to be a ConfigReader for use with Configure. Test case updated.
2010-12-04 12:15:47 -05:00
mark_story
9e32c13cac
Updating doc blocks.
2010-12-04 10:41:23 -05:00
Graham Weldon
dd18efbe7c
Append Controller to error class name for isAuthorized() not implemented.
2010-12-04 22:21:10 +11:00
Graham Weldon
1dbed85979
Append Controller to error class name for isAuthorized() not implemented.
2010-12-04 22:14:33 +11:00
mark_story
7eab3b2850
Moving load() logic out of Configure, and putting it into PhpReader.
...
Updating test cases. store() still needs to be properly implemented.
2010-12-04 01:05:12 -05:00
mark_story
6618178e1b
Adding more checks into PhpReader that currently exist in Configure.
2010-12-04 00:58:02 -05:00
mark_story
9b55487d4e
Removing a dead isset() and collapsing an if.
2010-12-04 00:24:09 -05:00
mark_story
aef53cd23a
Adding some more basic methods.
2010-12-04 00:14:55 -05:00
mark_story
da632fe191
Renaming method to match other core classes with similar features.
2010-12-04 00:10:42 -05:00
mark_story
9b8456ce6f
Adding an interface to define the necessary public methods.
...
Adding insertion of configure readers.
Adding tests.
2010-12-04 00:09:11 -05:00
Juan Basso
3f910dc6c1
Formatting
2010-12-04 00:58:49 -02:00
Juan Basso
874a1172a1
Cleaning auth and proxy configuration in full reset.
2010-12-03 23:13:49 -02:00
Juan Basso
075bdebebe
Moved the proxy configuration from request to class attribute.
2010-12-03 23:10:07 -02:00
Juan Basso
f004bef74f
DigestAuthentication adapted to new auth in HttpSocket.
2010-12-03 21:57:15 -02:00
José Lorenzo Rodríguez
66d0986cd4
Pepending table name to index generation to avoid name clashes
...
Finally, all tests using a Sqlite database pass
2010-12-03 15:25:26 -04:30
José Lorenzo Rodríguez
e167271568
Making more DboSlite tests pass
2010-12-03 14:41:39 -04:30
José Lorenzo Rodríguez
7c4ab886e6
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-12-03 14:08:03 -04:30
mark_story
bbb15c24a1
Adding more tests and better errors for PhpReader.
2010-12-02 23:30:28 -05:00
mark_story
ae328ffb3a
Adding plugin support for PhpReader.
...
Tests added.
2010-12-02 23:14:26 -05:00
mark_story
fdb5955d6c
Adding PhpReader to implement php file reading as per #1334
2010-12-02 23:06:08 -05:00
Juan Basso
4325e67163
Fixing setAuthConfig to accept false as param to remove auth config. Tests added.
2010-12-03 01:30:03 -02:00
Juan Basso
cd24aca39d
Removing auth key from request and putting this as attribute.
2010-12-03 00:46:11 -02:00
José Lorenzo Rodríguez
cdc4cb9e1e
Implementing method in DboSqlite to avoid error while running the test suite
2010-12-02 00:20:08 -04:30
José Lorenzo Rodríguez
2e04c5260e
Fixing some tests to make them run on sqlite
2010-12-02 00:19:43 -04:30
mark_story
44b09171ef
Adding unicode letters and numbers to url path segment regex.
...
Test case added.
Fixes #1284
2010-12-01 23:47:30 -05:00
Juan Basso
aa0bad9247
Ignore errorHandler if warning suppressor (@command()) is used.
2010-12-02 01:44:31 -02:00
Juan Basso
e1e8026392
Support to proxy authentication in basic authentication.
2010-12-01 14:00:10 -02:00
Juan Basso
64dcca61ef
Throw exception when authentication class dont support authentication/proxyAuthentication method.
2010-12-01 13:49:03 -02:00
Juan Basso
b9010b05f2
Support to proxy in HttpSocket.
2010-12-01 13:46:13 -02:00
Juan Basso
634d686288
Merge branch '2.0' into 2.0-http
2010-12-01 11:49:26 -02:00
Marko Marković
c55a57927c
Typos in documentation: reguired -> required
2010-12-01 08:12:25 +11:00
José Lorenzo Rodríguez
2e9283abd9
Fixing fixture loading for sqlite
2010-11-29 20:52:54 -04:30
José Lorenzo Rodríguez
0d93520e0a
Fixing test case for sqlite
2010-11-29 20:52:32 -04:30
Juan Basso
ffaec10a7c
Fixing the result of App::import() when name of class have slash.
2010-11-29 22:37:08 -02:00
José Lorenzo Rodríguez
a791687784
Adding try catch for pdo exception on DboSource::_execute
2010-11-28 23:50:18 -04:30
José Lorenzo Rodríguez
372123f15a
Moving common method put from DboMysl into DboSource, this makes more sqlite tests pass
2010-11-28 22:45:56 -04:30
Mark Story
40585a34e8
Adding support for userPath in IniAcl.
...
Test case added.
Fixes #1291
2010-11-28 21:22:10 -05:00
Mark Story
2495b3cd4c
Trimming whitespace and adding a file header.
2010-11-28 21:11:18 -05:00
Mark Story
3ddff879b1
Converting IniAcl to use IniFile, this removes one of the classes responsibilities.
2010-11-28 21:06:22 -05:00
Mark Story
35611d50c3
Fleshing out IniFile a bit more.
2010-11-28 21:05:32 -05:00
Mark Story
071cd9b477
Adding very naive implementation of an ini file parser.
2010-11-28 21:05:32 -05:00
mark_story
9d3b3a72ce
Starting to extract Ini file parsing out of IniAcl as it breaks single responsibility, and ini file parsing should be generic enough to be reused.
...
Adding a test case.
2010-11-28 21:05:32 -05:00
mark_story
cc18c15e61
Fixing coding standards.
2010-11-28 21:05:32 -05:00
mark_story
284a8db3f4
Moving error handling classes into a separate directory.
...
Moving error handling test cases into a directory that matches the one in libs.
Updating imports.
2010-11-28 12:27:51 -05:00
mark_story
e40ee2576b
Minor optimization in h()
...
Minor optimizations in FormHelper, as calls to ArrayAccess methods are avoided now.
2010-11-28 00:33:01 -05:00
mark_story
da98791e14
Adding some more documentation about precedence of configuration.
2010-11-27 19:37:25 -05:00
mark_story
345779772d
Fixing issue where an AppController::appError would cause errors as $method was not a real method.
2010-11-27 14:35:36 -05:00
mark_story
d3f0d25c03
Removing error masking in ErrorHandler, instead correctly calling set_error_handler() works better.
2010-11-27 14:32:43 -05:00
José Lorenzo Rodríguez
492bcea85f
mproving decribing process of tables in sqlite
2010-11-27 00:37:13 -04:30
José Lorenzo Rodríguez
0ff01330c4
Making dates deconstruction in model more consistent for different datasources
2010-11-27 00:13:04 -04:30
José Lorenzo Rodríguez
41ee035d28
Starting to bring sqlite dbo up to date
2010-11-26 23:46:34 -04:30
Juan Basso
547f48fb03
Changing to be compatible with PHP 5.2+
2010-11-26 23:00:26 -02:00
José Lorenzo Rodríguez
b6731dd9ad
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
2010-11-26 20:26:41 -04:30
ADmad
1186bc56f1
Adding EmailCompnent::lineFeed property toallow overriding the default line feed string when using mail() function to send mail. Closes #1320
2010-11-27 02:11:43 +05:30
mark_story
9b4f7a1a15
More documentation.
2010-11-25 22:51:31 -05:00
mark_story
f3feb1575c
Removing support for AppError. It doesn't make sense to have hardcoded class references when there is better configuration available.
...
Updating doc blocks for exceptions.
Updating core.php file.
2010-11-25 22:51:30 -05:00
mark_story
1cffea379f
More documentation.
2010-11-25 22:51:30 -05:00
mark_story
04d3feb6c0
Unknown errors cannot be mapped as they generate another error. Having a default case doesn't make much sense here.
...
Adding additional coverage to ErrorHandler.
2010-11-25 22:51:30 -05:00
mark_story
845edf38e1
Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
...
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
2010-11-25 22:51:30 -05:00
mark_story
e88cdc8a01
Adding more documentation.
2010-11-25 22:51:30 -05:00
mark_story
55623ace92
Adding deprecated error level to the map switch.
2010-11-25 22:51:30 -05:00
mark_story
f2f3f13c75
Adding exception logging configuration setting. Allows uncaught exceptions to be logged.
...
Implementing logging, and adding a test case.
2010-11-25 22:51:30 -05:00
mark_story
af4447d55d
Removing Configure::write('log'). This feature is now part of Error configuration.
...
Removing log check from Debugger::showError(). This method only show's errors, it shouldn't be logging them as well.
2010-11-25 22:51:30 -05:00
mark_story
14a6368b39
Adding missed isset() check
...
Making ConsoleErrorHandler handle both errors, and exceptions in CLI.
2010-11-25 22:51:30 -05:00
mark_story
e2c8e20afa
Pulling exception page rendering out into a separate class, ErrorHandler felt very large and confusing, as it had a few too many jobs.
2010-11-25 22:51:29 -05:00
mark_story
8a35b76cc2
Fixing error caused by removed method.
2010-11-25 22:51:29 -05:00
mark_story
722b1a02ba
Adding Debugger output to ErrorHandler::handleError, and adding tracing for log writes.
...
Renaming Debugger::_output() -> Debugger::outputError() and making it public instead of protected.
2010-11-25 22:51:29 -05:00
mark_story
f373fc19d1
Removing logError from CakeLog, it will be moved into ErrorHandler::handleError()
2010-11-25 22:51:29 -05:00
mark_story
a621ac1ba3
Adding level to the core.php file, this lets you choose which error levels you are interested in for your application.
...
Removing hardcoded error_reporting levels in Configure.
2010-11-25 22:51:29 -05:00
mark_story
a8ba73da62
Removing wrapper method that didn't contribute anything.
...
Adding doc blocks for the sequence bootstrapping takes.
2010-11-25 22:51:29 -05:00
mark_story
b371de8cf4
Moving error handler configuration setting after application bootstrap is done, this will allow classes to be imported using the cache.
2010-11-25 22:51:29 -05:00
mark_story
e68a1a094e
Moving error and exception handler configuration into Configure, as settings. You can use Error.handler and Exception.handler to define the error and exception handlers for your application.
2010-11-25 22:51:28 -05:00
mark_story
4960b6e7bf
Changing method names on CakeLog and Debugger to better reflect what they do. Updating test cases.
2010-11-25 22:51:28 -05:00
mark_story
da3bf1c747
Adding ErrorHandler::handleError for consolidating core error handling out of CakeLog and Debugger.
2010-11-25 22:51:28 -05:00
mark_story
6d5cf96d1c
Making instance method use the instance, and not call itself statically.
2010-11-25 22:51:28 -05:00
mark_story
15ca2400bc
Fixing issue in DboSource::name() where special characters in column names would not be correctly quoted.
...
Tests added.
Fixes #1264
2010-11-25 06:52:23 -05:00
mark_story
7d158e8d1f
Fixing Set::sort() for arrays with out of sequence, or missing keys.
...
Tests added.
Fixes #1312
2010-11-25 06:39:08 -05:00
mark_story
4214242efd
Adding test for correct merge order for $uses.
...
Fixing incorrect merge ordering for $uses, so it matches historical behaviour.
Fixes #1309
2010-11-24 22:44:12 -05:00
mark_story
0e29567f8d
Adding an array cast to fix issues where users could modify cookie
...
values causing iteration errors. Fixes #1309
2010-11-24 22:09:08 -05:00
mark_story
d5fb0b25cb
Fixing issue where Date header would be missing from Emails sent by
...
EmailComponent.
Adding user configurable field for date.
Test cases added. Fixes #1304
2010-11-22 22:08:46 -05:00
mark_story
d9484c109f
Merge branch '1.3' of github.com:cakephp/cakephp into 1.3
2010-11-22 21:29:33 -05:00
mark_story
d0d16a7eda
Fixing i18n extraction errors in Scaffold. Fixes #1305
2010-11-22 21:29:11 -05:00
mark_story
bf10723f89
Applying patch from 'michealc' to fix duplicated comments. Fixes #1306
2010-11-22 21:21:55 -05:00
mark_story
f48811a2ff
Moving include up so its not buried deep inside the class.
2010-11-22 21:15:02 -05:00
mark_story
7013a8f1e0
Fixing typo. Should be AppShell, not AppModel.
2010-11-22 21:07:21 -05:00
mark_story
244de1df85
Adding a comment about the messageId property and shells. Refs #1303
2010-11-22 13:01:14 -05:00
mark_story
2d21e9c331
Removing cache hits, as App::core() is almost always called before Cache is initialized, as Cache uses App::core to load the first configured engine. This Cache::read call can never succeed so it should be removed.
2010-11-21 23:02:39 -05:00
mark_story
8e1f7cc7b9
Removing extra line.
2010-11-21 15:12:44 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -05:00
mark_story
8a129ec3a0
Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
...
Updating Controller and Shell usage to match new parameters.
2010-11-21 00:47:42 -05:00
mark_story
8821bec049
Moving _mergeVars() into Object as its common to Controller, Model and Shell.
2010-11-21 00:14:29 -05:00
mark_story
8f82156a51
Adding _mergeVars to Controller (this duplicated method will be re-factored away).
...
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
e2aeae3825
Adding _mergeVars() into Model.
...
Refactoring how Model does its property merging.
Eventually _mergeVars() could be moved into Object.
2010-11-21 00:12:07 -05:00
mark_story
cbd88ede37
Adding support for AppShell into App. When you import a Shell class, App will automatically load Shell and AppShell.
2010-11-21 00:12:07 -05:00
mark_story
66c9b79c2e
Removing App::__overload() it does nothing anymore.
2010-11-21 00:12:06 -05:00
mark_story
79aafda698
Removing use of serialize() for locked fields. This removes any
...
possible exploit related to serialize()/unserialize(). Instead values
are passed as | delimited.
2010-11-21 00:09:45 -05:00
mark_story
ae7855692d
Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
...
Tests updated.
2010-11-20 23:42:54 -05:00
mark_story
3237402fb8
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
Juan Basso
3056fbf680
Changing authentication classes to use suffix Authentication instead of Method.
2010-11-20 17:47:35 -02:00
mark_story
e0a8ffe8a3
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
...
machine paths would not be correctly handled. Fixes #1254
2010-11-20 13:26:30 -05:00
PhpNut
82d46067ab
Corrected doc comment.
2010-11-17 15:00:27 -06:00
PhpNut
bed7767258
Removing __cache property that can be altered outside of the class definition.
...
Adding __resetCache() as a replacement for checking if cache should be reset and written.
2010-11-17 14:02:35 -06:00
José Lorenzo Rodríguez
40418de218
Freeing up some memory in dbos after the result set has been completly fetched.
...
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
José Lorenzo Rodríguez
c0f10437ea
Adding a few transactions to speed up a little tests involving fixtures
2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
1326707c9d
Implementing transaction nesting, this will allow to open multiple transactions that will only be commited if all transactions succesfully calls commit()
2010-11-16 22:56:23 -04:30
mark_story
47f6a29998
Small optimizations in env() and Helper::_parseAttributes().
2010-11-16 22:24:54 -05:00
mark_story
d89581dcca
Changing object construction and method call to use file_put_contents.
2010-11-16 21:54:05 -05:00
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
José Lorenzo Rodríguez
f2b707ac0b
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
2010-11-16 21:54:42 -04:30
mark_story
5349257bbd
Changing empty() to !isset() to avoid additional cache hits when po files are missing or empty.
2010-11-16 07:32:14 -05:00
José Lorenzo Rodríguez
a335891eba
mapping lastNumRows to lastAffectedRows as it is not possible to do the first one using PDO
2010-11-16 02:02:08 -04:30
mark_story
66e6ec763e
Merge branch 'dispatcher-request' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/tests/cases/libs/all_routing.test.php
cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
Juan Basso
7e0d34903e
Removed use of reference in params of http methods.
2010-11-15 00:09:52 -02:00
mark_story
293ef95f33
Adding more documentation, and adding some return early changes.
2010-11-14 18:43:46 -05:00
mark_story
db3f74dfa0
Moving a method around.
2010-11-14 18:38:10 -05:00
mark_story
070066be18
Expanding doc blocks for Dispatcher.
...
Extracting _isPrivateAction() so subclasses could change the behavior.
2010-11-14 18:37:27 -05:00
mark_story
1631f31460
Adding doc comments to Configure and App.
2010-11-14 18:26:54 -05:00
mark_story
1b89547c58
Pulling App out into its own file. Trying to stick with one class per file conventions.
...
Removing class_exists check, as Set is loaded during the framework
bootstrap.
2010-11-14 13:02:30 -05:00
mark_story
afd2683602
Adding a check for loaded routes. This prevents routes being loaded on each dispatched action, such as when requestAction is called.
2010-11-14 01:12:39 -05:00
mark_story
f27566336c
Renaming private method to protected.
...
Removing return by reference operator.
2010-11-14 01:08:13 -05:00
mark_story
f36f38e7f6
Adding doc blocks and adding type hints for _invoke().
2010-11-14 01:05:42 -05:00
mark_story
f02e0483ee
Reworking parameter munging specific to requestAction into requestAction. Updating tests cases for Object. As request->data is an array() not null. And leading / is trimmed off of [url][url].
2010-11-14 01:01:11 -05:00
mark_story
ea80a6dbbb
Removing instance variables that were no longer needed, as they weren't actually being used for much.
2010-11-14 00:16:07 -05:00
mark_story
1fe84c00dd
Starting to try and simplify the bootstrap process, and give a choice
...
over which GET param is used for cake's url.
2010-11-14 00:06:01 -05:00
mark_story
dad7963ea4
Moving Dispatcher inside libs directory, as it is part of CakePHP's libs.
2010-11-14 00:00:23 -05:00
mark_story
6073ac5dfa
Fixing errors caused by accessing things that don't exist.
2010-11-13 23:57:01 -05:00
mark_story
c7fed2ecba
Removing duplicate calls to Inflector.
2010-11-13 21:08:26 -05:00
mark_story
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
4c3337598e
Updating version numbers for 1.3.6
2010-11-13 20:01:20 -05:00
Juan Basso
974161cf3a
Changed the name of header to use in Digest method.
2010-11-13 21:47:25 -02:00
Juan Basso
85607a9963
Removed interference in the name of the headers.
2010-11-13 21:44:11 -02:00
Juan Basso
44629bd673
Support to digest method in HttpSocket. Thanks to jmcneese and Adrien Gibrat.
2010-11-13 20:51:09 -02:00
Juan Basso
1d56625f3a
If method is false, dont send the authentication. Fixed throw message.
2010-11-13 17:22:16 -02:00
Juan Basso
1dfd3ce0b1
Changing the auth value only if auth not is setted.
2010-11-13 13:40:00 -02:00
mark_story
01894b315f
Fixing issues caused by not accessing the request object correctly.
2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
47fa4713b1
Pulling ScaffoldView into a separate file.
2010-11-12 22:54:28 -05:00
mark_story
85e072a64b
Removing reference operators in view class constructors.
2010-11-12 22:51:53 -05:00
mark_story
4e3b62e466
Removing vestigial method in App.
...
Fixing E_STRICT error in Router.
2010-11-10 23:43:48 -05:00
mark_story
6c2b088706
Merge branch '2.0' into 2.0-view
2010-11-10 23:41:44 -05:00
José Lorenzo Rodríguez
00a3eda4d0
Fixing broken test because of change done in previous commit
2010-11-10 23:48:58 -04:30
mark_story
76c3e1a112
Adding cache comment stripping to the CacheHelper, it was recently removed from View, and needed to be added here to fix failing tests.
2010-11-09 23:55:30 -05:00
mark_story
6c0dfe9592
Fixing error where params[url] has moved.
2010-11-09 23:44:33 -05:00
mark_story
ee0dc785b2
Removing cache comment stripping, they are harmless in html/xml.
2010-11-09 22:37:02 -05:00
mark_story
7ad4068085
Refactoring to remove some duplication.
2010-11-09 22:27:36 -05:00
mark_story
1cf5e72054
Removing duplicated calls to slug()
...
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
Juan Basso
777afb6d3e
separeted auth from HttpSocket. Refs #880
2010-11-09 23:09:56 -02:00
Juan Basso
ef2a7d4608
Replaced trigger_error by throw Exception.
2010-11-09 21:28:11 -02:00
Juan Basso
8a4faa1e69
Updated doc to avoid E_STRICT messages.
2010-11-09 21:12:40 -02:00
Juan Basso
c6dd77de6f
Removed unsed attribute.
2010-11-09 21:04:52 -02:00
Juan Basso
8c29847c8f
Simplified the CakeSocket and fixed some phpdocs.
2010-11-09 19:07:29 -02:00
Juan Basso
fb5495fad5
Throws an exception on fail in connect.
2010-11-09 18:58:29 -02:00
Juan Basso
b46b861383
Removed unsed variable.
2010-11-09 18:54:33 -02:00
José Lorenzo Rodríguez
47c6132b24
cleaning up some tests, adding missing parameters in DboSource to match declaration on DataSource
2010-11-09 01:25:05 -04:30
José Lorenzo Rodríguez
9caba98780
Merge branch '2.0' of github.com:cakephp/cakephp into feature/2.0/pdo
2010-11-08 22:40:09 -04:30
José Lorenzo Rodríguez
8c2f9e1d2b
Removing E_STRICT errors from router
2010-11-08 22:38:30 -04:30
José Lorenzo Rodríguez
afa5ee6885
Removing E_STRICT errors from connection manager
2010-11-08 22:37:34 -04:30
José Lorenzo Rodríguez
2fa653d2f3
Removing E_STRICT errors from i18n
2010-11-08 22:37:09 -04:30
José Lorenzo Rodríguez
398adbbc7a
Removing E_STRICT errors from debugger
2010-11-08 22:36:48 -04:30
José Lorenzo Rodríguez
4cba8a12a0
Removing E_STRICT errors from Configure and App class
2010-11-08 22:36:38 -04:30
José Lorenzo Rodríguez
62017b2e38
Removing E_STRICT errors from ClassRegistry
2010-11-08 22:35:55 -04:30
José Lorenzo Rodríguez
09011d1010
Removing E_STRICT errors from CakeSession
2010-11-08 22:35:31 -04:30
mark_story
e8678b38ac
Adding specific conditions to model->delete's call to dbo->delete. This
...
helps fix a race condition where dbo->defaultConditions could cause
additional data loss. Fixes #250
2010-11-08 21:50:45 -05:00
José Lorenzo Rodríguez
f93a759220
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-11-08 21:30:38 -04:30
Juan Basso
b413aa99d9
Removing instance by reference.
2010-11-08 23:51:45 -02:00
mark_story
dfefc2d97b
Very initial pass at getting elements cached with Cache. Refs #1268
2010-11-08 00:06:10 -05:00
Ceeram
bc7770aa83
removing useless calls to mapActions()
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-11-07 23:16:41 -05:00
mark_story
e431e86aa4
Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added.
2010-11-07 20:53:04 -05:00
Jeremy Harris
c98306727d
Merge branch '2.0-redirect' into 2.0
2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511
Added support for redirection routes. Fixes #1151
2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84
Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086
2010-11-07 17:08:01 -08:00
mark_story
3216c902cd
Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
...
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
22497eb41c
Fixing failing tests in controller test.
2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8
Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
1ba28c246b
Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter.
...
Tests updated.
2010-11-07 13:23:45 -05:00
mark_story
92fec4588a
Making private things protected.
2010-11-07 13:23:45 -05:00
mark_story
4c0fd76a2e
Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.
2010-11-07 13:23:45 -05:00
mark_story
c92ecdcd1b
Initial pass at decoupling CacheHelper from View.
...
CacheHelper does all caching using helper callbacks now.
2010-11-07 13:23:43 -05:00
mark_story
1bc6433ecd
Removing duplicate import() and fixing missing dependency.
2010-11-07 13:23:43 -05:00
mark_story
aaff059132
Moving output into a property, and removing extra arguments from helpers. Having a view property reduces the number of strings that are copied around.
2010-11-07 13:23:43 -05:00
mark_story
2dff74d037
Removing local and using output property.
2010-11-07 13:23:43 -05:00
mark_story
2e140a9fd3
Adding tests for element callbacks.
2010-11-07 13:23:43 -05:00
mark_story
32587c154c
Adding callback support to elements. You can use the 3rd parameter to control whether or not before/afterRender callbacks should be fired for a particular element.
2010-11-07 13:23:43 -05:00
mark_story
1b19ad48b4
Adding parameters to helper callbacks, these allow helpers to introspect more on the view/layout being rendered.
...
Updating tests.
2010-11-07 13:23:42 -05:00
mark_story
882efa883e
Removing the trigger_error and view re-renders and replacing them with exceptions.
2010-11-07 13:23:42 -05:00
mark_story
76919902b9
Removing direct tests of protected method.
...
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
2010-11-07 13:23:42 -05:00
mark_story
540f1426be
Removing View::error(). Instead you should be handling error states in your controller, or throwing exceptions and letting the application error handling deal with the error.
2010-11-07 13:23:42 -05:00
mark_story
3f61fa004e
Removing dead import.
2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149
Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks.
...
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
2010-11-07 13:23:42 -05:00
Mark Story
157bdfafc6
Moving beforeLayout, before additional viewVars are processed. Refs #624
2010-11-07 13:23:42 -05:00
mark_story
09d3a0626a
Updating l10n to use the new CakeRequest method.
2010-11-07 01:38:25 -04:00
mark_story
22bb07abb0
Adding visibility to a few methods.
2010-11-07 01:36:37 -04:00
mark_story
1424e02488
Adding a method to CakeRequest to parse out the accept-language header. This will help remove features from l10n.
2010-11-07 01:35:36 -04:00
ADmad
eb76ab95f2
Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself.
2010-11-06 09:33:50 +05:30
mark_story
d56b812181
Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added.
...
Fixes #1257
2010-11-04 21:08:40 -04:00
José Lorenzo Rodríguez
6028705c72
Moving more methods out from DboSourceTest
2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
eedd823fd8
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-11-03 00:23:18 -04:30
mark_story
bff711e2dc
Merge branch '2.0-console' into 2.0
...
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
2010-11-02 23:49:19 -04:00
Juan Basso
b0a600f925
Merge branch '2.0-post-method' into 2.0
2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a
Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://"
2010-11-03 01:26:41 -02:00
Juan Basso
b752766d6c
Using full base when $url is empty.
2010-11-03 01:16:38 -02:00