Commit graph

305 commits

Author SHA1 Message Date
mark_story
23dce83836 Fixing test cases and code from merge with 1.3
Making MemcacheEngine::__Memcache protected, so mocking is possible.
2011-01-18 20:20:49 -05:00
mark_story
dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
mark_story
b94edefb2c Removing the last vestiges of the enable parameter.
Fixing issue where isset() stupidly plods along when doing a string index of a string.
Updating DbAcl to use proper settings array.
Fixes #1467
2011-01-18 19:33:57 -05:00
mark_story
0f4c90588d Fixing issue where elements did not get .ctp as a fallback extension unlike view and layout files.
Adding a protected method to get extensions, as it would be in 3 places now.
Added tests.
Fixes #1438
2011-01-12 20:43:41 -05:00
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
4312a26b2f Removing View::$autoRender it wasn't used.
Removing @access tags, which just restated the visibility keywords.
Adding documentation to a number of parameters and methods.
2010-12-21 21:59:25 -05:00
Juan Basso
a7c7436d8e Passing viewVars to cache views, avoiding cake:nocache problems. 2010-12-18 19:31:10 -02: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
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
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
mark_story
c7fed2ecba Removing duplicate calls to Inflector. 2010-11-13 21:08:26 -05:00
mark_story
85e072a64b Removing reference operators in view class constructors. 2010-11-12 22:51:53 -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
mark_story
dfefc2d97b Very initial pass at getting elements cached with Cache. Refs #1268 2010-11-08 00:06:10 -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
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
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
1166806218 Removing shutup operator from View::_render()
Errors in your views will not be suppressed when debug = 0 anymore.
Fixes #943
2010-10-26 23:12:24 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
0761edecfb Making the cake:nocache stripping more relaxed so that if either condition to enable caching is on, tags will be stripped. Tests added. Fixes #1148 2010-09-28 23:03:56 -04:00
mark_story
6d7f2d37ab Fixing issue where fields with the exact same name as the model would result in incorrect name attributes. Tests added. Fixes #1123 2010-09-26 00:46:51 -04:00
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
e91fa68f8e Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105 2010-09-18 00:13:03 -04:00
mark_story
e4b2fb173b Removing the deprecated properties.
Removing property copying to helpers.
Making the view test cases pass again.
2010-09-13 23:11:59 -04:00
mark_story
634cea24eb Adding 'action' into View::__get() to make an integration test pass. 2010-09-13 23:11:59 -04:00
mark_story
f1164c93d6 Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery. 2010-08-29 21:37:25 -04:00
mark_story
2cdb10812d Merge branch '2.0-exceptions' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/tests/cases/dispatcher.test.php
2010-08-28 00:14:34 -04:00
mark_story
dc67b9cacc Moving all the exceptions into one file for the short term. 2010-08-28 00:08:35 -04:00
José Lorenzo Rodríguez
f63b093d24 Merge branch '2.0-request' into 2.0
Still tons of tests failing
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/html.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-08-27 23:31:41 -04:30
mark_story
4cc2229641 Updating CacheHelper to use correct View API.
Updating View to make CacheHelper tests pass.
2010-08-26 23:24:09 -04:00
mark_story
65c235023d Removing ability to register View and ThemeView into ClassRegistry. 2010-08-10 23:18:41 -04:00
mark_story
052c81774c Removing some code duplication. 2010-08-10 23:18:40 -04:00
mark_story
fc3379767d Moving methods around. ObjectCollection now normalizes helpers arrays. Plugin helpers now lazy load.
Tests updated.
2010-08-10 23:18:38 -04:00
mark_story
1d983e1cd4 Making MissingView and MissingLayout cake errors into exceptions. 2010-08-10 23:18:37 -04:00
mark_story
a23207791a Modifying View to accept HelperCollection. Removing methods that are no longer needed. 2010-08-10 23:18:37 -04:00
mark_story
c15d228515 Initial integration of HelperCollection into View. 2010-08-10 23:18:37 -04:00
mark_story
6db3dbc680 Starting to create HelperCollection which will be responsible for loading and constructing helpers.
Making an abstract class that will be the base of all object collections.
Adding test cases.
2010-08-10 23:18:36 -04:00