Skip to content
Permalink
Browse files

Fix API links.

The book has been moved, so we should update the links.

Fixes #4555
  • Loading branch information...
markstory committed Oct 7, 2014
1 parent c801347 commit 0c3b9e466387693b487760d298047e664edbeeab
Showing with 808 additions and 809 deletions.
  1. +1 −1 app/config/acl.ini.php
  2. +2 −2 app/webroot/test.php
  3. +18 −19 cake/basics.php
  4. +1 −1 cake/console/libs/bake.php
  5. +1 −1 cake/console/libs/schema.php
  6. +1 −2 cake/console/libs/testsuite.php
  7. +2 −2 cake/console/templates/skel/webroot/test.php
  8. +9 −8 cake/libs/configure.php
  9. +1 −1 cake/libs/controller/app_controller.php
  10. +3 −3 cake/libs/controller/component.php
  11. +4 −4 cake/libs/controller/components/acl.php
  12. +23 −23 cake/libs/controller/components/auth.php
  13. +1 −1 cake/libs/controller/components/cookie.php
  14. +3 −3 cake/libs/controller/components/email.php
  15. +1 −1 cake/libs/controller/components/request_handler.php
  16. +10 −10 cake/libs/controller/components/security.php
  17. +8 −8 cake/libs/controller/components/session.php
  18. +27 −27 cake/libs/controller/controller.php
  19. +7 −7 cake/libs/debugger.php
  20. +10 −10 cake/libs/inflector.php
  21. +2 −2 cake/libs/model/behaviors/acl.php
  22. +2 −2 cake/libs/model/behaviors/containable.php
  23. +1 −1 cake/libs/model/behaviors/translate.php
  24. +13 −13 cake/libs/model/behaviors/tree.php
  25. +45 −45 cake/libs/model/model.php
  26. +15 −15 cake/libs/view/helpers/ajax.php
  27. +1 −1 cake/libs/view/helpers/cache.php
  28. +24 −24 cake/libs/view/helpers/form.php
  29. +17 −17 cake/libs/view/helpers/html.php
  30. +1 −1 cake/libs/view/helpers/javascript.php
  31. +6 −6 cake/libs/view/helpers/number.php
  32. +1 −1 cake/libs/view/helpers/paginator.php
  33. +1 −1 cake/libs/view/helpers/rss.php
  34. +6 −6 cake/libs/view/helpers/session.php
  35. +9 −9 cake/libs/view/helpers/text.php
  36. +19 −19 cake/libs/view/helpers/time.php
  37. +4 −4 cake/libs/view/helpers/xml.php
  38. +2 −2 cake/tests/cases/basics.test.php
  39. +2 −2 cake/tests/cases/console/cake.test.php
  40. +2 −2 cake/tests/cases/dispatcher.test.php
  41. +2 −2 cake/tests/cases/libs/cache.test.php
  42. +2 −2 cake/tests/cases/libs/cache/apc.test.php
  43. +2 −2 cake/tests/cases/libs/cache/file.test.php
  44. +2 −2 cake/tests/cases/libs/cache/memcache.test.php
  45. +2 −2 cake/tests/cases/libs/cache/xcache.test.php
  46. +2 −2 cake/tests/cases/libs/cake_log.test.php
  47. +2 −2 cake/tests/cases/libs/cake_session.test.php
  48. +2 −2 cake/tests/cases/libs/cake_socket.test.php
  49. +1 −1 cake/tests/cases/libs/cake_test_case.test.php
  50. +2 −2 cake/tests/cases/libs/cake_test_fixture.test.php
  51. +2 −2 cake/tests/cases/libs/class_registry.test.php
  52. +2 −2 cake/tests/cases/libs/code_coverage_manager.test.php
  53. +2 −2 cake/tests/cases/libs/configure.test.php
  54. +2 −2 cake/tests/cases/libs/controller/component.test.php
  55. +2 −2 cake/tests/cases/libs/controller/components/acl.test.php
  56. +2 −2 cake/tests/cases/libs/controller/components/auth.test.php
  57. +2 −2 cake/tests/cases/libs/controller/components/cookie.test.php
  58. +2 −2 cake/tests/cases/libs/controller/components/email.test.php
  59. +2 −2 cake/tests/cases/libs/controller/components/request_handler.test.php
  60. +2 −2 cake/tests/cases/libs/controller/components/security.test.php
  61. +2 −2 cake/tests/cases/libs/controller/components/session.test.php
  62. +2 −2 cake/tests/cases/libs/controller/controller_merge_vars.test.php
  63. +2 −2 cake/tests/cases/libs/controller/pages_controller.test.php
  64. +2 −2 cake/tests/cases/libs/controller/scaffold.test.php
  65. +2 −2 cake/tests/cases/libs/error.test.php
  66. +2 −2 cake/tests/cases/libs/file.test.php
  67. +2 −2 cake/tests/cases/libs/folder.test.php
  68. +2 −2 cake/tests/cases/libs/http_socket.test.php
  69. +2 −2 cake/tests/cases/libs/i18n.test.php
  70. +1 −1 cake/tests/cases/libs/inflector.test.php
  71. +2 −2 cake/tests/cases/libs/l10n.test.php
  72. +2 −2 cake/tests/cases/libs/log/file_log.test.php
  73. +2 −2 cake/tests/cases/libs/model/behaviors/containable.test.php
  74. +2 −2 cake/tests/cases/libs/model/behaviors/translate.test.php
  75. +2 −2 cake/tests/cases/libs/model/behaviors/tree.test.php
  76. +2 −2 cake/tests/cases/libs/model/cake_schema.test.php
  77. +1 −1 cake/tests/cases/libs/model/connection_manager.test.php
  78. +2 −2 cake/tests/cases/libs/model/datasources/dbo_source.test.php
  79. +2 −2 cake/tests/cases/libs/model/db_acl.test.php
  80. +2 −2 cake/tests/cases/libs/model/model.test.php
  81. +2 −2 cake/tests/cases/libs/model/model_delete.test.php
  82. +2 −2 cake/tests/cases/libs/model/model_integration.test.php
  83. +2 −2 cake/tests/cases/libs/model/model_read.test.php
  84. +2 −2 cake/tests/cases/libs/model/model_validation.test.php
  85. +2 −2 cake/tests/cases/libs/model/model_write.test.php
  86. +2 −2 cake/tests/cases/libs/model/models.php
  87. +2 −2 cake/tests/cases/libs/multibyte.test.php
  88. +2 −2 cake/tests/cases/libs/object.test.php
  89. +2 −2 cake/tests/cases/libs/overloadable.test.php
  90. +2 −2 cake/tests/cases/libs/router.test.php
  91. +2 −2 cake/tests/cases/libs/sanitize.test.php
  92. +2 −2 cake/tests/cases/libs/security.test.php
  93. +2 −2 cake/tests/cases/libs/set.test.php
  94. +1 −1 cake/tests/cases/libs/string.test.php
  95. +2 −2 cake/tests/cases/libs/test_manager.test.php
  96. +2 −2 cake/tests/cases/libs/validation.test.php
  97. +2 −2 cake/tests/cases/libs/view/helper.test.php
  98. +2 −2 cake/tests/cases/libs/view/helpers/ajax.test.php
  99. +2 −2 cake/tests/cases/libs/view/helpers/cache.test.php
  100. +2 −2 cake/tests/cases/libs/view/helpers/form.test.php
  101. +2 −2 cake/tests/cases/libs/view/helpers/html.test.php
  102. +2 −2 cake/tests/cases/libs/view/helpers/javascript.test.php
  103. +2 −2 cake/tests/cases/libs/view/helpers/js.test.php
  104. +2 −2 cake/tests/cases/libs/view/helpers/number.test.php
  105. +2 −2 cake/tests/cases/libs/view/helpers/paginator.test.php
  106. +2 −2 cake/tests/cases/libs/view/helpers/rss.test.php
  107. +2 −2 cake/tests/cases/libs/view/helpers/session.test.php
  108. +2 −2 cake/tests/cases/libs/view/helpers/text.test.php
  109. +2 −2 cake/tests/cases/libs/view/helpers/time.test.php
  110. +2 −2 cake/tests/cases/libs/view/helpers/xml.test.php
  111. +2 −2 cake/tests/cases/libs/view/media.test.php
  112. +2 −2 cake/tests/cases/libs/view/theme.test.php
  113. +2 −2 cake/tests/cases/libs/view/view.test.php
  114. +2 −2 cake/tests/cases/libs/xml.test.php
  115. +2 −2 cake/tests/fixtures/account_fixture.php
  116. +2 −2 cake/tests/fixtures/aco_action_fixture.php
  117. +2 −2 cake/tests/fixtures/aco_fixture.php
  118. +2 −2 cake/tests/fixtures/aco_two_fixture.php
  119. +2 −2 cake/tests/fixtures/advertisement_fixture.php
  120. +2 −2 cake/tests/fixtures/another_article_fixture.php
  121. +2 −2 cake/tests/fixtures/apple_fixture.php
  122. +2 −2 cake/tests/fixtures/aro_fixture.php
  123. +2 −2 cake/tests/fixtures/aro_two_fixture.php
  124. +2 −2 cake/tests/fixtures/aros_aco_fixture.php
  125. +2 −2 cake/tests/fixtures/aros_aco_two_fixture.php
  126. +2 −2 cake/tests/fixtures/article_featured_fixture.php
  127. +2 −2 cake/tests/fixtures/article_featureds_tags_fixture.php
  128. +2 −2 cake/tests/fixtures/article_fixture.php
  129. +2 −2 cake/tests/fixtures/articles_tag_fixture.php
  130. +2 −2 cake/tests/fixtures/attachment_fixture.php
  131. +2 −2 cake/tests/fixtures/auth_user_custom_field_fixture.php
  132. +2 −2 cake/tests/fixtures/auth_user_fixture.php
  133. +2 −2 cake/tests/fixtures/author_fixture.php
  134. +2 −2 cake/tests/fixtures/basket_fixture.php
  135. +2 −2 cake/tests/fixtures/bid_fixture.php
  136. +2 −2 cake/tests/fixtures/bidding_fixture.php
  137. +2 −2 cake/tests/fixtures/bidding_message_fixture.php
  138. +2 −2 cake/tests/fixtures/binary_test_fixture.php
  139. +2 −2 cake/tests/fixtures/book_fixture.php
  140. +2 −2 cake/tests/fixtures/cache_test_model_fixture.php
  141. +2 −2 cake/tests/fixtures/callback_fixture.php
  142. +2 −2 cake/tests/fixtures/category_fixture.php
  143. +2 −2 cake/tests/fixtures/category_thread_fixture.php
  144. +2 −2 cake/tests/fixtures/cd_fixture.php
  145. +2 −2 cake/tests/fixtures/comment_fixture.php
  146. +2 −2 cake/tests/fixtures/content_account_fixture.php
  147. +2 −2 cake/tests/fixtures/content_fixture.php
  148. +2 −2 cake/tests/fixtures/counter_cache_post_fixture.php
  149. +2 −2 cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
  150. +2 −2 cake/tests/fixtures/counter_cache_user_fixture.php
  151. +2 −2 cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
  152. +2 −2 cake/tests/fixtures/data_test_fixture.php
  153. +2 −2 cake/tests/fixtures/device_fixture.php
  154. +2 −2 cake/tests/fixtures/device_type_category_fixture.php
  155. +2 −2 cake/tests/fixtures/device_type_fixture.php
  156. +2 −2 cake/tests/fixtures/document_directory_fixture.php
  157. +2 −2 cake/tests/fixtures/document_fixture.php
  158. +2 −2 cake/tests/fixtures/exterior_type_category_fixture.php
  159. +2 −2 cake/tests/fixtures/feature_set_fixture.php
  160. +2 −2 cake/tests/fixtures/featured_fixture.php
  161. +2 −2 cake/tests/fixtures/film_file_fixture.php
  162. +2 −2 cake/tests/fixtures/flag_tree_fixture.php
  163. +2 −2 cake/tests/fixtures/fruit_fixture.php
  164. +2 −2 cake/tests/fixtures/fruits_uuid_tag_fixture.php
  165. +2 −2 cake/tests/fixtures/group_update_all_fixture.php
  166. +2 −2 cake/tests/fixtures/home_fixture.php
  167. +2 −2 cake/tests/fixtures/image_fixture.php
  168. +2 −2 cake/tests/fixtures/item_fixture.php
  169. +2 −2 cake/tests/fixtures/items_portfolio_fixture.php
  170. +2 −2 cake/tests/fixtures/join_a_b_fixture.php
  171. +2 −2 cake/tests/fixtures/join_a_c_fixture.php
  172. +2 −2 cake/tests/fixtures/join_a_fixture.php
  173. +2 −2 cake/tests/fixtures/join_b_fixture.php
  174. +2 −2 cake/tests/fixtures/join_c_fixture.php
  175. +2 −2 cake/tests/fixtures/join_thing_fixture.php
  176. +2 −2 cake/tests/fixtures/message_fixture.php
  177. +2 −2 cake/tests/fixtures/my_categories_my_products_fixture.php
  178. +2 −2 cake/tests/fixtures/my_categories_my_users_fixture.php
  179. +2 −2 cake/tests/fixtures/my_category_fixture.php
  180. +2 −2 cake/tests/fixtures/my_product_fixture.php
  181. +2 −2 cake/tests/fixtures/my_user_fixture.php
  182. +2 −2 cake/tests/fixtures/number_tree_fixture.php
  183. +2 −2 cake/tests/fixtures/number_tree_two_fixture.php
  184. +2 −2 cake/tests/fixtures/numeric_article_fixture.php
  185. +2 −2 cake/tests/fixtures/overall_favorite_fixture.php
  186. +2 −2 cake/tests/fixtures/person_fixture.php
  187. +2 −2 cake/tests/fixtures/portfolio_fixture.php
  188. +2 −2 cake/tests/fixtures/post_fixture.php
  189. +2 −2 cake/tests/fixtures/posts_tag_fixture.php
  190. +2 −2 cake/tests/fixtures/prefix_test_fixture.php
  191. +2 −2 cake/tests/fixtures/primary_model_fixture.php
  192. +2 −2 cake/tests/fixtures/product_fixture.php
  193. +2 −2 cake/tests/fixtures/product_update_all_fixture.php
  194. +2 −2 cake/tests/fixtures/project_fixture.php
  195. +2 −2 cake/tests/fixtures/sample_fixture.php
  196. +2 −2 cake/tests/fixtures/secondary_model_fixture.php
  197. +2 −2 cake/tests/fixtures/session_fixture.php
  198. +2 −2 cake/tests/fixtures/something_else_fixture.php
  199. +2 −2 cake/tests/fixtures/something_fixture.php
  200. +2 −2 cake/tests/fixtures/stories_tag_fixture.php
  201. +2 −2 cake/tests/fixtures/story_fixture.php
  202. +2 −2 cake/tests/fixtures/syfile_fixture.php
  203. +2 −2 cake/tests/fixtures/tag_fixture.php
  204. +2 −2 cake/tests/fixtures/test_plugin_article_fixture.php
  205. +2 −2 cake/tests/fixtures/test_plugin_comment_fixture.php
  206. +2 −2 cake/tests/fixtures/the_paper_monkies_fixture.php
  207. +2 −2 cake/tests/fixtures/thread_fixture.php
  208. +2 −2 cake/tests/fixtures/translate_article_fixture.php
  209. +2 −2 cake/tests/fixtures/translate_fixture.php
  210. +2 −2 cake/tests/fixtures/translate_table_fixture.php
  211. +2 −2 cake/tests/fixtures/translate_with_prefix_fixture.php
  212. +2 −2 cake/tests/fixtures/translated_article_fixture.php
  213. +2 −2 cake/tests/fixtures/translated_item_fixture.php
  214. +2 −2 cake/tests/fixtures/unconventional_tree_fixture.php
  215. +2 −2 cake/tests/fixtures/underscore_field_fixture.php
  216. +2 −2 cake/tests/fixtures/user_fixture.php
  217. +2 −2 cake/tests/fixtures/uuid_fixture.php
  218. +2 −2 cake/tests/fixtures/uuid_tag_fixture.php
  219. +2 −2 cake/tests/fixtures/uuid_tree_fixture.php
  220. +2 −2 cake/tests/fixtures/uuiditem_fixture.php
  221. +2 −2 cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
  222. +2 −2 cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
  223. +2 −2 cake/tests/fixtures/uuidportfolio_fixture.php
  224. +2 −2 cake/tests/groups/acl.group.php
  225. +2 −2 cake/tests/groups/bake.group.php
  226. +2 −2 cake/tests/groups/behaviors.group.php
  227. +2 −2 cake/tests/groups/cache.group.php
  228. +2 −2 cake/tests/groups/components.group.php
  229. +2 −2 cake/tests/groups/configure.group.php
  230. +2 −2 cake/tests/groups/console.group.php
  231. +2 −2 cake/tests/groups/controller.group.php
  232. +2 −2 cake/tests/groups/database.group.php
  233. +2 −2 cake/tests/groups/helpers.group.php
  234. +2 −2 cake/tests/groups/i18n.group.php
  235. +2 −2 cake/tests/groups/javascript.group.php
  236. +2 −2 cake/tests/groups/lib.group.php
  237. +2 −2 cake/tests/groups/model.group.php
  238. +2 −2 cake/tests/groups/no_cross_contamination.group.php
  239. +2 −2 cake/tests/groups/routing_system.group.php
  240. +2 −2 cake/tests/groups/socket.group.php
  241. +2 −2 cake/tests/groups/test_suite.group.php
  242. +2 −2 cake/tests/groups/view.group.php
  243. +2 −2 cake/tests/groups/xml.group.php
  244. +2 −2 cake/tests/lib/cake_test_case.php
  245. +2 −2 cake/tests/lib/cake_test_fixture.php
  246. +2 −2 cake/tests/lib/cake_test_model.php
  247. +1 −1 cake/tests/lib/cake_test_suite_dispatcher.php
  248. +2 −2 cake/tests/lib/cake_web_test_case.php
  249. +2 −2 cake/tests/lib/code_coverage_manager.php
  250. +1 −1 cake/tests/lib/reporter/cake_base_reporter.php
  251. +2 −2 cake/tests/lib/reporter/cake_cli_reporter.php
  252. +1 −1 cake/tests/lib/reporter/cake_html_reporter.php
  253. +1 −1 cake/tests/lib/reporter/cake_text_reporter.php
  254. +3 −3 cake/tests/lib/templates/footer.php
  255. +2 −2 cake/tests/lib/templates/header.php
  256. +3 −3 cake/tests/lib/templates/menu.php
  257. +3 −3 cake/tests/lib/templates/simpletest.php
  258. +3 −3 cake/tests/lib/templates/xdebug.php
  259. +2 −2 cake/tests/lib/test_manager.php
  260. +2 −2 cake/tests/test_app/controllers/tests_apps_controller.php
  261. +2 −2 cake/tests/test_app/controllers/tests_apps_posts_controller.php
  262. +2 −2 cake/tests/test_app/libs/cache/test_app_cache.php
  263. +2 −2 cake/tests/test_app/libs/library.php
  264. +2 −2 cake/tests/test_app/libs/log/test_app_log.php
  265. +2 −2 cake/tests/test_app/plugins/test_plugin/config/load.php
  266. +2 −2 cake/tests/test_app/plugins/test_plugin/config/more.load.php
  267. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
  268. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
  269. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
  270. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
  271. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
  272. +2 −2 cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
  273. +2 −2 cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
  274. +2 −2 cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
  275. +2 −2 cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
  276. +2 −2 cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
  277. +2 −2 cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
  278. +2 −2 cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
  279. +2 −2 cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
  280. +3 −3 cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
  281. +2 −2 cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
  282. +2 −2 cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
  283. +1 −1 cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
  284. +2 −2 cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
  285. +2 −2 cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
  286. +3 −3 cake/tests/test_app/vendors/Test/MyTest.php
  287. +3 −3 cake/tests/test_app/vendors/Test/hello.php
  288. +2 −2 cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
  289. +2 −2 cake/tests/test_app/vendors/shells/sample.php
  290. +3 −3 cake/tests/test_app/vendors/somename/some.name.php
  291. +3 −3 cake/tests/test_app/vendors/welcome.php
@@ -67,4 +67,4 @@

[groupname-goes-here]
deny = aco5, aco6
allow = aco7, aco8
allow = aco7, aco8
@@ -4,14 +4,14 @@
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
* CakePHP(tm) Tests <http://book.cakephp.org/1.3/en/The-Manual/Common-Tasks-With-CakePHP/Testing.html>
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://book.cakephp.org/view/1196/Testing
* @link http://book.cakephp.org/1.3/en/The-Manual/Common-Tasks-With-CakePHP/Testing.html
* @package cake
* @subpackage cake.app.webroot
* @since CakePHP(tm) v 1.2.0.4433
@@ -72,7 +72,7 @@ function clone($object)
* `config('config1', 'config2');`
*
* @return boolean Success
* @link http://book.cakephp.org/view/1125/config
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#config
*/
function config() {
$args = func_get_args();
@@ -103,7 +103,7 @@ function config() {
*
* @param string $name Filename without the .php part
* @deprecated Will be removed in 2.0
* @link http://book.cakephp.org/view/1140/uses
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#uses
*/
function uses() {
$args = func_get_args();
@@ -120,8 +120,7 @@ function uses() {
* @param boolean $var Variable to show debug information for.
* @param boolean $showHtml If set to true, the method prints the debug data in a screen-friendly way.
* @param boolean $showFrom If set to true, the method prints from where the function was called.
* @link http://book.cakephp.org/view/1190/Basic-Debugging
* @link http://book.cakephp.org/view/1128/debug
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#debug
*/
function debug($var = false, $showHtml = false, $showFrom = true) {
if (Configure::read() > 0) {
@@ -221,7 +220,7 @@ function array_combine($a1, $a2) {
* @param string $text Text to wrap through htmlspecialchars
* @param string $charset Character set to use when escaping. Defaults to config value in 'App.encoding' or 'UTF-8'
* @return string Wrapped text
* @link http://book.cakephp.org/view/1132/h
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#h
*/
function h($text, $charset = null) {
if (is_array($text)) {
@@ -276,7 +275,7 @@ function pluginSplit($name, $dotAppend = false, $plugin = null) {
* `array('a', 'b')`
*
* @return array Array of given parameters
* @link http://book.cakephp.org/view/1122/a
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#a
* @deprecated Will be removed in 2.0
*/
function a() {
@@ -296,7 +295,7 @@ function a() {
* `array('a'=>'b')`
*
* @return array Associative array
* @link http://book.cakephp.org/view/1123/aa
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#aa
* @deprecated Will be removed in 2.0
*/
function aa() {
@@ -317,7 +316,7 @@ function aa() {
* Convenience method for echo().
*
* @param string $text String to echo
* @link http://book.cakephp.org/view/1129/e
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#e
* @deprecated Will be removed in 2.0
*/
function e($text) {
@@ -329,7 +328,7 @@ function e($text) {
*
* @param string $str String to lowercase
* @return string Lowercased string
* @link http://book.cakephp.org/view/1134/low
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#low
* @deprecated Will be removed in 2.0
*/
function low($str) {
@@ -341,7 +340,7 @@ function low($str) {
*
* @param string $str String to uppercase
* @return string Uppercased string
* @link http://book.cakephp.org/view/1139/up
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#up
* @deprecated Will be removed in 2.0
*/
function up($str) {
@@ -355,7 +354,7 @@ function up($str) {
* @param string $replace String to insert
* @param string $subject String to search
* @return string Replaced string
* @link http://book.cakephp.org/view/1137/r
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#r
* @deprecated Will be removed in 2.0
*/
function r($search, $replace, $subject) {
@@ -368,7 +367,7 @@ function r($search, $replace, $subject) {
*
* @see debug()
* @param array $var Variable to print out
* @link http://book.cakephp.org/view/1136/pr
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#pr
*/
function pr($var) {
if (Configure::read() > 0) {
@@ -403,7 +402,7 @@ function params($p) {
* @param array Third array
* @param array Etc...
* @return array All array parameters merged into one
* @link http://book.cakephp.org/view/1124/am
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#am
*/
function am() {
$r = array();
@@ -425,7 +424,7 @@ function am() {
*
* @param string $key Environment variable name.
* @return string Environment variable setting.
* @link http://book.cakephp.org/view/1130/env
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#env
*/
function env($key) {
if ($key == 'HTTPS') {
@@ -653,7 +652,7 @@ function clearCache($params = null, $type = 'views', $ext = '.php') {
*
* @param array $values Array of values to strip slashes
* @return mixed What is returned from calling stripslashes
* @link http://book.cakephp.org/view/1138/stripslashes_deep
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#stripslashes_deep
*/
function stripslashes_deep($values) {
if (is_array($values)) {
@@ -672,7 +671,7 @@ function stripslashes_deep($values) {
* @param string $singular Text to translate
* @param boolean $return Set to true to return translated string, or false to echo
* @return mixed translated string if $return is false string will be echoed
* @link http://book.cakephp.org/view/1121/__
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#__
*/
function __($singular, $return = false) {
if (!$singular) {
@@ -953,7 +952,7 @@ function LogError($message) {
*
* @param string $file File to look for
* @return Full path to file if exists, otherwise false
* @link http://book.cakephp.org/view/1131/fileExistsInPath
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#fileExistsInPath
*/
function fileExistsInPath($file) {
$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
@@ -974,7 +973,7 @@ function fileExistsInPath($file) {
*
* @param string String to convert
* @return string with underscore remove from start and end of string
* @link http://book.cakephp.org/view/1126/convertSlash
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#convertSlash
*/
function convertSlash($string) {
$string = trim($string, '/');
@@ -1035,7 +1034,7 @@ function http_build_query($data, $prefix = null, $argSep = null, $baseKey = null
* @param mixed $val1 Value to return in case condition matches
* @param mixed $val2 Value to return if condition doesn't match
* @return mixed $val1 or $val2, depending on whether $condition evaluates to a non-empty expression.
* @link http://book.cakephp.org/view/1133/ife
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Global-Constants-and-Functions.html#ife
* @deprecated Will be removed in 2.0
*/
function ife($condition, $val1 = null, $val2 = null) {
@@ -27,7 +27,7 @@
*
* @package cake
* @subpackage cake.cake.console.libs
* @link http://book.cakephp.org/view/1522/Code-Generation-with-Bake
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Console-Applications/Code-Generation-with-Bake.html
*/
class BakeShell extends Shell {
@@ -28,7 +28,7 @@
*
* @package cake
* @subpackage cake.cake.console.libs
* @link http://book.cakephp.org/view/1523/Schema-management-and-migrations
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Console-Applications/Schema-management-and-migrations.html
*/
class SchemaShell extends Shell {
@@ -6,14 +6,13 @@
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
* CakePHP(tm) Tests <http://book.cakephp.org/1.3/en/The-Manual/Common-Tasks-With-CakePHP/Testing.html>
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
* @package cake
* @subpackage cake.cake.console.libs
* @since CakePHP(tm) v 1.2.0.4433
@@ -4,14 +4,14 @@
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
* CakePHP(tm) Tests <http://book.cakephp.org/1.3/en/The-Manual/Common-Tasks-With-CakePHP/Testing.html>
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
* @link http://book.cakephp.org/1.3/en/The-Manual/Common-Tasks-With-CakePHP/Testing.html CakePHP(tm) Tests
* @package cake
* @subpackage cake.cake.tests.libs
* @since CakePHP(tm) v 1.2.0.4433
@@ -23,14 +23,14 @@
*
* @package cake
* @subpackage cake.cake.libs
* @link http://book.cakephp.org/view/924/The-Configuration-Class
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#the-configuration-class
*/
class Configure extends Object {
/**
* Current debug level.
*
* @link http://book.cakephp.org/view/931/CakePHP-Core-Configuration-Variables
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#cakephp-core-configuration-variables
* @var integer
* @access public
*/
@@ -72,6 +72,7 @@ function &getInstance($boot = true) {
* ));
* }}}
*
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#write
* @link http://book.cakephp.org/view/926/write
* @param array $config Name of var to write
* @param mixed $value Value to set for var
@@ -154,7 +155,7 @@ function write($config, $value = null) {
* Configure::read('Name.key'); will return only the value of Configure::Name[key]
* }}}
*
* @link http://book.cakephp.org/view/927/read
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#read
* @param string $var Variable to obtain. Use '.' to access array elements.
* @return string value of Configure::$var
* @access public
@@ -204,7 +205,7 @@ function read($var = 'debug') {
* Configure::delete('Name.key'); will delete only the Configure::Name[key]
* }}}
*
* @link http://book.cakephp.org/view/928/delete
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#delete
* @param string $var the var to be deleted
* @return void
* @access public
@@ -231,7 +232,7 @@ function delete($var = null) {
* - To load config files from app/config use `Configure::load('configure_file');`.
* - To load config files from a plugin `Configure::load('plugin.configure_file');`.
*
* @link http://book.cakephp.org/view/929/load
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#load
* @param string $fileName name of file to load, extension must be .php and only the name
* should be used, not the extenstion
* @return mixed false if file not found, void if load successful
@@ -282,7 +283,7 @@ function load($fileName) {
*
* Usage `Configure::version();`
*
* @link http://book.cakephp.org/view/930/version
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#version
* @return string Current version of CakePHP
* @access public
*/
@@ -448,7 +449,7 @@ function __loadBootstrap($boot) {
/**
* Class/file loader and path management.
*
* @link http://book.cakephp.org/view/933/The-App-Class
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#the-app-class
* @since CakePHP(tm) v 1.2.0.6001
* @package cake
* @subpackage cake.cake.libs
@@ -848,7 +849,7 @@ function objects($type, $path = null, $cache = true) {
* Finds classes based on $name or specific file(s) to search. Calling App::import() will
* not construct any classes contained in the files. It will only find and require() the file.
*
* @link http://book.cakephp.org/view/934/Using-App-import
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Configuration.html#using-app-import
* @param mixed $type The type of Class if passed as a string, or all params can be passed as
* an single array to $type,
* @param string $name Name of the Class or a unique name for the file
@@ -30,7 +30,7 @@
*
* @package cake
* @subpackage cake.cake.libs.controller
* @link http://book.cakephp.org/view/957/The-App-Controller
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Controllers.html#the-app-controller
*/
class AppController extends Controller {
}
@@ -22,7 +22,7 @@
*
* @package cake
* @subpackage cake.cake.libs.controller
* @link http://book.cakephp.org/view/993/Components
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Components.html
*/
class Component extends Object {
@@ -84,7 +84,7 @@ function init(&$controller) {
* @param object $controller Controller with components to initialize
* @return void
* @access public
* @link http://book.cakephp.org/view/998/MVC-Class-Access-Within-Components
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Components.html#mvc-class-access-within-components
*/
function initialize(&$controller) {
foreach (array_keys($this->_loaded) as $name) {
@@ -106,7 +106,7 @@ function initialize(&$controller) {
* @param object $controller Controller with components to startup
* @return void
* @access public
* @link http://book.cakephp.org/view/998/MVC-Class-Access-Within-Components
* @link http://book.cakephp.org/1.3/en/The-Manual/Developing-with-CakePHP/Components.html#mvc-class-access-within-components
* @deprecated See Component::triggerCallback()
*/
function startup(&$controller) {
@@ -29,7 +29,7 @@
*
* @package cake
* @subpackage cake.cake.libs.controller.components
* @link http://book.cakephp.org/view/1242/Access-Control-Lists
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Components/Access-Control-Lists.html
*/
class AclComponent extends Object {
@@ -258,7 +258,7 @@ function initialize(&$component) {
* @param string $action Action (defaults to *)
* @return boolean Success (true if ARO has access to action in ACO, false otherwise)
* @access public
* @link http://book.cakephp.org/view/1249/Checking-Permissions-The-ACL-Component
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Components/Access-Control-Lists.html#checking-permissions-the-acl-component
*/
function check($aro, $aco, $action = "*") {
if ($aro == null || $aco == null) {
@@ -350,7 +350,7 @@ function check($aro, $aco, $action = "*") {
* @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
* @return boolean Success
* @access public
* @link http://book.cakephp.org/view/1248/Assigning-Permissions
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Components/Access-Control-Lists.html#assigning-permissions
*/
function allow($aro, $aco, $actions = "*", $value = 1) {
$perms = $this->getAclLink($aro, $aco);
@@ -402,7 +402,7 @@ function allow($aro, $aco, $actions = "*", $value = 1) {
* @param string $actions Action (defaults to *)
* @return boolean Success
* @access public
* @link http://book.cakephp.org/view/1248/Assigning-Permissions
* @link http://book.cakephp.org/1.3/en/The-Manual/Core-Components/Access-Control-Lists.html#assigning-permissions
*/
function deny($aro, $aco, $action = "*") {
return $this->allow($aro, $aco, $action, -1);
Oops, something went wrong.

0 comments on commit 0c3b9e4

Please sign in to comment.
You can’t perform that action at this time.