Changeset 7713

Timestamp:

03/02/08 14:28:53 (1 year ago)

Author:

fabien

Message:

enforced javascript and stylesheet positions

Files:

• branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/AssetHelper.php (modified) (2 diffs)
• branches/1.1/lib/response/sfWebResponse.class.php (modified) (8 diffs)
• branches/1.1/test/unit/response/sfWebResponseTest.php (modified) (3 diffs)

branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/AssetHelper.php

@@ -456 +456 @@
-  $html = '';
-
-array('first', '', 'last'
+$response->getPositions(
-  {
-    foreach ($response->getJavascripts($position) as $files => $options)
@@ -505 +505 @@
-  $html = '';
-
-array('first', '', 'last'
+$response->getPositions(
-  {
-    foreach ($response->getStylesheets($position) as $files => $options)

branches/1.1/lib/response/sfWebResponse.class.php

@@ -30 +30 @@
-    $metas       = array(),
-    $httpMetas   = array(),
+    $positions   = array('first', '', 'last'),
-    $stylesheets = array(),
-    $javascripts = array(),
@@ -47 +48 @@
-  {
-    parent::initialize($dispatcher, $parameters);
+
+    $this->javascripts = array_combine($this->positions, array_fill(0, count($this->positions), array()));
+    $this->stylesheets = array_combine($this->positions, array_fill(0, count($this->positions), array()));
-
-    $this->statusTexts = array(
@@ -538 +542 @@
-
-  /**
+   * Returns the available position names for stylesheets and javascripts in order.
+   *
+   * @return array An array of position names
+   */
+  public function getPositions()
+  {
+    return $this->positions;
+  }
+
+  /**
-   * Retrieves stylesheets for the current web response.
-   *
@@ -550 +564 @@
-      return $this->stylesheets;
-    }
+
+    $this->validatePosition($position);
-
-    return isset($this->stylesheets[$position]) ? $this->stylesheets[$position] : array();
@@ -563 +579 @@
-  public function addStylesheet($css, $position = '', $options = array())
-  {
-
-
-
-
+
-
-    $this->stylesheets[$position][$css] = $options;
@@ -584 +597 @@
-      return $this->javascripts;
-    }
+
+    $this->validatePosition($position);
-
-    return isset($this->javascripts[$position]) ? $this->javascripts[$position] : array();
@@ -597 +612 @@
-  public function addJavascript($js, $position = '', $options = array())
-  {
-
-
-
-
+
-
-    $this->javascripts[$position][$js] = $options;
@@ -697 +709 @@
-    list($this->content, $this->statusCode, $this->statusText, $this->parameterHolder, $this->cookies, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = $data;
-  }
+
+  /**
+   * Validate a position name.
+   *
+   * @throws InvalidArgumentException if the position is not available
+   */
+  protected function validatePosition($position)
+  {
+    if (!in_array($position, $this->positions, true))
+    {
+      throw new InvalidArgumentException(sprintf('The position "%s" does not exist (available positions: %s).', $position, implode(', ', $this->positions)));
+    }
+  }
-}

branches/1.1/test/unit/response/sfWebResponseTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-6
+8
-
-class myWebResponse extends sfWebResponse
@@ -194 +194 @@
-$t->is($stylesheets['bar'], array('media' => 'print'), '->addStylesheet() takes an array of parameters as its third argument');
-
+try
+{
+  $response->addStylesheet('last', 'none');
+  $t->fail('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+}
+
-// ->getStylesheets()
-$t->diag('->getStylesheets()');
@@ -212 +222 @@
-$t->ok(array_key_exists('last_js', $response->getJavascripts('last')), '->addJavascript() takes a position as its second argument');
-
+try
+{
+  $response->addJavascript('last_js', 'none');
+  $t->fail('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+}
+
-// ->getJavascripts()
-$t->diag('->getJavascripts()');