Merge pull request #39 from ruudboon/4.0.4

4.0.4
phalcon · Feb 16, 2020 · f3ef562 · f3ef562
2 parents 77e9609 + c33fc6f
commit f3ef562
Show file tree

Hide file tree

Showing 37 changed files with 298 additions and 322 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,10 +1,12 @@
 name: main
-on: push
+on:
+    pull_request:
+    push:
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-      matrix: 
+      matrix:
         php-versions: [7.2, 7.3, 7.4]
     steps:
     - uses: actions/checkout@v2
@@ -21,7 +23,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} 
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
         restore-keys: ${{ runner.os }}-composer-
     - name: composer install
       run: composer install --no-interaction --no-ansi --no-progress --no-suggest

diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
         "Eclipse",
         "autocomplete"
     ],
-    "homepage": "https://phalconphp.com",
+    "homepage": "https://phalconphp.io",
     "license": "BSD-3-Clause",
     "authors": [
         {
             "name": "Phalcon Team",
-            "email": "team@phalconphp.com",
-            "homepage": "https://phalconphp.com/en/team"
+            "email": "team@phalconphp.io",
+            "homepage": "https://phalconphp.io/en/team"
         },
         {
             "name": "Contributors",
@@ -29,7 +29,7 @@
     "support": {
         "issues": "https://github.com/phalcon/ide-stubs/issues",
         "source": "https://github.com/phalcon/ide-stubs",
-        "forum": "https://forum.phalconphp.com/"
+        "forum": "https://forum.phalconphp.io/"
     },
     "require": {
         "php": ">=7.2.0"

diff --git a/src/Phalcon/Assets/Asset/Js.php b/src/Phalcon/Assets/Asset/Js.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Assets\Asset;
 
 /**
- * Represents Javascript assets
+ * Represents JavaScript assets
  */
 class Js extends \Phalcon\Assets\Asset
 {

diff --git a/src/Phalcon/Assets/Collection.php b/src/Phalcon/Assets/Collection.php
@@ -64,7 +64,7 @@ class Collection implements \Countable, \Iterator
     /**
      * @var int
      */
-    protected $position;
+    protected $position = 0;
 
     /**
      * @var string
@@ -270,7 +270,7 @@ public function addInlineCss(string $content, bool $filter = true, $attributes =
     }
 
     /**
-     * Adds an inline javascript to the collection
+     * Adds an inline JavaScript to the collection
      *
      * @param string $content
      * @param bool $filter
@@ -282,7 +282,7 @@ public function addInlineJs(string $content, bool $filter = true, $attributes =
     }
 
     /**
-     * Adds a javascript asset to the collection
+     * Adds a JavaScript asset to the collection
      *
      * @param array $attributes
      * @param string $path

diff --git a/src/Phalcon/Assets/Filters/Cssmin.php b/src/Phalcon/Assets/Filters/Cssmin.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Assets\Filters;
 
 /**
- * Minify the css - removes comments removes newlines and line feeds keeping
+ * Minify the CSS - removes comments removes newlines and line feeds keeping
  * removes last semicolon from last property
  */
 class Cssmin implements \Phalcon\Assets\FilterInterface

diff --git a/src/Phalcon/Assets/Manager.php b/src/Phalcon/Assets/Manager.php
@@ -14,7 +14,7 @@
 /**
  * Phalcon\Assets\Manager
  *
- * Manages collections of CSS/Javascript assets
+ * Manages collections of CSS/JavaScript assets
  */
 class Manager extends AbstractInjectionAware
 {
@@ -78,7 +78,7 @@ public function addAssetByType(string $type, Asset $asset): Manager
     }
 
     /**
-     * Adds a Css asset to the 'css' collection
+     * Adds a CSS asset to the 'css' collection
      *
      * ```php
      * $assets->addCss("css/bootstrap.css");
@@ -119,7 +119,7 @@ public function addInlineCodeByType(string $type, Inline $code): Manager
     }
 
     /**
-     * Adds an inline Css to the 'css' collection
+     * Adds an inline CSS to the 'css' collection
      *
      * @param string $content
      * @param mixed $filter
@@ -131,7 +131,7 @@ public function addInlineCss(string $content, $filter = true, $attributes = null
     }
 
     /**
-     * Adds an inline javascript to the 'js' collection
+     * Adds an inline JavaScript to the 'js' collection
      *
      * @param string $content
      * @param mixed $filter
@@ -143,7 +143,7 @@ public function addInlineJs(string $content, $filter = true, $attributes = null)
     }
 
     /**
-     * Adds a javascript asset to the 'js' collection
+     * Adds a JavaScript asset to the 'js' collection
      *
      * ```php
      * $assets->addJs("scripts/jquery.js");

diff --git a/src/Phalcon/Db/Adapter/AbstractAdapter.php b/src/Phalcon/Db/Adapter/AbstractAdapter.php
@@ -421,7 +421,7 @@ public function fetchAll(string $sqlQuery, int $fetchMode = Enum::FETCH_ASSOC, $
      *
      * // Getting name of last edited robot
      * $robot = $connection->fetchColumn(
-     *     "SELECT id, name FROM robots order by modified desc",
+     *     "SELECT id, name FROM robots ORDER BY modified DESC",
      *     1
      * );
      * print_r($robot);

diff --git a/src/Phalcon/Db/Adapter/AdapterInterface.php b/src/Phalcon/Db/Adapter/AdapterInterface.php
@@ -267,12 +267,12 @@ public function fetchAll(string $sqlQuery, int $fetchMode = 2, $placeholders = n
      *
      * ```php
      * // Getting count of robots
-     * $robotsCount = $connection->fetchColumn("SELECT count() FROM robots");
+     * $robotsCount = $connection->fetchColumn("SELECT COUNT() FROM robots");
      * print_r($robotsCount);
      *
      * // Getting name of last edited robot
      * $robot = $connection->fetchColumn(
-     *     "SELECT id, name FROM robots order by modified desc",
+     *     "SELECT id, name FROM robots ORDER BY modified DESC",
      *     1
      * );
      * print_r($robot);

diff --git a/src/Phalcon/Db/Adapter/Pdo/Mysql.php b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Db\Adapter\Pdo;
 
 /**
- * Specific functions for the Mysql database system
+ * Specific functions for the MySQL database system
  *
  * ```php
  * use Phalcon\Db\Adapter\Pdo\Mysql;

diff --git a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
@@ -12,7 +12,7 @@
 use Phalcon\Db\RawValue;
 
 /**
- * Specific functions for the Postgresql database system
+ * Specific functions for the PostgreSQL database system
  *
  * ```php
  * use Phalcon\Db\Adapter\Pdo\Postgresql;

diff --git a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
@@ -12,7 +12,7 @@
 use Phalcon\Db\RawValue;
 
 /**
- * Specific functions for the Sqlite database system
+ * Specific functions for the SQLite database system
  *
  * ```php
  * use Phalcon\Db\Adapter\Pdo\Sqlite;

diff --git a/src/Phalcon/Db/Column.php b/src/Phalcon/Db/Column.php
@@ -250,9 +250,11 @@ class Column implements \Phalcon\Db\ColumnInterface
     /**
      * Column not nullable?
      *
+     * Default SQL definition is NOT NULL.
+     *
      * @var bool
      */
-    protected $notNull = false;
+    protected $notNull = true;
 
     /**
      * Column is part of the primary key?

diff --git a/src/Phalcon/Debug.php b/src/Phalcon/Debug.php
@@ -74,7 +74,7 @@ public function debugVar($varz, string $key = null): Debug
     }
 
     /**
-     * Returns the css sources
+     * Returns the CSS sources
      *
      * @return string
      */
@@ -83,7 +83,7 @@ public function getCssSources(): string
     }
 
     /**
-     * Returns the javascript sources
+     * Returns the JavaScript sources
      *
      * @return string
      */

diff --git a/src/Phalcon/Escaper.php b/src/Phalcon/Escaper.php
@@ -69,7 +69,7 @@ public function escapeCss(string $css): string
     }
 
     /**
-     * Escape javascript strings by replacing non-alphanumeric chars by their
+     * Escape JavaScript strings by replacing non-alphanumeric chars by their
      * hexadecimal escaped representation
      *
      * @param string $js

diff --git a/src/Phalcon/Flash/AbstractFlash.php b/src/Phalcon/Flash/AbstractFlash.php
@@ -143,7 +143,7 @@ public function notice(string $message): string
     }
 
     /**
-     * Set the autoescape mode in generated html
+     * Set the autoescape mode in generated HTML
      *
      * @param bool $autoescape
      * @return FlashInterface

diff --git a/src/Phalcon/Forms/Element/Check.php b/src/Phalcon/Forms/Element/Check.php
@@ -18,7 +18,7 @@ class Check extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Email.php b/src/Phalcon/Forms/Element/Email.php
@@ -18,7 +18,7 @@ class Email extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/File.php b/src/Phalcon/Forms/Element/File.php
@@ -16,7 +16,7 @@ class File extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Hidden.php b/src/Phalcon/Forms/Element/Hidden.php
@@ -18,7 +18,7 @@ class Hidden extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Numeric.php b/src/Phalcon/Forms/Element/Numeric.php
@@ -18,7 +18,7 @@ class Numeric extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Password.php b/src/Phalcon/Forms/Element/Password.php
@@ -18,7 +18,7 @@ class Password extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Radio.php b/src/Phalcon/Forms/Element/Radio.php
@@ -18,7 +18,7 @@ class Radio extends \Phalcon\Forms\Element\AbstractElement
 {
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Forms/Element/Select.php b/src/Phalcon/Forms/Element/Select.php
@@ -51,7 +51,7 @@ public function getOptions()
     }
 
     /**
-     * Renders the element widget returning html
+     * Renders the element widget returning HTML
      *
      * @param array $attributes
      * @return string

diff --git a/src/Phalcon/Html/Helper/AbstractHelper.php b/src/Phalcon/Html/Helper/AbstractHelper.php
@@ -14,7 +14,7 @@
 /**
  * Phalcon\Html\Helper\AbstractHelper
  *
- * Abstract class for all html helpers
+ * Abstract class for all HTML helpers
  */
 abstract class AbstractHelper
 {

diff --git a/src/Phalcon/Mvc/Model.php b/src/Phalcon/Mvc/Model.php
@@ -663,7 +663,7 @@ public function dump(): array
      * $transaction2->rollback();
      * ```
      *
-     * @param arrray|string|int|null $parameters = [
+     * @param array|string|int|null $parameters = [
      *     'conditions' => ''
      *     'columns' => '',
      *     'bind' => [],
@@ -752,7 +752,7 @@ public static function find($parameters = null): ResultsetInterface
      * );
      * ```
      *
-     * @param arrray|string|int|null $parameters = [
+     * @param array|string|int|null $parameters = [
      *     'conditions' => ''
      *     'columns' => '',
      *     'bind' => [],