2.0 #179

Closed
wants to merge 3,414 commits into
from

Projects

None yet
@zoghal
zoghal commented Aug 20, 2011

hi , fixing 2 bug in ThemeView & Dispatcher

@lorenzo

I think this line can be removed

Member

I think that ticket is for MySQL, SQLServer actually requires an ORDER BY for pagination to work. Without an order by the SQLServer will have SQL errors.

markstory and others added some commits Jun 23, 2011
@markstory markstory Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	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
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
91a1cf8
@markstory markstory Fixing failures from merging. 3e4388d
@markstory markstory Renaming FileLog test case. 5035bb9
@lorenzo lorenzo Fixing a couple of recently broken tests 1814b06
@lorenzo lorenzo Fixing test broken in Mysql driver d86dcd6
@lorenzo lorenzo Removing a apparently bad hack in the FolderTest case 55387ef
@markstory markstory Adding a test for double escaped form urls.
Refs #1748
68378f2
@markstory markstory Fixing form action attributes being double encoded with
querystring attributes.
Fixes #1748
d6e262d
@markstory markstory Removing duplicated code. 623466d
@markstory markstory Adding support for Unicode characters. Refs #1321 9ab2ec7
@markstory markstory Fixing issues with unicode quoting. 3169c5a
@markstory markstory Fixing tests that shouldn't have been changed. 6bcfd19
@markstory markstory Updating varchar, text columns to use nvarchar.
This storage type stores unicode properly, and is the
saner default datatype for most applications.
Fixes #1321
08f1afe
@AD7six AD7six Hide db credentials
To protect users who have publically accessible installs with debug
turned on - *** out db login credentials
fcd0505
@thatcode thatcode Minor comment and path changes. fb3a192
@markstory markstory Removing expectation that was not being fulfilled. ffe575b
@markstory markstory Starting to convert Helper::setEntity() and View::entity()
to not be nearly as complex and magic.  This also
helps reduce coupling between the helpers and Models.
8a8336c
@markstory markstory Updating more tests for change in Helper setEntity(). 3a847ae
@markstory markstory Starting to update FormHelper's internals to work with changes in
Helper.
b7e554f
@markstory markstory Making a test more specific. 96cc1b9
@markstory markstory Fixing '2.name' style fields when creating multiple record forms. 2587044
@markstory markstory Fixing issue where _method would be remembered as a field. f5b3549
@markstory markstory Removing pointless test that was in the middle of an unrelated test. 87fe663
@markstory markstory Fixing more failing tests.
Fixing use of properties that are going away.
4073584
@markstory markstory Removing now dead code. 1ffa736
@markstory markstory Fixing failing tests caused by merge with 1.3 e4d7010
@markstory markstory Moving entity() and its related attributes to Helper
Removing entity() and its attributes from View.
Having that information on View allowed for unwanted side effects,
and seemed like a break of encapsulation.
8925832
@maurymmarques maurymmarques Removed unnecessary str_replace Sanitize class. df043ed
@ADmad ADmad Removing unneeded magic methods. Closes #1802 b22e30c
@lorenzo lorenzo Removing magic variable in DboSource to bypass the adding of fields t…
…o association queries, instead adding the ability to declare 'fields' => false in the association array. This opens the possibility of having joins for filtering purposes.
ee2930d
@markstory markstory Moving FormHelper specifics into that class. c9acb6b
@markstory markstory Fixing failing debugger test.
Adding doc blocks for helper properties.
bef2e75
Thomas Ploch Removed legacy app/config folder from 2.0 branch. 4854b4a
@lorenzo lorenzo Merge pull request #139 from tPl0ch/2.0-legacycode
Removed legacy app/config folder from 2.0 branch.
a1f63a1
@majna majna Fix for render element - allow under_scored plugin name. Fixes #1814 71ed244
@markstory markstory Merge pull request #132 from thatcode/2.0
Minor comment and path changes.
2725718
@markstory markstory Merge pull request #140 from majna/2.0
Fix for render element - allow under_scored plugin name.
Fixes #1814
2f24be7
@markstory markstory Changing title CSS for web test runner.
Fixes #1752
0366d8f
@labianchin labianchin Update component task, make components extend Component instead of Ob…
…ject.
ae9a3ef
@markstory markstory Merge branch 'form-helper' into 2.0 c2a9626
@markstory markstory Fixing failing test that happened between 12:00 & 12:59 be09c67
@lorenzo lorenzo Merge pull request #141 from luisarmando/componentsUpgrade
Update component task, make components extend Component instead of Object
f671be6
@milesj

Is this "extents" typo correct?

Member

It is a typo, should fix that soon :)

@markstory
Member

Nice, should the error say to load the specific plugin or set all of them?

Member

It shows the two options, but the first one shown is a single one

@renan

Should it be 2.0?

Member

Not sure :P

Member

I think so, this is a new file.

Member

I was just kidding :)

@ceeram

This should point to app/Config/bootstrap.php

Member

Nice Catch!

lorenzo and others added some commits Jul 7, 2011
@lorenzo lorenzo Fixing copy paste typos from previous commit af12a17
@majna majna Fix for wrong Exception messages and typos. Added missing ExceptionRe…
…nderer tests for Datasource
742130b
@ADmad ADmad Fixing singularization of "curves" 1bccc77
@lorenzo lorenzo Merge pull request #144 from majna/2.0
Fix for exception messages and typos
a69fcca
@hiromi2424 hiromi2424 fixed unassigned "show passes" parameter for test 9e79756
@lorenzo lorenzo Merge pull request #145 from hiromi2424/2.0-fix-testsuite-show-passes
Re-adding support for showing passing tests in web testsuite
f320457
@majna majna Refactored DatabaseSession to use only 'Session.handler.model' config…
…. Fixed static call on non-static method DatabaseSession::gc(). Fix for SessionFixture -primary key too long (MySQL Error: 1071)
cde13da
@ceeram ceeram removing unneeded parameter, describe() only takes one parameter 00dd1cc
@ceeram ceeram removing unused parameter for value() 4d702ee
@burzum burzum Adding the "returnQuery" key to the 2nd argument of the find() method…
… to be able to get the query array back from the before state of findMethod() calls. This was required in the past for some more complex queries and is in 2.0 no longer possible because the find methods became protected.
9d7c97c
@lorenzo lorenzo Merge pull request #146 from majna/2.0-database-session
Refactored DatabaseSession to use only 'Session.handler.model' config
273125d
@lorenzo lorenzo Adding App::location() method to be able to obtain the defined path f…
…or a class
f8ab1d3
@lorenzo lorenzo Removing the Controller::modelNames property and loading it's content…
…s in the uses variable.

Simplifying code in Controller::render()
Setting all models loaded into the request parameters so it can be used later on the Form helper
e45b35c
@ceeram ceeram removing unneeded parameter 6047024
@burzum burzum Refactoring the code to build the query array as suggested here cakep… adb943b
@ceeram ceeram fixing regex for setting constant in test.php e3dfec9
@ceeram ceeram Adding option to ProjectTask, for setting CAKE_CORE_INCLUDE_PATH. Tes…
…ts added.
a025cb2
@lorenzo lorenzo Refactoring how models are passed as a request parameter to the view,…
… now the full plugin and model name will be passed on
567ac02
@lorenzo lorenzo Moving tagIsInvalid from Helper back to FormHelper, as it is a better…
… home for it
22f0237
@lorenzo lorenzo Refactoring how model information is extracted in the FormHelper, it …
…is done now in a lazy manner and hopefully using less memory
39dadf5
@lorenzo lorenzo Starting to update tests after removing the validationErrors property…
… in Helper
d54e8cd
@lorenzo lorenzo Cleaning up the ClassRegistry::init() method, removing the use of the…
… second parameter as it always accepted but one value

The second parameter is now $strict, meaning that if the model class is not found it will not try to create an AppModel instance
60b44e0
@lorenzo lorenzo Ensuring that classes returned by ClassRegistry::init() are model ins…
…tances
e8efc67
@lorenzo lorenzo Updating FormHelper tests 1941be6
@lorenzo lorenzo Fixing ClassRegistry that was incorrectly checking class inheritance
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
ef5650c
@lorenzo lorenzo Currently the FormHelper fails if the Model supplied is 'Model', perh…
…aps we need to add a special case for this
9304f34
@lorenzo lorenzo Adding a special case for not trying to instantiate a Model called Mo…
…del in FormHelper
ba012ed
@lorenzo lorenzo Updating more tests on FormHelperTest case 4ed46cf
@lorenzo lorenzo Updating test to reflect that models passed as a request parameter ar…
…e now in an associative array
a5851e9
@lorenzo lorenzo Fixing remaining failing tests on FormHelperTest case 0228611
@lorenzo lorenzo Fixing typo dcd8811
@lorenzo lorenzo Cleaning up the code and adding tests for new features 0c79ad8
@lorenzo lorenzo REmoving call to deprecated method in PHPUnit ac2538b
@lorenzo lorenzo Updating Controller test case 37231b4
lorenzo and others added some commits Jul 25, 2011
@lorenzo lorenzo Reverting change done by previous merge 2b7888e
@lorenzo lorenzo Merge remote-tracking branch 'origin/2.0-saveall' into 2.0 165dcf1
@markstory markstory Cleaning up after route connection. c35d52e
@markstory markstory Updating docs for Configure classes. f534ea0
@markstory markstory Updating doc blocks and @package strings for Console
classes.
74e2cb1
@markstory markstory Merge pull request #134 from maurymmarques/2.0
Removed unnecessary str_replace Sanitize class to CakePHP 2.0.
7d957b4
@lorenzo lorenzo Making saveAll with validate => only validate the current model data …
…first
1c7f181
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 94f9ef6
@lorenzo lorenzo Merge remote-tracking branch 'origin/2.0-paginator-count' into 2.0 959a968
@lorenzo lorenzo Solving scope problem after clearing up variables in the default rout…
…es file
21ff9ca
@lorenzo lorenzo Updating all @package annotations in doc blocks cfd2d9e
Dean Sofer Added `'integer' => 'number'` for HTML5
Located in $map in the `FormHelper::input()` method. This means that if a field input is related to an integer column in the database, it will show up as a number input in the HTML5 form (where supported) yet gracefully degrade.
333f365
Dean Sofer Added test for HTML5 `FormHelper::input()` integer to number in $map 804e88b
@lorenzo lorenzo Reverting change done to validation that was duplicating the validate…
…s() process for the main model, returning the correct value in validateAssociated() instead
8c60e01
@lorenzo lorenzo Updating version numbers to 2.0.0-beta 402934f
@lorenzo lorenzo Removing duplicate directory separator when looking for locale search…
… paths, closes #1854
25682db
Dean Sofer Additional tweak to FormHelper::input(), make float types use the num…
…ber input
2ef17ec
@markstory markstory Fixing issue wher times between 12:00 and 12:59 would be incorrectly
marked as am.
Fixes #1851
ecccfe9
@majna majna Fix for lowercased schema folder when baking plugin skel 29e4cad
@markstory markstory Removing unused property.
Removing broken dispatch pass-though method.
8149e4f
@lorenzo lorenzo Merge pull request #159 from majna/2.0-plugin-task
Fix for lowercased schema folder when baking plugin skel.
dbcdbbb
@markstory markstory Adding missing Vendor directory.
Fixes #1859
8f38065
@markstory markstory Fixing double output issues with Scaffold. f9373ff
@markstory markstory Changing Postgresql to use DELETE FROM instead of TRUNCATE.
This should improve compatibilty with databases using constraints.
Fixes #1838
e1960d1
@lorenzo
Member

Well, there is a reason for using truncate and it's that it will also reset the associated sequences. I wonder if this broke some tests internally in the core

Member

Interesting, the ticket was complaining that using truncate wasn't working with constraints. http://cakephp.lighthouseapp.com/projects/42648/tickets/1838 I didn't see any new failing tests related to sequences though.

markstory and others added some commits Jul 30, 2011
@markstory markstory Fixing issues with SecurityComponent, where removing your session,
would allow posting of invalid form data.
Fixes #1867
7a9ac53
@ADmad ADmad Fixed TreeBehavior::childCount(). Closes #1833 762fcf2
@ADmad ADmad Enhancing validation messages to have placeholders. Closes #1855 b15c77e
@lorenzo lorenzo Making ControllerTestCase abstract, that way PHP won't complain about…
… empty test cases, closes #1868
eaa0163
@ADmad ADmad Fixed TreeBehavior::childCount(). Closes #1833 9577fb0
@markstory markstory Fixing issues with Sanitize::stripWhitespace() and utf8 characters.
Fixes #1862
416e527
@markstory markstory Merge pull request #157 from ProLoser/patch-2
Added `'integer' => 'number'` for HTML5
4da671c
@markstory markstory Fixing issues with duplicate content/empty tags with CacheHelper.
Added internal tag munging proposed by 'FelipePtChO'.
Uncommented a test that was failing.
Fixes #1857
b5a533b
@ceeram ceeram moving test icons one dir up, and remove subdir img in img dbdc0a1
@ceeram ceeram Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 e083b21
@markstory markstory Re-adding support for PHP's include_path.
Moving constants that are made of other constants into bootstrap.php
721c438
@markstory markstory Making skel files generate hard coded paths, when CakePHP
is not on the include_path, and exclude hard coded paths when it is.
20e9015
@markstory markstory Removing APP_PATH it is always the same as APP.
Fixing a typo in index.php.
6e2870c
@markstory markstory Doing some refactoring in the project task.
Adding tests for constants staying commented out when CakePHP is on the include_path.
cdcabc7
@markstory markstory Changing assertPattern to assertRegExp. b362afe
@markstory markstory Adding comments about CAKE_CORE_INCLUDE_PATH.
Removing ini_set() blocks that don't need to exist.
b45e8eb
@markstory markstory Updating output of project task to better reflect what
happened.
c1b0eb8
@0x20h 0x20h Adding better file locking in write(). This should reduce issues
with file locking and unserialize().
Fixes #1660
ea7c8c4
@markstory markstory Adding a line to the generated cache files,
that re-assigns view params after component callbacks.
Fixes issues with SecurityComponent and cache files.
Fixes #1863
6ef4ce4
@markstory markstory Making long options & arguments replaced with short forms.
Fixes #1882
5f84b48
@markstory markstory Fixing incorrectly inflected shell names in help. fb756c5
@markstory markstory Fixing bad include on text reporter.
Fixing bad includes and updating usage in text coverage reports.
10c78c5
@markstory markstory Adding an exception when a short option is longer than one
character. Having long short options breaks parsing, and
doesn't make sense with how short options are used.
b739127
@markstory markstory Fixing issues where option values started with '-'. 5d3c470
@markstory markstory Fixing issues output xml help. 2f079b3
@markstory markstory Fixing notice errors caused by undefined property. be262f3
@markstory markstory Cleanup of minor issues found with phpmd. e4a7c8f
@markstory markstory Fixing parameter name in RssHelper docs.
Fixes #1888
5330096
@markstory markstory Updating doc blocks in Debugger and CakeLog. 4ab9ded
@markstory markstory Expanding docs on HtmlHelper. a268eea
@markstory markstory Fixing plugin option + locations subcommand. 95f3eb4
Maggion Emmanuel Adding `cake_dev` domain 7ab1805
@renan renan Merge pull request #168 from kamui545/patch-1
Adding `cake_dev` domain
eb7567d
Maggion Emmanuel Adding support for url input cb5f57f
@majna majna Fix for wrong 'cake_dev' i18n domain param. 48e6814
@renan renan Merge pull request #170 from majna/2.0-i18n-domain
Fixed wrong i18n domain param: 'cake_developer'
ed8daf8
Maggion Emmanuel Edited lib/Cake/View/Helper/FormHelper.php via GitHub 6cd89b0
Maggion Emmanuel Adding test case 2773450
@ADmad ADmad Fixing regression in Set::extract(). Closes #1895 #1816 #1692 392102b
@markstory
Member

Nicely done :)

Member

Thanks. I don't know whether it was divine intervention or just plain luck that i was able to patch this, cause I still have no idea how the whole logic works :)

@majna
majna commented on cfd2d9e Aug 10, 2011

You forgot to update @package in app/Config files, to be consistent with skel. (.gitignore maybe)

markstory and others added some commits Aug 11, 2011
@markstory markstory Fixing failing tests. e9382d0
@markstory markstory Fixing issue where postLink() would fail when used with SecurityCompo…
…nent.
2ce2d06
@markstory markstory Adding tests for FormHelper::postButton() and SecurityComponent. 6026aa4
@lorenzo lorenzo Re-adding primaryKey detection support to FormHelper, it was removed …
…mistakenly in last refactor
3d46172
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 9b6ea7d
@lorenzo lorenzo Adding ability to Set class to iterate on ArrayObjects, or any object…
… implementing ArrayAccess and Traversable
1726bad
@markstory markstory Fixing notice error when all csrf tokens are expired at once.
Fixes #1901
1df8de6
@markstory markstory Fixing issues with CSRF token failure and requestAction.
Fixes #1900
3014d3f
@markstory markstory Fixing issues with request stack not being used correctly
when there are requestAction requests being performed.
Adding Router::popRequest() to allow manipulation of request stack
so nested requestAction or serial requestAction calls work correctly.
Fixes #1906
fdacc9d
@martin-ueding martin-ueding prepared utf8 database connection option 00a77b4
@ADmad ADmad Merge pull request #176 from martin-ueding/1.3
Added commented "encoding" => "utf8" to default db config
2a2a4ab
@ADmad ADmad Data returned by Model::save() not contains primary key too when new …
…record is created. Closes #1869
7983b41
@ADmad ADmad Fixing regression in Set::extract(). Refs #1895, #1816, #1692. b781762
@ADmad ADmad For paging links the 'class' attribute is now always applied to the w…
…rapping tag for consistency. Closes #1759
5d79299
@ADmad ADmad Making Model::find('count') behave nicely when 'group' key is specifi…
…ed in options. Closes #1677
ef4826e
@dereuromark
Member

"Data returned by Model::save() not contains primary key too when new record is created. Closes #1869"
not should probably read now :)

Member

Right its a typo, "not" should be "now". I realized that after I had already pushed couple of other commits so couldn't really do anything about it. Maybe if you had sent a pull request too with required changes for your ticket this would have been avoided :)

Member

Well, I guess I take full responsibility then.

markstory and others added some commits Aug 14, 2011
@markstory markstory Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
d93c8cb
@markstory markstory Fixing failing cache tests. e29eb1c
@markstory markstory Fixing failing test. In 2.0, absolute paths are not altered. 182b13f
@ADmad ADmad Optimizing various finds when deleting records and updating counter c…
…ache to avoid extra queries, unnecessary joins and callbacks triggering
2b342d9
@ADmad

Merging commits from 1.3 has this problem that we loose the visibility keyword for functions :(

Member

I'll go back and add them in. I totally missed that.

Member

I can include in api script (https://gist.github.com/1113866) to check about the visibility word in all the whole methods.

Member

That would be nice. We should probably have a shell in the core itself for checking coding standards. That would also help promote best practices among the framework users. The shell could be setup as a pre-commit hook.

@markstory
Member

I fixed up the visibility issues in 54e1de9

@zoghal zoghal closed this Aug 20, 2011
@gBokiau

I believe this should actually have been (ROOT . DS . APP_DIR . DS . 'Config' . DS . 'core.php') as in preceding lookups for bootstrap and tmp

Member

Why? APP is defined as ROOT . DS . APP_DIR . DS.

APP is actually defined as $this->params['working'] (see line 125), so more error-prone

@gBokiau Look more closely at the diff. This change does nothing but remove a duplicate constant. Also look how $this->params['working'] is generated: https://github.com/cakephp/cakephp/blob/6e2870c706efe970fae9f239619beededfb39aec/lib/Cake/Console/ShellDispatcher.php#L264

I bumped into this while trying to have the webroot directory on the same level as the app directory, e.g.

ROOT
    APP
    WEBROOT

I figured using the root as working directory and manually defining params['app'] and params['webroot'] would be a solution, even though this could lead to problems further down the road, with APP not being correctly defined.

Not only is this currently impossible, but there is room for two conflicting definitions of the same folder without one taking precedence over the other.

You're missing the point. How is APP_PATH different than APP in this commit?

@ceeram

What is this line doing?

Member

Your guess is good as mine, the commit was done 3 years ago 😄

Member

worst memory ever @ADmad

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment