Merge pull request #2 from phalcon/2.1.x

Merge from base 2.1.x

ide/stubs/Phalcon/Escaper.php

@@ -25,6 +25,9 @@ class Escaper implements \Phalcon\EscaperInterface
     protected $_htmlQuoteType = 3;
 
 
+    protected $_doubleEncode = true;
+
+
     /**
      * Sets the encoding to be used by the escaper
      * <code>
@@ -52,6 +55,16 @@ public function getEncoding() {}
      */
     public function setHtmlQuoteType($quoteType) {}
 
+    /**
+     * Sets the double_encode to be used by the escaper
+     * <code>
+     * $escaper->setDoubleEncode(false);
+     * </code>
+     *
+     * @param bool $doubleEncode 
+     */
+    public function setDoubleEncode($doubleEncode) {}
+
     /**
      * Detect the character encoding of a string to be handled by an encoder
      * Special-handling for chr(172) and chr(128) to chr(159) which fail to be detected by mb_detect_encoding()

ide/stubs/Phalcon/Flash.php

@@ -28,31 +28,31 @@ abstract class Flash
     /**
      * Phalcon\Flash constructor
      *
-     * @param mixed $cssClasses
+     * @param mixed $cssClasses 
      */
     public function __construct($cssClasses = null) {}
 
     /**
      * Set whether the output must be implicitly flushed to the output or returned as string
      *
-     * @param bool $implicitFlush
-     * @return \Phalcon\FlashInterface
+     * @param bool $implicitFlush 
+     * @return \Phalcon\FlashInterface 
      */
     public function setImplicitFlush($implicitFlush) {}
 
     /**
      * Set if the output must be implicitly formatted with HTML
      *
-     * @param bool $automaticHtml
-     * @return \Phalcon\FlashInterface
+     * @param bool $automaticHtml 
+     * @return \Phalcon\FlashInterface 
      */
     public function setAutomaticHtml($automaticHtml) {}
 
     /**
      * Set an array with CSS classes to format the messages
      *
-     * @param array $cssClasses
-     * @return \Phalcon\FlashInterface
+     * @param array $cssClasses 
+     * @return \Phalcon\FlashInterface 
      */
     public function setCssClasses($cssClasses) {}
 
@@ -62,8 +62,8 @@ public function setCssClasses($cssClasses) {}
      * $flash->error('This is an error');
      * </code>
      *
-     * @param mixed $message
-     * @return string
+     * @param mixed $message 
+     * @return string 
      */
     public function error($message) {}
 
@@ -73,8 +73,8 @@ public function error($message) {}
      * $flash->notice('This is an information');
      * </code>
      *
-     * @param mixed $message
-     * @return string
+     * @param mixed $message 
+     * @return string 
      */
     public function notice($message) {}
 
@@ -84,8 +84,8 @@ public function notice($message) {}
      * $flash->success('The process was finished successfully');
      * </code>
      *
-     * @param mixed $message
-     * @return string
+     * @param mixed $message 
+     * @return string 
      */
     public function success($message) {}
 
@@ -95,8 +95,8 @@ public function success($message) {}
      * $flash->warning('Hey, this is important');
      * </code>
      *
-     * @param mixed $message
-     * @return string
+     * @param mixed $message 
+     * @return string 
      */
     public function warning($message) {}
 
@@ -106,9 +106,9 @@ public function warning($message) {}
      * $flash->outputMessage('error', message);
      * </code>
      *
-     * @param string $type
-     * @param string|array $message
-     * @return string|void
+     * @param string $type 
+     * @param string|array $message 
+     * @return string|void 
      */
     public function outputMessage($type, $message) {}
 

ide/stubs/Phalcon/Loader.php

@@ -44,6 +44,9 @@ class Loader implements \Phalcon\Events\EventsAwareInterface
     protected $_directories = null;
 
 
+    protected $_files = null;
+
+
     protected $_registered = false;
 
 
@@ -114,6 +117,23 @@ public function registerDirs($directories, $merge = false) {}
      */
     public function getDirs() {}
 
+    /**
+     * Registers files that are "non-classes" hence need a "require". This is very useful for including files that only
+     * have functions
+     *
+     * @param array $files 
+     * @param bool $merge 
+     * @return Loader 
+     */
+    public function registerFiles($files, $merge = false) {}
+
+    /**
+     * Returns the files currently registered in the autoloader
+     *
+     * @return array 
+     */
+    public function getFiles() {}
+
     /**
      * Register classes and their locations
      *
@@ -144,6 +164,11 @@ public function register() {}
      */
     public function unregister() {}
 
+    /**
+     * Checks if a file exists and then adds the file by doing virtual require
+     */
+    public function loadFiles() {}
+
     /**
      * Autoloads the registered classes
      *

ide/stubs/Phalcon/Security.php

@@ -107,7 +107,7 @@ public function getDI() {}
      * Sets a number of bytes to be generated by the openssl pseudo random generator
      *
      * @param long $randomBytes 
-     * @return \Phalcon\Security 
+     * @return Security 
      */
     public function setRandomBytes($randomBytes) {}
 
@@ -213,7 +213,7 @@ public function computeHmac($data, $key, $algo, $raw = false) {}
      * Sets the default hash
      *
      * @param int $defaultHash 
-     * @return \Phalcon\Security 
+     * @return Security 
      */
     public function setDefaultHash($defaultHash) {}
 
@@ -224,4 +224,25 @@ public function setDefaultHash($defaultHash) {}
      */
     public function getDefaultHash() {}
 
+    /**
+     * Testing for LibreSSL
+     *
+     * @return bool 
+     */
+    public function hasLibreSsl() {}
+
+    /**
+     * Getting OpenSSL or LibreSSL version
+     * Parse OPENSSL_VERSION_TEXT because OPENSSL_VERSION_NUMBER is no use for LibreSSL.
+     *
+     * @link https://bugs.php.net/bug.php?id=71143
+     * <code>
+     * if ($security->getSslVersionNumber() >= 20105) {
+     * // ...
+     * }
+     * </code>
+     * @return int 
+     */
+    public function getSslVersionNumber() {}
+
 }