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

phpunit 6 update #222

Merged
merged 6 commits into from Apr 27, 2017
Merged

phpunit 6 update #222

merged 6 commits into from Apr 27, 2017

Conversation

kokspflanze
Copy link
Contributor

  • phpunit 4 droped
  • added phpunit 5.7.14 and phpunit 6.0.7
  • added ::class syntax in tests

@kokspflanze
Copy link
Contributor Author

the php7 latest part should be fixed with zendframework/zend-eventmanager#47

froschdesign
froschdesign reviewed Mar 1, 2017
View reviewed changes
test/Application/BadControllerTrait.php
@@ -72,7 +73,7 @@ public function prepareApplication()
},
],
'invokables' => [
'Request' => 'Zend\Http\PhpEnvironment\Request',
'Request' => Request::class,
Copy link
Member

Choose a reason for hiding this comment

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

The topic of this PR is "PHPUnit 6" and all these changes makes a review more difficult.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if you want i can try to split it in 2 PRs

michalbundyra
michalbundyra reviewed Mar 2, 2017
View reviewed changes
.travis.yml Outdated
@@ -74,6 +72,7 @@ install:
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
Copy link
Member

Choose a reason for hiding this comment

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

Order here is important. This is not gonna work as expected if we will have composer.lock locked with PHPUnit 6.0.

I would suggest also extract satooshi/php-coveralls to variable, as we have it in other modules (please see for example some expressive modules).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i can change it to https://github.com/zendframework/zend-expressive-fastroute/blob/master/.travis.yml if that is okay

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it is right. Please update. Thanks!

@weierophinney weierophinney merged commit bda9029 into zendframework:master Apr 27, 2017
weierophinney added a commit that referenced this pull request Apr 27, 2017
@weierophinney
Merge pull request #222 from kokspflanze/phpunit_update
54ae3af 
phpunit 6 update

Conflicts:
	composer.json
	composer.lock
	test/Application/TestAsset/modules/Application/Module.php
	test/Controller/ActionControllerTest.php
	test/Controller/Plugin/AcceptableViewModelSelectorTest.php
	test/Controller/RestfulControllerTest.php
	test/Controller/TestAsset/ControllerLoaderAbstractFactory.php
	test/ResponseSender/AbstractResponseSenderTest.php
	test/TestAsset/MiddlewareAbstractFactory.php
	test/View/DefaultRendereringStrategyTest.php
weierophinney added a commit that referenced this pull request Apr 27, 2017
@weierophinney
Merge branch 'hotix/qa-tools'
933baf3 
Close #208
Close #222
Close #228
Close #230
weierophinney added a commit that referenced this pull request Apr 27, 2017
@weierophinney
Merge branch 'hotix/qa-tools' into develop
ef53bf6 
Forward port #208
Forward port #222
Forward port #228
Forward port #230

Conflicts:
	src/Controller/Plugin/Forward.php
	test/Controller/ActionControllerTest.php
	test/Controller/ControllerManagerTest.php
	test/Controller/Plugin/ForwardTest.php
	test/Controller/RestfulControllerTest.php
	test/Controller/TestAsset/ControllerLoaderAbstractFactory.php
	test/Service/ServiceListenerFactoryTest.php
	test/Service/ServiceManagerConfigTest.php
	test/Service/ViewHelperManagerFactoryTest.php
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@froschdesign froschdesign froschdesign left review comments

@michalbundyra michalbundyra michalbundyra left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kokspflanze @froschdesign @michalbundyra @weierophinney