mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 02:22:57 +01:00
Code Issues Releases Wiki Activity

Cleaning up UriTemplate as this is now an opt-in and not used by default

Browse Source
This commit is contained in:
Michael Dowling 2014-02-08 12:00:59 -08:00
parent d175175c6e
commit 5922d1cf4c
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Guzzle/Url/UriTemplate.php
View File

@ -9,17 +9,12 @@ namespace Guzzle\Url;
*/
class UriTemplate
{
const DEFAULT_PATTERN = '/\{([^\}]+)\}/';
/** @var string URI template */
private $template;
/** @var array Variables to use in the template expansion */
private $variables;
/** @var string Regex used to parse expressions */
private $regex = self::DEFAULT_PATTERN;
/** @var array Hash for quick operator lookups */
private static $operatorHash = array(
'+' => true, '#' => true, '.' => true, '/' => true, ';' => true, '?' => true, '&' => true
@ -38,24 +33,14 @@ class UriTemplate
public function expand($template, array $variables)
{
if ($this->regex == self::DEFAULT_PATTERN && false === strpos($template, '{')) {
if (false === strpos($template, '{')) {
return $template;
}
$this->template = $template;
$this->variables = $variables;
return preg_replace_callback($this->regex, array($this, 'expandMatch'), $this->template);
}
/**
* Set the regex patten used to expand URI templates
*
* @param string $regexPattern
*/
public function setRegex($regexPattern)
{
$this->regex = $regexPattern;
return preg_replace_callback('/\{([^\}]+)\}/', [$this, 'expandMatch'], $this->template);
}
/**
@ -229,7 +214,12 @@ class UriTemplate
}
/**
* Determines if an array is associative
* Determines if an array is associative.
*
* This makes the assumption that input arrays are sequences or hashes.
* This assumption is a tradeoff for accuracy in favor of speed, but it
* should work in almost every case where input is supplied for a URI
* template.
*
* @param array $array Array to check
*
@ -237,7 +227,7 @@ class UriTemplate
*/
private function isAssoc(array $array)
{
return (bool) count(array_filter(array_keys($array), 'is_string'));
return $array && array_keys($array)[0] !== 0;
}
/**