Skip to content

Commit f3c4abf

Browse files
TiSiETiSiE
committed
chore: merge upstream changes
2 parents 4d2d91f + 1015b06 commit f3c4abf

36 files changed

+247
-112
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ test export-ignore
33
.gitattributes export-ignore
44
phpunit.xml* export-ignore
55
phpcs.xml export-ignore
6+
.github export-ignore

‎.github/workflows/tests.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Tests
2+
on:
3+
pull_request:
4+
branches:
5+
- '**.x'
6+
push:
7+
branches:
8+
- '**.x'
9+
jobs:
10+
testing:
11+
name: PHP ${{ matrix.php }}
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
php: [7.2, 7.3, 7.4]
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
20+
- name: Setup PHP with composer
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: ${{ matrix.php }}
24+
tools: composer
25+
26+
- name: Install dependencies
27+
run: composer install
28+
29+
- name: Lint syntax / code convention
30+
run: composer lint
31+
32+
- name: Run unit tests
33+
run: composer test

‎CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at . All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

‎COPYRIGHT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(c) 2019 - 2020 CROSS Solution (https://cross-solution.de)

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 CROSS Solution
3+
Copyright (c) 2019 - 2020 CROSS Solution
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"test": "vendor/bin/phpunit",
3232
"test-coverage-clover": "vendor/bin/phpunit --coverage-clover=coverage.clover.xml",
3333
"test-coverage-html": "vendor/bin/phpunit --coverage-html=test/coverage",
34-
"lint": "vendor/bin/phpcs --standard=phpcs.xml src/*"
34+
"lint": "vendor/bin/phpcs -v --standard=phpcs.xml src/*"
3535
},
3636
"scripts-descriptions": {
3737
"test": "Runs the phpunit testsuite",

‎src/Constraint/ExtendsOrImplements.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);
@@ -17,7 +18,6 @@
1718
* Constraint to assert the extending or implementing of specific classes and interfaces.
1819
*
1920
* @author Mathias Gelhausen <gelhausen@cross-solution.de>
20-
* @todo write tets.
2121
*/
2222
class ExtendsOrImplements extends BaseConstraint
2323
{

‎src/Constraint/UsesTraits.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/Exception/ExceptionInterface.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
3-
* CROSS PHPunit Utils
4+
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <https://www.cross-solution.de>
7-
* @license MIT
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/Exception/InvalidUsageException.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
3-
* CROSS PHPunit Utils
4+
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <https://www.cross-solution.de>
7-
* @license MIT
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);
@@ -15,7 +16,6 @@
1516
* Exception thrown if a helper trait is used the wrong way
1617
*
1718
* @author Mathias Gelhausen <gelhausen@cross-solution.de>
18-
* @todo write tests
1919
*/
2020
class InvalidUsageException extends \PHPUnit\Framework\Exception implements ExceptionInterface
2121
{

‎src/Exception/TemplatedMessageExceptionTrait.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
3-
* CROSS PHPunit Utils
4+
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <https://www.cross-solution.de>
7-
* @license MIT
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);
@@ -32,7 +33,7 @@ trait TemplatedMessageExceptionTrait
3233
*
3334
* @return \Exception
3435
*/
35-
public static function create(...$args): \Exception
36+
public static function create(...$args): self
3637
{
3738
$ex = end($args) instanceof \Throwable ? array_pop($args) : null;
3839
$message = sprintf(...$args);

‎src/TestCase/AssertInheritanceTrait.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/TestCase/AssertUsesTraitsTrait.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/TestCase/ContainerDoubleTrait.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/TestCase/CreateProphecyTrait.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
3-
* CROSS PHPunit Utils
4+
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <https://www.cross-solution.de>
7-
* @license MIT
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);
@@ -18,7 +19,6 @@
1819
* Creates object prophecies or doubles.
1920
*
2021
* @author Mathias Gelhausen <gelhausen@cross-solution.de>
21-
* @todo write tests
2222
*/
2323
trait CreateProphecyTrait
2424
{

‎src/TestCase/SetupTargetTrait.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
79
*/
810

911
declare(strict_types=1);

‎src/TestCase/TestInheritanceTrait.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/TestCase/TestSetterAndGetterTrait.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2019 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);
@@ -99,7 +100,7 @@
99100
*
100101
* @author Mathias Gelhausen <gelhausen@cross-solution.de>
101102
*
102-
* @since @#next#@ Allow SUT per individual test.
103+
* @since 2.x Allow SUT per individual test.
103104
*/
104105
trait TestSetterAndGetterTrait
105106
{

‎src/TestCase/TestUsesTraitsTrait.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
34
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @license MIT
7-
* @copyright 2013 - 2016 Cross Solution <http://cross-solution.de>
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

‎src/Utils/Instance.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2+
23
/**
3-
* CROSS PHPunit Utils
4+
* CROSS PHPUnit Utils
45
*
5-
* @filesource
6-
* @copyright 2019 Cross Solution <https://www.cross-solution.de>
7-
* @license MIT
6+
* @see https://github.com/cross-solution/phpunit-utils for the canonical source repository
7+
* @copyright https://github.com/cross-solution/phpunit-utils/blob/master/COPYRIGHT
8+
* @license https://github.com/cross-solution/phpunit-utils/blob/master/LICENSE MIT
89
*/
910

1011
declare(strict_types=1);

0 commit comments

Comments
 (0)