diff options
| author | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-11-27 08:01:41 -0800 |
|---|---|---|
| committer | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-11-27 08:01:41 -0800 |
| commit | 235aae3fda323f31ef180d4bf3825f55b1914132 (patch) | |
| tree | be202c9befba51d7e9b6a608635a2103c1667fdd | |
| parent | 62b4cc0fa103bb8f9d0cc2a9a44ad65d76c6d1cc (diff) | |
| parent | d75c96309518610ebaab38f57b032d234dc90111 (diff) | |
| download | sql-formatter-235aae3fda323f31ef180d4bf3825f55b1914132.zip sql-formatter-235aae3fda323f31ef180d4bf3825f55b1914132.tar.gz sql-formatter-235aae3fda323f31ef180d4bf3825f55b1914132.tar.bz2 | |
Merge branch 'master' of https://github.com/augusteiner/sql-formatter into augusteiner-master
Conflicts:
lib/SqlFormatter.php
| -rw-r--r-- | lib/SqlFormatter.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php index d921333..8e3a4ef 100644 --- a/lib/SqlFormatter.php +++ b/lib/SqlFormatter.php @@ -184,12 +184,12 @@ class SqlFormatter self::$reserved = array_keys($reservedMap); // Set up regular expressions - self::$regex_boundaries = '('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$boundaries)).')'; - self::$regex_reserved = '('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved)).')'; - self::$regex_reserved_toplevel = str_replace(' ','\\s+','('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved_toplevel)).')'); - self::$regex_reserved_newline = str_replace(' ','\\s+','('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved_newline)).')'); + self::$regex_boundaries = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$boundaries)).')'; + self::$regex_reserved = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved)).')'; + self::$regex_reserved_toplevel = str_replace(' ','\\s+','('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved_toplevel)).')'); + self::$regex_reserved_newline = str_replace(' ','\\s+','('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved_newline)).')'); - self::$regex_function = '('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$functions)).')'; + self::$regex_function = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$functions)).')'; self::$init = true; } |