Merge pull request #15964 from ustmaestro/5.0.x

5.0.x

phalcon/Config/Adapter/Grouped.zep

@@ -19,7 +19,7 @@ use Phalcon\Factory\Exception as FactoryException;
 /**
  * Reads multiple files (or arrays) and merges them all together.
  *
- * See `Phalcon\Config\Factory::load` To load Config Adapter class using 'adapter' option.
+ * See `Phalcon\Config\ConfigFactory::load` To load Config Adapter class using 'adapter' option.
  *
  * ```php
  * use Phalcon\Config\Adapter\Grouped;

phalcon/Config/Config.zep

@@ -62,7 +62,7 @@ class Config extends Collection implements ConfigInterface
      * Merges a configuration into the current one
      *
      *```php
-     * $appConfig = new \Phalcon\Config(
+     * $appConfig = new \Phalcon\Config\Config(
      *     [
      *         "database" => [
      *             "host" => "localhost",

phalcon/Config/ConfigInterface.zep

@@ -15,7 +15,7 @@ use Phalcon\Support\Collection\CollectionInterface;
 /**
  * Phalcon\Config\ConfigInterface
  *
- * Interface for Phalcon\Config class
+ * Interface for Phalcon\Config\Config class
  */
 interface ConfigInterface extends CollectionInterface
 {

phalcon/Di/Injectable.zep

@@ -23,14 +23,14 @@ use Phalcon\Session\BagInterface;
  * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request
  * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response
  * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies
- * @property \Phalcon\Filter $filter
+ * @property \Phalcon\Filter\Filter $filter
  * @property \Phalcon\Flash\Direct $flash
  * @property \Phalcon\Flash\Session $flashSession
  * @property \Phalcon\Session\ManagerInterface $session
  * @property \Phalcon\Events\Manager|\Phalcon\Events\ManagerInterface $eventsManager
  * @property \Phalcon\Db\Adapter\AdapterInterface $db
- * @property \Phalcon\Security $security
- * @property \Phalcon\Crypt\Crypt|\Phalcon\Crypt\CryptInterface $crypt
+ * @property \Phalcon\Encryption\Security $security
+ * @property \Phalcon\Encryption\Crypt|\Phalcon\Encryption\Crypt\CryptInterface $crypt
  * @property \Phalcon\Tag $tag
  * @property \Phalcon\Html\Escaper|\Phalcon\Html\Escaper\EscaperInterface $escaper
  * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations

phalcon/Events/AbstractEventsAware.zep

@@ -13,10 +13,7 @@ namespace Phalcon\Events;
 use Phalcon\Events\ManagerInterface;
 
 /**
- * Trait EventsAwareTrait
- *
- * @package Phalcon\Events\Traits
- *
+ * This abstract class offers access to the events manager
  * @property ?ManagerInterface $eventsManager
  */
 abstract class AbstractEventsAware

phalcon/Events/Event.zep

@@ -11,8 +11,6 @@
 namespace Phalcon\Events;
 
 /**
- * Phalcon\Events\Event
- *
  * This class offers contextual information of a fired event in the
  * EventsManager
  *

phalcon/Events/EventInterface.zep

@@ -11,8 +11,6 @@
 namespace Phalcon\Events;
 
 /**
- * Phalcon\Events\EventInterface
- *
  * Interface for Phalcon\Events\Event class
  */
 interface EventInterface

phalcon/Events/EventsAwareInterface.zep

@@ -11,8 +11,6 @@
 namespace Phalcon\Events;
 
 /**
- * Phalcon\Events\EventsAwareInterface
- *
  * This interface must for those classes that accept an EventsManager and
  * dispatch events
  */

phalcon/Events/Exception.zep

@@ -11,11 +11,8 @@
 namespace Phalcon\Events;
 
 /**
- * Phalcon\Events\Exception
- *
  * Exceptions thrown in Phalcon\Events will use this class
  */
 class Exception extends \Exception
 {
-
 }

phalcon/Events/Manager.zep

@@ -14,8 +14,6 @@ use Closure;
 use SplPriorityQueue;
 
 /**
- * Phalcon\Events\Manager
- *
  * Phalcon Events Manager, offers an easy way to intercept and manipulate, if
  * needed, the normal flow of operation. With the EventsManager the developer
  * can create hooks or plugins that will offer monitoring of data, manipulation,

phalcon/Events/ManagerInterface.zep

@@ -11,8 +11,6 @@
 namespace Phalcon\Events;
 
 /**
- * Phalcon\Events\ManagerInterface
- *
  * Interface for Phalcon\Events managers.
  */
 interface ManagerInterface

phalcon/Forms/Element/AbstractElement.zep

@@ -82,7 +82,7 @@ abstract class AbstractElement implements ElementInterface
     protected value = null;
 
     /**
-     * Phalcon\Forms\Element constructor
+     * Constructor
      *
      * @param string name       Attribute name (value of 'name' attribute of HTML element)
      * @param array  attributes Additional HTML element attributes

phalcon/Forms/Element/Email.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag;
 
 /**
- * Phalcon\Forms\Element\Email
- *
  * Component INPUT[type=email] for forms
  */
 class Email extends AbstractElement

phalcon/Forms/Element/Hidden.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag;
 
 /**
- * Phalcon\Forms\Element\Hidden
- *
  * Component INPUT[type=hidden] for forms
  */
 class Hidden extends AbstractElement

phalcon/Forms/Element/Numeric.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag;
 
 /**
- * Phalcon\Forms\Element\Numeric
- *
  * Component INPUT[type=number] for forms
  */
 class Numeric extends AbstractElement

phalcon/Forms/Element/Password.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag;
 
 /**
- * Phalcon\Forms\Element\Password
- *
  * Component INPUT[type=password] for forms
  */
 class Password extends AbstractElement

phalcon/Forms/Element/Radio.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag;
 
 /**
- * Phalcon\Forms\Element\Radio
- *
  * Component INPUT[type=radio] for forms
  */
 class Radio extends AbstractElement

phalcon/Forms/Element/Select.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Tag\Select as SelectTag;
 
 /**
- * Phalcon\Forms\Element\Select
- *
  * Component SELECT (choice) for forms
  */
 class Select extends AbstractElement
@@ -25,7 +23,7 @@ class Select extends AbstractElement
     protected optionsValues = null;
 
     /**
-     * Phalcon\Forms\Element constructor
+     * Constructor
      *
      * @param object|array options
      * @param array        attributes

phalcon/Forms/Element/Text.zep

@@ -13,8 +13,6 @@ namespace Phalcon\Forms\Element;
 use Phalcon\Forms\Exception;
 
 /**
- * Phalcon\Forms\Element\Text
- *
  * Component INPUT[type=text] for forms
  */
 class Text extends AbstractElement

phalcon/Image/Adapter/AbstractAdapter.zep

@@ -14,8 +14,6 @@ use Phalcon\Image\Enum;
 use Phalcon\Image\Exception;
 
 /**
- * Phalcon\Image\Adapter
- *
  * All image adapters must use this class
  */
 abstract class AbstractAdapter implements AdapterInterface

phalcon/Image/Adapter/AdapterInterface.zep

@@ -12,6 +12,9 @@ namespace Phalcon\Image\Adapter;
 
 use Phalcon\Image\Enum;
 
+/**
+ * Interface for Phalcon\Image\Adapter classes
+ */
 interface AdapterInterface
 {
     public function background(string color, int opacity = 100) -> <AdapterInterface>;

phalcon/Image/Exception.zep

@@ -10,7 +10,9 @@
 
 namespace Phalcon\Image;
 
+/**
+ * Exceptions thrown in Phalcon\Image will use this class
+ */
 class Exception extends \Exception
 {
-
 }

phalcon/Image/ImageFactory.zep

@@ -13,13 +13,10 @@ namespace Phalcon\Image;
 use Phalcon\Factory\AbstractFactory;
 use Phalcon\Image\Adapter\AdapterInterface;
 
-/**
- * Phalcon\Image/ImageFactory
- */
 class ImageFactory extends AbstractFactory
 {
     /**
-     * TagFactory constructor.
+     * Constructor
      */
     public function __construct(array! services = [])
     {

phalcon/Paginator/PaginatorFactory.zep

@@ -46,7 +46,7 @@ class PaginatorFactory extends AbstractFactory
      * $paginator = (new PaginatorFactory())->load($options);
      *```
      *
-     * @param array|\Phalcon\Config = [
+     * @param array|\Phalcon\Config\Config config = [
      *     'adapter' => 'queryBuilder',
      *     'limit' => 20,
      *     'page' => 1,

phalcon/Session/Bag.zep

@@ -33,7 +33,7 @@ use Phalcon\Support\Collection;
  * @property string           $name
  * @property ManagerInterface $session;
  */
-class Bag extends Collection implements InjectionAwareInterface
+class Bag extends Collection implements BagInterface, InjectionAwareInterface
 {
     /**
      * @var DiInterface|null

phalcon/Session/BagInterface.zep

@@ -0,0 +1,38 @@
+/**
+ * This file is part of the Phalcon.
+ *
+ * (c) Phalcon Team <team@phalcon.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Phalcon\Session;
+
+/**
+ * Phalcon\Session\BagInterface
+ *
+ * Interface for Phalcon\Session\Bag
+ */
+interface BagInterface
+{
+    public function __get(string element) -> var;
+
+    public function __isset(string element) -> bool;
+
+    public function __set(string element, value) -> void;
+
+    public function __unset(string element) -> void;
+
+    public function init(array data = []) -> void;
+
+    public function get(string element, var defaultValue = null, string! cast = null) -> var;
+
+    public function set(string element, var value) -> void;
+
+    public function has(string element) -> bool;
+
+    public function remove(string element) -> void;
+
+    public function clear() -> void;
+}