Reformat code

Orbitale · Mar 15, 2015 · 5680239 · 5680239
1 parent b1d5adf
commit 5680239
Show file tree

Hide file tree

Showing 17 changed files with 156 additions and 95 deletions.
diff --git a/Admin/TranslationAdmin.php b/Admin/TranslationAdmin.php
@@ -18,32 +18,35 @@
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
 
-class TranslationAdmin extends Admin {
+class TranslationAdmin extends Admin
+{
 
     protected function configureRoutes(RouteCollection $collection)
     {
-        $collection->clearExcept(array('list','edit'));
+        $collection->clearExcept(array('list', 'edit'));
     }
 
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper)
+    {
 
         $subject = $this->getSubject();
 
         /** @var EntityManager $em */
 
         $likes = $this->modelManager->getEntityManager($subject)->getRepository(get_class($subject))->findOneLikes($subject);
 
-        $help = $this->getConfigurationPool()->getContainer()->get('templating')->render('OrbitaleTranslationBundle:Translation:sonata_translations_like_help.html.twig', array('translations' => $likes));
+        $help = $this->getConfigurationPool()->getContainer()->get('templating')->render('OrbitaleTranslationBundle:Translation:sonata_translations_like_help.html.twig',
+            array('translations' => $likes));
 
         $formMapper
-            ->add('locale', 'text', array('disabled'=>true))
-            ->add('domain', 'text', array('disabled'=>true))
-            ->add('source', 'text', array('disabled'=>true))
-            ->add('translation', 'text', array('required'=>false, 'sonata_help' => $help))
-        ;
+            ->add('locale', 'text', array('disabled' => true))
+            ->add('domain', 'text', array('disabled' => true))
+            ->add('source', 'text', array('disabled' => true))
+            ->add('translation', 'text', array('required' => false, 'sonata_help' => $help));
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
+    {
 
         $domains = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository('Orbitale\Bundle\TranslationBundle\Entity\Translation')->getDomains();
         $domains = array_combine($domains, $domains);
@@ -57,24 +60,23 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
             ->add('domain', 'doctrine_orm_string', array('field_type' => 'choice'), null, array('choices' => $domains))
             ->add('locale', 'doctrine_orm_string', array('field_type' => 'choice'), null, array('choices' => $locales))
             ->add('translation_empty', 'doctrine_orm_callback', array(
-                'callback' => function(ProxyQuery $queryBuilder, $alias, $field, $value) {
+                'callback' => function (ProxyQuery $queryBuilder, $alias, $field, $value) {
                     if (!$value['value']) {
                         return;
                     }
                     $queryBuilder->andWhere($alias.'.translation IS NULL');
                 },
                 'field_type' => 'checkbox'
-            ))
-        ;
+            ));
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper)
+    {
         $listMapper
             ->add('locale', 'text')
             ->addIdentifier('source', 'text')
             ->addIdentifier('translation', 'text')
-            ->add('domain', 'text')
-        ;
+            ->add('domain', 'text');
 
     }
 

diff --git a/Command/TranslationExtractCommand.php b/Command/TranslationExtractCommand.php
@@ -12,10 +12,10 @@
 
 use Orbitale\Bundle\TranslationBundle\Translation\Extractor;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * This command extracts translation elements from database to files.

diff --git a/DependencyInjection/OrbitaleTranslationExtension.php b/DependencyInjection/OrbitaleTranslationExtension.php
@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('parameters.yml');
         $loader->load('default_locales.yml');
 
@@ -46,7 +46,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         foreach ($config as $key => $value) {
-            $container->setParameter('orbitale_translation.' . $key, $value);
+            $container->setParameter('orbitale_translation.'.$key, $value);
         }
 
         $container->setParameter('locales', $config['locales']);
@@ -80,9 +80,9 @@ private function processLocales(ContainerBuilder $container, $locales)
                 (!is_numeric($locale) && !in_array($locale, array_keys($baseLocales)))
                 || (is_numeric($locale) && !in_array($publicName, array_keys($baseLocales)))
             ) {
-                $msg = 'An error occured when parsing configuration for Translation locales.' . "\n"
-                    . 'You specified a locale named "' . (is_numeric($locale) ? $publicName : $locale) . '" which is not registered in our supported locales.' . "\n"
-                    . 'Locale format must be the shortest, for example, you should use "en" instead of "en_US".';
+                $msg = 'An error occured when parsing configuration for Translation locales.'."\n"
+                    .'You specified a locale named "'.(is_numeric($locale) ? $publicName : $locale).'" which is not registered in our supported locales.'."\n"
+                    .'Locale format must be the shortest, for example, you should use "en" instead of "en_US".';
                 throw new InvalidArgumentException($msg);
             } else {
                 if (is_numeric($locale)) {

diff --git a/Doctrine/TranslationLikeHydrator.php b/Doctrine/TranslationLikeHydrator.php
@@ -11,17 +11,19 @@
 namespace Orbitale\Bundle\TranslationBundle\Doctrine;
 
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
-use PDO;
 use Orbitale\Bundle\TranslationBundle\Entity\Translation;
+use PDO;
 
-class TranslationLikeHydrator extends AbstractHydrator {
+class TranslationLikeHydrator extends AbstractHydrator
+{
 
     /**
      * @var array
      */
     protected $initializedCollections;
 
-    function hydrateAllData() {
+    function hydrateAllData()
+    {
         $results = array();
 
         $owners = $this->_rsm->columnOwnerMap;
@@ -36,18 +38,18 @@ function hydrateAllData() {
                 $value = $row[$dqlAlias];
                 $fieldName = $mapping_fields[$dqlAlias];
 
-                if ( $fieldName !== 'id' || ($fieldName == 'id' && $value) ) {
+                if ($fieldName !== 'id' || ($fieldName == 'id' && $value)) {
 
                     if ($element === 'translationsLike') {
                         // Hydrates a translation-like
-                        $refObject   = new \ReflectionObject( $like );
-                        $refProperty = $refObject->getProperty( $fieldName );
+                        $refObject = new \ReflectionObject($like);
+                        $refProperty = $refObject->getProperty($fieldName);
                         $refProperty->setAccessible(true);
                         $refProperty->setValue($like, $value);
                     } else {
                         // Hydrates a "master" translation
-                        $refObject   = new \ReflectionObject( $result );
-                        $refProperty = $refObject->getProperty( $fieldName );
+                        $refObject = new \ReflectionObject($result);
+                        $refProperty = $refObject->getProperty($fieldName);
                         $refProperty->setAccessible(true);
                         $refProperty->setValue($result, $value);
                     }

diff --git a/Entity/Translation.php b/Entity/Translation.php
@@ -10,8 +10,8 @@
 
 namespace Orbitale\Bundle\TranslationBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="orbitale_translations")
@@ -72,7 +72,8 @@ public function __toString()
         return $this->source;
     }
 
-    function __construct() {
+    function __construct()
+    {
         $this->translationsLike = new ArrayCollection();
     }
 
@@ -206,8 +207,10 @@ public function getTranslation()
      * @param Translation $translation
      * @return $this
      */
-    public function addTranslationLike(Translation $translation) {
+    public function addTranslationLike(Translation $translation)
+    {
         $this->translationsLike->add($translation);
+
         return $this;
     }
 
@@ -216,16 +219,19 @@ public function addTranslationLike(Translation $translation) {
      * @param Translation $translation
      * @return $this
      */
-    public function removeTranslationLike(Translation $translation) {
+    public function removeTranslationLike(Translation $translation)
+    {
         $this->translationsLike->removeElement($translation);
+
         return $this;
     }
 
     /**
      * Get translations like
      * @return Translation[]
      */
-    public function getTranslationsLike(){
+    public function getTranslationsLike()
+    {
         return $this->translationsLike;
     }
 }
diff --git a/Listeners/FlushTranslations.php b/Listeners/FlushTranslations.php
@@ -14,15 +14,18 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
-class FlushTranslations implements EventSubscriberInterface {
+class FlushTranslations implements EventSubscriberInterface
+{
 
     protected $translator;
 
-    function __construct(Translator $translator) {
+    function __construct(Translator $translator)
+    {
         $this->translator = $translator;
     }
 
-    function flushTranslations(){
+    function flushTranslations()
+    {
         $this->translator->flushTranslations();
     }
 

diff --git a/Repository/TranslationRepository.php b/Repository/TranslationRepository.php
@@ -13,14 +13,16 @@
 use Doctrine\ORM\EntityRepository;
 use Orbitale\Bundle\TranslationBundle\Entity\Translation;
 
-class TranslationRepository extends EntityRepository {
+class TranslationRepository extends EntityRepository
+{
 
     /**
      * Get all translations with mentioned tokens
      * @param array $tokens
      * @return array
      */
-    public function findByTokens($tokens = array()) {
+    public function findByTokens($tokens = array())
+    {
         return $this->findBy(array('token' => $tokens));
     }
 
@@ -112,7 +114,8 @@ public function findOneLikes(Translation $translation)
      * @return Translation[]
      * @see Orbitale\Bundle\TranslationBundle\Doctrine\TranslationLikeHydrator
      */
-    public function findLikes($locale = null, $domain = null) {
+    public function findLikes($locale = null, $domain = null)
+    {
 
         $em = $this->_em;
         $dql = "

diff --git a/Tests/Controller/TranslationControllerTest.php b/Tests/Controller/TranslationControllerTest.php
@@ -17,7 +17,8 @@
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Router;
 
-class TranslationControllerTest extends AbstractTestCase {
+class TranslationControllerTest extends AbstractTestCase
+{
 
     public function testAdminAndExport()
     {

diff --git a/Tests/Fixtures/AbstractTestCase.php b/Tests/Fixtures/AbstractTestCase.php
@@ -35,6 +35,7 @@ protected function getKernel(array $options = array())
         if (!static::$kernel) {
             static::bootKernel($options);
         }
+
         return static::$kernel;
     }
 

diff --git a/Tests/Fixtures/App/AppKernel.php b/Tests/Fixtures/App/AppKernel.php
@@ -8,8 +8,8 @@
 * file that was distributed with this source code.
 */
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {

diff --git a/Tests/Translator/ExtractionTest.php b/Tests/Translator/ExtractionTest.php
@@ -11,16 +11,17 @@
 namespace Orbitale\Bundle\TranslationBundle\Tests\Translator;
 
 use Doctrine\ORM\EntityManager;
+use Orbitale\Bundle\TranslationBundle\Command\TranslationExtractCommand;
 use Orbitale\Bundle\TranslationBundle\Entity\Translation;
 use Orbitale\Bundle\TranslationBundle\Tests\Fixtures\AbstractTestCase;
-use Orbitale\Bundle\TranslationBundle\Command\TranslationExtractCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Yaml;
 
-class ExtractionTest extends AbstractTestCase {
+class ExtractionTest extends AbstractTestCase
+{
 
     /**
      * @var EntityManager
@@ -49,7 +50,8 @@ protected function setUp()
     /**
      * @return Translation[]
      */
-    private function processDummyDatas(){
+    private function processDummyDatas()
+    {
         $translationsToAdd = array(
             array('first.element', 'Premier élément', 'fr', 'messages'),
             array('first.element', 'First Element', 'en', 'messages'),
@@ -69,6 +71,7 @@ private function processDummyDatas(){
             $finalTranslations[$obj->getToken()] = $obj;
         }
         $this->em->flush();
+
         return $finalTranslations;
     }
 

diff --git a/Tests/Translator/TranslatorTest.php b/Tests/Translator/TranslatorTest.php
@@ -262,7 +262,13 @@ public function testGetLocalesInDb()
 
     public function testDomainsInDb()
     {
-        $domainsToSave = array('messages', 'garbage_domain', 'another_creepy_domain', 'hey_what_about', 'FOSUserBundle');
+        $domainsToSave = array(
+            'messages',
+            'garbage_domain',
+            'another_creepy_domain',
+            'hey_what_about',
+            'FOSUserBundle'
+        );
 
         /** @var Translation[] $translations */
         $translations = array();
@@ -305,10 +311,10 @@ public function testTranslationsLikeOne()
         $this->assertCount(2, $likes);
         $number = 0;
         foreach ($likes as $like) {
-            $number += preg_match('~'.$like->getSource().'~isUu',       $translation1->getSource());
-            $number += preg_match('~'.$like->getTranslation().'~isUu',  $translation1->getSource());
-            $number += preg_match('~'.$like->getSource().'~isUu',       $translation1->getTranslation());
-            $number += preg_match('~'.$like->getTranslation().'~isUu',  $translation1->getTranslation());
+            $number += preg_match('~'.$like->getSource().'~isUu', $translation1->getSource());
+            $number += preg_match('~'.$like->getTranslation().'~isUu', $translation1->getSource());
+            $number += preg_match('~'.$like->getSource().'~isUu', $translation1->getTranslation());
+            $number += preg_match('~'.$like->getTranslation().'~isUu', $translation1->getTranslation());
         }
         $this->assertGreaterThan(0, $number);
     }

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
 
-$file = __DIR__ . '/../vendor/autoload.php';
+$file = __DIR__.'/../vendor/autoload.php';
 if (!file_exists($file)) {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ protected function getKernel(array $options = array()) @@
             if (!static::$kernel) {
                 static::bootKernel($options);
             }
             return static::$kernel;
         }
@@ Expand Down @@