Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:vegas-cmf/mvc
Browse files Browse the repository at this point in the history
  • Loading branch information
szytko committed Apr 28, 2016
2 parents b2a7ee0 + 63796bd commit c80c961
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 41 deletions.
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
language: php

php:
- 5.5

services:
- mongodb
- memcached

before_install:
- mysql -e "CREATE DATABASE IF NOT EXISTS vegas_test;" -uroot
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
- echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
- sudo apt-get update
- sudo apt-get install mongodb-org-server

before_script:
- phpenv config-add travis/php.ini
- git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b phalcon-v2.0.8
- (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
- curl -s http://getcomposer.org/installer | php
- php composer.phar install --dev

script:
- cp tests/fixtures/app/config/config.sample.php tests/fixtures/app/config/config.php
- mkdir -p tests/fixtures/cache
- mkdir -p tests/fixtures/tmp
- mkdir -p build/logs
- php vendor/bin/phpunit -c travis/phpunit.xml.dist

after_script:
- php vendor/bin/coveralls -v

after_success:
- coveralls
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Vegas CMF MVC
================

[![Travis Status](https://travis-ci.org/vegas-cmf/mvc.svg?branch=master)](https://travis-ci.org/vegas-cmf/mvc.svg?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/vegas-cmf/mvc/badge.svg?branch=master)](https://coveralls.io/github/vegas-cmf/mvc?branch=master)
10 changes: 0 additions & 10 deletions src/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,6 @@
*/
class Application extends \Phalcon\Mvc\Application
{
/**
* @const string
*/
const DEV_ENV = 'development';

/**
* @const string
*/
const PROD_ENV = 'production';

/**
* @var string
*/
Expand Down
27 changes: 0 additions & 27 deletions tests/ApplicationTest.php

This file was deleted.

6 changes: 3 additions & 3 deletions tests/Autoloader/BootTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public function testBootView()

$this->assertSame([
'Test' => $appDirectory . '/modules/Test',
'App\Initializer' => $appDirectory . '/initializers/',
'App\Shared' => $appDirectory . '/shared/',
'App\View' => $appDirectory . '/view/',
'App\Initializer' => $appDirectory . '/initializers',
'App\Shared' => $appDirectory . '/shared',
'App\View' => $appDirectory . '/view',
], $namespaces);

}
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/app/config/config.sample.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
return [
'application' => [
'environment' => \Vegas\Mvc\Application::DEV_ENV,
'modules' => [
'Test'
],
Expand Down
1 change: 1 addition & 0 deletions travis/php.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=mongo.so
38 changes: 38 additions & 0 deletions travis/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit
backupStaticAttributes="false"
backupGlobals="false"
cacheTokens="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
mapTestClassNameToCoveredClassName="false"

processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"

strict="false"
verbose="true"
bootstrap="../tests/bootstrap.php">
<testsuites>
<testsuite name="Vegas CMF Core Test Suite">
<directory>../tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory suffix=".php">../src</directory>
</whitelist>
</filter>

<logging>
<log type="coverage-clover" target="../build/logs/clover.xml"/>
</logging>
</phpunit>

0 comments on commit c80c961

Please sign in to comment.