Skip to content

Commit

Permalink
Merge pull request #4 from symfony-bundles/dev
Browse files Browse the repository at this point in the history
Update configurations
  • Loading branch information
khaperets committed May 25, 2016
2 parents 8917e76 + 98ebcd3 commit cbb9109
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 26 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
logs/
vendor/
composer.lock
5 changes: 2 additions & 3 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
filter:
excluded_paths:
- logs/*
- vendor/*
- Tests/*

Expand All @@ -13,7 +12,7 @@ build:
tests:
override:
-
command: phpunit
command: phpunit --coverage-clover ./clover.xml
coverage:
file: logs/coverage/clover.xml
file: clover.xml
format: clover
1 change: 0 additions & 1 deletion .sensiolabs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ ignore_branches:
- gh-pages

global_exclude_dirs:
- logs
- vendor
- Tests
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ php:
- nightly

before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv rehash; fi;
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
Expand Down
27 changes: 27 additions & 0 deletions Tests/Kernel.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace SymfonyBundles\BundleDependency\Tests;

class Kernel
{

/**
* @var Fixtures\app\AppKernel
*/
private static $instance;

/**
* @return Fixtures\app\AppKernel
*/
public static function make()
{
if (null === static::$instance) {
static::$instance = new Fixtures\app\AppKernel('test', true);

static::$instance->boot();
}

return static::$instance;
}

}
15 changes: 1 addition & 14 deletions Tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase

public function setUp()
{
$this->container = $this->bootKernel()->getContainer();
}

protected function bootKernel()
{
$kernel = $this->createKernel();
$kernel->boot();

return $kernel;
}

protected function createKernel()
{
return new Fixtures\app\AppKernel('test', true);
$this->container = Kernel::make()->getContainer();
}

}
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
"phpunit/php-code-coverage": "^3.3.0",
"symfony/framework-bundle": "~2.7|~3.0"
},
"config": {
"platform": {
"php": "5.6"
}
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
Expand Down
7 changes: 0 additions & 7 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,11 @@
</testsuite>
</testsuites>

<logging>
<log type="coverage-clover" target="./logs/coverage/clover.xml"/>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
<log type="coverage-html" target="./logs/coverage" yui="true" highlight="true"/>
</logging>

<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Tests</directory>
<directory>./logs</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
Expand Down

0 comments on commit cbb9109

Please sign in to comment.