Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to PHPUnit 6 #89

Merged
merged 5 commits into from
Feb 15, 2017
Merged

Update to PHPUnit 6 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f050691
Update composer dev dependencies for using phpunit 6
SenseException Feb 12, 2017
77e4d0e
Use PHPUnit 6 namespaces in tests
SenseException Feb 12, 2017
261b027
Minor code cleaning
SenseException Feb 13, 2017
888e7a1
Import class TestCase
SenseException Feb 13, 2017
34809da
Fix of invalid composer.lock
SenseException Feb 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"bitexpert/slf4psrlog": "^0.1.3"
},
"require-dev": {
"phpunit/php-code-coverage": "^4.0.1",
"phpunit/phpunit": "^5.6",
"phpunit/php-code-coverage": "^5.0.0",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the explicit dependency on php-code-coverage?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, we might not need it any more. Did not realize. Thanks for pointing out ;)

"phpunit/phpunit": "^6.0",
"squizlabs/php_codesniffer": "^2.6.2",
"phpdocumentor/phpdocumentor": "v2.9.0",
"monolog/monolog": "^1.21.0",
Expand Down
128 changes: 66 additions & 62 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
use bitExpert\Disco\Helper\BeanFactoryAwareService;
use bitExpert\Disco\Helper\MasterService;
use bitExpert\Disco\Helper\SampleService;
use PHPUnit\Framework\TestCase;
use ProxyManager\Proxy\ValueHolderInterface;
use ProxyManager\Proxy\VirtualProxyInterface;
use stdClass;

/**
* Unit tests for {@link \bitExpert\Disco\AnnotationBeanFactory}.
*/
class AnnotationBeanFactoryUnitTest extends \PHPUnit_Framework_TestCase
class AnnotationBeanFactoryUnitTest extends TestCase
{
/**
* @var AnnotationBeanFactory
Expand Down
5 changes: 3 additions & 2 deletions tests/bitExpert/Disco/Annotations/AnnotationAttributeParserUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@

namespace bitExpert\Disco\Annotations;

use PHPUnit\Framework\TestCase;

/**
* Unit tests for {@link \bitExpert\Disco\Annotations\AnnotationsAttributeParser}.
*/
class AnnotationAttributeParserUnitTest extends \PHPUnit_Framework_TestCase
class AnnotationAttributeParserUnitTest extends TestCase
{
/**
* @test
* @dataProvider requireDataProvider
*/
public function requireGetsRecognizedCorrectly($parameterValue, $expectedValue)
{

self::assertSame($expectedValue, AnnotationAttributeParser::parseBooleanValue($parameterValue));
}

Expand Down
4 changes: 3 additions & 1 deletion tests/bitExpert/Disco/Annotations/BeanUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@

namespace bitExpert\Disco\Annotations;

use PHPUnit\Framework\TestCase;

/**
* Unit tests for {@link \bitExpert\Disco\Annotations\Bean}.
*/
class BeanUnitTest extends \PHPUnit_Framework_TestCase
class BeanUnitTest extends TestCase
{
/**
* @test
Expand Down
6 changes: 4 additions & 2 deletions tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@

namespace bitExpert\Disco\Annotations;

use PHPUnit\Framework\TestCase;

/**
* Unit tests for {@link \bitExpert\Disco\Annotations\Parameter}.
*/
class ParameterUnitTest extends \PHPUnit_Framework_TestCase
class ParameterUnitTest extends TestCase
{
/**
* @test
* @expectedException \Doctrine\Common\Annotations\AnnotationException
*/
public function missingNameWillThrowAnnotationException()
{
$parameter = new Parameter();
new Parameter();
}

/**
Expand Down
Loading