Merge pull request #24 from ruudboon/4.x

Updated stubs to beta.2
phalcon · Aug 19, 2019 · 5c1c775 · 5c1c775
2 parents 779bbb3 + 0830ac3
commit 5c1c775
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 27 deletions.
diff --git a/src/Phalcon/Collection.php b/src/Phalcon/Collection.php
@@ -137,9 +137,8 @@ public function offsetGet($element) {}
 
     /**
      * Offset to set
-     * See [offsetSet](
+     * See [offsetSet](https://php.net/manual/en/arrayaccess.offsetset.php)
      *
-     * @link )https://php.net/manual/en/arrayaccess.offsetset.php)
      * @param mixed $element
      * @param mixed $value
      */

diff --git a/src/Phalcon/application/AbstractApplication.php b/src/Phalcon/application/AbstractApplication.php
@@ -89,24 +89,24 @@ abstract public function handle();
      *
      * @param array $modules
      * @param bool $merge
-     * @return Application
+     * @return AbstractApplication
      */
-    public function registerModules(array $modules, bool $merge = false): Application {}
+    public function registerModules(array $modules, bool $merge = false): AbstractApplication {}
 
     /**
      * Sets the module name to be used if the router doesn't return a valid module
      *
      * @param string $defaultModule
-     * @return Application
+     * @return AbstractApplication
      */
-    public function setDefaultModule(string $defaultModule): Application {}
+    public function setDefaultModule(string $defaultModule): AbstractApplication {}
 
     /**
      * Sets the events manager
      *
      * @param \Phalcon\Events\ManagerInterface $eventsManager
-     * @return Application
+     * @return AbstractApplication
      */
-    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): Application {}
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): AbstractApplication {}
 
 }
diff --git a/src/Phalcon/db/adapter/AbstractAdapter.php b/src/Phalcon/db/adapter/AbstractAdapter.php
@@ -480,7 +480,7 @@ public function getDescriptor(): array {}
     /**
      * Returns internal dialect instance
      *
-     * @return DialectInterface
+     * @return \Phalcon\Db\DialectInterface
      */
     public function getDialect(): DialectInterface {}
 
@@ -651,9 +651,9 @@ public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager
     /**
      * Sets the dialect used to produce the SQL
      *
-     * @param DialectInterface $dialect
+     * @param \Phalcon\Db\DialectInterface $dialect
      */
-    public function setDialect(DialectInterface $dialect) {}
+    public function setDialect(\Phalcon\Db\DialectInterface $dialect) {}
 
     /**
      * Set if nested transactions should use savepoints

diff --git a/src/Phalcon/db/adapter/AdapterInterface.php b/src/Phalcon/db/adapter/AdapterInterface.php
@@ -326,7 +326,7 @@ public function getDescriptor(): array;
     /**
      * Returns internal dialect instance
      *
-     * @return DialectInterface
+     * @return \Phalcon\Db\DialectInterface
      */
     public function getDialect(): DialectInterface;
 
@@ -494,7 +494,7 @@ public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\
      * @param string $sqlStatement
      * @param mixed $placeholders
      * @param mixed $dataTypes
-     * @return bool|ResultInterface
+     * @return bool|\Phalcon\Db\ResultInterface
      */
     public function query(string $sqlStatement, $placeholders = null, $dataTypes = null);
 

diff --git a/src/Phalcon/db/result/Pdo.php b/src/Phalcon/db/result/Pdo.php
@@ -53,13 +53,13 @@ class Pdo implements \Phalcon\Db\ResultInterface
     /**
      * Phalcon\Db\Result\Pdo constructor
      *
-     * @param Db\AdapterInterface $connection
+     * @param \Phalcon\Db\Adapter\AdapterInterface $connection
      * @param \PDOStatement $result
      * @param mixed $sqlStatement
      * @param mixed $bindParams
      * @param mixed $bindTypes
      */
-    public function __construct(Db\AdapterInterface $connection, \PDOStatement $result, $sqlStatement = null, $bindParams = null, $bindTypes = null) {}
+    public function __construct(\Phalcon\Db\Adapter\AdapterInterface $connection, \PDOStatement $result, $sqlStatement = null, $bindParams = null, $bindTypes = null) {}
 
     /**
      * Moves internal resultset cursor to another position letting us to fetch a

diff --git a/src/Phalcon/forms/element/Select.php b/src/Phalcon/forms/element/Select.php
@@ -25,7 +25,7 @@ public function __construct(string $name, $options = null, $attributes = null) {
     /**
      * Adds an option to the current options
      *
-     * @param array $option
+     * @param array|string $option
      * @return Element
      */
     public function addOption($option): Element {}

diff --git a/src/Phalcon/html/Tag.php b/src/Phalcon/html/Tag.php
@@ -1171,12 +1171,12 @@ private function renderSelectArray(array $options, $value, string $closeOption):
     /**
      * Generates the option values from a resultset
      *
-     * @param ResulsetInterface $resultset
+     * @param \Phalcon\Mvc\Model\ResultsetInterface $resultset
      * @param mixed $using
      * @param mixed $value
      * @param string $closeOption
      * @return string
      */
-    private function renderSelectResultset(ResulsetInterface $resultset, $using, $value, string $closeOption): string {}
+    private function renderSelectResultset(\Phalcon\Mvc\Model\ResultsetInterface $resultset, $using, $value, string $closeOption): string {}
 
 }
diff --git a/src/Phalcon/security/Random.php b/src/Phalcon/security/Random.php
@@ -10,13 +10,6 @@
  * Provides secure random number generator which is suitable for generating
  * session key in HTTP cookies, etc.
  *
- * It supports following secure random number generators:
- *
- * - random_bytes (PHP 7)
- * - libsodium
- * - openssl, libressl
- * - /dev/urandom
- *
  * `Phalcon\Security\Random` could be mainly useful for:
  *
  * - Key generation (e.g. generation of complicated keys)

diff --git a/src/Phalcon/tag/Select.php b/src/Phalcon/tag/Select.php
@@ -33,12 +33,12 @@ private static function optionsFromArray(array $data, $value, string $closeOptio
     /**
      * Generate the OPTION tags based on a resultset
      *
-     * @param \Phalcon\Mvc\Model\ResulsetInterface $resultset
+     * @param \Phalcon\Mvc\Model\ResultsetInterface $resultset
      * @param array $using
      * @param mixed $value
      * @param string $closeOption
      * @return string
      */
-    private static function optionsFromResultset(\Phalcon\Mvc\Model\ResulsetInterface $resultset, $using, $value, string $closeOption): string {}
+    private static function optionsFromResultset(\Phalcon\Mvc\Model\ResultsetInterface $resultset, $using, $value, string $closeOption): string {}
 
 }