Skip to content

Merge from 1.x #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 2, 2018
Merged

Merge from 1.x #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bbafac
Make client service public
Jean85 Dec 4, 2017
d6cb1e9
Update changelog for 1.0.1
Jean85 Dec 4, 2017
5b2ca9d
Disable xDebug in Travis for faster builds
Jean85 Dec 4, 2017
988a3d9
Use correct order for fixing Travis CI build
Jean85 Dec 4, 2017
c93be40
Fix or ignore PHPStan errors
Jean85 Dec 4, 2017
e6b7856
Fix build
Jean85 Dec 4, 2017
32bc4f7
Fix CS
Jean85 Dec 4, 2017
a3b5e7b
Merge branch 'releases/1.x' into merge-from-1.x
Jean85 Dec 12, 2017
5feb051
Mark 2.0 release date
Jean85 Dec 12, 2017
c47e7c1
Fix mess during merge
Jean85 Dec 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ before_install:
- composer global require hirak/prestissimo

install:
- travis_wait travis_retry composer update --no-interaction --prefer-dist --prefer-stable $COMPOSER_OPTIONS
- travis_retry travis_wait composer update --no-interaction --prefer-dist --prefer-stable $COMPOSER_OPTIONS

script:
- vendor/bin/phpunit -v
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## 2.0.0 - [Unreleased]
## 2.0.0 - 2017-12-12
Copy link
Member

Choose a reason for hiding this comment

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

assuming this is still correct?

Copy link
Member

Choose a reason for hiding this comment

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

actually I think GH might be showing this diff funny (looking at the PR commit list vs whats in the 'compare' view)

Copy link
Member

Choose a reason for hiding this comment

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

(you may also want to double check the branch looks ok)

### Added
- Add support for Symfony 4.x
### Changed
Expand All @@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Drop support for Symfony 2.x
- Drop support for PHP 5 and 7.0

## 1.0.1 - 2017-12-04
### Changed
- The `sentry.client` service is now explicitly declared as public

## 1.0.0 - 2017-11-07
### Added
- Add official support to PHP 7.2 (#71)
Expand Down