Skip to content

Commit

Permalink
Merge pull request #491 from phalcon/2.0.x
Browse files Browse the repository at this point in the history
2.0.9
  • Loading branch information
sergeyklay committed Nov 25, 2015
2 parents 8002f4a + cb415ae commit f376f57
Show file tree
Hide file tree
Showing 150 changed files with 7,556 additions and 2,894 deletions.
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
.DS_Store
.idea/*
*.iml
*.sublime-project
*.sublime-workspace
composer.lock
composer.phar
/nbproject/
/vendor
/codeception/acceptance/WebGuy.php
/codeception/functional/TestGuy.php
/codeception/unit/CodeGuy.php
/vendor/
.vagrant
Vagrantfile
/build
/tests/_support/_generated/*.php
sample.db
35 changes: 0 additions & 35 deletions .scrutinizer.yml

This file was deleted.

63 changes: 39 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,61 @@ php:
- 5.5
- 5.6

sudo:
false

services:
- memcached
- mysql
- mongodb

env:
- TEST_BS_HOST=127.0.0.1 TEST_BS_PORT=11301

cache:
directories:
- vendor
- $HOME/.composer/cache

env:
- PHALCON_VERSION="2.0.8"
- PHALCON_VERSION="2.0.7"
- PHALCON_VERSION="2.0.6"
- PHALCON_VERSION="2.0.5"
- PHALCON_VERSION="2.0.4"
global:
- TEST_BT_HOST=127.0.0.1 TEST_BT_PORT=11300 TEST_MC_HOST=127.0.0.1 TEST_MC_PORT=11211
matrix:
- PHALCON_VERSION="2.0.9"
- PHALCON_VERSION="2.0.8"
- PHALCON_VERSION="2.0.7"
- PHALCON_VERSION="2.0.6"
- PHALCON_VERSION="2.0.5"
- PHALCON_VERSION="2.0.4"

before_install:
- sudo apt-get update -qq
- sudo apt-get install -y beanstalkd
- sudo beanstalkd -l ${TEST_BS_HOST} -p ${TEST_BS_PORT} &
- bash tests/_ci/setup_beanstalkd.sh
- beanstalkd -v
- beanstalkd -l ${TEST_BT_HOST} -p ${TEST_BT_PORT} & # start queue listener
- sleep 5 # give server some time to boot
- cd $TRAVIS_BUILD_DIR
- pecl channel-update pecl.php.net
- (CFLAGS="-O1 -g3 -fno-strict-aliasing"; pecl install yaml < /dev/null &)
- pecl install mongo < /dev/null &
- phpenv config-add tests/_ci/memcached.ini
- php -m

install:
- composer self-update
- git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b phalcon-v${PHALCON_VERSION}
- (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize &> /dev/null && ./configure --silent --enable-phalcon &> /dev/null && make --silent -j4 > /dev/null && make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini &> /dev/null)
- php -r 'echo \Phalcon\Version::get()."\n";'
- composer install
- travis_retry composer install --prefer-source --no-interaction
- travis_retry composer require "duncan3dc/fork-helper":"*"

before_script:
- mysql -e 'create database incubator_tests charset=utf8mb4 collate=utf8mb4_unicode_ci;'
- cat tests/travis/db_schema.sql | mysql incubator_tests

script:
- php vendor/bin/phpcs --standard=PSR2 --encoding=utf-8 Library/
- phpunit --configuration tests/phpunit.xml.dist --coverage-clover=coverage.clover
- vendor/bin/phpcs --standard=PSR2 --colors --extensions=php --encoding=utf-8 Library/
- vendor/bin/codecept build
- vendor/bin/codecept run --coverage-text

addons:
apt:
packages:
- libyaml-dev

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
- mysql -e 'DROP DATABASE incubator_tests;'
notifications:
email:
recipients:
- [email protected]
on_success: change
on_failure: always
Loading

0 comments on commit f376f57

Please sign in to comment.