Merge branch 'master' into feature/68-objectset

Conflicts:
	code/view/json.php

code/controller/view.php

@@ -187,7 +187,7 @@ protected function _actionRender(ControllerContextInterface $context)
  $content = $view->render($data);
 
  //Set the data in the response
- $context->response->setContent($content, $view->mimetype);
+ $context->response->setContent($content, $view->getMimetype());
  }
  else throw new ControllerExceptionFormatNotSupported('Format: '.$format.' not supported');
 

code/dispatcher/dispatcher.php

@@ -203,9 +203,7 @@ protected function _actionPost(DispatcherContextInterface $context)
  else
  {
  //Determine the action based on the model state
- if($controller instanceof ControllerModellable) {
- $action = $controller->getModel()->getState()->isUnique() ? 'edit' : 'add';
- }
+ $action = $controller->getModel()->getState()->isUnique() ? 'edit' : 'add';
  }
 
  //Throw exception if no action could be determined from the request
@@ -398,4 +396,4 @@ public function getHttpMethods()
  {
  return $this->_methods;
  }
-}
+}

code/http/url/interface.php

@@ -127,8 +127,11 @@ public function setPort($port);
  /**
  * Returns the path portion as a string or array
  *
+ * This method will encode the path to conform to RFC 3986 returned as string.
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @param boolean $toArray If TRUE return an array. Default FALSE
- * @return string|array The path string; e.g., `path/to/site`.
+ * @return string|array The path string; e.g., `/path/to/site`.
  */
  public function getPath($toArray = false);
 
@@ -147,6 +150,9 @@ public function setPath($path);
  /**
  * Returns the query portion as a string or array
  *
+ * This method will encode the query to conform to RFC 3986 if returned as string
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @param boolean $toArray If TRUE return an array. Default FALSE
  * @param boolean|null $escape If TRUE escapes '&' to '&' for xml compliance. If NULL use the default.
  * @return string|array The query string; e.g., `foo=bar&baz=dib`.
@@ -229,6 +235,9 @@ public static function fromString($url);
  /**
  * Get the full url, of the format scheme:https://user:pass@host/path?query#fragment';
  *
+ * This will method will encode the resulting url to comform to RFC 3986
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @param integer $parts A bitmask of binary or'ed HTTP_URL constants; FULL is the default
  * @param boolean|null $escape If TRUE escapes '&' to '&' for xml compliance. If NULL use the default.
  * @return string

code/http/url/url.php

@@ -69,6 +69,8 @@
  * ?>
  * </code>
  *
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @author Johan Janssens <https://github.com/johanjanssens>
  * @package Kodekit\Library\Http\Url
  */
@@ -139,22 +141,7 @@ class HttpUrl extends Object implements HttpUrlInterface
  protected $_path = '';
 
  /**
- * Url-encode only these characters in path elements.
- *
- * Characters are ' ' (space), '/', '?', '&', and '#'.
- *
- * @var array
- */
- protected $_encode_path = array(
- ' ' => '+',
- '/' => '%2F',
- '?' => '%3F',
- '&' => '%26',
- '#' => '%23',
- );
-
- /**
- * Escape '&' to '&amp;'
+ * Escapes '&' to '&amp;'
  *
  * @var boolean
  *
@@ -290,7 +277,7 @@ public function getUser()
  */
  public function setUser($user)
  {
- $this->user = $user;
+ $this->user = rawurldecode($user);
  return $this;
  }
 
@@ -312,7 +299,7 @@ public function getPass()
  */
  public function setPass($pass)
  {
- $this->pass = $pass;
+ $this->pass = rawurldecode($pass);
  return $this;
  }
 
@@ -334,7 +321,7 @@ public function getHost()
  */
  public function setHost($host)
  {
- $this->host = $host;
+ $this->host = rawurldecode($host);
  return $this;
  }
 
@@ -356,20 +343,28 @@ public function getPort()
  */
  public function setPort($port)
  {
- $this->port = $port;
+ $this->port = (int) rawurldecode($port);
  return $this;
  }
 
  /**
  * Returns the path portion as a string or array
  *
- * @param boolean $toArray If TRUE return an array. Default FALSE
- * @return string|array The path string; e.g., `path/to/site`.
+ * This method will encode the path to conform to RFC 3986 returned as string.
+ * @link https://tools.ietf.org/html/rfc3986
+ *
+ * @param boolean $toArray If TRUE return an array. Default FALSE
+ * @return string|array The path string; e.g., `/path/to/site`.
  */
  public function getPath($toArray = false)
  {
- $result = $toArray ? $this->_path : $this->_pathEncode($this->_path);
- return $result;
+ if(!$toArray) {
+ $path = !empty($this->_path) ? '/'.implode('/', array_map('rawurlencode', $this->_path)) : '';
+ } else {
+ $path = (array) $this->_path;
+ }
+
+ return $path;
  }
 
  /**
@@ -387,14 +382,14 @@ public function setPath($path)
  if (is_string($path))
  {
  if (!empty($path)) {
- $path = explode('/', $path);
+ $path = explode('/', ltrim($path, '/'));
  } else {
  $path = array();
  }
  }
 
  foreach ($path as $key => $val) {
- $path[$key] = urldecode($val);
+ $path[$key] = rawurldecode($val);
  }
 
  $this->_path = $path;
@@ -404,6 +399,9 @@ public function setPath($path)
  /**
  * Returns the query portion as a string or array
  *
+ * This method will encode the query to conform to RFC 3986 if returned as string
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @param boolean $toArray If TRUE return an array. Default FALSE
  * @param boolean|null $escape If TRUE escapes '&' to '&amp;' for xml compliance. If NULL use the default.
  * @return string|array The query string; e.g., `foo=bar&baz=dib`.
@@ -415,7 +413,7 @@ public function getQuery($toArray = false, $escape = null)
 
  if(!$toArray)
  {
- $result =  http_build_query($this->_query, '', $escape ? '&amp;' : '&');
+ $result = http_build_query($this->_query, '', $escape ? '&amp;' : '&');
 
  // We replace the + used for spaces by http_build_query with the more standard %20.
  $result = str_replace('+', '%20', $result);
@@ -436,7 +434,8 @@ public function getQuery($toArray = false, $escape = null)
  */
  public function setQuery($query, $merge = false)
  {
- $result = $query;
+ //Parse
+ $array = $query;
  if (!is_array($query))
  {
  if (strpos($query, '&amp;') !== false)
@@ -446,9 +445,20 @@ public function setQuery($query, $merge = false)
  }
 
  //Set the query vars
- parse_str($query, $result);
+ parse_str($query, $array);
  }
 
+ //Decode
+ $result = array();
+ foreach($array as $key => $value)
+ {
+ $key = rawurldecode($key);
+ $value = rawurldecode($value);
+
+ $result[$key] = $value;
+ }
+
+ //Merge
  if ($merge) {
  $this->_query = array_merge($this->_query, $result);
  } else {
@@ -476,7 +486,7 @@ public function getFragment()
  */
  public function setFragment($fragment)
  {
- $this->fragment = $fragment;
+ $this->fragment = rawurldecode($fragment);
  return $this;
  }
 
@@ -539,7 +549,6 @@ public function toArray($parts = self::FULL, $escape = null)
  $result['path'] = $this->_path;
  }
 
-
  if (($parts & self::QUERY) && !empty($this->_query)) {
  $result['query'] = $this->getQuery(false, $escape);
  }
@@ -590,6 +599,9 @@ public static function fromString($url)
  /**
  * Get the full url, of the format scheme:https://user:pass@host/path?query#fragment';
  *
+ * This will method will encode the resulting url to comform to RFC 3986
+ * @link https://tools.ietf.org/html/rfc3986
+ *
  * @param integer $parts A bitmask of binary or'ed HTTP_URL constants; FULL is the default
  * @param boolean|null $escape If TRUE escapes '&' to '&amp;' for xml compliance. If NULL use the default.
  * @return string
@@ -601,7 +613,7 @@ public function toString($parts = self::FULL, $escape = null)
 
  //Add the scheme
  if (($parts & self::SCHEME) && !empty($this->scheme)) {
- $url .= urlencode($this->scheme) . ':';
+ $url .= rawurlencode($this->scheme) . ':';
  }
 
  // Add the host and port, if any.
@@ -612,18 +624,18 @@ public function toString($parts = self::FULL, $escape = null)
  //Add the username and password
  if (($parts & self::USER) && !empty($this->user))
  {
- $url .= urlencode($this->user);
+ $url .= rawurlencode($this->user);
  if (($parts & self::PASS) && !empty($this->pass)) {
- $url .= ':' . urlencode($this->pass);
+ $url .= ':' . rawurlencode($this->pass);
  }
 
  $url .= '@';
  }
 
- $url .= urlencode($this->host);
+ $url .= rawurlencode($this->host);
 
  if (($parts & self::PORT) && !empty($this->port)) {
- $url .= ':' . (int)$this->port;
+ $url .= ':' . (int)rawurlencode($this->port);
  }
  }
 
@@ -642,7 +654,7 @@ public function toString($parts = self::FULL, $escape = null)
  }
 
  if (($parts & self::FRAGMENT) && trim($this->fragment) !== '') {
- $url .= '#' . urlencode($this->fragment);
+ $url .= '#' . rawurlencode($this->fragment);
  }
 
  return $url;
@@ -668,31 +680,6 @@ public function equals(HttpUrlInterface $url)
  return true;
  }
 
- /**
- * Converts an array of path elements into a string.
- *
- * Does not use urlencode(); instead, only converts characters found in HttpUrl::$_encode_path.
- *
- * @param array $spec The path elements.
- * @return string A url path string.
- */
- protected function _pathEncode($spec)
- {
- if (is_string($spec)) {
- $spec = explode('/', $spec);
- }
-
- $keys = array_keys($this->_encode_path);
- $vals = array_values($this->_encode_path);
-
- $out = array();
- foreach ((array)$spec as $elem) {
- $out[] = str_replace($keys, $vals, $elem);
- }
-
- return implode('/', $out);
- }
-
  /**
  * Set the virtual properties.
  *

code/template/behavior/filterable.php

@@ -156,15 +156,15 @@ public function getFilter($filter)
  */
  protected function _afterRender(TemplateContextInterface $context)
  {
- if(is_string($context->result))
+ if(is_string($context->source))
  {
- $content = $context->result;
+ $content = $context->source;
 
  foreach($this->__filter_queue as $filter) {
  $filter->filter($content, $this->getMixer());
  }
 
- $context->result = $content;
+ $context->source = $content;
  }
  }
 }

code/template/behavior/helperable.php

@@ -17,6 +17,17 @@
  */
 class TemplateBehaviorHelperable extends TemplateBehaviorAbstract
 {
+ /**
+ * Register a helper() function in the template
+ *
+ * @param ViewContextInterface $context A view context object
+ * @return void
+ */
+ protected function _beforeRender(TemplateContextInterface $context)
+ {
+ $context->subject->registerFunction('helper', array($this, 'invokeHelper'));
+ }
+
  /**
  * Invoke a template helper
  *

code/template/template.php

@@ -58,11 +58,9 @@ protected function _initialize(ObjectConfig $config)
  'filters' => array(),
  'functions' => array(
  'escape' => array(__NAMESPACE__.'\StringEscaper', 'escape'),
- 'helper' => array($this, 'invokeHelper'),
  'parameter' => array($this, 'getParameter'),
  'parameters' => array($this, 'getParameters')
  ),
- 'command_chain' => 'lib:command.chain',
  ))->append(array(
  'behaviors' => array('filterable' => array('filters' => $config->filters)),
  ));
@@ -82,18 +80,17 @@ final public function render($source, array $data = array(), $type = null)
  {
  $context = $this->getContext();
  $context->data = $data;
- $context->action = 'render';
  $context->source = $source;
  $context->type = $type;
 
  if ($this->invokeCommand('before.render', $context) !== false)
  {
  //Render the template
- $context->result = $this->_actionRender($context);
+ $context->source = $this->_actionRender($context);
  $this->invokeCommand('after.render', $context);
  }
 
- return $context->result;
+ return $context->source;
  }
 
  /**