Commit graph

2761 commits

Author SHA1 Message Date
Mark Story
f11068b831 Trimming trailing whitespace from files. Refs #201 2010-01-15 13:26:47 -05:00
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 00:11:33 -05:00
Mark Story
34c4af549c Adding missing reference operators for php4 compatibility. 2010-01-15 00:09:59 -05:00
Mark Story
f1a0690415 Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well. 2010-01-15 00:02:24 -05:00
Mark Story
276d183bdd Adding conditional to php5 only function use. 2010-01-14 23:40:18 -05:00
Mark Story
371ac3971a Fixing php4 compatibility in model_read test. 2010-01-14 23:38:24 -05:00
Mark Story
3a38e0869f Fixing php4 issues in ErrorHandler and ErrorHandler testcase. 2010-01-14 23:17:24 -05:00
Mark Story
d4d9ed7bfe Fixing test cases and php4 compatibility in Debugger. 2010-01-14 23:06:48 -05:00
Mark Story
5212406ea7 Making xml data test php5 only as Xml::compare() is non-functional in php4 2010-01-14 22:48:19 -05:00
Mark Story
5d280ea977 Making CodeCoverageManager and CakeSession tests run in php4. Removing test case for removed method. 2010-01-14 22:47:49 -05:00
Mark Story
2093f05ce7 Fixing php4 compatibility issues in CakeLog. 2010-01-14 22:33:14 -05:00
Mark Story
8f2a4a1e0e Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a Trimming trailing whitespace from files. Refs #201 2010-01-14 20:15:54 -05:00
Joël Perras
259b59cae1 Adding optional $reset parameter to Inflector::rules(). Fixes #91.
Inflector::rules() now has an optional 3rd parameter, $reset, which can
be set to true if you desire to remove the default inflections defined
in Inflector.

Note that the reset will only affect those inflection types which you
have explicitly re-defined in the $rules parameter.
2010-01-14 18:18:55 -05:00
Joël Perras
eb7e10db50 Updating Inflector::slug() handling of $map argument. Fixes #18.
When passing a $map to Inflector::slug(), the $map values will now
overwrite any default mappings that Inflector::slug defines.

Modified pre-existing test-case for Inflector::slug() when using a $map.
2010-01-14 17:51:14 -05:00
Joël Perras
adb0c809a0 Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199.
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
José Lorenzo Rodríguez
09b466f8aa Fixing whitespace and removig calls to Helper::output() introduced by error 2010-01-14 15:38:48 -04:30
José Lorenzo Rodríguez
0b3758dc91 Bug fix in I18n
Changing calls from date to strftime in TimeHelper
Implementing TimeHelper::converSpecifiers() to conver format strings to be windows safe and I18n friendly
Implementing TimeHelper::i18nFormat() to format dates with preferred locale date format
Changing TimeHelper::format() to handle inversion of first two parameters, while being backwards compatible. If called with the first parameter as a time string it will call TimeHelper::i18nFormat()
2010-01-14 14:11:57 -04:30
José Lorenzo Rodríguez
a980f72364 Refactoring I18n::translate() to return time format string or arrays when category is LC_TIME
Tests added
2010-01-14 09:54:45 -04:30
José Lorenzo Rodríguez
589972d581 Merge branch '1.3' into github-i18n
* 1.3: (137 commits)
  Updating tests to reflect SessionHelper's loss of magic inclusion.
  Removing SessionHelper's magical inclusion into the helpers array.  Use of SessionHelper must now be explicitly done. Tests updated.
  Fixing merge var test case for non magic session component.
  Fixing Pagescontroller test and removal of pageTitle from controller.
  Fixing component and controller test cases to work with less magical session component.
  Removing the magical addition of SessionComponent to components array.  This makes components more declarative, and removes magic that cannot be undone by the end developer.
  Fixing failing tests due to deleted assets.
  Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100.
  Updating CakeTestSuiteDispatcher parsing of .
  Adding missing </p> to Html test reporter template.
  Updating css file in skel dir.
  Fixing alignment issues in tables.
  Removing orphaned method.
  Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
  Adding php5 check to avoid errors when using __get() or __isset() methods in models
  Fixing include in test of CodeCoverageManager. Fixes #196
  Fixing var name when not have SimpleTest or XDebug installed.
  Moving skel/config/sql to skel/config/schema
  Fixing output of 'Actions' in bake templates.  Now outputs a __() call.
  Updating scaffolds to match new bake design.
  ...
2010-01-14 08:34:03 -04:30
Mark Story
1980a46b46 Updating tests to reflect SessionHelper's loss of magic inclusion. 2010-01-14 00:09:14 -05:00
Mark Story
a56bc5585c Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated. 2010-01-13 23:55:09 -05:00
Mark Story
a85da63956 Fixing merge var test case for non magic session component. 2010-01-13 23:49:11 -05:00
Mark Story
32832f4810 Fixing Pagescontroller test and removal of pageTitle from controller. 2010-01-13 23:49:11 -05:00
Mark Story
540e81b1b0 Fixing component and controller test cases to work with less magical session component. 2010-01-13 23:49:11 -05:00
Mark Story
67b69b3106 Fixing failing tests due to deleted assets. 2010-01-13 23:47:31 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
ADmad
848dc518ab Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes 2010-01-14 04:13:39 +05:30
Juan Basso
d8257518de Fixing include in test of CodeCoverageManager. Fixes #196
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:38:26 -05:00
José Lorenzo Rodríguez
4e3aedecde Fixing persitModel and plugin Behaviors. Closes #192 2010-01-13 09:53:00 -04:30
Mark Story
84840c7b04 Fixing issues with magic input() type detection and adding/updating tests. 2010-01-12 23:27:17 -05:00
Mark Story
d8e7aa929c Merge branch '1.3-misc' into 1.3 2010-01-12 17:18:14 -05:00
Mark Story
8e22e8cbea Merge branch '1.3-test-suite' into 1.3-misc 2010-01-12 09:31:07 -05:00
Mark Story
a0c3c4b803 Updating AuthComponent::startup() so that being redirected to loginAction with no Auth.redirect value in the session and a non empty loginRedirect defined, the Auth.redirect value is not overwritten. This prevents redirection to already accessible pages. Test cases updated.
Fixes #173
2010-01-11 23:54:06 -05:00
José Lorenzo Rodríguez
04562982b2 Fixing doc block 2010-01-11 15:34:16 -04:30
José Lorenzo Rodríguez
7e9fc9f705 Test case for date format definition using a LC_TIME locale file 2010-01-11 15:19:57 -04:30
José Lorenzo Rodríguez
50f58da60d Continuing work on locale definition file parser 2010-01-11 15:12:24 -04:30
José Lorenzo Rodríguez
8bc4f0336e Beginings of a parser of locale definition file 2010-01-11 15:09:42 -04:30
José Lorenzo Rodríguez
aa9258cbd1 Adding test for DboSource::group() and virtual fields
Closes #184
2010-01-11 12:22:59 -04:30
Phally
bbb105fc8c Added virtual field support for GROUP BY. 2010-01-11 11:46:59 -04:30
Mark Story
4ada5b7eea Fixing notice errors caused by incorrect datatyping in php4. 2010-01-11 09:44:51 -05:00
Mark Story
da26124add Renaming CodeCoverageManager::start() to init().
Adding a start(), stop(), and clear() methods to CodeCoverageManager.
Making CakeBaseReporter toggle code coverage on and off as needed.
Updating test case for CodeCoverageManager.
2010-01-10 13:23:37 -05:00
Mark Story
a41678e51f Merge branch '1.3-misc' into 1.3-test-suite 2010-01-10 12:53:00 -05:00
Mark Story
6147de7725 Fixing notice errors in test case. 2010-01-10 12:52:06 -05:00
Mark Story
836c7de7cb Updating CodeCoverageManager test case and CodeCoverageManager 2010-01-10 12:48:40 -05:00
Mark Story
e304246e8f Updating test manager test cases to reflect changes in API. 2010-01-10 12:39:21 -05:00
predominant
0959de6031 Adding more tests to check cache paths and stupid values. 2010-01-10 20:54:20 +11:00
predominant
3bd8bd2e0e Adding Inflector::underscore tests 2010-01-10 20:52:49 +11:00
tPl0ch
61079f6317 Fixes #42. Updated Sanitize::clean() with 'remove_html' option. Updated Sanitize::html() to accept new options. Updated test cases.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-07 19:04:49 -05:00
tPl0ch
5ae0164574 Added Validation::uuid(). Updated test cases.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-06 21:29:55 -05:00
Mark Story
65a12ed902 Adding tests for previous commit. 2010-01-06 21:26:52 -05:00
Mark Story
683be26bcb Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-06 21:14:25 -05:00
predominant
e2a2770d9f Fixing validation errors for wrong case checking on Validation::ip.
Adding IPv6 validation for Validation::url().
Added tests for ports in urls.
Fixed port length allowance on Validation.
2010-01-07 11:02:05 +11:00
Mark Story
be7ce6e923 Fixing issues where chained jQuery engine requests wouldn't eval() script elements, making ajax pagination much harder. 2010-01-06 11:59:15 -05:00
predominant
1302fba632 Fix validation of IPv6 on IPv4 checks.
Separate IPv4 and IPv6 validation to allow strict checking.
2010-01-06 00:53:48 +11:00
Mark Story
2ace6bb0b1 Updating Controllers used to test full page caching to reflect changes in CacheHelper's functionality. 2010-01-03 23:51:31 -05:00
Mark Story
95135d18cc Merge branch '1.3' into 1.3-misc 2010-01-03 23:36:32 -05:00
Mark Story
32113a4c88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-03 23:35:48 -05:00
Mark Story
a726f82f18 Fixing failing test caused by changes in Configure/App api's and merged code from 1.2 2010-01-03 23:35:17 -05:00
Mark Story
3c88d81735 Adding tests for model method validation with multiple parameters and addition of original validation rule to method params. Closes #149 2010-01-01 23:34:11 -05:00
predominant
e4fa475998 Test cases for model bake updates, refs #147 2010-01-01 20:19:15 +11:00
ADmad
5f987a4996 Controller data is now set to an array instead of Xml object if request content type is 'application/xml' 2009-12-31 17:36:58 +05:30
Mark Story
41e6fdf346 Merge remote branch 'fahad/1.3-l10n' into 1.3-misc 2009-12-29 23:39:08 -05:00
Mark Story
49e9550482 Merge branch '1.3' into 1.3-misc 2009-12-29 22:07:23 -05:00
Mark Story
32683d3d64 Fixing issues in PrototypeEngineHelper where parameters would end up wrapped in a function() {} when marked as a dataExpression. This prevented the sending of form data.
Tests added.
Fixes #142
2009-12-29 21:52:59 -05:00
Ali Farhadi
f86a80ac9e Fixing failing tests caused by changes in L10n class, and removal of duplicate test. 2009-12-30 00:24:05 +03:30
Mark Story
b377905741 Fixing whitespacing and formatting of doc blocks. 2009-12-28 23:00:38 -05:00
Mark Story
b68d2a32bf Merge branch '1.3' into 1.3-misc 2009-12-28 22:15:52 -05:00
Mark Story
6749e1166b Making cacheAction array settings use action names instead of url paths. This removes the ability to set different durations for specific passed arguments. However, makes passed args, named params, and querystring params all behave the same in regard to cacheAction. Test cases updated. 2009-12-28 21:26:51 -05:00
Mark Story
b89280a916 Fixing test failures caused by changes in Cache::__loadEngine().
Adding tests for Cache::config().
2009-12-28 13:52:50 -05:00
Mark Story
45a3eb250f Starting refactoring of cachehelper to use Router::reverse to generate check/match strings. Removing dead code as well. 2009-12-28 13:38:36 -05:00
Mark Story
df8914b2e4 Router::reverse now removes models and paging keys that controllers can insert into params arrays. 2009-12-28 13:34:05 -05:00
Mark Story
5b78a662e8 Adding tests for querystring reversal. 2009-12-27 23:10:29 -05:00
Mark Story
886cd9e719 Adding Router::reverse and basic test case. 2009-12-27 23:09:26 -05:00
Mark Story
7a620b62b0 Merge branch '1.3-misc' into mergers
Conflicts:
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
predominant
19924501d1 Updating Inflector to employ internal caching.
Refs #23
2009-12-25 18:53:38 +11:00
Joël Perras
173b4e7b5d Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-22 23:53:01 -05:00
Joël Perras
8eb9f9e8fd Implenting IPv6 validation using filter_var(), with a regex-based fallback if the aforementioned function does not exist (PHP < 5.2). Fixes #38. 2009-12-22 23:52:06 -05:00
Mark Story
e7a5143aa9 Adding tests for after = false in currency(). Refs #34 2009-12-22 19:11:52 -05:00
Mark Story
1a387e6b8a Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
Tests added. Fixes #129
This reverses the change made in efa36abdf0 which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
5274dce9f1 Making set vars with Js->set go to the top of the buffered scripts array. Tests added.
Updating doc blocks for JsHelper and JsBaseEngineHelper.
Fixes #131
2009-12-21 09:41:36 -05:00
Mark Story
42fa6ff04a Fixing JsHelper::writeBuffer when inline is set to false. Scripts are now enclosed in a script tag. Fixes #130 2009-12-21 09:29:28 -05:00
ADmad
d561405daa Renaming RequestHandler::getReferrer to RequestHandler::getReferer for (mis)spelling consistency and deprecating the former 2009-12-20 23:06:28 +05:30
ADmad
f36e5eff5f Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-20 13:22:43 +05:30
Mark Story
3cdf22d860 Correcting tests affected by changes in Router. 2009-12-19 20:22:16 -05:00
Mark Story
79cd856e19 Updating ExtractTask test case to reflect changes made in df8895a266. Domain strings are no longer default merged into default.pot. 2009-12-19 20:18:18 -05:00
Mark Story
e95186d5cc Fixing failing test in ApiShell test. 2009-12-19 20:08:31 -05:00
Mark Story
3edb84d77c Adding skip for BakeShell test, if a User class exists bake all cannot be tested. 2009-12-19 20:01:59 -05:00
Mark Story
c669f8c998 Fixing failing tests in AuthComponent because of required parameter. 2009-12-19 19:58:55 -05:00
Mark Story
22cf13b6b6 Updating DboSource test to remove protected access and use methods instead. 2009-12-19 19:54:49 -05:00
Mark Story
3f7405c8d6 Removing cakeDebug from test_app layout.
Adding skips for tests that can cause failures when cache dirs are not writable.
2009-12-19 19:47:20 -05:00
Mark Story
7467224455 Moving test case and adding doc block. 2009-12-19 19:41:25 -05:00
Mark Story
4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
ADmad
cea102c357 Updating doc block to reflect that url can be string or array and removing 'escapeTitle' param. Use key 'escape' in options instead 2009-12-20 00:46:47 +05:30
Mark Story
071c6f0e8b Merge branch 'sql-dump' into 1.3-misc 2009-12-19 13:32:01 -05:00
Mark Story
a89fcba243 Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
3eaff3e021 Correcting FormHelper::minute() to fix issues with extracting values from array formatted data. Fixes #107 2009-12-19 11:55:35 -05:00
Mark Story
18c878b3f5 More whitespace fixes. 2009-12-18 19:18:23 -05:00