Skip to content

Commit

Permalink
Merge pull request #11 from phalcon/development
Browse files Browse the repository at this point in the history
1.3.2
  • Loading branch information
sergeyklay committed Sep 10, 2017
2 parents eb68e5b + 1e77e2d commit 2940f3c
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git:
env:
matrix:
- PHALCON_VERSION="phalcon-v2.0.13"
- PHALCON_VERSION="v3.2.0"
- PHALCON_VERSION="v3.2.2"

matrix:
fast_finish: true
Expand All @@ -51,11 +51,12 @@ before_install:
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
- travis_retry composer install --prefer-dist --no-interaction --ignore-platform-reqs
- git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b ${PHALCON_VERSION}
- export PHP_MAJOR="$(echo $TRAVIS_PHP_VERSION | cut -d '.' -f 1)"

install:
- (cd cphalcon/build; bash install)
- '[[ "${PHALCON_VERSION}" == "phalcon-v2.0.13" ]] || phpenv config-add cphalcon/tests/_ci/phalcon.ini'
- '[[ "${PHALCON_VERSION}" != "phalcon-v2.0.13" ]] || phpenv config-add cphalcon/unit-tests/ci/phalcon.ini'
- phpenv config-add $TRAVIS_BUILD_DIR/tests/_ci/phalcon.ini
- if [ "$PHP_MAJOR" == 5 ]; then composer require doctrine/instantiator:1.0.5; fi;

script:
- vendor/bin/phpcs
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ To use this component, you need at least:
* PHP >= 5.5
* Latest stable [Phalcon Framework release][:phalcon:] extension enabled

**NOTE:** Support for legacy PHP versions (down to 5.6) is provided on a best-effort basis.

### Installing

Install Composer in a common location or in your project:
Expand Down
32 changes: 32 additions & 0 deletions tests/_ci/phalcon.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
;
; Phalcon Framework
;
; Copyright (c) 2011-2017 Phalcon Team (https://www.phalconphp.com)
;
; This source file is subject to the New BSD License that is bundled
; with this package in the file LICENSE.txt.
;
; If you did not receive a copy of the license and are unable to
; obtain it through the world-wide-web, please send an email
; to license@phalconphp.com so we can send you a copy immediately.

[phalcon]
extension=phalcon.so

; ----- Options to use the Phalcon Framework

; phalcon.db.escape_identifiers = On
; phalcon.db.force_casting = Off

; phalcon.orm.events = On
; phalcon.orm.virtual_foreign_keys = On
; phalcon.orm.column_renaming = On
; phalcon.orm.not_null_validations = On
; phalcon.orm.exception_on_failed_save = Off
; phalcon.orm.enable_literals = On
; phalcon.orm.late_state_binding = Off
; phalcon.orm.enable_implicit_joins = On
; phalcon.orm.cast_on_hydrate = Off
; phalcon.orm.ignore_unknown_columns = Off
; phalcon.orm.update_snapshot_on_save = On
; phalcon.orm.disable_assign_setters = Off

0 comments on commit 2940f3c

Please sign in to comment.