From 9f522de0d50c6430d8981351c33d1fe87915c76f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 6 May 2013 12:46:41 +0200 Subject: [PATCH] fixed CS --- .../Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php | 2 +- .../Tests/Validator/Constraints/UniqueValidatorTest.php | 1 + .../Component/ClassLoader/Tests/DebugClassLoaderTest.php | 1 + src/Symfony/Component/Form/DataTransformerInterface.php | 6 ++++-- .../Core/DataTransformer/DataTransformerChain.php | 5 +++-- .../Core/DataTransformer/DateTimeToArrayTransformer.php | 3 ++- .../Core/DataTransformer/DateTimeToStringTransformer.php | 3 ++- .../DataTransformer/DateTimeToRfc3339TransformerTest.php | 2 +- .../HttpKernel/Profiler/RedisProfilerStorage.php | 2 +- .../HttpKernel/Tests/Profiler/Mock/RedisMock.php | 8 ++++---- .../Component/Routing/Tests/Loader/XmlFileLoaderTest.php | 2 +- 11 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php index ad47f339b9..dfc53cc2e9 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php @@ -118,7 +118,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase $shortString = ''; $longString = ''; - for($i=1; $i<=DbalLogger::MAX_STRING_LENGTH; $i++) { + for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; $i++) { $shortString .= $testStringArray[$i % $testStringCount]; $longString .= $testStringArray[$i % $testStringCount]; } diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php index efedfd9244..ac0599a633 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php @@ -308,6 +308,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase $entity, ); next($returnValue); + return $returnValue; }) ) diff --git a/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php index ffbcafbd22..873515c336 100644 --- a/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php @@ -42,6 +42,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase $reflProp->setAccessible(true); $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0])); + return; } } diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php index 432dd36295..04db5c192f 100644 --- a/src/Symfony/Component/Form/DataTransformerInterface.php +++ b/src/Symfony/Component/Form/DataTransformerInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Form; +use Symfony\Component\Form\Exception\TransformationFailedException; + /** * Transforms a value between different representations. * @@ -43,7 +45,7 @@ interface DataTransformerInterface * * @return mixed The value in the transformed representation * - * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails. + * @throws TransformationFailedException When the transformation fails. */ public function transform($value); @@ -69,7 +71,7 @@ interface DataTransformerInterface * * @return mixed The value in the original representation * - * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails. + * @throws TransformationFailedException When the transformation fails. */ public function reverseTransform($value); } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php index ec466e1f94..9cc185e1ab 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; +use Symfony\Component\Form\Exception\TransformationFailedException; /** * Passes a value through multiple value transformers @@ -48,7 +49,7 @@ class DataTransformerChain implements DataTransformerInterface * * @return mixed The transformed value * - * @throws \Symfony\Component\Form\Exception\TransformationFailedException + * @throws TransformationFailedException */ public function transform($value) { @@ -72,7 +73,7 @@ class DataTransformerChain implements DataTransformerInterface * * @return mixed The reverse-transformed value * - * @throws \Symfony\Component\Form\Exception\TransformationFailedException + * @throws TransformationFailedException */ public function reverseTransform($value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php index eb4ebec9cd..34af282057 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; +use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a normalized time and a localized time string/array. @@ -33,7 +34,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer * @param array $fields The date fields * @param Boolean $pad Whether to use padding * - * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string + * @throws UnexpectedTypeException if a timezone is not a string */ public function __construct($inputTimezone = null, $outputTimezone = null, array $fields = null, $pad = false) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php index 730d54ef63..8e4c0cbe10 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; +use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a date string and a DateTime object @@ -57,7 +58,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer * @param string $format The date format * @param Boolean $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format * - * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string + * @throws UnexpectedTypeException if a timezone is not a string */ public function __construct($inputTimezone = null, $outputTimezone = null, $format = 'Y-m-d H:i:s', $parseUsingPipe = null) { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php index f550d4bd20..98aeb77292 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php @@ -124,7 +124,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsValidDateString() - { + { $transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC'); $transformer->reverseTransform('2010-2010-2010'); diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php index d601653bb8..28028311a0 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php @@ -207,7 +207,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface $redis = new Redis; $redis->connect($host, $port); - + // if a valid dbnumber is given select the redis index if (-1 < $dbnum) { $redis->select($dbnum); diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php index 122479b922..ca2980edde 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php @@ -238,17 +238,17 @@ class RedisMock return true; } - + public function select($dbnum) { if (!$this->connected) { return false; } - + if (0 > $dbnum) { return false; } - - return true; + + return true; } } diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php index 147b6e70a7..9c2bb77b14 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php @@ -47,7 +47,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase $this->assertEquals(1, count($routes), 'One route is loaded'); $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); - + $route = $routes['blog_show']; $this->assertSame(null, $route->getDefault('slug')); $this->assertEquals('RouteCompiler', $route->getOption('compiler_class'));