Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3e492d6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.1
* 4.4: Update versions in composer.json [Mime] Fix serialization of RawMessage
2 parents 9f2a668 + 55396f9 commit 3e492d6

File tree

88 files changed

+101
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+101
-88
lines changed

‎.github/build-packages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
echo "Missing \"version\" in composer.json.\n";
5555
exit(1);
5656
}
57-
$package->version = str_replace('-dev', '.x-dev', $package->version);
5857
$package->dist['type'] = 'tar';
5958
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
6059

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ install:
209209
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
210210
git rm -rq src/Symfony/Bridge/PhpUnit
211211
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
212-
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
212+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
213213
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
214214
rm -rf .phpunit
215215
fi
@@ -243,7 +243,7 @@ install:
243243
git checkout -m FETCH_HEAD &&
244244
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
245245
else
246-
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
246+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
247247
fi
248248
249249
- |

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@
7676
]
7777
},
7878
"minimum-stability": "dev",
79-
"version": "5.1-dev"
79+
"version": "5.1.x-dev"
8080
}

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545
]
4646
},
4747
"minimum-stability": "dev",
48-
"version": "5.1-dev"
48+
"version": "5.1.x-dev"
4949
}

‎src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
"url": "https://github.com/sebastianbergmann/phpunit"
4747
}
4848
},
49-
"version": "5.1-dev"
49+
"version": "5.1.x-dev"
5050
}

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "5.1-dev"
36+
"version": "5.1.x-dev"
3737
}

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@
7878
]
7979
},
8080
"minimum-stability": "dev",
81-
"version": "5.1-dev"
81+
"version": "5.1.x-dev"
8282
}

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "5.1-dev"
45+
"version": "5.1.x-dev"
4646
}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@
109109
]
110110
},
111111
"minimum-stability": "dev",
112-
"version": "5.1-dev"
112+
"version": "5.1.x-dev"
113113
}

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@
6161
]
6262
},
6363
"minimum-stability": "dev",
64-
"version": "5.1-dev"
64+
"version": "5.1.x-dev"
6565
}

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
]
5252
},
5353
"minimum-stability": "dev",
54-
"version": "5.1-dev"
54+
"version": "5.1.x-dev"
5555
}

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
]
4242
},
4343
"minimum-stability": "dev",
44-
"version": "5.1-dev"
44+
"version": "5.1.x-dev"
4545
}

‎src/Symfony/Component/Asset/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "5.1-dev"
36+
"version": "5.1.x-dev"
3737
}

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"version": "5.1-dev"
38+
"version": "5.1.x-dev"
3939
}

‎src/Symfony/Component/Cache/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252
]
5353
},
5454
"minimum-stability": "dev",
55-
"version": "5.1-dev"
55+
"version": "5.1.x-dev"
5656
}

‎src/Symfony/Component/Config/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "5.1-dev"
45+
"version": "5.1.x-dev"
4646
}

‎src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@
5555
]
5656
},
5757
"minimum-stability": "dev",
58-
"version": "5.1-dev"
58+
"version": "5.1.x-dev"
5959
}

‎src/Symfony/Component/CssSelector/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
]
5252
},
5353
"minimum-stability": "dev",
54-
"version": "5.1-dev"
54+
"version": "5.1.x-dev"
5555
}

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
]
3939
},
4040
"minimum-stability": "dev",
41-
"version": "5.1-dev"
41+
"version": "5.1.x-dev"
4242
}

‎src/Symfony/Component/Dotenv/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

‎src/Symfony/Component/ErrorHandler/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "5.1-dev"
36+
"version": "5.1.x-dev"
3737
}

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
]
5050
},
5151
"minimum-stability": "dev",
52-
"version": "5.1-dev"
52+
"version": "5.1.x-dev"
5353
}

‎src/Symfony/Component/ExpressionLanguage/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
]
2929
},
3030
"minimum-stability": "dev",
31-
"version": "5.1-dev"
31+
"version": "5.1.x-dev"
3232
}

‎src/Symfony/Component/Filesystem/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
]
2727
},
2828
"minimum-stability": "dev",
29-
"version": "5.1-dev"
29+
"version": "5.1.x-dev"
3030
}

‎src/Symfony/Component/Finder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
]
2626
},
2727
"minimum-stability": "dev",
28-
"version": "5.1-dev"
28+
"version": "5.1.x-dev"
2929
}

‎src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@
6565
]
6666
},
6767
"minimum-stability": "dev",
68-
"version": "5.1-dev"
68+
"version": "5.1.x-dev"
6969
}

‎src/Symfony/Component/HttpClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
]
4848
},
4949
"minimum-stability": "dev",
50-
"version": "5.1-dev"
50+
"version": "5.1.x-dev"
5151
}

‎src/Symfony/Component/HttpFoundation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
]
3838
},
3939
"minimum-stability": "dev",
40-
"version": "5.1-dev"
40+
"version": "5.1.x-dev"
4141
}

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@
7676
]
7777
},
7878
"minimum-stability": "dev",
79-
"version": "5.1-dev"
79+
"version": "5.1.x-dev"
8080
}

‎src/Symfony/Component/Inflector/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
]
3535
},
3636
"minimum-stability": "dev",
37-
"version": "5.1-dev"
37+
"version": "5.1.x-dev"
3838
}

‎src/Symfony/Component/Intl/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "5.1-dev"
45+
"version": "5.1.x-dev"
4646
}

‎src/Symfony/Component/Ldap/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"version": "5.1-dev"
38+
"version": "5.1.x-dev"
3939
}

‎src/Symfony/Component/Lock/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"version": "5.1-dev"
38+
"version": "5.1.x-dev"
3939
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
]
3232
},
3333
"minimum-stability": "dev",
34-
"version": "5.1-dev"
34+
"version": "5.1.x-dev"
3535
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1-dev"
32+
"version": "5.1.x-dev"
3333
}

‎src/Symfony/Component/Mailer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@
4444
]
4545
},
4646
"minimum-stability": "dev",
47-
"version": "5.1-dev"
47+
"version": "5.1.x-dev"
4848
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "5.1-dev"
36+
"version": "5.1.x-dev"
3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
]
3333
},
3434
"minimum-stability": "dev",
35-
"version": "5.1-dev"
35+
"version": "5.1.x-dev"
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@
3636
]
3737
},
3838
"minimum-stability": "dev",
39-
"version": "5.1-dev"
39+
"version": "5.1.x-dev"
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
]
3131
},
3232
"minimum-stability": "dev",
33-
"version": "5.1-dev"
33+
"version": "5.1.x-dev"
3434
}

‎src/Symfony/Component/Messenger/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252
]
5353
},
5454
"minimum-stability": "dev",
55-
"version": "5.1-dev"
55+
"version": "5.1.x-dev"
5656
}

‎src/Symfony/Component/Mime/RawMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ final public function unserialize($serialized)
7878

7979
public function __serialize(): array
8080
{
81-
return [$this->message];
81+
return [$this->toString()];
8282
}
8383

8484
public function __unserialize(array $data): void

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,18 @@ public function testToString()
3232
$this->assertEquals('some string', $message->toString());
3333
$this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
3434
}
35+
36+
public function testSerialization()
37+
{
38+
$message = new RawMessage('string');
39+
$this->assertEquals('string', unserialize(serialize($message))->toString());
40+
// calling methods more than once work
41+
$this->assertEquals('string', unserialize(serialize($message))->toString());
42+
43+
$message = new RawMessage(new \ArrayObject(['some', ' ', 'string']));
44+
$message = new RawMessage($message->toIterable());
45+
$this->assertEquals('some string', unserialize(serialize($message))->toString());
46+
// calling methods more than once work
47+
$this->assertEquals('some string', unserialize(serialize($message))->toString());
48+
}
3549
}

‎src/Symfony/Component/Mime/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"version": "5.1-dev"
38+
"version": "5.1.x-dev"
3939
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
]
2828
},
2929
"minimum-stability": "dev",
30-
"version": "5.1-dev"
30+
"version": "5.1.x-dev"
3131
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
]
2929
},
3030
"minimum-stability": "dev",
31-
"version": "5.1-dev"
31+
"version": "5.1.x-dev"
3232
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
]
2828
},
2929
"minimum-stability": "dev",
30-
"version": "5.1-dev"
30+
"version": "5.1.x-dev"
3131
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
]
2828
},
2929
"minimum-stability": "dev",
30-
"version": "5.1-dev"
30+
"version": "5.1.x-dev"
3131
}

0 commit comments

Comments
 (0)