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

[stable10] Backport of Add regex for shared object file names #34082

Merged
merged 2 commits into from
Feb 7, 2019

Conversation

sharidas
Copy link
Contributor

@sharidas sharidas commented Jan 8, 2019

Description

The change in this PR adds regular expression which would consider shared object file with extension not just .so. We should also consider files with extension say foo.so.1.2 or foo.1.2.so or foo.so or foo.so.. The regular expression change acheives this.

Related Issue

  • Fixes <issue_link>

Motivation and Context

The extensions added to resources/config/mimetypemapping.dist.json would only help for files with single extension. But for the shared object files in GNU/Linux we may have .so, .so.1.2, .1.2.so. For this we need a regular expression in the Detection.php to fix the problem of multiple extension.

How Has This Been Tested?

  • Tested with unit test

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

Add regular expression for shared object file name.
The file name can be for example 'a.so' or 'a.so.0.0.1'.
So this regular expression would help us to figure
out that file has 'so' extension too.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
…mac)

Add mime type for shared lib extnesion dylib.
dylib extension is required for MacOS.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
@sharidas sharidas added this to the development milestone Jan 8, 2019
@sharidas sharidas self-assigned this Jan 8, 2019
@sharidas sharidas requested a review from PVince81 January 8, 2019 13:46
@sharidas
Copy link
Contributor Author

sharidas commented Jan 8, 2019

Original PR #33894

@codecov
Copy link

codecov bot commented Jan 8, 2019

Codecov Report

Merging #34082 into stable10 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34082      +/-   ##
==============================================
+ Coverage       63.56%   63.57%   +<.01%     
- Complexity      19109    19115       +6     
==============================================
  Files            1264     1264              
  Lines           75147    75153       +6     
  Branches         1286     1286              
==============================================
+ Hits            47770    47776       +6     
  Misses          27001    27001              
  Partials          376      376
Flag Coverage Δ Complexity Δ
#javascript 53.32% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 64.66% <100%> (ø) 19115 <5> (+6) ⬆️
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Type/Detection.php 74.56% <100%> (+1.41%) 52 <5> (+6) ⬆️

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 58f2eeb...7d74dd5. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jan 8, 2019

Codecov Report

Merging #34082 into stable10 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34082      +/-   ##
==============================================
+ Coverage       63.56%   63.57%   +<.01%     
- Complexity      19109    19115       +6     
==============================================
  Files            1264     1264              
  Lines           75147    75153       +6     
  Branches         1286     1286              
==============================================
+ Hits            47770    47776       +6     
  Misses          27001    27001              
  Partials          376      376
Flag Coverage Δ Complexity Δ
#javascript 53.32% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 64.66% <100%> (ø) 19115 <5> (+6) ⬆️
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Type/Detection.php 74.56% <100%> (+1.41%) 52 <5> (+6) ⬆️

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 58f2eeb...7d74dd5. Read the comment docs.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@phil-davis phil-davis merged commit a12b47b into stable10 Feb 7, 2019
@delete-merged-branch delete-merged-branch bot deleted the regex-for-sharedobject-file-stable10 branch February 7, 2019 13:16
@PVince81 PVince81 modified the milestones: development, QA Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants