Commit graph

98 commits

Author SHA1 Message Date
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
predominant
2d85ffe05f Fixing inflector caching, adding new _cache() method to handle common caching. 2010-01-05 22:05:02 +11:00
predominant
19924501d1 Updating Inflector to employ internal caching.
Refs #23
2009-12-25 18:53:38 +11:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
ceeram
a67a97722a refs #291
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:25:47 -05:00
mark_story
f764c53c55 Removing Inflector's inheritance on Object, as it was unecessary.
Adding irregular waves => wave missed in merge from 1.2
2009-09-15 21:44:27 -04:00
jperras
6f8f4c5a05 Adding waves -> wave as irregular singularization rule. Fixes #47. 2009-08-22 20:26:33 -04:00
mark_story
2893b29e11 Fixing inflection of Taxes. Fixes #15 2009-08-12 09:46:18 -04:00
gwoo
c7050c9879 Merge branch '1.3-inflector' into 1.3 2009-08-01 23:53:36 -07:00
jperras
bc28dd834e Adding additional plural inflection rule. 2009-07-30 15:29:16 -04:00
gwoo
aab4dc2f1a Merge branch '1.3-inflector' into 1.3 2009-07-29 10:32:25 -07:00
jperras
54d1577276 Adding tests for Inflector::slug with non-latin characters & removing redundant element in preg_replace map. 2009-07-25 15:10:21 -04:00
jperras
659c1a65bc Modified Inflector::slug to not drop multibyte characters. Fixes #6104. 2009-07-25 14:25:45 -04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
8b24d976f2 Placing uninflected check before irregular rules. Refs [8169] and #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8170 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 13:25:19 +00:00
mark_story
109bda97b8 Correcting order of inflection rules in pluralize(). Places uninflected rules before irregular rules. Fixes compatibility with non-english languages. Fixes #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8169 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 03:17:26 +00:00
gwoo
54a3118d34 adding tests for map param on Inflector::slug. cleaning up. 2009-05-01 10:34:19 -07:00
gwoo
67d45cb28b updating headers on inflector and adding map param to slug(). added more comments to app/config/bootstrap.php 2009-05-01 10:03:30 -07:00
jperras
66959d5849 Fixing indentation & trailing EOF newline. 2009-04-10 15:28:34 -04:00
jperras
199d446ba7 Addding additional English irregular singularization/pluralization rule 'niche' => 'niches'. 2009-04-10 14:47:17 -04:00
jperras
7902f6838b Remvoving dependence on String class in Inflector::slug. 2009-04-10 14:15:27 -04:00
jperras
d72dad581a Cleaning up formatting. 2009-04-10 14:06:04 -04:00
jperras
67fffaab86 Removing unused Set class import. 2009-04-10 14:01:40 -04:00
jperras
8d1198dfd6 Refactoring Inflector class attributes from public to protected scope. 2009-04-10 13:41:32 -04:00
jperras
f466929aca Refactoring singularize/pluralize to use an in-memory array map for better performance. 2009-04-10 13:03:38 -04:00
jperras
dd55afe57f Removing unsused variable. 2009-04-10 10:34:36 -04:00
jperras
5f035ca340 Adding doc blocks for new inflector class variables & rules method. 2009-03-21 21:38:32 -04:00
jperras
6c1c6ada71 Fix Inflector::singularize bug with custom irregular singular rule not being parsed. 2009-03-21 20:06:30 -04:00
jperras
a9952e90c1 Reverting change to regex greediness. 2009-03-18 02:11:03 -04:00
jperras
f811a69c87 Fixing typo. 2009-03-18 01:42:22 -04:00
jperras
b563393752 Renaming inflector regex cache. 2009-03-17 20:56:48 -04:00
jperras
7bc94893c7 Removing redundant variable initialization. Making regexes less greedy. 2009-03-17 20:22:36 -04:00
mark_story
31cd461d22 Correcting singluarizing of taxes, faxes, waxes, and pluralization of crisis in Inflector. Tests added. Fixes #6130, #6131
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8052 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-22 04:09:39 +00:00
phpnut
eb653b8cba Closes #5792, Inflector optimization by returning replaced values instead of assining before returning
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7940 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-18 01:35:27 +00:00
john
5a0ab7b220 Updating docblocks and adding @link tags.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7816 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-31 20:49:23 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
phpnut
47f78d13a0 Adding more optimizations for the static classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7736 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-12 03:52:24 +00:00
mark_story
62168bfe0f Updating doc blocks to include access and return PHPDOC tags.
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
phpnut
2b95df3abf Additional optimization refactoring
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7597 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-13 18:59:30 +00:00
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
gwoo
8805173355 refactoring Inflector
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7523 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 12:25:40 +00:00
phpnut
80fa429785 Adding fix for undefined notice in vendors.php
Removed check for required file in Cache::!__loadEngine();
Fixed cache being wrote on each request from Configure::listObjects(); when data was an empty array
Removed extra call to App::getInstance(); in App::import();
Moved setting of App::!__loaded; inside of if statement.
Removed cake core install directory paths from the cached dir_map.
Changed uses('file'); to require statement in file.php
Changed uses('set'); to require statement in inflector.php
Removed check for existing inflections.php since this file has been included in 1.2 since Dev releases.
Added additional test for Helper::clean();
Fixed bug in Helper::!__clean();
Fixed random output of 1 when using MediaView;
Added csv mime type to MediaView



git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7516 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 03:42:17 +00:00
mark_story
6086e96a61 Adding inflection rule for empty string. Fixes #5325. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7509 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 18:30:54 +00:00
mark_story
20851bd548 Added ability to singularize 'gloves', 'wolves', 'shelves' and other ves words. Added tests. Closes #5080
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7335 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-12 00:22:09 +00:00
gwoo
9661a54a13 reformatting and fixing doc comment in inflector
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7244 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 03:08:35 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00