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

Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2 #114

Merged
merged 10 commits into from
Jul 3, 2017
Merged

Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2 #114

merged 10 commits into from
Jul 3, 2017

Conversation

michalbundyra
Copy link
Member

@michalbundyra michalbundyra commented Jul 3, 2017 •
edited
Loading

  • dropped PHP 5.6 and 7.0 support
  • updated travis configuration to run on PHP 7.2 (nightly)
  • bumped requirements to PHP 7.1
  • updated PHPUnit to 6.2.2
  • ::class notation in tests
  • removed PHP5.6/7.0 residues

@michalbundyra
Updated PHUnit to 6.2.2 || 5.7.21
9c6144f 
These version of PHPUnit are currenty supported. We need both versions
because PHPUnit 6 supports only PHP7+.
Changed travis configuration to use PHPUnit 5.7 on PHP 5.6.
@Ocramius
Copy link
Member

Ocramius commented Jul 3, 2017 via email

@michalbundyra
Copy link
Member Author

@Ocramius

We can bump everything to 7.1, as other zf components are also finally doing it

Do you want to do it in this PR?

@Ocramius
Copy link
Member

Ocramius commented Jul 3, 2017 via email

@michalbundyra
Bumped PHP version to 7.1
457429d 
Removed PHPUnit 5.7.21 and updated travis configuration
@michalbundyra
Updated PHPUnit configuration
0a6fa9a 
Removed unused group "disable"
@michalbundyra
Annotation @expectedException changed to method call
e5356cc 
When we use methods `expectException*` we can call them just before line
which should throw an exception
@michalbundyra
Removed PHP5.6 residues
3181ea9
@michalbundyra
Used $this-> instead of self:: for PHPUnit assertions
060b047
@michalbundyra
Fixed assertions
25fad55 
- use asserCount instead of assertEquals(.. count())
- use assertInstanceOf instead of isInstanceOf
@michalbundyra
Use ::class notation instead of strings
eb360c9
@michalbundyra michalbundyra changed the title Updated PHPUnit (^6.2.2 || ^5.7.21) Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2 Jul 3, 2017
@michalbundyra michalbundyra mentioned this pull request Jul 3, 2017
Closed
@michalbundyra
Copy link
Member Author

@Ocramius all done

Ocramius
Ocramius approved these changes Jul 3, 2017
View reviewed changes
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

Just a note for next tine (didn't want to rewrite all assertions now): it should be self::assert...

@Ocramius Ocramius self-assigned this Jul 3, 2017
@Ocramius Ocramius added this to the 3.2.0 milestone Jul 3, 2017
@Ocramius
Copy link
Member

Ocramius commented Jul 3, 2017

🚢

Thanks @webimpress!

@Ocramius Ocramius merged commit ef89962 into zendframework:develop Jul 3, 2017
@Ocramius Ocramius mentioned this pull request Jul 3, 2017
Merged
@michalbundyra michalbundyra deleted the feature/phpunit branch July 3, 2017 17:15
@michalbundyra michalbundyra mentioned this pull request Jul 3, 2017
Merged
@maghamed maghamed mentioned this pull request Aug 31, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Ocramius Ocramius Ocramius approved these changes

Assignees

@Ocramius Ocramius

Labels
enhancement
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@michalbundyra @Ocramius