s9e / RegexpBuilder

src/Serializer.php

Indentation +198 added lines, -198 removed lines

@@ -11,202 +11,202 @@
 
 class Serializer
 {
-	/**
-	* @var Escaper
-	*/
-	protected $escaper;
-
-	/**
-	* @var OutputInterface
-	*/
-	protected $output;
-
-	/**
-	* @param OutputInterface $output
-	* @param Escaper         $escaper
-	*/
-	public function __construct(OutputInterface $output, Escaper $escaper)
-	{
-		$this->escaper = $escaper;
-		$this->output  = $output;
-	}
-
-	/**
-	* Serialize given strings into a regular expression
-	*
-	* @param  array[] $strings
-	* @return string
-	*/
-	public function serializeStrings(array $strings)
-	{
-		$info = $this->analyzeStrings($strings);
-		$alternations = $this->buildAlternations($info);
-		$expr = implode('|', $alternations);
-
-		if (count($alternations) > 1 || $this->isOneOptionalString($info))
-		{
-			$expr = '(?:' . $expr . ')';
-		}
-
-		return $expr . $info['quantifier'];
-	}
-
-	/**
-	* Analyze given strings to determine how to serialize them
-	*
-	* The returned array may contains any of the following elements:
-	*
-	*  - (string) quantifier Either '' or '?'
-	*  - (array)  chars      List of values from single-char strings
-	*  - (array)  strings    List of multi-char strings
-	*
-	* @param  array[] $strings
-	* @return array
-	*/
-	protected function analyzeStrings(array $strings)
-	{
-		$info = ['quantifier' => ''];
-		if ($strings[0] === [])
-		{
-			$info['quantifier'] = '?';
-			unset($strings[0]);
-		}
-
-		$chars = $this->getChars($strings);
-		if (count($chars) > 1)
-		{
-			$info['chars'] = array_values($chars);
-			$strings = array_diff_key($strings, $chars);
-		}
-
-		$info['strings'] = array_values($strings);
-
-		return $info;
-	}
-
-	/**
-	* Build the list of alternations based on given info
-	*
-	* @param  array    $info
-	* @return string[]
-	*/
-	protected function buildAlternations(array $info)
-	{
-		$alternations = [];
-		if (!empty($info['chars']))
-		{
-			$alternations[] = $this->serializeCharacterClass($info['chars']);
-		}
-		foreach ($info['strings'] as $string)
-		{
-			$alternations[] = $this->serializeString($string);
-		}
-
-		return $alternations;
-	}
-
-	/**
-	* Return the portion of strings that are composed of a single character
-	*
-	* @param  array[]
-	* @return array   String key => codepoint
-	*/
-	protected function getChars(array $strings)
-	{
-		$chars = [];
-		foreach ($strings as $k => $string)
-		{
-			if (count($string) === 1)
-			{
-				$chars[$k] = $string[0];
-			}
-		}
-
-		return $chars;
-	}
-
-	/**
-	* Get the list of ranges that cover all given values
-	*
-	* @param  integer[] $values Ordered list of values
-	* @return array[]           List of ranges in the form [start, end]
-	*/
-	protected function getRanges(array $values)
-	{
-		$i      = 0;
-		$cnt    = count($values);
-		$start  = $values[0];
-		$end    = $start;
-		$ranges = [];
-		while (++$i < $cnt)
-		{
-			if ($values[$i] === $end + 1)
-			{
-				++$end;
-			}
-			else
-			{
-				$ranges[] = [$start, $end];
-				$start = $end = $values[$i];
-			}
-		}
-		$ranges[] = [$start, $end];
-
-		return $ranges;
-	}
-
-	/**
-	* Test whether a string is optional and has more than one character
-	*
-	* @param  array $info
-	* @return bool
-	*/
-	protected function isOneOptionalString(array $info)
-	{
-		// Test whether the first string has a quantifier and more than one element
-		return (!empty($info['quantifier']) && isset($info['strings'][0][1]));
-	}
-
-	/**
-	* Serialize a given list of values into a character class
-	*
-	* @param  integer[] $values
-	* @return string
-	*/
-	protected function serializeCharacterClass(array $values)
-	{
-		$expr = '[';
-		foreach ($this->getRanges($values) as list($start, $end))
-		{
-			$expr .= $this->escaper->escapeCharacterClass($this->output->output($start));
-			if ($end > $start)
-			{
-				if ($end > $start + 1)
-				{
-					$expr .= '-';
-				}
-				$expr .= $this->escaper->escapeCharacterClass($this->output->output($end));
-			}
-		}
-		$expr .= ']';
-
-		return $expr;
-	}
-
-	/**
-	* Serialize a given string into a regular expression
-	*
-	* @param  array  $string
-	* @return string
-	*/
-	protected function serializeString(array $string)
-	{
-		$expr = '';
-		foreach ($string as $element)
-		{
-			$expr .= (is_array($element)) ? $this->serializeStrings($element) : $this->escaper->escapeLiteral($this->output->output($element));
-		}
-
-		return $expr;
-	}
+    /**
+     * @var Escaper
+     */
+    protected $escaper;
+
+    /**
+     * @var OutputInterface
+     */
+    protected $output;
+
+    /**
+     * @param OutputInterface $output
+     * @param Escaper         $escaper
+     */
+    public function __construct(OutputInterface $output, Escaper $escaper)
+    {
+        $this->escaper = $escaper;
+        $this->output  = $output;
+    }
+
+    /**
+     * Serialize given strings into a regular expression
+     *
+     * @param  array[] $strings
+     * @return string
+     */
+    public function serializeStrings(array $strings)
+    {
+        $info = $this->analyzeStrings($strings);
+        $alternations = $this->buildAlternations($info);
+        $expr = implode('|', $alternations);
+
+        if (count($alternations) > 1 || $this->isOneOptionalString($info))
+        {
+            $expr = '(?:' . $expr . ')';
+        }
+
+        return $expr . $info['quantifier'];
+    }
+
+    /**
+     * Analyze given strings to determine how to serialize them
+     *
+     * The returned array may contains any of the following elements:
+     *
+     *  - (string) quantifier Either '' or '?'
+     *  - (array)  chars      List of values from single-char strings
+     *  - (array)  strings    List of multi-char strings
+     *
+     * @param  array[] $strings
+     * @return array
+     */
+    protected function analyzeStrings(array $strings)
+    {
+        $info = ['quantifier' => ''];
+        if ($strings[0] === [])
+        {
+            $info['quantifier'] = '?';
+            unset($strings[0]);
+        }
+
+        $chars = $this->getChars($strings);
+        if (count($chars) > 1)
+        {
+            $info['chars'] = array_values($chars);
+            $strings = array_diff_key($strings, $chars);
+        }
+
+        $info['strings'] = array_values($strings);
+
+        return $info;
+    }
+
+    /**
+     * Build the list of alternations based on given info
+     *
+     * @param  array    $info
+     * @return string[]
+     */
+    protected function buildAlternations(array $info)
+    {
+        $alternations = [];
+        if (!empty($info['chars']))
+        {
+            $alternations[] = $this->serializeCharacterClass($info['chars']);
+        }
+        foreach ($info['strings'] as $string)
+        {
+            $alternations[] = $this->serializeString($string);
+        }
+
+        return $alternations;
+    }
+
+    /**
+     * Return the portion of strings that are composed of a single character
+     *
+     * @param  array[]
+     * @return array   String key => codepoint
+     */
+    protected function getChars(array $strings)
+    {
+        $chars = [];
+        foreach ($strings as $k => $string)
+        {
+            if (count($string) === 1)
+            {
+                $chars[$k] = $string[0];
+            }
+        }
+
+        return $chars;
+    }
+
+    /**
+     * Get the list of ranges that cover all given values
+     *
+     * @param  integer[] $values Ordered list of values
+     * @return array[]           List of ranges in the form [start, end]
+     */
+    protected function getRanges(array $values)
+    {
+        $i      = 0;
+        $cnt    = count($values);
+        $start  = $values[0];
+        $end    = $start;
+        $ranges = [];
+        while (++$i < $cnt)
+        {
+            if ($values[$i] === $end + 1)
+            {
+                ++$end;
+            }
+            else
+            {
+                $ranges[] = [$start, $end];
+                $start = $end = $values[$i];
+            }
+        }
+        $ranges[] = [$start, $end];
+
+        return $ranges;
+    }
+
+    /**
+     * Test whether a string is optional and has more than one character
+     *
+     * @param  array $info
+     * @return bool
+     */
+    protected function isOneOptionalString(array $info)
+    {
+        // Test whether the first string has a quantifier and more than one element
+        return (!empty($info['quantifier']) && isset($info['strings'][0][1]));
+    }
+
+    /**
+     * Serialize a given list of values into a character class
+     *
+     * @param  integer[] $values
+     * @return string
+     */
+    protected function serializeCharacterClass(array $values)
+    {
+        $expr = '[';
+        foreach ($this->getRanges($values) as list($start, $end))
+        {
+            $expr .= $this->escaper->escapeCharacterClass($this->output->output($start));
+            if ($end > $start)
+            {
+                if ($end > $start + 1)
+                {
+                    $expr .= '-';
+                }
+                $expr .= $this->escaper->escapeCharacterClass($this->output->output($end));
+            }
+        }
+        $expr .= ']';
+
+        return $expr;
+    }
+
+    /**
+     * Serialize a given string into a regular expression
+     *
+     * @param  array  $string
+     * @return string
+     */
+    protected function serializeString(array $string)
+    {
+        $expr = '';
+        foreach ($string as $element)
+        {
+            $expr .= (is_array($element)) ? $this->serializeStrings($element) : $this->escaper->escapeLiteral($this->output->output($element));
+        }
+
+        return $expr;
+    }
 }
\ No newline at end of file

src/Builder.php

Indentation +141 added lines, -141 removed lines

@@ -18,145 +18,145 @@
 
 class Builder
 {
-	/**
-	* @var InputInterface
-	*/
-	protected $input;
-
-	/**
-	* @var Runner
-	*/
-	protected $runner;
-
-	/**
-	* @var Serializer
-	*/
-	protected $serializer;
-
-	/**
-	* @param array $config
-	*/
-	public function __construct(array $config = [])
-	{
-		$config += [
-			'delimiter' => '/',
-			'input'     => 'Bytes',
-			'output'    => 'Bytes'
-		];
-
-		$this->setInput($config['input']);
-		$this->setSerializer($config['output'], $config['delimiter']);
-		$this->setRunner();
-	}
-
-	/**
-	* Build and return a regular expression that matches all of the given strings
-	*
-	* @param  string[] $strings Literal strings to be matched
-	* @return string            Regular expression (without delimiters)
-	*/
-	public function build(array $strings)
-	{
-		$strings = array_unique($strings);
-		if ($this->isEmpty($strings))
-		{
-			return '';
-		}
-
-		$strings = $this->splitStrings($strings);
-		usort($strings, __CLASS__ . '::compareStrings');
-		$strings = $this->runner->run($strings);
-
-		return $this->serializer->serializeStrings($strings);
-	}
-
-	/**
-	* Compare two split strings
-	*
-	* Will sort strings in ascending order
-	*
-	* @param  integer[] $a
-	* @param  integer[] $b
-	* @return integer
-	*/
-	protected function compareStrings(array $a, array $b)
-	{
-		$i   = -1;
-		$cnt = min(count($a), count($b));
-		while (++$i < $cnt)
-		{
-			if ($a[$i] !== $b[$i])
-			{
-				return $a[$i] - $b[$i];
-			}
-		}
-
-		return count($a) - count($b);
-	}
-
-	/**
-	* Test whether the list of strings is empty
-	*
-	* @param  string[] $strings
-	* @return bool
-	*/
-	protected function isEmpty(array $strings)
-	{
-		return (empty($strings) || $strings === ['']);
-	}
-
-	/**
-	* Set the InputInterface instance in $this->input
-	*
-	* @param  string $inputType
-	* @return void
-	*/
-	protected function setInput($inputType)
-	{
-		$className   = __NAMESPACE__ . '\\Input\\' . $inputType;
-		$this->input = new $className;
-	}
-
-	/**
-	* Set the Runner instance $in this->runner
-	*
-	* @return void
-	*/
-	protected function setRunner()
-	{
-		$this->runner = new Runner;
-		$this->runner->addPass(new MergePrefix);
-		$this->runner->addPass(new GroupSingleCharacters);
-		$this->runner->addPass(new Recurse($this->runner));
-		$this->runner->addPass(new PromoteSingleStrings);
-		$this->runner->addPass(new MergeSuffix);
-		$this->runner->addPass(new CoalesceSingleCharacterPrefix);
-	}
-
-	/**
-	* Set the Serializer instance in $this->serializer
-	*
-	* @param  string $outputType
-	* @param  string $delimiter
-	* @return void
-	*/
-	protected function setSerializer($outputType, $delimiter)
-	{
-		$className = __NAMESPACE__ . '\\Output\\' . $outputType;
-		$output    = new $className;
-		$escaper   = new Escaper($delimiter);
-
-		$this->serializer = new Serializer($output, $escaper);
-	}
-
-	/**
-	* Split all given strings by character
-	*
-	* @param  string[] $strings List of strings
-	* @return array[]           List of arrays
-	*/
-	protected function splitStrings(array $strings)
-	{
-		return array_map([$this->input, 'split'], $strings);
-	}
+    /**
+     * @var InputInterface
+     */
+    protected $input;
+
+    /**
+     * @var Runner
+     */
+    protected $runner;
+
+    /**
+     * @var Serializer
+     */
+    protected $serializer;
+
+    /**
+     * @param array $config
+     */
+    public function __construct(array $config = [])
+    {
+        $config += [
+            'delimiter' => '/',
+            'input'     => 'Bytes',
+            'output'    => 'Bytes'
+        ];
+
+        $this->setInput($config['input']);
+        $this->setSerializer($config['output'], $config['delimiter']);
+        $this->setRunner();
+    }
+
+    /**
+     * Build and return a regular expression that matches all of the given strings
+     *
+     * @param  string[] $strings Literal strings to be matched
+     * @return string            Regular expression (without delimiters)
+     */
+    public function build(array $strings)
+    {
+        $strings = array_unique($strings);
+        if ($this->isEmpty($strings))
+        {
+            return '';
+        }
+
+        $strings = $this->splitStrings($strings);
+        usort($strings, __CLASS__ . '::compareStrings');
+        $strings = $this->runner->run($strings);
+
+        return $this->serializer->serializeStrings($strings);
+    }
+
+    /**
+     * Compare two split strings
+     *
+     * Will sort strings in ascending order
+     *
+     * @param  integer[] $a
+     * @param  integer[] $b
+     * @return integer
+     */
+    protected function compareStrings(array $a, array $b)
+    {
+        $i   = -1;
+        $cnt = min(count($a), count($b));
+        while (++$i < $cnt)
+        {
+            if ($a[$i] !== $b[$i])
+            {
+                return $a[$i] - $b[$i];
+            }
+        }
+
+        return count($a) - count($b);
+    }
+
+    /**
+     * Test whether the list of strings is empty
+     *
+     * @param  string[] $strings
+     * @return bool
+     */
+    protected function isEmpty(array $strings)
+    {
+        return (empty($strings) || $strings === ['']);
+    }
+
+    /**
+     * Set the InputInterface instance in $this->input
+     *
+     * @param  string $inputType
+     * @return void
+     */
+    protected function setInput($inputType)
+    {
+        $className   = __NAMESPACE__ . '\\Input\\' . $inputType;
+        $this->input = new $className;
+    }
+
+    /**
+     * Set the Runner instance $in this->runner
+     *
+     * @return void
+     */
+    protected function setRunner()
+    {
+        $this->runner = new Runner;
+        $this->runner->addPass(new MergePrefix);
+        $this->runner->addPass(new GroupSingleCharacters);
+        $this->runner->addPass(new Recurse($this->runner));
+        $this->runner->addPass(new PromoteSingleStrings);
+        $this->runner->addPass(new MergeSuffix);
+        $this->runner->addPass(new CoalesceSingleCharacterPrefix);
+    }
+
+    /**
+     * Set the Serializer instance in $this->serializer
+     *
+     * @param  string $outputType
+     * @param  string $delimiter
+     * @return void
+     */
+    protected function setSerializer($outputType, $delimiter)
+    {
+        $className = __NAMESPACE__ . '\\Output\\' . $outputType;
+        $output    = new $className;
+        $escaper   = new Escaper($delimiter);
+
+        $this->serializer = new Serializer($output, $escaper);
+    }
+
+    /**
+     * Split all given strings by character
+     *
+     * @param  string[] $strings List of strings
+     * @return array[]           List of arrays
+     */
+    protected function splitStrings(array $strings)
+    {
+        return array_map([$this->input, 'split'], $strings);
+    }
 }
\ No newline at end of file