fixed CS
This commit is contained in:
parent
d2885adffe
commit
7f3be5c49d
@ -86,4 +86,4 @@ class DoctrineOrmTypeGuesserTest extends \PHPUnit_Framework_TestCase
|
||||
return new DoctrineOrmTypeGuesser($registry);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
namespace Symfony\Bridge\Doctrine\Tests\Logger;
|
||||
|
||||
|
||||
class DbalLoggerTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ class EnumNodeDefinition extends ScalarNodeDefinition
|
||||
}
|
||||
|
||||
$this->values = $values;
|
||||
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -40,4 +40,4 @@ class EnumNodeDefinition extends ScalarNodeDefinition
|
||||
|
||||
return new EnumNode($this->name, $this->parent, $this->values);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -239,7 +239,6 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertRegExp('/Did you mean this/', $e->getMessage(), '->find() throws an \InvalidArgumentException if command does not exist, with one alternative');
|
||||
}
|
||||
|
||||
|
||||
$application->add(new \Foo1Command());
|
||||
$application->add(new \Foo2Command());
|
||||
|
||||
|
@ -9,7 +9,6 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
|
||||
namespace Symfony\Component\Console\Tests\Formatter;
|
||||
|
||||
use Symfony\Component\Console\Formatter\OutputFormatter;
|
||||
|
@ -360,7 +360,7 @@ class Filesystem
|
||||
if ($copyOnWindows) {
|
||||
if (is_link($file) || is_file($file)) {
|
||||
$this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
|
||||
} else if (is_dir($file)) {
|
||||
} elseif (is_dir($file)) {
|
||||
$this->mkdir($target);
|
||||
} else {
|
||||
throw new IOException(sprintf('Unable to guess "%s" file type.', $file));
|
||||
@ -368,9 +368,9 @@ class Filesystem
|
||||
} else {
|
||||
if (is_link($file)) {
|
||||
$this->symlink($file, $target);
|
||||
} else if (is_dir($file)) {
|
||||
} elseif (is_dir($file)) {
|
||||
$this->mkdir($target);
|
||||
} else if (is_file($file)) {
|
||||
} elseif (is_file($file)) {
|
||||
$this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
|
||||
} else {
|
||||
throw new IOException(sprintf('Unable to guess "%s" file type.', $file));
|
||||
|
@ -53,7 +53,6 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
$dateTime = new \DateTime($rfc3339);
|
||||
|
||||
if ($this->outputTimezone !== $this->inputTimezone) {
|
||||
|
@ -46,7 +46,7 @@ class FileType extends AbstractType
|
||||
{
|
||||
$resolver->setDefaults(array(
|
||||
'compound' => false,
|
||||
'data_class' => 'Symfony\Component\HttpFoundation\File\File'
|
||||
'data_class' => 'Symfony\Component\HttpFoundation\File\File'
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -90,7 +90,7 @@ abstract class Guess
|
||||
*/
|
||||
public function __construct($confidence)
|
||||
{
|
||||
if (self::VERY_HIGH_CONFIDENCE !== $confidence && self::HIGH_CONFIDENCE !== $confidence &&
|
||||
if (self::VERY_HIGH_CONFIDENCE !== $confidence && self::HIGH_CONFIDENCE !== $confidence &&
|
||||
self::MEDIUM_CONFIDENCE !== $confidence && self::LOW_CONFIDENCE !== $confidence) {
|
||||
throw new \InvalidArgumentException('The confidence should be one of the constants defined in Guess.');
|
||||
}
|
||||
|
@ -18,4 +18,3 @@ abstract class DateTimeTestCase extends LocalizedTestCase
|
||||
self::assertEquals($expected->format('c'), $actual->format('c'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -227,7 +227,6 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
// The mapping must be deterministic! If a child has the property path "[street]",
|
||||
// "data[street]" should be mapped, but "data.street" should not!
|
||||
|
||||
return array(
|
||||
// mapping target, child name, its property path, grand child name, its property path, violation path
|
||||
array(self::LEVEL_0, 'address', 'address', 'street', 'street', ''),
|
||||
@ -1260,7 +1259,6 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
|
||||
// 1) the error actually maps to an existing child and
|
||||
// 2) the property path of that child (relative to the form providing
|
||||
// the mapping) matches the left side of the mapping
|
||||
|
||||
return array(
|
||||
// mapping target, map from, map to, child name, its property path, grand child name, its property path, violation path
|
||||
array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'),
|
||||
|
@ -155,7 +155,6 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
|
||||
array('justOne' => true)
|
||||
);
|
||||
|
||||
|
||||
$this->storage->destroy('foo');
|
||||
}
|
||||
|
||||
@ -183,7 +182,7 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$collection->expects($this->once())
|
||||
->method('remove')
|
||||
->will($this->returnCallback(function($citeria) use($that) {
|
||||
->will($this->returnCallback(function($citeria) use ($that) {
|
||||
$that->assertInstanceOf('MongoTimestamp', $citeria[$that->options['time_field']]['$lt']);
|
||||
$that->assertGreaterThanOrEqual(time() - -1, $citeria[$that->options['time_field']]['$lt']->sec);
|
||||
}));
|
||||
|
@ -54,6 +54,7 @@ class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase
|
||||
public function savePathDataProvider()
|
||||
{
|
||||
$base = sys_get_temp_dir();
|
||||
|
||||
return array(
|
||||
array("$base/foo", "$base/foo", "$base/foo"),
|
||||
array("5;$base/foo", "5;$base/foo", "$base/foo"),
|
||||
|
@ -40,7 +40,7 @@ class MongoDbProfilerStorageTestDataCollector extends DataCollector
|
||||
public function collect(Request $request, Response $response, \Exception $exception = null)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
public function getName()
|
||||
{
|
||||
return 'test_data_collector';
|
||||
@ -126,4 +126,3 @@ class MongoDbProfilerStorageTest extends AbstractProfilerStorageTest
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -125,7 +125,8 @@ function get_data($index, $dataDir, $locale = 'en', $constraint = null)
|
||||
return $data;
|
||||
}
|
||||
|
||||
function icu_version() {
|
||||
function icu_version()
|
||||
{
|
||||
exec('icu-config --version', $output, $result);
|
||||
|
||||
if ($result !== 0 || !isset($output[0])) {
|
||||
@ -135,13 +136,15 @@ function icu_version() {
|
||||
return $output[0];
|
||||
}
|
||||
|
||||
function normalize_icu_version($version) {
|
||||
function normalize_icu_version($version)
|
||||
{
|
||||
preg_match('/^(?P<version>[0-9]\.[0-9]|[0-9]{2,})/', $version, $matches);
|
||||
|
||||
return $matches['version'];
|
||||
}
|
||||
|
||||
function download_icu_data($version) {
|
||||
function download_icu_data($version)
|
||||
{
|
||||
$icu = parse_ini_file(__DIR__.'/icu.ini');
|
||||
|
||||
if (!isset($icu[$version])) {
|
||||
@ -624,4 +627,4 @@ create_stub_datafile($defaultLocale, $stubRegionDir, $countries);
|
||||
|
||||
// Clean up
|
||||
clear_directory($currDir);
|
||||
rmdir($currDir);
|
||||
rmdir($currDir);
|
||||
|
@ -16,7 +16,7 @@ namespace Symfony\Component\Process\Tests;
|
||||
*/
|
||||
abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
protected abstract function getProcess($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array());
|
||||
abstract protected function getProcess($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array());
|
||||
|
||||
/**
|
||||
* @expectedException \InvalidArgumentException
|
||||
@ -233,7 +233,6 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
||||
$this->markTestSkipped('Windows does not support POSIX signals');
|
||||
}
|
||||
|
||||
|
||||
$process = $this->getProcess('php -r "while (true) {}"');
|
||||
$process->start();
|
||||
$process->stop();
|
||||
|
@ -214,7 +214,7 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
|
||||
$routes = $this->getRoutes('test', new Route('/', array(), array('_scheme' => 'http')));
|
||||
$this->assertEquals('http://localhost/app.php/', $this->getGenerator($routes, array('scheme' => 'https'))->generate('test'));
|
||||
}
|
||||
|
||||
|
||||
public function testPathWithTwoStartingSlashes()
|
||||
{
|
||||
$routes = $this->getRoutes('test', new Route('//path-and-not-domain'));
|
||||
|
@ -58,7 +58,6 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
|
||||
return $this->httpUtils->createRedirectResponse($request, $this->determineTargetUrl($request));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the provider key.
|
||||
*
|
||||
|
@ -62,7 +62,7 @@ class Regex extends Constraint
|
||||
* Convert the htmlPattern to a suitable format for HTML5 pattern.
|
||||
* Example: /^[a-z]+$/ would be converted to [a-z]+
|
||||
* However, if options are specified, it cannot be converted
|
||||
*
|
||||
*
|
||||
* Pattern is also ignored if match=false since the pattern should
|
||||
* then be reversed before application.
|
||||
*
|
||||
@ -78,7 +78,7 @@ class Regex extends Constraint
|
||||
if (!$this->match) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
if (preg_match('/^(.)(\^?)(.*?)(\$?)\1$/', $this->pattern, $matches)) {
|
||||
$delimiter = $matches[1];
|
||||
$start = empty($matches[2]) ? '.*' : '';
|
||||
|
@ -162,7 +162,7 @@ class RegexValidatorTest extends \PHPUnit_Framework_TestCase
|
||||
'pattern' => '/[a-z]+/',
|
||||
));
|
||||
$this->assertEquals('.*[a-z]+.*', $constraint->getHtmlPattern());
|
||||
|
||||
|
||||
// Dropped because of match=false
|
||||
$constraint = new Regex(array(
|
||||
'pattern' => '/[a-z]+/',
|
||||
@ -170,5 +170,4 @@ class RegexValidatorTest extends \PHPUnit_Framework_TestCase
|
||||
));
|
||||
$this->assertNull($constraint->getHtmlPattern());
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user