Merge pull request #14637 from phalcon/4.0.x

v4.0.0

.github/workflows/static-code-analysis.yml

@@ -0,0 +1,23 @@
+name: Static Code Analysis
+
+on:
+  push:
+    branches-ignore:
+      - 'appveyor*'
+    paths-ignore:
+      - '*.md'
+
+  pull_request:
+    branches:
+      - 'master'
+      - '4.0.x'
+
+jobs:
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2-beta
+        with:
+          fetch-depth: 1
+      - name: Run PHP_CodeSniffer
+        run: docker run --rm -v $(pwd):/data cytopia/phpcs --standard=./phpcs.xml

.travis.yml

@@ -1,11 +1,15 @@
 language: php
 php:
-  - '7.4snapshot'
+  - '7.4'
   - '7.3'
   - '7.2'
 
 dist: bionic
 
+branches:
+  except:
+    - /appveyor.*/
+
 git:
   depth: 5
   quiet: true
@@ -21,7 +25,6 @@ addons:
 matrix:
   fast_finish: true
   allow_failures:
-    - php: '7.4snapshot'
     - env: ZEPHIR_VERSION="development"
 
 cache:
@@ -39,7 +42,7 @@ services:
 env:
   global:
     - CC="gcc"
-    - ZEPHIR_VERSION="0.12.11"
+    - ZEPHIR_VERSION="0.12.15"
     - ZEPHIR_PARSER_VERSION="v1.3.2"
     - REPORT_COVERAGE=1
     - PATH="${HOME}/.composer/vendor/bin:${PATH}"
@@ -78,7 +81,6 @@ install:
 
 before_script:
   - cat .ci/travis.ini >> "$(phpenv prefix)/etc/conf.d/travis.ini"
-  - 'if [ "$(php-config --vernum)" -ge "70400" ]; then export REPORT_COVERAGE=0; fi'
   - .ci/genparsers.sh
   - .ci/build.sh
   - zephir --version
@@ -94,19 +96,8 @@ script:
 jobs:
   include:
     - stage: Development Zephir version
-      php: '7.3'
+      php: '7.4'
       env: ZEPHIR_VERSION="development"
-    - stage: Static Code Analysis
-      php: '7.2'
-      env:
-        - REPORT_COVERAGE=0
-      install:
-        - eval "composer install $DEFAULT_COMPOSER_FLAGS --ignore-platform-reqs"
-      before_script:
-        - phpenv config-rm xdebug.ini || true
-      script:
-        - vendor/bin/phpcs
-        - shellcheck .ci/*.sh
 
 after_failure:
   - echo "$($(phpenv which php) -v)"

BACKERS.md

@@ -7,44 +7,51 @@ You can join them in supporting Phalcon and Zephir development by visiting our p
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="middle">
+      <td align="center" valign="bottom">
         <a href="https://mctekk.com">
-          <img width="222px" height="37px" src="https://assets.phalcon.io/phalcon/images/backers/mctekk-149x34.svg" style="max-width:100%" alt="mctekk">
+          <img width="222px" height="32px" src="https://assets.phalcon.io/phalcon/images/backers/mctekk-149x34.svg" style="max-width:100%; vertical-align: bottom;" alt="mctekk">
         </a>
       </td>
-      <td align="center" valign="middle">
-        <a href="https://abits.com">
-          <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/abits-100x34.svg" style="max-width:100%;" alt="Abits">
+      <td align="center" valign="bottom">
+        <a href="https://www.cloudflare.com/">
+          <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/cloudflare.svg" style="max-width:100%;" alt="Cloudflare">
         </a>
       </td>
-      <td align="center" valign="middle">
-        <a href="https://algolia.com">
-          <img width="222px" height="38px" src="https://assets.phalcon.io/phalcon/images/backers/algolia-725x360.svg" style="max-width:100%;" alt="Algolia">
+      <td align="center" valign="bottom">
+        <a href="https://abits.com">
+          <img width="222px" height="36px" src="https://assets.phalcon.io/phalcon/images/backers/abits-100x34.svg" style="max-width:100%;" alt="Abits">
         </a>
       </td>
-      <td align="center" valign="middle">
-        <a href="https://netlify.com">
-          <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/netlify-147x40.svg" style="max-width:100%;" alt="Netlify">
+      <td align="center" valign="bottom">
+        <a href="https://algolia.com">
+          <img width="222px" height="34px" src="https://assets.phalcon.io/phalcon/images/backers/algolia-725x360.svg" style="max-width:100%;" alt="Algolia">
         </a>
       </td>
     </tr>
     <tr>
-      <td align="center" valign="middle">
+    <td align="center" valign="bottom">
+        <a href="https://netlify.com">
+          <img width="222px" height="36px" src="https://assets.phalcon.io/phalcon/images/backers/netlify-147x40.svg" style="max-width:100%;" alt="Netlify">
+        </a>
+     </td>
+      <td align="center" valign="bottom">
         <a href="https://odva.pro/">
           <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/o2.svg" style="max-width:100%;" alt="o2">
         </a>
       </td>
-    <td align="center" valign="middle">   
+    <td align="center" valign="bottom">   
       <a href="https://crowdin.com/">
         <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/crowdin.png" style="max-width:100%;" alt="Crowdin">
       </a>
     </td>
-     <td align="center" valign="middle">   
+     <td align="center" valign="bottom">   
       <a href="https://www.uptrends.com">
-        <img width="222px" height="42px" src="https://assets.phalcon.io/phalcon/images/backers/uptrends-200x60.svg" style="max-width:100%;" alt="Uptrends Web Application Monitoring">
+        <img width="222px" height="40px" src="https://assets.phalcon.io/phalcon/images/backers/uptrends-200x60.svg" style="max-width:100%;" alt="Uptrends Web Application Monitoring">
       </a>
     </td>
-      <td align="center" valign="middle">   
+    </tr>
+    <tr>
+    <td align="center" valign="bottom">   
       <a href="https://phalcon.link/fund">
        Support Us
       </a>

CHANGELOG-4.0.md

@@ -1,3 +1,58 @@
+# [4.0.0](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0) (2019-12-21)
+
+## Added
+- Added the ability to `Phalcon\Model::findFirstBy*` and `Phalcon\Model::findBy*` to process passed parameters (for `order` etc.) [#14573](https://github.com/phalcon/cphalcon/issues/14573)
+- Added `Phalcon\Helper\Str::decrement` to remove a number from a string or decrements that number if it already is defined [#14599](https://github.com/phalcon/cphalcon/issues/14599)
+- Added Exception storing and getting in the `Phalcon\Domain\Payload\*`  [#14575](https://github.com/phalcon/cphalcon/pull/14628)
+- Added options array in `Phalcon\Http\Cookie` in the constructor as well as `getOptions` and `setOptions` (ref #14627 - future work)  [#14575](https://github.com/phalcon/cphalcon/pull/14628)
+- Added options array in `Phalcon\Http\Response\Cookies` in the `set()` (ref #14627 - future work)  [#14575](https://github.com/phalcon/cphalcon/pull/14628)
+
+## Changed
+- Changed `Phalcon\Mvc\Router\Annotations` to use `converters` instead of `conversors` [#14532](https://github.com/phalcon/cphalcon/issues/14532)
+- Changed `Phalcon\Di::setRaw` to `Phalcon\Di::setService` to align more with the use of the method [#14555](https://github.com/phalcon/cphalcon/issues/14555)
+- Changed `Phalcon\Http\CookieInterface` to `Phalcon\Http\Cookie\CookieInterface` to avoid confusion [#14602](https://github.com/phalcon/cphalcon/issues/14602)
+- Changed `Phalcon\Storage\Adapter\*::getKeys` to accept an optional `$prefix` so as to filter the keys returned [#14575](https://github.com/phalcon/cphalcon/issues/14575)
+- Changed dates reported by the logger to use the `"c"` date mask for better sorting [#14575](https://github.com/phalcon/cphalcon/issues/14575)
+- Changed the `Phalcon\Storage\Adapter\*` constructors to require the `Phalcon\Storage\SerializerFactory` object [#14575](https://github.com/phalcon/cphalcon/pull/14628)
+
+## Fixed
+- Fixed `PhalconMvc\Model` to ignore internal setters if properties have the same name as the setter [#14538](https://github.com/phalcon/cphalcon/issues/14538)
+- Fixed `Phalcon\Logger\Formatter\Line` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547)
+- Fixed `Phalcon\Mvc\Model\MetaData\Apcu` and `Phalcon\Mvc\Model\MetaData\Redis` to allow setting the `prefix` and `lifetime` using the options or use the default. [#14549](https://github.com/phalcon/cphalcon/issues/14549)
+- Fixed `Phalcon\Storage\Adapter\AbstractAdapter`, `Phalcon\Storage\Adapter\AbstractInterface` getters to contain a default value 
+- Fixed `Phalcon\Storage\Adapter\Memory` initializing the array store correctly [#14551](https://github.com/phalcon/cphalcon/issues/14551)
+- Fixed `Phalcon\Storage\Adapter\Stream` to capture notice if the stream is not opened properly [#14551](https://github.com/phalcon/cphalcon/issues/14551)
+- Fixed `Phalcon\Security::getRandomBytes` to return `int` [#14551](https://github.com/phalcon/cphalcon/issues/14551)
+- Fixed `Phalcon\Security` to use `10` as the default work factor [#14551](https://github.com/phalcon/cphalcon/issues/14551)
+- Fixed `Phalcon\Helper\Arr::validateAny` and `Phalcon\Helper\Arr::validateAll`to use `null` as default for the callback method [#14551](https://github.com/phalcon/cphalcon/issues/14551)
+- Fixed `Phalcon\Escaper::escapeHtml` and `Phalcon\Escaper::escapeHtmlAttr` to allow `null` values [#14553](https://github.com/phalcon/cphalcon/issues/14553)
+- Fixed `Phalcon\Mvc\Model::cloneResultMap` to correctly recognize aliased fields and include them in the resultset [#14488](https://github.com/phalcon/cphalcon/issues/14488)
+- Fixed `Phalcon\Http\Request::getQuery`,`Phalcon\Http\Request::getPut`,`Phalcon\Http\Request::getPost` to treat `0` as non empty for `allowNoEmpty` [#14556](https://github.com/phalcon/cphalcon/issues/14556)
+- Fixed `Phalcon\Router::handle()` to use the `/` route on empty string [#14559](https://github.com/phalcon/cphalcon/issues/14559)
+- Fixed `Phalcon\Storage\Adapter\Libmemcached::getKeys` and `Phalcon\Storage\Adapter\Redis::getKeys` to return the keys that are prefixed only for that adapter [#14575](https://github.com/phalcon/cphalcon/issues/14575)
+- Fixed factories to return a new instance when calling `newInstance` and not a cached one from the internal mapper [#14584](https://github.com/phalcon/cphalcon/issues/14584)
+  - `Phalcon/Annotations/AnnotationsFactory`
+  - `Phalcon/Cache/AdapterFactory`
+  - `Phalcon/Config/ConfigFactory`
+  - `Phalcon/Db/Adapter/PdoFactory`
+  - `Phalcon/Image/ImageFactory`
+  - `Phalcon/Logger/AdapterFactory`
+  - `Phalcon/Paginator/PaginatorFactory`
+  - `Phalcon/Storage/AdapterFactory`
+  - `Phalcon/Storage/SerializerFactory`
+  - `Phalcon/Translate/InterpolatorFactory`
+  - `Phalcon/Translate/TranslateFactory`
+  - `Phalcon/Validation/ValidatorFactory`
+- Fixed `Phalcon\Mvc\Model::cloneResultMap` to cast integers when fields are `TYPE_BIGINTEGER`, `TYPE_INTEGER`, `TYPE_MEDIUMINTEGER`, `TYPE_SMALLINTEGER`, `TYPE_TINYINTEGER` [#14584](https://github.com/phalcon/cphalcon/issues/14584)
+- Fixed `Phalcon\Http\Response::setCookies` to use the correct interface [#14602](https://github.com/phalcon/cphalcon/issues/14602)
+- Fixed `Phalcon\Test\Unit\Image\Adapter\Gd::processBackground` to correctly calculate the alpha value [#14609](https://github.com/phalcon/cphalcon/issues/14609)
+- Fixed `Phalcon\Logger\Adapter\AdapterInterface` adding missing `inTransaction()` [#14575](https://github.com/phalcon/cphalcon/issues/14575)
+- Fixed `Phalcon\Mvc\Model::cloneResultsetMap` to remove fatal error when looking up the columnMap. [#14619](https://github.com/phalcon/cphalcon/issues/14619)
+- Fixed `Phalcon\Http\Request\FileInterface` by adding `getError` that was missing. [#14633](https://github.com/phalcon/cphalcon/issues/14633)
+
+## Removed
+- Removed ACL Firewall component from 4.0.x branch [#14630](https://github.com/phalcon/cphalcon/issues/14630)
+
 # [4.0.0-rc.r3](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-rc.3) (2019-11-16)
 ## Added
 - Added support for [PSR-13](https://www.php-fig.org/psr/psr-13/) links and evolvable links [#14507](https://github.com/phalcon/cphalcon/issues/14507)

CHANGELOG.md

@@ -1,3 +1,7 @@
+# [3.4.5](https://github.com/phalcon/cphalcon/releases/tag/v3.4.5) (2019-10-30)
+- Fixed segfault in `Phalcon\Mvc\Micro\LazyLoader::__call()` when the handler has a syntax error. [#12396](https://github.com/phalcon/cphalcon/issues/12396)
+- Fixed RuntimeException in `Phalcon\Db\Adapter\Pdo` Trying to call method upper on a non-object. [#14330](https://github.com/phalcon/cphalcon/issues/14330)
+- Fixed `Phalcon\Storage\Adapter\Redis::delete()` deprecated warning from php-redis [#14281](https://github.com/phalcon/cphalcon/issues/14281)
 
 # [3.4.4](https://github.com/phalcon/cphalcon/releases/tag/v3.4.4) (2019-06-30)
 - Generated Dialect Class referring to a PHP class can't be found [#13867](https://github.com/phalcon/cphalcon/pull/13867)