Merge pull request #670 from phalcon/2.0.x

2.0.12

Author: sergeyklay

ide/stubs/Phalcon/Crypt.php

@@ -105,22 +105,24 @@ public function getKey() {}
     /**
      * Pads texts before encryption
      *
-     * @see http://www.di-mgt.com.au/cryptopad.html
+     * @link http://www.di-mgt.com.au/cryptopad.html
      * @param string $text 
      * @param string $mode 
      * @param int $blockSize 
      * @param int $paddingType 
+     * @return string 
      */
     protected function _cryptPadText($text, $mode, $blockSize, $paddingType) {}
 
     /**
-     * Removes padding @a padding_type from @a text
-     * If the function detects that the text was not padded, it will return it unmodified
+     * Removes $paddingType padding from text
+     * If the method detects that the text was not padded, it will return it unmodified
      *
      * @param string $text Message to be unpadded
      * @param string $mode Encryption mode; unpadding is applied only in CBC or ECB mode
      * @param int $blockSize Cipher block size
      * @param int $paddingType Padding scheme
+     * @return string 
      */
     protected function _cryptUnpadText($text, $mode, $blockSize, $paddingType) {}
 

ide/stubs/Phalcon/Flash.php

@@ -84,7 +84,7 @@ public function notice($message) {}
      * $flash->success('The process was finished successfully');
      * </code>
      *
-     * @param string $message 
+     * @param mixed $message 
      * @return string 
      */
     public function success($message) {}

ide/stubs/Phalcon/mvc/Model.php

@@ -305,7 +305,7 @@ public function assign($data, $dataColumnMap = null, $whiteList = null) {}
      * ));
      * </code>
      *
-     * @param \Phalcon\Mvc\ModelInterface|Phalcon\Mvc\Model\Row $base 
+     * @param \Phalcon\Mvc\ModelInterface|\Phalcon\Mvc\Model\Row $base 
      * @param array $data 
      * @param array $columnMap 
      * @param int $dirtyState 
@@ -605,7 +605,7 @@ public function validationHasFailed() {}
      * </code>
      *
      * @param mixed $filter 
-     * @return MessageInterface[] 
+     * @return \Phalcon\Mvc\Model\Message\MessageInterface[] 
      */
     public function getMessages($filter = null) {}
 

ide/stubs/Phalcon/mvc/view/engine/Volt.php

@@ -97,7 +97,8 @@ public function sort($value) {}
      *
      * @param string $name 
      * @param array $arguments 
+     * @return mixed 
      */
-    public function callMacro($name, $arguments) {}
+    public function callMacro($name, $arguments = array()) {}
 
 }

scripts/Phalcon/Builder/Module.php

@@ -19,6 +19,8 @@
 
 namespace Phalcon\Builder;
 
+use SplFileInfo;
+
 /**
  * Module Builder
  *
@@ -88,7 +90,7 @@ public function build()
             $modulesDir = $this->path->getRootPath($modulesDir);
         }
 
-        $this->options->offsetSet('modulesDir', realpath($modulesDir));
+        $this->options->offsetSet('modulesDir', $modulesDir);
         $this->options->offsetSet('templatePath', realpath($templatePath));
         $this->options->offsetSet('projectPath', $this->path->getRootPath());
 
@@ -122,10 +124,39 @@ public function buildDirectories()
             ));
         }
 
-        mkdir($modulesDir . DIRECTORY_SEPARATOR . $moduleName, 0777, true);
+        $modulesPath = new SplFileInfo($modulesDir);
+        $modulePath  = $modulesDir. DIRECTORY_SEPARATOR . $moduleName;
+
+        try {
+            if ($modulesPath->isFile() && !$modulesPath->isDir()) {
+                throw new BuilderException(
+                    sprintf(
+                        "Builder expects a directory for 'modulesDir'. But %s is a file.",
+                        $modulesPath->getPathname()
+                    )
+                );
+            } elseif ($modulesPath->isReadable() && !mkdir($modulePath, 0777, true)) {
+                throw new BuilderException("Unable to create module directory. Check permissions.");
+            }
+
+            foreach ($this->moduleDirectories as $dir) {
+                $path = $modulePath . DIRECTORY_SEPARATOR . $dir;
+                if (!mkdir($path, 0777, true)) {
+                    throw new BuilderException(
+                        sprintf(
+                            "Unable to create %s directory. Check permissions.",
+                            $path
+                        )
+                    );
+                }
+            }
 
-        foreach ($this->moduleDirectories as $dir) {
-            mkdir($modulesDir . DIRECTORY_SEPARATOR . $moduleName . DIRECTORY_SEPARATOR . $dir, 0777, true);
+        } catch (\Exception $e) {
+            throw new BuilderException(
+                $e->getMessage(),
+                $e->getCode(),
+                ($e instanceof BuilderException ? null : $e)
+            );
         }
 
         return $this;

scripts/Phalcon/Utils.php

@@ -27,6 +27,14 @@ class Utils
 {
     const DB_ADAPTER_POSTGRESQL = 'Postgresql';
 
+    const DB_ADAPTER_SQLITE = 'Sqlite';
+
+    /**
+     * Converts the underscore_notation to the UpperCamelCase
+     *
+     * @param string $string
+     * @return string
+     */
     public static function camelize($string)
     {
         $stringParts = explode('_', $string);
@@ -35,6 +43,17 @@ public static function camelize($string)
         return implode('', $stringParts);
     }
 
+    /**
+     * Converts the underscore_notation to the lowerCamelCase
+     *
+     * @param string $string
+     * @return string
+     */
+    public static function lowerCamelize($string)
+    {
+        return lcfirst(self::camelize($string));
+    }
+
     /**
      * Resolves the DB Schema
      *
@@ -48,7 +67,13 @@ public static function resolveDbSchema(Config $config)
         }
 
         if (self::DB_ADAPTER_POSTGRESQL == $config->get('adapter')) {
-            return  'public';
+            return 'public';
+        }
+
+        if (self::DB_ADAPTER_SQLITE == $config->get('adapter')) {
+            // SQLite only supports the current database, unless one is
+            // attached. This is not the case, so don't return a schema.
+            return null;
         }
 
         if ($config->offsetExists('dbname')) {