Merge pull request #15 from ifacesoft/master

Master
ifacesoft · Apr 3, 2015 · cbc4c2b · cbc4c2b
2 parents c24da95 + 5f1718b
commit cbc4c2b
Show file tree

Hide file tree

Showing 7 changed files with 12,450 additions and 2,938 deletions.
diff --git a/Source/Ice/Core/Model.php b/Source/Ice/Core/Model.php
@@ -815,22 +815,21 @@ public static function getData(array $filterFields = [])
     /**
      * Return model by custom field
      *
-     * @param $fieldName
-     * @param $fieldValue
+     * @param array $fieldValueNames
      * @param $fieldNames
      * @param string|null $dataSourceKey
      * @param int $ttl
      * @return Model|null
      *
      * @author dp <[email protected]>
      *
-     * @version 0.4
+     * @version 0.6
      * @since 0.0
      */
-    public static function getModelBy($fieldName, $fieldValue, $fieldNames, $dataSourceKey = null, $ttl = null)
+    public static function getModelBy(array $fieldValueNames, $fieldNames, $dataSourceKey = null, $ttl = null)
     {
         return Query::getBuilder(self::getClass())
-            ->eq([$fieldName => $fieldValue])
+            ->eq($fieldValueNames)
             ->limit(1)
             ->select($fieldNames, [], $dataSourceKey)
             ->getModel($ttl);
@@ -1069,6 +1068,7 @@ private function insert($modelClass, $affected, $isSmart, $dataSourceKey)
 
         $insertId = Query::getBuilder($modelClass)
             ->insert($affected, $isSmart, $dataSourceKey)
+            ->execute()
             ->getInsertId();
 
         $this->set(reset($insertId));

diff --git a/Source/Ice/Core/Query/Builder.php b/Source/Ice/Core/Query/Builder.php
@@ -1086,11 +1086,11 @@ public function left($modelTableData, $fieldNames = '/pk', $condition = null)
      * @param bool $update
      * @param string|null $dataSourceKey
      * @param int $ttl
-     * @return Query_Result
+     * @return Query
      *
      * @author dp <[email protected]>
      *
-     * @version 0.2
+     * @version 0.6
      * @since 0.0
      */
     public function insert(array $data, $update = false, $dataSourceKey = null, $ttl = null)
@@ -1107,11 +1107,11 @@ public function insert(array $data, $update = false, $dataSourceKey = null, $ttl
      * @param $part
      * @param $dataSourceKey
      * @param $ttl
-     * @return Query_Builder
+     * @return Query
      *
      * @author dp <[email protected]>
      *
-     * @version 0.2
+     * @version 0.6
      * @since 0.1
      */
     private function affect(array $data, $part, $dataSourceKey, $ttl)
@@ -1163,11 +1163,11 @@ private function affect(array $data, $part, $dataSourceKey, $ttl)
      * @param array $data Key-value array
      * @param null $dataSource
      * @param int $ttl
-     * @return Query_Result
+     * @return Query
      *
      * @author dp <[email protected]>
      *
-     * @version 0.2
+     * @version 0.6
      * @since 0.0
      */
     public function update(array $data, $dataSource = null, $ttl = null)
@@ -1182,11 +1182,11 @@ public function update(array $data, $dataSource = null, $ttl = null)
      * @param array $pkValues
      * @param string|null $dataSourceKey
      * @param int $ttl
-     * @return Query_Result
+     * @return Query
      *
      * @author dp <[email protected]>
      *
-     * @version 0.2
+     * @version 0.6
      * @since 0.0
      */
     public function delete($pkValues = [], $dataSourceKey = null, $ttl = null)

diff --git a/Var/vendor/phpunit/coverage.xml b/Var/vendor/phpunit/coverage.xml
diff --git a/app.php b/app.php
@@ -10,10 +10,6 @@
  * @since 0.0
  */
 
-if (!defined('VENDOR_DIR')) {
-    define('VENDOR_DIR', dirname(__DIR__) . '/_vendor/');
-}
-
 require_once __DIR__ . '/bootstrap.php';
 
 \Ice\App::run();
diff --git a/bootstrap.php b/bootstrap.php
@@ -4,12 +4,16 @@
 
     if (!defined('MODULE_DIR')) {
         $moduleDir = php_sapi_name() == 'cli'
-            ? getcwd()
+            ? dirname(realpath($argv[0]))
             : dirname(dirname($_SERVER['SCRIPT_FILENAME']));
 
         define('MODULE_DIR', $moduleDir . '/');
     }
 
+    if (!defined('VENDOR_DIR')) {
+        define('VENDOR_DIR', dirname(MODULE_DIR) . '/_vendor/');
+    }
+
     if (!defined('ICE_DIR')) {
         define('ICE_DIR', __DIR__ . '/');
     }

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     }
   ],
   "config": {
-    "vendor-dir": "../_vendor/Ice"
+    "vendor-dir": "../_vendor"
   },
   "autoload": {
     "psr-4": {"Ice\\": "Source/Ice/"},
@@ -23,7 +23,8 @@
   "require": {
     "php": ">=5.4.0",
     "twig/twig": "1.*",
-    "smarty/smarty": "3.1.*"
+    "smarty/smarty": "3.1.*",
+    "michelf/php-markdown": "1.5.0"
   },
   "require-dev": {
     "firephp/firephp-core": "dev-master",