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

Commit

Permalink
Merge pull request #526 from ergebnis/fix/deprecate
Browse files Browse the repository at this point in the history 
Fix: Deprecate data providers
  • Loading branch information
@localheinz
localheinz committed Jan 3, 2022
2 parents 3a651d0 + 894e926 commit f85f01a
Show file tree
Hide file tree
Showing 11 changed files with 321 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

### Changed

- Deprecated all data providers ([#526]), by [@localheinz]

For a full diff see [`1.5.0...main`][1.5.0...main].

## [`1.5.0`][1.5.0]
Expand Down Expand Up @@ -183,6 +187,7 @@ For a full diff see [`0.7.0...0.8.0`][0.7.0...0.8.0].
[#374]: https://github.com/ergebnis/test-util/pull/374
[#434]: https://github.com/ergebnis/test-util/pull/434
[#435]: https://github.com/ergebnis/test-util/pull/435
[#526]: https://github.com/ergebnis/test-util/pull/526

[@dependabot]: https://github.com/dependabot
[@ergebnis]: https://github.com/ergebnis
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ In addition to the assertions made available by extending from `PHPUnit\Framewor

### Data Providers

:exclamation: The data providers have been deprecated. Use [`ergebnis/data-provider`](https://github.com/ergebnis/data-provider) instead.

This package provides the following generic data providers:

* [`Ergebnis\Test\Util\DataProvider\BoolProvider`](https://github.com/ergebnis/test-util#dataproviderboolprovider)
Expand Down
234 changes: 234 additions & 0 deletions phpstan-baseline.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,240 @@ parameters:
count: 1
path: test/Unit/DataProvider/AbstractProviderTestCase.php

-
message:
"""
#^Call to method arbitrary\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\BoolProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/BoolProviderTest.php

-
message:
"""
#^Call to method false\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\BoolProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/BoolProviderTest.php

-
message:
"""
#^Call to method true\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\BoolProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/BoolProviderTest.php

-
message:
"""
#^Call to method arbitrary\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method greaterThanOne\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method greaterThanZero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method lessThanOne\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method lessThanZero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method one\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method zero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\FloatProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/FloatProviderTest.php

-
message:
"""
#^Call to method arbitrary\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method greaterThanOne\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method greaterThanZero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method lessThanOne\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method lessThanZero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method one\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method zero\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\IntProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/IntProviderTest.php

-
message:
"""
#^Call to method null\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\NullProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/NullProviderTest.php

-
message:
"""
#^Call to method object\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\ObjectProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/ObjectProviderTest.php

-
message:
"""
#^Call to method resource\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\ResourceProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/ResourceProviderTest.php

-
message:
"""
#^Call to method arbitrary\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message:
"""
#^Call to method blank\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message:
"""
#^Call to method empty\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message:
"""
#^Call to method trimmed\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message:
"""
#^Call to method untrimmed\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message:
"""
#^Call to method withWhitespace\\(\\) of deprecated class Ergebnis\\\\Test\\\\Util\\\\DataProvider\\\\StringProvider\\:
use ergebnis/data\\-provider instead$#
"""
count: 1
path: test/Unit/DataProvider/StringProviderTest.php

-
message: "#^Method Ergebnis\\\\Test\\\\Util\\\\Test\\\\Unit\\\\Exception\\\\EmptyValuesTest\\:\\:assertClassExists\\(\\) is protected, but since the containing class is final, it can be private\\.$#"
count: 1
Expand Down
52 changes: 52 additions & 0 deletions psalm-baseline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,63 @@
<code>Util\Test\Util\DataProvider\Specification\Specification</code>
</UnnecessaryVarAnnotation>
</file>
<file src="test/Unit/DataProvider/BoolProviderTest.php">
<DeprecatedClass occurrences="3">
<code>BoolProvider::arbitrary()</code>
<code>BoolProvider::false()</code>
<code>BoolProvider::true()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/DataProvider/FloatProviderTest.php">
<DeprecatedClass occurrences="7">
<code>FloatProvider::arbitrary()</code>
<code>FloatProvider::greaterThanOne()</code>
<code>FloatProvider::greaterThanZero()</code>
<code>FloatProvider::lessThanOne()</code>
<code>FloatProvider::lessThanZero()</code>
<code>FloatProvider::one()</code>
<code>FloatProvider::zero()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/DataProvider/IntProviderTest.php">
<DeprecatedClass occurrences="7">
<code>IntProvider::arbitrary()</code>
<code>IntProvider::greaterThanOne()</code>
<code>IntProvider::greaterThanZero()</code>
<code>IntProvider::lessThanOne()</code>
<code>IntProvider::lessThanZero()</code>
<code>IntProvider::one()</code>
<code>IntProvider::zero()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/DataProvider/NullProviderTest.php">
<DeprecatedClass occurrences="1">
<code>NullProvider::null()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/DataProvider/ObjectProviderTest.php">
<DeprecatedClass occurrences="1">
<code>ObjectProvider::object()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/DataProvider/ResourceProviderTest.php">
<DeprecatedClass occurrences="1">
<code>ResourceProvider::resource()</code>
</DeprecatedClass>
<MissingClosureParamType occurrences="1">
<code>$value</code>
</MissingClosureParamType>
</file>
<file src="test/Unit/DataProvider/StringProviderTest.php">
<DeprecatedClass occurrences="6">
<code>StringProvider::arbitrary()</code>
<code>StringProvider::blank()</code>
<code>StringProvider::empty()</code>
<code>StringProvider::trimmed()</code>
<code>StringProvider::untrimmed()</code>
<code>StringProvider::withWhitespace()</code>
</DeprecatedClass>
</file>
<file src="test/Unit/Exception/InvalidExcludeClassNameTest.php">
<MixedInferredReturnType occurrences="1">
<code>\Generator&lt;array&lt;null|array|bool|float|int|resource|\stdClass&gt;&gt;</code>
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/BoolProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class BoolProvider
{
use Util\Helper;
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/FloatProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class FloatProvider
{
use Util\Helper;
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/IntProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class IntProvider
{
use Util\Helper;
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/NullProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class NullProvider
{
use Util\Helper;
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/ObjectProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class ObjectProvider
{
use Util\Helper;
Expand Down
4 changes: 4 additions & 0 deletions src/DataProvider/ResourceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

use Ergebnis\Test\Util;

/**
* @deprecated use ergebnis/data-provider instead
* @see https://github.com/ergebnis/data-provider
*/
final class ResourceProvider
{
use Util\Helper;
Expand Down

0 comments on commit f85f01a

Please sign in to comment.