Changeset 7524

Timestamp:

02/17/08 05:24:14 (2 years ago)

Author:

dwhittle

Message:

dwhittle: tweaked i18n + routing to use generic cache factory

+ moved cache to options in sfI18N (as it is optional)

Files:

• branches/dwhittle/1.1/lib/config/config/factories.yml (modified) (2 diffs)
• branches/dwhittle/1.1/lib/config/sfFactoryConfigHandler.class.php (modified) (3 diffs)
• branches/dwhittle/1.1/lib/i18n/sfI18N.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/routing/sfPatternRouting.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/task/generator/skeleton/app/app/config/factories.yml (modified) (2 diffs)
• branches/dwhittle/1.1/test/unit/i18n/extract/sfI18nExtractTest.php (modified) (2 diffs)
• branches/dwhittle/1.1/test/unit/i18n/sfI18NTest.php (modified) (7 diffs)

branches/dwhittle/1.1/lib/config/config/factories.yml

@@ -22 +22 @@
-
-  cache:
-
+          # cache class: sfAPCCache, sfXCacheCache, sfMemcacheCache, sfEAccelleratorCache
-    param:
-      lifetime:  86400         # default cache ttl
@@ -40 +40 @@
-      untranslated_prefix:  "[T]"   # prefix for untranslated strings
-      untranslated_suffix:  "[/T]"  # suffix for untranslated strings
-      cache:
-        class: sfAPCCache
-        param:
-          lifetime:  86400         # default cache ttl
-          prefix:    %SF_APP_DIR%  # prefix
-
-  routing:
-
+ 
-    param:
-true 
-. 
-
-
+  true
+  .
+  
+  
-
-  logger:

branches/dwhittle/1.1/lib/config/sfFactoryConfigHandler.class.php

@@ -48 +48 @@
-
-    // available list of factories
-
+cache', '
-
-    // let's do our fancy work
@@ -125 +125 @@
-        case 'user':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_user', '%s');\n  \$this->factories['user'] = new \$class(\$this->dispatcher, \$this->factories['storage'], array_merge(array('auto_shutdown' => false, 'culture' => \$this->factories['request']->getParameter('sf_culture'), 'default_culture' => sfConfig::get('sf_default_culture', 'en'), 'use_flash' => sfConfig::get('sf_use_flash'), 'logging' => sfConfig::get('sf_logging_enabled')), sfConfig::get('sf_factory_user_parameters', %s)));", $class, var_export(is_array($parameters) ? $parameters : array(), true));
+          break;
+
+        case 'cache':
+          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_cache', '%s');\n  \$this->factories['cache'] = new \$class(sfConfig::get('sf_factory_cache_parameters', %s));", $class, var_export(is_array($parameters) ? $parameters : array(), true));
-          break;
-
@@ -141 +145 @@
-
-        case 'i18n':
+
-          if (isset($parameters['cache']))
-          {
-cache
+instances[]
-            unset($parameters['cache']);
-          }
-          else
-          {
-cache = "    \$cache = null
+instances[] = "    \$cache = \$this->factories['cache']
-          }
-
-          $instances[] = sprintf("\n  if (sfConfig::get('sf_i18n'))\n  {\n".
-                     "    \$class = sfConfig::get('sf_factory_i18n', '%s');\n".
-
-
+
-                     "  }\n"
-$cache, 
+
-                     );
-          break;
-
-        case 'routing':
-
+
+
+
+
+
+
+
+
+
+
+
+
-          if (isset($parameters['load_configuration']) && $parameters['load_configuration'])
-          {

branches/dwhittle/1.1/lib/i18n/sfI18N.class.php

@@ -32 +32 @@
-   * @see initialize()
-   */
-sfCache $cache = null, 
-
-cache, $
+
+
+
-  }
-
@@ -44 +44 @@
-   * @param array             An array of options
-   */
-sfCache $cache = null, 
+
-  {
-    $this->dispatcher = $dispatcher;
-
+
+
+
+
+
-
-    if (isset($options['culture']))

branches/dwhittle/1.1/lib/routing/sfPatternRouting.class.php

@@ -24 +24 @@
-{
-  protected
+    $cache                  = null,
-    $currentRouteName       = null,
-    $currentInternalUri     = array(),
@@ -36 +37 @@
-  {
-    parent::initialize($dispatcher, $options);
+
+    if(isset($options['cache']) && ($options['cache'] instanceof sfCache))
+    {
+      $this->cache = $options['cache'];
+    }
-
-    $this->setDefaultSuffix(isset($options['suffix']) ? $options['suffix'] : '');

branches/dwhittle/1.1/lib/task/generator/skeleton/app/app/config/factories.yml

@@ -59 +59 @@
-
-  cache:
-
+          # cache classes: sfAPCCache, sfXCacheCache, sfMemcacheCache, sfEAccelleratorCache
-    param:
-      lifetime:  86400         # default cache ttl
@@ -77 +77 @@
-      untranslated_prefix:  "[T]"   # prefix for untranslated strings
-      untranslated_suffix:  "[/T]"  # suffix for untranslated strings
-      cache:
-        class: sfAPCCache
-        param:
-          lifetime:  86400         # default cache ttl
-          prefix:    %SF_APP_DIR%  # prefix
-
-  routing:
-# routing clas
+     # routing classe
-    param:
-
-
-
-
+  
+  
+  
+  
-
-  logger:

branches/dwhittle/1.1/test/unit/i18n/extract/sfI18nExtractTest.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -23 +23 @@
-$dispatcher = new sfEventDispatcher();
-$cache = new sfNoCache();
-$cache
+array('cache' => $cache)
-
-class sfI18nExtractTest extends sfI18nExtract

branches/dwhittle/1.1/test/unit/i18n/sfI18NTest.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -26 +26 @@
-// ->initialize()
-$t->diag('->initialize()');
-$cache
+array('cache' => $cache)
-$dispatcher->notify(new sfEvent(null, 'user.change_culture', array('culture' => 'fr')));
-$t->is($i18n->getCulture(), 'fr', '->initialize() connects to the user.change_culture event');
@@ -32 +32 @@
-// ->getCulture() ->setCulture()
-$t->diag('->getCulture() ->setCulture()');
-$cache
+array('cache' => $cache)
-$t->is($i18n->getCulture(), 'en', '->getCulture() returns the current culture');
-$i18n->setCulture('fr');
@@ -40 +40 @@
-$t->diag('->__()');
-sfConfig::set('sf_charset', 'UTF-8');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->__('an english sentence'), 'une phrase en français', '->__() translates a string');
-$args = array('%timestamp%' => $timestamp = time());
@@ -50 +50 @@
-
-// debug
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->__('unknown'), '[T]unknown[/T]', '->__() adds a prefix and a suffix on untranslated strings if debug is on');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->__('unknown'), '-unknown#', '->initialize() can change the default prefix and suffix dor untranslated strings');
-
-// ->getCountry()
-$t->diag('->getCountry()');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->getCountry('FR'), 'France', '->getCountry() returns the name of a country for the current culture');
-$t->is($i18n->getCountry('FR', 'es'), 'Francia', '->getCountry() takes an optional culture as its second argument');
@@ -63 +63 @@
-// ->getNativeName()
-$t->diag('->getNativeName()');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->getNativeName('fr'), 'français', '->getNativeName() returns the name of a culture');
-
-// ->getTimestampForCulture()
-$t->diag('->getTimestampForCulture()');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->getTimestampForCulture('15/10/2005'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() returns the timestamp for a data formatted in the current culture');
-$t->is($i18n->getTimestampForCulture('10/15/2005', 'en_US'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() can take a culture as its second argument');
@@ -75 +75 @@
-// ->getDateForCulture()
-$t->diag('->getDateForCulture()');
-$cache, array(
+array('cache' => $cache, 
-$t->is($i18n->getDateForCulture('15/10/2005'), array('15', '10', '2005'), '->getDateForCulture() returns the day, month and year for a data formatted in the current culture');
-$t->is($i18n->getDateForCulture('10/15/2005', 'en_US'), array('15', '10', '2005'), '->getDateForCulture() can take a culture as its second argument');