From bc63fb26be59a41e86b35b57f20831a9a006d69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20PY?= Date: Thu, 3 May 2012 18:14:01 +0200 Subject: [PATCH] Fix some cs --- .../DependencyInjection/AbstractDoctrineExtension.php | 2 +- .../CompilerPass/DoctrineValidationPass.php | 1 + src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php | 3 ++- src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php | 3 ++- .../Command/ConfigDumpReferenceCommand.php | 4 ++-- .../FrameworkBundle/Command/TranslationUpdateCommand.php | 9 +++++---- .../Bundle/FrameworkBundle/Routing/DelegatingLoader.php | 2 +- .../Bundle/FrameworkBundle/Translation/PhpExtractor.php | 2 +- .../FrameworkBundle/Translation/TranslationLoader.php | 2 +- .../Finder/Iterator/MultiplePcreFilterIterator.php | 4 ++-- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index b795adb186..d3194a0abd 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -38,7 +38,7 @@ abstract class AbstractDoctrineExtension extends Extension */ protected $drivers = array(); - /* + /** * @param array $objectManager A configured object manager. * @param ContainerBuilder $container A ContainerBuilder instance */ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php index 57102fceb0..7d4fc71fd7 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php @@ -46,6 +46,7 @@ class DoctrineValidationPass implements CompilerPassInterface * files matching a doctrine search pattern (Resources/config/validation.orm.xml) * * @param ContainerBuilder $container + * @param string $mapping * @param type $extension */ private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension) diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index d2644a618a..3bc7a7bb77 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -87,7 +87,8 @@ abstract class DoctrineType extends AbstractType * Return the default loader object. * * @param ObjectManager $manager - * @param array $options + * @param mixed $queryBuilder + * @param string $class * @return EntityLoaderInterface */ abstract public function getLoader(ObjectManager $manager, $queryBuilder, $class); diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php index b6ef4b3e2a..aae3040483 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php @@ -20,7 +20,8 @@ class EntityType extends DoctrineType * Return the default loader object. * * @param ObjectManager $manager - * @param array $options + * @param mixed $queryBuilder + * @param string $class * @return ORMQueryBuilderLoader */ public function getLoader(ObjectManager $manager, $queryBuilder, $class) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php index 3886c91260..92eb9f3aec 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php @@ -127,7 +127,7 @@ EOF private function outputArray(array $array, $depth) { - $is_indexed = array_values($array) === $array; + $isIndexed = array_values($array) === $array; foreach ($array as $key => $value) { if (is_array($value)) { @@ -136,7 +136,7 @@ EOF $val = $value; } - if ($is_indexed) { + if ($isIndexed) { $this->outputLine('- '.$val, $depth * 4); } else { $this->outputLine(sprintf('%-20s %s', $key.':', $val), $depth * 4); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 3f615ceab8..53bea1dbc7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -116,17 +116,18 @@ EOF $loader->loadMessages($bundleTransPath, $catalogue); // show compiled list of messages - if($input->getOption('dump-messages') === true){ + if ($input->getOption('dump-messages') === true) { foreach ($catalogue->getDomains() as $domain) { $output->writeln(sprintf("\nDisplaying messages for domain %s:\n", $domain)); - $output->writeln(Yaml::dump($catalogue->all($domain),10)); + $output->writeln(Yaml::dump($catalogue->all($domain), 10)); } - if($input->getOption('output-format') == 'xliff') + if ($input->getOption('output-format') == 'xliff') { $output->writeln('Xliff output version is 1.2/info>'); + } } // save the files - if($input->getOption('force') === true) { + if ($input->getOption('force') === true) { $output->writeln('Writing files'); $writer->writeTranslations($catalogue, $input->getOption('output-format'), array('path' => $bundleTransPath)); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index b4208311e1..a1baa9a51d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -56,7 +56,7 @@ class DelegatingLoader extends BaseDelegatingLoader { $collection = parent::load($resource, $type); - foreach ($collection->all() as $name => $route) { + foreach ($collection->all() as $route) { if ($controller = $route->getDefault('_controller')) { try { $controller = $this->parser->parse($controller); diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php index 6362db877b..258a306f75 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php @@ -100,7 +100,7 @@ class PhpExtractor implements ExtractorInterface $message = ''; foreach ($sequence as $id => $item) { - if($this->normalizeToken($tokens[$key + $id]) == $item) { + if ($this->normalizeToken($tokens[$key + $id]) == $item) { continue; } elseif (self::MESSAGE_TOKEN == $item) { $message = $this->normalizeToken($tokens[$key + $id]); diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php index bff9a5a61d..3d9396291b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php @@ -47,7 +47,7 @@ class TranslationLoader */ public function loadMessages($directory, MessageCatalogue $catalogue) { - foreach($this->loaders as $format => $loader) { + foreach ($this->loaders as $format => $loader) { // load any existing translation files $finder = new Finder(); $extension = $catalogue->getLocale().'.'.$format; diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php index 05202ead96..8ba0fe3ff8 100644 --- a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php @@ -51,8 +51,8 @@ abstract class MultiplePcreFilterIterator extends \FilterIterator * * @return Boolean Whether the given string is a regex */ - protected function isRegex($str) { - + protected function isRegex($str) + { if (preg_match('/^(.{3,}?)[imsxuADU]*$/', $str, $m)) { $start = substr($m[1], 0, 1); $end = substr($m[1], -1);