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

Add Pharaoh to Box #238

Merged
merged 7 commits into from
May 30, 2018
Merged

Add Pharaoh to Box #238

merged 7 commits into from
May 30, 2018

Conversation

theofidry
Copy link
Member

@theofidry theofidry commented May 26, 2018

Add Pharaoh to provide a new diff command

Closes #209

@theofidry
Copy link
Member Author

Hello @paragonie-scott,

So in this PR you can see the integration to Box, I'm wondering if there is anything that can and is worth merging back to Pharaoh. As you can see the integration was relatively simple, the differences lies in:

  • using the Symfony Console component
  • restarting the PHP process if phar.readonly is on On
  • working on PHAR files which do not have the .phar extension

There however still seem to be an issue with the actual diff command. Indeed whenever I run the DiffTest test, the fixtures PHARs are marked as changed by git (for both git & GNU diff). Also if I compare Box PHAR with itself, it does find differences which is very weird:

$ bin/box diff bin/box.phar box.phar --gnu-diff
diff --git a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/symfony/var-dumper/Dumper/HtmlDumper.php b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/symfony/var-dumper/Dumper/HtmlDumper.php
index f68fe9a..bae1b8b 100644
Binary files a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/symfony/var-dumper/Dumper/HtmlDumper.php and b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/symfony/var-dumper/Dumper/HtmlDumper.php differ
diff --git a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/assert/src/Assert.php b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/assert/src/Assert.php
index 09b634a..3cc281b 100644
Binary files a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/assert/src/Assert.php and b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/assert/src/Assert.php differ
diff --git a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/path-util/src/Path.php b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/path-util/src/Path.php
index 43ef4eb..6bbf229 100644
Binary files a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/path-util/src/Path.php and b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/path-util/src/Path.php differ
diff --git a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/path-util/src/Url.php b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/path-util/src/Url.php
index fef937e..e177568 100644
Binary files a/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_ySK8C2/vendor/webmozart/path-util/src/Url.php and b/private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_WOkOlh/vendor/webmozart/path-util/src/Url.php differ

$ bin/box diff bin/box.phar box.phar --gnu-diff
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/.box and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/.box
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/.requirement-checker and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/.requirement-checker
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/bin and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/bin
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/res and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/res
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/src and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/src
Common subdirectories: /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_MuHyEP/vendor and /private/var/folders/p3/lkw0cgjj2fq0656q_9rd0mk80000gn/T/phr_Glt0qm/vendor

I couldn't check any deeper yet though

@theofidry theofidry merged commit 924fa40 into box-project:master May 30, 2018
@theofidry theofidry deleted the feature/pharaoh branch May 30, 2018 16:58
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.

1 participant