fixed CS
This commit is contained in:
parent
fdef8041f8
commit
7cc3ca59d0
@ -139,7 +139,6 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
|
|||||||
$factory[0] = new Reference($replacements[$referenceId], $factory[0]->getInvalidBehavior());
|
$factory[0] = new Reference($replacements[$referenceId], $factory[0]->getInvalidBehavior());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return $factory;
|
return $factory;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -694,8 +694,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||||||
$mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
|
$mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
|
||||||
$mergeStmt->bindParam(7, $maxlifetime, \PDO::PARAM_INT);
|
$mergeStmt->bindParam(7, $maxlifetime, \PDO::PARAM_INT);
|
||||||
$mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
|
$mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
|
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
|
||||||
$mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
|
$mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
|
||||||
$mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
|
$mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
|
||||||
|
@ -1180,7 +1180,8 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
/**
|
/**
|
||||||
* @dataProvider provideVariousIncrementals
|
* @dataProvider provideVariousIncrementals
|
||||||
*/
|
*/
|
||||||
public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method) {
|
public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method)
|
||||||
|
{
|
||||||
$process = $this->getProcess(self::$phpBin.' -r '.escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\''.$stream.'\', $n, 1); $n++; usleep(1000); }'), null, null, null, null);
|
$process = $this->getProcess(self::$phpBin.' -r '.escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\''.$stream.'\', $n, 1); $n++; usleep(1000); }'), null, null, null, null);
|
||||||
$process->start();
|
$process->start();
|
||||||
$result = '';
|
$result = '';
|
||||||
@ -1195,7 +1196,8 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
$process->stop();
|
$process->stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function provideVariousIncrementals() {
|
public function provideVariousIncrementals()
|
||||||
|
{
|
||||||
return array(
|
return array(
|
||||||
array('php://stdout', 'getIncrementalOutput'),
|
array('php://stdout', 'getIncrementalOutput'),
|
||||||
array('php://stderr', 'getIncrementalErrorOutput'),
|
array('php://stderr', 'getIncrementalErrorOutput'),
|
||||||
|
@ -249,7 +249,8 @@ XML;
|
|||||||
$this->assertEquals($expected, $serializer->serialize($array, 'xml', $options));
|
$this->assertEquals($expected, $serializer->serialize($array, 'xml', $options));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testEncodeTraversableWhenNormalizable() {
|
public function testEncodeTraversableWhenNormalizable()
|
||||||
|
{
|
||||||
$this->encoder = new XmlEncoder();
|
$this->encoder = new XmlEncoder();
|
||||||
$serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
|
$serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
|
||||||
$this->encoder->setSerializer($serializer);
|
$this->encoder->setSerializer($serializer);
|
||||||
@ -261,7 +262,6 @@ XML;
|
|||||||
XML;
|
XML;
|
||||||
|
|
||||||
$this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));
|
$this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDecode()
|
public function testDecode()
|
||||||
|
Reference in New Issue
Block a user