diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2'

Browse Source 
* 4.2:
  Revert "bug #30620 [FrameworkBundle][HttpFoundation] make session service resettable (dmaicher)"
  [Workflow] Fixed dumping when many transition with same name exist
  relax assertions in tests
  fix ConsoleFormatter - call to a member function format() on string
  Made `debug:container` and `debug:autowiring` ignore starting backslash in service id
  [Validator] Translate messages into Japanese
  Fix Thai translation in validators.th.xlf
  [FramworkBundle] mark any env vars found in the ide setting as used
This commit is contained in:
Fabien Potencier 2019-05-01 10:40:02 +02:00
commit 90326e67d5
13 changed files with 185 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
View File

@ -115,7 +115,9 @@ class ConsoleFormatter implements FormatterInterface
} }
$formatted = strtr($this->options['format'], [ $formatted = strtr($this->options['format'], [
'%datetime%' => $record['datetime']->format($this->options['date_format']), '%datetime%' => $record['datetime'] instanceof \DateTimeInterface
? $record['datetime']->format($this->options['date_format'])
: $record['datetime'],
'%start_tag%' => sprintf('<%s>', $levelColor), '%start_tag%' => sprintf('<%s>', $levelColor),
'%level_name%' => sprintf($this->options['level_name_format'], $record['level_name']), '%level_name%' => sprintf($this->options['level_name_format'], $record['level_name']),
'%end_tag%' => '</>', '%end_tag%' => '</>',

66
src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php Normal file
View File

@ -0,0 +1,66 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\Monolog\Tests\Formatter;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
class ConsoleFormatterTest extends TestCase
{
/**
* @dataProvider providerFormatTests
*/
public function testFormat(array $record, $expectedMessage)
{
$formatter = new ConsoleFormatter();
self::assertSame($expectedMessage, $formatter->format($record));
}
/**
* @return array
*/
public function providerFormatTests()
{
$currentDateTime = new \DateTime();
return [
'record with DateTime object in datetime field' => [
'record' => [
'message' => 'test',
'context' => [],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => $currentDateTime,
'extra' => [],
],
'expectedMessage' => sprintf(
"%s <fg=cyan>WARNING </> <comment>[test]</> test\n",
$currentDateTime->format(ConsoleFormatter::SIMPLE_DATE)
),
],
'record with string in datetime field' => [
'record' => [
'message' => 'test',
'context' => [],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => '2019-01-01T00:42:00+00:00',
'extra' => [],
],
'expectedMessage' => "2019-01-01T00:42:00+00:00 <fg=cyan>WARNING </> <comment>[test]</> test\n",
],
];
}
}

9
src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
View File

@ -2551,8 +2551,13 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@name="name"] [@name="name"]
[@class="my&class form-control"] [@class="my&class form-control"]
[not(@required)] [not(@required)]
<<<<<<< HEAD
[./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]] [./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
[count(./option)>200] [count(./option)>200]
=======
[.//option[@value="Europe/Vienna"][@selected="selected"]]
[count(.//option)>200]
>>>>>>> 4.2
' '
); );
} }
@ -2568,7 +2573,11 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
'/select '/select
[@class="my&class form-control"] [@class="my&class form-control"]
[./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]] [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
<<<<<<< HEAD
[count(./option)>201] [count(./option)>201]
=======
[count(.//option)>201]
>>>>>>> 4.2
' '
); );
} }

2
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
View File

@ -237,6 +237,8 @@ EOF
private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden) private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden)
{ {
$name = ltrim($name, '\\');
if ($builder->has($name) || !$input->isInteractive()) { if ($builder->has($name) || !$input->isInteractive()) {
return $name; return $name;
} }

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -208,6 +208,8 @@ class FrameworkExtension extends Extension
'vscode' => 'vscode://file/%%f:%%l', 'vscode' => 'vscode://file/%%f:%%l',
]; ];
$ide = $config['ide']; $ide = $config['ide'];
// mark any env vars found in the ide setting as used
$container->resolveEnvPlaceholders($ide);
$container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide)); $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));
} }

1
src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
View File

@ -15,7 +15,6 @@
<argument type="service" id="session.storage" /> <argument type="service" id="session.storage" />
<argument type="service" id="session.attribute_bag" /> <argument type="service" id="session.attribute_bag" />
<argument type="service" id="session.flash_bag" /> <argument type="service" id="session.flash_bag" />
<tag name="kernel.reset" method="save" />
</service> </service>
<service id="Symfony\Component\HttpFoundation\Session\SessionInterface" alias="session" /> <service id="Symfony\Component\HttpFoundation\Session\SessionInterface" alias="session" />

1
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
View File

@ -154,6 +154,7 @@ TXT
return [ return [
[BackslashClass::class], [BackslashClass::class],
['FixturesBackslashClass'], ['FixturesBackslashClass'],
['\\'.BackslashClass::class],
]; ];
} }
} }

4
src/Symfony/Component/HttpFoundation/Session/Session.php
View File

@ -193,9 +193,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
*/ */
public function save() public function save()
{ {
if ($this->isStarted()) { $this->storage->save();
$this->storage->save();
}
} }
/** /**

10
src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
View File

@ -260,14 +260,4 @@ class SessionTest extends TestCase
$flash->get('hello'); $flash->get('hello');
$this->assertTrue($this->session->isEmpty()); $this->assertTrue($this->session->isEmpty());
} }
public function testSaveIfNotStarted()
{
$storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface')->getMock();
$session = new Session($storage);
$storage->expects($this->once())->method('isStarted')->willReturn(false);
$storage->expects($this->never())->method('save');
$session->save();
}
} }

32
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
View File

@ -330,6 +330,38 @@
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source> <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
<target>このSWIFTコードはIBANコード（{{ iban }}）に関連付けられていません。</target> <target>このSWIFTコードはIBANコード（{{ iban }}）に関連付けられていません。</target>
</trans-unit> </trans-unit>
<trans-unit id="86">
<source>This value should be valid JSON.</source>
<target>JSONでなければなりません。</target>
</trans-unit>
<trans-unit id="87">
<source>This collection should contain only unique elements.</source>
<target>要素は重複してはなりません。</target>
</trans-unit>
<trans-unit id="88">
<source>This value should be positive.</source>
<target>正の数でなければなりません。</target>
</trans-unit>
<trans-unit id="89">
<source>This value should be either positive or zero.</source>
<target>正の数、または0でなければなりません。</target>
</trans-unit>
<trans-unit id="90">
<source>This value should be negative.</source>
<target>負の数でなければなりません。</target>
</trans-unit>
<trans-unit id="91">
<source>This value should be either negative or zero.</source>
<target>負の数、または0でなければなりません。</target>
</trans-unit>
<trans-unit id="92">
<source>This value is not a valid timezone.</source>
<target>有効なタイムゾーンではありません。</target>
</trans-unit>
<trans-unit id="93">
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>このパスワードは漏洩している為使用できません。</target>
</trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Symfony/Component/Validator/Resources/translations/validators.th.xlf
View File

@ -152,7 +152,7 @@
</trans-unit> </trans-unit>
<trans-unit id="41"> <trans-unit id="41">
<source>This value is already used.</source> <source>This value is already used.</source>
<target>Tค่านี้ถูกใช้งานไปแล้ว</target> <target>ค่านี้ถูกใช้งานไปแล้ว</target>
</trans-unit> </trans-unit>
<trans-unit id="42"> <trans-unit id="42">
<source>The size of the image could not be detected.</source> <source>The size of the image could not be detected.</source>

25
src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php
View File

@ -149,8 +149,8 @@ class GraphvizDumper implements DumperInterface
{ {
$code = ''; $code = '';
foreach ($transitions as $place) { foreach ($transitions as $i => $place) {
$code .= sprintf(" transition_%s [label=\"%s\",%s];\n", $this->dotize($place['name']), $this->escape($place['name']), $this->addAttributes($place['attributes'])); $code .= sprintf(" transition_%s [label=\"%s\",%s];\n", $this->dotize($i), $this->escape($place['name']), $this->addAttributes($place['attributes']));
} }
return $code; return $code;
@ -165,7 +165,7 @@ class GraphvizDumper implements DumperInterface
$dotEdges = []; $dotEdges = [];
foreach ($definition->getTransitions() as $transition) { foreach ($definition->getTransitions() as $i => $transition) {
$transitionName = $workflowMetadata->getMetadata('label', $transition) ?? $transition->getName(); $transitionName = $workflowMetadata->getMetadata('label', $transition) ?? $transition->getName();
foreach ($transition->getFroms() as $from) { foreach ($transition->getFroms() as $from) {
@ -173,6 +173,7 @@ class GraphvizDumper implements DumperInterface
'from' => $from, 'from' => $from,
'to' => $transitionName, 'to' => $transitionName,
'direction' => 'from', 'direction' => 'from',
'transition_number' => $i,
]; ];
} }
foreach ($transition->getTos() as $to) { foreach ($transition->getTos() as $to) {
@ -180,6 +181,7 @@ class GraphvizDumper implements DumperInterface
'from' => $transitionName, 'from' => $transitionName,
'to' => $to, 'to' => $to,
'direction' => 'to', 'direction' => 'to',
'transition_number' => $i,
]; ];
} }
} }
@ -195,12 +197,17 @@ class GraphvizDumper implements DumperInterface
$code = ''; $code = '';
foreach ($edges as $edge) { foreach ($edges as $edge) {
$code .= sprintf(" %s_%s -> %s_%s [style=\"solid\"];\n", if ('from' === $edge['direction']) {
'from' === $edge['direction'] ? 'place' : 'transition', $code .= sprintf(" place_%s -> transition_%s [style=\"solid\"];\n",
$this->dotize($edge['from']), $this->dotize($edge['from']),
'from' === $edge['direction'] ? 'transition' : 'place', $this->dotize($edge['transition_number'])
$this->dotize($edge['to']) );
); } else {
$code .= sprintf(" transition_%s -> place_%s [style=\"solid\"];\n",
$this->dotize($edge['transition_number']),
$this->dotize($edge['to'])
);
}
} }
return $code; return $code;

104
src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
View File

@ -73,26 +73,26 @@ class GraphvizDumperTest extends TestCase
place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle]; place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle];
place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle];
place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle]; place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape="box" regular="1"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape="box" regular="1"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape="box" regular="1"]; transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape="box" regular="1"];
transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 [label="My custom transition label 1", shape="box" regular="1"]; transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [label="My custom transition label 1", shape="box" regular="1"];
transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [label="t4", shape="box" regular="1"]; transition_77de68daecd823babbb58edb1c8e14d7106e83bb [label="t4", shape="box" regular="1"];
transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [label="t5", shape="box" regular="1"]; transition_1b6453892473a467d07372d45eb05abc2031647a [label="t5", shape="box" regular="1"];
transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [label="t6", shape="box" regular="1"]; transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [label="t6", shape="box" regular="1"];
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"];
place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 [style="solid"]; place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [style="solid"];
transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"];
place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [style="solid"]; place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_77de68daecd823babbb58edb1c8e14d7106e83bb [style="solid"];
transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; transition_77de68daecd823babbb58edb1c8e14d7106e83bb -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"];
place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [style="solid"]; place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_1b6453892473a467d07372d45eb05abc2031647a [style="solid"];
transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; transition_1b6453892473a467d07372d45eb05abc2031647a -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"];
place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [style="solid"]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [style="solid"];
transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"];
} }
'; ';
} }
@ -107,12 +107,12 @@ class GraphvizDumperTest extends TestCase
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle style="filled"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle style="filled"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle];
place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle color="#FF0000" shape="doublecircle" style="filled" fillcolor="DeepSkyBlue"]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle color="#FF0000" shape="doublecircle" style="filled" fillcolor="DeepSkyBlue"];
transition_805bac6f9261aaae4068bf114e182e9c37e2728d [label="My custom transition label 2", shape="box" regular="1"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="My custom transition label 2", shape="box" regular="1"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape="box" regular="1"]; transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape="box" regular="1"];
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_805bac6f9261aaae4068bf114e182e9c37e2728d [style="solid"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"];
transition_805bac6f9261aaae4068bf114e182e9c37e2728d -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"];
} }
'; ';
} }
@ -131,26 +131,26 @@ class GraphvizDumperTest extends TestCase
place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle]; place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle];
place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle];
place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle]; place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape="box" regular="1"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape="box" regular="1"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape="box" regular="1"]; transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape="box" regular="1"];
transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 [label="My custom transition label 1", shape="box" regular="1"]; transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [label="My custom transition label 1", shape="box" regular="1"];
transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [label="t4", shape="box" regular="1"]; transition_77de68daecd823babbb58edb1c8e14d7106e83bb [label="t4", shape="box" regular="1"];
transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [label="t5", shape="box" regular="1"]; transition_1b6453892473a467d07372d45eb05abc2031647a [label="t5", shape="box" regular="1"];
transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [label="t6", shape="box" regular="1"]; transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [label="t6", shape="box" regular="1"];
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"];
transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"];
place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 [style="solid"]; place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [style="solid"];
transition_0e93386f7fc29aa558e22918bd39c3de8c84f6d8 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"];
place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [style="solid"]; place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_77de68daecd823babbb58edb1c8e14d7106e83bb [style="solid"];
transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; transition_77de68daecd823babbb58edb1c8e14d7106e83bb -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"];
place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [style="solid"]; place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_1b6453892473a467d07372d45eb05abc2031647a [style="solid"];
transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; transition_1b6453892473a467d07372d45eb05abc2031647a -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"];
place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [style="solid"]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [style="solid"];
transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"];
} }
'; ';
} }
@ -165,12 +165,12 @@ class GraphvizDumperTest extends TestCase
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle style="filled"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle style="filled"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle];
place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle style="filled" fillcolor="DeepSkyBlue"]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle style="filled" fillcolor="DeepSkyBlue"];
transition_805bac6f9261aaae4068bf114e182e9c37e2728d [label="My custom transition label 2", shape="box" regular="1"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="My custom transition label 2", shape="box" regular="1"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape="box" regular="1"]; transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape="box" regular="1"];
place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_805bac6f9261aaae4068bf114e182e9c37e2728d [style="solid"]; place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"];
transition_805bac6f9261aaae4068bf114e182e9c37e2728d -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"];
place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"];
transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"];
} }
'; ';
} }