composer update
This commit is contained in:
Vendored
+3
@@ -7,5 +7,8 @@ indent_style = space
|
||||
indent_size = 4
|
||||
charset = utf-8
|
||||
|
||||
[*.yml]
|
||||
indent_size = 2
|
||||
|
||||
[tests/_files/*_result_cache.txt]
|
||||
insert_final_newline = false
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/build export-ignore
|
||||
/tools export-ignore
|
||||
/tools/* binary
|
||||
|
||||
*.php diff=php
|
||||
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
# Configuration for probot-stale - https://github.com/probot/stale
|
||||
|
||||
# Number of days of inactivity before an Issue or Pull Request becomes stale
|
||||
daysUntilStale: 60
|
||||
|
||||
# Number of days of inactivity before a stale Issue or Pull Request is closed.
|
||||
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
|
||||
daysUntilClose: 7
|
||||
|
||||
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
|
||||
exemptLabels:
|
||||
- blocked
|
||||
- enhancement
|
||||
- backward-compatibility-break
|
||||
- feature-removal
|
||||
- php-support-removal
|
||||
- process
|
||||
- rfc
|
||||
- refactoring
|
||||
|
||||
# Set to true to ignore issues in a project (defaults to false)
|
||||
exemptProjects: false
|
||||
|
||||
# Set to true to ignore issues in a milestone (defaults to false)
|
||||
exemptMilestones: false
|
||||
|
||||
# Label to use when marking as stale
|
||||
staleLabel: stale
|
||||
|
||||
# Comment to post when marking as stale. Set to `false` to disable
|
||||
markComment: >
|
||||
This issue has been automatically marked as stale because it has not had activity within the last 60 days. It will be closed after 7 days if no further activity occurs. Thank you for your contributions.
|
||||
|
||||
# Comment to post when removing the stale label.
|
||||
# unmarkComment: >
|
||||
# Your comment here.
|
||||
|
||||
# Comment to post when closing a stale Issue or Pull Request.
|
||||
closeComment: >
|
||||
This issue has been automatically closed because it has not had activity since it was marked as stale. Thank you for your contributions.
|
||||
|
||||
# Limit the number of actions per hour, from 1-30. Default is 30
|
||||
limitPerRun: 30
|
||||
|
||||
# Limit to only `issues` or `pulls`
|
||||
only: issues
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
|
||||
|
||||
on:
|
||||
- push
|
||||
- pull_request
|
||||
|
||||
name: CI
|
||||
|
||||
jobs:
|
||||
coding-guidelines:
|
||||
name: Coding Guidelines
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Run friendsofphp/php-cs-fixer
|
||||
run: php7.3 tools/php-cs-fixer fix --diff-format=udiff --dry-run --show-progress=dots --using-cache=no --verbose
|
||||
Vendored
+1
-2
@@ -171,7 +171,7 @@ return PhpCsFixer\Config::create()
|
||||
'semicolon_after_instruction' => true,
|
||||
'set_type_to_cast' => true,
|
||||
'short_scalar_cast' => true,
|
||||
'simplified_null_return' => true,
|
||||
'simplified_null_return' => false,
|
||||
'single_blank_line_at_eof' => true,
|
||||
'single_import_per_statement' => true,
|
||||
'single_line_after_imports' => true,
|
||||
@@ -195,7 +195,6 @@ return PhpCsFixer\Config::create()
|
||||
->setFinder(
|
||||
PhpCsFixer\Finder::create()
|
||||
->files()
|
||||
->in(__DIR__ . '/build')
|
||||
->in(__DIR__ . '/src')
|
||||
->in(__DIR__ . '/tests')
|
||||
->notName('*.phpt')
|
||||
|
||||
Vendored
-10
@@ -44,13 +44,3 @@ after_success:
|
||||
|
||||
notifications:
|
||||
email: false
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- stage: Static Code Analysis
|
||||
php: 7.3
|
||||
env: php-cs-fixer
|
||||
install:
|
||||
- phpenv config-rm xdebug.ini
|
||||
script:
|
||||
- ./tools/php-cs-fixer fix --dry-run -v --show-progress=dots --diff-format=udiff
|
||||
|
||||
+30
@@ -2,6 +2,32 @@
|
||||
|
||||
All notable changes of the PHPUnit 7.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
|
||||
|
||||
## [7.5.17] - 2019-10-28
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fixed [#3727](https://github.com/sebastianbergmann/phpunit/issues/3727): Problem hidden by PHPUnit's error handler
|
||||
* Fixed [#3863](https://github.com/sebastianbergmann/phpunit/pull/3863): `\Countable` needs to be checked before `\EmptyIterator`
|
||||
|
||||
## [7.5.16] - 2019-09-14
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fixed [#3801](https://github.com/sebastianbergmann/phpunit/issues/3801): Class constant as default parameter is undefined
|
||||
* Fixed [#3834](https://github.com/sebastianbergmann/phpunit/issues/3834): Trailing slash breaks code coverage on Windows
|
||||
|
||||
## [7.5.15] - 2019-08-21
|
||||
|
||||
### Changed
|
||||
|
||||
* Implemented [#3765](https://github.com/sebastianbergmann/phpunit/pull/3765): Use `ReflectionType::getName()` instead of `ReflectionType::__toString()` (which is deprecated in PHP 7.4)
|
||||
|
||||
## [7.5.14] - 2019-07-15
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fixed [#3743](https://github.com/sebastianbergmann/phpunit/issues/3743): `EmptyIterator` instances are not handled correctly by `Count` and `IsEmpty` constraints
|
||||
|
||||
## [7.5.13] - 2019-06-19
|
||||
|
||||
### Fixed
|
||||
@@ -126,6 +152,10 @@ All notable changes of the PHPUnit 7.5 release series are documented in this fil
|
||||
* Fixed [#3429](https://github.com/sebastianbergmann/phpunit/pull/3429): Inefficient loop in `getHookMethods()`
|
||||
* Fixed [#3437](https://github.com/sebastianbergmann/phpunit/pull/3437): JUnit logger skips PHPT tests
|
||||
|
||||
[7.5.17]: https://github.com/sebastianbergmann/phpunit/compare/7.5.16...7.5.17
|
||||
[7.5.16]: https://github.com/sebastianbergmann/phpunit/compare/7.5.15...7.5.16
|
||||
[7.5.15]: https://github.com/sebastianbergmann/phpunit/compare/7.5.14...7.5.15
|
||||
[7.5.14]: https://github.com/sebastianbergmann/phpunit/compare/7.5.13...7.5.14
|
||||
[7.5.13]: https://github.com/sebastianbergmann/phpunit/compare/7.5.12...7.5.13
|
||||
[7.5.12]: https://github.com/sebastianbergmann/phpunit/compare/7.5.11...7.5.12
|
||||
[7.5.11]: https://github.com/sebastianbergmann/phpunit/compare/7.5.10...7.5.11
|
||||
|
||||
Vendored
+40
-40
@@ -153,6 +153,12 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${basedir}/build/phar/php-invoker">
|
||||
<fileset dir="${basedir}/vendor/phpunit/php-invoker/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/phpunit/php-text-template/LICENSE" tofile="${basedir}/build/phar/php-text-template/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/php-text-template">
|
||||
<fileset dir="${basedir}/vendor/phpunit/php-text-template/src">
|
||||
@@ -209,20 +215,6 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/recursion-context/LICENSE" tofile="${basedir}/build/phar/sebastian-recursion-context/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-recursion-context">
|
||||
<fileset dir="${basedir}/vendor/sebastian/recursion-context/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/resource-operations/LICENSE" tofile="${basedir}/build/phar/sebastian-resource-operations/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-resource-operations">
|
||||
<fileset dir="${basedir}/vendor/sebastian/resource-operations/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/global-state/LICENSE" tofile="${basedir}/build/phar/sebastian-global-state/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-global-state">
|
||||
<fileset dir="${basedir}/vendor/sebastian/global-state/src">
|
||||
@@ -244,6 +236,20 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/recursion-context/LICENSE" tofile="${basedir}/build/phar/sebastian-recursion-context/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-recursion-context">
|
||||
<fileset dir="${basedir}/vendor/sebastian/recursion-context/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/resource-operations/LICENSE" tofile="${basedir}/build/phar/sebastian-resource-operations/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-resource-operations">
|
||||
<fileset dir="${basedir}/vendor/sebastian/resource-operations/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/sebastian/version/LICENSE" tofile="${basedir}/build/phar/sebastian-version/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/sebastian-version">
|
||||
<fileset dir="${basedir}/vendor/sebastian/version/src">
|
||||
@@ -258,8 +264,23 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${basedir}/build/phar/php-invoker">
|
||||
<fileset dir="${basedir}/vendor/phpunit/php-invoker/src">
|
||||
<copy file="${basedir}/vendor/myclabs/deep-copy/LICENSE" tofile="${basedir}/build/phar/myclabs-deep-copy/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/myclabs-deep-copy">
|
||||
<fileset dir="${basedir}/vendor/myclabs/deep-copy/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/phar-io/manifest/LICENSE" tofile="${basedir}/build/phar/phar-io-manifest/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/phar-io-manifest">
|
||||
<fileset dir="${basedir}/vendor/phar-io/manifest/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/phar-io/version/LICENSE" tofile="${basedir}/build/phar/phar-io-version/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/phar-io-version">
|
||||
<fileset dir="${basedir}/vendor/phar-io/version/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
@@ -292,9 +313,9 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/myclabs/deep-copy/LICENSE" tofile="${basedir}/build/phar/myclabs-deep-copy/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/myclabs-deep-copy">
|
||||
<fileset dir="${basedir}/vendor/myclabs/deep-copy/src">
|
||||
<copy file="${basedir}/vendor/theseer/tokenizer/LICENSE" tofile="${basedir}/build/phar/theseer-tokenizer/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/theseer-tokenizer">
|
||||
<fileset dir="${basedir}/vendor/theseer/tokenizer/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
@@ -305,27 +326,6 @@
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/phar-io/manifest/LICENSE" tofile="${basedir}/build/phar/phar-io-manifest/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/phar-io-manifest">
|
||||
<fileset dir="${basedir}/vendor/phar-io/manifest/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/phar-io/version/LICENSE" tofile="${basedir}/build/phar/phar-io-version/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/phar-io-version">
|
||||
<fileset dir="${basedir}/vendor/phar-io/version/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${basedir}/vendor/theseer/tokenizer/LICENSE" tofile="${basedir}/build/phar/theseer-tokenizer/LICENSE"/>
|
||||
<copy todir="${basedir}/build/phar/theseer-tokenizer">
|
||||
<fileset dir="${basedir}/vendor/theseer/tokenizer/src">
|
||||
<include name="**/*.php" />
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="-phar-build" depends="-phar-determine-version">
|
||||
|
||||
Vendored
+1
-1
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<phive xmlns="https://phar.io/phive">
|
||||
<phar name="phpab" version="^1.25" installed="1.25.6" location="./tools/phpab" copy="true"/>
|
||||
<phar name="php-cs-fixer" version="^2.14" installed="2.15.1" location="./tools/php-cs-fixer" copy="true"/>
|
||||
<phar name="php-cs-fixer" version="^2.14" installed="2.15.3" location="./tools/php-cs-fixer" copy="true"/>
|
||||
<phar name="phpdox" version="^0.11" installed="0.12.0" location="./tools/phpdox" copy="true"/>
|
||||
<phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
|
||||
</phive>
|
||||
|
||||
Vendored
+1
-1
@@ -13,7 +13,7 @@ if (version_compare('7.1.0', PHP_VERSION, '>')) {
|
||||
fwrite(
|
||||
STDERR,
|
||||
sprintf(
|
||||
'This version of PHPUnit is supported on PHP 7.1 and PHP 7.2.' . PHP_EOL .
|
||||
'This version of PHPUnit is supported on PHP 7.1, PHP 7.2, and PHP 7.3.' . PHP_EOL .
|
||||
'You are using PHP %s (%s).' . PHP_EOL,
|
||||
PHP_VERSION,
|
||||
PHP_BINARY
|
||||
|
||||
Vendored
+1
-1
@@ -233,7 +233,7 @@
|
||||
<xs:attribute name="bootstrap" type="xs:anyURI"/>
|
||||
<xs:attribute name="cacheResult" type="xs:boolean" default="false"/>
|
||||
<xs:attribute name="cacheResultFile" type="xs:anyURI"/>
|
||||
<xs:attribute name="cacheTokens" type="xs:boolean"/>
|
||||
<xs:attribute name="cacheTokens" type="xs:boolean" default="false"/>
|
||||
<xs:attribute name="colors" type="xs:boolean" default="false"/>
|
||||
<xs:attribute name="columns" type="columnsType" default="80"/>
|
||||
<xs:attribute name="convertDeprecationsToExceptions" type="xs:boolean" default="true"/>
|
||||
|
||||
+1
-1
@@ -12,6 +12,6 @@ namespace PHPUnit;
|
||||
/**
|
||||
* Marker interface for PHPUnit exceptions.
|
||||
*/
|
||||
interface Exception
|
||||
interface Exception extends \Throwable
|
||||
{
|
||||
}
|
||||
|
||||
@@ -55,6 +55,10 @@ class Count extends Constraint
|
||||
return \count($other);
|
||||
}
|
||||
|
||||
if ($other instanceof \EmptyIterator) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ($other instanceof Traversable) {
|
||||
while ($other instanceof IteratorAggregate) {
|
||||
$other = $other->getIterator();
|
||||
|
||||
@@ -32,6 +32,10 @@ class IsEmpty extends Constraint
|
||||
*/
|
||||
protected function matches($other): bool
|
||||
{
|
||||
if ($other instanceof \EmptyIterator) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if ($other instanceof Countable) {
|
||||
return \count($other) === 0;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
*/
|
||||
namespace PHPUnit\Framework\Constraint;
|
||||
|
||||
use PHPUnit\Util\InvalidArgumentHelper;
|
||||
|
||||
/**
|
||||
* Constraint that asserts that the string it is evaluated for begins with a
|
||||
* given prefix.
|
||||
@@ -24,6 +26,10 @@ class StringStartsWith extends Constraint
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
if (\strlen($prefix) === 0) {
|
||||
throw InvalidArgumentHelper::factory(1, 'non-empty string');
|
||||
}
|
||||
|
||||
$this->prefix = $prefix;
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,10 @@ class DataProviderTestSuite extends TestSuite
|
||||
$this->dependencies = $dependencies;
|
||||
|
||||
foreach ($this->tests as $test) {
|
||||
if (!$test instanceof TestCase) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$test->setDependencies($dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of PHPUnit.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
namespace PHPUnit\Framework;
|
||||
|
||||
/**
|
||||
* @internal This class is not covered by the backward compatibility promise for PHPUnit
|
||||
*/
|
||||
final class InvalidParameterGroupException extends Exception
|
||||
{
|
||||
}
|
||||
@@ -12,6 +12,6 @@ namespace PHPUnit\Framework\MockObject;
|
||||
/**
|
||||
* Interface for exceptions used by PHPUnit_MockObject.
|
||||
*/
|
||||
interface Exception
|
||||
interface Exception extends \Throwable
|
||||
{
|
||||
}
|
||||
|
||||
+11
@@ -12,6 +12,7 @@ namespace PHPUnit\Framework\MockObject\Matcher;
|
||||
use PHPUnit\Framework\Constraint\Constraint;
|
||||
use PHPUnit\Framework\Constraint\IsEqual;
|
||||
use PHPUnit\Framework\ExpectationFailedException;
|
||||
use PHPUnit\Framework\InvalidParameterGroupException;
|
||||
use PHPUnit\Framework\MockObject\Invocation as BaseInvocation;
|
||||
|
||||
/**
|
||||
@@ -42,6 +43,16 @@ class ConsecutiveParameters extends StatelessInvocation
|
||||
public function __construct(array $parameterGroups)
|
||||
{
|
||||
foreach ($parameterGroups as $index => $parameters) {
|
||||
if (!\is_iterable($parameters)) {
|
||||
throw new InvalidParameterGroupException(
|
||||
\sprintf(
|
||||
'Parameter group #%d must be an array or Traversable, got %s',
|
||||
$index,
|
||||
\gettype($parameters)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
foreach ($parameters as $parameter) {
|
||||
if (!$parameter instanceof Constraint) {
|
||||
$parameter = new IsEqual($parameter);
|
||||
|
||||
@@ -102,7 +102,7 @@ final class MockMethod
|
||||
}
|
||||
|
||||
if ($method->hasReturnType()) {
|
||||
$returnType = (string) $method->getReturnType();
|
||||
$returnType = $method->getReturnType()->getName();
|
||||
} else {
|
||||
$returnType = '';
|
||||
}
|
||||
@@ -301,8 +301,8 @@ final class MockMethod
|
||||
$nullable = '?';
|
||||
}
|
||||
|
||||
if ($parameter->hasType() && (string) $parameter->getType() !== 'self') {
|
||||
$typeDeclaration = $parameter->getType() . ' ';
|
||||
if ($parameter->hasType() && $parameter->getType()->getName() !== 'self') {
|
||||
$typeDeclaration = $parameter->getType()->getName() . ' ';
|
||||
} else {
|
||||
try {
|
||||
$class = $parameter->getClass();
|
||||
@@ -326,13 +326,14 @@ final class MockMethod
|
||||
|
||||
if (!$parameter->isVariadic()) {
|
||||
if ($parameter->isDefaultValueAvailable()) {
|
||||
$value = $parameter->getDefaultValueConstantName();
|
||||
|
||||
if ($value === null) {
|
||||
try {
|
||||
$value = \var_export($parameter->getDefaultValue(), true);
|
||||
} elseif (!\defined($value)) {
|
||||
$rootValue = \preg_replace('/^.*\\\\/', '', $value);
|
||||
$value = \defined($rootValue) ? $rootValue : $value;
|
||||
} catch (\ReflectionException $e) {
|
||||
throw new RuntimeException(
|
||||
$e->getMessage(),
|
||||
(int) $e->getCode(),
|
||||
$e
|
||||
);
|
||||
}
|
||||
|
||||
$default = ' = ' . $value;
|
||||
|
||||
+7
-13
@@ -1662,22 +1662,16 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
|
||||
if ($this->prophet !== null) {
|
||||
try {
|
||||
$this->prophet->checkPredictions();
|
||||
} catch (Throwable $t) {
|
||||
/* Intentionally left empty */
|
||||
}
|
||||
|
||||
foreach ($this->prophet->getProphecies() as $objectProphecy) {
|
||||
foreach ($objectProphecy->getMethodProphecies() as $methodProphecies) {
|
||||
/** @var MethodProphecy[] $methodProphecies */
|
||||
foreach ($methodProphecies as $methodProphecy) {
|
||||
$this->numAssertions += \count($methodProphecy->getCheckedPredictions());
|
||||
} finally {
|
||||
foreach ($this->prophet->getProphecies() as $objectProphecy) {
|
||||
foreach ($objectProphecy->getMethodProphecies() as $methodProphecies) {
|
||||
/** @var MethodProphecy[] $methodProphecies */
|
||||
foreach ($methodProphecies as $methodProphecy) {
|
||||
$this->numAssertions += \count($methodProphecy->getCheckedPredictions());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($t)) {
|
||||
throw $t;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+14
-9
@@ -863,13 +863,16 @@ class TestResult implements Countable
|
||||
if ($name && $reflected->hasMethod($name)) {
|
||||
$reflected = $reflected->getMethod($name);
|
||||
}
|
||||
|
||||
$this->addFailure(
|
||||
$test,
|
||||
new RiskyTestError(\sprintf(
|
||||
"This test did not perform any assertions\n\n%s:%d",
|
||||
$reflected->getFileName(),
|
||||
$reflected->getStartLine()
|
||||
)),
|
||||
new RiskyTestError(
|
||||
\sprintf(
|
||||
"This test did not perform any assertions\n\n%s:%d",
|
||||
$reflected->getFileName(),
|
||||
$reflected->getStartLine()
|
||||
)
|
||||
),
|
||||
$time
|
||||
);
|
||||
} elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
|
||||
@@ -877,10 +880,12 @@ class TestResult implements Countable
|
||||
$test->getNumAssertions() > 0) {
|
||||
$this->addFailure(
|
||||
$test,
|
||||
new RiskyTestError(\sprintf(
|
||||
'This test is annotated with "@doesNotPerformAssertions" but performed %d assertions',
|
||||
$test->getNumAssertions()
|
||||
)),
|
||||
new RiskyTestError(
|
||||
\sprintf(
|
||||
'This test is annotated with "@doesNotPerformAssertions" but performed %d assertions',
|
||||
$test->getNumAssertions()
|
||||
)
|
||||
),
|
||||
$time
|
||||
);
|
||||
} elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) {
|
||||
|
||||
+5
-1
@@ -61,7 +61,7 @@ class TestSuite implements IteratorAggregate, SelfDescribing, Test
|
||||
/**
|
||||
* The tests in the test suite.
|
||||
*
|
||||
* @var TestCase[]
|
||||
* @var Test[]
|
||||
*/
|
||||
protected $tests = [];
|
||||
|
||||
@@ -800,6 +800,8 @@ class TestSuite implements IteratorAggregate, SelfDescribing, Test
|
||||
|
||||
/**
|
||||
* Returns the tests as an enumeration.
|
||||
*
|
||||
* @return Test[]
|
||||
*/
|
||||
public function tests(): array
|
||||
{
|
||||
@@ -808,6 +810,8 @@ class TestSuite implements IteratorAggregate, SelfDescribing, Test
|
||||
|
||||
/**
|
||||
* Set tests of the test suite
|
||||
*
|
||||
* @param Test[] $tests
|
||||
*/
|
||||
public function setTests(array $tests): void
|
||||
{
|
||||
|
||||
+16
-6
@@ -19,7 +19,7 @@ final class TestSuiteIterator implements RecursiveIterator
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
private $position;
|
||||
private $position = 0;
|
||||
|
||||
/**
|
||||
* @var Test[]
|
||||
@@ -58,7 +58,7 @@ final class TestSuiteIterator implements RecursiveIterator
|
||||
/**
|
||||
* Returns the current element.
|
||||
*/
|
||||
public function current(): Test
|
||||
public function current(): ?Test
|
||||
{
|
||||
return $this->valid() ? $this->tests[$this->position] : null;
|
||||
}
|
||||
@@ -73,12 +73,22 @@ final class TestSuiteIterator implements RecursiveIterator
|
||||
|
||||
/**
|
||||
* Returns the sub iterator for the current element.
|
||||
*
|
||||
* @throws \UnexpectedValueException if the current element is no TestSuite
|
||||
*/
|
||||
public function getChildren(): self
|
||||
{
|
||||
return new self(
|
||||
$this->tests[$this->position]
|
||||
);
|
||||
if (!$this->hasChildren()) {
|
||||
throw new UnexpectedValueException(
|
||||
'The current item is no TestSuite instance and hence cannot have any children.',
|
||||
1567849414
|
||||
);
|
||||
}
|
||||
|
||||
/** @var TestSuite $current */
|
||||
$current = $this->current();
|
||||
|
||||
return new self($current);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -86,6 +96,6 @@ final class TestSuiteIterator implements RecursiveIterator
|
||||
*/
|
||||
public function hasChildren(): bool
|
||||
{
|
||||
return $this->tests[$this->position] instanceof TestSuite;
|
||||
return $this->current() instanceof TestSuite;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of PHPUnit.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
namespace PHPUnit\Framework;
|
||||
|
||||
final class UnexpectedValueException extends Exception
|
||||
{
|
||||
}
|
||||
+13
-13
@@ -35,17 +35,17 @@ class PhptTestCase implements SelfDescribing, Test
|
||||
'auto_prepend_file=',
|
||||
'disable_functions=',
|
||||
'display_errors=1',
|
||||
'docref_root=',
|
||||
'docref_ext=.html',
|
||||
'docref_root=',
|
||||
'error_append_string=',
|
||||
'error_prepend_string=',
|
||||
'error_reporting=-1',
|
||||
'html_errors=0',
|
||||
'log_errors=0',
|
||||
'magic_quotes_runtime=0',
|
||||
'output_handler=',
|
||||
'open_basedir=',
|
||||
'output_buffering=Off',
|
||||
'output_handler=',
|
||||
'report_memleaks=0',
|
||||
'report_zend_debug=0',
|
||||
'safe_mode=0',
|
||||
@@ -177,7 +177,7 @@ class PhptTestCase implements SelfDescribing, Test
|
||||
}
|
||||
|
||||
try {
|
||||
$this->assertPhptExpectation($sections, $jobResult['stdout']);
|
||||
$this->assertPhptExpectation($sections, $this->output);
|
||||
} catch (AssertionFailedError $e) {
|
||||
$failure = $e;
|
||||
|
||||
@@ -366,20 +366,20 @@ class PhptTestCase implements SelfDescribing, Test
|
||||
$section = '';
|
||||
|
||||
$unsupportedSections = [
|
||||
'REDIRECTTEST',
|
||||
'REQUEST',
|
||||
'POST',
|
||||
'PUT',
|
||||
'POST_RAW',
|
||||
'GZIP_POST',
|
||||
'DEFLATE_POST',
|
||||
'GET',
|
||||
'COOKIE',
|
||||
'HEADERS',
|
||||
'CGI',
|
||||
'COOKIE',
|
||||
'DEFLATE_POST',
|
||||
'EXPECTHEADERS',
|
||||
'EXTENSIONS',
|
||||
'GET',
|
||||
'GZIP_POST',
|
||||
'HEADERS',
|
||||
'PHPDBG',
|
||||
'POST',
|
||||
'POST_RAW',
|
||||
'PUT',
|
||||
'REDIRECTTEST',
|
||||
'REQUEST',
|
||||
];
|
||||
|
||||
foreach (\file($this->filename) as $line) {
|
||||
|
||||
+4
-1
@@ -177,7 +177,10 @@ final class TestSuiteSorter
|
||||
}
|
||||
|
||||
if ($resolveDependencies && !($suite instanceof DataProviderTestSuite) && $this->suiteOnlyContainsTests($suite)) {
|
||||
$suite->setTests($this->resolveDependencies($suite->tests()));
|
||||
/** @var TestCase[] $tests */
|
||||
$tests = $suite->tests();
|
||||
|
||||
$suite->setTests($this->resolveDependencies($tests));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ class Version
|
||||
}
|
||||
|
||||
if (self::$version === null) {
|
||||
$version = new VersionId('7.5.13', \dirname(__DIR__, 2));
|
||||
$version = new VersionId('7.5.17', \dirname(__DIR__, 2));
|
||||
self::$version = $version->getVersion();
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -45,7 +45,7 @@ class JUnit extends Printer implements TestListener
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected $reportUselessTests = false;
|
||||
protected $reportRiskyTests = false;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
@@ -104,7 +104,7 @@ class JUnit extends Printer implements TestListener
|
||||
*
|
||||
* @throws \PHPUnit\Framework\Exception
|
||||
*/
|
||||
public function __construct($out = null, bool $reportUselessTests = false)
|
||||
public function __construct($out = null, bool $reportRiskyTests = false)
|
||||
{
|
||||
$this->document = new DOMDocument('1.0', 'UTF-8');
|
||||
$this->document->formatOutput = true;
|
||||
@@ -114,7 +114,7 @@ class JUnit extends Printer implements TestListener
|
||||
|
||||
parent::__construct($out);
|
||||
|
||||
$this->reportUselessTests = $reportUselessTests;
|
||||
$this->reportRiskyTests = $reportRiskyTests;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -175,7 +175,7 @@ class JUnit extends Printer implements TestListener
|
||||
*/
|
||||
public function addRiskyTest(Test $test, \Throwable $t, float $time): void
|
||||
{
|
||||
if (!$this->reportUselessTests || $this->currentTestCase === null) {
|
||||
if (!$this->reportRiskyTests || $this->currentTestCase === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -212,7 +212,7 @@ class TeamCity extends ResultPrinter
|
||||
} else {
|
||||
$split = \explode('::', $suiteName);
|
||||
|
||||
if (\count($split) === 2 && \method_exists($split[0], $split[1])) {
|
||||
if (\count($split) === 2 && \class_exists($split[0]) && \method_exists($split[0], $split[1])) {
|
||||
$fileName = self::getFileName($split[0]);
|
||||
$parameters['locationHint'] = "php_qn://$fileName::\\$suiteName";
|
||||
$parameters['name'] = $split[1];
|
||||
@@ -238,7 +238,7 @@ class TeamCity extends ResultPrinter
|
||||
if (!\class_exists($suiteName, false)) {
|
||||
$split = \explode('::', $suiteName);
|
||||
|
||||
if (\count($split) === 2 && \method_exists($split[0], $split[1])) {
|
||||
if (\count($split) === 2 && \class_exists($split[0]) && \method_exists($split[0], $split[1])) {
|
||||
$parameters['name'] = $split[1];
|
||||
}
|
||||
}
|
||||
|
||||
+26
-22
@@ -42,29 +42,33 @@ class Printer
|
||||
*/
|
||||
public function __construct($out = null)
|
||||
{
|
||||
if ($out !== null) {
|
||||
if (\is_string($out)) {
|
||||
if (\strpos($out, 'socket://') === 0) {
|
||||
$out = \explode(':', \str_replace('socket://', '', $out));
|
||||
|
||||
if (\count($out) !== 2) {
|
||||
throw new Exception;
|
||||
}
|
||||
|
||||
$this->out = \fsockopen($out[0], $out[1]);
|
||||
} else {
|
||||
if (\strpos($out, 'php://') === false && !Filesystem::createDirectory(\dirname($out))) {
|
||||
throw new Exception(\sprintf('Directory "%s" was not created', \dirname($out)));
|
||||
}
|
||||
|
||||
$this->out = \fopen($out, 'wt');
|
||||
}
|
||||
|
||||
$this->outTarget = $out;
|
||||
} else {
|
||||
$this->out = $out;
|
||||
}
|
||||
if ($out === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (\is_string($out) === false) {
|
||||
$this->out = $out;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (\strpos($out, 'socket://') === 0) {
|
||||
$out = \explode(':', \str_replace('socket://', '', $out));
|
||||
|
||||
if (\count($out) !== 2) {
|
||||
throw new Exception;
|
||||
}
|
||||
|
||||
$this->out = \fsockopen($out[0], $out[1]);
|
||||
} else {
|
||||
if (\strpos($out, 'php://') === false && !Filesystem::createDirectory(\dirname($out))) {
|
||||
throw new Exception(\sprintf('Directory "%s" was not created', \dirname($out)));
|
||||
}
|
||||
|
||||
$this->out = \fopen($out, 'wt');
|
||||
}
|
||||
|
||||
$this->outTarget = $out;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -293,7 +293,7 @@ final class Test
|
||||
foreach ($required['functions'] as $function) {
|
||||
$pieces = \explode('::', $function);
|
||||
|
||||
if (\count($pieces) === 2 && \method_exists($pieces[0], $pieces[1])) {
|
||||
if (\count($pieces) === 2 && \class_exists($pieces[0]) && \method_exists($pieces[0], $pieces[1])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,10 @@ EOF;
|
||||
$path = \realpath($directory['path']);
|
||||
|
||||
if (\is_string($path)) {
|
||||
$files[] = \sprintf('%s/', $path);
|
||||
$files[] = \sprintf(
|
||||
\addslashes('%s' . \DIRECTORY_SEPARATOR),
|
||||
$path
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
--TEST--
|
||||
phpunit --columns=max BankAccountTest ../../_files/BankAccountTest.php
|
||||
--FILE--
|
||||
<?php declare(strict_types=1);
|
||||
$_SERVER['argv'][1] = '--no-configuration';
|
||||
$_SERVER['argv'][2] = '--columns=max';
|
||||
$_SERVER['argv'][3] = 'BankAccountTest';
|
||||
$_SERVER['argv'][4] = __DIR__ . '/../../_files/BankAccountTest.php';
|
||||
|
||||
require __DIR__ . '/../../bootstrap.php';
|
||||
PHPUnit\TextUI\Command::main();
|
||||
--EXPECTF--
|
||||
PHPUnit %s by Sebastian Bergmann and contributors.
|
||||
|
||||
... 3 / 3 (100%)
|
||||
|
||||
Time: %s, Memory: %s
|
||||
|
||||
OK (3 tests, 3 assertions)
|
||||
@@ -0,0 +1,19 @@
|
||||
--TEST--
|
||||
phpunit --columns=40 BankAccountTest ../../_files/BankAccountTest.php
|
||||
--FILE--
|
||||
<?php declare(strict_types=1);
|
||||
$_SERVER['argv'][1] = '--no-configuration';
|
||||
$_SERVER['argv'][2] = '--columns=40';
|
||||
$_SERVER['argv'][3] = 'BankAccountTest';
|
||||
$_SERVER['argv'][4] = __DIR__ . '/../../_files/BankAccountTest.php';
|
||||
|
||||
require __DIR__ . '/../../bootstrap.php';
|
||||
PHPUnit\TextUI\Command::main();
|
||||
--EXPECTF--
|
||||
PHPUnit %s by Sebastian Bergmann and contributors.
|
||||
|
||||
... 3 / 3 (100%)
|
||||
|
||||
Time: %s, Memory: %s
|
||||
|
||||
OK (3 tests, 3 assertions)
|
||||
@@ -0,0 +1,21 @@
|
||||
--TEST--
|
||||
phpunit --generate-configuration
|
||||
--STDIN--
|
||||
|
||||
|
||||
|
||||
--FILE--
|
||||
<?php declare(strict_types=1);
|
||||
$_SERVER['argv'][1] = '--no-configuration';
|
||||
$_SERVER['argv'][2] = '--generate-configuration';
|
||||
|
||||
require __DIR__ . '/../../bootstrap.php';
|
||||
chdir(sys_get_temp_dir());
|
||||
PHPUnit\TextUI\Command::main();
|
||||
--EXPECTF--
|
||||
PHPUnit %s by Sebastian Bergmann and contributors.
|
||||
|
||||
Generating phpunit.xml in %s
|
||||
|
||||
Bootstrap script (relative to path shown above; default: vendor/autoload.php): Tests directory (relative to path shown above; default: tests): Source directory (relative to path shown above; default: src):
|
||||
Generated phpunit.xml in %s
|
||||
+3
-3
@@ -14,7 +14,7 @@ namespace Is\Namespaced;
|
||||
*/
|
||||
|
||||
const A_CONSTANT = 17;
|
||||
const PHP_VERSION = "0.0.0";
|
||||
const PHP_VERSION = "";
|
||||
|
||||
class Issue3154
|
||||
{
|
||||
@@ -36,7 +36,7 @@ $mock = $generator->generate(
|
||||
);
|
||||
|
||||
print $mock['code'];
|
||||
--EXPECT--
|
||||
--EXPECTF--
|
||||
class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework\MockObject\MockObject
|
||||
{
|
||||
private $__phpunit_invocationMocker;
|
||||
@@ -49,7 +49,7 @@ class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework
|
||||
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
|
||||
}
|
||||
|
||||
public function a(int $i = PHP_INT_MAX, int $j = Is\Namespaced\A_CONSTANT, string $v = PHP_VERSION, string $z = '#'): string
|
||||
public function a(int $i = %d, int $j = 17, string $v = '%s', string $z = '#'): string
|
||||
{
|
||||
$__phpunit_arguments = [$i, $j, $v, $z];
|
||||
$__phpunit_count = func_num_args();
|
||||
|
||||
+3
-3
@@ -4,7 +4,7 @@
|
||||
<?php
|
||||
class Foo
|
||||
{
|
||||
public function bar(int $baz = PHP_INT_MIN)
|
||||
public function bar(int $baz = PHP_INT_MAX)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,7 @@ $mock = $generator->generate(
|
||||
|
||||
print $mock['code'];
|
||||
?>
|
||||
--EXPECT--
|
||||
--EXPECTF--
|
||||
class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
|
||||
{
|
||||
private $__phpunit_invocationMocker;
|
||||
@@ -36,7 +36,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
|
||||
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
|
||||
}
|
||||
|
||||
public function bar(int $baz = PHP_INT_MIN)
|
||||
public function bar(int $baz = %d)
|
||||
{
|
||||
$__phpunit_arguments = [$baz];
|
||||
$__phpunit_count = func_num_args();
|
||||
|
||||
vendor/phpunit/phpunit/tests/end-to-end/mock-objects/mock-method/with_argument_default_constant.phpt
Vendored
+10
-7
@@ -1,12 +1,15 @@
|
||||
--TEST--
|
||||
Mock static method
|
||||
--FILE--
|
||||
<?php
|
||||
define('FOO_CONST', 1);
|
||||
<?php declare(strict_types=1);
|
||||
define('GLOBAL_CONSTANT', 1);
|
||||
|
||||
class Foo
|
||||
{
|
||||
private function bar($arg = FOO_CONST){}
|
||||
public const CLASS_CONSTANT_PUBLIC = 2;
|
||||
protected const CLASS_CONSTANT_PROTECTED = 3;
|
||||
private const CLASS_CONSTANT_PRIVATE = 4;
|
||||
private function bar($a = GLOBAL_CONSTANT, $b = self::CLASS_CONSTANT_PUBLIC, $c = self::CLASS_CONSTANT_PROTECTED, $d = self::CLASS_CONSTANT_PRIVATE){}
|
||||
}
|
||||
|
||||
require __DIR__ . '/../../../../vendor/autoload.php';
|
||||
@@ -24,15 +27,15 @@ print $code;
|
||||
?>
|
||||
--EXPECT--
|
||||
|
||||
private function bar($arg = FOO_CONST)
|
||||
private function bar($a = 1, $b = 2, $c = 3, $d = 4)
|
||||
{
|
||||
$__phpunit_arguments = [$arg];
|
||||
$__phpunit_arguments = [$a, $b, $c, $d];
|
||||
$__phpunit_count = func_num_args();
|
||||
|
||||
if ($__phpunit_count > 1) {
|
||||
if ($__phpunit_count > 4) {
|
||||
$__phpunit_arguments_tmp = func_get_args();
|
||||
|
||||
for ($__phpunit_i = 1; $__phpunit_i < $__phpunit_count; $__phpunit_i++) {
|
||||
for ($__phpunit_i = 4; $__phpunit_i < $__phpunit_count; $__phpunit_i++) {
|
||||
$__phpunit_arguments[] = $__phpunit_arguments_tmp[$__phpunit_i];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
--TEST--
|
||||
phpunit --version
|
||||
--FILE--
|
||||
<?php
|
||||
$_SERVER['argv'][1] = '--no-configuration';
|
||||
$_SERVER['argv'][2] = '--version';
|
||||
|
||||
require __DIR__ . '/../bootstrap.php';
|
||||
|
||||
PHPUnit\TextUI\Command::main();
|
||||
?>
|
||||
--EXPECTF--
|
||||
PHPUnit %s by Sebastian Bergmann and contributors.
|
||||
@@ -142,4 +142,14 @@ class CountTest extends ConstraintTestCase
|
||||
$this->assertNotInstanceOf(\IteratorAggregate::class, $datePeriod);
|
||||
$this->assertTrue($countConstraint->evaluate($datePeriod, '', true));
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket https://github.com/sebastianbergmann/phpunit/issues/3743
|
||||
*/
|
||||
public function test_EmptyIterator_is_handled_correctly(): void
|
||||
{
|
||||
$constraint = new Count(0);
|
||||
|
||||
$this->assertTrue($constraint->evaluate(new \EmptyIterator, '', true));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,4 +64,14 @@ EOF
|
||||
|
||||
$this->fail();
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket https://github.com/sebastianbergmann/phpunit/issues/3743
|
||||
*/
|
||||
public function test_EmptyIterator_is_handled_correctly(): void
|
||||
{
|
||||
$constraint = new IsEmpty;
|
||||
|
||||
$this->assertTrue($constraint->evaluate(new \EmptyIterator, '', true));
|
||||
}
|
||||
}
|
||||
|
||||
+7
@@ -35,6 +35,13 @@ class StringStartsWithTest extends ConstraintTestCase
|
||||
$this->assertTrue($constraint->evaluate('0E1zzz', '', true));
|
||||
}
|
||||
|
||||
public function testConstraintStringStartsWithCorrectSingleZeroAndReturnResult(): void
|
||||
{
|
||||
$constraint = new StringStartsWith('0');
|
||||
|
||||
$this->assertTrue($constraint->evaluate('0ABC', '', true));
|
||||
}
|
||||
|
||||
public function testConstraintStringStartsWithNotCorrectNumericValueAndReturnResult(): void
|
||||
{
|
||||
$constraint = new StringStartsWith('0E1');
|
||||
|
||||
Vendored
+18
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
use PHPUnit\Framework\ExpectationFailedException;
|
||||
use PHPUnit\Framework\InvalidParameterGroupException;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class ConsecutiveParametersTest extends TestCase
|
||||
@@ -65,4 +66,21 @@ class ConsecutiveParametersTest extends TestCase
|
||||
|
||||
$mock->foo('invalid');
|
||||
}
|
||||
|
||||
public function testIntegrationFailsWithNonIterableParameterGroup(): void
|
||||
{
|
||||
$mock = $this->getMockBuilder(stdClass::class)
|
||||
->setMethods(['foo'])
|
||||
->getMock();
|
||||
|
||||
$this->expectException(InvalidParameterGroupException::class);
|
||||
$this->expectExceptionMessage('Parameter group #1 must be an array or Traversable, got object');
|
||||
|
||||
$mock->expects($this->any())
|
||||
->method('foo')
|
||||
->withConsecutive(
|
||||
['bar'],
|
||||
$this->identicalTo([21, 42]) // this is not an array
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,216 @@
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of PHPUnit.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
namespace PHPUnit\Framework;
|
||||
|
||||
/**
|
||||
* @small
|
||||
*/
|
||||
final class TestSuiteIteratorTest extends TestCase
|
||||
{
|
||||
/*
|
||||
* tests for the initial state with empty test suite
|
||||
*/
|
||||
|
||||
public function testKeyForEmptyTestSuiteInitiallyReturnsZero(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertSame(0, $subject->key());
|
||||
}
|
||||
|
||||
public function testValidForEmptyTestSuiteInitiallyReturnsFalse(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertFalse($subject->valid());
|
||||
}
|
||||
|
||||
public function testCurrentForEmptyTestSuiteInitiallyReturnsNull(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertNull($subject->current());
|
||||
}
|
||||
|
||||
/*
|
||||
* tests for the initial state with non-empty test suite
|
||||
*/
|
||||
|
||||
public function testKeyForNonEmptyTestSuiteInitiallyReturnsZero(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertSame(0, $subject->key());
|
||||
}
|
||||
|
||||
public function testValidForNonEmptyTestSuiteInitiallyReturnsTrue(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertTrue($subject->valid());
|
||||
}
|
||||
|
||||
public function testCurrentForNonEmptyTestSuiteInitiallyReturnsFirstTest(): void
|
||||
{
|
||||
$test = new \EmptyTestCaseTest();
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest($test);
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertSame($test, $subject->current());
|
||||
}
|
||||
|
||||
/*
|
||||
* tests for rewind
|
||||
*/
|
||||
|
||||
public function testRewindResetsKeyToZero(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
$subject->next();
|
||||
|
||||
$subject->rewind();
|
||||
|
||||
$this->assertSame(0, $subject->key());
|
||||
}
|
||||
|
||||
public function testRewindResetsCurrentToFirstElement(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$test = new \EmptyTestCaseTest();
|
||||
$testSuite->addTest($test);
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
$subject->next();
|
||||
|
||||
$subject->rewind();
|
||||
|
||||
$this->assertSame($test, $subject->current());
|
||||
}
|
||||
|
||||
/*
|
||||
* tests for next
|
||||
*/
|
||||
|
||||
public function testNextIncreasesKeyFromZeroToOne(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$subject->next();
|
||||
|
||||
$this->assertSame(1, $subject->key());
|
||||
}
|
||||
|
||||
public function testCurrentAfterLastElementReturnsNull(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$subject->next();
|
||||
|
||||
$this->assertNull($subject->current());
|
||||
}
|
||||
|
||||
public function testValidAfterLastElementReturnsFalse(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$subject->next();
|
||||
|
||||
$this->assertFalse($subject->valid());
|
||||
}
|
||||
|
||||
/*
|
||||
* tests for getChildren
|
||||
*/
|
||||
|
||||
public function testGetChildrenForEmptyTestSuiteThrowsException(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->expectException(UnexpectedValueException::class);
|
||||
|
||||
$subject->getChildren();
|
||||
}
|
||||
|
||||
public function testGetChildrenForCurrentTestThrowsException(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest(new \EmptyTestCaseTest());
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->expectException(UnexpectedValueException::class);
|
||||
|
||||
$subject->getChildren();
|
||||
}
|
||||
|
||||
public function testGetChildrenReturnsNewInstanceWithCurrentTestSuite(): void
|
||||
{
|
||||
$childSuite = new TestSuite();
|
||||
$test = new \EmptyTestCaseTest();
|
||||
$childSuite->addTest($test);
|
||||
|
||||
$testSuite = new TestSuite();
|
||||
$testSuite->addTest($childSuite);
|
||||
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$children = $subject->getChildren();
|
||||
|
||||
$this->assertNotSame($subject, $children);
|
||||
$this->assertSame($test, $children->current());
|
||||
}
|
||||
|
||||
/*
|
||||
* tests for hasChildren
|
||||
*/
|
||||
|
||||
public function testHasChildrenForCurrentTestSuiteReturnsTrue(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$childSuite = new TestSuite();
|
||||
$testSuite->addTest($childSuite);
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertTrue($subject->hasChildren());
|
||||
}
|
||||
|
||||
public function testHasChildrenForCurrentTestReturnsFalse(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$test = new \EmptyTestCaseTest();
|
||||
$testSuite->addTest($test);
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertFalse($subject->hasChildren());
|
||||
}
|
||||
|
||||
public function testHasChildrenForNoTestsReturnsFalse(): void
|
||||
{
|
||||
$testSuite = new TestSuite();
|
||||
$subject = new TestSuiteIterator($testSuite);
|
||||
|
||||
$this->assertFalse($subject->hasChildren());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user