There are some components not explicitly listed in our composer.json file that where not upgraded to 2.7.0. Also somehow the console and translation component was upgraded only to the beta release.

CommentFileSizeAuthor
#12 update_additional-2498515-12-interdiff.txt223 bytesberdir
#12 update_additional-2498515-12.patch146.26 KBberdir
#1 update_additional-2498515-1.patch166.4 KBneclimdul

Comments

neclimdul’s picture

neclimdul
He/Him
commented
StatusFileSize
new update_additional-2498515-1.patch166.4 KB

Patch.

I had to add .exe to .gitattributes to get git to stop complaining. It seems the binary might have had converted line endings in the previous patch.

neclimdul’s picture

neclimdul
He/Him
commented
Status: Active » Needs review
webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Priority: Normal » Critical

Good catch. This seems like something we can't ship with, so escalating to critical.

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs review » Reviewed & tested by the community

Oh packageist.org--

neclimdul’s picture

neclimdul
He/Him
commented

For reference, I've been watching it here. Much easier then trying to parse composer.lock manually.

https://www.versioneye.com/user/projects/54cbab50fb6ebae9240000fa#tab-de...

dawehner’s picture

dawehner
Primary language German
commented

Oh, that is a super helpful website!

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Ok, in the spirit of #2470693-80: Upgrade to Symfony 2.7.0, getting this in sooner than later so we can uncover any bugs it introduces. Encouraging to see a passing test suite, though! :)

Committed and pushed to 8.0.x. Thanks!

  • webchick committed e339153 on 8.0.x 
    Issue #2498515 by neclimdul: Update additional Symfony Components to 2.7...

  • alexpott committed 8f9efde on 8.0.x 
    Revert "Issue #2498515 by neclimdul: Update additional Symfony...
alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Fixed » Needs work 
+++ b/core/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -149,19 +149,19 @@ private function getDefaultValidator()
diff --git a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe

diff --git a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
index b59fd5b7935e856dc92af806dd500f9346b0e92a..9f4a2aa6357a7dd48f810a66982dc0f78a1c27f6 100644

index b59fd5b7935e856dc92af806dd500f9346b0e92a..9f4a2aa6357a7dd48f810a66982dc0f78a1c27f6 100644
--- a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe

--- a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
+++ b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe

+++ b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
+++ b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
@@ -1,4 +1,4 @@

@@ -1,4 +1,4 @@
-MZ����@���	�!�L�!This program cannot be run in DOS mode.
+MZ����@���	�!�L�!This program cannot be run in DOS mode.
 $�,�;�B�;�B�;�B�2�מ:�B�2���-�B�2�ƞ9�B�2�ў?�B�a9�8�B�;�C��B�2�Ȟ:�B�2�֞:�B�2�Ӟ:�B�Rich;�B�PEL�MoO�	
 8 @`?�@��"P@ Pp!8!@ �.text	
  `.rdata�

This file has not changed in three years - and whatever changed here stopped me, dawehener and wimleers from working. Not sure what is going on here. Obviously the problem could be with the original console patch or my original commit. But I've reverted for now to allow us to continue working.

If you are stuck on the commit and can't do git pull because of the changes doing git reset HEAD~4 --hard and then git pull works.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented

So it does indeed look like the original patch is the problem :(

composer update symfony/console
Loading composer repositories with package information
Updating dependencies (including require-dev)
  - Removing symfony/console (v2.7.0-BETA2)
  - Installing symfony/console (v2.7.0)
    Downloading: 100%

Writing lock file
Generating autoload files
 8.0.x  alex: ~/dev/drupal/core > git st
 M composer.lock
 M vendor/composer/installed.json
 M vendor/symfony/console/Application.php
 M vendor/symfony/console/Command/HelpCommand.php
 M vendor/symfony/console/Command/ListCommand.php
 M vendor/symfony/console/Formatter/OutputFormatter.php
 M vendor/symfony/console/Helper/DialogHelper.php
 M vendor/symfony/console/Input/ArgvInput.php
 M vendor/symfony/console/Input/InputDefinition.php
 M vendor/symfony/console/Output/StreamOutput.php
 M vendor/symfony/console/Question/ChoiceQuestion.php
 M vendor/symfony/console/Resources/bin/hiddeninput.exe
 M vendor/symfony/console/Style/StyleInterface.php
 M vendor/symfony/console/Style/SymfonyStyle.php
 M vendor/symfony/console/Tests/Command/CommandTest.php
 M vendor/symfony/console/Tests/Fixtures/application_1.json
 M vendor/symfony/console/Tests/Fixtures/application_1.md
 M vendor/symfony/console/Tests/Fixtures/application_1.xml
 M vendor/symfony/console/Tests/Fixtures/application_2.json
 M vendor/symfony/console/Tests/Fixtures/application_2.md
 M vendor/symfony/console/Tests/Fixtures/application_2.xml
 M vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
 M vendor/symfony/console/Tests/Fixtures/application_run2.txt
 M vendor/symfony/console/Tests/Fixtures/application_run3.txt
 M vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
 M vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
?? vendor/symfony/console/.gitignore

git diff vendor/symfony/console/Resources/bin/hiddeninput.exe
diff --git a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
index b59fd5b..9f4a2aa 100644
Binary files a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe and b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe differ

Not sure how to proceed. @neclimdul what did you add to .gitattributes?

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs work » Needs review
StatusFileSize
new update_additional-2498515-12.patch146.26 KB
new update_additional-2498515-12-interdiff.txt223 bytes

As discussed.

It looks like there are two things that could be done in .gitattributes.

a) removing the default eol=lf option
b) Add .exe to the explicit list of binary files.

Seems like b) is better for a quick-fix, since that's consistent with how we deal with other binary files but we should probably re-visit that default option in a separate issue. People might be adding binary files that don't match one of the explicit file endings in custom projects and this could mess that up badly?

My patch seems to be a lot smaller, but it should be the same, I just reverted the revert and then a git diff of that..

neclimdul’s picture

neclimdul
He/Him
commented
Status: Needs review » Reviewed & tested by the community

The exe file hadn't changed in 3 years but did not match the one in our repository. To confirm this I downloaded the file directly from github and compared it. That is why I changed it.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed

Thanks everyone.

neclimdul’s picture

neclimdul
He/Him
commented

Sorry, I was just talking to alex and I mentioned the gitattribute problems I had in #1 but clearly it is not in my patch. Many apologies. :(

  • alexpott committed 42c845a on 8.0.x 
    Issue #2498515 by Berdir, neclimdul: Update additional Symfony...
dawehner’s picture

dawehner
Primary language German
commented

Better do mistakes than don't do something! It is always helpful to make such errors so you can learn about them.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.