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

Make sure we properly usleep() on windows rmdir/unlink #7976

Closed
wants to merge 74 commits into
base: 1.8
from

Conversation

Projects
None yet
@staabm
Copy link
Contributor

staabm commented Feb 12, 2019

phpstan reports (line-numbers based on revision c5d8409)

 ------ ------------------------------------------- 
  Line   src/Composer/Util/Filesystem.php           
 ------ ------------------------------------------- 
  205    Result of function usleep (void) is used.  
  230    Result of function usleep (void) is used.  
 ------ ------------------------------------------- 

I guess this means that !@unlink($path) is effectively dead code since usleep() will never return a true-ish result (at least per php-src-docs)

Seldaek and others added some commits Dec 3, 2018

Raphaël Aurières
Merge pull request #7833 from RaphaelAurieres/master
Allows the JsonFile class to be used for other json files than composer.json
Merge pull request #7853 from localheinz/fix/sort
Fix: Keep environment variables sorted by name
Merge pull request #7865 from localheinz/fix/sudo
Fix: Remove sudo configuration
Merge pull request #7862 from localheinz/fix/indent
Fix: Consistently indent with 2 spaces
Merge pull request #7864 from localheinz/feature/matrix
Enhancement: Explicitly configure build matrix to maintain order
Merge pull request #7863 from localheinz/feature/schema
Enhancement: Reference phpunit.xsd as installed with composer
Merge pull request #7860 from localheinz/feature/validate
Enhancement: Validate composer.json on Travis

Seldaek and others added some commits Jan 29, 2019

Update installer commit to fix SHA384 bug
Installer linked is affected by #7669
Merge pull request #7934 from IkeLutra/patch-1
Update installer commit to fix SHA384 bug
Merge branch '1.8'
* 1.8:
  Fix solver problem exceptions with unexpected contradictory "Conclusions"
  Also load config into IO if not freshly created
  Only load configuration into IO if IO is available
  Fix defaultRepos fallback does not use auth config
Update aliases.md
Add composer command for alias.
Merge branch '1.8'
* 1.8:
  Follow up to #7946 test: add solver flag to assert path execution
Make sure we properly usleep() on windows rmdir/unlink
usleep() returns void, therefore the previous code didn't work
@staabm

This comment has been minimized.

Copy link
Contributor Author

staabm commented Feb 12, 2019

confirmed per https://3v4l.org/gfrbj that usleep() does not return a non-NULL value

@stof

This comment has been minimized.

Copy link
Contributor

stof commented Feb 12, 2019

this fix should go in 1.8 IMO

@staabm

This comment has been minimized.

Copy link
Contributor Author

staabm commented Feb 12, 2019

@Seldaek should I retarget the PR for 1.8 or is this something you can easily handle on-merge?

@Seldaek

This comment has been minimized.

Copy link
Member

Seldaek commented Feb 12, 2019

It's easier for me if you retarget/rebase, but otherwise I'll do it when I merge.

@Seldaek Seldaek added this to the 1.8 milestone Feb 12, 2019

@staabm staabm changed the base branch from master to 1.8 Feb 12, 2019

@staabm

This comment has been minimized.

Copy link
Contributor Author

staabm commented Feb 12, 2019

sorry, messed it up. here is a new one, targeting 1.8: #7978

@staabm staabm closed this Feb 12, 2019

@staabm staabm deleted the staabm:patch-1 branch Feb 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment