Commit graph

6914 commits

Author SHA1 Message Date
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
b97ac84a34 Fixing method_exists use in Validation for php4 compatibility. 2010-01-14 23:41:35 -05:00
Mark Story
276d183bdd Adding conditional to php5 only function use. 2010-01-14 23:40:18 -05:00
Mark Story
741f507c23 Fixing reference errors in php4. 2010-01-14 23:38:39 -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
547aa76c92 Fixing method_exists() use for php4, as method_exists cannot be used with class/method names in php4. 2010-01-14 23:07:48 -05:00
Mark Story
036d7e6e13 Updating helper syntax. 2010-01-14 23:07:15 -05:00
Mark Story
d4d9ed7bfe Fixing test cases and php4 compatibility in Debugger. 2010-01-14 23:06:48 -05:00
Mark Story
f2dc2078c2 Making PagesController include SessionHelper. 2010-01-14 22:56:34 -05:00
Mark Story
96c56d7446 Fixing failing tests in php4 caused by missing & operators. 2010-01-14 22:54:17 -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
af4e9ba76e Fixing php4 reference issues in CakeSchema. 2010-01-14 22:18:26 -05:00
Mark Story
f2cc41bb3a Fixing php4 issues for AclShell test case. 2010-01-14 22:15: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
Joël Perras
199a14f3be Updating Model::exists() to be more side-effect free.
Model::exists() no longer monkeys with the internal state of
Model::$__exists. The optional $reset parameter has also been removed,
as it is no longer needed.
2010-01-14 16:47:08 -05:00
Joël Perras
137704e397 Optimization to Model::save(). 2010-01-14 16:47:08 -05:00
José Lorenzo Rodríguez
c196c2cbdf More whitespace fixes 2010-01-14 15:57:58 -04:30
José Lorenzo Rodríguez
5395397c95 Updating doc blocks 2010-01-14 15:50:27 -04:30
José Lorenzo Rodríguez
543f40c91e Simplifying returns 2010-01-14 15:42:30 -04:30
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
ebf99de965 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. 2010-01-13 23:49:10 -05:00
Mark Story
eb2c34afa0 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-13 23:47:59 -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
Joël Perras
4d1f6b82e8 Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100. 2010-01-13 23:19:10 -05:00
Joël Perras
88a09cfbb4 Updating CakeTestSuiteDispatcher parsing of .
Better handling of cases where dirname() of PHP_SELF returns only '/'.
2010-01-13 23:19:10 -05:00
Joël Perras
ff3aefe93a Adding missing </p> to Html test reporter template. 2010-01-13 23:19:09 -05:00
Mark Story
8243afa383 Updating css file in skel dir. 2010-01-13 23:03:02 -05:00
Mark Story
943af988f6 Fixing alignment issues in tables. 2010-01-13 22:37:30 -05:00
Mark Story
e60243c464 Merge branch '1.3' into scaffold-design 2010-01-13 22:16:47 -05:00
Mark Story
25a8a1b1c9 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-13 21:56:24 -05:00
Mark Story
619f9210f3 Removing orphaned method. 2010-01-13 21:55:32 -05:00