Skip to content

Commit

Permalink
Sync with master (phalcon#912)
Browse files Browse the repository at this point in the history
* phalcon#875: Swiftmailer and Twig are no longer required

Moved Swiftmailer and Twig to the Composer "suggest"

* Add new validator: ArrayInclusionIn

* Fix unit test

* Fix unit test - last test method

* Support for the TIMESTAMPDIFF

* Add options to ReCaptcha Validator to make it work with v3.

* Fixed PHPCS issues

* fix(oracle): Added missing interface method sharedLock

* Moved opening brace to newline as suggested

Co-Authored-By: lubber-de <c64@lubber.de>

* Translate Adapter for multi-column csv (phalcon#890)

* [Translate] add an intl MessageFormatter interpolator (phalcon#892)

* Tidied up READMEs.

* Applied PSR2 to tests.

* Code standards.

* Tidied up Annotations.

* Tidied up codebase.
  • Loading branch information
ruudboon authored and sergeyklay committed Jul 27, 2019
1 parent 6466f08 commit 39d5bc8
Show file tree
Hide file tree
Showing 176 changed files with 8,322 additions and 2,833 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ codeception.yml
tests/aerospike.suite.yml
tests/unit.suite.5.yml
tests/unit.suite.yml
tests/unit5x.suite.yml
tests/unit5x.suite.yml
Loading

0 comments on commit 39d5bc8

Please sign in to comment.