Changeset 32698

Timestamp:

07/01/11 08:55:58 (2 years ago)

Author:

fabien

Message:

[1.4] fixed a unit test

Files:

• branches/1.4/CHANGELOG (modified) (1 diff)
• branches/1.4/lib/view/sfViewCacheManager.class.php (modified) (6 diffs)
• branches/1.4/test/unit/validator/sfValidatorDecoratorTest.php (modified) (2 diffs)

branches/1.4/CHANGELOG

@@ +1 @@
+07/01/11: Version 1.4.12
+------------------------
+
+
-03/30/11: Version 1.4.11
-------------------------

branches/1.4/lib/view/sfViewCacheManager.class.php

@@ -130 +130 @@
-    }
-
-
+
+
-    {
-      throw new sfException('A cache key cannot be generated for an internal URI using the @rule syntax');
@@ -166 +167 @@
-      {
-        $cacheKey = 'sf_cache_partial/';
+        $cacheKey .= $this->convertParametersToKey($params);
-      }
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -295 +304 @@
-
-  /**
+   * Transforms an associative array of parameters from an URI into a unique key
+   * This method is only used for fragment
+   *
+   * @param  array $params  Associative array of parameters from the URI (including, at least, module and action)
+   *
+   * @return string Unique key
+   */
+  protected function convertParametersToFragmentKey($params)
+  {
+    // module should be __sf_cache_fragment and action should be the
+    // fragment name, also used as sf_cache_key parameter
+    // these parameters can be removed from the generated kay
+    unset($params['module'] , $params['action']);
+
+    ksort($params);
+    foreach ($params as $key => $value)
+    {
+      $cacheKey .= sprintf('%s/%s/', $key, $value);
+    }
+
+    return rtrim( $cacheKey , '/' );
+  }
+
+  /**
-   * Adds a cache to the manager.
-   *
@@ -675 +708 @@
-  public function start($name, $lifeTime, $clientLifeTime = null, $vary = array())
-  {
-    $internalUri = $this->routing->getCurrentInternalUri();
-
-    if (!$clientLifeTime)
-    {
-      $clientLifeTime = $lifeTime;
-    }
+
+    // fetch fragment uri
+    $internalUri = $this->getFragmentUri( $name );
-
-    // add cache config to cache manager
-    list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
+    // module should be __sf_cache_fragment and action should be the name of the fragment
-    $this->addCache($params['module'], $params['action'], array('withLayout' => false, 'lifeTime' => $lifeTime, 'clientLifeTime' => $clientLifeTime, 'vary' => $vary));
-
-    // get data from cache if available
-
+
+
-    if ($data !== null)
-    {
@@ -708 +744 @@
-   * @return bool true, if success otherwise false
-   */
-$name
+ $name 
-  {
-    $data = ob_get_clean();
-
-    // save content to cache
-    $internalUri = $this->routing->getCurrentInternalUri();
-    try
-    {
-$data, $internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name
+ $data, $this->getFragmentUri( $name ) 
-    }
-    catch (Exception $e)
@@ -723 +757 @@
-
-    return $data;
+  }
+
+  /**
+   * Computes a fragment internal URI.
+   *
+   * @param  string $name      The fragement name
+   *
+   * @return string The internal URI
+   */
+  public function getFragmentUri( $name )
+  {
+    // in fragement case, module is __sf_cache_fragment and action is the fragment name
+    // module and action are required to the set() procedure and isCacheable() method
+    return sprintf('@sf_cache_fragment?module=%s&action=%s&sf_cache_key=%s', '__sf_cache_fragment' , $name , $name );
-  }
-

branches/1.4/test/unit/validator/sfValidatorDecoratorTest.php

@@ -63 +63 @@
-$t->is($v->getMessages(), array('required' => 'This string is required.', 'invalid' => 'This string is invalid.', 'max_length' => '"%value%" is too long (%max_length% characters max).', 'min_length' => '"%value%" is too short (%min_length% characters min).'), '->getMessages() returns messages from the embedded validator');
-$v->setMessages(array('required' => 'Required...'));
-
+, 'invalid' => 'Invalid.'
-
-// ->getOption() ->getOptions() ->hasOption() ->getOptions() ->setOptions()
@@ -72 +72 @@
-$t->is($v->hasOption('min_length'), true, '->hasOption() returns true if the embedded validator has a given option');
-$v->setOptions(array('min_length' => 10));
-
+required' => true, 'trim' => false, 'empty_value' => null, '
-
-$v = new MyValidator();