Skip to content
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.

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

introduce 'requires OSFAMILY' #2722

Merged
merged 3 commits into from
Jul 1, 2017

Conversation

keradus
Copy link
Contributor

@keradus keradus commented Jul 1, 2017

Closes #2697

composer.json Outdated
@@ -37,7 +37,7 @@
"phpunit/phpunit-mock-objects": "^4.0",
"sebastian/comparator": "^2.0",
"sebastian/diff": "^1.4.3 || ^2.0",
"sebastian/environment": "^3.0.2",
"sebastian/environment": "^3.1@dev",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could 3.1 be deployed ?
alternatively, I could use php polyfilled constant from symfony/polyfill.

Copy link
Owner

Choose a reason for hiding this comment

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

3.1.0 has been released

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@codecov-io
Copy link

codecov-io commented Jul 1, 2017

Codecov Report

Merging #2722 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2722      +/-   ##
============================================
+ Coverage      55.4%   55.41%   +0.01%     
- Complexity     2762     2765       +3     
============================================
  Files           102      102              
  Lines          7229     7231       +2     
============================================
+ Hits           4005     4007       +2     
  Misses         3224     3224
Impacted Files Coverage Δ Complexity Δ
src/Util/Test.php 88.52% <100%> (+0.07%) 198 <0> (+3) ⬆️
src/Util/Configuration.php 84.23% <0%> (-0.04%) 157% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0300973...2e18f62. Read the comment docs.

@sebastianbergmann
Copy link
Owner

Yes, I'll release 3.1 shortly. I wanted to wait a while until the constant's value for Apple had settled.

? $matches['value'][$i]
: \sprintf(
'/%s/i',
\addcslashes($matches['value'][$i], '/')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

logic when to use strictly provided value and when to decorate it for regex matching can be moved direct to place, when we compare the 'OS' value. I'm for that movement, but with that, we would need to update all related tests (to not contain /Linux/i but just Linux). WDYT @sebastianbergmann ?

Copy link
Owner

Choose a reason for hiding this comment

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

Makes sense to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@sebastianbergmann
Copy link
Owner

Makes sense to me.

@sebastianbergmann sebastianbergmann merged commit 7e3fa25 into sebastianbergmann:master Jul 1, 2017
@keradus keradus deleted the osfamily branch July 1, 2017 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants