Merge pull request #1 from intersvyaz/semicolon

Добавил обработку ведущего двоеточия для имён параметров

Author: miramir

.gitignore

@@ -1,4 +1,3 @@
 .idea
 /vendor
-composer.lock
 /tests/output

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
+  - 5.6
 
 install:
   - composer self-update

Parser.php

@@ -23,10 +23,11 @@ class Parser
      */
     public function __construct($sql, $params = [])
     {
-        if (substr($sql, -4) === '.sql')
+        if (substr($sql, -4) === '.sql') {
             $this->sql = file_get_contents($sql);
-        else
+        } else {
             $this->sql = $sql;
+        }
 
         $this->params = $params;
         $this->parseSql();
@@ -76,13 +77,15 @@ private function simplifyParams($params)
             $key = ':' . ltrim($key, ':');
             if (is_array($value)) {
                 if (isset($value[0]) && is_array($value[0])) {
-                    foreach ($value[0] as $valKey => $valVal)
+                    foreach ($value[0] as $valKey => $valVal) {
                         $newParams[$key . '_' . $valKey] = $valVal;
+                    }
                 } elseif (!isset($value['bind']) || $value['bind'] === true) {
-                    if (isset($value[0]) && isset($value[1]))
+                    if (isset($value[0]) && isset($value[1])) {
                         $newParams[$key] = [$value[0], $value[1]];
-                    elseif (isset($value[0]))
+                    } elseif (isset($value[0])) {
                         $newParams[$key] = $value[0];
+                    }
                 }
             } else {
                 $newParams[$key] = $value;
@@ -92,7 +95,6 @@ private function simplifyParams($params)
         return $newParams;
     }
 
-
     /**
      * Функция разбора и подготовки текста sql запроса.
      */
@@ -129,9 +131,10 @@ private function parseSql()
      */
     private function replaceComment($comment, $queryInComment, $paramName)
     {
-        $paramName = ltrim($paramName, ':');
-        if (array_key_exists($paramName, $this->params)) {
-            $paramValue = $this->params[$paramName];
+        $param = $this->getParam($paramName);
+        if ($param) {
+            $paramName = $param[0];
+            $paramValue = $param[1];
             if (is_array($paramValue)) {
                 $value = isset($paramValue[0]) ? $paramValue[0] : null;
                 $bind = isset($paramValue['bind']) ? $paramValue['bind'] : true;
@@ -156,4 +159,22 @@ private function replaceComment($comment, $queryInComment, $paramName)
 
         $this->sql = str_replace($comment, $queryInComment, $this->sql);
     }
+
+    /**
+     * Ищет параметр в массиве $this->params
+     * @param string $name имя параметра
+     * @return array|bool массив ['имя_параметра_без_ведущего_двоеточия', 'значение_параметра'] или ложь если параметра нет
+     */
+    private function getParam($name)
+    {
+        $name = ltrim($name, ':');
+
+        if (array_key_exists($name, $this->params)) {
+            return [$name, $this->params[$name]];
+        } elseif (array_key_exists(':' . $name, $this->params)) {
+            return [$name, $this->params[':' . $name]];
+        }
+
+        return false;
+    }
 }

composer.json

@@ -1,18 +1,29 @@
 {
     "name": "intersvyaz/yii2-sqlparser",
     "description": "Parsing sql-query",
-    "keywords": ["yii2", "extension", "database"],
+    "keywords": [
+        "yii2",
+        "extension",
+        "database"
+    ],
     "homepage": "https://github.com/intersvyaz/yii2-sqlparser.git",
     "license": "MIT",
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0"
+        "fxp/composer-asset-plugin": " ~1.0.0",
+        "yiisoft/yii2": "~2.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "~4.5.0"
     },
     "autoload": {
         "psr-4": {"Intersvyaz\\SqlParser\\": ""}
+    },
+    "extra": {
+        "asset-installer-paths": {
+            "npm-asset-library": "vendor/npm",
+            "bower-asset-library": "vendor/bower"
+        }
     }
 }