Merge branch '4.4' into 5.1

* 4.4:
  Update versions in composer.json
  [Mime] Fix serialization of RawMessage

.github/build-packages.php

@@ -54,7 +54,6 @@ foreach ($dirs as $k => $dir) {
         echo "Missing \"version\" in composer.json.\n";
         exit(1);
     }
-    $package->version = str_replace('-dev', '.x-dev', $package->version);
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 

.travis.yml

@@ -209,7 +209,7 @@ install:
           git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
           git rm -rq src/Symfony/Bridge/PhpUnit
           git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
-          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
+          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
           sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
           rm -rf .phpunit
       fi
@@ -243,7 +243,7 @@ install:
           git checkout -m FETCH_HEAD &&
           export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       else
-          export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
+          export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
       fi
 
     - |

src/Symfony/Bridge/Doctrine/composer.json

@@ -76,5 +76,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bridge/Monolog/composer.json

@@ -45,5 +45,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bridge/PhpUnit/composer.json

@@ -46,5 +46,5 @@
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
     },
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bridge/ProxyManager/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bridge/Twig/composer.json

@@ -78,5 +78,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bundle/DebugBundle/composer.json

@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -109,5 +109,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bundle/SecurityBundle/composer.json

@@ -61,5 +61,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bundle/TwigBundle/composer.json

@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Bundle/WebProfilerBundle/composer.json

@@ -41,5 +41,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Asset/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/BrowserKit/composer.json

@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Cache/composer.json

@@ -52,5 +52,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Config/composer.json

@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Console/composer.json

@@ -55,5 +55,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/CssSelector/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/DependencyInjection/composer.json

@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/DomCrawler/composer.json

@@ -38,5 +38,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Dotenv/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/ErrorHandler/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/EventDispatcher/composer.json

@@ -49,5 +49,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/ExpressionLanguage/composer.json

@@ -28,5 +28,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Filesystem/composer.json

@@ -26,5 +26,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Finder/composer.json

@@ -25,5 +25,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Form/composer.json

@@ -65,5 +65,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/HttpClient/composer.json

@@ -47,5 +47,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/HttpFoundation/composer.json

@@ -37,5 +37,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/HttpKernel/composer.json

@@ -76,5 +76,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Inflector/composer.json

@@ -34,5 +34,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Intl/composer.json

@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Ldap/composer.json

@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Lock/composer.json

@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Amazon/composer.json

@@ -31,5 +31,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Google/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Postmark/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mailer/composer.json

@@ -44,5 +44,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Messenger/Bridge/Amqp/composer.json

@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json

@@ -36,5 +36,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Messenger/Bridge/Redis/composer.json

@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Messenger/composer.json

@@ -52,5 +52,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Mime/RawMessage.php

@@ -78,7 +78,7 @@ class RawMessage implements \Serializable
 
     public function __serialize(): array
     {
-        return [$this->message];
+        return [$this->toString()];
     }
 
     public function __unserialize(array $data): void

src/Symfony/Component/Mime/Tests/RawMessageTest.php

@@ -32,4 +32,18 @@ class RawMessageTest extends TestCase
         $this->assertEquals('some string', $message->toString());
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
     }
+
+    public function testSerialization()
+    {
+        $message = new RawMessage('string');
+        $this->assertEquals('string', unserialize(serialize($message))->toString());
+        // calling methods more than once work
+        $this->assertEquals('string', unserialize(serialize($message))->toString());
+
+        $message = new RawMessage(new \ArrayObject(['some', ' ', 'string']));
+        $message = new RawMessage($message->toIterable());
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+        // calling methods more than once work
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+    }
 }

src/Symfony/Component/Mime/composer.json

@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Firebase/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json

@@ -28,5 +28,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Nexmo/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/OvhCloud/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/RocketChat/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Sinch/composer.json

@@ -28,5 +28,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Slack/composer.json

@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Telegram/composer.json

@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/Bridge/Twilio/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Notifier/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/OptionsResolver/composer.json

@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Process/composer.json

@@ -26,5 +26,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/PropertyAccess/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/PropertyInfo/composer.json

@@ -52,5 +52,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Routing/composer.json

@@ -48,5 +48,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Security/Core/composer.json

@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Security/Csrf/composer.json

@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Security/Guard/composer.json

@@ -31,5 +31,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Security/Http/composer.json

@@ -44,5 +44,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Serializer/composer.json

@@ -59,5 +59,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Stopwatch/composer.json

@@ -26,5 +26,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/String/composer.json

@@ -37,5 +37,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Templating/composer.json

@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Translation/composer.json

@@ -54,5 +54,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Uid/composer.json

@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Validator/composer.json

@@ -73,5 +73,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/VarDumper/composer.json

@@ -46,5 +46,5 @@
         "Resources/bin/var-dump-server"
     ],
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/VarExporter/composer.json

@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/WebLink/composer.json

@@ -39,5 +39,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Workflow/composer.json

@@ -38,5 +38,5 @@
         "psr-4": { "Symfony\\Component\\Workflow\\": "" }
     },
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Component/Yaml/composer.json

@@ -39,5 +39,5 @@
         "Resources/bin/yaml-lint"
     ],
     "minimum-stability": "dev",
-    "version": "5.1-dev"
+    "version": "5.1.x-dev"
 }

src/Symfony/Contracts/Cache/composer.json

@@ -32,5 +32,5 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/Deprecation/composer.json

@@ -23,5 +23,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/EventDispatcher/composer.json

@@ -32,5 +32,5 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/HttpClient/composer.json

@@ -31,5 +31,5 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/Service/composer.json

@@ -32,5 +32,5 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/Translation/composer.json

@@ -31,5 +31,5 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }

src/Symfony/Contracts/composer.json

@@ -47,5 +47,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "2.1-dev"
+    "version": "2.1.x-dev"
 }