Added more test, test resources and bugfixes (#24)

* Added more test, test resources and bugfixes

* cs fix

Author: Nyholm

src/Visitor/Php/Symfony/FormTypeChoices.php

@@ -46,51 +46,53 @@ public function enterNode(Node $node)
         }
 
         // symfony 3 displays key by default, where symfony 2 displays value
-        $useKey = $this->symfonyMajorVersion == 3;
+        $useKey = $this->symfonyMajorVersion === 3;
 
         // remember choices in this node
         $choicesNodes = [];
 
         // loop through array
-        if ($node instanceof Node\Expr\Array_) {
-            foreach ($node->items as $item) {
-                if (!$item->key instanceof Node\Scalar\String_) {
-                    continue;
-                }
+        if (!$node instanceof Node\Expr\Array_) {
+            return;
+        }
 
-                if ($item->key->value === 'choices_as_values') {
-                    $useKey = true;
-                    continue;
-                }
+        foreach ($node->items as $item) {
+            if (!$item->key instanceof Node\Scalar\String_) {
+                continue;
+            }
 
-                if ($item->key->value !== 'choices') {
-                    continue;
-                }
+            if ($item->key->value === 'choices_as_values') {
+                $useKey = true;
+                continue;
+            }
 
-                if (!$item->value instanceof Node\Expr\Array_) {
-                    continue;
-                }
+            if ($item->key->value !== 'choices') {
+                continue;
+            }
 
-                $choicesNodes[] = $item->value;
+            if (!$item->value instanceof Node\Expr\Array_) {
+                continue;
             }
 
-            if (count($choicesNodes) > 0) {
-                // probably will be only 1, but who knows
-                foreach ($choicesNodes as $choices) {
-                    // TODO: do something with grouped (multi-dimensional) arrays here
-                    if (!$choices instanceof Node\Expr\Array_) {
-                        continue;
-                    }
+            $choicesNodes[] = $item->value;
+        }
 
-                    foreach ($choices as $citem) {
-                        $labelNode = $useKey ? $citem[0]->key : $citem[0]->value;
-                        if (!$labelNode instanceof Node\Scalar\String_) {
-                            continue;
-                        }
+        if (count($choicesNodes) > 0) {
+            // probably will be only 1, but who knows
+            foreach ($choicesNodes as $choices) {
+                // TODO: do something with grouped (multi-dimensional) arrays here
+                if (!$choices instanceof Node\Expr\Array_) {
+                    continue;
+                }
 
-                        $sl = new SourceLocation($labelNode->value, $this->getAbsoluteFilePath(), $choices->getAttribute('startLine'));
-                        $this->collection->addLocation($sl);
+                foreach ($choices->items as $citem) {
+                    $labelNode = $useKey ? $citem->key : $citem->value;
+                    if (!$labelNode instanceof Node\Scalar\String_) {
+                        continue;
                     }
+
+                    $sl = new SourceLocation($labelNode->value, $this->getAbsoluteFilePath(), $choices->getAttribute('startLine'));
+                    $this->collection->addLocation($sl);
                 }
             }
         }

tests/Functional/Visitor/Php/BasePHPVisitorTest.php

@@ -20,6 +20,14 @@
  */
 abstract class BasePHPVisitorTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @param $visitor
+     * @param $namespaceForTestFile
+     *
+     * @return SourceCollection
+     *
+     * @throws \Exception
+     */
     protected function getSourceLocations($visitor, $namespaceForTestFile)
     {
         $extractor = new PHPFileExtractor();

tests/Functional/Visitor/Php/Symfony/ContainerAwareTransTest.php

@@ -24,8 +24,11 @@ public function testExtract()
     {
         $collection = $this->getSourceLocations(new ContainerAwareTrans(), Resources\Php\Symfony\ContainerAwareTrans::class);
 
-        $this->assertCount(1, $collection);
-        $source = $collection->first();
-        $this->assertEquals('foobar', $source->getMessage());
+        $this->assertCount(4, $collection);
+
+        $this->assertEquals('trans0', $collection->get(0)->getMessage());
+        $this->assertEquals('trans1', $collection->get(1)->getMessage());
+        $this->assertEquals('trans_line', $collection->get(2)->getMessage());
+        $this->assertEquals('variable', $collection->get(3)->getMessage());
     }
 }

tests/Functional/Visitor/Php/Symfony/FormTypeChoicesTest.php

@@ -42,4 +42,15 @@ public function testSimpleSymfony27()
         $this->assertEquals('label4', $collection->get(3)->getMessage());
         $this->assertEquals(12, $collection->get(0)->getLine());
     }
+
+    public function testChainedChoice()
+    {
+        $visitor = new FormTypeChoices();
+        $visitor->setSymfonyMajorVersion(3);
+        $collection = $this->getSourceLocations($visitor, Resources\Php\Symfony\ChainedChoiceType::class);
+
+        $this->assertCount(2, $collection, print_r($collection, true));
+        $this->assertEquals('label1', $collection->get(0)->getMessage());
+        $this->assertEquals('label2', $collection->get(1)->getMessage());
+    }
 }

tests/Resources/Php/Symfony/ChainedChoiceType.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Translation\Extractor\Tests\Resources\Php\Symfony;
+
+class ChainedChoiceType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name')
+            ->add('test', null, [
+            'choices' => [
+                'label1' => 'key',
+                'label2' => 'key',
+            ],
+        ]);
+    }
+}

tests/Resources/Php/Symfony/ContainerAwareTrans.php

@@ -9,8 +9,31 @@ class ContainerAwareTrans
      */
     public function newAction()
     {
-        $translated = $this->get('translator')->trans('foobar');
+        // Using container
+        $translated = $this->get('translator')->trans('trans0');
+
+        // As a parameter
+        $model->setMessage(
+            $this->get('translator')->trans(
+                'trans1',
+                array(
+                    'a' => 'x',
+                    'b' => 'y',
+                    'c' => 'z',
+                )
+            )
+        );
 
         return array();
     }
+
+    public function getLine()
+    {
+        return $this->translator->trans('trans_line');
+    }
+    public function getTranslatorVariable()
+    {
+        $translator = $this->get('translator');
+        $translator->trans('variable');
+    }
 }