Merge pull request #87 from lisi4ok/master

changes for version 5.2.1
phalcon · Mar 8, 2023 · cf434be · cf434be
2 parents 80709ec + 8a215ca
commit cf434be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ["7.4", "8.0", "8.1"]
+        php-versions: ["7.4", "8.0", "8.1", "8.2"]
 
     steps:
     - uses: actions/checkout@v3
@@ -23,7 +23,7 @@ jobs:
 
     - name: Get Composer Cache Directory
       id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache dependencies
       uses: actions/cache@v3

diff --git a/src/Db/AbstractDb.php b/src/Db/AbstractDb.php
@@ -9,7 +9,7 @@
  */
 namespace Phalcon\Db;
 
-use PDO as Pdo;
+use \PDO as Pdo;
 
 /**
  * Phalcon\Db and its related classes provide a simple SQL database interface

diff --git a/src/Di/Injectable.php b/src/Di/Injectable.php
@@ -37,7 +37,7 @@
  * @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata
  * @property \Phalcon\Mvc\Model\Transaction\Manager|\Phalcon\Mvc\Model\Transaction\ManagerInterface $transactionManager
  * @property \Phalcon\Assets\Manager $assets
- * @property \Phalcon\Di\Di|\Phalcon\Di\DiInterface $di
+ * @property \Phalcon\Di\Di|\Phalcon\Di\Di\DiInterface $di
  * @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent
  * @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view
  */

diff --git a/src/Mvc/Micro.php b/src/Mvc/Micro.php
@@ -137,7 +137,7 @@ public function __construct(\Phalcon\Di\DiInterface $container = null)
     /**
      * Appends an 'after' middleware to be called after execute the route
      *
-     * @param callable $handler
+     * @param callable|MiddlewareInterface $handler
      * @return Micro
      */
     public function after($handler): Micro
@@ -157,7 +157,7 @@ public function afterBinding($handler): Micro
     /**
      * Appends a before middleware to be called before execute the route
      *
-     * @param callable $handler
+     * @param callable|MiddlewareInterface $handler
      * @return Micro
      */
     public function before($handler): Micro

diff --git a/src/Storage/Adapter/Apcu.php b/src/Storage/Adapter/Apcu.php
@@ -9,7 +9,7 @@
  */
 namespace Phalcon\Storage\Adapter;
 
-use APCuIterator;
+use APCUIterator;
 use DateInterval;
 use Exception;
 use Phalcon\Storage\SerializerFactory;
@@ -195,7 +195,7 @@ protected function phpApcuFetch($key, $success = null)
 
     /**
      * @param string $pattern
-     * @return bool|APCuIterator
+     * @return bool|APCUIterator
      */
     protected function phpApcuIterator(string $pattern)
     {