Merge branch '4.4' into 5.1
* 4.4: Update versions in composer.json [Mime] Fix serialization of RawMessage
This commit is contained in:
commit
3e492d6e5d
1
.github/build-packages.php
vendored
1
.github/build-packages.php
vendored
@ -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";
|
||||
|
||||
|
@ -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
|
||||
|
||||
- |
|
||||
|
@ -76,5 +76,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -45,5 +45,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -46,5 +46,5 @@
|
||||
"url": "https://github.com/sebastianbergmann/phpunit"
|
||||
}
|
||||
},
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -33,5 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -78,5 +78,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -42,5 +42,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -109,5 +109,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -61,5 +61,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -51,5 +51,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -41,5 +41,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -33,5 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -35,5 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -52,5 +52,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -42,5 +42,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -55,5 +55,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -51,5 +51,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -38,5 +38,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -33,5 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -49,5 +49,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -28,5 +28,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -26,5 +26,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -25,5 +25,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -65,5 +65,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -47,5 +47,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -37,5 +37,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -76,5 +76,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -34,5 +34,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -42,5 +42,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -35,5 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -35,5 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -31,5 +31,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -44,5 +44,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -33,5 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -32,5 +32,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -36,5 +36,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -30,5 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -52,5 +52,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ class RawMessage implements \Serializable
|
||||
|
||||
public function __serialize(): array
|
||||
{
|
||||
return [$this->message];
|
||||
return [$this->toString()];
|
||||
}
|
||||
|
||||
public function __unserialize(array $data): void
|
||||
|
@ -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());
|
||||
}
|
||||
}
|
||||
|
@ -35,5 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -28,5 +28,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -28,5 +28,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -30,5 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -30,5 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -27,5 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -26,5 +26,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -33,5 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -52,5 +52,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -48,5 +48,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -51,5 +51,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -35,5 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -31,5 +31,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -44,5 +44,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -59,5 +59,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -26,5 +26,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -37,5 +37,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -32,5 +32,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -54,5 +54,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -30,5 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -73,5 +73,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -46,5 +46,5 @@
|
||||
"Resources/bin/var-dump-server"
|
||||
],
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -29,5 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -39,5 +39,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -38,5 +38,5 @@
|
||||
"psr-4": { "Symfony\\Component\\Workflow\\": "" }
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -39,5 +39,5 @@
|
||||
"Resources/bin/yaml-lint"
|
||||
],
|
||||
"minimum-stability": "dev",
|
||||
"version": "5.1-dev"
|
||||
"version": "5.1.x-dev"
|
||||
}
|
||||
|
@ -32,5 +32,5 @@
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -23,5 +23,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -32,5 +32,5 @@
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -31,5 +31,5 @@
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -32,5 +32,5 @@
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -31,5 +31,5 @@
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
@ -47,5 +47,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"version": "2.1-dev"
|
||||
"version": "2.1.x-dev"
|
||||
}
|
||||
|
Reference in New Issue
Block a user